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

danmar · Oct 8, 2023 · cadf47e · cadf47e
1 parent f7268e7
commit cadf47e
Show file tree

Hide file tree

Showing 62 changed files with 81 additions and 124 deletions.
diff --git a/Makefile b/Makefile
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -23,7 +23,6 @@
 #include "cppcheckexecutor.h"
 #include "errorlogger.h"
 #include "errortypes.h"
-#include "filelister.h"
 #include "importproject.h"
 #include "path.h"
 #include "platform.h"

diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
@@ -18,9 +18,10 @@
 
 #include "cppcheckexecutor.h"
 
+#include "addoninfo.h"
 #include "analyzerinfo.h"
-#include "checkers.h"
 #include "checkersreport.h"
+#include "cmdlinelogger.h"
 #include "cmdlineparser.h"
 #include "color.h"
 #include "config.h"
@@ -48,12 +49,11 @@
 #include <cassert>
 #include <cstdio>
 #include <cstdlib> // EXIT_SUCCESS and EXIT_FAILURE
-#include <functional>
 #include <iostream>
 #include <iterator>
 #include <list>
-#include <memory>
 #include <sstream> // IWYU pragma: keep
+#include <unordered_set>
 #include <utility>
 #include <vector>
 

diff --git a/cli/filelister.cpp b/cli/filelister.cpp
@@ -18,7 +18,6 @@
 
 #include "filelister.h"
 
-#include "config.h"
 #include "path.h"
 #include "pathmatch.h"
 #include "utils.h"

diff --git a/cli/processexecutor.cpp b/cli/processexecutor.cpp
@@ -22,7 +22,6 @@
 
 #include "config.h"
 #include "cppcheck.h"
-#include "cppcheckexecutor.h"
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "importproject.h"
@@ -37,7 +36,6 @@
 #include <csignal>
 #include <cstdlib>
 #include <cstring>
-#include <functional>
 #include <iostream>
 #include <list>
 #include <sstream> // IWYU pragma: keep

diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp
@@ -20,7 +20,6 @@
 
 #include "config.h"
 #include "cppcheck.h"
-#include "cppcheckexecutor.h"
 #include "errorlogger.h"
 #include "importproject.h"
 #include "settings.h"
@@ -29,7 +28,6 @@
 #include <algorithm>
 #include <cassert>
 #include <cstdlib>
-#include <functional>
 #include <future>
 #include <iostream>
 #include <list>

diff --git a/gui/checkstatistics.h b/gui/checkstatistics.h
@@ -23,12 +23,12 @@
 
 #include <QMap>
 #include <QObject>
-#include <QSet>
 #include <QString>
 #include <QStringList>
 
 #include <set>
 #include <string>
+#include <utility>
 
 /// @addtogroup GUI
 /// @{

diff --git a/gui/checkthread.cpp b/gui/checkthread.cpp
@@ -31,7 +31,6 @@
 
 #include <algorithm>
 #include <cstddef>
-#include <functional>
 #include <iterator>
 #include <list>
 #include <map>

diff --git a/gui/compliancereportdialog.cpp b/gui/compliancereportdialog.cpp
@@ -43,6 +43,7 @@
 #include <QFileInfo>
 #include <QIODevice>
 #include <QLineEdit>
+#include <QList>
 #include <QMessageBox>
 #include <QProcess>
 #include <QRegularExpression>

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -18,6 +18,7 @@
 
 #include "mainwindow.h"
 
+#include "addoninfo.h"
 #include "applicationlist.h"
 #include "aboutdialog.h"
 #include "analyzerinfo.h"
@@ -48,12 +49,12 @@
 #include "ui_mainwindow.h"
 
 #include <algorithm>
-#include <functional>
 #include <iterator>
 #include <list>
 #include <set>
 #include <string>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
 #include <QApplication>

