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

danmar · Jul 21, 2024 · d03d820 · d03d820
1 parent 0552b41
commit d03d820
Show file tree

Hide file tree

Showing 49 changed files with 42 additions and 26 deletions.
diff --git a/cli/executor.h b/cli/executor.h
@@ -24,7 +24,6 @@
 #include <mutex>
 #include <string>
 #include <unordered_set>
-#include <utility>
 
 class Settings;
 class ErrorLogger;

diff --git a/cli/processexecutor.cpp b/cli/processexecutor.cpp
@@ -34,6 +34,7 @@
 #include <cassert>
 #include <cerrno>
 #include <csignal>
+#include <cstdint>
 #include <cstdlib>
 #include <cstring>
 #include <iostream>

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

diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp
@@ -26,7 +26,7 @@
 #include "timer.h"
 
 #include <cassert>
-#include <cstddef>
+#include <cstdint>
 #include <cstdlib>
 #include <future>
 #include <iostream>

diff --git a/gui/checkthread.cpp b/gui/checkthread.cpp
@@ -31,13 +31,11 @@
 #include "utils.h"
 
 #include <algorithm>
-#include <cstddef>
 #include <fstream>
 #include <iterator>
 #include <list>
 #include <set>
 #include <string>
-#include <utility>
 #include <vector>
 
 #include <QByteArray>

diff --git a/gui/codeeditor.cpp b/gui/codeeditor.cpp
@@ -22,7 +22,6 @@
 
 #include <QChar>
 #include <QColor>
-#include <QCryptographicHash>
 #include <QFont>
 #include <QFontMetrics>
 #include <QKeySequence>
@@ -31,7 +30,6 @@
 #include <QPainter>
 #include <QPaintEvent>
 #include <QRect>
-#include <QRectF>
 #include <QRegularExpressionMatchIterator>
 #include <QShortcut>
 #include <QTextBlock>

diff --git a/gui/codeeditorstyle.cpp b/gui/codeeditorstyle.cpp
@@ -19,7 +19,6 @@
 #include "codeeditorstyle.h"
 
 #include <QSettings>
