Move to separate headers

Hopefully this can speed up compilation times. https://doc.qt.io/qt-6/qtglobal.html#details PR qbittorrent#19430.
vuriaval · Aug 11, 2023 · 31fe327 · 31fe327
1 parent 9fa48a3
commit 31fe327
Show file tree

Hide file tree

Showing 52 changed files with 71 additions and 51 deletions.
diff --git a/CODING_GUIDELINES.md b/CODING_GUIDELINES.md
@@ -318,7 +318,7 @@ The headers should be ordered alphabetically within each group. \
 If there are conditionals for the same header group, then put them at the bottom of the respective group. \
 If there are conditionals that contain headers from several different header groups, then put them above the "qBittorrent's own headers" group.
 
-One exception is the header containing the library version (for example, QtGlobal), this particular header isn't constrained by the aforementioned order.
+One exception is the header containing the library version (for example, QtVersionChecks), this particular header isn't constrained by the aforementioned order.
 
 Example:
 
@@ -331,7 +331,7 @@ Example:
 // exceptions, headers containing version number
 #include <boost/version.hpp>
 #include <libtorrent/version.hpp>
-#include <QtGlobal>
+#include <QtVersionChecks>
 
 // C++ Standard Library headers
 #include <cstdio>

diff --git a/src/app/application.h b/src/app/application.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 #include <QAtomicInt>
 #include <QCoreApplication>
 #include <QPointer>

diff --git a/src/app/applicationinstancemanager.cpp b/src/app/applicationinstancemanager.cpp
@@ -28,7 +28,7 @@
 
 #include "applicationinstancemanager.h"
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #ifdef Q_OS_WIN
 #include <windows.h>

diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -27,7 +27,7 @@
  * exception statement from your version.
  */
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #include <chrono>
 #include <cstdlib>

diff --git a/src/app/qtlocalpeer/qtlocalpeer.cpp b/src/app/qtlocalpeer/qtlocalpeer.cpp
@@ -68,7 +68,7 @@
 
 #include "qtlocalpeer.h"
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #if defined(Q_OS_WIN)
 #include <Windows.h>

diff --git a/src/app/signalhandler.cpp b/src/app/signalhandler.cpp
@@ -30,7 +30,7 @@
 
 #include "signalhandler.h"
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #include <algorithm>
 #include <csignal>

diff --git a/src/app/upgrade.cpp b/src/app/upgrade.cpp
@@ -28,7 +28,7 @@
 
 #include "upgrade.h"
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 #include <QCoreApplication>
 #include <QMetaEnum>
 

diff --git a/src/base/applicationcomponent.h b/src/base/applicationcomponent.h
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <QtGlobal>
+#include <QtClassHelperMacros>
 
 #include "interfaces/iapplication.h"
 

diff --git a/src/base/bittorrent/abstractfilestorage.h b/src/base/bittorrent/abstractfilestorage.h
@@ -28,7 +28,6 @@
 
 #pragma once
 
-#include <QtGlobal>
 #include <QCoreApplication>
 
 #include "base/pathfwd.h"

