cleaned up includes based on include-what-you-use

danmar · May 21, 2024 · eda173c · eda173c
1 parent c9a726c
commit eda173c
Show file tree

Hide file tree

Showing 40 changed files with 48 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -655,7 +655,7 @@ cli/cmdlineparser.o: cli/cmdlineparser.cpp cli/cmdlinelogger.h cli/cmdlineparser
 cli/cppcheckexecutor.o: cli/cppcheckexecutor.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/cppcheckexecutor.h cli/cppcheckexecutorseh.h cli/executor.h cli/processexecutor.h cli/signalhandler.h cli/singleexecutor.h cli/threadexecutor.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/checkersreport.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
+cli/cppcheckexecutorseh.o: cli/cppcheckexecutorseh.cpp cli/cppcheckexecutor.h cli/cppcheckexecutorseh.h lib/config.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/cppcheckexecutorseh.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
@@ -664,7 +664,7 @@ cli/executor.o: cli/executor.cpp cli/executor.h lib/addoninfo.h lib/color.h lib/
 cli/filelister.o: cli/filelister.cpp cli/filelister.h lib/config.h lib/filesettings.h lib/path.h lib/pathmatch.h lib/platform.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/filelister.cpp
 
-cli/main.o: cli/main.cpp cli/cppcheckexecutor.h lib/config.h lib/errortypes.h lib/filesettings.h lib/platform.h lib/standards.h lib/utils.h
+cli/main.o: cli/main.cpp cli/cppcheckexecutor.h lib/config.h lib/errortypes.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

diff --git a/cli/cmdlineparser.h b/cli/cmdlineparser.h
@@ -22,7 +22,6 @@
 #include <cstddef>
 #include <list>
 #include <string>
-#include <utility>
 #include <vector>
 
 #include "cmdlinelogger.h"

diff --git a/cli/cppcheckexecutor.h b/cli/cppcheckexecutor.h
@@ -20,17 +20,16 @@
 #define CPPCHECKEXECUTOR_H
 
 #include "config.h"
-#include "filesettings.h"
 
 #include <cstdio>
 #include <list>
 #include <string>
-#include <utility>
 #include <vector>
 
 class Settings;
 class ErrorLogger;
 class SuppressionList;