diff --git a/gui/resultstree.cpp b/gui/resultstree.cpp
@@ -49,7 +49,6 @@
 #include <QMenu>
 #include <QMessageBox>
 #include <QModelIndex>
-#include <QModelIndexList>
 #include <QProcess>
 #include <QSet>
 #include <QSettings>

diff --git a/gui/resultsview.cpp b/gui/resultsview.cpp
@@ -25,15 +25,21 @@
 #include "common.h"
 #include "csvreport.h"
 #include "erroritem.h"
+#include "errorlogger.h"
+#include "errortypes.h"
 #include "path.h"
 #include "printablereport.h"
 #include "resultstree.h"
+#include "settings.h"
 #include "txtreport.h"
 #include "xmlreport.h"
 #include "xmlreportv2.h"
 
 #include "ui_resultsview.h"
 
+#include <set>
+#include <string>
+
 #include <QAbstractItemModel>
 #include <QApplication>
 #include <QByteArray>
@@ -45,6 +51,7 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QIODevice>
+#include <QLabel>
 #include <QList>
 #include <QListWidget>
 #include <QListWidgetItem>

diff --git a/gui/statsdialog.cpp b/gui/statsdialog.cpp
@@ -29,10 +29,12 @@
 #include <QDate>
 #include <QFileDialog>
 #include <QFileInfo>
+#include <QFont>
 #include <QLabel>
 #include <QLineEdit>
 #include <QMimeData>
 #include <QPageSize>
+#include <QPlainTextEdit>
 #include <QPrinter>
 #include <QPushButton>
 #include <QStringList>

diff --git a/gui/test/projectfile/testprojectfile.cpp b/gui/test/projectfile/testprojectfile.cpp
@@ -18,16 +18,13 @@
 
 #include "testprojectfile.h"
 
+#include "addoninfo.h"
 #include "importproject.h"
-#include "library.h"
 #include "platform.h"
 #include "projectfile.h"
 #include "settings.h"
 
-#include <set>
 #include <string>
-#include <utility>
-#include <vector>
 
 #include <QList>
 #include <QStringList>

diff --git a/lib/addoninfo.cpp b/lib/addoninfo.cpp
@@ -22,8 +22,8 @@
 #include "utils.h"
 
 #include <fstream>
-#include <sstream>
 #include <string>
+#include <vector>
 
 #include "json.h"
 

diff --git a/lib/astutils.h b/lib/astutils.h
@@ -31,6 +31,7 @@
 #include "config.h"
 #include "errortypes.h"
 #include "library.h"
+#include "mathlib.h"
 #include "smallvector.h"
 #include "symboldatabase.h"
 #include "token.h"

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

diff --git a/lib/checkersreport.cpp b/lib/checkersreport.cpp
@@ -17,8 +17,16 @@
  */
 
 #include "checkersreport.h"
+
 #include "checkers.h"
+#include "errortypes.h"
+#include "settings.h"
+
+#include <map>
 #include <sstream>
