applied diskarzhan fixes

firewave · firewave · commit dbccfbf0f632 · 2026-04-21T21:20:28.000+02:00
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -50,10 +50,8 @@
 #include <iostream>
 #include <iterator>
 #include <list>
-#include <memory>
 #include <set>
 #include <sstream>
-#include <unordered_set>
 #include <utility>
 
 #ifdef HAVE_RULES
diff --git a/gui/checkthread.cpp b/gui/checkthread.cpp
@@ -34,7 +34,6 @@
 #include <fstream>
 #include <iterator>
 #include <list>
-#include <set>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/gui/cppchecklibrarydata.cpp b/gui/cppchecklibrarydata.cpp
@@ -21,7 +21,6 @@
 #include "utils.h"
 
 #include <stdexcept>
-#include <string>
 #include <utility>
 
 #include <QObject>
diff --git a/gui/erroritem.cpp b/gui/erroritem.cpp
@@ -20,7 +20,6 @@
 
 #include "common.h"
 
-#include <list>
 
 QErrorPathItem::QErrorPathItem(const ErrorMessage::FileLocation &loc)
     : file(QString::fromStdString(loc.getfile(false)))
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -64,9 +64,7 @@
 #include <iterator>
 #include <list>
 #include <memory>
-#include <set>
 #include <string>
-#include <unordered_set>
 #include <utility>
 #include <vector>
 
diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp
@@ -33,7 +33,6 @@
 #include "ui_projectfile.h"
 
 #include <array>
-#include <list>
 #include <string>
 #include <utility>
 
diff --git a/gui/threadhandler.cpp b/gui/threadhandler.cpp
@@ -27,7 +27,6 @@
 
 #include <algorithm>
 #include <string>
-#include <unordered_set>
 #include <utility>
 
 #include <QDebug>
diff --git a/lib/astutils.cpp b/lib/astutils.cpp
@@ -39,12 +39,9 @@
 #include <algorithm>
 #include <cstring>
 #include <functional>
-#include <initializer_list>
 #include <iterator>
-#include <list>
 #include <set>
 #include <type_traits>