+struct FileSettings;
 class FileWithDetails;
 
 /**

diff --git a/cli/filelister.cpp b/cli/filelister.cpp
@@ -23,7 +23,6 @@
 #include "pathmatch.h"
 #include "utils.h"
 
-#include <cstddef>
 #include <cstring>
 #include <iterator>
 #include <memory>

diff --git a/cli/filelister.h b/cli/filelister.h
@@ -19,11 +19,9 @@
 #ifndef filelisterH
 #define filelisterH
 
-#include <cstddef>
 #include <list>
 #include <set>
 #include <string>
-#include <utility>
 
 class PathMatch;
 class FileWithDetails;

diff --git a/cli/processexecutor.h b/cli/processexecutor.h
@@ -25,7 +25,6 @@
 #include <cstddef>
 #include <list>
 #include <string>
-#include <utility>
 
 class Settings;
 class ErrorLogger;

diff --git a/cli/singleexecutor.cpp b/cli/singleexecutor.cpp
@@ -24,9 +24,9 @@
 #include "timer.h"
 
 #include <cassert>
+#include <cstddef>
 #include <list>
 #include <numeric>
-#include <utility>
 
 class ErrorLogger;
 

diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp
@@ -25,14 +25,15 @@
 #include "settings.h"
 #include "timer.h"
 
-#include <algorithm>
 #include <cassert>
+#include <cstddef>
 #include <cstdlib>
 #include <future>
 #include <iostream>
 #include <list>
 #include <numeric>
 #include <mutex>
+#include <string>
 #include <system_error>
 #include <utility>
 #include <vector>

diff --git a/cli/threadexecutor.h b/cli/threadexecutor.h
@@ -22,10 +22,7 @@
 #include "cppcheck.h"
 #include "executor.h"
 
-#include <cstddef>
 #include <list>
-#include <string>
-#include <utility>
 
 class Settings;
 class ErrorLogger;

diff --git a/lib/checkassert.cpp b/lib/checkassert.cpp
@@ -24,12 +24,16 @@
 
 #include "astutils.h"
 #include "errortypes.h"
+#include "library.h"
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
 #include "tokenlist.h"
 
+#include <algorithm>
+#include <utility>
+
 //---------------------------------------------------------------------------
 
 // CWE ids used

diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
@@ -34,7 +34,6 @@
 #include "checknullpointer.h"
 
 #include <algorithm>
-#include <cassert>
 #include <iterator>
 #include <list>
 #include <map>

diff --git a/test/test64bit.cpp b/test/test64bit.cpp
@@ -22,6 +22,8 @@
 #include "helpers.h"
 #include "settings.h"
 
+#include <cstddef>
+
 class Test64BitPortability : public TestFixture {
 public:
     Test64BitPortability() : TestFixture("Test64BitPortability") {}

diff --git a/test/testautovariables.cpp b/test/testautovariables.cpp
@@ -22,6 +22,8 @@
 #include "helpers.h"
 #include "settings.h"
 
+#include <cstddef>
+
 class TestAutoVariables : public TestFixture {
 public:
     TestAutoVariables() : TestFixture("TestAutoVariables") {}

diff --git a/test/testbool.cpp b/test/testbool.cpp
@@ -22,6 +22,8 @@
 #include "helpers.h"
 #include "settings.h"
 
+#include <cstddef>
+
 class TestBool : public TestFixture {
 public:
     TestBool() : TestFixture("TestBool") {}

diff --git a/test/testboost.cpp b/test/testboost.cpp
@@ -22,6 +22,8 @@
 #include "helpers.h"
 #include "settings.h"
 
+#include <cstddef>
+
 class TestBoost : public TestFixture {
 public:
     TestBoost() : TestFixture("TestBoost") {}

diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
@@ -28,6 +28,7 @@
 #include "fixture.h"
 #include "tokenize.h"
 
+#include <cstddef>
 #include <list>
 #include <string>
 #include <vector>

diff --git a/test/testcharvar.cpp b/test/testcharvar.cpp
@@ -23,6 +23,8 @@
 #include "platform.h"
 #include "settings.h"
 
+#include <cstddef>
+
 class TestCharVar : public TestFixture {
 public:
     TestCharVar() : TestFixture("TestCharVar") {}

diff --git a/test/testclass.cpp b/test/testclass.cpp
@@ -25,6 +25,7 @@
 #include "tokenize.h"
 #include "tokenlist.h"
 
+#include <cstddef>
 #include <list>
 #include <sstream>
 #include <string>

diff --git a/test/testcondition.cpp b/test/testcondition.cpp
@@ -24,6 +24,7 @@
 #include "settings.h"
 #include "tokenize.h"
 
+#include <cstddef>
 #include <limits>
 #include <string>
 #include <vector>

diff --git a/test/testconstructors.cpp b/test/testconstructors.cpp
@@ -23,6 +23,8 @@
 #include "standards.h"
 #include "settings.h"
 
+#include <cstddef>
+
 class TestConstructors : public TestFixture {
 public:
     TestConstructors() : TestFixture("TestConstructors") {}

diff --git a/test/testexceptionsafety.cpp b/test/testexceptionsafety.cpp
@@ -22,6 +22,8 @@
 #include "helpers.h"
 #include "settings.h"
 
+#include <cstddef>
+
 class TestExceptionSafety : public TestFixture {
 public:
     TestExceptionSafety() : TestFixture("TestExceptionSafety") {}

diff --git a/test/testfilelister.cpp b/test/testfilelister.cpp
@@ -23,7 +23,6 @@
 #include "fixture.h"
 
 #include <algorithm>
-#include <cstddef>
 #include <list>
 #include <stdexcept>
 #include <string>

diff --git a/test/testfunctions.cpp b/test/testfunctions.cpp
@@ -23,6 +23,7 @@
 #include "settings.h"
 #include "standards.h"
 
+#include <cstddef>
 #include <string>
 
 class TestFunctions : public TestFixture {

diff --git a/test/testgarbage.cpp b/test/testgarbage.cpp
@@ -23,6 +23,7 @@
 #include "settings.h"
 #include "token.h"
 
+#include <cstddef>
 #include <list>
 #include <string>
 

diff --git a/test/testinternal.cpp b/test/testinternal.cpp
@@ -23,6 +23,8 @@
 #include "helpers.h"
 #include "settings.h"
 
+#include <cstddef>
+
 class TestInternal : public TestFixture {
 public:
     TestInternal() : TestFixture("TestInternal") {}

diff --git a/test/testio.cpp b/test/testio.cpp
@@ -24,6 +24,7 @@
 #include "platform.h"
 #include "settings.h"
 
+#include <cstddef>
 #include <string>
 
 class TestIO : public TestFixture {

diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
@@ -24,6 +24,7 @@
 #include "symboldatabase.h"
 #include "token.h"
 
+#include <cstddef>
 #include <list>
 
 class TestMemleak : private TestFixture {

diff --git a/test/testnullpointer.cpp b/test/testnullpointer.cpp
@@ -27,6 +27,7 @@
 #include "token.h"
 #include "tokenize.h"
 
+#include <cstddef>
 #include <list>
 #include <map>
 #include <string>

diff --git a/test/testother.cpp b/test/testother.cpp
@@ -25,6 +25,7 @@
 #include "standards.h"
 #include "tokenize.h"
 
+#include <cstddef>
 #include <string>
 #include <vector>
 

diff --git a/test/testpostfixoperator.cpp b/test/testpostfixoperator.cpp
@@ -22,6 +22,8 @@
 #include "helpers.h"
 #include "settings.h"
 
+#include <cstddef>
+
 class TestPostfixOperator : public TestFixture {
 public:
     TestPostfixOperator() : TestFixture("TestPostfixOperator") {}

diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
@@ -24,9 +24,9 @@
 #include "fixture.h"
 #include "token.h"
 
+#include <cstddef>
 #include <string>
 
-
 class TestSimplifyTokens : public TestFixture {
 public:
     TestSimplifyTokens() : TestFixture("TestSimplifyTokens") {}

diff --git a/test/testsimplifyusing.cpp b/test/testsimplifyusing.cpp
@@ -26,6 +26,7 @@
 #include "tokenlist.h"
 #include "utils.h"
 
+#include <cstddef>
 #include <sstream>
 #include <string>
 #include <vector>

diff --git a/test/testsizeof.cpp b/test/testsizeof.cpp
@@ -23,6 +23,7 @@
 #include "settings.h"
 #include "tokenize.h"
 
+#include <cstddef>
 #include <string>
 #include <vector>
 

diff --git a/test/testsummaries.cpp b/test/testsummaries.cpp
@@ -20,6 +20,7 @@
 #include "helpers.h"
 #include "summaries.h"
 
+#include <cstddef>
 #include <string>
 
 class TestSummaries : public TestFixture {

diff --git a/test/testsuppressions.cpp b/test/testsuppressions.cpp
@@ -29,7 +29,6 @@
 #include "threadexecutor.h"
 #include "singleexecutor.h"
 
-#include <cstddef>
 #include <cstring>
 #include <list>
 #include <map>

diff --git a/test/testtokenlist.cpp b/test/testtokenlist.cpp
@@ -28,6 +28,8 @@
 #include <sstream>
 #include <stack>
 #include <string>
+#include <utility>
+#include <vector>
 
 #include <simplecpp.h>
 

diff --git a/test/testtype.cpp b/test/testtype.cpp
@@ -25,6 +25,7 @@
 #include "standards.h"
 #include "tokenize.h"
 
+#include <cstddef>
 #include <list>
 #include <string>
 #include <vector>

diff --git a/test/testunusedfunctions.cpp b/test/testunusedfunctions.cpp
@@ -25,6 +25,7 @@
 #include "tokenize.h"
 #include "tokenlist.h"
 
+#include <cstddef>
 #include <sstream>
 #include <string>
 

diff --git a/test/testvaarg.cpp b/test/testvaarg.cpp
@@ -22,6 +22,8 @@
 #include "helpers.h"
 #include "settings.h"
 
+#include <cstddef>
+
 class TestVaarg : public TestFixture {
 public:
     TestVaarg() : TestFixture("TestVaarg") {}

diff --git a/test/testvarid.cpp b/test/testvarid.cpp
@@ -25,6 +25,7 @@
 #include "tokenize.h"
 #include "tokenlist.h"
 
+#include <cstddef>
 #include <sstream>
 #include <string>
 #include <vector>