+#include <unordered_set>
+#include <utility>
+#include <vector>
 
 static bool isCppcheckPremium(const Settings& settings) {
     return (settings.cppcheckCfgProductName.compare(0, 16, "Cppcheck Premium") == 0);

diff --git a/lib/checkersreport.h b/lib/checkersreport.h
@@ -18,10 +18,13 @@
 
 #pragma once
 
-#include "settings.h"
+#include "config.h"
+
 #include <set>
 #include <string>
 
+class Settings;
+
 class CPPCHECKLIB CheckersReport {
 public:
     CheckersReport(const Settings& settings, const std::set<std::string>& activeCheckers);

diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
@@ -22,6 +22,8 @@
 #include "astutils.h"
 #include "errorlogger.h"
 #include "library.h"
+#include "mathlib.h"
+#include "platform.h"
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"

diff --git a/lib/checktype.cpp b/lib/checktype.cpp
@@ -30,9 +30,13 @@
 #include "tokenize.h"
 #include "valueflow.h"
 
+#include <algorithm>
 #include <cmath>
+#include <cstddef>
+#include <iterator>
 #include <list>
 #include <sstream>
+#include <utility>
 #include <vector>
 
 //---------------------------------------------------------------------------

diff --git a/lib/checkvaarg.cpp b/lib/checkvaarg.cpp
@@ -26,6 +26,8 @@
 #include "tokenize.h"
 
 #include <cstddef>
+#include <iterator>
+#include <list>
 #include <vector>
 
 //---------------------------------------------------------------------------

diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -26,21 +26,21 @@
 #include "ctu.h"
 #include "errortypes.h"
 #include "library.h"
-#include "mathlib.h"
 #include "path.h"
 #include "platform.h"
-#include "preprocessor.h" // Preprocessor
+#include "preprocessor.h"
 #include "standards.h"
 #include "suppressions.h"
 #include "timer.h"
 #include "token.h"
-#include "tokenize.h" // Tokenizer
+#include "tokenize.h"
 #include "tokenlist.h"
 #include "utils.h"
 #include "valueflow.h"
 #include "version.h"
 
 #include <algorithm>
+#include <cassert>
 #include <cstdio>
 #include <cstdint>
 #include <cstring>

diff --git a/lib/cppcheck.h b/lib/cppcheck.h
@@ -38,6 +38,7 @@
 #include <vector>
 
 class Tokenizer;
+enum class SHOWTIME_MODES;
 
 /// @addtogroup Core
 /// @{

diff --git a/lib/errorlogger.cpp b/lib/errorlogger.cpp
@@ -20,8 +20,8 @@
 
 #include "color.h"
 #include "cppcheck.h"
-#include "mathlib.h"
 #include "path.h"
+#include "suppressions.h"
 #include "token.h"
 #include "tokenlist.h"
 #include "utils.h"

diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -38,8 +38,6 @@
 
 #include <tinyxml2.h>
 
-#include <simplecpp.h>
-
 #include "json.h"
 
 void ImportProject::ignorePaths(const std::vector<std::string> &ipaths)

diff --git a/lib/library.cpp b/lib/library.cpp
@@ -31,6 +31,7 @@
 #include <algorithm>
 #include <cctype>
 #include <climits>
+#include <cstddef>
 #include <cstring>
 #include <list>
 #include <memory>

diff --git a/lib/library.h b/lib/library.h
@@ -26,7 +26,6 @@
 #include "errortypes.h"
 #include "standards.h"
 
-#include <cstddef>
 #include <map>
 #include <memory>
 #include <set>

diff --git a/lib/path.cpp b/lib/path.cpp
@@ -25,7 +25,6 @@
 
 #include <algorithm>
 #include <cstdlib>
-#include <fstream>
 #include <sys/stat.h>
 #include <utility>
 

diff --git a/lib/settings.cpp b/lib/settings.cpp
@@ -19,7 +19,6 @@
 #include "settings.h"
 #include "path.h"
 #include "summaries.h"
-#include "timer.h"
 #include "vfvalue.h"
 
 #include <fstream>

diff --git a/lib/suppressions.cpp b/lib/suppressions.cpp
@@ -19,7 +19,7 @@
 #include "suppressions.h"
 
 #include "errorlogger.h"
-#include "mathlib.h"
+#include "errortypes.h"
 #include "path.h"
 #include "utils.h"
 #include "token.h"

diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
@@ -24,7 +24,6 @@
 #include "errortypes.h"
 #include "keywords.h"
 #include "library.h"
-#include "mathlib.h"
 #include "path.h"
 #include "platform.h"
 #include "settings.h"

diff --git a/test/fixture.cpp b/test/fixture.cpp
@@ -23,6 +23,7 @@
 #include "options.h"
 #include "redirect.h"
 
+#include <algorithm>
 #include <cstdio>
 #include <cctype>
 #include <exception>