Forward declare in a few places

src/gui/autoexpandabledialog.h

@@ -31,7 +31,8 @@
 
 #include <QDialog>
 #include <QLineEdit>
-#include <QString>
+
+class QString;
 
 namespace Ui
 {

src/gui/categoryfiltermodel.h

@@ -30,15 +30,15 @@
 #define CATEGORYFILTERMODEL_H
 
 #include <QAbstractItemModel>
-#include <QModelIndex>
+
+class QModelIndex;
+class CategoryModelItem;
 
 namespace BitTorrent
 {
     class TorrentHandle;
 }
 
-class CategoryModelItem;
-
 class CategoryFilterModel : public QAbstractItemModel
 {
     Q_OBJECT

src/gui/categoryfilterproxymodel.h

@@ -30,7 +30,8 @@
 #define CATEGORYFILTERPROXYMODEL_H
 
 #include <QSortFilterProxyModel>
-#include <QString>
+
+class QString;
 
 class CategoryFilterProxyModel : public QSortFilterProxyModel
 {

src/gui/fspathedit_p.cpp

@@ -29,8 +29,11 @@
 #include "fspathedit_p.h"
 
 #include <QCompleter>
+#include <QContextMenuEvent>
 #include <QDir>
 #include <QFileInfo>
+#include <QFileSystemModel>
+#include <QMenu>
 #include <QStringList>
 #include <QStyle>
 

src/gui/fspathedit_p.h

@@ -29,20 +29,19 @@
 #ifndef QBT_GUI_FSPATHEDIT_P_H
 #define QBT_GUI_FSPATHEDIT_P_H
 
-#include <QAction>
 #include <QComboBox>
-#include <QCompleter>
-#include <QContextMenuEvent>
 #include <QFileIconProvider>
-#include <QFileSystemModel>
-#include <QKeyEvent>
 #include <QLineEdit>
-#include <QMenu>
-#include <QStringRef>
 #include <QValidator>
 #include <QVector>
 
+class QAction;
+class QCompleter;
+class QContextMenuEvent;
+class QFileSystemModel;
+class QKeyEvent;
 class QStringList;
+class QStringRef;
 
 namespace Private
 {

src/gui/properties/downloadedpiecesbar.h

@@ -31,10 +31,11 @@
 
 #include <QBitArray>
 #include <QVector>
-#include <QWidget>
 
 #include "piecesbar.h"
 
+class QWidget;
+
 class DownloadedPiecesBar : public PiecesBar
 {
     using base = PiecesBar;

src/gui/properties/propertieswidget.cpp

@@ -29,6 +29,7 @@
 #include "propertieswidget.h"
 
 #include <QAction>
+#include <QClipboard>
 #include <QDateTime>
 #include <QDebug>
 #include <QDir>

src/gui/properties/trackerlistwidget.cpp

@@ -30,12 +30,14 @@
 
 #include <QAction>
 #include <QApplication>
+#include <QClipboard>
 #include <QColor>
 #include <QDebug>
 #include <QHash>
 #include <QHeaderView>
 #include <QMenu>
 #include <QMessageBox>
+#include <QShortcut>
 #include <QStringList>
 #include <QTableView>
 #include <QTreeWidgetItem>

src/gui/properties/trackerlistwidget.h

@@ -29,13 +29,13 @@
 #ifndef TRACKERLIST_H
 #define TRACKERLIST_H
 
-#include <QClipboard>
 #include <QList>
-#include <QShortcut>
 #include <QTreeWidget>
 
 #include "propertieswidget.h"
 
+class QShortcut;
+
 #define NB_STICKY_ITEM 3
 
 namespace BitTorrent

src/gui/rss/rsswidget.cpp

@@ -37,6 +37,7 @@
 #include <QMenu>
 #include <QMessageBox>
 #include <QRegularExpression>
+#include <QShortcut>
 #include <QStandardItemModel>
 #include <QString>
 

src/gui/rss/rsswidget.h

@@ -32,8 +32,9 @@
 #define RSSWIDGET_H
 
 #include <QPointer>
-#include <QShortcut>
+#include <QWidget>
 
+class QShortcut;
 class ArticleListWidget;
 class FeedListWidget;
 class QListWidgetItem;

src/gui/search/searchsortmodel.cpp

@@ -29,6 +29,7 @@
 #include "searchsortmodel.h"
 
 #include "base/global.h"
+#include "base/utils/string.h"
 
 SearchSortModel::SearchSortModel(QObject *parent)
     : base(parent)

src/gui/search/searchsortmodel.h

@@ -31,7 +31,6 @@
 
 #include <QSortFilterProxyModel>
 #include <QStringList>
-#include "base/utils/string.h"
 
 class SearchSortModel : public QSortFilterProxyModel
 {

src/gui/tagfiltermodel.h

@@ -30,17 +30,17 @@
 #define TAGFILTERMODEL_H
 
 #include <QAbstractListModel>
-#include <QModelIndex>
 #include <QSet>
 #include <QVector>
 
+class QModelIndex;
+class TagModelItem;
+
 namespace BitTorrent
 {
     class TorrentHandle;
 }
 
-class TagModelItem;
-
 class TagFilterModel : public QAbstractListModel
 {
     Q_OBJECT

src/gui/tagfilterproxymodel.h

@@ -30,7 +30,8 @@
 #define TAGFILTERPROXYMODEL_H
 
 #include <QSortFilterProxyModel>
-#include <QString>
+
+class QString;
 
 class TagFilterProxyModel : public QSortFilterProxyModel
 {

src/gui/torrentcontentmodel.cpp

@@ -49,6 +49,7 @@
 #endif
 
 #include "base/bittorrent/downloadpriority.h"
+#include "base/bittorrent/torrentinfo.h"
 #include "base/global.h"
 #include "base/utils/fs.h"
 #include "base/utils/misc.h"

src/gui/torrentcontentmodel.h

@@ -30,16 +30,20 @@
 #define TORRENTCONTENTMODEL_H
 
 #include <QAbstractItemModel>
-#include <QModelIndex>
-#include <QVariant>
 #include <QVector>
 
-#include "base/bittorrent/torrentinfo.h"
 #include "torrentcontentmodelitem.h"
 
 class QFileIconProvider;
+class QModelIndex;
+class QVariant;
 class TorrentContentModelFile;
 
+namespace BitTorrent
+{
+    class TorrentInfo;
+}
+
 class TorrentContentModel : public QAbstractItemModel
 {
     Q_OBJECT

src/gui/torrentcontentmodelfile.h

@@ -29,9 +29,13 @@
 #ifndef TORRENTCONTENTMODELFILE_H
 #define TORRENTCONTENTMODELFILE_H
 
-#include "base/bittorrent/downloadpriority.h"
 #include "torrentcontentmodelitem.h"
 
+namespace BitTorrent
+{
+    enum class DownloadPriority;
+}
+
 class TorrentContentModelFile : public TorrentContentModelItem
 {
 public:

src/gui/torrentcontentmodelfolder.h

@@ -29,9 +29,13 @@
 #ifndef TORRENTCONTENTMODELFOLDER_H
 #define TORRENTCONTENTMODELFOLDER_H
 
-#include "base/bittorrent/downloadpriority.h"
 #include "torrentcontentmodelitem.h"
 
+namespace BitTorrent
+{
+    enum class DownloadPriority;
+}
+
 class TorrentContentModelFolder : public TorrentContentModelItem
 {
 public:

src/gui/torrentcontentmodelitem.h

@@ -30,10 +30,10 @@
 #define TORRENTCONTENTMODELITEM_H
 
 #include <QList>
-#include <QVariant>
 
 #include "base/bittorrent/downloadpriority.h"
 
+class QVariant;
 class TorrentContentModelFolder;
 
 class TorrentContentModelItem