Move to separate headers

Hopefully this can speed up compilation times. https://doc.qt.io/qt-6/qtglobal.html#details PR #19430.
2026-01-03 06:02:29 -06:00 · 2023-08-11 13:47:55 +08:00
parent 9fa48a375d
commit 31fe327763
52 changed files with 71 additions and 51 deletions
--- a/src/base/applicationcomponent.h
+++ b/src/base/applicationcomponent.h
@@ -28,7 +28,7 @@

 #pragma once

-#include <QtGlobal>
+#include <QtClassHelperMacros>

 #include "interfaces/iapplication.h"

--- 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"
--- a/src/base/bittorrent/cachestatus.h
+++ b/src/base/bittorrent/cachestatus.h
@@ -28,7 +28,7 @@

 #pragma once

-#include <QtGlobal>
+#include <QtTypes>

 namespace BitTorrent
 {
--- 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"
--- 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;
--- a/src/base/bittorrent/sessionstatus.h
+++ b/src/base/bittorrent/sessionstatus.h
@@ -28,7 +28,7 @@

 #pragma once

-#include <QtGlobal>
+#include <QtTypes>

 namespace BitTorrent
 {
--- 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
--- 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>

--- 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>
--- 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>
--- 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>
--- a/src/base/global.h
+++ b/src/base/global.h
@@ -30,7 +30,7 @@

 #include <type_traits>

-#include <QtGlobal>
+#include <QtProcessorDetection>

 #include <QString>

--- 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>
--- 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;
--- 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>
--- 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>
--- a/src/base/path.h
+++ b/src/base/path.h
@@ -31,7 +31,6 @@

 #include <filesystem>

-#include <QtGlobal>
 #include <QMetaType>
 #include <QString>

@@ -39,6 +38,8 @@

 #include "base/interfaces/istringable.h"

+class QStringView;
+
 class Path final : public IStringable
 {
 public:
--- 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"
--- 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>
--- 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
--- 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
--- 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>
--- 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>