diff --git a/src/base/bittorrent/cachestatus.h b/src/base/bittorrent/cachestatus.h
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <QtGlobal>
+#include <QtTypes>
 
 namespace BitTorrent
 {

diff --git a/src/base/bittorrent/infohash.h b/src/base/bittorrent/infohash.h
@@ -32,7 +32,6 @@
 #include <libtorrent/info_hash.hpp>
 #endif
 
-#include <QtGlobal>
 #include <QMetaType>
 
 #include "base/digest32.h"

diff --git a/src/base/bittorrent/peeraddress.h b/src/base/bittorrent/peeraddress.h
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <QtGlobal>
+#include <QtTypes>
 #include <QHostAddress>
 
 class QString;

diff --git a/src/base/bittorrent/sessionstatus.h b/src/base/bittorrent/sessionstatus.h
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <QtGlobal>
+#include <QtTypes>
 
 namespace BitTorrent
 {

diff --git a/src/base/bittorrent/speedmonitor.h b/src/base/bittorrent/speedmonitor.h
@@ -33,7 +33,7 @@
 #include <boost/circular_buffer.hpp>
 #endif
 
-#include <QtGlobal>
+#include <QtTypes>
 
 template<typename T>
 struct Sample

diff --git a/src/base/bittorrent/torrent.h b/src/base/bittorrent/torrent.h
@@ -29,8 +29,8 @@
 
 #pragma once
 
-#include <QtGlobal>
 #include <QtContainerFwd>
+#include <QtTypes>
 #include <QMetaType>
 #include <QString>
 

diff --git a/src/base/bittorrent/tracker.h b/src/base/bittorrent/tracker.h
@@ -34,7 +34,7 @@
 
 #include <libtorrent/entry.hpp>
 
-#include <QtGlobal>
+#include <QtTypes>
 #include <QHash>
 #include <QObject>
 #include <QSet>

diff --git a/src/base/bittorrent/trackerentry.h b/src/base/bittorrent/trackerentry.h
@@ -31,7 +31,6 @@
 #include <libtorrent/socket.hpp>
 
 #include <QtContainerFwd>
-#include <QtGlobal>
 #include <QHash>
 #include <QMap>
 #include <QString>

diff --git a/src/base/digest32.h b/src/base/digest32.h
@@ -30,7 +30,6 @@
 
 #include <libtorrent/sha1_hash.hpp>
 
-#include <QtGlobal>
 #include <QByteArray>
 #include <QHash>
 #include <QSharedData>

diff --git a/src/base/global.h b/src/base/global.h
@@ -30,7 +30,7 @@
 
 #include <type_traits>
 
-#include <QtGlobal>
+#include <QtProcessorDetection>
 
 #include <QString>
 

diff --git a/src/base/indexrange.h b/src/base/indexrange.h
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <QtGlobal>
+#include <QtAssert>
 
 // Interval is defined via [first;last]
 template <typename Index>

diff --git a/src/base/interfaces/iapplication.h b/src/base/interfaces/iapplication.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 #include <QMetaObject>
 
 class QString;

diff --git a/src/base/net/downloadmanager.h b/src/base/net/downloadmanager.h
@@ -29,7 +29,7 @@
 
 #pragma once
 
-#include <QtGlobal>
+#include <QtTypes>
 #include <QHash>
 #include <QNetworkProxy>
 #include <QObject>

diff --git a/src/base/net/geoipdatabase.h b/src/base/net/geoipdatabase.h
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <QtGlobal>
+#include <QtTypes>
 #include <QCoreApplication>
 #include <QDateTime>
 #include <QHash>

diff --git a/src/base/path.h b/src/base/path.h
@@ -31,14 +31,15 @@
 
 #include <filesystem>
 
-#include <QtGlobal>
 #include <QMetaType>
 #include <QString>
 
 #include "pathfwd.h"
 
 #include "base/interfaces/istringable.h"
 
+class QStringView;
+
 class Path final : public IStringable
 {
 public:

diff --git a/src/base/preferences.h b/src/base/preferences.h
@@ -30,7 +30,7 @@
 #pragma once
 
 #include <QtContainerFwd>
-#include <QtGlobal>
+#include <QtSystemDetection>
 #include <QObject>
 
 #include "base/pathfwd.h"

diff --git a/src/base/torrentfileswatcher.cpp b/src/base/torrentfileswatcher.cpp
@@ -31,7 +31,7 @@
 
 #include <chrono>
 
-#include <QtGlobal>
+#include <QtAssert>
 #include <QDir>
 #include <QDirIterator>
 #include <QFile>

diff --git a/src/base/utils/compare.h b/src/base/utils/compare.h
@@ -29,7 +29,7 @@
 #pragma once
 
 #include <Qt>
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #if !defined(Q_OS_WIN) && (!defined(Q_OS_UNIX) || defined(Q_OS_MACOS) || defined(QT_FEATURE_icu))
 #define QBT_USE_QCOLLATOR

diff --git a/src/base/utils/gzip.cpp b/src/base/utils/gzip.cpp
@@ -31,7 +31,7 @@
 
 #include <vector>
 
-#include <QtGlobal>
+#include <QtAssert>
 #include <QByteArray>
 
 #ifndef ZLIB_CONST

diff --git a/src/base/utils/misc.h b/src/base/utils/misc.h
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #ifdef Q_OS_WIN
 #include <Windows.h>

diff --git a/src/base/utils/random.cpp b/src/base/utils/random.cpp
@@ -30,7 +30,7 @@
 
 #include <random>
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #ifdef Q_OS_WIN
 #include <Windows.h>

diff --git a/src/gui/log/loglistview.cpp b/src/gui/log/loglistview.cpp
@@ -29,7 +29,7 @@
 
 #include "loglistview.h"
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 #include <QApplication>
 #include <QClipboard>
 #include <QFontMetrics>

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
@@ -29,7 +29,7 @@
 
 #include "mainwindow.h"
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #include <algorithm>
 #include <chrono>
@@ -59,7 +59,6 @@
 #include <QShortcut>
 #include <QSplitter>
 #include <QStatusBar>
-#include <QtGlobal>
 #include <QTimer>
 
 #include "base/bittorrent/session.h"

diff --git a/src/gui/powermanagement/powermanagement.cpp b/src/gui/powermanagement/powermanagement.cpp
@@ -28,7 +28,7 @@
 
 #include "powermanagement.h"
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #ifdef Q_OS_MACOS
 #include <IOKit/pwr_mgt/IOPMLib.h>

diff --git a/src/gui/programupdater.cpp b/src/gui/programupdater.cpp
@@ -29,7 +29,7 @@
 
 #include "programupdater.h"
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #if defined(Q_OS_WIN)
 #include <Windows.h>

diff --git a/src/gui/properties/peerlistwidget.cpp b/src/gui/properties/peerlistwidget.cpp
@@ -31,7 +31,6 @@
 
 #include <algorithm>
 
-#include <QtGlobal>
 #include <QApplication>
 #include <QClipboard>
 #include <QHeaderView>

diff --git a/src/gui/rss/automatedrssdownloader.cpp b/src/gui/rss/automatedrssdownloader.cpp
@@ -29,7 +29,6 @@
 
 #include "automatedrssdownloader.h"
 
-#include <QtGlobal>
 #include <QCursor>
 #include <QFileDialog>
 #include <QMenu>

diff --git a/src/gui/search/searchwidget.cpp b/src/gui/search/searchwidget.cpp
@@ -30,7 +30,7 @@
 
 #include "searchwidget.h"
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #include <utility>
 

diff --git a/src/gui/uithemecommon.h b/src/gui/uithemecommon.h
@@ -29,7 +29,6 @@
 
 #pragma once
 
-#include <QtGlobal>
 #include <QApplication>
 #include <QColor>
 #include <QHash>

diff --git a/src/gui/uithememanager.h b/src/gui/uithememanager.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 #include <QColor>
 #include <QHash>
 #include <QIcon>

diff --git a/src/gui/uithemesource.h b/src/gui/uithemesource.h
@@ -32,8 +32,8 @@
 
 #include <memory>
 
-#include <QtGlobal>
 #include <QColor>
+#include <QCoreApplication>
 #include <QHash>
 #include <QIcon>
 #include <QString>

diff --git a/src/gui/utils.cpp b/src/gui/utils.cpp
@@ -28,7 +28,7 @@
 
 #include "utils.h"
 
-#include <QtGlobal>
+#include <QtSystemDetection>
 
 #ifdef Q_OS_WIN
 #include <Objbase.h>

diff --git a/test/testalgorithm.cpp b/test/testalgorithm.cpp
@@ -31,6 +31,7 @@
 #include <unordered_map>
 #include <unordered_set>
 
+#include <QObject>
 #include <QTest>
 
 #include "base/algorithm.h"