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

danmar · Oct 28, 2024 · 45aeff3 · 45aeff3
1 parent 1efa223
commit 45aeff3
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 2 deletions.
diff --git a/gui/checkstatistics.cpp b/gui/checkstatistics.cpp
@@ -21,6 +21,7 @@
 #include <QDebug>
 #include <QList>
 #include <QSet>
+#include <QtLogging>
 
 CheckStatistics::CheckStatistics(QObject *parent)
     : QObject(parent)

diff --git a/gui/cppchecklibrarydata.cpp b/gui/cppchecklibrarydata.cpp
@@ -28,7 +28,6 @@
 #include <QXmlStreamAttributes>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 const unsigned int CppcheckLibraryData::Function::Arg::ANY = ~0U;
 const unsigned int CppcheckLibraryData::Function::Arg::VARIADIC = ~1U;

diff --git a/gui/csvreport.cpp b/gui/csvreport.cpp
@@ -24,7 +24,6 @@
 #include <QDir>
 #include <QFile>
 #include <QList>
-#include <QtGlobal>
 
 CsvReport::CsvReport(const QString &filename) :
     Report(filename)

diff --git a/gui/test/cppchecklibrarydata/testcppchecklibrarydata.cpp b/gui/test/cppchecklibrarydata/testcppchecklibrarydata.cpp
@@ -27,6 +27,7 @@
 #include <QStringList>
 #include <QTextStream>
 #include <QtTest>
+#include <QtLogging>
 
 const QString TestCppcheckLibraryData::TempCfgFile = "./tmp.cfg";
 

diff --git a/gui/threadhandler.cpp b/gui/threadhandler.cpp
@@ -35,6 +35,7 @@
 #include <QSettings>
 #include <QTextStream>
 #include <QVariant>
+#include <QtLogging>
 
 ThreadHandler::ThreadHandler(QObject *parent) :
     QObject(parent)

diff --git a/gui/translationhandler.cpp b/gui/translationhandler.cpp
@@ -28,7 +28,11 @@
 #include <QLocale>
 #include <QMessageBox>
 #include <QTranslator>
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
+#include <QtPreprocessorSupport>
+#else
 #include <QtGlobal>
+#endif
 
 
 // Provide own translations for standard buttons. This (garbage) code is needed to enforce them to appear in .ts files even after "lupdate gui.pro"

diff --git a/gui/xmlreportv2.cpp b/gui/xmlreportv2.cpp
@@ -32,6 +32,7 @@
 #include <QXmlStreamAttributes>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
+#include <QtLogging>
 
 static const QString ResultElementName = "results";
 static const QString CppcheckElementName = "cppcheck";

diff --git a/tools/triage/mainwindow.cpp b/tools/triage/mainwindow.cpp
@@ -58,6 +58,7 @@
 #include <QTextStream>
 #include <QTreeView>
 #include <QtCore>
+#include <QtLogging>
 
 class QWidget;