cleaned up includes based on include-what-you-use (danmar#8178)

firewave · web-flow · commit 23adf760ba80 · 2026-02-03T22:06:31.000+01:00
diff --git a/.github/workflows/selfcheck.yml b/.github/workflows/selfcheck.yml
@@ -121,7 +121,7 @@ jobs:
 
       - name: Self check (unusedFunction / no test / no gui)
         run: |
-          supprs="--suppress=unusedFunction:lib/errorlogger.h:196 --suppress=unusedFunction:lib/importproject.cpp:1530 --suppress=unusedFunction:lib/importproject.cpp:1554"
+          supprs="--suppress=unusedFunction:lib/errorlogger.h:196 --suppress=unusedFunction:lib/importproject.cpp:1531 --suppress=unusedFunction:lib/importproject.cpp:1555"
           ./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib -D__CPPCHECK__ -D__GNUC__ --enable=unusedFunction,information --exception-handling -rp=. --project=cmake.output.notest_nogui/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr $supprs
         env:
           DISABLE_VALUEFLOW: 1
diff --git a/Makefile b/Makefile
@@ -574,7 +574,7 @@ $(libcppdir)/checkunusedvar.o: lib/checkunusedvar.cpp lib/addoninfo.h lib/astuti
 $(libcppdir)/checkvaarg.o: lib/checkvaarg.cpp lib/addoninfo.h lib/astutils.h lib/check.h lib/checkers.h lib/checkvaarg.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkvaarg.cpp
 
-$(libcppdir)/clangimport.o: lib/clangimport.cpp lib/addoninfo.h lib/checkers.h lib/clangimport.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/clangimport.o: lib/clangimport.cpp lib/clangimport.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/clangimport.cpp
 
 $(libcppdir)/color.o: lib/color.cpp lib/color.h lib/config.h
diff --git a/gui/codeeditorstyle.cpp b/gui/codeeditorstyle.cpp
@@ -18,6 +18,7 @@
 
 #include "codeeditorstyle.h"
 
+#include <QList>
 #include <QSettings>
 #include <QVariant>
 
diff --git a/gui/codeeditstyledialog.cpp b/gui/codeeditstyledialog.cpp
@@ -28,7 +28,6 @@
 #include <QHBoxLayout>
 #include <QPushButton>
 #include <QString>
-#include <QStringList>
 #include <QVBoxLayout>
 #include <QtGlobal>
 
diff --git a/gui/codeeditstyledialog.h b/gui/codeeditstyledialog.h
@@ -25,6 +25,7 @@
 #include <QDialog>
 #include <QFont>
 #include <QObject>
+#include <QStringList>
 
 class CodeEditor;
 class SelectColorButton;
diff --git a/gui/erroritem.h b/gui/erroritem.h
@@ -23,7 +23,6 @@
 #include "errortypes.h"
 
 #include <QList>
-#include <QMetaType>
 #include <QString>
 
 /// @addtogroup GUI
diff --git a/gui/helpdialog.h b/gui/helpdialog.h
@@ -22,7 +22,6 @@
 #include <QDialog>
 #include <QObject>
 #include <QTextBrowser>
-#include <QVariant>
 
 class QHelpEngine;
 class QWidget;
diff --git a/gui/librarydialog.cpp b/gui/librarydialog.cpp
@@ -30,7 +30,6 @@
 #include <QComboBox>
 #include <QFile>
 #include <QFileDialog>
-#include <QFlags>
 #include <QIODevice>
 #include <QLineEdit>
 #include <QList>
diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp
@@ -45,7 +45,6 @@
 #include <QDir>
 #include <QFileDialog>
 #include <QFileInfo>
-#include <QFlags>
 #include <QLabel>
 #include <QLineEdit>
 #include <QListWidget>
diff --git a/gui/resultstree.cpp b/gui/resultstree.cpp
@@ -50,9 +50,7 @@
 #include <QIcon>
 #include <QItemSelectionModel>
 #include <QKeyEvent>
-#include <QList>
 #include <QLocale>
-#include <QMap>
 #include <QMenu>
 #include <QMessageBox>
 #include <QModelIndex>
diff --git a/gui/xmlreportv2.h b/gui/xmlreportv2.h
@@ -22,7 +22,6 @@
 #include "erroritem.h"
 #include "xmlreport.h"
 
-#include <QList>
 #include <QString>
 
 class QXmlStreamReader;
diff --git a/lib/clangimport.cpp b/lib/clangimport.cpp
@@ -20,7 +20,6 @@
 
 #include "errortypes.h"
 #include "mathlib.h"
-#include "settings.h"
 #include "standards.h"
 #include "symboldatabase.h"
 #include "token.h"
@@ -45,6 +44,8 @@
 #include <vector>
 #include <numeric>
 
+class Settings;
+
 static const std::string AccessSpecDecl = "AccessSpecDecl";
 static const std::string ArraySubscriptExpr = "ArraySubscriptExpr";
 static const std::string BinaryOperator = "BinaryOperator";
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -31,6 +31,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <fstream>
+#include <initializer_list>
 #include <iostream>
 #include <iterator>
 #include <stack>
diff --git a/lib/platform.h b/lib/platform.h
@@ -30,7 +30,6 @@
 #include <climits>
 #include <cstddef>
 #include <cstdint>
-#include <stdexcept>
 #include <string>
 #include <vector>
 
diff --git a/oss-fuzz/Makefile b/oss-fuzz/Makefile
@@ -254,7 +254,7 @@ $(libcppdir)/checkunusedvar.o: ../lib/checkunusedvar.cpp ../lib/addoninfo.h ../l
 $(libcppdir)/checkvaarg.o: ../lib/checkvaarg.cpp ../lib/addoninfo.h ../lib/astutils.h ../lib/check.h ../lib/checkers.h ../lib/checkvaarg.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkvaarg.cpp
 
-$(libcppdir)/clangimport.o: ../lib/clangimport.cpp ../lib/addoninfo.h ../lib/checkers.h ../lib/clangimport.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
+$(libcppdir)/clangimport.o: ../lib/clangimport.cpp ../lib/clangimport.h ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/clangimport.cpp
 
 $(libcppdir)/color.o: ../lib/color.cpp ../lib/color.h ../lib/config.h
diff --git a/test/testcondition.cpp b/test/testcondition.cpp
@@ -24,7 +24,6 @@
 #include "settings.h"
 
 #include <cstddef>
-#include <limits>
 #include <string>
 
 class TestCondition : public TestFixture {
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
@@ -31,7 +31,6 @@
 #include <cstdint>
 #include <cstring>
 #include <iterator>
-#include <limits>
 #include <list>
 #include <set>
 #include <sstream>
