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

danmar · Apr 11, 2024 · 6d3d868 · 6d3d868
1 parent d0de1fe
commit 6d3d868
Show file tree

Hide file tree

Showing 35 changed files with 76 additions and 83 deletions.
diff --git a/Makefile b/Makefile
diff --git a/cli/processexecutor.cpp b/cli/processexecutor.cpp
@@ -42,6 +42,7 @@
 #include <sstream>
 #include <sys/select.h>
 #include <sys/time.h>
+#include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <utility>

diff --git a/cli/signalhandler.cpp b/cli/signalhandler.cpp
@@ -31,6 +31,7 @@
 //#include <features.h> // __USE_DYNAMIC_STACK_SIZE
 #include <map>
 #include <string>
+#include <sys/types.h>
 #include <unistd.h>
 #include <utility>
 

diff --git a/gui/main.cpp b/gui/main.cpp
@@ -19,7 +19,7 @@
 #include "cppcheck.h"
 #include "common.h"
 #include "mainwindow.h"
-#include "erroritem.h"
+#include "erroritem.h" // IWYU pragma: keep
 #include "translationhandler.h"
 
 #ifdef _WIN32

diff --git a/gui/test/projectfile/testprojectfile.cpp b/gui/test/projectfile/testprojectfile.cpp
@@ -18,11 +18,11 @@
 
 #include "testprojectfile.h"
 
-#include "addoninfo.h"
 #include "importproject.h"
 #include "platform.h"
 #include "projectfile.h"
 #include "settings.h"
+#include "suppressions.h"
 
 #include <string>
 

diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -26,6 +26,7 @@
 #include "symboldatabase.h"
 #include "errorlogger.h"
 #include "errortypes.h"
+#include "platform.h"
 #include "token.h"
 #include "tokenize.h"
 #include "tokenlist.h"

diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -42,7 +42,6 @@
 #include <set>
 #include <sstream>
 #include <utility>
-#include <numeric>
 
 //---------------------------------------------------------------------------
 

diff --git a/lib/cppcheck.h b/lib/cppcheck.h
@@ -43,6 +43,7 @@ class TokenList;
 enum class SHOWTIME_MODES;
 struct FileSettings;
 class CheckUnusedFunctions;
+class Tokenizer;
 
 /// @addtogroup Core
 /// @{

diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -23,7 +23,7 @@
 #include "standards.h"
 #include "suppressions.h"
 #include "token.h"
-#include "tokenize.h"
+#include "tokenlist.h"
 #include "utils.h"
 
 #include <algorithm>

diff --git a/lib/platform.h b/lib/platform.h
@@ -25,6 +25,7 @@
 #include "standards.h"
 
 #include <climits>
+#include <cstddef>
 #include <stdexcept>
 #include <string>
 #include <vector>

diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
@@ -32,6 +32,7 @@
 #include <algorithm>
 #include <array>
 #include <cstddef>
+#include <iterator>
 #include <sstream>
 #include <utility>
 

diff --git a/lib/settings.h b/lib/settings.h
@@ -41,7 +41,6 @@
 #include <tuple>
 #include <vector>
 #include <unordered_set>
