Merge pull request #13937 from Chocobo1/qt6

Use Qt provided forward declaration header

src/app/filelogger.cpp

@@ -33,6 +33,7 @@
 #include <QDateTime>
 #include <QDir>
 #include <QTextStream>
+#include <QVector>
 
 #include "base/global.h"
 #include "base/logger.h"

src/app/upgrade.cpp

@@ -29,6 +29,7 @@
 #include "upgrade.h"
 
 #include <QFile>
+#include <QVector>
 
 #include "base/logger.h"
 #include "base/profile.h"

src/base/bittorrent/session.h

@@ -41,6 +41,7 @@
 #include <QHash>
 #include <QPointer>
 #include <QSet>
+#include <QtContainerFwd>
 #include <QVector>
 
 #include "base/settingvalue.h"
@@ -58,7 +59,6 @@ class QFile;
 class QNetworkConfiguration;
 class QNetworkConfigurationManager;
 class QString;
-class QStringList;
 class QThread;
 class QTimer;
 class QUrl;

src/base/bittorrent/torrenthandle.cpp

@@ -31,6 +31,8 @@
 
 #include <type_traits>
 
+#include <QHash>
+
 namespace BitTorrent
 {
     uint qHash(const TorrentState key, const uint seed)

src/base/bittorrent/torrenthandle.h

@@ -29,15 +29,12 @@
 
 #pragma once
 
-#include <QHash>
 #include <QMetaType>
-#include <QSet>
 #include <QString>
-#include <QVector>
+#include <QtContainerFwd>
 
 class QBitArray;
 class QDateTime;
-class QStringList;
 class QUrl;
 
 namespace BitTorrent

src/base/bittorrent/torrentinfo.cpp

@@ -40,6 +40,7 @@
 #include <QString>
 #include <QStringList>
 #include <QUrl>
+#include <QVector>
 
 #include "base/exceptions.h"
 #include "base/global.h"

src/base/bittorrent/torrentinfo.h

@@ -32,14 +32,13 @@
 #include <libtorrent/torrent_info.hpp>
 
 #include <QCoreApplication>
-#include <QVector>
+#include <QtContainerFwd>
 
 #include "base/indexrange.h"
 
 class QByteArray;
 class QDateTime;
 class QString;
-class QStringList;
 class QUrl;
 
 namespace BitTorrent

src/base/filesystemwatcher.h

@@ -32,11 +32,10 @@
 #include <QDir>
 #include <QFileSystemWatcher>
 #include <QHash>
+#include <QtContainerFwd>
 #include <QTimer>
 #include <QVector>
 
-class QStringList;
-
 /*
  * Subclassing QFileSystemWatcher in order to support Network File
  * System watching (NFS, CIFS) on Linux and Mac OS.

src/base/logger.cpp

@@ -31,6 +31,7 @@
 #include <algorithm>
 
 #include <QDateTime>
+#include <QVector>
 
 namespace
 {

src/base/logger.h

@@ -34,7 +34,7 @@
 #include <QObject>
 #include <QReadWriteLock>
 #include <QString>
-#include <QVector>
+#include <QtContainerFwd>
 
 const int MAX_LOG_MESSAGES = 20000;
 

src/base/preferences.cpp

@@ -41,6 +41,7 @@
 #include <QCoreApplication>
 #include <QDateTime>
 #include <QDir>
+#include <QList>
 #include <QLocale>
 #include <QNetworkCookie>
 #include <QSettings>

src/base/preferences.h

@@ -30,16 +30,15 @@
 #ifndef PREFERENCES_H
 #define PREFERENCES_H
 
-#include <QList>
+#include <QtContainerFwd>
+#include <QVariant>
 
 #include "base/utils/net.h"
 
 class QDateTime;
 class QNetworkCookie;
 class QSize;
-class QStringList;
 class QTime;
-class QVariant;
 
 enum SchedulerDays
 {

src/base/scanfoldersmodel.h

@@ -31,8 +31,7 @@
 
 #include <QAbstractListModel>
 #include <QList>
-
+#include <QtContainerFwd>
-class QStringList;
 
 class FileSystemWatcher;
 

src/base/search/searchhandler.cpp

@@ -31,6 +31,7 @@
 
 #include <QProcess>
 #include <QTimer>
+#include <QVector>
 
 #include "base/global.h"
 #include "base/utils/foreignapps.h"

src/base/search/searchhandler.h

@@ -33,7 +33,7 @@
 #include <QList>
 #include <QObject>
 #include <QString>
-#include <QVector>
+#include <QtContainerFwd>
 
 class QProcess;
 class QTimer;

src/base/types.h

@@ -29,7 +29,7 @@
 #ifndef TYPES_H
 #define TYPES_H
 
-#include <QMap>
+#include <QtContainerFwd>
 
 const qlonglong MAX_ETA = 8640000;
 

src/base/utils/bytearray.cpp

@@ -29,6 +29,7 @@
 #include "bytearray.h"
 
 #include <QByteArray>
+#include <QVector>
 
 QVector<QByteArray> Utils::ByteArray::splitToViews(const QByteArray &in, const QByteArray &sep, const QString::SplitBehavior behavior)
 {

src/base/utils/bytearray.h

@@ -29,7 +29,7 @@
 #pragma once
 
 #include <QString>
-#include <QVector>
+#include <QtContainerFwd>
 
 class QByteArray;
 

src/base/utils/misc.cpp

@@ -52,6 +52,7 @@
 #include <QRegularExpression>
 #include <QSet>
 #include <QSysInfo>
+#include <QVector>
 
 #if (defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)) && defined(QT_DBUS_LIB)
 #include <QDBusInterface>

src/base/utils/net.cpp

@@ -28,10 +28,13 @@
 
 #include "net.h"
 
+#include <QList>
 #include <QNetworkInterface>
+#include <QPair>
 #include <QSslCertificate>
 #include <QSslKey>
 #include <QString>
+#include <QVector>
 
 namespace Utils
 {

src/base/utils/net.h

@@ -30,9 +30,7 @@
 #define BASE_UTILS_NET_H
 
 #include <QHostAddress>
-#include <QList>
+#include <QtContainerFwd>
-#include <QPair>
-#include <QVector>
 
 class QSslCertificate;
 class QSslKey;

src/base/utils/password.cpp

@@ -34,6 +34,7 @@
 
 #include <QByteArray>
 #include <QString>
+#include <QVector>
 
 #include "bytearray.h"
 #include "random.h"

src/base/utils/string.cpp

@@ -35,6 +35,7 @@
 #include <QLocale>
 #include <QRegExp>
 #include <QtGlobal>
+#include <QVector>
 
 #if defined(Q_OS_MACOS) || defined(__MINGW32__)
 #define QBT_USES_QTHREADSTORAGE

src/base/utils/string.h

@@ -31,9 +31,10 @@
 #define UTILS_STRING_H
 
 #include <QChar>
-#include <QVector>
+#include <QString>
+#include <Qt>
+#include <QtContainerFwd>
 
-class QString;
 class QStringRef;
 
 class TriStateBool;

src/gui/fspathedit_p.h

@@ -32,15 +32,14 @@
 #include <QComboBox>
 #include <QFileIconProvider>
 #include <QLineEdit>
+#include <QtContainerFwd>
 #include <QValidator>
-#include <QVector>
 
 class QAction;
 class QCompleter;
 class QContextMenuEvent;
 class QFileSystemModel;
 class QKeyEvent;
-class QStringList;
 class QStringRef;
 
 namespace Private

src/gui/properties/downloadedpiecesbar.cpp

@@ -31,6 +31,7 @@
 #include <cmath>
 
 #include <QDebug>
+#include <QVector>
 
 namespace
 {

src/gui/properties/downloadedpiecesbar.h

@@ -30,7 +30,7 @@
 #define DOWNLOADEDPIECESBAR_H
 
 #include <QBitArray>
-#include <QVector>
+#include <QtContainerFwd>
 
 #include "piecesbar.h"
 

src/gui/properties/trackerlistwidget.cpp

@@ -42,6 +42,7 @@
 #include <QTableView>
 #include <QTreeWidgetItem>
 #include <QUrl>
+#include <QVector>
 
 #include "base/bittorrent/peerinfo.h"
 #include "base/bittorrent/session.h"

src/gui/properties/trackerlistwidget.h

@@ -30,7 +30,7 @@
 #define TRACKERLIST_H
 
 #include <QTreeWidget>
-#include <QVector>
+#include <QtContainerFwd>
 
 class PropertiesWidget;
 

src/gui/properties/trackersadditiondialog.h

@@ -30,9 +30,9 @@
 #define TRACKERSADDITION_H
 
 #include <QDialog>
+#include <QtContainerFwd>
 
 class QString;
-class QStringList;
 
 namespace BitTorrent
 {

src/gui/search/pluginselectdialog.h

@@ -31,11 +31,11 @@
 #define PLUGINSELECTDIALOG_H
 
 #include <QDialog>
+#include <QStringList>
 
 #include "base/search/searchpluginmanager.h"
 
 class QDropEvent;
-class QStringList;
 class QTreeWidgetItem;
 
 namespace Net

src/gui/tagfiltermodel.cpp

@@ -30,6 +30,8 @@
 
 #include <QDebug>
 #include <QIcon>
+#include <QSet>
+#include <QVector>
 
 #include "base/bittorrent/session.h"
 #include "base/bittorrent/torrenthandle.h"

src/gui/tagfiltermodel.h

@@ -30,8 +30,7 @@
 #define TAGFILTERMODEL_H
 
 #include <QAbstractListModel>
-#include <QSet>
+#include <QtContainerFwd>
-#include <QVector>
 
 class QModelIndex;
 

src/gui/trackerentriesdialog.cpp

@@ -31,6 +31,7 @@
 #include <algorithm>
 
 #include <QHash>
+#include <QVector>
 
 #include "base/bittorrent/trackerentry.h"
 #include "ui_trackerentriesdialog.h"

src/gui/trackerentriesdialog.h

@@ -29,7 +29,7 @@
 #pragma once
 
 #include <QDialog>
-#include <QVector>
+#include <QtContainerFwd>
 
 #include "base/settingvalue.h"
 

src/webui/api/apicontroller.cpp

@@ -30,8 +30,10 @@
 
 #include <algorithm>
 
+#include <QHash>
 #include <QJsonDocument>
 #include <QMetaObject>
+#include <QVector>
 
 #include "apierror.h"
 

src/webui/api/apicontroller.h

@@ -28,10 +28,9 @@
 
 #pragma once
 
-#include <QHash>
 #include <QObject>
 #include <QVariant>
-#include <QVector>
+#include <QtContainerFwd>
 
 class QString;
 

src/webui/api/logcontroller.cpp

@@ -30,6 +30,7 @@
 
 #include <QJsonArray>
 #include <QJsonObject>
+#include <QVector>
 
 #include "base/global.h"
 #include "base/logger.h"
@@ -75,18 +76,18 @@ void LogController::mainAction()
 
     for (const Log::Msg &msg : asConst(logger->getMessages(lastKnownId)))
     {
-        if (!((msg.type == Log::NORMAL && isNormal)
+        if (!(((msg.type == Log::NORMAL) && isNormal)
-              || (msg.type == Log::INFO && isInfo)
+              || ((msg.type == Log::INFO) && isInfo)
-              || (msg.type == Log::WARNING && isWarning)
+              || ((msg.type == Log::WARNING) && isWarning)
-              || (msg.type == Log::CRITICAL && isCritical)))
+              || ((msg.type == Log::CRITICAL) && isCritical)))
             continue;
 
         msgList.append(QJsonObject
         {
-            {KEY_LOG_ID, msg.id},
+            {QLatin1String(KEY_LOG_ID), msg.id},
-            {KEY_LOG_TIMESTAMP, msg.timestamp},
+            {QLatin1String(KEY_LOG_TIMESTAMP), msg.timestamp},
-            {KEY_LOG_MSG_TYPE, msg.type},
+            {QLatin1String(KEY_LOG_MSG_TYPE), msg.type},
-            {KEY_LOG_MSG_MESSAGE, msg.message}
+            {QLatin1String(KEY_LOG_MSG_MESSAGE), msg.message}
         });
     }
 
@@ -105,10 +106,8 @@ void LogController::mainAction()
 //   - last_known_id (int): exclude messages with id <= 'last_known_id' (default -1)
 void LogController::peersAction()
 {
-    int lastKnownId;
+    bool ok = false;
-    bool ok;
+    int lastKnownId = params()["last_known_id"].toInt(&ok);
-
-    lastKnownId = params()["last_known_id"].toInt(&ok);
     if (!ok)
         lastKnownId = -1;
 
@@ -119,11 +118,11 @@ void LogController::peersAction()
     {
         peerList.append(QJsonObject
         {
-            {KEY_LOG_ID, peer.id},
+            {QLatin1String(KEY_LOG_ID), peer.id},
-            {KEY_LOG_TIMESTAMP, peer.timestamp},
+            {QLatin1String(KEY_LOG_TIMESTAMP), peer.timestamp},
-            {KEY_LOG_PEER_IP, peer.ip},
+            {QLatin1String(KEY_LOG_PEER_IP), peer.ip},
-            {KEY_LOG_PEER_BLOCKED, peer.blocked},
+            {QLatin1String(KEY_LOG_PEER_BLOCKED), peer.blocked},
-            {KEY_LOG_PEER_REASON, peer.reason}
+            {QLatin1String(KEY_LOG_PEER_REASON), peer.reason}
         });
     }
 

src/webui/api/logcontroller.h

@@ -30,7 +30,7 @@
 
 #include "apicontroller.h"
 
-class LogController : public APIController
+class LogController final : public APIController
 {
     Q_OBJECT
     Q_DISABLE_COPY(LogController)

src/webui/api/rsscontroller.cpp

@@ -32,6 +32,7 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonValue>
+#include <QVector>
 
 #include "base/rss/rss_article.h"
 #include "base/rss/rss_autodownloader.h"

src/webui/api/rsscontroller.h

@@ -30,7 +30,7 @@
 
 #include "apicontroller.h"
 
-class RSSController : public APIController
+class RSSController final : public APIController
 {
     Q_OBJECT
     Q_DISABLE_COPY(RSSController)

src/webui/api/searchcontroller.cpp

@@ -30,8 +30,10 @@
 
 #include <limits>
 
+#include <QHash>
 #include <QJsonArray>
 #include <QJsonObject>
+#include <QList>
 #include <QSharedPointer>
 
 #include "base/global.h"

src/webui/api/searchcontroller.h

@@ -28,15 +28,13 @@
 
 #pragma once
 
-#include <QHash>
+#include <QtContainerFwd>
-#include <QList>
 
 #include "base/search/searchpluginmanager.h"
 #include "apicontroller.h"
 
 class QJsonArray;
 class QJsonObject;
-class QStringList;
 
 struct ISession;
 struct SearchResult;

src/webui/api/serialize/serialize_torrent.cpp

@@ -29,6 +29,8 @@
 #include "serialize_torrent.h"
 
 #include <QDateTime>
+#include <QSet>
+#include <QVector>
 
 #include "base/bittorrent/infohash.h"
 #include "base/bittorrent/torrenthandle.h"