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

danmar · Sep 30, 2024 · 6f9460a · 6f9460a
1 parent 6d56c7f
commit 6f9460a
Show file tree

Hide file tree

Showing 25 changed files with 18 additions and 13 deletions.
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -42,7 +42,6 @@
 #include <algorithm>
 #include <cassert>
 #include <climits>
-#include <cstdint>
 #include <cstdio>
 #include <cstdlib> // EXIT_FAILURE
 #include <cstring>

diff --git a/gui/codeeditstylecontrols.h b/gui/codeeditstylecontrols.h
@@ -27,7 +27,6 @@
 #include <QFont>
 #include <QObject>
 #include <QPushButton>
-#include <QString>
 
 class QWidget;
 

diff --git a/gui/codeeditstyledialog.cpp b/gui/codeeditstyledialog.cpp
@@ -27,6 +27,7 @@
 #include <QFormLayout>
 #include <QHBoxLayout>
 #include <QPushButton>
+#include <QString>
 #include <QStringList>
 #include <QVBoxLayout>
 #include <QtGlobal>

diff --git a/gui/codeeditstyledialog.h b/gui/codeeditstyledialog.h
@@ -25,13 +25,13 @@
 #include <QDialog>
 #include <QFont>
 #include <QObject>
-#include <QString>
 
 class CodeEditor;
 class SelectColorButton;
 class SelectFontWeightCombo;
 class QPushButton;
 class QWidget;
+class QString;
 
 #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
 class QStringList;

diff --git a/gui/helpdialog.cpp b/gui/helpdialog.cpp
@@ -28,6 +28,7 @@
 #include <QHelpContentWidget>
 #include <QHelpIndexWidget>
 #include <QMessageBox>
+#include <QString>
 #include <QStringList>
 #include <QUrl>
 #include <QVBoxLayout>

diff --git a/gui/resultsview.h b/gui/resultsview.h
@@ -23,6 +23,8 @@
 #include "report.h"
 #include "showtypes.h"
 
+#include <cstdint>
+
 #include <QObject>
 #include <QString>
 #include <QStringList>

diff --git a/gui/scratchpad.cpp b/gui/scratchpad.cpp
@@ -25,6 +25,7 @@
 
 #include <QLineEdit>
 #include <QPushButton>
+#include <QString>
 
 ScratchPad::ScratchPad(MainWindow& mainWindow)
     : QDialog(&mainWindow)

diff --git a/gui/test/projectfile/testprojectfile.cpp b/gui/test/projectfile/testprojectfile.cpp
@@ -26,7 +26,6 @@
 
 #include <string>
 
-#include <QDir>
 #include <QFile>
 #include <QIODevice>
 #include <QList>

diff --git a/gui/test/projectfile/testprojectfile.h b/gui/test/projectfile/testprojectfile.h
@@ -17,7 +17,6 @@
  */
 
 #include <QObject>
-#include <QString>
 
 class TestProjectFile : public QObject {
     Q_OBJECT

diff --git a/gui/test/translationhandler/testtranslationhandler.h b/gui/test/translationhandler/testtranslationhandler.h
@@ -17,7 +17,6 @@
  */
 
 #include <QObject>
-#include <QString>
 
 class TestTranslationHandler : public QObject {
     Q_OBJECT

diff --git a/gui/test/xmlreportv2/testxmlreportv2.h b/gui/test/xmlreportv2/testxmlreportv2.h
@@ -17,7 +17,6 @@
  */
 
 #include <QObject>
-#include <QString>
 
 class TestXmlReportV2 : public QObject {
     Q_OBJECT

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

diff --git a/lib/astutils.h b/lib/astutils.h
@@ -28,6 +28,7 @@
 #include <stack>
 #include <string>
 #include <type_traits>
+#include <utility>
 #include <vector>
 
 #include "config.h"

diff --git a/lib/checkersreport.cpp b/lib/checkersreport.cpp
@@ -23,6 +23,7 @@
 #include "settings.h"
 
 #include <algorithm>
+#include <cstddef>
 #include <map>
 #include <sstream>
 #include <unordered_set>

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

diff --git a/lib/settings.cpp b/lib/settings.cpp
@@ -24,6 +24,7 @@
 
 #include <cctype>
 #include <fstream>
+#include <iostream>
 #include <sstream>
 #include <utility>
 

diff --git a/lib/timer.h b/lib/timer.h
@@ -28,6 +28,7 @@
 #include <map>
 #include <mutex>
 #include <string>
+#include <utility>
 
 enum class SHOWTIME_MODES : std::uint8_t {
     SHOWTIME_NONE,

diff --git a/lib/vfvalue.h b/lib/vfvalue.h
@@ -31,7 +31,6 @@
 #include <functional>
 #include <string>
 #include <type_traits>
-#include <utility>
 #include <vector>
 
 class Token;

diff --git a/test/fixture.h b/test/fixture.h
@@ -31,6 +31,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <list>
+#include <memory>
 #include <sstream>
 #include <stdexcept>
 #include <string>

diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp
@@ -26,6 +26,8 @@
 #include "preprocessor.h"
 #include "settings.h"
 #include "suppressions.h"
+#include "tokenize.h"
+#include "tokenlist.h"
 #include "fixture.h"
 #include "helpers.h"
 

diff --git a/test/testprogrammemory.cpp b/test/testprogrammemory.cpp
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
 #include "fixture.h"
 #include "helpers.h"
 #include "token.h"

diff --git a/test/testsettings.cpp b/test/testsettings.cpp
@@ -23,8 +23,6 @@
 #include "helpers.h"
 #include "suppressions.h"
 
-
-
 class TestSettings : public TestFixture {
 public:
     TestSettings() : TestFixture("TestSettings") {}

diff --git a/test/testtype.cpp b/test/testtype.cpp
@@ -26,12 +26,9 @@
 #include "tokenize.h"
 
 #include <cstddef>
-#include <list>
 #include <string>
 #include <vector>
 
-#include <simplecpp.h>
-
 class TestType : public TestFixture {
 public:
     TestType() : TestFixture("TestType") {}

diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "errortypes.h"
 #include "fixture.h"
 #include "helpers.h"
 #include "mathlib.h"

diff --git a/tools/dmake/dmake.cpp b/tools/dmake/dmake.cpp
@@ -20,6 +20,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cstdint>
 #include <cstdlib>
 #include <fstream>
 #include <functional>