Updated the Makefile.os4

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

@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        image: ["ubuntu:16.04", "ubuntu:18.04", "ubuntu:23.10"]
+        image: ["centos:7", "ubuntu:14.04", "ubuntu:16.04", "ubuntu:18.04", "ubuntu:23.10"]
         include:
           - build_gui: false
           - image: "ubuntu:23.10"
@@ -39,6 +39,13 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Install missing software on CentOS 7
+        if: matrix.image == 'centos:7'
+        run: |
+          yum install -y cmake gcc-c++ make pcre-devel
+          yum --enablerepo=extras install -y epel-release
+          yum install -y ccache
+
       - name: Install missing software on ubuntu
         if: contains(matrix.image, 'ubuntu')
         run: |
@@ -55,12 +62,22 @@ jobs:
       # - it doesn't support centos
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
+        if: matrix.image != 'ubuntu:14.04' # no support for --set-config
         with:
           key: ${{ github.workflow }}-${{ matrix.image }}
 
+      # tests require CMake 3.9 - no ccache available
+      - name: CMake build (no tests / no ccache)
+        if: matrix.image == 'ubuntu:14.04'
+        run: |
+          mkdir cmake.output
+          cd cmake.output
+          cmake -G "Unix Makefiles" -DHAVE_RULES=On ..
+          cmake --build . -- -j$(nproc)
+
       # tests require CMake 3.9 - ccache available
       - name: CMake build (no tests)
-        if: matrix.image == 'ubuntu:16.04'
+        if: matrix.image == 'centos:7' || matrix.image == 'ubuntu:16.04'
         run: |
           mkdir cmake.output
           cd cmake.output
@@ -68,7 +85,7 @@ jobs:
           cmake --build . -- -j$(nproc)
 
       - name: CMake build
-        if: ${{ !matrix.build_gui && matrix.image != 'ubuntu:16.04' }}
+        if: ${{ !matrix.build_gui && matrix.image != 'centos:7' && matrix.image != 'ubuntu:14.04' && matrix.image != 'ubuntu:16.04' }}
         run: |
           mkdir cmake.output
           cd cmake.output
@@ -82,7 +99,7 @@ jobs:
           cmake --build cmake.output -- -j$(nproc)
 
       - name: Run CMake test
-        if: matrix.image != 'ubuntu:16.04'
+        if: matrix.image != 'centos:7' && matrix.image != 'ubuntu:14.04' && matrix.image != 'ubuntu:16.04'
         run: |
           cmake --build cmake.output --target check -- -j$(nproc)
 
@@ -90,7 +107,7 @@ jobs:
 
     strategy:
       matrix:
-        image: ["ubuntu:16.04", "ubuntu:18.04", "ubuntu:23.10"]
+        image: ["centos:7", "ubuntu:14.04", "ubuntu:16.04", "ubuntu:18.04", "ubuntu:23.10"]
       fail-fast: false # Prefer quick result
 
     runs-on: ubuntu-22.04
@@ -101,6 +118,13 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Install missing software on CentOS 7
+        if: matrix.image == 'centos:7'
+        run: |
+          yum install -y gcc-c++ make which python3 pcre-devel
+          yum --enablerepo=extras install -y epel-release
+          yum install -y ccache
+
       - name: Install missing software on ubuntu
         if: contains(matrix.image, 'ubuntu')
         run: |
@@ -112,6 +136,7 @@ jobs:
       # - it doesn't support centos
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
+        if: matrix.image != 'ubuntu:14.04' # no support for --set-config
         with:
           key: ${{ github.workflow }}-${{ matrix.image }}
 

.github/workflows/CI-unixish.yml

@@ -446,6 +446,8 @@ jobs:
           python3 ../naming.py --var='[a-z].*' --function='[a-z].*' naming_test.c.dump
           ../../cppcheck --dump naming_test.cpp 
           python3 ../naming.py --var='[a-z].*' --function='[a-z].*' naming_test.cpp.dump
+          ../../cppcheck --dump namingng_test.c 
+          python3 ../namingng.py --configfile ../naming.json --verify namingng_test.c.dump
 
       - name: Build democlient
         if: matrix.os == 'ubuntu-22.04'

.github/workflows/CI-windows.yml

@@ -202,4 +202,6 @@ jobs:
           rem python3 ..\naming.py --var='[a-z].*' --function='[a-z].*' naming_test.c.dump || exit /b !errorlevel!
           ..\..\cppcheck --dump naming_test.cpp || exit /b !errorlevel!
           python3 ..\naming.py --var='[a-z].*' --function='[a-z].*' naming_test.cpp.dump || exit /b !errorlevel!
+          ..\..\cppcheck --dump namingng_test.c || exit /b !errorlevel!
+          python3 ..\namingng.py --configfile ..\naming.json --verify namingng_test.c.dump || exit /b !errorlevel!
 

.github/workflows/cppcheck-premium.yml

@@ -19,23 +19,22 @@ jobs:
     runs-on: ubuntu-22.04 # run on the latest image only
 
     env:
-      PREMIUM_VERSION: 23.12.0
+      PREMIUM_VERSION: devdrop-20231105
 
     steps:
       - uses: actions/checkout@v3
 
       - name: Download cppcheckpremium
         run: |
-          wget https://files.cppchecksolutions.com/${{ env.PREMIUM_VERSION }}/ubuntu-22.04/cppcheckpremium-${{ env.PREMIUM_VERSION }}-amd64.tar.gz
+          wget https://files.cppchecksolutions.com/cppcheckpremium-${{ env.PREMIUM_VERSION }}-amd64.tar.gz
-          #wget https://files.cppchecksolutions.com/cppcheckpremium-${{ env.PREMIUM_VERSION }}-amd64.tar.gz
           tar xzf cppcheckpremium-${{ env.PREMIUM_VERSION }}-amd64.tar.gz
 
       - name: Generate a license file
         run: |
           echo cppcheck > cppcheck.lic
-          echo 241231 >> cppcheck.lic
+          echo 231231 >> cppcheck.lic
           echo 80000 >> cppcheck.lic
-          echo 53b72a908d7aeeee >> cppcheck.lic
+          echo 57e08c39523ab54d >> cppcheck.lic
           echo path:lib >> cppcheck.lic
 
       - name: Check

.github/workflows/iwyu.yml

@@ -63,7 +63,7 @@ jobs:
       # TODO: switch to Qt 6 after we enabled the Qt mappings again
       - 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 -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On
+          cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off
 
       - name: Prepare CMake dependencies
         run: |
@@ -140,7 +140,7 @@ 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 -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off -DEXTERNALS_AS_SYSTEM=On
+          cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off
         env:
           CC: clang-17
           CXX: clang++-17

.gitignore

@@ -130,3 +130,9 @@ compile_commands.json
 
 #vs code
 /.vscode
+
+#debian build system
+/debian
+
+/release_files
+*.lha

AUTHORS

@@ -221,7 +221,6 @@ Lukas Grützmacher
 Lukasz Czajczyk
 Łukasz Jankowski
 Luxon Jean-Pierre
-Maarten van der Schrieck
 Maksim Derbasov
 Malcolm Parsons
 Marc-Antoine Perennou

CMakeLists.txt

@@ -1,18 +1,14 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 2.8.12)
-if (MSVC)
+project(Cppcheck)
-    cmake_minimum_required(VERSION 3.13)
-endif()
-cmake_policy(SET CMP0048 NEW) # allow VERSION in project()
-project(Cppcheck VERSION 2.13.99 LANGUAGES CXX)
 
 include(cmake/cxx11.cmake)
 use_cxx11()
-set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 include(GNUInstallDirs)
 
+include(cmake/ccache.cmake)
 include(cmake/compilerCheck.cmake)
 include(cmake/versions.cmake)
 include(cmake/options.cmake)

Makefile

@@ -137,7 +137,7 @@ ifeq (clang++, $(findstring clang++,$(CXX)))
     CPPCHK_GLIBCXX_DEBUG=
 endif
 ifndef CXXFLAGS
-    CXXFLAGS=-pedantic -Wall -Wextra -Wcast-qual -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Wpacked -Wredundant-decls -Wundef -Wno-shadow -Wno-missing-field-initializers -Wno-missing-braces -Wno-sign-compare -Wno-multichar -Woverloaded-virtual $(CPPCHK_GLIBCXX_DEBUG) -g
+    CXXFLAGS=-std=c++0x -O2 -DNDEBUG -Wall -Wno-sign-compare -Wno-multichar
 endif
 
 ifeq (g++, $(findstring g++,$(CXX)))
@@ -365,7 +365,7 @@ dmake:	tools/dmake.o cli/filelister.o $(libcppdir)/pathmatch.o $(libcppdir)/path
 	$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
 
 run-dmake: dmake
-	./dmake
+	./dmake --release
 
 clean:
 	rm -f build/*.cpp build/*.o lib/*.o cli/*.o test/*.o tools/*.o externals/*/*.o testrunner dmake cppcheck cppcheck.exe cppcheck.1
@@ -626,7 +626,7 @@ $(libcppdir)/settings.o: lib/settings.cpp externals/picojson/picojson.h lib/addo
 $(libcppdir)/summaries.o: lib/summaries.cpp lib/addoninfo.h lib/analyzerinfo.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/summaries.h lib/suppressions.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/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/mathlib.h lib/path.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/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/mathlib.h lib/path.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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/suppressions.cpp
 
 $(libcppdir)/templatesimplifier.o: lib/templatesimplifier.cpp lib/addoninfo.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/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h

Makefile.os4