-#include <utility>
 
 enum class SHOWTIME_MODES;
 namespace ValueFlow {

diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -19,7 +19,6 @@
 //---------------------------------------------------------------------------
 #include "tokenize.h"
 
-#include "check.h"
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "library.h"

diff --git a/lib/tokenize.h b/lib/tokenize.h
@@ -36,7 +36,7 @@ class TimerResults;
 class Token;
 class TemplateSimplifier;
 class ErrorLogger;
-struct Directive;
+struct Directive; // IWYU pragma: keep
 enum class Severity;
 
 /// @addtogroup Core

diff --git a/oss-fuzz/Makefile b/oss-fuzz/Makefile
@@ -142,7 +142,7 @@ tinyxml2.o: ../externals/tinyxml2/tinyxml2.cpp ../externals/tinyxml2/tinyxml2.h
 $(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) ${LIB_FUZZING_ENGINE} $(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
+$(libcppdir)/tokenize.o: ../lib/tokenize.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/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) ${LIB_FUZZING_ENGINE} $(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
@@ -265,7 +265,7 @@ $(libcppdir)/forwardanalyzer.o: ../lib/forwardanalyzer.cpp ../lib/addoninfo.h ..
 $(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) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/fwdanalysis.cpp
 
-$(libcppdir)/importproject.o: ../lib/importproject.cpp ../externals/picojson/picojson.h ../externals/tinyxml2/tinyxml2.h ../lib/addoninfo.h ../lib/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
+$(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/tokenlist.h ../lib/utils.h ../lib/vfvalue.h ../lib/xml.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/importproject.cpp
 
 $(libcppdir)/infer.o: ../lib/infer.cpp ../lib/calculate.h ../lib/config.h ../lib/errortypes.h ../lib/infer.h ../lib/mathlib.h ../lib/valueptr.h ../lib/vfvalue.h

diff --git a/test/helpers.h b/test/helpers.h
@@ -19,13 +19,15 @@
 #ifndef helpersH
 #define helpersH
 
-#include "preprocessor.h"
+#include "config.h"
 #include "settings.h"
 #include "standards.h"
 #include "tokenize.h"
 #include "tokenlist.h"
 
 #include <cstddef>
+#include <map>
+#include <set>
 #include <stdexcept>
 #include <sstream>
 #include <string>

diff --git a/test/testclass.cpp b/test/testclass.cpp
@@ -23,8 +23,10 @@
 #include "helpers.h"
 #include "settings.h"
 #include "tokenize.h"
+#include "tokenlist.h"
 
 #include <list>
+#include <sstream>
 #include <string>
 #include <vector>
 

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

diff --git a/test/testgarbage.cpp b/test/testgarbage.cpp
@@ -24,7 +24,6 @@
 #include "token.h"
 
 #include <list>
-#include <sstream>
 #include <string>
 
 class TestGarbage : public TestFixture {

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

diff --git a/test/testleakautovar.cpp b/test/testleakautovar.cpp
@@ -17,7 +17,6 @@
  */
 
 #include "checkleakautovar.h"
-#include "errortypes.h"
 #include "fixture.h"
 #include "helpers.h"
 #include "settings.h"

diff --git a/test/testmathlib.cpp b/test/testmathlib.cpp
@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "errortypes.h"
 #include "mathlib.h"
 #include "fixture.h"
 

diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
@@ -23,9 +23,7 @@
 #include "standards.h"
 #include "fixture.h"
 #include "token.h"
-#include "tokenize.h"
 
-#include <sstream>
 #include <string>
 
 

diff --git a/test/testsimplifyusing.cpp b/test/testsimplifyusing.cpp
@@ -23,6 +23,7 @@
 #include "settings.h"
 #include "token.h"
 #include "tokenize.h"
+#include "tokenlist.h"
 #include "utils.h"
 
 #include <sstream>

diff --git a/test/teststl.cpp b/test/teststl.cpp
@@ -22,7 +22,6 @@
 #include "helpers.h"
 #include "settings.h"
 #include "standards.h"
-#include "tokenize.h"
 #include "utils.h"
 
 #include <cstddef>

diff --git a/test/teststring.cpp b/test/teststring.cpp
@@ -24,7 +24,6 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream>
 #include <string>
 #include <vector>
 

diff --git a/test/testsummaries.cpp b/test/testsummaries.cpp
@@ -18,9 +18,7 @@
 
 #include "fixture.h"
 #include "helpers.h"
-#include "settings.h"
 #include "summaries.h"
-#include "tokenize.h"
 
 #include <string>
 

diff --git a/test/testthreadexecutor.cpp b/test/testthreadexecutor.cpp
@@ -25,7 +25,6 @@
 #include "threadexecutor.h"
 #include "timer.h"
 
-#include <algorithm>
 #include <cstdlib>
 #include <list>
 #include <memory>

diff --git a/test/testtoken.cpp b/test/testtoken.cpp
@@ -16,10 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "errortypes.h"
 #include "fixture.h"
 #include "helpers.h"
-#include "settings.h"
 #include "standards.h"
 #include "token.h"
 #include "tokenlist.h"

diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -33,8 +33,11 @@
 #include <set>
 #include <sstream>
 #include <string>
+#include <utility>
 #include <vector>
 
+#include <simplecpp.h>
+
 class TestTokenizer : public TestFixture {
 public:
     TestTokenizer() : TestFixture("TestTokenizer") {}

diff --git a/test/testtokenrange.cpp b/test/testtokenrange.cpp
@@ -16,12 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "settings.h"
 #include "fixture.h"
 #include "helpers.h"
 #include "token.h"
-#include "tokenize.h"
-#include "tokenlist.h"
 #include "tokenrange.h"
 #include "symboldatabase.h"
 

diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp
@@ -19,11 +19,9 @@
 #include "check.h"
 #include "checkuninitvar.h"
 #include "ctu.h"
-#include "errortypes.h"
 #include "fixture.h"
 #include "helpers.h"
 #include "settings.h"
-#include "tokenize.h"
 
 #include <list>
 #include <string>

diff --git a/test/testunusedfunctions.cpp b/test/testunusedfunctions.cpp
@@ -23,7 +23,9 @@
 #include "platform.h"
 #include "settings.h"
 #include "tokenize.h"
+#include "tokenlist.h"
 
+#include <sstream>
 #include <string>
 
 class TestUnusedFunctions : public TestFixture {

diff --git a/test/testunusedprivfunc.cpp b/test/testunusedprivfunc.cpp
@@ -24,7 +24,6 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream>
 #include <string>
 #include <vector>
 

diff --git a/test/testvarid.cpp b/test/testvarid.cpp
@@ -16,14 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "errortypes.h"
 #include "helpers.h"
 #include "platform.h"
 #include "settings.h"
 #include "standards.h"
 #include "fixture.h"
 #include "token.h"
 #include "tokenize.h"
+#include "tokenlist.h"
 
 #include <sstream>
 #include <string>