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

firewave · web-flow · commit ce16b8de3722 · 2024-11-23T17:34:58.000+01:00
diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
@@ -43,6 +43,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cstdint>
 #include <cstdio>
 #include <cstdlib> // EXIT_SUCCESS and EXIT_FAILURE
 #include <ctime>
diff --git a/cli/main.cpp b/cli/main.cpp
@@ -65,7 +65,6 @@
 #include <cstdlib>
 #include <exception>
 #include <iostream>
-#include <string>
 #endif
 
 /**
diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp
@@ -38,8 +38,6 @@
 #include <utility>
 #include <vector>
 
-enum class Color : std::uint8_t;
-
 ThreadExecutor::ThreadExecutor(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const Settings &settings, SuppressionList &suppressions, ErrorLogger &errorLogger, CppCheck::ExecuteCmdFn executeCommand)
     : Executor(files, fileSettings, settings, suppressions, errorLogger)
     , mExecuteCommand(std::move(executeCommand))
diff --git a/gui/codeeditor.h b/gui/codeeditor.h
@@ -35,7 +35,6 @@
 class CodeEditorStyle;
 class QPaintEvent;
 class QRect;
-class QResizeEvent;
 class QTextDocument;
 
 class Highlighter : public QSyntaxHighlighter {
diff --git a/gui/csvreport.h b/gui/csvreport.h
@@ -24,8 +24,6 @@
 #include <QString>
 #include <QTextStream>
 
-class ErrorItem;
-
 /// @addtogroup GUI
 /// @{
 
diff --git a/gui/helpdialog.h b/gui/helpdialog.h
@@ -25,7 +25,6 @@
 #include <QVariant>
 
 class QHelpEngine;
-class QUrl;
 class QWidget;
 namespace Ui {
     class HelpDialog;
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
@@ -42,7 +42,6 @@ class QSettings;
 class QTimer;
 class QLineEdit;
 class ImportProject;
-class QCloseEvent;
 class QNetworkAccessManager;
 class QNetworkReply;
 class Settings;
diff --git a/gui/newsuppressiondialog.cpp b/gui/newsuppressiondialog.cpp
@@ -33,7 +33,6 @@
 #include <QStringList>
 
 class QWidget;
-enum class Color : std::uint8_t;
 
 NewSuppressionDialog::NewSuppressionDialog(QWidget *parent) :
     QDialog(parent),
diff --git a/gui/printablereport.h b/gui/printablereport.h
@@ -23,8 +23,6 @@
 
 #include <QString>
 
-class ErrorItem;
-
 /// @addtogroup GUI
 /// @{
 
diff --git a/gui/resultstree.h b/gui/resultstree.h
@@ -39,8 +39,6 @@ class QModelIndex;
 class QWidget;
 class QItemSelectionModel;
 class ThreadHandler;
-class QContextMenuEvent;
-class QKeyEvent;
 class QSettings;
 enum class Severity : std::uint8_t;
 
diff --git a/gui/test/filelist/testfilelist.h b/gui/test/filelist/testfilelist.h
@@ -17,7 +17,6 @@
  */
 
 #include <QObject>
