Move to separate headers

Hopefully this can speed up compilation times. https://doc.qt.io/qt-6/qtglobal.html#details PR #19430.
1 year ago · 31fe327763
52 changed files with 71 additions and 51 deletions
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- a/src/gui/uithemecommon.h
+++ b/src/gui/uithemecommon.h
@ -29,7 +29,6 @@
 #pragma once
 #include <QtGlobal>
 #include <QApplication>
 #include <QColor>
 #include <QHash>
--- 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>
--- 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>
--- 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>
--- 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"
--- a/test/testbittorrenttrackerentry.cpp
+++ b/test/testbittorrenttrackerentry.cpp
@ -28,6 +28,7 @@
 #include <algorithm>
 #include <QObject>
 #include <QTest>
 #include <QVector>
--- a/test/testglobal.cpp
+++ b/test/testglobal.cpp
@ -26,7 +26,10 @@
 * exception statement from your version.
 */
-#include <QtGlobal>
+#include <type_traits>
 #include <QList>
 #include <QObject>
 #include <QTest>
 #include "base/global.h"
@ -40,13 +43,27 @@ public:
    TestGlobal() = default;
 private slots:
-#if (QT_VERSION < QT_VERSION_CHECK(6, 4, 0))
+    void testAsConst() const
-    void testStringLiteral() const
+    {
        {
-        QCOMPARE(u""_s, QStringLiteral(""));
+            QList<int> list = {0, 1, 2};
-        QCOMPARE(u"abc"_s, QStringLiteral("abc"));
+
            static_assert(std::is_const_v<std::remove_reference_t<decltype(asConst(list))>>);
            QCOMPARE(list, asConst(list));
            QCOMPARE(list, asConst(QList<int>(list)));
        }
        {
            const QList<int> list = {0, 1, 2};
            static_assert(std::is_const_v<std::remove_reference_t<decltype(asConst(list))>>);
            QCOMPARE(list, asConst(list));
            QCOMPARE(list, asConst(QList<int>(list)));
            // should not compile:
            //asConst(std::move(list));
        }
    }
 #endif
 };
 QTEST_APPLESS_MAIN(TestGlobal)
--- a/test/testorderedset.cpp
+++ b/test/testorderedset.cpp
@ -27,6 +27,7 @@
 * exception statement from your version.
 */
 #include <QObject>
 #include <QSet>
 #include <QTest>
--- a/test/testpath.cpp
+++ b/test/testpath.cpp
@ -26,7 +26,8 @@
 * exception statement from your version.
 */
-#include <QtGlobal>
+#include <QtSystemDetection>
 #include <QObject>
 #include <QTest>
 #include "base/global.h"
--- a/test/testutilsbytearray.cpp
+++ b/test/testutilsbytearray.cpp
@ -26,6 +26,7 @@
 * exception statement from your version.
 */
 #include <QObject>
 #include <QTest>
 #include "base/global.h"
--- a/test/testutilscompare.cpp
+++ b/test/testutilscompare.cpp
@ -28,6 +28,7 @@
 #include <tuple>
 #include <QObject>
 #include <QTest>
 #include "base/global.h"
--- a/test/testutilsgzip.cpp
+++ b/test/testutilsgzip.cpp
@ -26,6 +26,7 @@
 * exception statement from your version.
 */
 #include <QObject>
 #include <QTest>
 #include "base/global.h"
--- a/test/testutilsio.cpp
+++ b/test/testutilsio.cpp
@ -26,7 +26,8 @@
 * exception statement from your version.
 */
-#include <QtGlobal>
+#include <QtSystemDetection>
 #include <QObject>
 #include <QTest>
 #include "base/global.h"
--- a/test/testutilsstring.cpp
+++ b/test/testutilsstring.cpp
@ -26,6 +26,7 @@
 * exception statement from your version.
 */
 #include <QObject>
 #include <QTest>
 #include "base/global.h"
--- a/test/testutilsversion.cpp
+++ b/test/testutilsversion.cpp
@ -26,6 +26,7 @@
 * exception statement from your version.
 */
 #include <QObject>
 #include <QTest>
 #include "base/global.h"