@@ -0,0 +1,918 @@
+# This file is generated by tools/dmake, do not edit.
+
+ifndef VERBOSE
+    VERBOSE=
+endif
+# To compile with rules, use 'make HAVE_RULES=yes'
+ifndef HAVE_RULES
+    HAVE_RULES=no
+endif
+
+ifdef SRCDIR
+    $(error Usage of SRCDIR to activate match compiler has been removed. Use MATCHCOMPILER=yes instead.)
+endif
+ifndef MATCHCOMPILER
+    MATCHCOMPILER=
+endif
+# use match compiler
+ifeq ($(MATCHCOMPILER),yes)
+    # Find available Python interpreter
+    ifeq ($(PYTHON_INTERPRETER),)
+        PYTHON_INTERPRETER := $(shell which python3)
+    endif
+    ifeq ($(PYTHON_INTERPRETER),)
+        PYTHON_INTERPRETER := $(shell which python)
+    endif
+    ifeq ($(PYTHON_INTERPRETER),)
+        $(error Did not find a Python interpreter)
+    endif
+    ifdef VERIFY
+        matchcompiler_S := $(shell $(PYTHON_INTERPRETER) tools/matchcompiler.py --verify)
+    else
+        matchcompiler_S := $(shell $(PYTHON_INTERPRETER) tools/matchcompiler.py)
+    endif
+    libcppdir:=build
+else
+    libcppdir:=lib
+endif
+
+ifndef CPPFLAGS
+    CPPFLAGS=
+endif
+
+ifdef FILESDIR
+    CPPFLAGS+=-DFILESDIR=\"$(FILESDIR)\"
+endif
+
+RDYNAMIC=-export-dynamic
+# Set the CPPCHK_GLIBCXX_DEBUG flag. This flag is not used in release Makefiles.
+# The _GLIBCXX_DEBUG define doesn't work in Cygwin or other Win32 systems.
+ifndef COMSPEC
+    ifeq ($(VERBOSE),1)
+        $(info COMSPEC not found)
+    endif
+    ifdef ComSpec
+        ifeq ($(VERBOSE),1)
+            $(info ComSpec found)
+        endif
+        #### ComSpec is defined on some WIN32's.
+        WINNT=1
+
+        ifeq ($(VERBOSE),1)
+            $(info PATH=$(PATH))
+        endif
+
+        ifneq (,$(findstring /cygdrive/,$(PATH)))
+            ifeq ($(VERBOSE),1)
+                $(info /cygdrive/ found in PATH)
+            endif
+            CYGWIN=1
+        endif # CYGWIN
+    endif # ComSpec
+endif # COMSPEC
+
+ifdef WINNT
+    ifeq ($(VERBOSE),1)
+        $(info WINNT found)
+    endif
+    #### Maybe Windows
+    ifndef CPPCHK_GLIBCXX_DEBUG
+        CPPCHK_GLIBCXX_DEBUG=
+    endif # !CPPCHK_GLIBCXX_DEBUG
+
+    ifeq ($(VERBOSE),1)
+        $(info MSYSTEM=$(MSYSTEM))
+    endif
+
+    ifneq ($(MSYSTEM),MINGW32 MINGW64)
+        RDYNAMIC=
+    endif
+
+    LDFLAGS+=-lshlwapi
+else # !WINNT
+    ifeq ($(VERBOSE),1)
+        $(info WINNT not found)
+    endif
+
+    uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+
+    ifeq ($(VERBOSE),1)
+        $(info uname_S=$(uname_S))
+    endif
+
+    ifeq ($(uname_S),Linux)
+        ifndef CPPCHK_GLIBCXX_DEBUG
+            CPPCHK_GLIBCXX_DEBUG=-D_GLIBCXX_DEBUG
+        endif # !CPPCHK_GLIBCXX_DEBUG
+    endif # Linux
+
+    ifeq ($(uname_S),GNU/kFreeBSD)
+        ifndef CPPCHK_GLIBCXX_DEBUG
+            CPPCHK_GLIBCXX_DEBUG=-D_GLIBCXX_DEBUG
+        endif # !CPPCHK_GLIBCXX_DEBUG
+    endif # GNU/kFreeBSD
+
+    LDFLAGS+=-lpthread
+
+endif # WINNT
+
+ifdef CYGWIN
+    ifeq ($(VERBOSE),1)
+        $(info CYGWIN found)
+    endif
+
+    # Set the flag to address compile time warnings
+    # with tinyxml2 and Cygwin.
+    CPPFLAGS+=-U__STRICT_ANSI__
+    
+    # Increase stack size for Cygwin builds to avoid segmentation fault in limited recursive tests.
+    CXXFLAGS+=-Wl,--stack,8388608
+endif # CYGWIN
+
+ifndef CXX
+    CXX=g++
+endif
+
+ifeq (clang++, $(findstring clang++,$(CXX)))
+    CPPCHK_GLIBCXX_DEBUG=
+endif
+ifndef CXXFLAGS
+    CXXFLAGS=-std=c++0x -O2 -DNDEBUG -Wall -Wno-sign-compare -Wno-multichar
+endif
+
+override CXXFLAGS +=-mcrt=newlib -O2 -athread=native -DNO_UNIX_SIGNAL_HANDLING -DUSE_THREADS
+
+ifeq (g++, $(findstring g++,$(CXX)))
+    override CXXFLAGS += -std=gnu++0x -pipe
+else ifeq (clang++, $(findstring clang++,$(CXX)))
+    override CXXFLAGS += -std=c++0x
+else ifeq ($(CXX), c++)
+    ifeq ($(shell uname -s), Darwin)
+        override CXXFLAGS += -std=c++0x
+    endif
+endif
+
+ifeq ($(HAVE_RULES),yes)
+    PCRE_CONFIG = $(shell which pcre-config)
+    ifeq ($(PCRE_CONFIG),)
+        $(error Did not find pcre-config)
+    endif
+    override CXXFLAGS += -DHAVE_RULES $(shell $(PCRE_CONFIG) --cflags)
+    ifdef LIBS
+        LIBS += -lpcre
+    else
+        LIBS=-lpcre
+    endif
+endif
+
+ifndef PREFIX
+    PREFIX=/usr
+endif
+
+ifndef INCLUDE_FOR_LIB
+    INCLUDE_FOR_LIB=-Ilib -isystem externals -isystem externals/picojson -isystem externals/simplecpp -isystem externals/tinyxml2
+endif
+
+ifndef INCLUDE_FOR_CLI
+    INCLUDE_FOR_CLI=-Ilib -isystem externals/simplecpp -isystem externals/tinyxml2
+endif
+
+ifndef INCLUDE_FOR_TEST
+    INCLUDE_FOR_TEST=-Ilib -Icli -isystem externals/simplecpp -isystem externals/tinyxml2
+endif
+
+BIN=$(DESTDIR)$(PREFIX)/bin
+
+# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux
+DB2MAN?=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
+XP=xsltproc -''-nonet -''-param man.charmap.use.subset "0"
+MAN_SOURCE=man/cppcheck.1.xml
+
+
+###### Object Files
+
+LIBOBJ =      $(libcppdir)/valueflow.o \
+              $(libcppdir)/tokenize.o \
+              $(libcppdir)/symboldatabase.o \
+              $(libcppdir)/addoninfo.o \
+              $(libcppdir)/analyzerinfo.o \
+              $(libcppdir)/astutils.o \
+              $(libcppdir)/check.o \
+              $(libcppdir)/check64bit.o \
+              $(libcppdir)/checkassert.o \
+              $(libcppdir)/checkautovariables.o \
+              $(libcppdir)/checkbool.o \
+              $(libcppdir)/checkboost.o \
+              $(libcppdir)/checkbufferoverrun.o \
+              $(libcppdir)/checkclass.o \
+              $(libcppdir)/checkcondition.o \
+              $(libcppdir)/checkers.o \
+              $(libcppdir)/checkersreport.o \
+              $(libcppdir)/checkexceptionsafety.o \
+              $(libcppdir)/checkfunctions.o \
+              $(libcppdir)/checkinternal.o \
+              $(libcppdir)/checkio.o \
+              $(libcppdir)/checkleakautovar.o \
+              $(libcppdir)/checkmemoryleak.o \
+              $(libcppdir)/checknullpointer.o \
+              $(libcppdir)/checkother.o \
+              $(libcppdir)/checkpostfixoperator.o \
+              $(libcppdir)/checksizeof.o \
+              $(libcppdir)/checkstl.o \
+              $(libcppdir)/checkstring.o \
+              $(libcppdir)/checktype.o \
+              $(libcppdir)/checkuninitvar.o \
+              $(libcppdir)/checkunusedfunctions.o \
+              $(libcppdir)/checkunusedvar.o \
+              $(libcppdir)/checkvaarg.o \
+              $(libcppdir)/clangimport.o \
+              $(libcppdir)/color.o \
+              $(libcppdir)/cppcheck.o \
+              $(libcppdir)/ctu.o \
+              $(libcppdir)/errorlogger.o \
+              $(libcppdir)/errortypes.o \
+              $(libcppdir)/forwardanalyzer.o \
+              $(libcppdir)/fwdanalysis.o \
+              $(libcppdir)/importproject.o \
+              $(libcppdir)/infer.o \
+              $(libcppdir)/keywords.o \
+              $(libcppdir)/library.o \
+              $(libcppdir)/mathlib.o \
+              $(libcppdir)/path.o \
+              $(libcppdir)/pathanalysis.o \
+              $(libcppdir)/pathmatch.o \
+              $(libcppdir)/platform.o \
+              $(libcppdir)/preprocessor.o \
+              $(libcppdir)/programmemory.o \
+              $(libcppdir)/reverseanalyzer.o \
+              $(libcppdir)/settings.o \
+              $(libcppdir)/summaries.o \
+              $(libcppdir)/suppressions.o \
+              $(libcppdir)/templatesimplifier.o \
+              $(libcppdir)/timer.o \
+              $(libcppdir)/token.o \
+              $(libcppdir)/tokenlist.o \
+              $(libcppdir)/utils.o \
+              $(libcppdir)/vfvalue.o
+
+EXTOBJ =      externals/simplecpp/simplecpp.o \
+              externals/tinyxml2/tinyxml2.o
+
+CLIOBJ =      cli/cmdlineparser.o \
+              cli/cppcheckexecutor.o \
+              cli/cppcheckexecutorseh.o \
+              cli/cppcheckexecutorsig.o \
+              cli/executor.o \
+              cli/filelister.o \
+              cli/main.o \
+              cli/processexecutor.o \
+              cli/singleexecutor.o \
+              cli/stacktrace.o \
+              cli/threadexecutor.o
+
+TESTOBJ =     test/fixture.o \
+              test/helpers.o \
+              test/main.o \
+              test/options.o \
+              test/test64bit.o \
+              test/testanalyzerinformation.o \
+              test/testassert.o \
+              test/testastutils.o \
+              test/testautovariables.o \
+              test/testbool.o \
+              test/testboost.o \
+              test/testbufferoverrun.o \
+              test/testcharvar.o \
+              test/testcheck.o \
+              test/testclangimport.o \
+              test/testclass.o \
+              test/testcmdlineparser.o \
+              test/testcolor.o \
+              test/testcondition.o \
+              test/testconstructors.o \
+              test/testcppcheck.o \
+              test/testerrorlogger.o \
+              test/testexceptionsafety.o \
+              test/testfilelister.o \
+              test/testfunctions.o \
+              test/testgarbage.o \
+              test/testimportproject.o \
+              test/testincompletestatement.o \
+              test/testinternal.o \
+              test/testio.o \
+              test/testleakautovar.o \
+              test/testlibrary.o \
+              test/testmathlib.o \
+              test/testmemleak.o \
+              test/testnullpointer.o \
+              test/testoptions.o \
+              test/testother.o \
+              test/testpath.o \
+              test/testpathmatch.o \
+              test/testplatform.o \
+              test/testpostfixoperator.o \
+              test/testpreprocessor.o \
+              test/testprocessexecutor.o \
+              test/testsettings.o \
+              test/testsimplifytemplate.o \
+              test/testsimplifytokens.o \
+              test/testsimplifytypedef.o \
+              test/testsimplifyusing.o \
+              test/testsingleexecutor.o \
+              test/testsizeof.o \
+              test/teststl.o \
+              test/teststring.o \
+              test/testsummaries.o \
+              test/testsuppressions.o \
+              test/testsymboldatabase.o \
+              test/testthreadexecutor.o \
+              test/testtimer.o \
+              test/testtoken.o \
+              test/testtokenize.o \
+              test/testtokenlist.o \
+              test/testtokenrange.o \
+              test/testtype.o \
+              test/testuninitvar.o \
+              test/testunusedfunctions.o \
+              test/testunusedprivfunc.o \
+              test/testunusedvar.o \
+              test/testutils.o \
+              test/testvaarg.o \
+              test/testvalueflow.o \
+              test/testvarid.o
+
+.PHONY: run-dmake tags
+
+
+###### Targets
+
+cppcheck: $(EXTOBJ) $(LIBOBJ) $(CLIOBJ)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)
+
+all:	cppcheck testrunner
+
+testrunner: $(EXTOBJ) $(TESTOBJ) $(LIBOBJ) cli/executor.o cli/processexecutor.o cli/singleexecutor.o cli/threadexecutor.o cli/cmdlineparser.o cli/cppcheckexecutor.o cli/cppcheckexecutorseh.o cli/cppcheckexecutorsig.o cli/stacktrace.o cli/filelister.o
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)
+
+test:	all
+	./testrunner
+
+check:	all
+	./testrunner -q
+
+checkcfg:	cppcheck validateCFG
+	./test/cfg/runtests.sh
+
+dmake:	tools/dmake.o cli/filelister.o $(libcppdir)/pathmatch.o $(libcppdir)/path.o $(libcppdir)/utils.o externals/simplecpp/simplecpp.o
+	$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
+
+run-dmake: dmake
+	./dmake --release
+
+clean:
+	rm -f build/*.cpp build/*.o lib/*.o cli/*.o test/*.o tools/*.o externals/*/*.o testrunner dmake cppcheck cppcheck.exe cppcheck.1
+
+man:	man/cppcheck.1
+
+man/cppcheck.1:	$(MAN_SOURCE)
+
+	$(XP) $(DB2MAN) $(MAN_SOURCE)
+
+tags:
+	ctags -R --exclude=doxyoutput --exclude=test/cfg cli externals gui lib test
+
+install: cppcheck
+	install -d ${BIN}
+	install cppcheck ${BIN}
+	install htmlreport/cppcheck-htmlreport ${BIN}
+ifdef FILESDIR
+	install -d ${DESTDIR}${FILESDIR}
+	install -d ${DESTDIR}${FILESDIR}/addons
+	install -m 644 addons/*.py ${DESTDIR}${FILESDIR}/addons
+	install -d ${DESTDIR}${FILESDIR}/cfg
+	install -m 644 cfg/*.cfg ${DESTDIR}${FILESDIR}/cfg
+	install -d ${DESTDIR}${FILESDIR}/platforms
+	install -m 644 platforms/*.xml ${DESTDIR}${FILESDIR}/platforms
+else
+	$(error FILESDIR must be set!)
+endif
+
+uninstall:
+	@if test -d ${BIN}; then \
+	  files="cppcheck cppcheck-htmlreport"; \
+	  echo '(' cd ${BIN} '&&' rm -f $$files ')'; \
+	  ( cd ${BIN} && rm -f $$files ); \
+	fi
+ifdef FILESDIR 
+	@if test -d ${DESTDIR}${FILESDIR}; then \
+	  echo rm -rf ${DESTDIR}${FILESDIR}; \
+	  rm -rf ${DESTDIR}${FILESDIR}; \
+	fi
+endif
+ifdef CFGDIR 
+	@if test -d ${DESTDIR}${CFGDIR}; then \
+	  files="`cd cfg 2>/dev/null && ls`"; \
+	  if test -n "$$files"; then \
+	    echo '(' cd ${DESTDIR}${CFGDIR} '&&' rm -f $$files ')'; \
+	    ( cd ${DESTDIR}${CFGDIR} && rm -f $$files ); \
+	  fi; \
+	fi
+endif
+
+# Validation of library files:
+ConfigFiles := $(wildcard cfg/*.cfg)
+ConfigFilesCHECKED := $(patsubst %.cfg,%.checked,$(ConfigFiles))
+.PHONY: validateCFG
+%.checked:%.cfg
+	xmllint --noout --relaxng cfg/cppcheck-cfg.rng $<
+validateCFG: ${ConfigFilesCHECKED}
+	xmllint --noout cfg/cppcheck-cfg.rng
+
+# Validation of platforms files:
+PlatformFiles := $(wildcard platforms/*.xml)
+PlatformFilesCHECKED := $(patsubst %.xml,%.checked,$(PlatformFiles))
+.PHONY: validatePlatforms
+%.checked:%.xml
+	xmllint --noout --relaxng platforms/cppcheck-platforms.rng $<
+validatePlatforms: ${PlatformFilesCHECKED}
+	xmllint --noout platforms/cppcheck-platforms.rng
+
+# Validate XML output (to detect regressions)
+/tmp/errorlist.xml: cppcheck
+	./cppcheck --errorlist >$@
+/tmp/example.xml: cppcheck
+	./cppcheck --xml --enable=all --inconclusive --max-configs=1 samples 2>/tmp/example.xml
+createXMLExamples:/tmp/errorlist.xml /tmp/example.xml
+.PHONY: validateXML
+validateXML: createXMLExamples
+	xmllint --noout cppcheck-errors.rng
+	xmllint --noout --relaxng cppcheck-errors.rng /tmp/errorlist.xml
+	xmllint --noout --relaxng cppcheck-errors.rng /tmp/example.xml
+
+checkCWEEntries: /tmp/errorlist.xml
+	$(eval PYTHON_INTERPRETER := $(if $(PYTHON_INTERPRETER),$(PYTHON_INTERPRETER),$(shell which python3)))
+	$(eval PYTHON_INTERPRETER := $(if $(PYTHON_INTERPRETER),$(PYTHON_INTERPRETER),$(shell which python)))
+	$(eval PYTHON_INTERPRETER := $(if $(PYTHON_INTERPRETER),$(PYTHON_INTERPRETER),$(error Did not find a Python interpreter)))
+	$(PYTHON_INTERPRETER) tools/listErrorsWithoutCWE.py -F /tmp/errorlist.xml
+.PHONY: validateRules
+validateRules:
+	xmllint --noout rules/*.xml
+
+###### Build
+
+$(libcppdir)/valueflow.o: lib/valueflow.cpp lib/addoninfo.h lib/analyzer.h lib/astutils.h lib/calculate.h lib/check.h lib/checkuninitvar.h lib/color.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/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/valueptr.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/check.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/sourcelocation.h lib/standards.h lib/summaries.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/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/color.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/suppressions.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/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/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.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)/analyzerinfo.cpp
+
+$(libcppdir)/astutils.o: lib/astutils.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkclass.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/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.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)/astutils.cpp
+
+$(libcppdir)/check.o: lib/check.cpp lib/addoninfo.h lib/check.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/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/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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/check.h lib/checkassert.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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/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/suppressions.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/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/suppressions.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)/checkboost.o: lib/checkboost.cpp lib/check.h lib/checkboost.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.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)/checkboost.cpp
+
+$(libcppdir)/checkbufferoverrun.o: lib/checkbufferoverrun.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/astutils.h lib/check.h lib/checkbufferoverrun.h lib/color.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/suppressions.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
+	$(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/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/suppressions.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/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/suppressions.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
+	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkers.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/suppressions.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/check.h lib/checkexceptionsafety.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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/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/suppressions.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/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/suppressions.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/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/suppressions.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/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/suppressions.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/checkmemoryleak.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/suppressions.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/checknullpointer.h lib/color.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/suppressions.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/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/suppressions.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/checkpostfixoperator.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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/checksizeof.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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/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/suppressions.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/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/suppressions.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/check.h lib/checktype.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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/checknullpointer.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/platform.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/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/check.h lib/checkunusedfunctions.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/suppressions.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 externals/simplecpp/simplecpp.h lib/addoninfo.h lib/astutils.h lib/check.h lib/checkunusedvar.h lib/config.h lib/errortypes.h lib/fwdanalysis.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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/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/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/suppressions.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/clangimport.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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/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/settings.h lib/standards.h lib/suppressions.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
+	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/cppcheck.cpp
+
+$(libcppdir)/ctu.o: lib/ctu.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/astutils.h lib/check.h lib/color.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/suppressions.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/analyzerinfo.h lib/check.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/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
+	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/errortypes.cpp
+
+$(libcppdir)/forwardanalyzer.o: lib/forwardanalyzer.cpp lib/addoninfo.h lib/analyzer.h lib/astutils.h lib/config.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/suppressions.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)/forwardanalyzer.cpp
+
+$(libcppdir)/fwdanalysis.o: lib/fwdanalysis.cpp lib/astutils.h lib/config.h lib/errortypes.h lib/fwdanalysis.h lib/library.h lib/mathlib.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/config.h lib/errortypes.h lib/filesettings.h lib/importproject.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.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
+	$(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/valueptr.h lib/vfvalue.h
+	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/infer.cpp
+
+$(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/valueflow.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/utils.h
+	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/mathlib.cpp
+
+$(libcppdir)/path.o: lib/path.cpp externals/simplecpp/simplecpp.h lib/config.h lib/path.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
+	$(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/utils.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/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/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/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/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/suppressions.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)/programmemory.cpp
+
+$(libcppdir)/reverseanalyzer.o: lib/reverseanalyzer.cpp lib/addoninfo.h lib/analyzer.h lib/astutils.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/suppressions.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)/settings.o: lib/settings.cpp externals/picojson/picojson.h lib/addoninfo.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
+	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/settings.cpp
+
+$(libcppdir)/summaries.o: lib/summaries.cpp lib/addoninfo.h lib/analyzerinfo.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/summaries.h lib/suppressions.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/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/mathlib.h lib/path.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
+	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/suppressions.cpp
+
+$(libcppdir)/templatesimplifier.o: lib/templatesimplifier.cpp lib/addoninfo.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/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 lib/utils.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/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/suppressions.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/color.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/suppressions.h lib/symboldatabase.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)/vfvalue.o: lib/vfvalue.cpp lib/config.h lib/errortypes.h lib/mathlib.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
+	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vfvalue.cpp
+
+cli/cmdlineparser.o: cli/cmdlineparser.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/cppcheckexecutor.h cli/filelister.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/analyzerinfo.h lib/check.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/settings.h lib/standards.h lib/suppressions.h lib/timer.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/cppcheckexecutorseh.h cli/cppcheckexecutorsig.h cli/executor.h cli/processexecutor.h cli/singleexecutor.h cli/threadexecutor.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/checkersreport.h lib/checkunusedfunctions.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/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
+	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/cppcheckexecutor.cpp
+
+cli/cppcheckexecutorseh.o: cli/cppcheckexecutorseh.cpp cli/cppcheckexecutor.h cli/cppcheckexecutorseh.h lib/config.h lib/filesettings.h lib/platform.h lib/standards.h lib/utils.h
+	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/cppcheckexecutorseh.cpp
+
+cli/cppcheckexecutorsig.o: cli/cppcheckexecutorsig.cpp cli/cppcheckexecutor.h cli/cppcheckexecutorsig.h cli/stacktrace.h lib/config.h lib/filesettings.h lib/platform.h lib/standards.h lib/utils.h
+	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/cppcheckexecutorsig.cpp
+
+cli/executor.o: cli/executor.cpp cli/executor.h lib/addoninfo.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
+	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/executor.cpp
+
+cli/filelister.o: cli/filelister.cpp cli/filelister.h lib/config.h lib/path.h lib/pathmatch.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/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/analyzerinfo.h lib/check.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/platform.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/singleexecutor.o: cli/singleexecutor.cpp cli/executor.h cli/singleexecutor.h lib/addoninfo.h lib/analyzerinfo.h lib/check.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/platform.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/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/analyzerinfo.h lib/check.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/platform.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/threadexecutor.cpp
+
+test/fixture.o: test/fixture.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/cppcheck.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 lib/xml.h test/fixture.h test/options.h test/redirect.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/fixture.cpp
+
+test/helpers.o: test/helpers.cpp cli/filelister.h externals/simplecpp/simplecpp.h lib/addoninfo.h lib/config.h lib/errortypes.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/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/helpers.h
+	$(CXX) ${INCLUDE_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/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/suppressions.h lib/utils.h test/fixture.h test/options.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/main.cpp
+
+test/options.o: test/options.cpp test/options.h
+	$(CXX) ${INCLUDE_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/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/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/test64bit.cpp
+
+test/testanalyzerinformation.o: test/testanalyzerinformation.cpp lib/addoninfo.h lib/analyzerinfo.h lib/check.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 test/fixture.h
+	$(CXX) ${INCLUDE_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/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/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_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/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/suppressions.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} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testastutils.cpp
+
+test/testautovariables.o: test/testautovariables.cpp lib/addoninfo.h lib/check.h lib/checkautovariables.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/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_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/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/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testbool.cpp
+
+test/testboost.o: test/testboost.cpp lib/addoninfo.h lib/check.h lib/checkboost.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/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testboost.cpp
+
+test/testbufferoverrun.o: test/testbufferoverrun.cpp lib/addoninfo.h lib/check.h lib/checkbufferoverrun.h lib/color.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/sourcelocation.h lib/standards.h lib/suppressions.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} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testbufferoverrun.cpp
+
+test/testcharvar.o: test/testcharvar.cpp lib/addoninfo.h lib/check.h lib/checkother.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/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcharvar.cpp
+
+test/testcheck.o: test/testcheck.cpp lib/addoninfo.h lib/check.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 test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcheck.cpp
+
+test/testclangimport.o: test/testclangimport.cpp lib/addoninfo.h lib/check.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/sourcelocation.h lib/standards.h lib/suppressions.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} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testclangimport.cpp
+
+test/testclass.o: test/testclass.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkclass.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/sourcelocation.h lib/standards.h lib/suppressions.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} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testclass.cpp
+
+test/testcmdlineparser.o: test/testcmdlineparser.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/cppcheckexecutor.h lib/addoninfo.h lib/check.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
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcmdlineparser.cpp
+
+test/testcolor.o: test/testcolor.cpp lib/addoninfo.h lib/check.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 test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcolor.cpp
+
+test/testcondition.o: test/testcondition.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkcondition.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/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_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/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testconstructors.cpp
+
+test/testcppcheck.o: test/testcppcheck.cpp lib/addoninfo.h lib/analyzerinfo.h lib/check.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/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
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcppcheck.cpp
+
+test/testerrorlogger.o: test/testerrorlogger.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/cppcheck.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 lib/xml.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testerrorlogger.cpp
+
+test/testexceptionsafety.o: test/testexceptionsafety.cpp lib/addoninfo.h lib/check.h lib/checkexceptionsafety.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/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testexceptionsafety.cpp
+
+test/testfilelister.o: test/testfilelister.cpp cli/filelister.h lib/addoninfo.h lib/check.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/suppressions.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testfilelister.cpp
+
+test/testfunctions.o: test/testfunctions.cpp lib/addoninfo.h lib/check.h lib/checkfunctions.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/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testfunctions.cpp
+
+test/testgarbage.o: test/testgarbage.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.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/suppressions.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} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testgarbage.cpp
+
+test/testimportproject.o: test/testimportproject.cpp lib/addoninfo.h lib/check.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/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h test/redirect.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testimportproject.cpp
+
+test/testincompletestatement.o: test/testincompletestatement.cpp lib/addoninfo.h lib/check.h lib/checkother.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/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testincompletestatement.cpp
+
+test/testinternal.o: test/testinternal.cpp lib/addoninfo.h lib/check.h lib/checkinternal.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/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testinternal.cpp
+
+test/testio.o: test/testio.cpp lib/addoninfo.h lib/check.h lib/checkio.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/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testio.cpp
+
+test/testleakautovar.o: test/testleakautovar.cpp lib/addoninfo.h lib/check.h lib/checkleakautovar.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/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testleakautovar.cpp
+
+test/testlibrary.o: test/testlibrary.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.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/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testlibrary.cpp
+
+test/testmathlib.o: test/testmathlib.cpp lib/addoninfo.h lib/check.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 test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testmathlib.cpp
+
+test/testmemleak.o: test/testmemleak.cpp lib/addoninfo.h lib/check.h lib/checkmemoryleak.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/sourcelocation.h lib/standards.h lib/suppressions.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} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testmemleak.cpp
+
+test/testnullpointer.o: test/testnullpointer.cpp lib/addoninfo.h lib/check.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/platform.h lib/settings.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 test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testnullpointer.cpp
+
+test/testoptions.o: test/testoptions.cpp lib/addoninfo.h lib/check.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 test/fixture.h test/options.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testoptions.cpp
+
+test/testother.o: test/testother.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkother.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/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testother.cpp
+
+test/testpath.o: test/testpath.cpp lib/addoninfo.h lib/check.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
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testpath.cpp
+
+test/testpathmatch.o: test/testpathmatch.cpp lib/addoninfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/pathmatch.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_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/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 lib/xml.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testplatform.cpp
+
+test/testpostfixoperator.o: test/testpostfixoperator.cpp lib/addoninfo.h lib/check.h lib/checkpostfixoperator.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/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_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/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
+	$(CXX) ${INCLUDE_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/analyzerinfo.h lib/check.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/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
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testprocessexecutor.cpp
+
+test/testsettings.o: test/testsettings.cpp lib/addoninfo.h lib/check.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/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsettings.cpp
+
+test/testsimplifytemplate.o: test/testsimplifytemplate.cpp lib/addoninfo.h lib/check.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/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifytemplate.cpp
+
+test/testsimplifytokens.o: test/testsimplifytokens.cpp lib/addoninfo.h lib/check.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/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifytokens.cpp
+
+test/testsimplifytypedef.o: test/testsimplifytypedef.cpp lib/addoninfo.h lib/check.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/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} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifytypedef.cpp
+
+test/testsimplifyusing.o: test/testsimplifyusing.cpp lib/addoninfo.h lib/check.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/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} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifyusing.cpp
+
+test/testsingleexecutor.o: test/testsingleexecutor.cpp cli/executor.h cli/singleexecutor.h lib/addoninfo.h lib/analyzerinfo.h lib/check.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/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
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsingleexecutor.cpp
+
+test/testsizeof.o: test/testsizeof.cpp lib/addoninfo.h lib/check.h lib/checksizeof.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/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsizeof.cpp
+
+test/teststl.o: test/teststl.cpp lib/addoninfo.h lib/check.h lib/checkstl.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/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/teststl.cpp
+
+test/teststring.o: test/teststring.cpp lib/addoninfo.h lib/check.h lib/checkstring.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/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/teststring.cpp
+
+test/testsummaries.o: test/testsummaries.cpp lib/addoninfo.h lib/check.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/summaries.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_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/analyzerinfo.h lib/check.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/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
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsuppressions.cpp
+
+test/testsymboldatabase.o: test/testsymboldatabase.cpp lib/addoninfo.h lib/check.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/sourcelocation.h lib/standards.h lib/suppressions.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} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsymboldatabase.cpp
+
+test/testthreadexecutor.o: test/testthreadexecutor.cpp cli/executor.h cli/threadexecutor.h lib/addoninfo.h lib/analyzerinfo.h lib/check.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/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
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testthreadexecutor.cpp
+
+test/testtimer.o: test/testtimer.cpp lib/addoninfo.h lib/check.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/timer.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtimer.cpp
+
+test/testtoken.o: test/testtoken.cpp lib/addoninfo.h lib/check.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/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} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtoken.cpp
+
+test/testtokenize.o: test/testtokenize.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.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/suppressions.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} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtokenize.cpp
+
+test/testtokenlist.o: test/testtokenlist.cpp lib/addoninfo.h lib/check.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/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtokenlist.cpp
+
+test/testtokenrange.o: test/testtokenrange.cpp lib/addoninfo.h lib/check.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/sourcelocation.h lib/standards.h lib/suppressions.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
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtokenrange.cpp
+
+test/testtype.o: test/testtype.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checktype.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/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtype.cpp
+
+test/testuninitvar.o: test/testuninitvar.cpp lib/addoninfo.h lib/check.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/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testuninitvar.cpp
+
+test/testunusedfunctions.o: test/testunusedfunctions.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkunusedfunctions.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/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_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/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testunusedprivfunc.cpp
+
+test/testunusedvar.o: test/testunusedvar.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkunusedvar.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/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testunusedvar.cpp
+
+test/testutils.o: test/testutils.cpp lib/addoninfo.h lib/check.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 test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testutils.cpp
+
+test/testvaarg.o: test/testvaarg.cpp lib/addoninfo.h lib/check.h lib/checkvaarg.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/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testvaarg.cpp
+
+test/testvalueflow.o: test/testvalueflow.cpp lib/addoninfo.h lib/check.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/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} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testvalueflow.cpp
+
+test/testvarid.o: test/testvarid.cpp lib/addoninfo.h lib/check.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/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} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testvarid.cpp
+
+externals/simplecpp/simplecpp.o: externals/simplecpp/simplecpp.cpp externals/simplecpp/simplecpp.h
+	$(CXX)  $(CPPFLAGS) $(CXXFLAGS) -w -c -o $@ externals/simplecpp/simplecpp.cpp
+
+externals/tinyxml2/tinyxml2.o: externals/tinyxml2/tinyxml2.cpp externals/tinyxml2/tinyxml2.h
+	$(CXX)  $(CPPFLAGS) $(CXXFLAGS) -w -c -o $@ externals/tinyxml2/tinyxml2.cpp
+
+tools/dmake.o: tools/dmake.cpp cli/filelister.h lib/config.h lib/pathmatch.h lib/utils.h
+	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ tools/dmake.cpp
+
+
+
+release: cppcheck
+	mkdir -p release/cppcheck
+	cp -r release_files/* release/cppcheck/
+	cp -r cfg release/cppcheck/
+	cp -r addons release/cppcheck/
+	cp -r platforms release/cppcheck/
+	cp cppcheck release/cppcheck/cppcheck
+	strip release/cppcheck/cppcheck
+	cp COPYING release/cppcheck/
+	cp AUTHORS release/cppcheck/
+	cp README-Amiga.md release/cppcheck/
+	lha -aeqr3 a cppcheck.lha release/
+	rm -rf release

README-Amiga.md

@@ -0,0 +1,37 @@
+# cppcheck
+
+This is the port of cppcheck 2.8 to AmigaOS 4. 
+
+Cppcheck is a static 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 have very few false positives. 
+Cppcheck is designed to be able to analyze your C/C++ code even if it has 
+non-standard syntax (common in embedded projects).
+
+### Installation
+
+Extract the archive wherever you want and start using it. You might want
+to add its folder at your system PATH, so that it can be accessed by
+anywhere. Make sure that all the files that are contained in this archive 
+are available where you have the executable.
+
+The simplest way to use it is by running it in a shell like
+
+```bash
+cppcheck Work:program/src
+```
+
+Please, read the manual on different ways to use it. There are many 
+different options to make it work better and faster for you.
+
+### Support
+
+If you like what I am doing and my ports and you would like to support me, 
+and my future releases please visit https://ko-fi.com/walkero where you 
+can find all the latest updates by me and you can donate.
+
+### Changelog
+
+2.8r1 (2022-09-22)
+* First public release
+

addons/README.md

@@ -33,10 +33,8 @@ Addons are scripts that analyses Cppcheck dump files to check compatibility with
   Helper class for reading Cppcheck dump files within an addon.
 - misra_9.py
   Implementation of the MISRA 9.x rules used by `misra` addon. 
-- namingng.config.json
+- naming.json
   Example configuration for `namingng` addon. 
-- namingng.json
-  Example JSON file that can be used using --addon=namingng.json, referring to namingng.py and namingng.config.json
 - ROS_naming.json
   Example configuration for the `namingng` addon enforcing the [ROS naming convention for C++ ](http://wiki.ros.org/CppStyleGuide#Files).
 - runaddon.py

addons/ROS_naming.json

@@ -1,5 +1,5 @@
 {
-    "RE_FILE": [".*[A-Z]"],
+    "RE_FILE": {".*[A-Z]": [true, "under_scored"]},
     "RE_NAMESPACE": {".*[A-Z]": [true, "under_scored"],
     				 ".*\\_$": [true, "under_scored"]},
     "RE_FUNCTIONNAME": {".*\\_": [true, "camelCase"],

addons/cppcheckdata.py

@@ -1619,11 +1619,11 @@ def is_suppressed(location, message, errorId):
             return True
     return False
 
-def reportError(location, severity, message, addon, errorId, extra='', columnOverride=None):
+def reportError(location, severity, message, addon, errorId, extra=''):
     if '--cli' in sys.argv:
         msg = { 'file': location.file,
                 'linenr': location.linenr,
-                'column': location.column if columnOverride is None else columnOverride,
+                'column': location.column,
                 'severity': severity,
                 'message': message,
                 'addon': addon,

addons/misra_9.py

@@ -311,7 +311,8 @@ class InitializerParser:
                 if self.ed and self.ed.isValue:
                     if not isDesignated and len(self.rootStack) > 0 and self.rootStack[-1][1] == self.root:
                         self.rootStack[-1][0].markStuctureViolation(self.token)
-                    if isFirstElement and self.token.isInt and self.token.getKnownIntValue() == 0 and self.token.next.str == '}':
+
+                    if isFirstElement and self.token.str == '0' and self.token.next.str == '}':
                         # Zero initializer causes recursive initialization
                         self.root.initializeChildren()
                     elif self.token.isString and self.ed.valueType and self.ed.valueType.pointer > 0:

addons/naming.json

@@ -2,15 +2,6 @@
     "RE_VARNAME": ["[a-z]*[a-zA-Z0-9_]*\\Z"],
     "RE_PRIVATE_MEMBER_VARIABLE": null,
     "RE_FUNCTIONNAME": ["[a-z0-9A-Z]*\\Z"],
-    "include_guard": {
-        "input": "path",
-        "prefix": "",
-        "suffix": "",
-        "case": "upper",
-        "max_linenr": 5,
-        "RE_HEADERFILE": "[^/].*\\.h\\Z",
-        "required": true
-    },
     "var_prefixes": {"uint32_t": "ui32",
                      "int*": "intp"},
     "function_prefixes": {"uint16_t": "ui16",

addons/namingng.json

@@ -1,6 +0,0 @@
-{
-    "script":"namingng.py",
-    "args":[
-        "--configfile=namingng.config.json"
-    ]
-}

addons/namingng.py

@@ -3,7 +3,6 @@
 # cppcheck addon for naming conventions
 # An enhanced version. Configuration is taken from a json file
 # It supports to check for type-based prefixes in function or variable names.
-# Aside from include guard naming, include guard presence can also be tested.
 #
 # Example usage (variable name must start with lowercase, function name must start with uppercase):
 # $ cppcheck --dump path-to-src/
@@ -12,18 +11,9 @@
 # JSON format:
 #
 # {
-#    "RE_VARNAME": ["[a-z]*[a-zA-Z0-9_]*\\Z"],
+#    "RE_VARNAME": "[a-z]*[a-zA-Z0-9_]*\\Z",
 #    "RE_PRIVATE_MEMBER_VARIABLE": null,
-#    "RE_FUNCTIONNAME": ["[a-z0-9A-Z]*\\Z"],
+#    "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"}
@@ -34,386 +24,230 @@
 
 import cppcheckdata
 import sys
-import os
 import re
 import argparse
 import json
 
+
 # Auxiliary class
 class DataStruct:
-    def __init__(self, file, linenr, string, column=0):
+    def __init__(self, file, linenr, string):
         self.file = file
         self.linenr = linenr
         self.str = string
-        self.column = column
 
-def reportNamingError(location,message,errorId='namingConvention',severity='style',extra='',column=None):
-    cppcheckdata.reportError(location,severity,message,'namingng',errorId,extra,columnOverride=column)
 
-def configError(error,fatal=True):
+def reportError(filename, linenr, severity, msg):
-    print('config error: %s'%error)
+    message = "[{filename}:{linenr}] ( {severity} ) naming.py: {msg}\n".format(
-    if fatal:
+        filename=filename,
-        sys.exit(1)
+        linenr=linenr,
+        severity=severity,
+        msg=msg
+    )
+    sys.stderr.write(message)
+    return message
 
-def validateConfigREs(list_or_dict,json_key):
-    have_error = False
-    for item in list_or_dict:
-        try:
-            re.compile(item)
-        except re.error as err:
-            configError("item '%s' of '%s' is not a valid regular expression: %s"%(item,json_key,err),fatal=False)
-            have_error = True
-            continue
-        if not isinstance(list_or_dict,dict):
-            continue
-        # item is actually a dict key; check value
-        value = list_or_dict[item]
-        if (not isinstance(value,list) or len(value) != 2
-                or not isinstance(value[0],bool) or not isinstance(value[1],str)):
-            configError("item '%s' of '%s' must be an array [bool,string]"%(item,json_key),fatal=False)
-            have_error = True
-
-    return have_error
 
 def loadConfig(configfile):
-    if not os.path.exists(configfile):
+    with open(configfile) as fh:
-        configError("cannot find config file '%s'"%configfile)
+        data = json.load(fh)
-
+    return data
-    try:
-        with open(configfile) as fh:
-            data = json.load(fh)
-    except json.JSONDecodeError as e:
-        configError("error parsing config file as JSON at line %d: %s"%(e.lineno,e.msg))
-    except Exception as e:
-        configError("error opening config file '%s': %s"%(configfile,e))
-
-    if not isinstance(data, dict):
-        configError('config file must contain a JSON object at the top level')
-
-    # All errors are emitted before bailing out, to make the unit test more
-    # effective.
-    have_error = False
-
-    # Put config items in a class, so that settings can be accessed using
-    # config.feature
-    class Config:
-        pass
-    config = Config()
-
-    mapping = {
-        'file':                     ('RE_FILE', (list,)),
-        'namespace':                ('RE_NAMESPACE', (list,dict)),
-        'include_guard':            ('include_guard', (dict,)),
-        'variable':                 ('RE_VARNAME', (list,dict)),
-        'variable_prefixes':        ('var_prefixes', (dict,), {}),
-        'private_member':           ('RE_PRIVATE_MEMBER_VARIABLE', (list,dict)),
-        'public_member':            ('RE_PUBLIC_MEMBER_VARIABLE', (list,dict)),
-        'global_variable':          ('RE_GLOBAL_VARNAME', (list,dict)),
-        'function_name':            ('RE_FUNCTIONNAME', (list,dict)),
-        'function_prefixes':        ('function_prefixes', (dict,), {}),
-        'class_name':               ('RE_CLASS_NAME', (list,dict)),
-        'skip_one_char_variables':  ('skip_one_char_variables', (bool,)),
-    }
-
-    # parse defined keys and store as members of config object
-    for key,opts in mapping.items():
-        json_key = opts[0]
-        req_type = opts[1]
-        default = None if len(opts)<3 else opts[2]
-
-        value = data.pop(json_key,default)
-        if value is not None and type(value) not in req_type:
-            req_typename = ' or '.join([tp.__name__ for tp in req_type])
-            got_typename = type(value).__name__
-            configError('%s must be %s (not %s), or not set'%(json_key,req_typename,got_typename),fatal=False)
-            have_error = True
-            continue
-
-        # type list implies that this is either a list of REs or a dict with RE keys
-        if list in req_type and value is not None:
-            re_error = validateConfigREs(value,json_key)
-            if re_error:
-                have_error = True
-
-        setattr(config,key,value)
-
-    # check remaining keys, only accept underscore-prefixed comments
-    for key,value in data.items():
-        if key == '' or key[0] != '_':
-            configError("unknown config key '%s'"%key,fatal=False)
-            have_error = True
-
-    if have_error:
-        sys.exit(1)
-
-    return config
 
 
-def evalExpr(conf, exp, mockToken, msgType):
+def checkTrueRegex(data, expr, msg, errors):
-    report_as_error = False
+    res = re.match(expr, data.str)
-    msg = msgType + ' ' + mockToken.str + ' violates naming convention'
+    if res:
+        errors.append(reportError(data.file, data.linenr, 'style', msg))
 
+
+def checkFalseRegex(data, expr, msg, errors):
+    res = re.match(expr, data.str)
+    if not res:
+        errors.append(reportError(data.file, data.linenr, 'style', msg))
+
+
+def evalExpr(conf, exp, mockToken, msgType, errors):
     if isinstance(conf, dict):
-        report_as_error = conf[exp][0]
+        if conf[exp][0]:
-        msg += ': ' + conf[exp][1]
+            msg = msgType + ' ' + mockToken.str + ' violates naming convention : ' + conf[exp][1]
-
+            checkTrueRegex(mockToken, exp, msg, errors)
-    res = re.match(exp,mockToken.str)
+        elif ~conf[exp][0]:
-    if bool(res) == report_as_error:
+            msg = msgType + ' ' + mockToken.str + ' violates naming convention : ' + conf[exp][1]
-        reportNamingError(mockToken,msg)
+            checkFalseRegex(mockToken, exp, msg, errors)
-
+        else:
-def check_include_guard_name(conf,directive):
+            msg = msgType + ' ' + mockToken.str + ' violates naming convention : ' + conf[exp][0]
-    parts = directive.str.split()
+            checkFalseRegex(mockToken, exp, msg, errors)
-    if len(parts) != 2:
-        msg = 'syntax error'
-        reportNamingError(directive,msg,'syntax')
-        return None,None
-    guard_name = parts[1]
-    guard_column = 1+directive.str.find(guard_name)
-
-    filename = directive.file
-    if conf.include_guard.get('input','path') == 'basename':
-        filename = os.path.basename(filename)
-    use_case = conf.include_guard.get('case','upper')
-    if use_case == 'upper':
-        filename = filename.upper()
-    elif use_case == 'lower':
-        filename = filename.lower()
-    elif use_case == 'keep':
-        pass # keep filename case as-is
     else:
-        print("invalid config value for 'case': '%s'"%use_case,file=sys.stderr)
+        msg = msgType + ' ' + mockToken.str + ' violates naming convention'
-        sys.exit(1)
+        checkFalseRegex(mockToken, exp, msg, errors)
 
-    barename = re.sub('[^A-Za-z0-9]','_',filename).strip('_')
-    expect_guard_name = conf.include_guard.get('prefix','') + barename + conf.include_guard.get('suffix','')
-    if expect_guard_name != guard_name:
-        msg = 'include guard naming violation; %s != %s'%(guard_name,expect_guard_name)
-        reportNamingError(directive,msg,'includeGuardName',column=guard_column)
 
-    return guard_name,guard_column
+def process(dumpfiles, configfile, debugprint=False):
 
-def check_include_guards(conf,cfg,unguarded_include_files):
+    errors = []
-    # Scan for '#ifndef FILE_H' as the first directive, in the first N lines.
-    # Then test whether the next directive #defines the found name.
-    # Various tests are done:
-    # - check include guards for their naming and consistency
-    # - test whether include guards are in place
-    max_linenr = conf.include_guard.get('max_linenr', 5)
 
-    def report(directive,msg,errorId,column=0):
-        reportNamingError(directive,msg,errorId,column=column)
-
-    def report_pending_ifndef(directive,column):
-        report(directive,'include guard #ifndef is not followed by #define','includeGuardIncomplete',column=column)
-
-    last_fn = None
-    pending_ifndef = None
-    phase = 0
-    for directive in cfg.directives:
-        if last_fn != directive.file:
-            if pending_ifndef:
-                report_pending_ifndef(pending_ifndef,guard_column)
-                pending_ifndef = None
-            last_fn = directive.file
-            phase = 0
-        if phase == -1:
-            # ignore (the remainder of) this file
-            continue
-        if not re.match(include_guard_header_re,directive.file):
-            phase = -1
-            continue
-
-        if directive.linenr > max_linenr:
-            if phase == 0 and conf.include_guard.get('required',1):
-                report(directive,'include guard not found before line %d'%max_linenr,'includeGuardMissing')
-            phase = -1
-            continue
-
-        if phase == 0:
-            # looking for '#ifndef FILE_H'
-            if not directive.str.startswith('#ifndef'):
-                if conf.include_guard.get('required',1):
-                    report(directive,'first preprocessor directive should be include guard #ifndef','includeGuardMissing')
-                phase = -1
-                continue
-            guard_name,guard_column = check_include_guard_name(conf,directive)
-            if guard_name == None:
-                phase = -1
-                continue
-            pending_ifndef = directive
-            phase = 1
-        elif phase == 1:
-            pending_ifndef = None
-            # looking for '#define FILE_H'
-            if not directive.str.startswith('#define'):
-                report(directive,'second preprocessor directive should be include guard #define','includeGuardIncomplete')
-                phase = -1
-                continue
-            parts = directive.str.split()
-            if len(parts) == 1:
-                report(directive,'syntax error','syntax')
-                phase = -1
-                continue
-            if guard_name != parts[1]:
-                report(directive,'include guard does not guard; %s != %s'%(guard_name,parts[1]),'includeGuardAwayFromDuty',severity='warning',column=guard_column)
-
-            unguarded_include_files.remove(directive.file)
-
-            phase = -1
-    if pending_ifndef:
-        report_pending_ifndef(pending_ifndef,guard_column)
-
-def process(dumpfiles, configfile):
     conf = loadConfig(configfile)
 
-    if conf.include_guard:
-        global include_guard_header_re
-        include_guard_header_re = conf.include_guard.get('RE_HEADERFILE',"[^/].*\\.h\\Z")
-
     for afile in dumpfiles:
         if not afile[-5:] == '.dump':
             continue
-        if not args.cli:
+        print('Checking ' + afile + '...')
-            print('Checking ' + afile + '...')
         data = cppcheckdata.CppcheckData(afile)
-        process_data(conf,data)
 
-def check_file_naming(conf,data):
+        # Check File naming
-    for source_file in data.files:
+        if "RE_FILE" in conf and conf["RE_FILE"]:
-        basename = os.path.basename(source_file)
+            mockToken = DataStruct(afile[:-5], "0", afile[afile.rfind('/') + 1:-5])
-        good = False
+            msgType = 'File name'
-        for exp in conf.file:
+            for exp in conf["RE_FILE"]:
-            good |= bool(re.match(exp, source_file))
+                evalExpr(conf["RE_FILE"], exp, mockToken, msgType, errors)
-            good |= bool(re.match(exp, basename))
-        if not good:
-            mockToken = DataStruct(source_file, 0, basename)
-            reportNamingError(mockToken, 'File name ' + basename + ' violates naming convention')
 
-def check_namespace_naming(conf,data):
+        # Check Namespace naming
-    for tk in data.rawTokens:
+        if "RE_NAMESPACE" in conf and conf["RE_NAMESPACE"]:
-        if tk.str != 'namespace':
+            for tk in data.rawTokens:
-            continue
+                if tk.str == 'namespace':
-        mockToken = DataStruct(tk.next.file, tk.next.linenr, tk.next.str, tk.next.column)
+                    mockToken = DataStruct(tk.next.file, tk.next.linenr, tk.next.str)
-        for exp in conf.namespace:
+                    msgType = 'Namespace'
-            evalExpr(conf.namespace, exp, mockToken, 'Namespace')
+                    for exp in conf["RE_NAMESPACE"]:
+                        evalExpr(conf["RE_NAMESPACE"], exp, mockToken, msgType, errors)
 
-def check_variable_naming(conf,cfg):
+        for cfg in data.configurations:
-    for var in cfg.variables:
+            print('Checking %s, config %s...' % (afile, cfg.name))
-        if not var.nameToken:
+            if "RE_VARNAME" in conf and conf["RE_VARNAME"]:
-            continue
+                for var in cfg.variables:
-        if var.access in ('Global','Public','Private'):
+                    if var.nameToken and var.access != 'Global' and var.access != 'Public' and var.access != 'Private':
-            continue
+                        prev = var.nameToken.previous
-        prev = var.nameToken.previous
+                        varType = prev.str
-        varType = prev.str
+                        while "*" in varType and len(varType.replace("*", "")) == 0:
-        while "*" in varType and len(varType.replace("*", "")) == 0:
+                            prev = prev.previous
-            prev = prev.previous
+                            varType = prev.str + varType
-            varType = prev.str + varType
 
-        if args.debugprint:
+                        if debugprint:
-            print("Variable Name: " + str(var.nameToken.str))
+                            print("Variable Name: " + str(var.nameToken.str))
-            print("original Type Name: " + str(var.nameToken.valueType.originalTypeName))
+                            print("original Type Name: " + str(var.nameToken.valueType.originalTypeName))
-            print("Type Name: " + var.nameToken.valueType.type)
+                            print("Type Name: " + var.nameToken.valueType.type)
-            print("Sign: " + str(var.nameToken.valueType.sign))
+                            print("Sign: " + str(var.nameToken.valueType.sign))
-            print("variable type: " + varType)
+                            print("variable type: " + varType)
-            print("\n")
+                            print("\n")
-            print("\t-- {} {}".format(varType, str(var.nameToken.str)))
+                            print("\t-- {} {}".format(varType, str(var.nameToken.str)))
 
-        if conf.skip_one_char_variables and len(var.nameToken.str) == 1:
+                        if conf["skip_one_char_variables"] and len(var.nameToken.str) == 1:
-            continue
+                            continue
-        if varType in conf.variable_prefixes:
+                        if varType in conf["var_prefixes"]:
-            prefix = conf.variable_prefixes[varType]
+                            if not var.nameToken.str.startswith(conf["var_prefixes"][varType]):
-            if not var.nameToken.str.startswith(prefix):
+                                errors.append(reportError(
-                reportNamingError(var.typeStartToken,
+                                                    var.typeStartToken.file,
-                                    'Variable ' +
+                                                    var.typeStartToken.linenr,
-                                    var.nameToken.str +
+                                                    'style',
-                                    ' violates naming convention',
+                                                    'Variable ' +
-                                    column=var.nameToken.column)
+                                                    var.nameToken.str +
+                                                    ' violates naming convention'))
 
-        mockToken = DataStruct(var.typeStartToken.file, var.typeStartToken.linenr, var.nameToken.str, var.nameToken.column)
+                        mockToken = DataStruct(var.typeStartToken.file, var.typeStartToken.linenr, var.nameToken.str)
-        for exp in conf.variable:
+                        msgType = 'Variable'
-            evalExpr(conf.variable, exp, mockToken, 'Variable')
+                        for exp in conf["RE_VARNAME"]:
+                            evalExpr(conf["RE_VARNAME"], exp, mockToken, msgType, errors)
 
-# Naming check for Global, Private and Public member variables
+            # Check Private Variable naming
-def check_gpp_naming(conf_list,cfg,access,message):
+            if "RE_PRIVATE_MEMBER_VARIABLE" in conf and conf["RE_PRIVATE_MEMBER_VARIABLE"]:
-    for var in cfg.variables:
+                # TODO: Not converted yet
-        if var.access != access:
+                for var in cfg.variables:
-            continue
+                    if (var.access is None) or var.access != 'Private':
-        mockToken = DataStruct(var.typeStartToken.file, var.typeStartToken.linenr, var.nameToken.str, var.nameToken.column)
+                        continue
-        for exp in conf_list:
+                    mockToken = DataStruct(var.typeStartToken.file, var.typeStartToken.linenr, var.nameToken.str)
-            evalExpr(conf_list, exp, mockToken, message)
+                    msgType = 'Private member variable'
+                    for exp in conf["RE_PRIVATE_MEMBER_VARIABLE"]:
+                        evalExpr(conf["RE_PRIVATE_MEMBER_VARIABLE"], exp, mockToken, msgType, errors)
 
-def check_function_naming(conf,cfg):
+            # Check Public Member Variable naming
-    for token in cfg.tokenlist:
+            if "RE_PUBLIC_MEMBER_VARIABLE" in conf and conf["RE_PUBLIC_MEMBER_VARIABLE"]:
-        if not token.function:
+                for var in cfg.variables:
-            continue
+                    if (var.access is None) or var.access != 'Public':
-        if token.function.type in ('Constructor', 'Destructor', 'CopyConstructor', 'MoveConstructor'):
+                        continue
-            continue
+                    mockToken = DataStruct(var.typeStartToken.file, var.typeStartToken.linenr, var.nameToken.str)
-        retval = token.previous.str
+                    msgType = 'Public member variable'
-        prev = token.previous
+                    for exp in conf["RE_PUBLIC_MEMBER_VARIABLE"]:
-        while "*" in retval and len(retval.replace("*", "")) == 0:
+                        evalExpr(conf["RE_PUBLIC_MEMBER_VARIABLE"], exp, mockToken, msgType, errors)
-            prev = prev.previous
-            retval = prev.str + retval
-        if args.debugprint:
-            print("\t:: {} {}".format(retval, token.function.name))
 
-        if retval and retval in conf.function_prefixes:
+            # Check Global Variable naming
-            if not token.function.name.startswith(conf.function_prefixes[retval]):
+            if "RE_GLOBAL_VARNAME" in conf and conf["RE_GLOBAL_VARNAME"]:
-                reportNamingError(token, 'Function ' + token.function.name + ' violates naming convention', column=token.column)
+                for var in cfg.variables:
-        mockToken = DataStruct(token.file, token.linenr, token.function.name, token.column)
+                    if (var.access is None) or var.access != 'Global':
-        msgType = 'Function'
+                        continue
-        for exp in conf.function_name:
+                    mockToken = DataStruct(var.typeStartToken.file, var.typeStartToken.linenr, var.nameToken.str)
-            evalExpr(conf.function_name, exp, mockToken, msgType)
+                    msgType = 'Public member variable'
+                    for exp in conf["RE_GLOBAL_VARNAME"]:
+                        evalExpr(conf["RE_GLOBAL_VARNAME"], exp, mockToken, msgType, errors)
 
-def check_class_naming(conf,cfg):
+            # Check Functions naming
-    for fnc in cfg.functions:
+            if "RE_FUNCTIONNAME" in conf and conf["RE_FUNCTIONNAME"]:
-        if fnc.type not in ('Constructor','Destructor'):
+                for token in cfg.tokenlist:
-            continue
+                    if token.function:
-        mockToken = DataStruct(fnc.tokenDef.file, fnc.tokenDef.linenr, fnc.name, fnc.tokenDef.column)
+                        if token.function.type in ('Constructor', 'Destructor', 'CopyConstructor', 'MoveConstructor'):
-        msgType = 'Class ' + fnc.type
+                            continue
-        for exp in conf.class_name:
+                        retval = token.previous.str
-            evalExpr(conf.class_name, exp, mockToken, msgType)
+                        prev = token.previous
+                        while "*" in retval and len(retval.replace("*", "")) == 0:
+                            prev = prev.previous
+                            retval = prev.str + retval
+                        if debugprint:
+                            print("\t:: {} {}".format(retval, token.function.name))
 
-def process_data(conf,data):
+                        if retval and retval in conf["function_prefixes"]:
-    if conf.file:
+                            if not token.function.name.startswith(conf["function_prefixes"][retval]):
-        check_file_naming(conf,data)
+                                errors.append(reportError(
+                                    token.file, token.linenr, 'style', 'Function ' + token.function.name + ' violates naming convention'))
+                        mockToken = DataStruct(token.file, token.linenr, token.function.name)
+                        msgType = 'Function'
+                        for exp in conf["RE_FUNCTIONNAME"]:
+                            evalExpr(conf["RE_FUNCTIONNAME"], exp, mockToken, msgType, errors)
 
-    if conf.namespace:
+            # Check Class naming
-        check_namespace_naming(conf,data)
+            if "RE_CLASS_NAME" in conf and conf["RE_CLASS_NAME"]:
+                for fnc in cfg.functions:
+                    # Check if it is Constructor/Destructor
+                    if fnc.type == 'Constructor' or fnc.type == 'Destructor':
+                        mockToken = DataStruct(fnc.tokenDef.file, fnc.tokenDef.linenr, fnc.name)
+                        msgType = 'Class ' + fnc.type
+                        for exp in conf["RE_CLASS_NAME"]:
+                            evalExpr(conf["RE_CLASS_NAME"], exp, mockToken, msgType, errors)
+    return errors
 
-    unguarded_include_files = []
-    if conf.include_guard and conf.include_guard.get('required',1):
-        unguarded_include_files = [fn for fn in data.files if re.match(include_guard_header_re,fn)]
-
-    for cfg in data.configurations:
-        if not args.cli:
-            print('Checking config %s...' % cfg.name)
-        if conf.variable:
-            check_variable_naming(conf,cfg)
-        if conf.private_member:
-            check_gpp_naming(conf.private_member,cfg,'Private','Private member variable')
-        if conf.public_member:
-            check_gpp_naming(conf.public_member,cfg,'Public','Public member variable')
-        if conf.global_variable:
-            check_gpp_naming(conf.global_variable,cfg,'Global','Global variable')
-        if conf.function_name:
-            check_function_naming(conf,cfg)
-        if conf.class_name:
-            check_class_naming(conf,cfg)
-        if conf.include_guard:
-            check_include_guards(conf,cfg,unguarded_include_files)
-
-    for fn in unguarded_include_files:
-        mockToken = DataStruct(fn,0,os.path.basename(fn))
-        reportNamingError(mockToken,'Missing include guard','includeGuardMissing')
 
 if __name__ == "__main__":
-    parser = cppcheckdata.ArgumentParser()
+    parser = argparse.ArgumentParser(description='Naming verification')
+    parser.add_argument('dumpfiles', type=str, nargs='+',
+                        help='A set of dumpfiles to process')
     parser.add_argument("--debugprint", action="store_true", default=False,
                         help="Add debug prints")
-    parser.add_argument("--configfile", type=str, default="namingng.config.json",
+    parser.add_argument("--configfile", type=str, default="naming.json",
                         help="Naming check config file")
+    parser.add_argument("--verify", action="store_true", default=False,
+                        help="verify this script. Must be executed in test folder !")
 
     args = parser.parse_args()
-    process(args.dumpfile, args.configfile)
+    errors = process(args.dumpfiles, args.configfile, args.debugprint)
+
+    if args.verify:
+        print(errors)
+        if len(errors) < 6:
+            print("Not enough errors found")
+            sys.exit(1)
+        target = [
+         '[namingng_test.c:8] ( style ) naming.py: Variable badui32 violates naming convention\n',
+         '[namingng_test.c:11] ( style ) naming.py: Variable a violates naming convention\n',
+         '[namingng_test.c:29] ( style ) naming.py: Variable badui32 violates naming convention\n',
+         '[namingng_test.c:20] ( style ) naming.py: Function ui16bad_underscore violates naming convention\n',
+         '[namingng_test.c:25] ( style ) naming.py: Function u32Bad violates naming convention\n',
+         '[namingng_test.c:37] ( style ) naming.py: Function Badui16 violates naming convention\n']
+        diff = set(errors) - set(target)
+        if len(diff):
+            print("Not the right errors found {}".format(str(diff)))
+            sys.exit(1)
+        print("Verification done\n")
+        sys.exit(0)
+
+    if len(errors):
+        print('Found errors: {}'.format(len(errors)))
+        sys.exit(1)
 
     sys.exit(0)

addons/test/misra/misra-test.c

@@ -441,7 +441,6 @@ static void misra_9_empty_or_zero_initializers(void) {
     int e[2][2] = { { 1 , 2 }, {} };           // 9.2
 
     int f[5]    = { 0 };
-    int f1[5]   = { 0u };                     // no-warning  #11298
     int g[5][2] = { 0 };
     int h[2][2] = { { 0 } };                   // 9.3
     int i[2][2] = { { 0 }, { 0 } };

addons/test/namingng_test.c

@@ -0,0 +1,50 @@
+#include <stddef.h>
+#include <stdint.h>
+
+uint32_t ui32Good (int abc)
+{
+    uint32_t ui32good;
+    int32_t i32good;
+    uint32_t badui32;
+    int32_t badi32;
+
+    uint32_t a;  // Short
+    return 5;
+}
+
+uint16_t ui16Good (int a)
+{
+    return 5;
+}
+
+uint16_t ui16bad_underscore (int a)
+{
+    return 5;
+}
+
+uint32_t u32Bad (int a)
+{
+    uint32_t ui32good;
+    int32_t i32good;
+    uint32_t badui32;
+    int32_t badi32;
+    int * intpointer=NULL;
+    int ** intppointer=NULL;
+    int *** intpppointer=NULL;
+    return 5;
+}
+
+uint16_t Badui16 (int a)
+{
+    return 5;
+}
+
+void * Pointer()
+{
+    return NULL;
+}
+
+void ** PPointer()
+{
+    return NULL;
+}

cfg/cairo.cfg

@@ -6,7 +6,6 @@
   <define name="cairo_bool_t" value="int"/>
   <!-- TODO: Configure cairo_status_t as an enum when this is implemented in Cppcheck -->
   <podtype name="cairo_status_t"/>
-  <define name="CAIRO_STATUS_READ_ERROR" value="10"/>
   <!-- ########## cairo Macros / Defines ########## -->
   <define name="CAIRO_HAS_MIME_SURFACE" value="1"/>
   <define name="CAIRO_MIME_TYPE_CCITT_FAX" value="&quot;image/g3fax&quot;"/>

cfg/gtk.cfg

@@ -2,8 +2,6 @@
 <!-- This file once has been generated automatically. See https://github.com/scriptum/cppcheck-libs -->
 <!-- Now it is maintained and extended manually. -->
 <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)"/>
@@ -180,14 +178,11 @@
   <define name="g_assert(expr)" value="assert(expr)"/>
   <define name="g_assert_not_reached()" value="assert(NULL)"/>
   <define name="g_assert_true(expr)" value="g_assert(expr)"/>
-  <define name="g_assert_false(expr)" value="g_assert(!(expr))"/>
   <define name="g_assert_cmpstr(s1, cmp, s2)" value="g_assert_true(g_strcmp0 ((s1), (s2)) cmp 0)"/>
   <define name="g_assert_cmpint(n1, cmp, n2)" value="g_assert_true((n1) cmp (n2))"/>
   <define name="g_assert_cmpuint(n1, cmp, n2)" value="g_assert_true((n1) cmp (n2))"/>
   <define name="g_assert_cmphex(n1, cmp, n2)" value="g_assert_true((n1) cmp (n2))"/>
   <define name="g_assert_cmpfloat(n1, cmp, n2)" value="g_assert_true((n1) cmp (n2))"/>
-  <define name="g_assert_null(expr)" value="g_assert_true((expr) == NULL)"/>
-  <define name="g_assert_nonnull(expr)" value="g_assert_true((expr) != NULL)"/>
   <define name="g_signal_connect(instance, detailed_signal, c_handler, data)" value="g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, (GConnectFlags) 0)"/>
   <define name="g_signal_connect_after(instance, detailed_signal, c_handler, data)" value="g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, G_CONNECT_AFTER)"/>
   <define name="g_signal_connect_swapped(instance, detailed_signal, c_handler, data)" value="g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, G_CONNECT_SWAPPED)"/>

cfg/posix.cfg

@@ -4179,30 +4179,6 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
       <valid>0:</valid>
     </arg>
   </function>
-  <!-- https://pubs.opengroup.org/onlinepubs/9699919799/functions/strxfrm_l.html -->
-  <!-- size_t strxfrm_l(char *restrict s1, const char *restrict s2, size_t n, locale_t locale) -->
-  <function name="strxfrm_l">
-    <returnValue type="size_t"/>
-    <noreturn>false</noreturn>
-    <leak-ignore/>
-    <!-- In case the 3rd argument is 0, the 1st argument is permitted to be a null pointer. (#6306) -->
-    <arg nr="1" direction="out">
-      <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">
-      <not-uninit/>
-      <valid>0:</valid>
-    </arg>
-    <arg nr="4" direction="in">
-      <not-uninit/>
-    </arg>
-  </function>  
   <!-- https://pubs.opengroup.org/onlinepubs/9699919799/functions/asctime.html -->
   <!-- char *asctime_r(const struct tm *tm, char *buf); -->
   <function name="asctime_r">

cfg/std.cfg

@@ -737,7 +737,6 @@
       <not-uninit/>
     </arg>
   </function>
-  <!-- https://en.cppreference.com/w/cpp/numeric/math/tgamma -->
   <!-- double tgamma(double x); -->
   <function name="tgamma,std::tgamma">
     <use-retval/>
@@ -747,11 +746,8 @@
     <leak-ignore/>
     <arg nr="1" direction="in">
       <not-uninit/>
-      <!-- If x is zero or a negative integer for which the function is asymptotic, it may cause a pole error (depending on implementation).-->
-      <valid>!0.0:</valid>
     </arg>
   </function>
-  <!-- https://en.cppreference.com/w/cpp/numeric/math/tgamma -->
   <!-- float tgammaf(float x); -->
   <function name="tgammaf,std::tgammaf">
     <use-retval/>
@@ -761,11 +757,8 @@
     <leak-ignore/>
     <arg nr="1" direction="in">
       <not-uninit/>
-      <!-- If x is zero or a negative integer for which the function is asymptotic, it may cause a pole error (depending on implementation).-->
-      <valid>!0.0:</valid>
     </arg>
   </function>
-  <!-- https://en.cppreference.com/w/cpp/numeric/math/tgamma -->
   <!-- long double tgammal(long double x); -->
   <function name="tgammal,std::tgammal">
     <use-retval/>
@@ -775,8 +768,6 @@
     <leak-ignore/>
     <arg nr="1" direction="in">
       <not-uninit/>
-      <!-- If x is zero or a negative integer for which the function is asymptotic, it may cause a pole error (depending on implementation).-->
-      <valid>!0.0:</valid>
     </arg>
   </function>
   <!-- double trunc(double x); -->
@@ -3044,7 +3035,6 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
-  <!-- https://cplusplus.com/reference/cmath/lgamma/ -->
   <!-- double lgamma(double x); -->
   <function name="lgamma,std::lgamma">
     <use-retval/>
@@ -3054,11 +3044,8 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <leak-ignore/>
     <arg nr="1" direction="in">
       <not-uninit/>
-      <!-- If x is zero or a negative integer for which the function is asymptotic, it may cause a pole error (depending on implementation).-->
-      <valid>!0.0:</valid>
     </arg>
   </function>
-  <!-- https://cplusplus.com/reference/cmath/lgamma/ -->
   <!-- float lgammaf(float x); -->
   <function name="lgammaf,std::lgammaf">
     <use-retval/>
@@ -3068,11 +3055,8 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <leak-ignore/>
     <arg nr="1" direction="in">
       <not-uninit/>
-      <!-- If x is zero or a negative integer for which the function is asymptotic, it may cause a pole error (depending on implementation).-->
-      <valid>!0.0:</valid>
     </arg>
   </function>
-  <!-- https://cplusplus.com/reference/cmath/lgamma/ -->
   <!-- long double lgammal(long double x); -->
   <function name="lgammal,std::lgammal">
     <use-retval/>
@@ -3082,8 +3066,6 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <leak-ignore/>
     <arg nr="1" direction="in">
       <not-uninit/>
-      <!-- If x is zero or a negative integer for which the function is asymptotic, it may cause a pole error (depending on implementation).-->
-      <valid>!0.0:</valid>
     </arg>
   </function>
   <!-- double rint(double x); -->

cli/CMakeLists.txt

@@ -6,11 +6,11 @@ list(REMOVE_ITEM srcs ${mainfile})
 add_library(cli_objs OBJECT ${hdrs} ${srcs})
 target_include_directories(cli_objs PRIVATE ${PROJECT_SOURCE_DIR}/lib/)
 if(USE_BUNDLED_TINYXML2)
-    target_externals_include_directories(cli_objs PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)
+    target_include_directories(cli_objs PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)
 else()
     target_include_directories(cli_objs SYSTEM PRIVATE ${tinyxml2_INCLUDE_DIRS})
 endif()
-target_externals_include_directories(cli_objs PRIVATE ${PROJECT_SOURCE_DIR}/externals/simplecpp/)
+target_include_directories(cli_objs PRIVATE ${PROJECT_SOURCE_DIR}/externals/simplecpp/)
 if (NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
     target_precompile_headers(cli_objs PRIVATE precompiled.h)
 endif()
@@ -38,11 +38,11 @@ endif()
 add_executable(cppcheck ${cppcheck_SOURCES})
 target_include_directories(cppcheck PRIVATE ${PROJECT_SOURCE_DIR}/lib/)
 if(USE_BUNDLED_TINYXML2)
-    target_externals_include_directories(cppcheck PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)
+    target_include_directories(cppcheck PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)
 else()
     target_include_directories(cppcheck SYSTEM PRIVATE ${tinyxml2_INCLUDE_DIRS})
 endif()
-target_externals_include_directories(cppcheck PRIVATE ${PROJECT_SOURCE_DIR}/externals/simplecpp/)
+target_include_directories(cppcheck PRIVATE ${PROJECT_SOURCE_DIR}/externals/simplecpp/)
 if (HAVE_RULES)
     target_link_libraries(cppcheck ${PCRE_LIBRARY})
 endif()

cli/cmdlineparser.cpp

@@ -42,7 +42,6 @@
 #include <algorithm>
 #include <cassert>
 #include <climits>
-#include <cstdint>
 #include <cstdio>
 #include <cstdlib> // EXIT_FAILURE
 #include <cstring>
@@ -798,9 +797,9 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 }
 
                 if (str == "c")
-                    mSettings.enforcedLang = Standards::Language::C;
+                    mSettings.enforcedLang = Settings::Language::C;
                 else if (str == "c++")
-                    mSettings.enforcedLang = Standards::Language::CPP;
+                    mSettings.enforcedLang = Settings::Language::CPP;
                 else {
                     mLogger.printError("unknown language '" + str + "' enforced.");
                     return Result::Fail;

cli/cppcheckexecutor.cpp

@@ -42,7 +42,6 @@
 #endif
 
 #include <algorithm>
-#include <cassert>
 #include <cstdio>
 #include <cstdlib> // EXIT_SUCCESS and EXIT_FAILURE
 #include <ctime>
@@ -50,7 +49,6 @@
 #include <list>
 #include <set>
 #include <sstream> // IWYU pragma: keep
-#include <unordered_set>
 #include <utility>
 #include <vector>
 
@@ -219,29 +217,21 @@ int CppCheckExecutor::check_wrapper(CppCheck& cppcheck)
     return check_internal(cppcheck);
 }
 
-bool CppCheckExecutor::reportSuppressions(const Settings &settings, const Suppressions& suppressions, bool unusedFunctionCheckEnabled, const std::list<std::pair<std::string, std::size_t>> &files, const std::list<FileSettings>& fileSettings, ErrorLogger& errorLogger) {
+bool CppCheckExecutor::reportSuppressions(const Settings &settings, bool unusedFunctionCheckEnabled, const std::list<std::pair<std::string, std::size_t>> &files, ErrorLogger& errorLogger) {
-    const auto& suppr = suppressions.getSuppressions();
+    const auto& suppressions = settings.nomsg.getSuppressions();
-    if (std::any_of(suppr.begin(), suppr.end(), [](const Suppressions::Suppression& s) {
+    if (std::any_of(suppressions.begin(), suppressions.end(), [](const Suppressions::Suppression& s) {
         return s.errorId == "unmatchedSuppression" && s.fileName.empty() && s.lineNumber == Suppressions::Suppression::NO_LINE;
     }))
         return false;
 
     bool err = false;
     if (settings.useSingleJob()) {
-        // the two inputs may only be used exclusively
-        assert(!(!files.empty() && !fileSettings.empty()));
-
         for (std::list<std::pair<std::string, std::size_t>>::const_iterator i = files.cbegin(); i != files.cend(); ++i) {
             err |= Suppressions::reportUnmatchedSuppressions(
-                suppressions.getUnmatchedLocalSuppressions(i->first, unusedFunctionCheckEnabled), errorLogger);
+                settings.nomsg.getUnmatchedLocalSuppressions(i->first, unusedFunctionCheckEnabled), errorLogger);
-        }
-
-        for (std::list<FileSettings>::const_iterator i = fileSettings.cbegin(); i != fileSettings.cend(); ++i) {
-            err |= Suppressions::reportUnmatchedSuppressions(
-                suppressions.getUnmatchedLocalSuppressions(i->filename, unusedFunctionCheckEnabled), errorLogger);
         }
     }
-    err |= Suppressions::reportUnmatchedSuppressions(suppressions.getUnmatchedGlobalSuppressions(unusedFunctionCheckEnabled), errorLogger);
+    err |= Suppressions::reportUnmatchedSuppressions(settings.nomsg.getUnmatchedGlobalSuppressions(unusedFunctionCheckEnabled), errorLogger);
     return err;
 }
 
@@ -287,7 +277,7 @@ int CppCheckExecutor::check_internal(CppCheck& cppcheck) const
     cppcheck.analyseWholeProgram(settings.buildDir, mFiles, mFileSettings);
 
     if (settings.severity.isEnabled(Severity::information) || settings.checkConfiguration) {
-        const bool err = reportSuppressions(settings, settings.nomsg, cppcheck.isUnusedFunctionCheckEnabled(), mFiles, mFileSettings, *mStdLogger);
+        const bool err = reportSuppressions(settings, cppcheck.isUnusedFunctionCheckEnabled(), mFiles, *mStdLogger);
         if (err && returnValue == 0)
             returnValue = settings.exitCode;
     }

cli/cppcheckexecutor.h

@@ -31,7 +31,6 @@
 class CppCheck;
 class Settings;
 class ErrorLogger;
-class Suppressions;
 
 /**
  * This class works as an example of how CppCheck can be used in external
@@ -49,7 +48,7 @@ public:
      */
     CppCheckExecutor() = default;
     CppCheckExecutor(const CppCheckExecutor &) = delete;