-#include <QString>
 
 class TestFileList : public QObject {
     Q_OBJECT
diff --git a/gui/test/projectfile/testprojectfile.cpp b/gui/test/projectfile/testprojectfile.cpp
@@ -19,6 +19,7 @@
 #include "testprojectfile.h"
 
 #include "importproject.h"
+#include "library.h"
 #include "platform.h"
 #include "projectfile.h"
 #include "settings.h"
diff --git a/gui/test/resultstree/testresultstree.cpp b/gui/test/resultstree/testresultstree.cpp
@@ -17,22 +17,34 @@
  */
 
 #include "testresultstree.h"
+
 #include "resultstree.h"
 
 // headers that declare mocked functions/variables
 #include "applicationlist.h"
 #include "common.h"
 #include "threadhandler.h"
 #include "projectfile.h"
-#include "xmlreportv2.h"
 
+#include "application.h"
 #include "cppcheck.h"
+#include "erroritem.h"
 #include "errorlogger.h"
+#include "errortypes.h"
 #include "path.h"
+#include "report.h"
 #include "settings.h"
+#include "showtypes.h"
+#include "suppressions.h"
+#include "xmlreport.h"
 
+#include <cstddef>
+#include <set>
+#include <string>
 #include <utility>
 
+#include <QModelIndex>
+#include <QString>
 #include <QtTest>
 
 class TestReport : public Report {
diff --git a/gui/txtreport.h b/gui/txtreport.h
@@ -25,8 +25,6 @@
 #include <QObject>
 #include <QTextStream>
 
-class ErrorItem;
-
 /// @addtogroup GUI
 /// @{
 
diff --git a/lib/addoninfo.cpp b/lib/addoninfo.cpp
@@ -24,7 +24,6 @@
 #include <fstream>
 #include <iostream>
 #include <string>
-#include <vector>
 
 #include "json.h"
 
diff --git a/lib/checkbufferoverrun.h b/lib/checkbufferoverrun.h
@@ -36,10 +36,6 @@
 #include <string>
 #include <vector>
 
-namespace tinyxml2 {
-    class XMLElement;
-}
-
 class ErrorLogger;
 class Settings;
 class Token;
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -42,10 +42,6 @@
 
 #include "xml.h"
 
-namespace CTU {
-    class FileInfo;
-}
-
 //---------------------------------------------------------------------------
 
 // Register CheckClass..
diff --git a/lib/checkclass.h b/lib/checkclass.h
@@ -37,14 +37,6 @@ class ErrorLogger;
 class Settings;
 class Token;
 
-namespace CTU {
-    class FileInfo;
-}
-
-namespace tinyxml2 {
-    class XMLElement;
-}
-
 /// @addtogroup Checks
 /// @{
 
diff --git a/lib/checkersreport.cpp b/lib/checkersreport.cpp
@@ -18,6 +18,7 @@
 
 #include "checkersreport.h"
 
+#include "addoninfo.h"
 #include "checkers.h"
 #include "errortypes.h"
 #include "settings.h"
diff --git a/lib/checknullpointer.h b/lib/checknullpointer.h
@@ -35,14 +35,6 @@ class Library;
 class Settings;
 class Token;
 
-namespace CTU {
-    class FileInfo;
-}
-
-namespace tinyxml2 {
-    class XMLElement;
-}
-
 /// @addtogroup Checks
 /// @{
 
diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
@@ -41,11 +41,6 @@
 #include <unordered_set>
 #include <vector>
 
-
-namespace tinyxml2 {
-    class XMLElement;
-}
-
 //---------------------------------------------------------------------------
 
 // CWE ids used:
diff --git a/lib/checkuninitvar.h b/lib/checkuninitvar.h
@@ -30,7 +30,6 @@
 #include "vfvalue.h"
 
 #include <cstdint>
-#include <list>
 #include <map>
 #include <set>
 #include <string>
@@ -42,15 +41,6 @@ class ErrorLogger;
 class Settings;
 class Library;
 
-namespace CTU {
-    class FileInfo;
-}
-
-namespace tinyxml2 {
-    class XMLElement;
-}
-
-
 struct VariableValue {
     explicit VariableValue(MathLib::bigint val = 0) : value(val) {}
     MathLib::bigint value;
diff --git a/lib/infer.cpp b/lib/infer.cpp
@@ -30,8 +30,6 @@
 #include <unordered_set>
 #include <utility>
 
-class Token;
-
 template<class Predicate, class Compare>
 static const ValueFlow::Value* getCompareValue(const std::list<ValueFlow::Value>& values, Predicate pred, Compare compare)
 {
diff --git a/lib/library.h b/lib/library.h
@@ -32,7 +32,6 @@
 #include <set>
 #include <string>
 #include <unordered_map>
-#include <utility>
 #include <vector>
 
 class Token;
diff --git a/lib/settings.h b/lib/settings.h
@@ -43,6 +43,10 @@
 #include <unordered_set>
 #include <utility>
 
+#if defined(USE_WINDOWS_SEH) || defined(USE_UNIX_SIGNAL_HANDLING)
+#include <cstdio>
+#endif
+
 enum class SHOWTIME_MODES : std::uint8_t;
 namespace ValueFlow {
     class Value;
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -126,7 +126,6 @@
 #include <numeric>
 #include <set>
 #include <sstream>
-#include <stdexcept>
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
diff --git a/lib/valueflow.h b/lib/valueflow.h
@@ -22,6 +22,7 @@
 //---------------------------------------------------------------------------
 
 #include "config.h"
+#include "errortypes.h"
 #include "mathlib.h"
 #include "vfvalue.h"
 
@@ -33,7 +34,6 @@
 #include <vector>
 
 class ErrorLogger;
-struct InferModel;
 class Settings;
 class SymbolDatabase;
 class TimerResultsIntf;
diff --git a/lib/vf_common.h b/lib/vf_common.h
@@ -26,7 +26,6 @@
 #include "vfvalue.h"
 
 #include <cstddef>
-#include <list>
 #include <string>
 
 class Token;
diff --git a/test/signal/test-signalhandler.cpp b/test/signal/test-signalhandler.cpp
@@ -23,6 +23,7 @@
 
 #include <cassert>
 #include <cfenv>
+#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 
diff --git a/test/signal/test-signalhandler.py b/test/signal/test-signalhandler.py
@@ -35,7 +35,7 @@ def test_assert():
     if sys.platform == "darwin":
         assert stderr.startswith("Assertion failed: (false), function my_assert, file test-signalhandler.cpp, line "), stderr
     else:
-        assert stderr.endswith("test-signalhandler.cpp:33: void my_assert(): Assertion `false' failed.\n"), stderr
+        assert stderr.endswith("test-signalhandler.cpp:34: void my_assert(): Assertion `false' failed.\n"), stderr
     lines = stdout.splitlines()
     assert lines[0] == 'Internal error: cppcheck received signal SIGABRT - abort or assertion'
     # no stacktrace of MacOs
diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
@@ -22,6 +22,7 @@
 #include "mathlib.h"
 #include "platform.h"
 #include "settings.h"
+#include "standards.h"
 #include "token.h"
 #include "tokenize.h"
 #include "vfvalue.h"