-#include <unordered_map>
 #include <utility>
 
 const Token* findExpression(const nonneg int exprid,
diff --git a/lib/astutils.h b/lib/astutils.h
@@ -24,7 +24,6 @@
 
 #include <cstdint>
 #include <functional>
-#include <list>
 #include <string>
 #include <type_traits>
 #include <utility>
diff --git a/lib/calculate.h b/lib/calculate.h
@@ -21,7 +21,6 @@
 
 #include "mathlib.h"
 #include "errortypes.h"
-#include <limits>
 #include <string>
 
 template<class T>
diff --git a/lib/check64bit.cpp b/lib/check64bit.cpp
@@ -29,7 +29,6 @@
 #include "token.h"
 #include "tokenize.h"
 
-#include <vector>
 
 //---------------------------------------------------------------------------
 
diff --git a/lib/checkautovariables.cpp b/lib/checkautovariables.cpp
@@ -32,10 +32,8 @@
 #include "vfvalue.h"
 
 #include <algorithm>
-#include <list>
 #include <unordered_set>
 #include <utility>
-#include <vector>
 
 //---------------------------------------------------------------------------
 
diff --git a/lib/checkbool.cpp b/lib/checkbool.cpp
@@ -28,8 +28,6 @@
 #include "tokenize.h"
 #include "vfvalue.h"
 
-#include <list>
-#include <vector>
 //---------------------------------------------------------------------------
 
 // Register this check class (by creating a static instance of it)
diff --git a/lib/checkcondition.cpp b/lib/checkcondition.cpp
@@ -36,7 +36,6 @@
 
 #include <algorithm>
 #include <cstdint>
-#include <initializer_list>
 #include <limits>
 #include <list>
 #include <set>
diff --git a/lib/checkersreport.cpp b/lib/checkersreport.cpp
@@ -25,10 +25,7 @@
 
 #include <algorithm>
 #include <cstddef>
-#include <map>
 #include <sstream>
-#include <unordered_set>
-#include <vector>
 
 static int getMisraCVersion(const Settings& settings) {
     if (settings.premiumArgs.find("misra-c-2025") != std::string::npos)
diff --git a/lib/checkexceptionsafety.cpp b/lib/checkexceptionsafety.cpp
@@ -29,8 +29,6 @@
 
 #include <list>
 #include <set>
-#include <utility>
-#include <vector>
 
 //---------------------------------------------------------------------------
 
diff --git a/lib/checkfunctions.cpp b/lib/checkfunctions.cpp
@@ -36,10 +36,7 @@
 #include "vfvalue.h"
 
 #include <iomanip>
-#include <list>
-#include <map>
 #include <sstream>
-#include <unordered_map>
 #include <vector>
 
 //---------------------------------------------------------------------------
diff --git a/lib/checkinternal.cpp b/lib/checkinternal.cpp
@@ -27,9 +27,7 @@
 #include "token.h"
 #include "tokenize.h"
 
-#include <cstring>
 #include <set>
-#include <vector>
 
 // Register this check class (by creating a static instance of it).
 // Disabled in release builds
diff --git a/lib/checkio.cpp b/lib/checkio.cpp
@@ -35,7 +35,6 @@
 #include <cctype>
 #include <cstdlib>
 #include <functional>
-#include <list>
 #include <map>
 #include <set>
 #include <sstream>
diff --git a/lib/checkpostfixoperator.cpp b/lib/checkpostfixoperator.cpp
@@ -29,7 +29,6 @@
 #include "token.h"
 #include "tokenize.h"
 
-#include <vector>
 
 //---------------------------------------------------------------------------
 
diff --git a/lib/checksizeof.cpp b/lib/checksizeof.cpp
@@ -29,8 +29,6 @@
 
 #include <algorithm>
 #include <iterator>
-#include <map>
-#include <vector>
 
 //---------------------------------------------------------------------------
 
diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
@@ -35,7 +35,6 @@
 #include "checknullpointer.h"
 
 #include <algorithm>
-#include <initializer_list>
 #include <iterator>
 #include <list>
 #include <map>
diff --git a/lib/checktype.cpp b/lib/checktype.cpp
@@ -40,7 +40,6 @@
 #include <list>
 #include <sstream>
 #include <utility>
-#include <vector>
 
 //---------------------------------------------------------------------------
 
diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
@@ -38,12 +38,10 @@
 #include <algorithm>
 #include <cassert>
 #include <functional>
-#include <initializer_list>
 #include <list>
 #include <map>
 #include <unordered_set>
 #include <utility>
-#include <vector>
 
 //---------------------------------------------------------------------------
 
diff --git a/lib/checkunusedfunctions.cpp b/lib/checkunusedfunctions.cpp
@@ -35,7 +35,6 @@
 #include <algorithm>
 #include <cctype>
 #include <cstring>
-#include <functional>
 #include <map>
 #include <sstream>
 #include <tuple>
diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
@@ -34,7 +34,6 @@
 #include <algorithm>
 #include <cstddef>
 #include <cstdint>
-#include <list>
 #include <set>
 #include <utility>
 #include <vector>
diff --git a/lib/checkvaarg.cpp b/lib/checkvaarg.cpp
@@ -27,8 +27,6 @@
 
 #include <cstddef>
 #include <iterator>
-#include <list>
-#include <vector>
 
 //---------------------------------------------------------------------------
 
diff --git a/lib/forwardanalyzer.cpp b/lib/forwardanalyzer.cpp
@@ -36,7 +36,6 @@
 #include <cstdio>
 #include <cstdint>
 #include <functional>
-#include <list>
 #include <string>
 #include <tuple>
 #include <type_traits>
diff --git a/lib/fwdanalysis.cpp b/lib/fwdanalysis.cpp
@@ -27,7 +27,6 @@
 #include "vfvalue.h"
 
 #include <deque>
-#include <list>
 #include <string>
 #include <utility>
 
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -35,7 +35,6 @@
 #include <iostream>
 #include <iterator>
 #include <stack>
-#include <unordered_set>
 #include <utility>
 #include <vector>
 
diff --git a/lib/library.cpp b/lib/library.cpp
@@ -34,7 +34,6 @@
 #include <cstring>
 #include <iostream>
 #include <list>
-#include <memory>
 #include <stdexcept>
 #include <string>
 #include <unordered_set>
diff --git a/lib/pathanalysis.cpp b/lib/pathanalysis.cpp
@@ -24,7 +24,6 @@
 #include "vfvalue.h"
 
 #include <algorithm>
-#include <string>
 #include <tuple>
 
 const Scope* PathAnalysis::findOuterScope(const Scope * scope)
diff --git a/lib/programmemory.cpp b/lib/programmemory.cpp
@@ -37,7 +37,6 @@
 #include <cmath>
 #include <functional>
 #include <iterator>
-#include <list>
 #include <memory>
 #include <stack>
 #include <stdexcept>
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -41,7 +41,6 @@
 #include <cassert>
 #include <cstring>
 #include <functional>
-#include <initializer_list>
 #include <iomanip>
 #include <iostream>
 #include <iterator>
diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
@@ -32,7 +32,6 @@
 #include <cassert>
 #include <iostream>
 #include <map>
-#include <memory>
 #include <stack>
 #include <type_traits>
 #include <utility>
diff --git a/lib/vf_analyzers.cpp b/lib/vf_analyzers.cpp
@@ -41,9 +41,7 @@
 #include <cassert>
 #include <cstddef>
 #include <functional>
-#include <initializer_list>
 #include <iterator>
-#include <list>
 #include <set>
 #include <type_traits>
 
diff --git a/lib/vf_common.cpp b/lib/vf_common.cpp
@@ -36,7 +36,6 @@
 #include <exception>
 #include <limits>
 #include <utility>
-#include <vector>
 
 namespace ValueFlow
 {
diff --git a/lib/vf_settokenvalue.cpp b/lib/vf_settokenvalue.cpp
@@ -39,7 +39,6 @@
 #include <cstdint>
 #include <functional>
 #include <list>
-#include <string>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
diff --git a/test/cfg/cppunit.cpp b/test/cfg/cppunit.cpp
@@ -8,7 +8,6 @@
 
 // cppcheck-suppress-file valueFlowBailout
 
-#include <string>
 
 #include <cppunit/Exception.h>
 #include <cppunit/Portability.h>
diff --git a/test/fixture.h b/test/fixture.h
@@ -32,7 +32,6 @@
 #include <cstddef>
 #include <cstdint>
 #include <exception>
-#include <list>
 #include <memory>
 #include <set>
 #include <sstream>
diff --git a/test/testcheck.cpp b/test/testcheck.cpp
@@ -19,7 +19,6 @@
 #include "check.h"
 #include "fixture.h"
 
-#include <list>
 #include <string>
 
 class TestCheck : public TestFixture {
diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
@@ -37,10 +37,8 @@
 #include <cstdio>
 #include <list>
 #include <memory>
-#include <set>
 #include <stdexcept>
 #include <string>
-#include <unordered_set>
 #include <vector>
 
 class TestCmdlineParser : public TestFixture {
diff --git a/test/testexecutor.cpp b/test/testexecutor.cpp
@@ -29,7 +29,6 @@
 
 #include <list>
 #include <stdexcept>
-#include <string>
 #include <utility>
 
 class DummyExecutor : public Executor
diff --git a/test/testfrontend.cpp b/test/testfrontend.cpp
@@ -24,7 +24,6 @@
 #include "standards.h"
 
 #include <list>
-#include <string>
 
 class TestFrontend : public TestFixture {
 public:
diff --git a/test/testlibrary.cpp b/test/testlibrary.cpp
@@ -27,9 +27,7 @@
 
 #include <cstddef>
 #include <cstdint>
-#include <map>
 #include <string>
-#include <unordered_map>
 #include <vector>
 
 #define ASSERT_EQ(expected, actual)   ASSERT(expected == actual)
diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
diff --git a/test/testpath.cpp b/test/testpath.cpp
diff --git a/test/testpathmatch.cpp b/test/testpathmatch.cpp
diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp
diff --git a/test/testsarifreport.cpp b/test/testsarifreport.cpp
diff --git a/test/testsizeof.cpp b/test/testsizeof.cpp
diff --git a/test/testtokenrange.cpp b/test/testtokenrange.cpp
diff --git a/test/testunusedprivfunc.cpp b/test/testunusedprivfunc.cpp