-    CppCheckExecutor& operator=(const CppCheckExecutor&) = delete;
+    void operator=(const CppCheckExecutor&) = delete;
 
     /**
      * Starts the checking.
@@ -82,7 +81,7 @@ private:
 
 protected:
 
-    static bool reportSuppressions(const Settings &settings, const Suppressions& suppressions, bool unusedFunctionCheckEnabled, const std::list<std::pair<std::string, std::size_t>> &files, const std::list<FileSettings>& fileSettings, ErrorLogger& errorLogger);
+    static bool reportSuppressions(const Settings &settings, bool unusedFunctionCheckEnabled, const std::list<std::pair<std::string, std::size_t>> &files, ErrorLogger& errorLogger);
 
     /**
      * Wrapper around check_internal

cli/cppcheckexecutorsig.cpp

@@ -109,7 +109,7 @@ static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
     pid_t killid;
     // TODO: separate these two defines
 #if defined(__linux__) && defined(REG_ERR)
-    const auto* const uc = reinterpret_cast<const ucontext_t*>(context);
+    const ucontext_t* const uc = reinterpret_cast<const ucontext_t*>(context);
     killid = (pid_t) syscall(SYS_gettid);
     if (uc) {
         type = (int)uc->uc_mcontext.gregs[REG_ERR] & 2;

cli/executor.cpp

@@ -20,10 +20,10 @@
 
 #include "color.h"
 #include "errorlogger.h"
-#include "library.h"
 #include "settings.h"
 #include "suppressions.h"
 
+#include <algorithm>
 #include <cassert>
 #include <sstream> // IWYU pragma: keep
 #include <utility>

cli/executor.h

@@ -45,7 +45,7 @@ public:
     virtual ~Executor() = default;
 
     Executor(const Executor &) = delete;
-    Executor& operator=(const Executor &) = delete;
+    void operator=(const Executor &) = delete;
 
     virtual unsigned int check() = 0;
 

cli/filelister.cpp

@@ -253,3 +253,4 @@ std::string FileLister::addFiles(std::list<std::pair<std::string, std::size_t>>
 }
 
 #endif
+

cli/main.cpp

@@ -20,7 +20,7 @@
 /**
  *
  * @mainpage Cppcheck
- * @version 2.13.99
+ * @version 2.13.0
  *
  * @section overview_sec Overview
  * Cppcheck is a simple tool for static analysis of C/C++ code.
@@ -68,6 +68,11 @@
 #include <string>
 #endif
 
+#if defined(__amigaos4__)
+static const char *stack __attribute__((used)) = "$STACK:102400";
+static const char *version __attribute__((used)) = "\0$VER: cppcheck 2.13.0 (09.01.2024)";
+#endif
+
 /**
  * Main function of cppcheck
  *
@@ -101,3 +106,4 @@ int main(int argc, char* argv[])
 #endif
 // *INDENT-ON*
 }
+

cli/processexecutor.cpp

@@ -18,7 +18,7 @@
 
 #include "processexecutor.h"
 
-#if !defined(WIN32) && !defined(__MINGW32__)
+#if !defined(WIN32) && !defined(__MINGW32__) && !defined(__amigaos4__)
 
 #include "config.h"
 #include "cppcheck.h"
@@ -107,11 +107,11 @@ namespace {
         void writeToPipe(PipeSignal type, const std::string &data) const
         {
             {
-                const auto t = static_cast<char>(type);
+                const char t = static_cast<char>(type);
                 writeToPipeInternal(type, &t, 1);
             }
 
-            const auto len = static_cast<unsigned int>(data.length());
+            const unsigned int len = static_cast<unsigned int>(data.length());
             {
                 static constexpr std::size_t l_size = sizeof(unsigned int);
                 writeToPipeInternal(type, &len, l_size);
@@ -206,7 +206,7 @@ bool ProcessExecutor::handleRead(int rpipe, unsigned int &result, const std::str
 
 bool ProcessExecutor::checkLoadAverage(size_t nchildren)
 {
-#if defined(__QNX__) || defined(__HAIKU__)  // getloadavg() is unsupported on Qnx, Haiku.
+#if defined(__QNX__) || defined(__HAIKU__) || defined(__amigaos4__) // getloadavg() is unsupported on Qnx, Haiku.
     (void)nchildren;
     return true;
 #else
@@ -404,3 +404,4 @@ void ProcessExecutor::reportInternalChildErr(const std::string &childname, const
 }
 
 #endif // !WIN32
+

cli/processexecutor.h

@@ -43,7 +43,7 @@ class ProcessExecutor : public Executor {
 public:
     ProcessExecutor(const std::list<std::pair<std::string, std::size_t>> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, CppCheck::ExecuteCmdFn executeCommand);
     ProcessExecutor(const ProcessExecutor &) = delete;
-    ProcessExecutor& operator=(const ProcessExecutor &) = delete;
+    void operator=(const ProcessExecutor &) = delete;
 
     unsigned int check() override;
 

cli/singleexecutor.h

@@ -37,7 +37,7 @@ class SingleExecutor : public Executor
 public:
     SingleExecutor(CppCheck &cppcheck, const std::list<std::pair<std::string, std::size_t>> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger);
     SingleExecutor(const SingleExecutor &) = delete;
-    SingleExecutor& operator=(const SingleExecutor &) = delete;
+    void operator=(const SingleExecutor &) = delete;
 
     unsigned int check() override;
 

cli/threadexecutor.h

@@ -45,7 +45,7 @@ class ThreadExecutor : public Executor {
 public:
     ThreadExecutor(const std::list<std::pair<std::string, std::size_t>> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger, CppCheck::ExecuteCmdFn executeCommand);
     ThreadExecutor(const ThreadExecutor &) = delete;
-    ThreadExecutor& operator=(const ThreadExecutor &) = delete;
+    void operator=(const ThreadExecutor &) = delete;
 
     unsigned int check() override;
 

cmake/ccache.cmake

@@ -0,0 +1,7 @@
+if (CMAKE_VERSION VERSION_LESS "3.0")
+    if (CMAKE_CXX_COMPILER_LAUNCHER)
+        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CMAKE_CXX_COMPILER_LAUNCHER}")
+    elseif (CMAKE_C_COMPILER_LAUNCHER)
+        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CMAKE_C_COMPILER_LAUNCHER}")
+    endif()
+endif()

cmake/compilerCheck.cmake

@@ -1,13 +1,14 @@
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.1)
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
-        message(ERROR "GCC >= 5.1 required - detected ${CMAKE_CXX_COMPILER_VERSION} not supported")
+        message(ERROR "GCC >= 4.8 required - detected ${CMAKE_CXX_COMPILER_VERSION} not supported")
     endif ()
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)
+    # TODO: verify this
-        message(ERROR "Clang >= 3.5 required - detected ${CMAKE_CXX_COMPILER_VERSION} not supported")
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 2.9)
+        message(ERROR "Clang >= 2.9 required - detected ${CMAKE_CXX_COMPILER_VERSION} not supported")
     endif ()
 elseif(MSVC)
-    if (MSVC_VERSION VERSION_LESS 1900)
+    if (MSVC_VERSION VERSION_LESS 1800)
-        message(ERROR "Visual Studio >= 2015 (19.0) required - detected ${MSVC_VERSION} not supported")
+        message(ERROR "Visual Studio >= 2013 (1800) required - detected ${MSVC_VERSION} not supported")
     endif ()
 endif()

cmake/compilerDefinitions.cmake

@@ -1,6 +1,4 @@
 if (MSVC)
-    # add_compile_definitions() requires CMake 3.12
-
     # Visual Studio only sets _DEBUG
     add_compile_definitions($<$<CONFIG:Debug>:DEBUG>)
 

cmake/compileroptions.cmake

@@ -16,14 +16,6 @@ function(target_compile_options_safe TARGET FLAG)
     endif()
 endfunction()
 
-function(target_externals_include_directories TARGET)
-    if (EXTERNALS_AS_SYSTEM)
-        target_include_directories(${TARGET} SYSTEM ${ARGN})
-    else()
-        target_include_directories(${TARGET} ${ARGN})
-    endif()
-endfunction()
-
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     add_compile_options(-Weverything)
 endif()
@@ -85,7 +77,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 
     if (USE_LIBCXX)
         add_compile_options(-stdlib=libc++)
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lc++")
+        add_link_options(-lc++)
     endif()
 
     # TODO: fix and enable these warnings - or move to suppression list below
@@ -133,8 +125,6 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 endif()
 
 if (MSVC)
-    # add_link_options() requires CMake 3.13
-
     # General
     add_compile_options(/W4) # Warning Level
     add_compile_options(/Zi) # Debug Information Format - Program Database

cmake/cxx11.cmake

@@ -1,9 +1,20 @@
 macro(use_cxx11)
-  # some GitHub Action Windows runners randomly fail with a complaint that Qt6 requires a C++17 compiler
+  if (CMAKE_VERSION VERSION_LESS "3.1")
-  if (MSVC AND USE_QT6)
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    # CMAKE_CXX_STANDARD 17 was added in CMake 3.8
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-    set (CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to use")
+    elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    endif ()
   else ()
-    set (CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard to use")
+    # some GitHub Action windows runners randomly fail with a complaint that Qt6 requires a C++17 compiler
-  endif()
+    if (MSVC)
+      set (CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to use")
+    else ()
+      set (CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard to use")
+    endif()
+    set (CMAKE_CXX_STANDARD_REQUIRED ON)
+    if (POLICY CMP0025)
+      cmake_policy(SET CMP0025 NEW)
+    endif ()
+  endif ()
 endmacro(use_cxx11)

cmake/options.cmake

@@ -17,9 +17,7 @@ option(ANALYZE_ADDRESS      "Clang dynamic analyzer: fast memory error detector.
 option(ANALYZE_THREAD       "Clang dynamic analyzer: tool that detects data races. "        OFF)
 option(ANALYZE_UNDEFINED    "Clang dynamic analyzer: undefined behavior checker. "          OFF)
 option(ANALYZE_DATAFLOW     "Clang dynamic analyzer: general dynamic dataflow analysis."    OFF)
-
 option(WARNINGS_ARE_ERRORS  "Treat warnings as errors"                                      OFF)
-option(EXTERNALS_AS_SYSTEM  "Treat externals as system includes"                            OFF)
 
 set(USE_MATCHCOMPILER "Auto" CACHE STRING "Usage of match compiler")
 set_property(CACHE USE_MATCHCOMPILER PROPERTY STRINGS Auto Off On Verify) 
@@ -72,10 +70,6 @@ else()
     set(CMAKE_DISABLE_PRECOMPILE_HEADERS On CACHE BOOL "Disable precompiled headers")
 endif()
 
-if (BUILD_TESTS AND REGISTER_TESTS AND CMAKE_VERSION VERSION_LESS "3.9")
-    message(FATAL_ERROR "Registering tests with CTest requires at least CMake 3.9. Use REGISTER_TESTS=OFF to disable this.")
-endif()
-
 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")
 

cmake/printInfo.cmake

@@ -1,4 +1,4 @@
-message( STATUS "------------------ General configuration for ${PROJECT_NAME} ${PROJECT_VERSION} -----------------")
+message( STATUS "------------------ General configuration for ${PROJECT_NAME} ${VERSION} -----------------")
 message( STATUS )
 message( STATUS "CMake Version =         ${CMAKE_VERSION}")
 message( STATUS "CMake Generator =       ${CMAKE_GENERATOR}")
@@ -25,9 +25,7 @@ message( STATUS "ANALYZE_ADDRESS =       ${ANALYZE_ADDRESS}" )
 message( STATUS "ANALYZE_THREAD =        ${ANALYZE_THREAD}" )
 message( STATUS "ANALYZE_UNDEFINED =     ${ANALYZE_UNDEFINED}" )
 message( STATUS "ANALYZE_DATAFLOW =      ${ANALYZE_DATAFLOW}" )
-message( STATUS )
 message( STATUS "WARNINGS_ARE_ERRORS =   ${WARNINGS_ARE_ERRORS}" )
-message( STATUS "EXTERNALS_AS_SYSTEM =   ${EXTERNALS_AS_SYSTEM}" )
 message( STATUS )
 message( STATUS "USE_MATCHCOMPILER =     ${USE_MATCHCOMPILER}" )
 message( STATUS "USE_MATCHCOMPILER_OPT = ${USE_MATCHCOMPILER_OPT}" )

cmake/versions.cmake

@@ -1,6 +1,11 @@
 # Version for libraries CPP
 # Version string must have 3 "parts". https://sourceforge.net/p/cppcheck/discussion/development/thread/e57efb2b62/
-SET(SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
+SET(VERSION "2.13.0")
+STRING(REGEX MATCHALL "[0-9]+" VERSION_PARTS "${VERSION}")
+LIST(GET VERSION_PARTS 0 VERSION_MAJOR)
+LIST(GET VERSION_PARTS 1 VERSION_MINOR)
+LIST(GET VERSION_PARTS 2 VERSION_PATCH)
+SET(SOVERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 # Postfix of so's:
 SET(DLLVERSION "")

createrelease

@@ -37,11 +37,11 @@
 # - empty the releasenotes.txt in main branch
 #
 # Update version numbers in:
-# sed -i -r "s/version 2[.][0-9]+([.]99)*/version 2.13.0/" cli/main.cpp
+# sed -i -r "s/version 2[.][0-9]+([.]99)*/version 2.9/" cli/main.cpp
-# sed -i -r "s|2[.][0-9]+([.]99)*|2.13.0|" cmake/versions.cmake # version must have 3 parts.
+# sed -i -r "s|2[.][0-9]+([.]99)*|2.9.0|" cmake/versions.cmake # version must have 3 parts.
-# sed -i -r "s/CPPCHECK_MINOR_VERSION [0-9]+/CPPCHECK_MINOR_VERSION 13/" lib/version.h
+# sed -i -r "s/MINOR [0-9]+/MINOR 9/" lib/version.h
-# sed -i -r "s/2[.][0-9]+([.]99)*( dev)*/2.13.0/" win_installer/productInfo.wxi
+# sed -i -r "s/2[.][0-9]+([.]99)*/2.9/" win_installer/productInfo.wxi
-# sed -i -r "s/subtitle: Version 2\.[0-9]+.*/subtitle: Version 2.13/" man/*.md
+# sed -i -r "s/subtitle: Version 2\.[0-9]+/subtitle: Version 2.9/" man/*.md
 # Ensure that "-rc1" is added in productInfo.wxi and lib/version.h
 # Verify:
 # grep '\.99' */*.[ch]* && grep '[0-9][0-9] dev' */*.[ch]*