-#include <QStringList>
 #include <QVariant>
 
 CodeEditorStyle::CodeEditorStyle(

diff --git a/gui/codeeditstylecontrols.cpp b/gui/codeeditstylecontrols.cpp
@@ -20,6 +20,8 @@
 
 #include <QColorDialog>
 #include <QDialog>
+#include <QObject>
+#include <QString>
 #include <QVariant>
 
 class QWidget;

diff --git a/gui/common.cpp b/gui/common.cpp
@@ -23,6 +23,7 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QList>
+#include <QMap>
 #include <QSettings>
 #include <QStringList>
 #include <QVariant>

diff --git a/gui/cppchecklibrarydata.h b/gui/cppchecklibrarydata.h
@@ -24,7 +24,6 @@
 #include <QList>
 #include <QMap>
 #include <QPair>
-#include <QSet>
 #include <QString>
 #include <QStringList>
 

diff --git a/gui/helpdialog.h b/gui/helpdialog.h
@@ -21,7 +21,6 @@
 
 #include <QDialog>
 #include <QObject>
-#include <QString>
 #include <QTextBrowser>
 #include <QVariant>
 

diff --git a/gui/libraryeditargdialog.cpp b/gui/libraryeditargdialog.cpp
@@ -24,6 +24,7 @@
 #include <QComboBox>
 #include <QLineEdit>
 #include <QSpinBox>
+#include <QString>
 #include <QStringList>
 
 class QWidget;

diff --git a/gui/libraryeditargdialog.h b/gui/libraryeditargdialog.h
@@ -24,7 +24,6 @@
 #include <QDialog>
 #include <QList>
 #include <QObject>
-#include <QString>
 
 class QWidget;
 namespace Ui {

diff --git a/gui/newsuppressiondialog.cpp b/gui/newsuppressiondialog.cpp
@@ -24,10 +24,12 @@
 
 #include "ui_newsuppressiondialog.h"
 
+#include <cstdint>
 #include <string>
 
 #include <QComboBox>
 #include <QLineEdit>
+#include <QString>
 #include <QStringList>
 
 class QWidget;

diff --git a/gui/newsuppressiondialog.h b/gui/newsuppressiondialog.h
@@ -23,7 +23,6 @@
 
 #include <QDialog>
 #include <QObject>
-#include <QString>
 
 class QWidget;
 namespace Ui {

diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp
@@ -48,6 +48,7 @@
 #include <QListWidget>
 #include <QListWidgetItem>
 #include <QMap>
+#include <QObject>
 #include <QPushButton>
 #include <QRadioButton>
 #include <QRegularExpression>

diff --git a/gui/resultstree.cpp b/gui/resultstree.cpp
@@ -34,6 +34,7 @@
 #include "xmlreportv2.h"
 
 #include <utility>
+#include <vector>
 
 #include <QAction>
 #include <QApplication>
@@ -53,6 +54,7 @@
 #include <QMenu>
 #include <QMessageBox>
 #include <QModelIndex>
+#include <QObject>
 #include <QProcess>
 #include <QSet>
 #include <QSettings>

diff --git a/gui/resultsview.h b/gui/resultsview.h
@@ -20,7 +20,6 @@
 #ifndef RESULTSVIEW_H
 #define RESULTSVIEW_H
 
-#include "common.h"
 #include "report.h"
 #include "showtypes.h"
 
@@ -38,6 +37,7 @@ class QPrinter;
 class QSettings;
 class CheckStatistics;
 class QPoint;
+enum class ReportType : std::uint8_t;
 namespace Ui {
     class ResultsView;
 }

diff --git a/gui/scratchpad.h b/gui/scratchpad.h
@@ -21,7 +21,6 @@
 
 #include <QDialog>
 #include <QObject>
-#include <QString>
 
 class MainWindow;
 namespace Ui {

diff --git a/lib/checkcondition.cpp b/lib/checkcondition.cpp
@@ -35,6 +35,7 @@
 #include "checkother.h" // comparisonNonZeroExpressionLessThanZero and testIfNonZeroExpressionIsPositive
 
 #include <algorithm>
+#include <cstdint>
 #include <limits>
 #include <list>
 #include <set>

diff --git a/lib/checkleakautovar.cpp b/lib/checkleakautovar.cpp
@@ -39,7 +39,6 @@
 #include <algorithm>
 #include <array>
 #include <cstddef>
-#include <iostream>
 #include <list>
 #include <vector>
 

diff --git a/lib/checkleakautovar.h b/lib/checkleakautovar.h
@@ -31,6 +31,7 @@
 #include <map>
 #include <set>
 #include <string>
+#include <utility>
 
 class ErrorLogger;
 class Settings;

diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -37,6 +37,7 @@
 
 #include <algorithm> // find_if()
 #include <cctype>
+#include <cstdint>
 #include <list>
 #include <map>
 #include <set>

diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
@@ -32,6 +32,7 @@
 #include "valueflow.h"
 
 #include <algorithm>
+#include <cstdint>
 #include <list>
 #include <set>
 #include <utility>

diff --git a/lib/color.cpp b/lib/color.cpp
@@ -18,7 +18,6 @@
 
 #include "color.h"
 
-#include <cstddef>
 #include <cstdlib>
 #include <sstream>
 #include <iostream>

diff --git a/lib/cppcheck.h b/lib/cppcheck.h
@@ -38,6 +38,7 @@
 #include <set>
 #include <string>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
 class TokenList;

diff --git a/lib/forwardanalyzer.cpp b/lib/forwardanalyzer.cpp
@@ -35,6 +35,7 @@
 #include <algorithm>
 #include <cassert>
 #include <cstdio>
+#include <cstdint>
 #include <functional>
 #include <list>
 #include <string>

diff --git a/lib/fwdanalysis.cpp b/lib/fwdanalysis.cpp
@@ -27,8 +27,8 @@
 #include "vfvalue.h"
 
 #include <list>
-#include <map>
 #include <string>
+#include <utility>
 
 static bool isUnchanged(const Token *startToken, const Token *endToken, const std::set<nonneg int> &exprVarIds, bool local)
 {

diff --git a/lib/preprocessor.h b/lib/preprocessor.h
@@ -30,6 +30,7 @@
 #include <map>
 #include <set>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <simplecpp.h>

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

diff --git a/lib/token.h b/lib/token.h
@@ -28,6 +28,7 @@
 #include "utils.h"
 #include "vfvalue.h"
 
+#include <algorithm>
 #include <cassert>
 #include <cstdint>
 #include <cstddef>
@@ -37,6 +38,7 @@
 #include <ostream>
 #include <set>
 #include <string>
+#include <type_traits>
 #include <utility>
 #include <vector>
 

diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
@@ -32,6 +32,7 @@
 #include "token.h"
 
 #include <cctype>
+#include <cstdint>
 #include <exception>
 #include <functional>
 #include <utility>

diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -113,6 +113,7 @@
 #include <array>
 #include <cassert>
 #include <chrono>
+#include <cstdint>
 #include <cstdlib>
 #include <cstring>
 #include <functional>

diff --git a/lib/vf_common.h b/lib/vf_common.h
@@ -25,6 +25,8 @@
 #include "symboldatabase.h"
 #include "vfvalue.h"
 
+#include <cstddef>
+#include <list>
 #include <string>
 
 class Token;

diff --git a/lib/vf_enumvalue.cpp b/lib/vf_enumvalue.cpp
@@ -22,9 +22,9 @@
 #include "symboldatabase.h"
 #include "token.h"
 #include "valueflow.h"
+#include "vfvalue.h"
 
 #include <list>
-#include <memory>
 #include <vector>
 
 namespace ValueFlow

diff --git a/lib/vf_settokenvalue.cpp b/lib/vf_settokenvalue.cpp
@@ -38,7 +38,6 @@
 #include <cstddef>
 #include <functional>
 #include <list>
-#include <memory>
 #include <string>
 #include <unordered_map>
 #include <unordered_set>

diff --git a/test/fixture.cpp b/test/fixture.cpp
@@ -21,6 +21,7 @@
 #include "cppcheck.h"
 #include "errortypes.h"
 #include "helpers.h"
+#include "library.h"
 #include "options.h"
 #include "redirect.h"
 

diff --git a/test/fixture.h b/test/fixture.h
@@ -24,7 +24,6 @@
 #include "color.h"
 #include "config.h"
 #include "errorlogger.h"
-#include "library.h"
 #include "platform.h"
 #include "settings.h"
 #include "standards.h"

diff --git a/test/helpers.h b/test/helpers.h
@@ -20,6 +20,7 @@
 #define helpersH
 
 #include "config.h"
+#include "library.h"
 #include "preprocessor.h"
 #include "settings.h"
 #include "standards.h"
@@ -40,6 +41,9 @@ class ErrorLogger;
 namespace simplecpp {
     struct DUI;
 }
+namespace tinyxml2 {
+    class XMLDocument;
+}
 
 // TODO: make Tokenizer private
 class SimpleTokenizer : public Tokenizer {

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

diff --git a/test/testastutils.cpp b/test/testastutils.cpp
@@ -24,6 +24,7 @@
 #include "token.h"
 #include "tokenlist.h"
 
+#include <cstdint>
 #include <cstring>
 
 class TestAstUtils : public TestFixture {