@@ -72,7 +72,7 @@
 # git tag 2.8 ; git push --tags
 # ./createrelease 2.8
 #
-# copy msi from release-windows, install and test cppcheck
+# copy msi from release-windows
 # copy manual from build-manual
 #
 # Update download link on index.php main page
@@ -96,14 +96,13 @@
 # ./build-cppcheck.sh
 #
 # run daca with new release
-# 1. edit tools/donate-cpu-server.py. Update OLD_VERSION and SERVER_VERSION
+# 1. edit tools/donate-cpu-server.py. Update OLD_VERSION and VERSION
-# 2. scp -i ~/.ssh/osuosl_id_rsa tools/donate-cpu-server.py danielmarjamaki@cppcheck1.osuosl.org:/var/daca@home/
+# 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
+# * trac: cd /var && nice tar -zcf /home/danielmarjamaki/trac.tar.gz trac-cppcheck
-# * git: git checkout -f && git checkout main && git pull && tar -cJf git.tar.xz .git
+# * git: git checkout -f && git checkout main && git pull && tar -zcf ~/cppchecksolutions/backups/2.12.0-git.tar.gz .git
 # * Changelog
-# * ci status: screenshot(s) showing that all tests pass for tagged commit
 
 # Folder/tag to use
 folder=$1
@@ -133,8 +132,8 @@ rm $releasename.*
 cd ..
 
 # Generate version.txt
-make -j12
+make -j4
-rm -f cppcheck.cfg
+rm cppcheck.cfg
 ./cppcheck --version > upload/version.txt
 
 cd ~/cppcheck/upload
@@ -150,7 +149,7 @@ cp -R ~/cppcheck/cfg .
 cp -R ~/cppcheck/addons .
 cp -R ~/cppcheck/platforms .
 cd ~/cppcheck
-make clean ; make -j12 FILESDIR=~/.cppcheck/$tag MATCHCOMPILER=yes CXXFLAGS=-O2
+make clean ; make -j4 FILESDIR=~/.cppcheck/$tag MATCHCOMPILER=yes
 mv cppcheck ~/.cppcheck/cppcheck-$tag
 
 git checkout main

externals/picojson/picojson.h

@@ -1198,3 +1198,4 @@ inline std::ostream &operator<<(std::ostream &os, const picojson::value &x) {
 #endif
 
 #endif
+

gui/CMakeLists.txt

@@ -38,7 +38,7 @@ CheckOptions:
     set_target_properties(cppcheck-gui PROPERTIES WIN32_EXECUTABLE ON)
     target_include_directories(cppcheck-gui PRIVATE ${PROJECT_SOURCE_DIR}/lib/)
     if(USE_BUNDLED_TINYXML2)
-        target_externals_include_directories(cppcheck-gui PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)
+        target_include_directories(cppcheck-gui PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)
     else()
         target_include_directories(cppcheck-gui SYSTEM PRIVATE ${tinyxml2_INCLUDE_DIRS})
     endif()

gui/about.ui

@@ -112,7 +112,7 @@ of the GNU General Public License version 3</string>
        <item>
         <widget class="QLabel" name="mUsedLibs">
          <property name="text">
-          <string>&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;</string>
+          <string>&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;</string>
          </property>
         </widget>
        </item>

gui/codeeditor.cpp

@@ -22,7 +22,6 @@
 
 #include <QChar>
 #include <QColor>
-#include <QCryptographicHash>
 #include <QFont>
 #include <QFontMetrics>
 #include <QKeySequence>
@@ -38,6 +37,7 @@
 #include <QTextCursor>
 #include <QTextEdit>
 #include <QTextFormat>
+#include <QtCore>
 
 class QTextDocument;
 
@@ -287,11 +287,11 @@ CodeEditor::CodeEditor(QWidget *parent) :
     setStyleSheet(generateStyleString());
 
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
-    auto *copyText = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_C),this);
+    QShortcut *copyText = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_C),this);
-    auto *allText = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_A),this);
+    QShortcut *allText = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_A),this);
 #else
-    const auto *copyText = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_C),this);
+    const QShortcut *copyText = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_C),this);
-    const auto *allText = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_A),this);
+    const QShortcut *allText = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_A),this);
 #endif
 
     connect(this, SIGNAL(blockCountChanged(int)), this, SLOT(updateLineNumberAreaWidth(int)));
@@ -448,14 +448,15 @@ void CodeEditor::lineNumberAreaPaintEvent(const QPaintEvent *event)
 QString CodeEditor::generateStyleString()
 {
     QString bgcolor = QString("background:rgb(%1,%2,%3);")
-                      .arg(mWidgetStyle->widgetBGColor.red(),
+                      .arg(mWidgetStyle->widgetBGColor.red())
-                           mWidgetStyle->widgetBGColor.green(),
+                      .arg(mWidgetStyle->widgetBGColor.green())
-                           mWidgetStyle->widgetBGColor.blue());
+                      .arg(mWidgetStyle->widgetBGColor.blue());
     QString fgcolor = QString("color:rgb(%1,%2,%3);")
-                      .arg(mWidgetStyle->widgetFGColor.red(),
+                      .arg(mWidgetStyle->widgetFGColor.red())
-                           mWidgetStyle->widgetFGColor.green(),
+                      .arg(mWidgetStyle->widgetFGColor.green())
-                           mWidgetStyle->widgetFGColor.blue());
+                      .arg(mWidgetStyle->widgetFGColor.blue());
     QString style = QString("%1 %2")
-                    .arg(bgcolor, fgcolor);
+                    .arg(bgcolor)
+                    .arg(fgcolor);
     return style;
 }

gui/codeeditstyledialog.cpp

@@ -72,10 +72,10 @@ StyleEditDialog::StyleEditDialog(const CodeEditorStyle& newStyle,
     mStyleIncoming(newStyle),
     mStyleOutgoing(newStyle)
 {
-    auto *vboxMain = new QVBoxLayout(this);
+    QVBoxLayout *vboxMain = new QVBoxLayout(this);
-    auto *hboxEdit = new QHBoxLayout();
+    QHBoxLayout *hboxEdit = new QHBoxLayout();
     // Color/Weight controls
-    auto *flEditControls = new QFormLayout();
+    QFormLayout *flEditControls = new QFormLayout();
     mBtnWidgetColorFG = new SelectColorButton(this);
     flEditControls->addRow(QObject::tr("Editor Foreground Color"),
                            mBtnWidgetColorFG);
@@ -141,7 +141,7 @@ StyleEditDialog::StyleEditDialog(const CodeEditorStyle& newStyle,
     vboxMain->addLayout(hboxEdit);
 
     // Default Controls
-    auto *hboxDefaultControls = new QHBoxLayout();
+    QHBoxLayout *hboxDefaultControls = new QHBoxLayout();
     mBtnDefaultLight = new QPushButton(QObject::tr("Set to Default Light"),
                                        this);
     mBtnDefaultDark  = new QPushButton(QObject::tr("Set to Default Dark"),
@@ -153,7 +153,7 @@ StyleEditDialog::StyleEditDialog(const CodeEditorStyle& newStyle,
     vboxMain->addLayout(hboxDefaultControls);
     vboxMain->addStretch(2);
     // dialog controls
-    auto *dBtnBox = new QDialogButtonBox(
+    QDialogButtonBox *dBtnBox = new QDialogButtonBox(
         QDialogButtonBox::Cancel |
         QDialogButtonBox::Ok |
         QDialogButtonBox::Reset);

gui/common.cpp

@@ -66,7 +66,7 @@ QString toFilterString(const QMap<QString,QString>& filters, bool addAllSupporte
     // name patterns are our values. The generated filter string list will
     // thus be sorted alphabetically over the descriptions.
     for (const auto& k: filters.keys()) {
-        entries << QString("%1 (%2)").arg(k, filters.value(k));
+        entries << QString("%1 (%2)").arg(k).arg(filters.value(k));
     }
 
     return entries.join(";;");

gui/compliancereportdialog.cpp

@@ -37,7 +37,6 @@
 #include <QCheckBox>
 #include <QComboBox>
 #include <QCoreApplication>
-#include <QCryptographicHash>
 #include <QDialogButtonBox>
 #include <QDir>
 #include <QFile>
@@ -53,6 +52,7 @@
 #include <QStringList>
 #include <QTemporaryFile>
 #include <QTextStream>
+#include <QtCore>
 
 static void addHeaders(const QString& file1, QSet<QString> &allFiles) {
     if (allFiles.contains(file1))
@@ -170,7 +170,7 @@ void ComplianceReportDialog::save()
             } 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, QString::fromStdString(e.errorMessage)),
+                                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();

gui/cppcheck_ja.ts

@@ -176,7 +176,7 @@ Parameters: -l(line) (file)</translation>
     <message>
         <location filename="compliancereportdialog.cpp" line="173"/>
         <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
-        <translation>&apos;%1&apos; (%2)のインポートに失敗しました。コンプライアンスレポートに表示できません</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to import &apos;%1&apos;, can not show files in compliance report</source>
@@ -1153,7 +1153,7 @@ Do you want to load this project file instead?</source>
     <message>
         <location filename="mainwindow.cpp" line="961"/>
         <source>Failed to load %1 - %2</source>
-        <translation>%1 - %2 の読み込みに失敗</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="1313"/>
@@ -1233,7 +1233,7 @@ Analysis is stopped.</source>
     <message>
         <location filename="mainwindow.cpp" line="1799"/>
         <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
-        <translation>&apos;%1&apos; (%2) のインポートに失敗しました。解析は停止</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="2099"/>
@@ -2213,7 +2213,7 @@ Options:
     <message>
         <location filename="resultstree.cpp" line="347"/>
         <source>internal</source>
-        <translation>内部</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="resultstree.cpp" line="692"/>
@@ -2435,7 +2435,7 @@ To toggle what kind of errors are shown, open view menu.</source>
     <message>
         <location filename="resultsview.cpp" line="575"/>
         <source>when checking a file</source>
-        <translation>ファイルをチェックするとき</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="resultsview.cpp" line="576"/>

gui/cppchecklibrarydata.cpp

@@ -46,8 +46,8 @@ static std::string mandatoryAttibuteMissing(const QXmlStreamReader &xmlReader, c
 {
     throw std::runtime_error(QObject::tr("line %1: Mandatory attribute '%2' missing in '%3'")
                              .arg(xmlReader.lineNumber())
-                             .arg(attributeName, xmlReader.name().toString())
+                             .arg(attributeName)
-                             .toStdString());
+                             .arg(xmlReader.name().toString()).toStdString());
 }
 
 static CppcheckLibraryData::Container loadContainer(QXmlStreamReader &xmlReader)

gui/csvreport.cpp

@@ -62,8 +62,8 @@ void CsvReport::writeError(const ErrorItem &error)
      */
 
     const QString file = QDir::toNativeSeparators(error.errorPath.back().file);
-    QString line = QString("%1,%2,").arg(file, error.errorPath.back().line);
+    QString line = QString("%1,%2,").arg(file).arg(error.errorPath.back().line);
-    line += QString("%1,%2,%3").arg(GuiSeverity::toString(error.severity), error.errorId, error.summary);
+    line += QString("%1,%2,%3").arg(GuiSeverity::toString(error.severity)).arg(error.errorId).arg(error.summary);
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     mTxtWriter << line << Qt::endl;
 #else

gui/librarydialog.cpp

@@ -121,7 +121,7 @@ void LibraryDialog::openCfg()
     if (!errmsg.isNull()) {
         QMessageBox msg(QMessageBox::Critical,
                         tr("Cppcheck"),
-                        tr("Failed to load %1. %2.").arg(selectedFile, errmsg),
+                        tr("Failed to load %1. %2.").arg(selectedFile).arg(errmsg),
                         QMessageBox::Ok,
                         this);
         msg.exec();
@@ -185,7 +185,7 @@ void LibraryDialog::saveCfgAs()
 
 void LibraryDialog::addFunction()
 {
-    auto *d = new LibraryAddFunctionDialog;
+    LibraryAddFunctionDialog *d = new LibraryAddFunctionDialog;
     if (d->exec() == QDialog::Accepted && !d->functionName().isEmpty()) {
 
         CppcheckLibraryData::Function f;

gui/main.cpp

@@ -39,6 +39,7 @@
 #include <QString>
 #include <QStringList>
 #include <QVariant>
+#include <QtCore>
 
 
 static void ShowUsage();
@@ -58,7 +59,7 @@ int main(int argc, char *argv[])
     QCoreApplication::setOrganizationName("Cppcheck");
     QCoreApplication::setApplicationName("Cppcheck-GUI");
 
-    auto* settings = new QSettings("Cppcheck", "Cppcheck-GUI", &app);
+    QSettings* settings = new QSettings("Cppcheck", "Cppcheck-GUI", &app);
 
     // Set data dir..
     const QStringList args = QApplication::arguments();
@@ -70,7 +71,7 @@ int main(int argc, char *argv[])
         return 0;
     }
 
-    auto* th = new TranslationHandler(&app);
+    TranslationHandler* th = new TranslationHandler(&app);
     th->setLanguage(settings->value(SETTINGS_LANGUAGE, th->suggestLanguage()).toString());
 
     if (!CheckArgs(QApplication::arguments()))

gui/mainwindow.cpp

@@ -247,7 +247,7 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
 
     for (int i = 0; i < mPlatforms.getCount(); i++) {
         PlatformData platform = mPlatforms.mPlatforms[i];
-        auto *action = new QAction(this);
+        QAction *action = new QAction(this);
         platform.mActMainWindow = action;
         mPlatforms.mPlatforms[i] = platform;
         action->setText(platform.mTitle);
@@ -392,10 +392,10 @@ void MainWindow::loadSettings()
     mUI->mActionToolBarFilter->setChecked(showFilterToolbar);
     mUI->mToolBarFilter->setVisible(showFilterToolbar);
 
-    const Standards::Language enforcedLanguage = (Standards::Language)mSettings->value(SETTINGS_ENFORCED_LANGUAGE, 0).toInt();
+    const Settings::Language enforcedLanguage = (Settings::Language)mSettings->value(SETTINGS_ENFORCED_LANGUAGE, 0).toInt();
-    if (enforcedLanguage == Standards::Language::CPP)
+    if (enforcedLanguage == Settings::CPP)
         mUI->mActionEnforceCpp->setChecked(true);
-    else if (enforcedLanguage == Standards::Language::C)
+    else if (enforcedLanguage == Settings::C)
         mUI->mActionEnforceC->setChecked(true);
     else
         mUI->mActionAutoDetectLanguage->setChecked(true);
@@ -469,11 +469,11 @@ void MainWindow::saveSettings() const
     mSettings->setValue(SETTINGS_TOOLBARS_FILTER_SHOW, mUI->mToolBarFilter->isVisible());
 
     if (mUI->mActionEnforceCpp->isChecked())
-        mSettings->setValue(SETTINGS_ENFORCED_LANGUAGE, Standards::Language::CPP);
+        mSettings->setValue(SETTINGS_ENFORCED_LANGUAGE, Settings::CPP);
     else if (mUI->mActionEnforceC->isChecked())
-        mSettings->setValue(SETTINGS_ENFORCED_LANGUAGE, Standards::Language::C);
+        mSettings->setValue(SETTINGS_ENFORCED_LANGUAGE, Settings::C);
     else
-        mSettings->setValue(SETTINGS_ENFORCED_LANGUAGE, Standards::Language::None);
+        mSettings->setValue(SETTINGS_ENFORCED_LANGUAGE, Settings::None);
 
     mApplications->saveSettings();
 
@@ -861,7 +861,7 @@ bool MainWindow::tryLoadLibrary(Library *library, const QString& filename)
     const Library::Error error = loadLibrary(library, filename);
     if (error.errorcode != Library::ErrorCode::OK) {
         if (error.errorcode == Library::ErrorCode::UNKNOWN_ELEMENT) {
-            QMessageBox::information(this, tr("Information"), tr("The library '%1' contains unknown elements:\n%2").arg(filename, error.reason.c_str()));
+            QMessageBox::information(this, tr("Information"), tr("The library '%1' contains unknown elements:\n%2").arg(filename).arg(error.reason.c_str()));
             return true;
         }
 
@@ -899,7 +899,7 @@ bool MainWindow::tryLoadLibrary(Library *library, const QString& filename)
         }
         if (!error.reason.empty())
             errmsg += " '" + QString::fromStdString(error.reason) + "'";
-        QMessageBox::information(this, tr("Information"), tr("Failed to load the selected library '%1'.\n%2").arg(filename, errmsg));
+        QMessageBox::information(this, tr("Information"), tr("Failed to load the selected library '%1'.\n%2").arg(filename).arg(errmsg));
         return false;
     }
     return true;
@@ -958,7 +958,7 @@ Settings MainWindow::getCppcheckSettings()
     {
         const QString cfgErr = QString::fromStdString(result.loadCppcheckCfg());
         if (!cfgErr.isEmpty())
-            QMessageBox::critical(this, tr("Error"), tr("Failed to load %1 - %2").arg("cppcheck.cfg", cfgErr));
+            QMessageBox::critical(this, tr("Error"), tr("Failed to load %1 - %2").arg("cppcheck.cfg").arg(cfgErr));
 
         const auto cfgAddons = result.addons;
         result.addons.clear();
@@ -1021,7 +1021,7 @@ Settings MainWindow::getCppcheckSettings()
             result.platform.loadFromFile(applicationFilePath.toStdString().c_str(), platform.toStdString());
         } else {
             for (int i = Platform::Type::Native; i <= Platform::Type::Unix64; i++) {
-                const auto p = (Platform::Type)i;
+                const Platform::Type p = (Platform::Type)i;
                 if (platform == Platform::toString(p)) {
                     result.platform.set(p);
                     break;
@@ -1091,7 +1091,7 @@ Settings MainWindow::getCppcheckSettings()
         result.platform.set((Platform::Type) mSettings->value(SETTINGS_CHECKED_PLATFORM, 0).toInt());
     result.standards.setCPP(mSettings->value(SETTINGS_STD_CPP, QString()).toString().toStdString());
     result.standards.setC(mSettings->value(SETTINGS_STD_C, QString()).toString().toStdString());
-    result.enforcedLang = (Standards::Language)mSettings->value(SETTINGS_ENFORCED_LANGUAGE, 0).toInt();
+    result.enforcedLang = (Settings::Language)mSettings->value(SETTINGS_ENFORCED_LANGUAGE, 0).toInt();
 
     if (result.jobs <= 1) {
         result.jobs = 1;
@@ -1468,21 +1468,21 @@ void MainWindow::about()
         msg.exec();
     }
     else {
-        auto *dlg = new AboutDialog(CppCheck::version(), CppCheck::extraVersion(), this);
+        AboutDialog *dlg = new AboutDialog(CppCheck::version(), CppCheck::extraVersion(), this);
         dlg->exec();
     }
 }
 
 void MainWindow::showLicense()
 {
-    auto *dlg = new FileViewDialog(":COPYING", tr("License"), this);
+    FileViewDialog *dlg = new FileViewDialog(":COPYING", tr("License"), this);
     dlg->resize(570, 400);
     dlg->exec();
 }
 
 void MainWindow::showAuthors()
 {
-    auto *dlg = new FileViewDialog(":AUTHORS", tr("Authors"), this);
+    FileViewDialog *dlg = new FileViewDialog(":AUTHORS", tr("Authors"), this);
     dlg->resize(350, 400);
     dlg->exec();
 }
@@ -1634,7 +1634,7 @@ void MainWindow::openHelpContents()
 
 void MainWindow::openOnlineHelp()
 {
-    auto *helpDialog = new HelpDialog;
+    HelpDialog *helpDialog = new HelpDialog;
     helpDialog->showMaximized();
 }
 
@@ -1787,7 +1787,7 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const bool check
             if (!errorMessage.isEmpty()) {
                 QMessageBox msg(QMessageBox::Critical,
                                 tr("Cppcheck"),
-                                tr("Failed to import '%1': %2\n\nAnalysis is stopped.").arg(prjfile, errorMessage),
+                                tr("Failed to import '%1': %2\n\nAnalysis is stopped.").arg(prjfile).arg(errorMessage),
                                 QMessageBox::Ok,
                                 this);
                 msg.exec();
@@ -1796,7 +1796,7 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const bool check
         } catch (InternalError &e) {
             QMessageBox msg(QMessageBox::Critical,
                             tr("Cppcheck"),
-                            tr("Failed to import '%1' (%2), analysis is stopped").arg(prjfile, QString::fromStdString(e.errorMessage)),
+                            tr("Failed to import '%1' (%2), analysis is stopped").arg(prjfile).arg(QString::fromStdString(e.errorMessage)),
                             QMessageBox::Ok,
                             this);
             msg.exec();
@@ -1923,7 +1923,7 @@ void MainWindow::enableProjectOpenActions(bool enable)
 
 void MainWindow::openRecentProject()
 {
-    auto *action = qobject_cast<QAction *>(sender());
+    QAction *action = qobject_cast<QAction *>(sender());
     if (!action)
         return;
     const QString project = action->data().toString();
@@ -2012,7 +2012,7 @@ void MainWindow::removeProjectMRU(const QString &project)
 
 void MainWindow::selectPlatform()
 {
-    auto *action = qobject_cast<QAction *>(sender());
+    QAction *action = qobject_cast<QAction *>(sender());
     if (action) {
         const Platform::Type platform = (Platform::Type) action->data().toInt();
         mSettings->setValue(SETTINGS_CHECKED_PLATFORM, platform);
@@ -2100,7 +2100,7 @@ void MainWindow::replyFinished(QNetworkReply *reply) {
                 }
                 mUI->mButtonHideInformation->setVisible(true);
                 mUI->mLabelInformation->setVisible(true);
-                mUI->mLabelInformation->setText(tr("New version available: %1. %2").arg(str.trimmed(), install));
+                mUI->mLabelInformation->setText(tr("New version available: %1. %2").arg(str.trimmed()).arg(install));
             }
         }
     }

gui/printablereport.cpp

@@ -46,7 +46,7 @@ void PrintableReport::writeError(const ErrorItem &error)
 {
     const QString file = QDir::toNativeSeparators(error.errorPath.back().file);
     QString line = QString("%1,%2,").arg(file).arg(error.errorPath.back().line);
-    line += QString("%1,%2").arg(GuiSeverity::toString(error.severity), error.summary);
+    line += QString("%1,%2").arg(GuiSeverity::toString(error.severity)).arg(error.summary);
 
     mFormattedReport += line;
     mFormattedReport += "\n";

gui/projectfiledialog.cpp

@@ -55,6 +55,7 @@
 #include <QSize>
 #include <QSpinBox>
 #include <QVariant>
+#include <QtCore>
 
 static constexpr char ADDON_MISRA[]   = "misra";
 static constexpr char CODING_STANDARD_MISRA_C_2023[] = "misra-c-2023";
@@ -182,7 +183,7 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, bool premium, QWi
     libs.sort();
     mUI->mLibraries->clear();
     for (const QString &lib : libs) {
-        auto* item = new QListWidgetItem(lib, mUI->mLibraries);
+        QListWidgetItem* item = new QListWidgetItem(lib, mUI->mLibraries);
         item->setFlags(item->flags() | Qt::ItemIsUserCheckable); // set checkable flag
         item->setCheckState(Qt::Unchecked); // AND initialize check state
     }
@@ -604,7 +605,7 @@ void ProjectFileDialog::setProjectConfigurations(const QStringList &configs)
     mUI->mListVsConfigs->clear();
     mUI->mListVsConfigs->setEnabled(!configs.isEmpty() && !mUI->mChkAllVsConfigs->isChecked());
     for (const QString &cfg : configs) {
-        auto* item = new QListWidgetItem(cfg, mUI->mListVsConfigs);
+        QListWidgetItem* item = new QListWidgetItem(cfg, mUI->mListVsConfigs);
         item->setFlags(item->flags() | Qt::ItemIsUserCheckable); // set checkable flag
         item->setCheckState(Qt::Unchecked);
     }
@@ -621,7 +622,7 @@ void ProjectFileDialog::addIncludeDir(const QString &dir)
         return;
 
     const QString newdir = QDir::toNativeSeparators(dir);
-    auto *item = new QListWidgetItem(newdir);
+    QListWidgetItem *item = new QListWidgetItem(newdir);
     item->setFlags(item->flags() | Qt::ItemIsEditable);
     mUI->mListIncludeDirs->addItem(item);
 }
@@ -632,7 +633,7 @@ void ProjectFileDialog::addCheckPath(const QString &path)
         return;
 
     const QString newpath = QDir::toNativeSeparators(path);
-    auto *item = new QListWidgetItem(newpath);
+    QListWidgetItem *item = new QListWidgetItem(newpath);
     item->setFlags(item->flags() | Qt::ItemIsEditable);
     mUI->mListCheckPaths->addItem(item);
 }
@@ -643,7 +644,7 @@ void ProjectFileDialog::addExcludePath(const QString &path)
         return;
 
     const QString newpath = QDir::toNativeSeparators(path);
-    auto *item = new QListWidgetItem(newpath);
+    QListWidgetItem *item = new QListWidgetItem(newpath);
     item->setFlags(item->flags() | Qt::ItemIsEditable);
     mUI->mListExcludedPaths->addItem(item);
 }

gui/resultstree.cpp

@@ -110,7 +110,7 @@ void ResultsTree::initialize(QSettings *settings, ApplicationList *list, ThreadH
 
 QStandardItem *ResultsTree::createNormalItem(const QString &name)
 {
-    auto *item = new QStandardItem(name);
+    QStandardItem *item = new QStandardItem(name);
     item->setData(name, Qt::ToolTipRole);
     item->setEditable(false);
     return item;
@@ -118,7 +118,7 @@ QStandardItem *ResultsTree::createNormalItem(const QString &name)
 
 QStandardItem *ResultsTree::createCheckboxItem(bool checked)
 {
-    auto *item = new QStandardItem;
+    QStandardItem *item = new QStandardItem;
     item->setCheckable(true);
     item->setCheckState(checked ? Qt::Checked : Qt::Unchecked);
     item->setEnabled(false);
@@ -127,7 +127,7 @@ QStandardItem *ResultsTree::createCheckboxItem(bool checked)
 
 QStandardItem *ResultsTree::createLineNumberItem(const QString &linenumber)
 {
-    auto *item = new QStandardItem();
+    QStandardItem *item = new QStandardItem();
     item->setData(QVariant(linenumber.toInt()), Qt::DisplayRole);
     item->setToolTip(linenumber);
     item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
@@ -611,7 +611,7 @@ void ResultsTree::contextMenuEvent(QContextMenuEvent * e)
 
         //Create a signal mapper so we don't have to store data to class
         //member variables
-        auto *signalMapper = new QSignalMapper(this);
+        QSignalMapper *signalMapper = new QSignalMapper(this);
 
         if (mContextItem && mApplications->getApplicationCount() > 0 && mContextItem->parent()) {
             //Create an action for the application
@@ -619,7 +619,7 @@ void ResultsTree::contextMenuEvent(QContextMenuEvent * e)
             if (defaultApplicationIndex < 0)
                 defaultApplicationIndex = 0;
             const Application& app = mApplications->getApplication(defaultApplicationIndex);
-            auto *start = new QAction(app.getName(), &menu);
+            QAction *start = new QAction(app.getName(), &menu);
             if (multipleSelection)
                 start->setDisabled(true);
 
@@ -646,11 +646,11 @@ void ResultsTree::contextMenuEvent(QContextMenuEvent * e)
             }
 
             //Create an action for the application
-            auto *recheckAction          = new QAction(tr("Recheck"), &menu);
+            QAction *recheckAction          = new QAction(tr("Recheck"), &menu);
-            auto *copyAction             = new QAction(tr("Copy"), &menu);
+            QAction *copyAction             = new QAction(tr("Copy"), &menu);
-            auto *hide                   = new QAction(tr("Hide"), &menu);
+            QAction *hide                   = new QAction(tr("Hide"), &menu);
-            auto *hideallid              = new QAction(tr("Hide all with id"), &menu);
+            QAction *hideallid              = new QAction(tr("Hide all with id"), &menu);
-            auto *opencontainingfolder   = new QAction(tr("Open containing folder"), &menu);
+            QAction *opencontainingfolder   = new QAction(tr("Open containing folder"), &menu);
 
             if (multipleSelection) {
                 hideallid->setDisabled(true);
@@ -668,7 +668,7 @@ void ResultsTree::contextMenuEvent(QContextMenuEvent * e)
             menu.addAction(hide);
             menu.addAction(hideallid);
 
-            auto *suppress = new QAction(tr("Suppress selected id(s)"), &menu);
+            QAction *suppress = new QAction(tr("Suppress selected id(s)"), &menu);
             {
                 QVariantMap data = mContextItem->data().toMap();
                 const QString messageId = data[ERRORID].toString();
@@ -691,7 +691,7 @@ void ResultsTree::contextMenuEvent(QContextMenuEvent * e)
                 menu.addSeparator();
                 QMenu *tagMenu = menu.addMenu(tr("Tag"));
                 {
-                    auto *action = new QAction(tr("No tag"), tagMenu);
+                    QAction *action = new QAction(tr("No tag"), tagMenu);
                     tagMenu->addAction(action);
                     connect(action, &QAction::triggered, [=]() {
                         tagSelectedItems(QString());
@@ -699,7 +699,7 @@ void ResultsTree::contextMenuEvent(QContextMenuEvent * e)
                 }
 
                 for (const QString& tagstr : currentProject->getTags()) {
-                    auto *action = new QAction(tagstr, tagMenu);
+                    QAction *action = new QAction(tagstr, tagMenu);
                     tagMenu->addAction(action);
                     connect(action, &QAction::triggered, [=]() {
                         tagSelectedItems(tagstr);
@@ -816,7 +816,7 @@ void ResultsTree::startApplication(const QStandardItem *target, int application)
         }
 #endif // Q_OS_WIN
 
-        const QString cmdLine = QString("%1 %2").arg(program, params);
+        const QString cmdLine = QString("%1 %2").arg(program).arg(params);
 
         // this is reported as deprecated in Qt 5.15.2 but no longer in Qt 6
 #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))

gui/resultsview.cpp

@@ -436,7 +436,7 @@ void ResultsView::readErrorsXml(const QString &filename)
 
 void ResultsView::updateDetails(const QModelIndex &index)
 {
-    const auto *model = qobject_cast<const QStandardItemModel*>(mUI->mTree->model());
+    const QStandardItemModel *model = qobject_cast<const QStandardItemModel*>(mUI->mTree->model());
     QStandardItem *item = model->itemFromIndex(index);
 
     if (!item) {
@@ -463,7 +463,7 @@ void ResultsView::updateDetails(const QModelIndex &index)
 
     const QString file0 = data["file0"].toString();
     if (!file0.isEmpty() && Path::isHeader(data["file"].toString().toStdString()))
-        formattedMsg += QString("\n\n%1: %2").arg(tr("First included by"), QDir::toNativeSeparators(file0));
+        formattedMsg += QString("\n\n%1: %2").arg(tr("First included by")).arg(QDir::toNativeSeparators(file0));
 
     if (data["cwe"].toInt() > 0)
         formattedMsg.prepend("CWE: " + QString::number(data["cwe"].toInt()) + "\n");

gui/settingsdialog.cpp

@@ -140,7 +140,7 @@ void SettingsDialog::initTranslationsList()
 {
     const QString current = mTranslator->getCurrentLanguage();
     for (const TranslationInfo& translation : mTranslator->getTranslations()) {
-        auto *item = new QListWidgetItem;
+        QListWidgetItem *item = new QListWidgetItem;
         item->setText(translation.mName);
         item->setData(mLangCodeRole, QVariant(translation.mCode));
         mUI->mListLanguages->addItem(item);

gui/statsdialog.cpp

@@ -182,9 +182,9 @@ void StatsDialog::pdfExport()
         "<font color=\"blue\"><h3>%9   :   %10</h3></font>\n"
         "<font color=\"blue\"><h3>%11  :   %12</h3></font>\n"
         "<font color=\"purple\"><h3>%13  :   %14</h3></font>\n")
-                         .arg(tr("Statistics"),
+                         .arg(tr("Statistics"))
-                              QDate::currentDate().toString("dd.MM.yyyy"),
+                         .arg(QDate::currentDate().toString("dd.MM.yyyy"))
-                              tr("Errors"))
+                         .arg(tr("Errors"))
                          .arg(mStatistics->getCount(CPPCHECK,ShowTypes::ShowErrors))
                          .arg(tr("Warnings"))
                          .arg(mStatistics->getCount(CPPCHECK,ShowTypes::ShowWarnings))
@@ -246,17 +246,17 @@ void StatsDialog::copyToClipboard()
         "\t%8:\t%9\n"
         "\t%10:\t%11\n"
         )
-                             .arg(projSettings,
+                             .arg(projSettings)
-                                  project,
+                             .arg(project)
-                                  mUI->mProject->text(),
+                             .arg(mUI->mProject->text())
-                                  paths,
+                             .arg(paths)
-                                  mUI->mPaths->text(),
+                             .arg(mUI->mPaths->text())
-                                  incPaths,
+                             .arg(incPaths)
-                                  mUI->mIncludePaths->text(),
+                             .arg(mUI->mIncludePaths->text())
-                                  defines)
+                             .arg(defines)
-                             .arg(mUI->mDefines->text(),
+                             .arg(mUI->mDefines->text())
-                                  undefines,
+                             .arg(undefines)
-                                  mUI->mUndefines->text());
+                             .arg(mUI->mUndefines->text());
 
     const QString previous = QString(
         "%1\n"
@@ -264,13 +264,13 @@ void StatsDialog::copyToClipboard()
         "\t%4:\t%5\n"
         "\t%6:\t%7\n"
         )
-                             .arg(prevScan,
+                             .arg(prevScan)
-                                  selPath,
+                             .arg(selPath)
-                                  mUI->mPath->text(),
+                             .arg(mUI->mPath->text())
-                                  numFiles,
+                             .arg(numFiles)
-                                  mUI->mNumberOfFilesScanned->text(),
+                             .arg(mUI->mNumberOfFilesScanned->text())
-                                  duration,
+                             .arg(duration)
-                                  mUI->mScanDuration->text());
+                             .arg(mUI->mScanDuration->text());
 
     const QString statistics = QString(
         "%1\n"
@@ -281,8 +281,8 @@ void StatsDialog::copyToClipboard()
         "\t%10:\t%11\n"
         "\t%12:\t%13\n"
         )
-                               .arg(stats,
+                               .arg(stats)
-                                    errors)
+                               .arg(errors)
                                .arg(mStatistics->getCount(CPPCHECK,ShowTypes::ShowErrors))
                                .arg(warnings)
                                .arg(mStatistics->getCount(CPPCHECK,ShowTypes::ShowWarnings))
@@ -308,17 +308,17 @@ void StatsDialog::copyToClipboard()
         " <tr><th>%10:</th><td>%11</td></tr>\n"
         "</table>\n"
         )
-                                 .arg(projSettings,
+                                 .arg(projSettings)
-                                      project,
+                                 .arg(project)
-                                      mUI->mProject->text(),
+                                 .arg(mUI->mProject->text())
-                                      paths,
+                                 .arg(paths)
-                                      mUI->mPaths->text(),
+                                 .arg(mUI->mPaths->text())
-                                      incPaths,
+                                 .arg(incPaths)
-                                      mUI->mIncludePaths->text(),
+                                 .arg(mUI->mIncludePaths->text())
-                                      defines)
+                                 .arg(defines)
-                                 .arg(mUI->mDefines->text(),
+                                 .arg(mUI->mDefines->text())
-                                      undefines,
+                                 .arg(undefines)
-                                      mUI->mUndefines->text());
+                                 .arg(mUI->mUndefines->text());
 
     const QString htmlPrevious = QString(
         "<h3>%1</h3>\n"
@@ -328,13 +328,13 @@ void StatsDialog::copyToClipboard()
         " <tr><th>%6:</th><td>%7</td></tr>\n"
         "</table>\n"
         )
-                                 .arg(prevScan,
+                                 .arg(prevScan)
-                                      selPath,
+                                 .arg(selPath)
-                                      mUI->mPath->text(),
+                                 .arg(mUI->mPath->text())
-                                      numFiles,
+                                 .arg(numFiles)
-                                      mUI->mNumberOfFilesScanned->text(),
+                                 .arg(mUI->mNumberOfFilesScanned->text())
-                                      duration,
+                                 .arg(duration)
-                                      mUI->mScanDuration->text());
+                                 .arg(mUI->mScanDuration->text());
 
     const QString htmlStatistics = QString(
         "<h3>%1</h3>\n"
@@ -346,8 +346,8 @@ void StatsDialog::copyToClipboard()
         " <tr><th>%12:</th><td>%13</td></tr>\n"
         "</table>\n"
         )
-                                   .arg(stats,
+                                   .arg(stats)
-                                        errors)
+                                   .arg(errors)
                                    .arg(mStatistics->getCount(CPPCHECK,ShowTypes::ShowErrors))
                                    .arg(warnings)
                                    .arg(mStatistics->getCount(CPPCHECK,ShowTypes::ShowWarnings))
@@ -362,7 +362,7 @@ void StatsDialog::copyToClipboard()
 
     const QString htmlSummary = htmlSettings + htmlPrevious + htmlStatistics;
 
-    auto *mimeData = new QMimeData();
+    QMimeData *mimeData = new QMimeData();
     mimeData->setText(textSummary);
     mimeData->setHtml(htmlSummary);
     clipboard->setMimeData(mimeData);
@@ -384,14 +384,14 @@ void StatsDialog::setStatistics(const CheckStatistics *stats)
 #ifdef QT_CHARTS_LIB
 QChartView *createChart(const QString &statsFile, const QString &tool)
 {
-    auto *chart = new QChart;
+    QChart *chart = new QChart;
     chart->addSeries(numberOfReports(statsFile, tool + "-error"));
     chart->addSeries(numberOfReports(statsFile, tool + "-warning"));
     chart->addSeries(numberOfReports(statsFile, tool + "-style"));
     chart->addSeries(numberOfReports(statsFile, tool + "-performance"));
     chart->addSeries(numberOfReports(statsFile, tool + "-portability"));
 
-    auto *axisX = new QDateTimeAxis;
+    QDateTimeAxis *axisX = new QDateTimeAxis;
     axisX->setTitleText("Date");
     chart->addAxis(axisX, Qt::AlignBottom);
 
@@ -399,7 +399,7 @@ QChartView *createChart(const QString &statsFile, const QString &tool)
         s->attachAxis(axisX);
     }
 
-    auto *axisY = new QValueAxis;
+    QValueAxis *axisY = new QValueAxis;
     axisY->setLabelFormat("%i");
     axisY->setTitleText("Count");
     chart->addAxis(axisY, Qt::AlignLeft);
@@ -407,7 +407,7 @@ QChartView *createChart(const QString &statsFile, const QString &tool)
     qreal maxY = 0;
     for (QAbstractSeries *s : chart->series()) {
         s->attachAxis(axisY);
-        if (const auto *ls = dynamic_cast<const QLineSeries*>(s)) {
+        if (const QLineSeries *ls = dynamic_cast<const QLineSeries*>(s)) {
             for (QPointF p : ls->points()) {
                 if (p.y() > maxY)
                     maxY = p.y();
@@ -419,14 +419,14 @@ QChartView *createChart(const QString &statsFile, const QString &tool)
     //chart->createDefaultAxes();
     chart->setTitle(tool);
 
-    auto *chartView = new QChartView(chart);
+    QChartView *chartView = new QChartView(chart);
     chartView->setRenderHint(QPainter::Antialiasing);
     return chartView;
 }
 
 QLineSeries *numberOfReports(const QString &fileName, const QString &severity)
 {
-    auto *series = new QLineSeries();
+    QLineSeries *series = new QLineSeries();
     series->setName(severity);
     QFile f(fileName);
     if (f.open(QIODevice::ReadOnly | QIODevice::Text)) {

gui/test/filelist/CMakeLists.txt

@@ -10,8 +10,7 @@ add_executable(test-filelist
         ${CMAKE_SOURCE_DIR}/lib/utils.cpp
         $<TARGET_OBJECTS:simplecpp_objs>
         )
-target_include_directories(test-filelist PRIVATE ${CMAKE_SOURCE_DIR}/gui ${CMAKE_SOURCE_DIR}/lib)
+target_include_directories(test-filelist PRIVATE ${CMAKE_SOURCE_DIR}/gui ${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/externals/simplecpp)
-target_externals_include_directories(test-filelist PRIVATE ${CMAKE_SOURCE_DIR}/externals/simplecpp)
 target_compile_definitions(test-filelist PRIVATE SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
 target_link_libraries(test-filelist ${QT_CORE_LIB} ${QT_TEST_LIB})
 

htmlreport/cppcheck-htmlreport

@@ -408,8 +408,8 @@ def filter_bar(enabled):
     ,'\n        | '
     ,''.join([filter_button(enabled, tool, 'toggleTool') for tool in ['cppcheck', 'clang-tidy']])
     ,'\n        | '
-    ,'\n        <label class="severityHeader">File: <input type="search" oninput="filterFile(this.value)"/></label>'
+    ,'\n        <label class="severityHeader">File: <input type="text" oninput="filterFile(this.value)"/></label>'
-    ,'\n        <label class="severityHeader">Filter: <input type="search" oninput="filterText(this.value)"/></label>'
+    ,'\n        <label class="severityHeader">Filter: <input type="text" oninput="filterText(this.value)"/></label>'
     ,'\n      </div>\n'])
 
 def git_blame(errors, path, file, blame_options):

lib/CMakeLists.txt

@@ -43,14 +43,14 @@ if (BUILD_CORE_DLL)
 else()
     add_library(cppcheck-core OBJECT ${srcs_lib} ${hdrs})
 endif()
-target_externals_include_directories(cppcheck-core PRIVATE ${PROJECT_SOURCE_DIR}/externals/)
+target_include_directories(cppcheck-core PRIVATE ${PROJECT_SOURCE_DIR}/externals/)
 if(USE_BUNDLED_TINYXML2)
-    target_externals_include_directories(cppcheck-core PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)
+    target_include_directories(cppcheck-core PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)
 else()
     target_include_directories(cppcheck-core SYSTEM PRIVATE ${tinyxml2_INCLUDE_DIRS})
 endif()
-target_externals_include_directories(cppcheck-core PRIVATE ${PROJECT_SOURCE_DIR}/externals/picojson/)
+target_include_directories(cppcheck-core PRIVATE ${PROJECT_SOURCE_DIR}/externals/picojson/)
-target_externals_include_directories(cppcheck-core PRIVATE ${PROJECT_SOURCE_DIR}/externals/simplecpp/)
+target_include_directories(cppcheck-core PRIVATE ${PROJECT_SOURCE_DIR}/externals/simplecpp/)
 if (HAVE_RULES)
     target_include_directories(cppcheck-core SYSTEM PRIVATE ${PCRE_INCLUDE})
 endif()

lib/addoninfo.cpp

@@ -52,73 +52,42 @@ static std::string parseAddonInfo(AddonInfo& addoninfo, const picojson::value &j
         return "Loading " + fileName + " failed. " + json_error;
     }
     if (!json.is<picojson::object>())
-        return "Loading " + fileName + " failed. JSON is not an object.";
+        return "Loading " + fileName + " failed. Bad json.";
-
+    picojson::object obj = json.get<picojson::object>();
-    // TODO: remove/complete default value handling for missing fields
+    if (obj.count("args")) {
-    const picojson::object& obj = json.get<picojson::object>();
+        if (!obj["args"].is<picojson::array>())
-    {
+            return "Loading " + fileName + " failed. args must be array.";
-        const auto it = obj.find("args");
+        for (const picojson::value &v : obj["args"].get<picojson::array>())
-        if (it != obj.cend()) {
+            addoninfo.args += " " + v.get<std::string>();
-            const auto& val = it->second;
-            if (!val.is<picojson::array>())
-                return "Loading " + fileName + " failed. 'args' must be an array.";
-            for (const picojson::value &v : val.get<picojson::array>()) {
-                if (!v.is<std::string>())
-                    return "Loading " + fileName + " failed. 'args' entry is not a string.";
-                addoninfo.args += " " + v.get<std::string>();
-            }
-        }
     }
 
-    {
+    if (obj.count("ctu")) {
-        const auto it = obj.find("ctu");
+        // ctu is specified in the config file
-        if (it != obj.cend()) {
+        if (!obj["ctu"].is<bool>())
-            const auto& val = it->second;
+            return "Loading " + fileName + " failed. ctu must be boolean.";
-            // ctu is specified in the config file
+        addoninfo.ctu = obj["ctu"].get<bool>();
-            if (!val.is<bool>())
+    } else {
-                return "Loading " + fileName + " failed. 'ctu' must be a boolean.";
+        addoninfo.ctu = false;
-            addoninfo.ctu = val.get<bool>();
-        }
-        else {
-            addoninfo.ctu = false;
-        }
     }
 
-    {
+    if (obj.count("python")) {
-        const auto it = obj.find("python");
+        // Python was defined in the config file
-        if (it != obj.cend()) {
+        if (obj["python"].is<picojson::array>()) {
-            const auto& val = it->second;
+            return "Loading " + fileName +" failed. python must not be an array.";
-            // Python was defined in the config file
-            if (!val.is<std::string>()) {
-                return "Loading " + fileName +" failed. 'python' must be a string.";
-            }
-            addoninfo.python = val.get<std::string>();
-        }
-        else {
-            addoninfo.python = "";
         }
+        addoninfo.python = obj["python"].get<std::string>();
+    } else {
+        addoninfo.python = "";
     }
 
-    {
+    if (obj.count("executable")) {
-        const auto it = obj.find("executable");
+        if (!obj["executable"].is<std::string>())
-        if (it != obj.cend()) {
+            return "Loading " + fileName + " failed. executable must be a string.";
-            const auto& val = it->second;
+        addoninfo.executable = getFullPath(obj["executable"].get<std::string>(), fileName);
-            if (!val.is<std::string>())
+        return "";
-                return "Loading " + fileName + " failed. 'executable' must be a string.";
-            addoninfo.executable = getFullPath(val.get<std::string>(), fileName);
-            return ""; // TODO: why bail out?
-        }
     }
 
-    const auto it = obj.find("script");
+    return addoninfo.getAddonInfo(obj["script"].get<std::string>(), exename);
-    if (it == obj.cend())
-        return "Loading " + fileName + " failed. 'script' is missing.";
-
-    const auto& val = it->second;
-    if (!val.is<std::string>())
-        return "Loading " + fileName + " failed. 'script' must be a string.";
-
-    return addoninfo.getAddonInfo(val.get<std::string>(), exename);
 }
 
 std::string AddonInfo::getAddonInfo(const std::string &fileName, const std::string &exename) {

lib/analyzer.h

@@ -181,8 +181,6 @@ struct Analyzer {
     virtual bool stopOnCondition(const Token* condTok) const = 0;
     /// The condition that will be assumed during analysis
     virtual void assume(const Token* tok, bool state, unsigned int flags = 0) = 0;
-    /// Update the state of the program at the token
-    virtual void updateState(const Token* tok) = 0;
     /// Return analyzer for expression at token
     virtual ValuePtr<Analyzer> reanalyze(Token* tok, const std::string& msg = emptyString) const = 0;
     virtual bool invalid() const {

lib/astutils.cpp

@@ -1020,7 +1020,7 @@ bool isAliasOf(const Token* tok, const Token* expr, int* indirect, bool* inconcl
                 if (val.isLocalLifetimeValue() || (pointer && val.isSymbolicValue() && val.intvalue == 0)) {
                     if (findAstNode(val.tokvalue,
                                     [&](const Token* aliasTok) {
-                        return aliasTok != childTok && aliasTok->exprId() == childTok->exprId();
+                        return aliasTok->exprId() == childTok->exprId();
                     })) {
                         if (val.isInconclusive() && inconclusive != nullptr) {
                             value = &val;
@@ -2651,11 +2651,8 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings *settings,
         const Token * ptok = tok2;
         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, indirect, settings, &inconclusive);
         isChanged |= inconclusive;
         if (isChanged)
             return true;
@@ -3260,8 +3257,6 @@ static ExprUsage getFunctionUsage(const Token* tok, int indirect, const Settings
                 continue;
             if (arg->isReference())
                 return ExprUsage::PassedByReference;
-            if (arg->isPointer() && indirect == 1)
-                return ExprUsage::PassedByReference;
         }
         if (!args.empty() && indirect == 0 && !addressOf)
             return ExprUsage::Used;
@@ -3306,8 +3301,6 @@ ExprUsage getExprUsage(const Token* tok, int indirect, const Settings* settings,
             parent = parent->astParent();
         if (Token::Match(parent, "%assign%") && (astIsRHS(tok) || astIsLHS(parent->astOperand1())))
             return ExprUsage::NotUsed;
-        if (Token::Match(parent, "++|--"))
-            return ExprUsage::NotUsed;
         if (parent->isConstOp())
             return ExprUsage::NotUsed;
         if (parent->isCast())

lib/check.cpp

@@ -88,7 +88,7 @@ bool Check::wrongData(const Token *tok, const char *str)
 
 std::list<Check *> &Check::instances()
 {
-#ifdef __SVR4
+#if defined(__SVR4) || defined(__amigaos4__) 
     // 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 *>;

lib/checkbufferoverrun.cpp

@@ -948,7 +948,7 @@ bool CheckBufferOverrun::isCtuUnsafePointerArith(const Settings *settings, const
 /** @brief Parse current TU and extract file info */
 Check::FileInfo *CheckBufferOverrun::getFileInfo(const Tokenizer *tokenizer, const Settings *settings) const
 {
-    auto *fileInfo = new MyFileInfo;
+    MyFileInfo *fileInfo = new MyFileInfo;
     fileInfo->unsafeArrayIndex = CTU::getUnsafeUsage(tokenizer, settings, isCtuUnsafeArrayIndex);
     fileInfo->unsafePointerArith = CTU::getUnsafeUsage(tokenizer, settings, isCtuUnsafePointerArith);
     if (fileInfo->unsafeArrayIndex.empty() && fileInfo->unsafePointerArith.empty()) {
@@ -964,7 +964,7 @@ Check::FileInfo * CheckBufferOverrun::loadFileInfoFromXml(const tinyxml2::XMLEle
     const std::string arrayIndex("array-index");
     const std::string pointerArith("pointer-arith");
 
-    auto *fileInfo = new MyFileInfo;
+    MyFileInfo *fileInfo = new MyFileInfo;
     for (const tinyxml2::XMLElement *e = xmlElement->FirstChildElement(); e; e = e->NextSiblingElement()) {
         if (e->Name() == arrayIndex)
             fileInfo->unsafeArrayIndex = CTU::loadUnsafeUsageListFromXml(e);

lib/checkclass.cpp

@@ -2633,7 +2633,6 @@ namespace { // avoid one-definition-rule violation
 
         const Variable *var;
         const Token *tok;
-        std::vector<const Variable*> initArgs;
     };
 }
 
@@ -2664,44 +2663,25 @@ void CheckClass::initializerListOrder()
                     tok = tok->next();
 
                     // find all variable initializations in list
-                    for (; tok && tok != func->functionScope->bodyStart; tok = tok->next()) {
+                    while (tok && tok != func->functionScope->bodyStart) {
                         if (Token::Match(tok, "%name% (|{")) {
                             const Variable *var = scope->getVariable(tok->str());
                             if (var)
                                 vars.emplace_back(var, tok);
-                            else
-                                continue;
 
-                            const Token* const end = tok->next()->link();
+                            if (Token::Match(tok->tokAt(2), "%name% =")) {
-                            for (; tok != end; tok = tok->next()) {
+                                var = scope->getVariable(tok->strAt(2));
-                                if (const Variable* argVar = scope->getVariable(tok->str())) {
+
-                                    if (scope != argVar->scope())
+                                if (var)
-                                        continue;
+                                    vars.emplace_back(var, tok->tokAt(2));
-                                    if (argVar->isStatic())
-                                        continue;
-                                    if (tok->variable() && tok->variable()->isArgument())
-                                        continue;
-                                    if (var->isPointer() && (argVar->isArray() || Token::simpleMatch(tok->astParent(), "&")))
-                                        continue;
-                                    if (var->isReference())
-                                        continue;
-                                    if (Token::simpleMatch(tok->astParent(), "="))
-                                        continue;
-                                    vars.back().initArgs.emplace_back(argVar);
-                                }
                             }
-                        }
+                            tok = tok->next()->link()->next();
+                        } else
+                            tok = tok->next();
                     }
 
-                    for (int j = 0; j < vars.size(); j++) {
+                    // need at least 2 members to have out of order initialization
-                        // check for use of uninitialized arguments
+                    for (int j = 1; j < vars.size(); j++) {
-                        for (const auto& arg : vars[j].initArgs)
-                            if (vars[j].var->index() < arg->index())
-                                initializerListError(vars[j].tok, vars[j].var->nameToken(), scope->className, vars[j].var->name(), /*isArgument*/ true);
-
-                        // need at least 2 members to have out of order initialization
-                        if (j == 0)
-                            continue;
                         // check for out of order initialization
                         if (vars[j].var->index() < vars[j - 1].var->index())
                             initializerListError(vars[j].tok,vars[j].var->nameToken(), scope->className, vars[j].var->name());
@@ -2712,18 +2692,15 @@ void CheckClass::initializerListOrder()
     }
 }
 
-void CheckClass::initializerListError(const Token *tok1, const Token *tok2, const std::string &classname, const std::string &varname, bool isArgument)
+void CheckClass::initializerListError(const Token *tok1, const Token *tok2, const std::string &classname, const std::string &varname)
 {
     std::list<const Token *> toks = { tok1, tok2 };
-    const std::string msg = isArgument ?
-                            "Member variable '$symbol' uses an uninitialized argument due to the order of declarations." :
-                            "Member variable '$symbol' is in the wrong place in the initializer list.";
     reportError(toks, Severity::style, "initializerList",
-                "$symbol:" + classname + "::" + varname + '\n' +
+                "$symbol:" + classname + "::" + varname +"\n"
-                msg + '\n' +
+                "Member variable '$symbol' is in the wrong place in the initializer list.\n"
-                msg + ' ' +
+                "Member variable '$symbol' is in the wrong place in the initializer list. "
                 "Members are initialized in the order they are declared, not in the "
-                "order they are in the initializer list. Keeping the initializer list "
+                "order they are in the initializer list.  Keeping the initializer list "
                 "in the same order that the members were declared prevents order dependent "
                 "initialization errors.", CWE398, Certainty::inconclusive);
 }
@@ -3011,8 +2988,7 @@ static std::vector<DuplMemberFuncInfo> getDuplInheritedMemberFunctionsRecursive(
                 if (classFuncIt.name() == parentClassFuncIt.name() &&
                     (parentClassFuncIt.access != AccessControl::Private || !skipPrivate) &&
                     !classFuncIt.isConstructor() && !classFuncIt.isDestructor() &&
-                    classFuncIt.argsMatch(parentClassIt.type->classScope, parentClassFuncIt.argDef, classFuncIt.argDef, emptyString, 0) &&
+                    classFuncIt.argsMatch(parentClassIt.type->classScope, parentClassFuncIt.argDef, classFuncIt.argDef, emptyString, 0))
-                    (classFuncIt.isConst() == parentClassFuncIt.isConst() || Function::returnsConst(&classFuncIt) == Function::returnsConst(&parentClassFuncIt)))
                     results.emplace_back(&classFuncIt, &parentClassFuncIt, &parentClassIt);
             }
         }
@@ -3533,14 +3509,14 @@ Check::FileInfo *CheckClass::getFileInfo(const Tokenizer *tokenizer, const Setti
     if (classDefinitions.empty())
         return nullptr;
 
-    auto *fileInfo = new MyFileInfo;
+    MyFileInfo *fileInfo = new MyFileInfo;
     fileInfo->classDefinitions.swap(classDefinitions);
     return fileInfo;
 }
 
 Check::FileInfo * CheckClass::loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement) const
 {
-    auto *fileInfo = new MyFileInfo;
+    MyFileInfo *fileInfo = new MyFileInfo;
     for (const tinyxml2::XMLElement *e = xmlElement->FirstChildElement(); e; e = e->NextSiblingElement()) {
         if (std::strcmp(e->Name(), "class") != 0)
             continue;

lib/checkclass.h

@@ -199,7 +199,7 @@ private:
     void operatorEqToSelfError(const Token *tok);
     void checkConstError(const Token *tok, const std::string &classname, const std::string &funcname, bool suggestStatic);
     void checkConstError2(const Token *tok1, const Token *tok2, const std::string &classname, const std::string &funcname, bool suggestStatic);
-    void initializerListError(const Token *tok1,const Token *tok2, const std::string & classname, const std::string &varname, bool isArgument = false);
+    void initializerListError(const Token *tok1,const Token *tok2, const std::string & classname, const std::string &varname);
     void suggestInitializationList(const Token *tok, const std::string& varname);
     void selfInitializationError(const Token* tok, const std::string& varname);
     void pureVirtualFunctionCallInConstructorError(const Function * scopeFunction, const std::list<const Token *> & tokStack, const std::string &purefuncname);

lib/checkcondition.cpp

@@ -417,6 +417,8 @@ 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)
 {
+    if (tok && (diag(tok) | diag(tok->astParent())))
+        return;
     std::ostringstream expression;
     expression << std::hex << "(X " << bitop << " 0x" << value1 << ") " << op << " 0x" << value2;
 
@@ -1285,15 +1287,15 @@ void CheckCondition::checkIncorrectLogicOperator()
                 // 5 => testvalue is larger than both value1 and value2
                 bool result1, result2;
                 if (isfloat) {
-                    const auto testvalue = getvalue<double>(test, d1, d2);
+                    const double testvalue = getvalue<double>(test, d1, d2);
                     result1 = checkFloatRelation(op1, testvalue, d1);
                     result2 = checkFloatRelation(op2, testvalue, d2);
                 } else if (useUnsignedInt) {
-                    const auto testvalue = getvalue<MathLib::biguint>(test, u1, u2);
+                    const MathLib::biguint testvalue = getvalue<MathLib::biguint>(test, u1, u2);
                     result1 = checkIntRelation(op1, testvalue, u1);
                     result2 = checkIntRelation(op2, testvalue, u2);
                 } else {
-                    const auto testvalue = getvalue<MathLib::bigint>(test, i1, i2);
+                    const MathLib::bigint testvalue = getvalue<MathLib::bigint>(test, i1, i2);
                     result1 = checkIntRelation(op1, testvalue, i1);
                     result2 = checkIntRelation(op2, testvalue, i2);
                 }

lib/checkleakautovar.cpp

@@ -32,7 +32,6 @@
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
-#include "tokenlist.h"
 #include "utils.h"
 #include "vfvalue.h"
 
@@ -467,9 +466,6 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
             const Token * closingParenthesis = tok->linkAt(1);
             for (const Token *innerTok = tok->tokAt(2); innerTok && innerTok != closingParenthesis; innerTok = innerTok->next()) {
                 // TODO: replace with checkTokenInsideExpression()
-                const Token* const openingPar = isFunctionCall(innerTok);
-                if (!openingPar)
-                    checkTokenInsideExpression(innerTok, varInfo);
 
                 if (!isLocalVarNoAutoDealloc(innerTok, mTokenizer->isCPP()))
                     continue;
@@ -506,6 +502,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                 }
 
                 // check for function call
+                const Token * const openingPar = isFunctionCall(innerTok);
                 if (openingPar) {
                     const Library::AllocFunc* allocFunc = mSettings->library.getDeallocFuncInfo(innerTok);
                     // innerTok is a function name
@@ -808,15 +805,14 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
             const Token * vtok = typeEndTok->tokAt(3);
             const VarInfo::AllocInfo allocation(af ? af->groupId : (arrayDelete ? NEW_ARRAY : NEW), VarInfo::OWNED, ftok);
             changeAllocStatus(varInfo, allocation, vtok, vtok);
-        } else if (Token::Match(tok, "%var% ."))
+        }
-            checkTokenInsideExpression(tok, varInfo);
     }
     ret(endToken, varInfo, true);
     return true;
 }
 
 
-const Token * CheckLeakAutoVar::checkTokenInsideExpression(const Token * const tok, VarInfo &varInfo, bool inFuncCall)
+const Token * CheckLeakAutoVar::checkTokenInsideExpression(const Token * const tok, VarInfo &varInfo)
 {
     // Deallocation and then dereferencing pointer..
     if (tok->varId() > 0) {
@@ -842,7 +838,7 @@ const Token * CheckLeakAutoVar::checkTokenInsideExpression(const Token * const t
                 if (rhs->varId() == tok->varId()) {
                     // simple assignment
                     varInfo.erase(tok->varId());
-                } else if (rhs->astParent() && rhs->str() == "(" && !mSettings->library.returnValue(rhs->astOperand1()).empty()) {
+                } else if (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());
                     if (startsWith(returnValue, "arg")) {
@@ -863,7 +859,7 @@ const Token * CheckLeakAutoVar::checkTokenInsideExpression(const Token * const t
     }
 
     // check for function call
-    const Token * const openingPar = inFuncCall ? nullptr : isFunctionCall(tok);
+    const Token * const openingPar = isFunctionCall(tok);
     if (openingPar) {
         const Library::AllocFunc* allocFunc = mSettings->library.getDeallocFuncInfo(tok);
         VarInfo::AllocInfo alloc(allocFunc ? allocFunc->groupId : 0, VarInfo::DEALLOC, tok);
@@ -934,7 +930,8 @@ 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)
 {
     // Ignore function call?
-    const bool isLeakIgnore = mSettings->library.isLeakIgnore(mSettings->library.getFunctionName(tokName));
+    if (mSettings->library.isLeakIgnore(mSettings->library.getFunctionName(tokName)))
+        return;
     if (mSettings->library.getReallocFuncInfo(tokName))
         return;
 
@@ -993,8 +990,6 @@ void CheckLeakAutoVar::functionCall(const Token *tokName, const Token *tokOpenin
                         varAlloc.allocTok = arg;
                     }
                 }
-                else if (isLeakIgnore)
-                    checkTokenInsideExpression(arg, varInfo);
                 else
                     changeAllocStatus(varInfo, dealloc.type == 0 ? allocation : dealloc, tokName, arg);
             }
@@ -1046,14 +1041,7 @@ void CheckLeakAutoVar::functionCall(const Token *tokName, const Token *tokOpenin
             const VarInfo::AllocInfo sp_allocation(sp_af ? sp_af->groupId : (arrayDelete ? NEW_ARRAY : NEW), VarInfo::OWNED, allocTok);
             changeAllocStatus(varInfo, sp_allocation, vtok, vtok);
         } else {
-            const Token* const nextArg = funcArg->nextArgument();
+            checkTokenInsideExpression(arg, varInfo);
-            while (arg && ((nextArg && arg != nextArg) || (!nextArg && arg != tokOpeningPar->link()))) {
-                checkTokenInsideExpression(arg, varInfo, /*inFuncCall*/ isLeakIgnore);
-
-                if (isLambdaCaptureList(arg))
-                    break;
-                arg = arg->next();
-            }
         }
         // TODO: check each token in argument expression (could contain multiple variables)
         argNr++;
@@ -1119,7 +1107,7 @@ void CheckLeakAutoVar::ret(const Token *tok, VarInfo &varInfo, const bool isEndO
             for (const Token *tok2 = tok; tok2; tok2 = tok2->next()) {
                 if (tok2->str() == ";")
                     break;
-                if (!Token::Match(tok2, "return|(|{|,|*"))
+                if (!Token::Match(tok2, "return|(|{|,"))
                     continue;
 
                 const Token* tok3 = tok2->next();

lib/checkleakautovar.h

@@ -135,7 +135,7 @@ private:
      * @param varInfo Variable info
      * @return next token to process (if no other checks needed for this token). NULL if other checks could be performed.
      */
-    const Token * checkTokenInsideExpression(const Token * const tok, VarInfo &varInfo, bool inFuncCall = false);
+    const Token * checkTokenInsideExpression(const Token * const tok, VarInfo &varInfo);
 
     /** parse function call */
     void functionCall(const Token *tokName, const Token *tokOpeningPar, VarInfo &varInfo, const VarInfo::AllocInfo& allocation, const Library::AllocFunc* af);

lib/checkmemoryleak.h

@@ -86,7 +86,7 @@ private:
 public:
     CheckMemoryLeak() = delete;
     CheckMemoryLeak(const CheckMemoryLeak &) = delete;
-    CheckMemoryLeak& operator=(const CheckMemoryLeak &) = delete;
+    void operator=(const CheckMemoryLeak &) = delete;
 
     CheckMemoryLeak(const Tokenizer *t, ErrorLogger *e, const Settings *s)
         : mTokenizer_(t), mErrorLogger_(e), mSettings_(s) {}

lib/checknullpointer.cpp

@@ -586,7 +586,7 @@ Check::FileInfo *CheckNullPointer::getFileInfo(const Tokenizer *tokenizer, const
     if (unsafeUsage.empty())
         return nullptr;
 
-    auto *fileInfo = new MyFileInfo;
+    MyFileInfo *fileInfo = new MyFileInfo;
     fileInfo->unsafeUsage = unsafeUsage;
     return fileInfo;
 }
@@ -597,7 +597,7 @@ Check::FileInfo * CheckNullPointer::loadFileInfoFromXml(const tinyxml2::XMLEleme
     if (unsafeUsage.empty())
         return nullptr;
 
-    auto *fileInfo = new MyFileInfo;
+    MyFileInfo *fileInfo = new MyFileInfo;
     fileInfo->unsafeUsage = unsafeUsage;
     return fileInfo;
 }

lib/checkother.cpp

@@ -995,7 +995,16 @@ void CheckOther::checkVariableScope()
 
                 // parse else if blocks..
             } else if (Token::simpleMatch(tok, "else { if (") && Token::simpleMatch(tok->linkAt(3), ") {")) {
-                tok = tok->next();
+                const Token *endif = tok->linkAt(3)->linkAt(1);
+                bool elseif = false;
+                if (Token::simpleMatch(endif, "} }"))
+                    elseif = true;
+                else if (Token::simpleMatch(endif, "} else {") && Token::simpleMatch(endif->linkAt(2),"} }"))
+                    elseif = true;
+                if (elseif && Token::findmatch(tok->next(), "%varid%", tok->linkAt(1), var->declarationId())) {
+                    reduce = false;
+                    break;
+                }
             } else if (tok->varId() == var->declarationId() || tok->str() == "goto") {
                 reduce = false;
                 break;

lib/checkuninitvar.cpp

@@ -1642,7 +1642,12 @@ void CheckUninitVar::valueFlowUninit()
                     const bool isarray = tok->variable()->isArray();
                     if (isarray && tok->variable()->isMember())
                         continue; // Todo: this is a bailout
+                    const bool ispointer = astIsPointer(tok) && !isarray;
                     const bool deref = CheckNullPointer::isPointerDeRef(tok, unknown, mSettings);
+                    if (ispointer && v->indirect == 1 && !deref)
+                        continue;
+                    if (isarray && !deref)
+                        continue;
                     uninitderef = deref && v->indirect == 0;
                     const bool isleaf = isLeafDot(tok) || uninitderef;
                     if (!isleaf && Token::Match(tok->astParent(), ". %name%") && (tok->astParent()->next()->varId() || tok->astParent()->next()->isEnumerator()))
@@ -1705,7 +1710,7 @@ Check::FileInfo *CheckUninitVar::getFileInfo(const Tokenizer *tokenizer, const S
     if (unsafeUsage.empty())
         return nullptr;
 
-    auto *fileInfo = new MyFileInfo;
+    MyFileInfo *fileInfo = new MyFileInfo;
     fileInfo->unsafeUsage = unsafeUsage;
     return fileInfo;
 }
@@ -1716,7 +1721,7 @@ Check::FileInfo * CheckUninitVar::loadFileInfoFromXml(const tinyxml2::XMLElement
     if (unsafeUsage.empty())
         return nullptr;
 
-    auto *fileInfo = new MyFileInfo;
+    MyFileInfo *fileInfo = new MyFileInfo;
     fileInfo->unsafeUsage = unsafeUsage;
     return fileInfo;
 }

lib/clangimport.cpp

@@ -325,15 +325,15 @@ namespace clangimport {
         std::string nodeType;
         std::vector<AstNodePtr> children;
 
-        void setLocations(TokenList &tokenList, int file, int line, int col);
+        void setLocations(TokenList *tokenList, int file, int line, int col);
 
         void dumpAst(int num = 0, int indent = 0) const;
-        void createTokens1(TokenList &tokenList) {
+        void createTokens1(TokenList *tokenList) {
             //dumpAst();
-            if (!tokenList.back())
+            if (!tokenList->back())
                 setLocations(tokenList, 0, 1, 1);
             else
-                setLocations(tokenList, tokenList.back()->fileIndex(), tokenList.back()->linenr(), 1);
+                setLocations(tokenList, tokenList->back()->fileIndex(), tokenList->back()->linenr(), 1);
             createTokens(tokenList);
             if (nodeType == VarDecl || nodeType == RecordDecl || nodeType == TypedefDecl)
                 addtoken(tokenList, ";");
@@ -351,22 +351,22 @@ namespace clangimport {
             return children[c];
         }
     private:
-        Token *createTokens(TokenList &tokenList);
+        Token *createTokens(TokenList *tokenList);
-        Token *addtoken(TokenList &tokenList, const std::string &str, bool valueType=true);
+        Token *addtoken(TokenList *tokenList, const std::string &str, bool valueType=true);
-        const ::Type *addTypeTokens(TokenList &tokenList, const std::string &str, const Scope *scope = nullptr);
+        const ::Type *addTypeTokens(TokenList *tokenList, const std::string &str, const Scope *scope = nullptr);
-        void addFullScopeNameTokens(TokenList &tokenList, const Scope *recordScope);
+        void addFullScopeNameTokens(TokenList *tokenList, const Scope *recordScope);
-        Scope *createScope(TokenList &tokenList, Scope::ScopeType scopeType, AstNodePtr astNode, const Token *def);
+        Scope *createScope(TokenList *tokenList, Scope::ScopeType scopeType, AstNodePtr astNode, const Token *def);
-        Scope *createScope(TokenList &tokenList, Scope::ScopeType scopeType, const std::vector<AstNodePtr> &children2, const Token *def);
+        Scope *createScope(TokenList *tokenList, Scope::ScopeType scopeType, const std::vector<AstNodePtr> &children2, const Token *def);
-        Token *createTokensCall(TokenList &tokenList);
+        Token *createTokensCall(TokenList *tokenList);
-        void createTokensFunctionDecl(TokenList &tokenList);
+        void createTokensFunctionDecl(TokenList *tokenList);
-        void createTokensForCXXRecord(TokenList &tokenList);
+        void createTokensForCXXRecord(TokenList *tokenList);
-        Token *createTokensVarDecl(TokenList &tokenList);
+        Token *createTokensVarDecl(TokenList *tokenList);
         std::string getSpelling() const;
         std::string getType(int index = 0) const;
         std::string getFullType(int index = 0) const;
         bool isDefinition() const;
         std::string getTemplateParameters() const;
-        const Scope *getNestedInScope(TokenList &tokenList);
+        const Scope *getNestedInScope(TokenList *tokenList);
         void setValueType(Token *tok);
 
         int mFile  = 0;
@@ -496,7 +496,7 @@ void clangimport::AstNode::dumpAst(int num, int indent) const
     }
 }
 
-void clangimport::AstNode::setLocations(TokenList &tokenList, int file, int line, int col)
+void clangimport::AstNode::setLocations(TokenList *tokenList, int file, int line, int col)
 {
     for (const std::string &ext: mExtTokens) {
         if (startsWith(ext, "<col:"))
@@ -512,7 +512,7 @@ void clangimport::AstNode::setLocations(TokenList &tokenList, int file, int line
                 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));
+                file = tokenList->appendFileIfNew(ext.substr(1, sep1 - 1));
                 line = strToInt<int>(ext.substr(sep1 + 1, sep2 - sep1 - 1));
             }
         }
@@ -526,17 +526,17 @@ void clangimport::AstNode::setLocations(TokenList &tokenList, int file, int line
     }
 }
 
-Token *clangimport::AstNode::addtoken(TokenList &tokenList, const std::string &str, bool valueType)
+Token *clangimport::AstNode::addtoken(TokenList *tokenList, const std::string &str, bool valueType)
 {
     const Scope *scope = getNestedInScope(tokenList);
-    tokenList.addtoken(str, mLine, mCol, mFile);
+    tokenList->addtoken(str, mLine, mCol, mFile);
-    tokenList.back()->scope(scope);
+    tokenList->back()->scope(scope);
     if (valueType)
-        setValueType(tokenList.back());
+        setValueType(tokenList->back());
-    return tokenList.back();
+    return tokenList->back();
 }
 
-const ::Type * clangimport::AstNode::addTypeTokens(TokenList &tokenList, const std::string &str, const Scope *scope)
+const ::Type * clangimport::AstNode::addTypeTokens(TokenList *tokenList, const std::string &str, const Scope *scope)
 {
     if (str.find("\':\'") != std::string::npos) {
         return addTypeTokens(tokenList, str.substr(0, str.find("\':\'") + 1), scope);
@@ -574,11 +574,11 @@ const ::Type * clangimport::AstNode::addTypeTokens(TokenList &tokenList, const s
 
     // Set Type
     if (!scope) {
-        scope = tokenList.back() ? tokenList.back()->scope() : nullptr;
+        scope = tokenList->back() ? tokenList->back()->scope() : nullptr;
         if (!scope)
             return nullptr;
     }
-    for (const Token *typeToken = tokenList.back(); Token::Match(typeToken, "&|*|%name%"); typeToken = typeToken->previous()) {
+    for (const Token *typeToken = tokenList->back(); Token::Match(typeToken, "&|*|%name%"); typeToken = typeToken->previous()) {
         if (!typeToken->isName())
             continue;
         const ::Type *recordType = scope->check->findVariableType(scope, typeToken);
@@ -590,12 +590,12 @@ const ::Type * clangimport::AstNode::addTypeTokens(TokenList &tokenList, const s
     return nullptr;
 }
 
-void clangimport::AstNode::addFullScopeNameTokens(TokenList &tokenList, const Scope *recordScope)
+void clangimport::AstNode::addFullScopeNameTokens(TokenList *tokenList, const Scope *recordScope)
 {
     if (!recordScope)
         return;
     std::list<const Scope *> scopes;
-    while (recordScope && recordScope != tokenList.back()->scope() && !recordScope->isExecutable()) {
+    while (recordScope && recordScope != tokenList->back()->scope() && !recordScope->isExecutable()) {
         scopes.push_front(recordScope);
         recordScope = recordScope->nestedIn;
     }
@@ -607,13 +607,13 @@ void clangimport::AstNode::addFullScopeNameTokens(TokenList &tokenList, const Sc
     }
 }
 
-const Scope *clangimport::AstNode::getNestedInScope(TokenList &tokenList)
+const Scope *clangimport::AstNode::getNestedInScope(TokenList *tokenList)
 {
-    if (!tokenList.back())
+    if (!tokenList->back())
         return &mData->mSymbolDatabase->scopeList.front();
-    if (tokenList.back()->str() == "}" && mData->mNotScope.find(tokenList.back()) == mData->mNotScope.end())
+    if (tokenList->back()->str() == "}" && mData->mNotScope.find(tokenList->back()) == mData->mNotScope.end())
-        return tokenList.back()->scope()->nestedIn;
+        return tokenList->back()->scope()->nestedIn;
-    return tokenList.back()->scope();
+    return tokenList->back()->scope();
 }
 
 void clangimport::AstNode::setValueType(Token *tok)
@@ -626,7 +626,7 @@ void clangimport::AstNode::setValueType(Token *tok)
             continue;
 
         TokenList decl(nullptr);
-        addTypeTokens(decl, type, tok->scope());
+        addTypeTokens(&decl, type, tok->scope());
         if (!decl.front())
             break;
 
@@ -638,17 +638,17 @@ void clangimport::AstNode::setValueType(Token *tok)
     }
 }
 
-Scope *clangimport::AstNode::createScope(TokenList &tokenList, Scope::ScopeType scopeType, AstNodePtr astNode, const Token *def)
+Scope *clangimport::AstNode::createScope(TokenList *tokenList, Scope::ScopeType scopeType, AstNodePtr astNode, const Token *def)
 {
     std::vector<AstNodePtr> children2{std::move(astNode)};
     return createScope(tokenList, scopeType, children2, def);
 }
 
-Scope *clangimport::AstNode::createScope(TokenList &tokenList, Scope::ScopeType scopeType, const std::vector<AstNodePtr> & children2, const Token *def)
+Scope *clangimport::AstNode::createScope(TokenList *tokenList, Scope::ScopeType scopeType, const std::vector<AstNodePtr> & children2, const Token *def)
 {
     SymbolDatabase *symbolDatabase = mData->mSymbolDatabase;
 
-    auto *nestedIn = const_cast<Scope *>(getNestedInScope(tokenList));
+    Scope *nestedIn = const_cast<Scope *>(getNestedInScope(tokenList));
 
     symbolDatabase->scopeList.emplace_back(nullptr, nullptr, nestedIn);
     Scope *scope = &symbolDatabase->scopeList.back();
@@ -682,7 +682,7 @@ Scope *clangimport::AstNode::createScope(TokenList &tokenList, Scope::ScopeType
         }
     }
     scope->bodyStart = addtoken(tokenList, "{");
-    tokenList.back()->scope(scope);
+    tokenList->back()->scope(scope);
     mData->scopeAccessControl[scope] = scope->defaultAccess();
     if (!children2.empty()) {
         for (const AstNodePtr &astNode: children2) {
@@ -700,7 +700,7 @@ Scope *clangimport::AstNode::createScope(TokenList &tokenList, Scope::ScopeType
             astNode->createTokens(tokenList);
             if (scopeType == Scope::ScopeType::eEnum)
                 astNode->addtoken(tokenList, ",");
-            else if (!Token::Match(tokenList.back(), "[;{}]"))
+            else if (!Token::Match(tokenList->back(), "[;{}]"))
                 astNode->addtoken(tokenList, ";");
         }
     }
@@ -710,7 +710,7 @@ Scope *clangimport::AstNode::createScope(TokenList &tokenList, Scope::ScopeType
     return scope;
 }
 
-Token *clangimport::AstNode::createTokens(TokenList &tokenList)
+Token *clangimport::AstNode::createTokens(TokenList *tokenList)
 {
     if (nodeType == ArraySubscriptExpr) {
         Token *array = getChild(0)->createTokens(tokenList);
@@ -796,7 +796,7 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
     if (nodeType == CompoundStmt) {
         for (const AstNodePtr& child: children) {
             child->createTokens(tokenList);
-            if (!Token::Match(tokenList.back(), "[;{}]"))
+            if (!Token::Match(tokenList->back(), "[;{}]"))
                 child->addtoken(tokenList, ";");
         }
         return nullptr;
@@ -818,14 +818,14 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
         return getChild(0)->createTokens(tokenList);
     if (nodeType == CXXBoolLiteralExpr) {
         addtoken(tokenList, mExtTokens.back());
-        tokenList.back()->setValueType(new ValueType(ValueType::Sign::UNKNOWN_SIGN, ValueType::Type::BOOL, 0));
+        tokenList->back()->setValueType(new ValueType(ValueType::Sign::UNKNOWN_SIGN, ValueType::Type::BOOL, 0));
-        return tokenList.back();
+        return tokenList->back();
     }
     if (nodeType == CXXConstructExpr) {
         if (!children.empty())
             return getChild(0)->createTokens(tokenList);
         addTypeTokens(tokenList, '\'' + getType() + '\'');
-        Token *type = tokenList.back();
+        Token *type = tokenList->back();
         Token *par1 = addtoken(tokenList, "(");
         Token *par2 = addtoken(tokenList, ")");
         par1->link(par2);
@@ -866,7 +866,7 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
             }
         }
         if (!range)
-            throw InternalError(tokenList.back(), "Failed to import CXXForRangeStmt. Range?");
+            throw InternalError(tokenList->back(), "Failed to import CXXForRangeStmt. Range?");
         Token *expr2 = range->createTokens(tokenList);
         Token *par2 = addtoken(tokenList, ")");
 
@@ -961,7 +961,7 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
     }
     if (nodeType == DoStmt) {
         addtoken(tokenList, "do");
-        createScope(tokenList, Scope::ScopeType::eDo, getChild(0), tokenList.back());
+        createScope(tokenList, Scope::ScopeType::eDo, getChild(0), tokenList->back());
         Token *tok1 = addtoken(tokenList, "while");
         Token *par1 = addtoken(tokenList, "(");
         Token *expr = children[1]->createTokens(tokenList);
@@ -974,7 +974,7 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
     }
     if (nodeType == EnumConstantDecl) {
         Token *nameToken = addtoken(tokenList, getSpelling());
-        auto *scope = const_cast<Scope *>(nameToken->scope());
+        Scope *scope = const_cast<Scope *>(nameToken->scope());
         scope->enumeratorList.emplace_back(nameToken->scope());
         Enumerator *e = &scope->enumeratorList.back();
         e->name = nameToken;
@@ -1088,7 +1088,7 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
         createScope(tokenList, Scope::ScopeType::eIf, thenCode, iftok);
         if (elseCode) {
             elseCode->addtoken(tokenList, "else");
-            createScope(tokenList, Scope::ScopeType::eElse, elseCode, tokenList.back());
+            createScope(tokenList, Scope::ScopeType::eElse, elseCode, tokenList->back());
         }
         return nullptr;
     }
@@ -1099,11 +1099,11 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
         return expr;
     }
     if (nodeType == InitListExpr) {
-        const Scope *scope = tokenList.back()->scope();
+        const Scope *scope = tokenList->back()->scope();
         Token *start = addtoken(tokenList, "{");
         start->scope(scope);
         for (const AstNodePtr& child: children) {
-            if (tokenList.back()->str() != "{")
+            if (tokenList->back()->str() != "{")
                 addtoken(tokenList, ",");
             child->createTokens(tokenList);
         }
@@ -1261,7 +1261,7 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
     return addtoken(tokenList, "?" + nodeType + "?");
 }
 
-Token * clangimport::AstNode::createTokensCall(TokenList &tokenList)
+Token * clangimport::AstNode::createTokensCall(TokenList *tokenList)
 {
     int firstParam;
     Token *f;
@@ -1302,7 +1302,7 @@ Token * clangimport::AstNode::createTokensCall(TokenList &tokenList)
     return par1;
 }
 
-void clangimport::AstNode::createTokensFunctionDecl(TokenList &tokenList)
+void clangimport::AstNode::createTokensFunctionDecl(TokenList *tokenList)
 {
     const bool prev = contains(mExtTokens, "prev");
     const bool hasBody = !children.empty() && children.back()->nodeType == CompoundStmt;
@@ -1317,16 +1317,16 @@ void clangimport::AstNode::createTokensFunctionDecl(TokenList &tokenList)
             addtoken(tokenList, "static");
         if (isInline)
             addtoken(tokenList, "inline");
-        const Token * const before = tokenList.back();
+        const Token * const before = tokenList->back();
         addTypeTokens(tokenList, '\'' + getType() + '\'');
-        startToken = before ? before->next() : tokenList.front();
+        startToken = before ? before->next() : tokenList->front();
     }
 
     if (mExtTokens.size() > 4 && mExtTokens[1] == "parent")
         addFullScopeNameTokens(tokenList, mData->getScope(mExtTokens[2]));
 
     Token *nameToken = addtoken(tokenList, getSpelling() + getTemplateParameters());
-    auto *nestedIn = const_cast<Scope *>(nameToken->scope());
+    Scope *nestedIn = const_cast<Scope *>(nameToken->scope());
 
     if (prev) {
         const std::string addr = *(std::find(mExtTokens.cbegin(), mExtTokens.cend(), "prev") + 1);
@@ -1343,10 +1343,10 @@ void clangimport::AstNode::createTokensFunctionDecl(TokenList &tokenList)
             nestedIn->functionList.back().retDef = startToken;
     }
 
-    auto * const function = const_cast<Function*>(nameToken->function());
+    Function * const function = const_cast<Function*>(nameToken->function());
 
     if (!prev) {
-        auto accessControl = mData->scopeAccessControl.find(tokenList.back()->scope());
+        auto accessControl = mData->scopeAccessControl.find(tokenList->back()->scope());
         if (accessControl != mData->scopeAccessControl.end())
             function->access = accessControl->second;
     }
@@ -1377,10 +1377,10 @@ void clangimport::AstNode::createTokensFunctionDecl(TokenList &tokenList)
         AstNodePtr child = children[i];
         if (child->nodeType != ParmVarDecl)
             continue;
-        if (tokenList.back() != par1)
+        if (tokenList->back() != par1)
             addtoken(tokenList, ",");
         const Type *recordType = addTypeTokens(tokenList, child->mExtTokens.back(), nestedIn);
-        const Token *typeEndToken = tokenList.back();
+        const Token *typeEndToken = tokenList->back();
         const std::string spelling = child->getSpelling();
         Token *vartok = nullptr;
         if (!spelling.empty())
@@ -1424,7 +1424,7 @@ void clangimport::AstNode::createTokensFunctionDecl(TokenList &tokenList)
     }
 }
 
-void clangimport::AstNode::createTokensForCXXRecord(TokenList &tokenList)
+void clangimport::AstNode::createTokensForCXXRecord(TokenList *tokenList)
 {
     const bool isStruct = contains(mExtTokens, "struct");
     Token * const classToken = addtoken(tokenList, isStruct ? "struct" : "class");
@@ -1466,10 +1466,10 @@ void clangimport::AstNode::createTokensForCXXRecord(TokenList &tokenList)
         const_cast<Scope *>(classToken->scope())->definedTypesMap[className] = scope->definedType;
     }
     addtoken(tokenList, ";");
-    const_cast<Token *>(tokenList.back())->scope(classToken->scope());
+    const_cast<Token *>(tokenList->back())->scope(classToken->scope());
 }
 
-Token * clangimport::AstNode::createTokensVarDecl(TokenList &tokenList)
+Token * clangimport::AstNode::createTokensVarDecl(TokenList *tokenList)
 {
     const std::string addr = mExtTokens.front();
     if (contains(mExtTokens, "static"))
@@ -1479,14 +1479,14 @@ Token * clangimport::AstNode::createTokensVarDecl(TokenList &tokenList)
         typeIndex--;
     const std::string type = mExtTokens[typeIndex];
     const std::string name = mExtTokens[typeIndex - 1];
-    const Token *startToken = tokenList.back();
+    const Token *startToken = tokenList->back();
     const ::Type *recordType = addTypeTokens(tokenList, type);
     if (!startToken)
-        startToken = tokenList.front();
+        startToken = tokenList->front();
     else if (startToken->str() != "static")
         startToken = startToken->next();
     Token *vartok1 = addtoken(tokenList, name);
-    auto *scope = const_cast<Scope *>(tokenList.back()->scope());
+    Scope *scope = const_cast<Scope *>(tokenList->back()->scope());
     scope->varlist.emplace_back(vartok1, unquote(type), startToken, vartok1->previous(), 0, scope->defaultAccess(), recordType, scope);
     mData->varDecl(addr, vartok1, &scope->varlist.back());
     if (mExtTokens.back() == "cinit" && !children.empty()) {
@@ -1510,9 +1510,9 @@ Token * clangimport::AstNode::createTokensVarDecl(TokenList &tokenList)
     return vartok1;
 }
 
-static void setTypes(TokenList &tokenList)
+static void setTypes(TokenList *tokenList)
 {
-    for (Token *tok = tokenList.front(); tok; tok = tok->next()) {
+    for (Token *tok = tokenList->front(); tok; tok = tok->next()) {
         if (Token::simpleMatch(tok, "sizeof (")) {
             for (Token *typeToken = tok->tokAt(2); typeToken->str() != ")"; typeToken = typeToken->next()) {
                 if (typeToken->type())
@@ -1523,9 +1523,9 @@ static void setTypes(TokenList &tokenList)
     }
 }
 
-static void setValues(const Tokenizer &tokenizer, const SymbolDatabase *symbolDatabase)
+static void setValues(const Tokenizer *tokenizer, const SymbolDatabase *symbolDatabase)
 {
-    const Settings * const settings = tokenizer.getSettings();
+    const Settings * const settings = tokenizer->getSettings();
 
     for (const Scope& scope : symbolDatabase->scopeList) {
         if (!scope.definedType)
@@ -1542,7 +1542,7 @@ static void setValues(const Tokenizer &tokenizer, const SymbolDatabase *symbolDa
         scope.definedType->sizeOf = typeSize;
     }
 
-    for (auto *tok = const_cast<Token*>(tokenizer.tokens()); tok; tok = tok->next()) {
+    for (Token *tok = const_cast<Token*>(tokenizer->tokens()); tok; tok = tok->next()) {
         if (Token::simpleMatch(tok, "sizeof (")) {
             ValueType vt = ValueType::parseDecl(tok->tokAt(2), *settings);
             const int sz = vt.typeSize(settings->platform, true);
@@ -1563,18 +1563,18 @@ static void setValues(const Tokenizer &tokenizer, const SymbolDatabase *symbolDa
     }
 }
 
-void clangimport::parseClangAstDump(Tokenizer &tokenizer, std::istream &f)
+void clangimport::parseClangAstDump(Tokenizer *tokenizer, std::istream &f)
 {
-    TokenList &tokenList = tokenizer.list;
+    TokenList *tokenList = &tokenizer->list;
 
-    tokenizer.createSymbolDatabase();
+    tokenizer->createSymbolDatabase();
-    auto *symbolDatabase = const_cast<SymbolDatabase *>(tokenizer.getSymbolDatabase());
+    SymbolDatabase *symbolDatabase = const_cast<SymbolDatabase *>(tokenizer->getSymbolDatabase());
     symbolDatabase->scopeList.emplace_back(nullptr, nullptr, nullptr);
     symbolDatabase->scopeList.back().type = Scope::ScopeType::eGlobal;
     symbolDatabase->scopeList.back().check = symbolDatabase;
 
     clangimport::Data data;
-    data.mSettings = tokenizer.getSettings();
+    data.mSettings = tokenizer->getSettings();
     data.mSymbolDatabase = symbolDatabase;
     std::string line;
     std::vector<AstNodePtr> tree;
@@ -1617,16 +1617,16 @@ void clangimport::parseClangAstDump(Tokenizer &tokenizer, std::istream &f)
         tree[0]->createTokens1(tokenList);
 
     // Validation
-    for (const Token *tok = tokenList.front(); tok; tok = tok->next()) {
+    for (const Token *tok = tokenList->front(); tok; tok = tok->next()) {
         if (Token::Match(tok, "(|)|[|]|{|}") && !tok->link())
             throw InternalError(tok, "Token::link() is not set properly");
     }
 
-    if (tokenList.front())
+    if (tokenList->front())
-        tokenList.front()->assignIndexes();
+        tokenList->front()->assignIndexes();
     symbolDatabase->clangSetVariables(data.getVariableList());
     symbolDatabase->createSymbolDatabaseExprIds();
-    tokenList.clangSetOrigFiles();
+    tokenList->clangSetOrigFiles();
     setTypes(tokenList);
     setValues(tokenizer, symbolDatabase);
 }

lib/clangimport.h

@@ -29,7 +29,7 @@
 class Tokenizer;
 
 namespace clangimport {
-    void CPPCHECKLIB parseClangAstDump(Tokenizer &tokenizer, std::istream &f);
+    void CPPCHECKLIB parseClangAstDump(Tokenizer *tokenizer, std::istream &f);
 }
 
 #endif

lib/cppcheck.cpp

@@ -188,13 +188,13 @@ static void createDumpFile(const Settings& settings,
 
     std::string language;
     switch (settings.enforcedLang) {
-    case Standards::Language::C:
+    case Settings::Language::C:
         language = " language=\"c\"";
         break;
-    case Standards::Language::CPP:
+    case Settings::Language::CPP:
         language = " language=\"cpp\"";
         break;
-    case Standards::Language::None:
+    case Settings::Language::None:
         if (Path::isCPP(filename))
             language = " language=\"cpp\"";
         else if (Path::isC(filename))
@@ -423,126 +423,119 @@ static bool reportClangErrors(std::istream &is, const std::function<void(const E
     return false;
 }
 
-unsigned int CppCheck::checkClang(const std::string &path)
-{
-    if (!mSettings.quiet)
-        mErrorLogger.reportOut(std::string("Checking ") + path + " ...", Color::FgGreen);
-
-    // TODO: this ignores the configured language
-    const std::string lang = Path::isCPP(path) ? "-x c++" : "-x c";
-    const std::string analyzerInfo = mSettings.buildDir.empty() ? std::string() : AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, path, emptyString);
-    const std::string clangcmd = analyzerInfo + ".clang-cmd";
-    const std::string clangStderr = analyzerInfo + ".clang-stderr";
-    const std::string clangAst = analyzerInfo + ".clang-ast";
-    std::string exe = mSettings.clangExecutable;
-#ifdef _WIN32
-    // append .exe if it is not a path
-    if (Path::fromNativeSeparators(mSettings.clangExecutable).find('/') == std::string::npos) {
-        exe += ".exe";
-    }
-#endif
-
-    std::string flags(lang + " ");
-    // TODO: does not apply C standard
-    if (Path::isCPP(path) && !mSettings.standards.stdValue.empty())
-        flags += "-std=" + mSettings.standards.stdValue + " ";
-
-    for (const std::string &i: mSettings.includePaths)
-        flags += "-I" + i + " ";
-
-    flags += getDefinesFlags(mSettings.userDefines);
-
-    const std::string args2 = "-fsyntax-only -Xclang -ast-dump -fno-color-diagnostics " + flags + path;
-    const std::string redirect2 = analyzerInfo.empty() ? std::string("2>&1") : ("2> " + clangStderr);
-    if (!mSettings.buildDir.empty()) {
-        std::ofstream fout(clangcmd);
-        fout << exe << " " << args2 << " " << redirect2 << std::endl;
-    } else if (mSettings.verbose && !mSettings.quiet) {
-        mErrorLogger.reportOut(exe + " " + args2);
-    }
-
-    std::string output2;
-    if (mExecuteCommand(exe,split(args2),redirect2,output2) != EXIT_SUCCESS || output2.find("TranslationUnitDecl") == std::string::npos) {
-        std::cerr << "Failed to execute '" << exe << " " << args2 << " " << redirect2 << "'" << std::endl;
-        return 0;
-    }
-
-    // Ensure there are not syntax errors...
-    std::vector<ErrorMessage> compilerWarnings;
-    if (!mSettings.buildDir.empty()) {
-        std::ifstream fin(clangStderr);
-        auto reportError = [this](const ErrorMessage& errorMessage) {
-            reportErr(errorMessage);
-        };
-        if (reportClangErrors(fin, reportError, compilerWarnings))
-            return 0;
-    } else {
-        std::istringstream istr(output2);
-        auto reportError = [this](const ErrorMessage& errorMessage) {
-            reportErr(errorMessage);
-        };
-        if (reportClangErrors(istr, reportError, compilerWarnings))
-            return 0;
-    }
-
-    if (!mSettings.buildDir.empty()) {
-        std::ofstream fout(clangAst);
-        fout << output2 << std::endl;
-    }
-
-    try {
-        std::istringstream ast(output2);
-        Tokenizer tokenizer(&mSettings, this);
-        tokenizer.list.appendFileIfNew(path);
-        clangimport::parseClangAstDump(tokenizer, ast);
-        ValueFlow::setValues(tokenizer.list,
-                             const_cast<SymbolDatabase&>(*tokenizer.getSymbolDatabase()),
-                             this,
-                             &mSettings,
-                             &s_timerResults);
-        if (mSettings.debugnormal)
-            tokenizer.printDebugOutput(1);
-        checkNormalTokens(tokenizer);
-
-        // create dumpfile
-        std::ofstream fdump;
-        std::string dumpFile;
-        createDumpFile(mSettings, path, fdump, dumpFile);
-        if (fdump.is_open()) {
-            // TODO: use tinyxml2 to create XML
-            fdump << "<dump cfg=\"\">\n";
-            for (const ErrorMessage& errmsg: compilerWarnings)
-                fdump << "  <clang-warning file=\"" << toxml(errmsg.callStack.front().getfile()) << "\" line=\"" << errmsg.callStack.front().line << "\" column=\"" << errmsg.callStack.front().column << "\" message=\"" << toxml(errmsg.shortMessage()) << "\"/>\n";
-            fdump << "  <standards>\n";
-            fdump << "    <c version=\"" << mSettings.standards.getC() << "\"/>\n";
-            fdump << "    <cpp version=\"" << mSettings.standards.getCPP() << "\"/>\n";
-            fdump << "  </standards>\n";
-            tokenizer.dump(fdump);
-            fdump << "</dump>\n";
-            fdump << "</dumps>\n";
-            fdump.close();
-        }
-
-        // run addons
-        executeAddons(dumpFile, path);
-
-    } catch (const InternalError &e) {
-        const ErrorMessage errmsg = ErrorMessage::fromInternalError(e, nullptr, path, "Bailing out from analysis: Processing Clang AST dump failed");
-        reportErr(errmsg);
-    } catch (const TerminateException &) {
-        // Analysis is terminated
-        return mExitCode;
-    } catch (const std::exception &e) {
-        internalError(path, std::string("Processing Clang AST dump failed: ") + e.what());
-    }
-
-    return mExitCode;
-}
-
 unsigned int CppCheck::check(const std::string &path)
 {
-    if (mSettings.clang)
+    if (mSettings.clang) {
-        return checkClang(path);
+        if (!mSettings.quiet)
+            mErrorLogger.reportOut(std::string("Checking ") + path + " ...", Color::FgGreen);
+
+        const std::string lang = Path::isCPP(path) ? "-x c++" : "-x c";
+        const std::string analyzerInfo = mSettings.buildDir.empty() ? std::string() : AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, path, emptyString);
+        const std::string clangcmd = analyzerInfo + ".clang-cmd";
+        const std::string clangStderr = analyzerInfo + ".clang-stderr";
+        const std::string clangAst = analyzerInfo + ".clang-ast";
+        std::string exe = mSettings.clangExecutable;
+#ifdef _WIN32
+        // append .exe if it is not a path
+        if (Path::fromNativeSeparators(mSettings.clangExecutable).find('/') == std::string::npos) {
+            exe += ".exe";
+        }
+#endif
+
+        std::string flags(lang + " ");
+        if (Path::isCPP(path) && !mSettings.standards.stdValue.empty())
+            flags += "-std=" + mSettings.standards.stdValue + " ";
+
+        for (const std::string &i: mSettings.includePaths)
+            flags += "-I" + i + " ";
+
+        flags += getDefinesFlags(mSettings.userDefines);
+
+        const std::string args2 = "-fsyntax-only -Xclang -ast-dump -fno-color-diagnostics " + flags + path;
+        const std::string redirect2 = analyzerInfo.empty() ? std::string("2>&1") : ("2> " + clangStderr);
+        if (!mSettings.buildDir.empty()) {
+            std::ofstream fout(clangcmd);
+            fout << exe << " " << args2 << " " << redirect2 << std::endl;
+        } else if (mSettings.verbose && !mSettings.quiet) {
+            mErrorLogger.reportOut(exe + " " + args2);
+        }
+
+        std::string output2;
+        if (mExecuteCommand(exe,split(args2),redirect2,output2) != EXIT_SUCCESS || output2.find("TranslationUnitDecl") == std::string::npos) {
+            std::cerr << "Failed to execute '" << exe << " " << args2 << " " << redirect2 << "'" << std::endl;
+            return 0;
+        }
+
+        // Ensure there are not syntax errors...
+        std::vector<ErrorMessage> compilerWarnings;
+        if (!mSettings.buildDir.empty()) {
+            std::ifstream fin(clangStderr);
+            auto reportError = [this](const ErrorMessage& errorMessage) {
+                reportErr(errorMessage);
+            };
+            if (reportClangErrors(fin, reportError, compilerWarnings))
+                return 0;
+        } else {
+            std::istringstream istr(output2);
+            auto reportError = [this](const ErrorMessage& errorMessage) {
+                reportErr(errorMessage);
+            };
+            if (reportClangErrors(istr, reportError, compilerWarnings))
+                return 0;
+        }
+
+        if (!mSettings.buildDir.empty()) {
+            std::ofstream fout(clangAst);
+            fout << output2 << std::endl;
+        }
+
+        try {
+            std::istringstream ast(output2);
+            Tokenizer tokenizer(&mSettings, this);
+            tokenizer.list.appendFileIfNew(path);
+            clangimport::parseClangAstDump(&tokenizer, ast);
+            ValueFlow::setValues(tokenizer.list,
+                                 const_cast<SymbolDatabase&>(*tokenizer.getSymbolDatabase()),
+                                 this,
+                                 &mSettings,
+                                 &s_timerResults);
+            if (mSettings.debugnormal)
+                tokenizer.printDebugOutput(1);
+            checkNormalTokens(tokenizer);
+
+            // create dumpfile
+            std::ofstream fdump;
+            std::string dumpFile;
+            createDumpFile(mSettings, path, fdump, dumpFile);
+            if (fdump.is_open()) {
+                fdump << "<dump cfg=\"\">\n";
+                for (const ErrorMessage& errmsg: compilerWarnings)
+                    fdump << "  <clang-warning file=\"" << toxml(errmsg.callStack.front().getfile()) << "\" line=\"" << errmsg.callStack.front().line << "\" column=\"" << errmsg.callStack.front().column << "\" message=\"" << toxml(errmsg.shortMessage()) << "\"/>\n";
+                fdump << "  <standards>\n";
+                fdump << "    <c version=\"" << mSettings.standards.getC() << "\"/>\n";
+                fdump << "    <cpp version=\"" << mSettings.standards.getCPP() << "\"/>\n";
+                fdump << "  </standards>\n";
+                tokenizer.dump(fdump);
+                fdump << "</dump>\n";
+                fdump << "</dumps>\n";
+                fdump.close();
+            }
+
+            // run addons
+            executeAddons(dumpFile, path);
+
+        } catch (const InternalError &e) {
+            const ErrorMessage errmsg = ErrorMessage::fromInternalError(e, nullptr, path, "Bailing out from analysis: Processing Clang AST dump failed");
+            reportErr(errmsg);
+        } catch (const TerminateException &) {
+            // Analysis is terminated
+            return mExitCode;
+        } catch (const std::exception &e) {
+            internalError(path, std::string("Processing Clang AST dump failed: ") + e.what());
+        }
+
+        return mExitCode;
+    }
 
     return checkFile(Path::simplifyPath(path), emptyString);
 }
@@ -1354,8 +1347,8 @@ void CppCheck::executeRules(const std::string &tokenlist, const Tokenizer &token
                 }
                 break;
             }
-            const auto pos1 = (unsigned int)ovector[0];
+            const unsigned int pos1 = (unsigned int)ovector[0];
-            const auto pos2 = (unsigned int)ovector[1];
+            const unsigned int pos2 = (unsigned int)ovector[1];
 
             // jump to the end of the match for the next pcre_exec
             pos = (int)pos2;
@@ -1758,7 +1751,7 @@ bool CppCheck::analyseWholeProgram()
     // Analyse the tokens
     CTU::FileInfo ctu;
     for (const Check::FileInfo *fi : mFileInfo) {
-        const auto *fi2 = dynamic_cast<const CTU::FileInfo *>(fi);
+        const CTU::FileInfo *fi2 = dynamic_cast<const CTU::FileInfo *>(fi);
         if (fi2) {
             ctu.functionCalls.insert(ctu.functionCalls.end(), fi2->functionCalls.cbegin(), fi2->functionCalls.cend());
             ctu.nestedCalls.insert(ctu.nestedCalls.end(), fi2->nestedCalls.cbegin(), fi2->nestedCalls.cend());
@@ -1866,3 +1859,4 @@ void CppCheck::printTimerResults(SHOWTIME_MODES mode)
 {
     s_timerResults.showResults(mode);
 }
+

lib/cppcheck.h

@@ -200,8 +200,6 @@ private:
     void executeRules(const std::string &tokenlist, const Tokenizer &tokenizer);
 #endif
 
-    unsigned int checkClang(const std::string &path);
-
     /**
      * @brief Errors and warnings are directed here.
      *

lib/ctu.cpp

@@ -309,7 +309,7 @@ CTU::FileInfo *CTU::getFileInfo(const Tokenizer *tokenizer)
 {
     const SymbolDatabase * const symbolDatabase = tokenizer->getSymbolDatabase();
 
-    auto *fileInfo = new FileInfo;
+    FileInfo *fileInfo = new FileInfo;
 
     // Parse all functions in TU
     for (const Scope &scope : symbolDatabase->scopeList) {
@@ -513,7 +513,7 @@ static bool findPath(const std::string &callId,
         if (c->callArgNr != callArgNr)
             continue;
 
-        const auto *functionCall = dynamic_cast<const CTU::FileInfo::FunctionCall *>(c);
+        const CTU::FileInfo::FunctionCall *functionCall = dynamic_cast<const CTU::FileInfo::FunctionCall *>(c);
         if (functionCall) {
             if (!warning && functionCall->warning)
                 continue;
@@ -537,7 +537,7 @@ static bool findPath(const std::string &callId,
             return true;
         }
 
-        const auto *nestedCall = dynamic_cast<const CTU::FileInfo::NestedCall *>(c);
+        const CTU::FileInfo::NestedCall *nestedCall = dynamic_cast<const CTU::FileInfo::NestedCall *>(c);
         if (!nestedCall)
             continue;
 
@@ -570,7 +570,7 @@ std::list<ErrorMessage::FileLocation> CTU::FileInfo::getErrorPath(InvalidValueTy
         if (!path[index])
             continue;
 
-        const auto *functionCall = dynamic_cast<const CTU::FileInfo::FunctionCall *>(path[index]);
+        const CTU::FileInfo::FunctionCall *functionCall = dynamic_cast<const CTU::FileInfo::FunctionCall *>(path[index]);
 
         if (functionCall) {
             if (functionCallPtr)

lib/filesettings.h

@@ -31,17 +31,14 @@ struct CPPCHECKLIB FileSettings {
     std::string cfg;
     std::string filename;
     std::string defines;
-    // TODO: handle differently
     std::string cppcheckDefines() const {
         return defines + (msc ? ";_MSC_VER=1900" : "") + (useMfc ? ";__AFXWIN_H__=1" : "");
     }
     std::set<std::string> undefs;
     std::list<std::string> includePaths;
-    // only used by clang mode
     std::list<std::string> systemIncludePaths;
     std::string standard;
     Platform::Type platformType = Platform::Type::Unspecified;
-    // TODO: get rid of these
     bool msc{};
     bool useMfc{};
 };

lib/forwardanalyzer.cpp

@@ -26,12 +26,10 @@
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
-#include "utils.h"
 #include "valueptr.h"
 #include "vfvalue.h"
 
 #include <algorithm>
-#include <cassert>
 #include <cstdio>
 #include <functional>
 #include <list>
@@ -445,7 +443,7 @@ namespace {
             if (checkElse && isDoWhile &&
                 (condTok->hasKnownIntValue() ||
                  (!bodyAnalysis.isModified() && !condAnalysis.isModified() && condAnalysis.isRead()))) {
-                if (updateScope(endBlock) == Progress::Break)
+                if (updateRange(endBlock->link(), endBlock) == Progress::Break)
                     return Break();
                 return updateRecursive(condTok);
             }
@@ -521,17 +519,8 @@ namespace {
             return updateLoop(endToken, endBlock, condTok, initTok, stepTok, true);
         }
 
-        Progress updateScope(Token* endBlock, int depth = 20)
+        Progress updateScope(Token* endBlock) {
-        {
+            return updateRange(endBlock->link(), endBlock);
-            if (!endBlock)
-                return Break();
-            assert(endBlock->link());
-            Token* ctx = endBlock->link()->previous();
-            if (Token::simpleMatch(ctx, ")"))
-                ctx = ctx->link()->previous();
-            if (ctx)
-                analyzer->updateState(ctx);
-            return updateRange(endBlock->link(), endBlock, depth);
         }
 
         Progress updateRange(Token* start, const Token* end, int depth = 20) {
@@ -693,7 +682,7 @@ namespace {
                         thenBranch.escape = isEscapeScope(endBlock, thenBranch.escapeUnknown);
                         if (thenBranch.check) {
                             thenBranch.active = true;
-                            if (updateScope(endBlock, depth - 1) == Progress::Break)
+                            if (updateRange(endCond->next(), endBlock, depth - 1) == Progress::Break)
                                 return Break();
                         } else if (!elseBranch.check) {
                             thenBranch.active = true;
@@ -705,7 +694,7 @@ namespace {
                             elseBranch.escape = isEscapeScope(endBlock->linkAt(2), elseBranch.escapeUnknown);
                             if (elseBranch.check) {
                                 elseBranch.active = true;
-                                const Progress result = updateScope(endBlock->linkAt(2), depth - 1);
+                                const Progress result = updateRange(endBlock->tokAt(2), endBlock->linkAt(2), depth - 1);
                                 if (result == Progress::Break)
                                     return Break();
                             } else if (!thenBranch.check) {
@@ -757,7 +746,7 @@ namespace {
                 } else if (Token::simpleMatch(tok, "try {")) {
                     Token* endBlock = tok->next()->link();
                     ForwardTraversal tryTraversal = fork();
-                    tryTraversal.updateScope(endBlock, depth - 1);
+                    tryTraversal.updateRange(tok->next(), endBlock, depth - 1);
                     bool bail = tryTraversal.actions.isModified();
                     if (bail) {
                         actions = tryTraversal.actions;
@@ -771,7 +760,7 @@ namespace {
                             return Break();
                         endBlock = endCatch->linkAt(1);
                         ForwardTraversal ft = fork();
-                        ft.updateScope(endBlock, depth - 1);
+                        ft.updateRange(endBlock->link(), endBlock, depth - 1);
                         bail |= ft.terminate != Analyzer::Terminate::None || ft.actions.isModified();
                     }
                     if (bail)
@@ -891,8 +880,6 @@ Analyzer::Result valueFlowGenericForward(Token* start, const Token* end, const V
     if (a->invalid())
         return Analyzer::Result{Analyzer::Action::None, Analyzer::Terminate::Bail};
     ForwardTraversal ft{a, settings};
-    if (start)
-        ft.analyzer->updateState(start);
     ft.updateRange(start, end);
     return Analyzer::Result{ ft.actions, ft.terminate };
 }

lib/importproject.cpp

@@ -757,7 +757,6 @@ bool ImportProject::importVcxproj(const std::string &filename, std::map<std::str
             FileSettings fs;
             fs.filename = cfilename;
             fs.cfg = p.name;
-            // TODO: detect actual MSC version
             fs.msc = true;
             fs.useMfc = useOfMfc;
             fs.defines = "_WIN32=1";

lib/mathlib.cpp

@@ -75,11 +75,18 @@ std::string MathLib::value::str() const
 {
     std::ostringstream ostr;
     if (mType == MathLib::value::Type::FLOAT) {
+        #if defined(__amigaos4__) && defined(__CLIB2__)
+        if (isnan(mDoubleValue))
+            return "nan.0";
+        if (isinf(mDoubleValue))
+            return (mDoubleValue > 0) ? "inf.0" : "-inf.0";
+        #else
         if (std::isnan(mDoubleValue))
             return "nan.0";
         if (std::isinf(mDoubleValue))
             return (mDoubleValue > 0) ? "inf.0" : "-inf.0";
-
+        #endif
+        
         ostr.precision(9);
         ostr << std::fixed << mDoubleValue;
 
@@ -1361,3 +1368,4 @@ MathLib::value operator>>(const MathLib::value &v1, const MathLib::value &v2)
 {
     return v1.shiftRight(v2);
 }
+

lib/platform.h

@@ -24,6 +24,10 @@
 #include "config.h"
 #include "standards.h"
 
+#if defined(__amigaos4__) && !defined(__CLIB2__)
+#define stricmp strcasecmp
+#endif /* amigaos4 */
+
 #include <climits>
 #include <stdexcept>
 #include <string>
@@ -192,3 +196,4 @@ public:
 /// @}
 //---------------------------------------------------------------------------
 #endif // platformH
+

lib/programmemory.cpp

@@ -34,13 +34,14 @@
 #include <cassert>
 #include <cmath>
 #include <functional>
-#include <iterator>
 #include <list>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
+#include <iostream>
+
 ExprIdToken::ExprIdToken(const Token* tok) : tok(tok), exprid(tok ? tok->exprId() : 0) {}
 
 nonneg int ExprIdToken::getExpressionId() const {
@@ -1639,14 +1640,6 @@ namespace {
             return *it;
         }
 
-        static bool updateValue(ValueFlow::Value& v, ValueFlow::Value x)
-        {
-            const bool returnValue = !x.isUninitValue() && !x.isImpossible();
-            if (v.isUninitValue() || returnValue)
-                v = std::move(x);
-            return returnValue;
-        }
-
         ValueFlow::Value execute(const Token* expr)
         {
             depth--;
@@ -1655,29 +1648,13 @@ namespace {
                 }};
             if (depth < 0)
                 return unknown();
-            ValueFlow::Value v = unknown();
+            ValueFlow::Value v = executeImpl(expr);
-            if (updateValue(v, executeImpl(expr)))
+            if (!v.isUninitValue())
                 return v;
             if (!expr)
                 return v;
-            if (expr->exprId() > 0 && pm->hasValue(expr->exprId())) {
+            if (expr->exprId() > 0 && pm->hasValue(expr->exprId()))
-                if (updateValue(v, pm->at(expr->exprId())))
+                return pm->at(expr->exprId());
-                    return v;
-            }
-            // Find symbolic values
-            for (const ValueFlow::Value& value : expr->values()) {
-                if (!value.isSymbolicValue())
-                    continue;
-                if (!value.isKnown())
-                    continue;
-                if (value.tokvalue->exprId() > 0 && !pm->hasValue(value.tokvalue->exprId()))
-                    continue;
-                ValueFlow::Value v2 = pm->at(value.tokvalue->exprId());
-                if (!v2.isIntValue() && value.intvalue != 0)
-                    continue;
-                v2.intvalue += value.intvalue;
-                return v2;
-            }
             if (const ValueFlow::Value* value = getImpossibleValue(expr))
                 return *value;
             return v;

lib/settings.h

@@ -182,8 +182,12 @@ public:
     bool dump{};
     std::string dumpFile;
 
+    enum Language {
+        None, C, CPP
+    };
+
     /** @brief Name of the language that is enforced. Empty per default. */
-    Standards::Language enforcedLang{};
+    Language enforcedLang{};
 
 #if defined(USE_WINDOWS_SEH) || defined(USE_UNIX_SIGNAL_HANDLING)
     /** @brief Is --exception-handling given */

lib/standards.h

@@ -34,8 +34,6 @@
  * This struct contains all possible standards that cppcheck recognize.
  */
 struct Standards {
-    enum Language { None, C, CPP };
-
     /** C code standard */
     enum cstd_t { C89, C99, C11, CLatest = C11 } c = CLatest;
 

lib/symboldatabase.cpp

@@ -43,11 +43,11 @@
 #include <iomanip>
 #include <iostream>
 #include <iterator>
+#include <limits>
 #include <sstream> // IWYU pragma: keep
 #include <stack>
 #include <string>
 #include <tuple>
-#include <type_traits>
 #include <unordered_map>
 #include <unordered_set>
 //---------------------------------------------------------------------------
@@ -1052,7 +1052,7 @@ void SymbolDatabase::createSymbolDatabaseSetScopePointers()
 
         const_cast<Token *>(bodyEnd)->scope(&scope);
 
-        for (auto* tok = const_cast<Token *>(bodyStart); tok != bodyEnd; tok = tok->next()) {
+        for (Token* tok = const_cast<Token *>(bodyStart); tok != bodyEnd; tok = tok->next()) {
             if (bodyStart != bodyEnd && tok->str() == "{") {
                 bool isEndOfScope = false;
                 for (Scope* innerScope: scope.nestedList) {
@@ -1702,7 +1702,7 @@ void SymbolDatabase::createSymbolDatabaseExprIds()
         std::unordered_map<std::string, nonneg int> unknownIds;
         // Assign IDs to incomplete vars which are part of an expression
         // Such variables should be assumed global
-        for (auto* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
+        for (Token* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
             if (!tok->isIncompleteVar())
                 continue;
             if (!isExpression(tok->astParent()))
@@ -1725,7 +1725,7 @@ void SymbolDatabase::createSymbolDatabaseExprIds()
         // Assign IDs
         ExprIdMap exprIdMap;
         std::map<std::string, nonneg int> baseIds;
-        for (auto* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
+        for (Token* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
             if (tok->varId() > 0) {
                 tok->exprId(tok->varId());
                 if (tok->astParent() && tok->astParent()->exprId() == 0)
@@ -1794,7 +1794,7 @@ void SymbolDatabase::setArrayDimensionsUsingValueFlow()
             continue;
         // check each array dimension
         for (const Dimension &const_dimension : var->dimensions()) {
-            auto &dimension = const_cast<Dimension &>(const_dimension);
+            Dimension &dimension = const_cast<Dimension &>(const_dimension);
             if (dimension.num != 0 || !dimension.tok)
                 continue;
 
@@ -3383,7 +3383,7 @@ void SymbolDatabase::addClassFunction(Scope **scope, const Token **tok, const To
         if (match) {
             auto range = scope1->functionMap.equal_range((*tok)->str());
             for (std::multimap<std::string, const Function*>::const_iterator it = range.first; it != range.second; ++it) {
-                auto * func = const_cast<Function *>(it->second);
+                Function * func = const_cast<Function *>(it->second);
                 if (!func->hasBody()) {
                     if (func->argsMatch(scope1, func->argDef, (*tok)->next(), path, path_length)) {
                         const Token *closeParen = (*tok)->next()->link();
@@ -6502,7 +6502,7 @@ static bool isContainerYieldPointer(Library::Container::Yield yield)
 
 void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, SourceLocation loc)
 {
-    auto* valuetypePtr = new ValueType(valuetype);
+    ValueType* valuetypePtr = new ValueType(valuetype);
     if (mSettings.debugnormal || mSettings.debugwarnings)
         valuetypePtr->setDebugPath(tok, loc);
     tok->setValueType(valuetypePtr);
@@ -6584,7 +6584,7 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
                 setValueType(var1Tok, vt);
                 if (var1Tok != parent->previous())
                     setValueType(parent->previous(), vt);
-                auto *var = const_cast<Variable *>(parent->previous()->variable());
+                Variable *var = const_cast<Variable *>(parent->previous()->variable());
                 if (var) {
                     ValueType vt2_(*vt2);
                     if (vt2_.pointer == 0 && autoTok->strAt(1) == "*")
@@ -6737,7 +6737,7 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
                     varvt.constness |= 1;
             }
             setValueType(parent->previous(), varvt);
-            auto *var = const_cast<Variable *>(parent->previous()->variable());
+            Variable *var = const_cast<Variable *>(parent->previous()->variable());
             if (var) {
                 var->setValueType(varvt);
                 if (vt2->typeScope && vt2->typeScope->definedType) {
@@ -6803,7 +6803,7 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
                 if (isconst)
                     varvt.constness |= (1 << autovt.pointer);
                 setValueType(parent->previous(), varvt);
-                auto * var = const_cast<Variable *>(parent->previous()->variable());
+                Variable * var = const_cast<Variable *>(parent->previous()->variable());
                 if (var) {
                     var->setValueType(varvt);
                     if (templateArgType && templateArgType->classScope && templateArgType->classScope->definedType) {

lib/templatesimplifier.cpp

@@ -34,7 +34,6 @@
 #include <map>
 #include <memory>
 #include <stack>
-#include <type_traits>
 #include <utility>
 
 static Token *skipRequires(Token *tok)
@@ -1377,7 +1376,7 @@ void TemplateSimplifier::simplifyTemplateAliases()
         }
 
         if (found) {
-            auto *end = const_cast<Token *>(aliasDeclaration.aliasEndToken());
+            Token *end = const_cast<Token *>(aliasDeclaration.aliasEndToken());
 
             // remove declaration tokens
             if (aliasDeclaration.token()->previous())
@@ -3228,7 +3227,7 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
     // process uninstantiated templates
     // TODO: remove the specialized check and handle all uninstantiated templates someday.
     if (!instantiated && specialized) {
-        auto * tok2 = const_cast<Token *>(templateDeclaration.nameToken());
+        Token * tok2 = const_cast<Token *>(templateDeclaration.nameToken());
         if (mErrorLogger && !mTokenList.getFiles().empty())
             mErrorLogger->reportProgress(mTokenList.getFiles()[0], "TemplateSimplifier::simplifyTemplateInstantiations()", tok2->progressValue());
 

lib/token.cpp

@@ -42,7 +42,6 @@
 #include <set>
 #include <sstream> // IWYU pragma: keep
 #include <stack>
-#include <type_traits>
 #include <unordered_set>
 #include <utility>
 

lib/tokenize.cpp

@@ -821,14 +821,7 @@ namespace {
                 }
             }
 
-            // don't add class|struct|union in inheritance list
+            Token* const tok2 = insertTokens(tok, mRangeType);
-            auto rangeType = mRangeType;
-            if (Token::Match(tok->previous(), "public|private|protected")) {
-                while (Token::Match(rangeType.first, "const|class|struct|union"))
-                    rangeType.first = rangeType.first->next();
-            }
-
-            Token* const tok2 = insertTokens(tok, rangeType);
             Token* const tok3 = insertTokens(tok2, mRangeTypeQualifiers);
 
             Token *after = tok3;
@@ -3361,10 +3354,10 @@ bool Tokenizer::simplifyTokens1(const std::string &configuration)
     if (mTimerResults) {
         Timer t("Tokenizer::simplifyTokens1::createAst", mSettings->showtime, mTimerResults);
         list.createAst();
-        list.validateAst(mSettings->debugnormal);
+        list.validateAst();
     } else {
         list.createAst();
-        list.validateAst(mSettings->debugnormal);
+        list.validateAst();
     }
 
     if (mTimerResults) {
@@ -3922,7 +3915,7 @@ void Tokenizer::simplifyLabelsCaseDefault()
     int indentLevel = 0;
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         // Simplify labels in the executable scope..
-        auto *start = const_cast<Token *>(startOfExecutableScope(tok));
+        Token *start = const_cast<Token *>(startOfExecutableScope(tok));
         if (start) {
             tok = start;
             executablescope = true;

lib/tokenlist.cpp

@@ -50,9 +50,6 @@ TokenList::TokenList(const Settings* settings) :
     mSettings(settings)
 {
     mTokensFrontBack.list = this;
-    if (mSettings && (mSettings->enforcedLang != Standards::Language::None)) {
-        mLang = mSettings->enforcedLang;
-    }
 }
 
 TokenList::~TokenList()
@@ -83,12 +80,12 @@ void TokenList::deallocateTokens()
 
 void TokenList::determineCppC()
 {
-    // only try to determine it if it wasn't enforced
+    if (!mSettings) {
-    if (mLang == Standards::Language::None) {
+        mIsC = Path::isC(getSourceFilePath());
-        if (Path::isC(getSourceFilePath()))
+        mIsCpp = Path::isCPP(getSourceFilePath());
-            mLang = Standards::Language::C;
+    } else {
-        else if (Path::isCPP(getSourceFilePath()))
+        mIsC = mSettings->enforcedLang == Settings::Language::C || (mSettings->enforcedLang == Settings::Language::None && Path::isC(getSourceFilePath()));
-            mLang = Standards::Language::CPP;
+        mIsCpp = mSettings->enforcedLang == Settings::Language::CPP || (mSettings->enforcedLang == Settings::Language::None && Path::isCPP(getSourceFilePath()));
     }
 }
 
@@ -576,12 +573,8 @@ static bool iscpp11init_impl(const Token * const tok)
     }
 
     auto isCaseStmt = [](const Token* colonTok) {
-        if (!Token::Match(colonTok->tokAt(-1), "%name%|%num%|%char%|) :"))
+        if (!Token::Match(colonTok->tokAt(-1), "%name%|%num%|%char% :"))
             return false;
-        if (const Token* castTok = colonTok->linkAt(-1)) {
-            if (Token::simpleMatch(castTok->astParent(), "case"))
-                return true;
-        }
         const Token* caseTok = colonTok->tokAt(-2);
         while (caseTok && Token::Match(caseTok->tokAt(-1), "::|%name%"))
             caseTok = caseTok->tokAt(-1);
@@ -1725,10 +1718,10 @@ namespace {
     };
 }
 
-void TokenList::validateAst(bool print) const
+void TokenList::validateAst() const
 {
     OnException oe{[&] {
-            if (print)
+            if (mSettings && mSettings->debugnormal)
                 mTokensFrontBack.front->printOut();
         }};
     // Check for some known issues in AST to avoid crash/hang later on
@@ -1857,7 +1850,7 @@ void TokenList::simplifyPlatformTypes()
     if (!mSettings)
         return;
 
-    const bool isCPP11 = isCPP() && (mSettings->standards.cpp >= Standards::CPP11);
+    const bool isCPP11  = mSettings->standards.cpp >= Standards::CPP11;
 
     enum { isLongLong, isLong, isInt } type;
 
@@ -1999,7 +1992,7 @@ void TokenList::simplifyStdType()
             continue;
         }
 
-        if (Token::Match(tok, "char|short|int|long|unsigned|signed|double|float") || (isC() && (!mSettings || (mSettings->standards.c >= Standards::C99)) && Token::Match(tok, "complex|_Complex"))) {
+        if (Token::Match(tok, "char|short|int|long|unsigned|signed|double|float") || (mSettings->standards.c >= Standards::C99 && Token::Match(tok, "complex|_Complex"))) {
             bool isFloat= false;
             bool isSigned = false;
             bool isUnsigned = false;
@@ -2022,7 +2015,7 @@ void TokenList::simplifyStdType()
                 else if (Token::Match(tok2, "float|double")) {
                     isFloat = true;
                     typeSpec = tok2;
-                } else if (isC() && (!mSettings || (mSettings->standards.c >= Standards::C99)) && Token::Match(tok2, "complex|_Complex"))
+                } else if (mSettings->standards.c >= Standards::C99 && Token::Match(tok2, "complex|_Complex"))
                     isComplex = !isFloat || tok2->str() == "_Complex" || Token::Match(tok2->next(), "*|&|%name%"); // Ensure that "complex" is not the variables name
                 else if (Token::Match(tok2, "char|int")) {
                     if (!typeSpec)
@@ -2060,7 +2053,7 @@ void TokenList::simplifyStdType()
 
 bool TokenList::isKeyword(const std::string &str) const
 {
-    if (isCPP()) {
+    if (mIsCpp) {
         // TODO: integrate into keywords?
         // types and literals are not handled as keywords
         static const std::unordered_set<std::string> cpp_types = {"bool", "false", "true"};