From 4370a7eb126616d8f47a2ce51f014d15c85fd993 Mon Sep 17 00:00:00 2001 From: thalieht Date: Sun, 2 Jun 2019 12:13:34 +0300 Subject: [PATCH 1/3] Forward declare in a few places --- src/base/bittorrent/addtorrentparams.h | 3 ++- src/base/bittorrent/peerinfo.cpp | 2 ++ src/base/bittorrent/peerinfo.h | 3 ++- src/base/bittorrent/torrenthandle.cpp | 1 + src/base/bittorrent/torrenthandle.h | 2 +- src/base/http/connection.h | 3 +-- src/base/http/irequesthandler.h | 6 ++++-- src/base/http/responsegenerator.cpp | 1 + src/base/http/responsegenerator.h | 5 ++++- src/base/preferences.h | 2 +- src/base/utils/string.h | 2 +- src/gui/autoexpandabledialog.h | 3 ++- src/gui/categoryfiltermodel.h | 6 +++--- src/gui/categoryfilterproxymodel.h | 3 ++- src/gui/fspathedit_p.cpp | 3 +++ src/gui/fspathedit_p.h | 13 ++++++------- src/gui/properties/downloadedpiecesbar.h | 3 ++- src/gui/properties/propertieswidget.cpp | 1 + src/gui/properties/trackerlistwidget.cpp | 2 ++ src/gui/properties/trackerlistwidget.h | 4 ++-- src/gui/rss/rsswidget.cpp | 1 + src/gui/rss/rsswidget.h | 3 ++- src/gui/search/searchsortmodel.cpp | 1 + src/gui/search/searchsortmodel.h | 1 - src/gui/tagfiltermodel.h | 6 +++--- src/gui/tagfilterproxymodel.h | 3 ++- src/gui/torrentcontentmodel.cpp | 1 + src/gui/torrentcontentmodel.h | 10 +++++++--- src/gui/torrentcontentmodelfile.h | 6 +++++- src/gui/torrentcontentmodelfolder.h | 6 +++++- src/gui/torrentcontentmodelitem.h | 2 +- src/webui/api/apicontroller.h | 3 ++- src/webui/api/isessionmanager.h | 3 ++- src/webui/api/searchcontroller.cpp | 3 +++ src/webui/api/searchcontroller.h | 8 ++++---- 35 files changed, 82 insertions(+), 43 deletions(-) diff --git a/src/base/bittorrent/addtorrentparams.h b/src/base/bittorrent/addtorrentparams.h index 42a837019..59aa3a42b 100644 --- a/src/base/bittorrent/addtorrentparams.h +++ b/src/base/bittorrent/addtorrentparams.h @@ -33,10 +33,11 @@ #include #include "../tristatebool.h" -#include "downloadpriority.h" namespace BitTorrent { + enum class DownloadPriority; + struct AddTorrentParams { QString name; diff --git a/src/base/bittorrent/peerinfo.cpp b/src/base/bittorrent/peerinfo.cpp index 8e4277e4b..82f8982ff 100644 --- a/src/base/bittorrent/peerinfo.cpp +++ b/src/base/bittorrent/peerinfo.cpp @@ -28,6 +28,8 @@ #include "peerinfo.h" +#include + #include "base/bittorrent/torrenthandle.h" #include "base/net/geoipmanager.h" #include "base/unicodestrings.h" diff --git a/src/base/bittorrent/peerinfo.h b/src/base/bittorrent/peerinfo.h index 6fb3114af..a0741743d 100644 --- a/src/base/bittorrent/peerinfo.h +++ b/src/base/bittorrent/peerinfo.h @@ -31,10 +31,11 @@ #include -#include #include #include +class QBitArray; + namespace BitTorrent { class TorrentHandle; diff --git a/src/base/bittorrent/torrenthandle.cpp b/src/base/bittorrent/torrenthandle.cpp index f11e5e15c..d807212ea 100644 --- a/src/base/bittorrent/torrenthandle.cpp +++ b/src/base/bittorrent/torrenthandle.cpp @@ -59,6 +59,7 @@ #include "base/profile.h" #include "base/tristatebool.h" #include "base/utils/fs.h" +#include "downloadpriority.h" #include "peerinfo.h" #include "session.h" #include "trackerentry.h" diff --git a/src/base/bittorrent/torrenthandle.h b/src/base/bittorrent/torrenthandle.h index 4eaf94482..4513d805e 100644 --- a/src/base/bittorrent/torrenthandle.h +++ b/src/base/bittorrent/torrenthandle.h @@ -45,7 +45,6 @@ #include #include "private/speedmonitor.h" -#include "downloadpriority.h" #include "infohash.h" #include "torrentinfo.h" @@ -58,6 +57,7 @@ class QUrl; namespace BitTorrent { + enum class DownloadPriority; class PeerInfo; class Session; class TrackerEntry; diff --git a/src/base/http/connection.h b/src/base/http/connection.h index 4304a9ee5..926d4e44a 100644 --- a/src/base/http/connection.h +++ b/src/base/http/connection.h @@ -34,13 +34,12 @@ #include #include -#include "types.h" - class QTcpSocket; namespace Http { class IRequestHandler; + struct Response; class Connection : public QObject { diff --git a/src/base/http/irequesthandler.h b/src/base/http/irequesthandler.h index 0d2cf9a5c..99e6cf574 100644 --- a/src/base/http/irequesthandler.h +++ b/src/base/http/irequesthandler.h @@ -29,10 +29,12 @@ #ifndef HTTP_IREQUESTHANDLER_H #define HTTP_IREQUESTHANDLER_H -#include "types.h" - namespace Http { + struct Environment; + struct Request; + struct Response; + class IRequestHandler { public: diff --git a/src/base/http/responsegenerator.cpp b/src/base/http/responsegenerator.cpp index 21d9e42c4..90ee498d5 100644 --- a/src/base/http/responsegenerator.cpp +++ b/src/base/http/responsegenerator.cpp @@ -31,6 +31,7 @@ #include +#include "base/http/types.h" #include "base/utils/gzip.h" QByteArray Http::toByteArray(Response response) diff --git a/src/base/http/responsegenerator.h b/src/base/http/responsegenerator.h index b7b8e8985..81dcac3a2 100644 --- a/src/base/http/responsegenerator.h +++ b/src/base/http/responsegenerator.h @@ -31,10 +31,13 @@ #ifndef HTTP_RESPONSEGENERATOR_H #define HTTP_RESPONSEGENERATOR_H -#include "types.h" +class QByteArray; +class QString; namespace Http { + struct Response; + QByteArray toByteArray(Response response); QString httpDate(); void compressContent(Response &response); diff --git a/src/base/preferences.h b/src/base/preferences.h index 26ed99dbc..9252a0bdb 100644 --- a/src/base/preferences.h +++ b/src/base/preferences.h @@ -31,13 +31,13 @@ #define PREFERENCES_H #include -#include #include "base/utils/net.h" class QDateTime; class QNetworkCookie; class QSize; +class QStringList; class QTime; class QVariant; diff --git a/src/base/utils/string.h b/src/base/utils/string.h index c5cf43c78..5ad1bfbad 100644 --- a/src/base/utils/string.h +++ b/src/base/utils/string.h @@ -31,8 +31,8 @@ #define UTILS_STRING_H #include -#include +class QString; class TriStateBool; namespace Utils diff --git a/src/gui/autoexpandabledialog.h b/src/gui/autoexpandabledialog.h index 73f2cdbad..692e62587 100644 --- a/src/gui/autoexpandabledialog.h +++ b/src/gui/autoexpandabledialog.h @@ -31,7 +31,8 @@ #include #include -#include + +class QString; namespace Ui { diff --git a/src/gui/categoryfiltermodel.h b/src/gui/categoryfiltermodel.h index 2fd058fb0..f4f550e7a 100644 --- a/src/gui/categoryfiltermodel.h +++ b/src/gui/categoryfiltermodel.h @@ -30,15 +30,15 @@ #define CATEGORYFILTERMODEL_H #include -#include + +class QModelIndex; +class CategoryModelItem; namespace BitTorrent { class TorrentHandle; } -class CategoryModelItem; - class CategoryFilterModel : public QAbstractItemModel { Q_OBJECT diff --git a/src/gui/categoryfilterproxymodel.h b/src/gui/categoryfilterproxymodel.h index ef6c2e7a5..9e5ee360b 100644 --- a/src/gui/categoryfilterproxymodel.h +++ b/src/gui/categoryfilterproxymodel.h @@ -30,7 +30,8 @@ #define CATEGORYFILTERPROXYMODEL_H #include -#include + +class QString; class CategoryFilterProxyModel : public QSortFilterProxyModel { diff --git a/src/gui/fspathedit_p.cpp b/src/gui/fspathedit_p.cpp index 71c7e30a2..4153e1787 100644 --- a/src/gui/fspathedit_p.cpp +++ b/src/gui/fspathedit_p.cpp @@ -29,8 +29,11 @@ #include "fspathedit_p.h" #include +#include #include #include +#include +#include #include #include diff --git a/src/gui/fspathedit_p.h b/src/gui/fspathedit_p.h index 21c553eb0..66029d676 100644 --- a/src/gui/fspathedit_p.h +++ b/src/gui/fspathedit_p.h @@ -29,20 +29,19 @@ #ifndef QBT_GUI_FSPATHEDIT_P_H #define QBT_GUI_FSPATHEDIT_P_H -#include #include -#include -#include #include -#include -#include #include -#include -#include #include #include +class QAction; +class QCompleter; +class QContextMenuEvent; +class QFileSystemModel; +class QKeyEvent; class QStringList; +class QStringRef; namespace Private { diff --git a/src/gui/properties/downloadedpiecesbar.h b/src/gui/properties/downloadedpiecesbar.h index ee96d45b5..38bb603b9 100644 --- a/src/gui/properties/downloadedpiecesbar.h +++ b/src/gui/properties/downloadedpiecesbar.h @@ -31,10 +31,11 @@ #include #include -#include #include "piecesbar.h" +class QWidget; + class DownloadedPiecesBar : public PiecesBar { using base = PiecesBar; diff --git a/src/gui/properties/propertieswidget.cpp b/src/gui/properties/propertieswidget.cpp index b6e60dd06..07209d963 100644 --- a/src/gui/properties/propertieswidget.cpp +++ b/src/gui/properties/propertieswidget.cpp @@ -29,6 +29,7 @@ #include "propertieswidget.h" #include +#include #include #include #include diff --git a/src/gui/properties/trackerlistwidget.cpp b/src/gui/properties/trackerlistwidget.cpp index 34d732dae..0caa12ecf 100644 --- a/src/gui/properties/trackerlistwidget.cpp +++ b/src/gui/properties/trackerlistwidget.cpp @@ -30,12 +30,14 @@ #include #include +#include #include #include #include #include #include #include +#include #include #include #include diff --git a/src/gui/properties/trackerlistwidget.h b/src/gui/properties/trackerlistwidget.h index 8fcde45eb..7ea25d4fd 100644 --- a/src/gui/properties/trackerlistwidget.h +++ b/src/gui/properties/trackerlistwidget.h @@ -29,13 +29,13 @@ #ifndef TRACKERLIST_H #define TRACKERLIST_H -#include #include -#include #include #include "propertieswidget.h" +class QShortcut; + #define NB_STICKY_ITEM 3 namespace BitTorrent diff --git a/src/gui/rss/rsswidget.cpp b/src/gui/rss/rsswidget.cpp index 7f2e33f26..2ca6f8d6a 100644 --- a/src/gui/rss/rsswidget.cpp +++ b/src/gui/rss/rsswidget.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include #include diff --git a/src/gui/rss/rsswidget.h b/src/gui/rss/rsswidget.h index 6bd150eb9..a4e693f0c 100644 --- a/src/gui/rss/rsswidget.h +++ b/src/gui/rss/rsswidget.h @@ -32,8 +32,9 @@ #define RSSWIDGET_H #include -#include +#include +class QShortcut; class ArticleListWidget; class FeedListWidget; class QListWidgetItem; diff --git a/src/gui/search/searchsortmodel.cpp b/src/gui/search/searchsortmodel.cpp index fcc9e0000..e83e9e753 100644 --- a/src/gui/search/searchsortmodel.cpp +++ b/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) diff --git a/src/gui/search/searchsortmodel.h b/src/gui/search/searchsortmodel.h index 6434b3dcd..50f782c49 100644 --- a/src/gui/search/searchsortmodel.h +++ b/src/gui/search/searchsortmodel.h @@ -31,7 +31,6 @@ #include #include -#include "base/utils/string.h" class SearchSortModel : public QSortFilterProxyModel { diff --git a/src/gui/tagfiltermodel.h b/src/gui/tagfiltermodel.h index 19451bf94..1dd8fd38b 100644 --- a/src/gui/tagfiltermodel.h +++ b/src/gui/tagfiltermodel.h @@ -30,17 +30,17 @@ #define TAGFILTERMODEL_H #include -#include #include #include +class QModelIndex; +class TagModelItem; + namespace BitTorrent { class TorrentHandle; } -class TagModelItem; - class TagFilterModel : public QAbstractListModel { Q_OBJECT diff --git a/src/gui/tagfilterproxymodel.h b/src/gui/tagfilterproxymodel.h index 6bb83f457..93b75b585 100644 --- a/src/gui/tagfilterproxymodel.h +++ b/src/gui/tagfilterproxymodel.h @@ -30,7 +30,8 @@ #define TAGFILTERPROXYMODEL_H #include -#include + +class QString; class TagFilterProxyModel : public QSortFilterProxyModel { diff --git a/src/gui/torrentcontentmodel.cpp b/src/gui/torrentcontentmodel.cpp index bc336e3aa..902ef34bb 100644 --- a/src/gui/torrentcontentmodel.cpp +++ b/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" diff --git a/src/gui/torrentcontentmodel.h b/src/gui/torrentcontentmodel.h index fda753aad..7d02189d4 100644 --- a/src/gui/torrentcontentmodel.h +++ b/src/gui/torrentcontentmodel.h @@ -30,16 +30,20 @@ #define TORRENTCONTENTMODEL_H #include -#include -#include #include -#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 diff --git a/src/gui/torrentcontentmodelfile.h b/src/gui/torrentcontentmodelfile.h index ff972c4b5..61d663d82 100644 --- a/src/gui/torrentcontentmodelfile.h +++ b/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: diff --git a/src/gui/torrentcontentmodelfolder.h b/src/gui/torrentcontentmodelfolder.h index 6e41ef269..a8dfcf3b0 100644 --- a/src/gui/torrentcontentmodelfolder.h +++ b/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: diff --git a/src/gui/torrentcontentmodelitem.h b/src/gui/torrentcontentmodelitem.h index 84e55afb8..49d0516a0 100644 --- a/src/gui/torrentcontentmodelitem.h +++ b/src/gui/torrentcontentmodelitem.h @@ -30,10 +30,10 @@ #define TORRENTCONTENTMODELITEM_H #include -#include #include "base/bittorrent/downloadpriority.h" +class QVariant; class TorrentContentModelFolder; class TorrentContentModelItem diff --git a/src/webui/api/apicontroller.h b/src/webui/api/apicontroller.h index 419d6c390..be620832a 100644 --- a/src/webui/api/apicontroller.h +++ b/src/webui/api/apicontroller.h @@ -31,9 +31,10 @@ #include #include #include -#include #include +class QString; + struct ISessionManager; using StringMap = QMap; using DataMap = QMap; diff --git a/src/webui/api/isessionmanager.h b/src/webui/api/isessionmanager.h index 9d77dcdb1..1917f803d 100644 --- a/src/webui/api/isessionmanager.h +++ b/src/webui/api/isessionmanager.h @@ -28,9 +28,10 @@ #pragma once -#include #include +class QString; + struct ISession { virtual ~ISession() = default; diff --git a/src/webui/api/searchcontroller.cpp b/src/webui/api/searchcontroller.cpp index 0c2597aa2..37491b4cd 100644 --- a/src/webui/api/searchcontroller.cpp +++ b/src/webui/api/searchcontroller.cpp @@ -28,6 +28,8 @@ #include "searchcontroller.h" +#include +#include #include #include "base/global.h" @@ -37,6 +39,7 @@ #include "base/utils/random.h" #include "base/utils/string.h" #include "apierror.h" +#include "isessionmanager.h" class SearchPluginManager; diff --git a/src/webui/api/searchcontroller.h b/src/webui/api/searchcontroller.h index 38cdc40f5..c2accaefc 100644 --- a/src/webui/api/searchcontroller.h +++ b/src/webui/api/searchcontroller.h @@ -29,15 +29,15 @@ #pragma once #include -#include -#include #include -#include #include "base/search/searchpluginmanager.h" #include "apicontroller.h" -#include "isessionmanager.h" +class QJsonArray; +class QJsonObject; +class QStringList; +struct ISession; struct SearchResult; class SearchController : public APIController From 9995967fbff5dec99a117093f5a1723c3a7c6e41 Mon Sep 17 00:00:00 2001 From: thalieht Date: Tue, 4 Jun 2019 00:35:27 +0300 Subject: [PATCH 2/3] Remove some unused #include --- .../bittorrent/private/resumedatasavingmanager.cpp | 1 - src/base/bittorrent/torrentcreatorthread.cpp | 1 - src/base/bittorrent/trackerentry.h | 1 - src/base/filesystemwatcher.cpp | 2 -- src/base/net/downloadmanager.h | 1 - src/base/net/geoipmanager.cpp | 1 - src/base/net/geoipmanager.h | 1 - src/base/net/private/geoipdatabase.cpp | 1 - src/base/net/smtp.h | 1 - src/base/preferences.cpp | 1 - src/base/rss/rss_autodownloader.cpp | 1 - src/base/rss/rss_autodownloadrule.cpp | 1 - src/base/rss/rss_session.cpp | 2 -- src/base/search/searchpluginmanager.cpp | 1 - src/base/utils/fs.cpp | 1 - src/base/utils/password.cpp | 1 - src/gui/addnewtorrentdialog.cpp | 1 - src/gui/advancedsettings.cpp | 1 - src/gui/autoexpandabledialog.cpp | 3 --- src/gui/categoryfilterwidget.cpp | 1 - src/gui/executionlogwidget.cpp | 1 - src/gui/fspathedit.h | 1 - src/gui/guiiconprovider.cpp | 2 -- src/gui/mainwindow.cpp | 6 ------ src/gui/optionsdialog.cpp | 2 -- src/gui/programupdater.cpp | 1 - src/gui/programupdater.h | 1 - src/gui/properties/peerlistwidget.cpp | 2 -- src/gui/properties/proplistdelegate.cpp | 1 - src/gui/properties/trackerlistwidget.cpp | 1 - src/gui/properties/trackersadditiondialog.cpp | 2 -- src/gui/rss/automatedrssdownloader.cpp | 1 - src/gui/rss/rsswidget.cpp | 2 -- src/gui/rss/rsswidget.h | 1 - src/gui/search/searchlistdelegate.cpp | 2 -- src/gui/search/searchwidget.cpp | 12 ------------ src/gui/statusbar.cpp | 1 - src/gui/tagfilterwidget.cpp | 2 -- src/gui/torrentcontentmodel.cpp | 1 - src/gui/torrentcontentmodelitem.cpp | 4 ---- src/gui/torrentcreatordialog.cpp | 1 - src/gui/transferlistfilterswidget.cpp | 4 ---- src/gui/transferlistmodel.cpp | 1 - src/webui/api/serialize/serialize_torrent.cpp | 2 -- src/webui/api/synccontroller.cpp | 1 - 45 files changed, 79 deletions(-) diff --git a/src/base/bittorrent/private/resumedatasavingmanager.cpp b/src/base/bittorrent/private/resumedatasavingmanager.cpp index 4fd93722d..ffe1a6162 100644 --- a/src/base/bittorrent/private/resumedatasavingmanager.cpp +++ b/src/base/bittorrent/private/resumedatasavingmanager.cpp @@ -29,7 +29,6 @@ #include "resumedatasavingmanager.h" #include -#include #include #include "base/logger.h" diff --git a/src/base/bittorrent/torrentcreatorthread.cpp b/src/base/bittorrent/torrentcreatorthread.cpp index 681519fbd..6b5961351 100644 --- a/src/base/bittorrent/torrentcreatorthread.cpp +++ b/src/base/bittorrent/torrentcreatorthread.cpp @@ -43,7 +43,6 @@ #include "base/global.h" #include "base/utils/fs.h" -#include "base/utils/misc.h" #include "base/utils/string.h" namespace diff --git a/src/base/bittorrent/trackerentry.h b/src/base/bittorrent/trackerentry.h index 9592bc1ff..b427aa455 100644 --- a/src/base/bittorrent/trackerentry.h +++ b/src/base/bittorrent/trackerentry.h @@ -30,7 +30,6 @@ #define BITTORRENT_TRACKERENTRY_H #include -#include class QString; diff --git a/src/base/filesystemwatcher.cpp b/src/base/filesystemwatcher.cpp index b68ac4f4f..c9cbe8c36 100644 --- a/src/base/filesystemwatcher.cpp +++ b/src/base/filesystemwatcher.cpp @@ -37,11 +37,9 @@ #endif #include "base/algorithm.h" -#include "base/bittorrent/magneturi.h" #include "base/bittorrent/torrentinfo.h" #include "base/global.h" #include "base/logger.h" -#include "base/preferences.h" #include "base/utils/fs.h" namespace diff --git a/src/base/net/downloadmanager.h b/src/base/net/downloadmanager.h index 84716934e..b92ad3e95 100644 --- a/src/base/net/downloadmanager.h +++ b/src/base/net/downloadmanager.h @@ -32,7 +32,6 @@ #include #include -#include #include #include #include diff --git a/src/base/net/geoipmanager.cpp b/src/base/net/geoipmanager.cpp index a496b038a..15ffa4a6d 100644 --- a/src/base/net/geoipmanager.cpp +++ b/src/base/net/geoipmanager.cpp @@ -30,7 +30,6 @@ #include "geoipmanager.h" #include -#include #include #include #include diff --git a/src/base/net/geoipmanager.h b/src/base/net/geoipmanager.h index ef9ef5a4d..28e5c4e27 100644 --- a/src/base/net/geoipmanager.h +++ b/src/base/net/geoipmanager.h @@ -30,7 +30,6 @@ #ifndef NET_GEOIPMANAGER_H #define NET_GEOIPMANAGER_H -#include #include class QHostAddress; diff --git a/src/base/net/private/geoipdatabase.cpp b/src/base/net/private/geoipdatabase.cpp index 233a6fb7a..f50538684 100644 --- a/src/base/net/private/geoipdatabase.cpp +++ b/src/base/net/private/geoipdatabase.cpp @@ -32,7 +32,6 @@ #include #include -#include "base/types.h" #include "geoipdatabase.h" namespace diff --git a/src/base/net/smtp.h b/src/base/net/smtp.h index b8775f895..91f5aa881 100644 --- a/src/base/net/smtp.h +++ b/src/base/net/smtp.h @@ -36,7 +36,6 @@ #include #include #include -#include #include #include diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp index 81ac30e1f..fce855ac3 100644 --- a/src/base/preferences.cpp +++ b/src/base/preferences.cpp @@ -59,7 +59,6 @@ #include "global.h" #include "settingsstorage.h" #include "utils/fs.h" -#include "utils/misc.h" Preferences *Preferences::m_instance = nullptr; diff --git a/src/base/rss/rss_autodownloader.cpp b/src/base/rss/rss_autodownloader.cpp index 10513ac9d..a293651b5 100644 --- a/src/base/rss/rss_autodownloader.cpp +++ b/src/base/rss/rss_autodownloader.cpp @@ -30,7 +30,6 @@ #include #include -#include #include #include #include diff --git a/src/base/rss/rss_autodownloadrule.cpp b/src/base/rss/rss_autodownloadrule.cpp index 3e6c57566..b8f67c039 100644 --- a/src/base/rss/rss_autodownloadrule.cpp +++ b/src/base/rss/rss_autodownloadrule.cpp @@ -32,7 +32,6 @@ #include #include -#include #include #include #include diff --git a/src/base/rss/rss_session.cpp b/src/base/rss/rss_session.cpp index 339329bc4..ed8d64959 100644 --- a/src/base/rss/rss_session.cpp +++ b/src/base/rss/rss_session.cpp @@ -31,14 +31,12 @@ #include "rss_session.h" #include -#include #include #include #include #include #include #include -#include #include "../asyncfilestorage.h" #include "../global.h" diff --git a/src/base/search/searchpluginmanager.cpp b/src/base/search/searchpluginmanager.cpp index 12d5280b4..7643e924a 100644 --- a/src/base/search/searchpluginmanager.cpp +++ b/src/base/search/searchpluginmanager.cpp @@ -31,7 +31,6 @@ #include -#include #include #include #include diff --git a/src/base/utils/fs.cpp b/src/base/utils/fs.cpp index ab29a9a2c..ec87a0af7 100644 --- a/src/base/utils/fs.cpp +++ b/src/base/utils/fs.cpp @@ -49,7 +49,6 @@ #include #endif -#include #include #include #include diff --git a/src/base/utils/password.cpp b/src/base/utils/password.cpp index e7bf0cbf6..06f425863 100644 --- a/src/base/utils/password.cpp +++ b/src/base/utils/password.cpp @@ -37,7 +37,6 @@ #include "bytearray.h" #include "random.h" -#include "string.h" namespace Utils { diff --git a/src/gui/addnewtorrentdialog.cpp b/src/gui/addnewtorrentdialog.cpp index 7b90af8c8..3dff791fd 100644 --- a/src/gui/addnewtorrentdialog.cpp +++ b/src/gui/addnewtorrentdialog.cpp @@ -43,7 +43,6 @@ #include "base/bittorrent/torrenthandle.h" #include "base/global.h" #include "base/net/downloadmanager.h" -#include "base/preferences.h" #include "base/settingsstorage.h" #include "base/torrentfileguard.h" #include "base/utils/fs.h" diff --git a/src/gui/advancedsettings.cpp b/src/gui/advancedsettings.cpp index dd5d5139a..5def580b7 100644 --- a/src/gui/advancedsettings.cpp +++ b/src/gui/advancedsettings.cpp @@ -30,7 +30,6 @@ #include -#include #include #include #include diff --git a/src/gui/autoexpandabledialog.cpp b/src/gui/autoexpandabledialog.cpp index d8385f47b..be4074f89 100644 --- a/src/gui/autoexpandabledialog.cpp +++ b/src/gui/autoexpandabledialog.cpp @@ -28,9 +28,6 @@ #include "autoexpandabledialog.h" -#include - -#include "mainwindow.h" #include "ui_autoexpandabledialog.h" #include "utils.h" diff --git a/src/gui/categoryfilterwidget.cpp b/src/gui/categoryfilterwidget.cpp index 9bc7032c8..fda482e95 100644 --- a/src/gui/categoryfilterwidget.cpp +++ b/src/gui/categoryfilterwidget.cpp @@ -29,7 +29,6 @@ #include "categoryfilterwidget.h" #include -#include #include #include "base/bittorrent/session.h" diff --git a/src/gui/executionlogwidget.cpp b/src/gui/executionlogwidget.cpp index a561a53ca..301201994 100644 --- a/src/gui/executionlogwidget.cpp +++ b/src/gui/executionlogwidget.cpp @@ -28,7 +28,6 @@ #include "executionlogwidget.h" -#include #include #include diff --git a/src/gui/fspathedit.h b/src/gui/fspathedit.h index 87359a9c3..49c28f903 100644 --- a/src/gui/fspathedit.h +++ b/src/gui/fspathedit.h @@ -29,7 +29,6 @@ #ifndef QBT_FSPATHEDIT_H #define QBT_FSPATHEDIT_H -#include #include namespace Private diff --git a/src/gui/guiiconprovider.cpp b/src/gui/guiiconprovider.cpp index 1a2688814..a958ca24f 100644 --- a/src/gui/guiiconprovider.cpp +++ b/src/gui/guiiconprovider.cpp @@ -31,9 +31,7 @@ #include #include -#include #if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC)) -#include #include #endif diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index d27366f44..e6aabfdff 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -28,7 +28,6 @@ #include "mainwindow.h" -#include #include #include #include @@ -38,7 +37,6 @@ #include #include #include -#include #include #include #include @@ -71,7 +69,6 @@ #include "base/utils/password.h" #include "aboutdialog.h" #include "addnewtorrentdialog.h" -#include "application.h" #include "autoexpandabledialog.h" #include "cookiesdialog.h" #include "downloadfromurldialog.h" @@ -96,9 +93,6 @@ #include "ui_mainwindow.h" #include "utils.h" -#ifdef Q_OS_WIN -#include "base/net/downloadmanager.h" -#endif #ifdef Q_OS_MAC #include "macutilities.h" #endif diff --git a/src/gui/optionsdialog.cpp b/src/gui/optionsdialog.cpp index 5368ee190..ee1125d4a 100644 --- a/src/gui/optionsdialog.cpp +++ b/src/gui/optionsdialog.cpp @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -45,7 +44,6 @@ #include "base/bittorrent/session.h" #include "base/global.h" -#include "base/http/server.h" #include "base/net/dnsupdater.h" #include "base/net/portforwarder.h" #include "base/net/proxyconfigurationmanager.h" diff --git a/src/gui/programupdater.cpp b/src/gui/programupdater.cpp index 9e5b46e51..0611e1717 100644 --- a/src/gui/programupdater.cpp +++ b/src/gui/programupdater.cpp @@ -36,7 +36,6 @@ #include #include "base/net/downloadmanager.h" -#include "base/utils/fs.h" namespace { diff --git a/src/gui/programupdater.h b/src/gui/programupdater.h index f87836869..628a511bb 100644 --- a/src/gui/programupdater.h +++ b/src/gui/programupdater.h @@ -30,7 +30,6 @@ #define PROGRAMUPDATER_H #include -#include namespace Net { diff --git a/src/gui/properties/peerlistwidget.cpp b/src/gui/properties/peerlistwidget.cpp index f4cc47873..5cbfe5111 100644 --- a/src/gui/properties/peerlistwidget.cpp +++ b/src/gui/properties/peerlistwidget.cpp @@ -46,13 +46,11 @@ #include "base/net/geoipmanager.h" #include "base/net/reverseresolution.h" #include "base/preferences.h" -#include "base/unicodestrings.h" #include "guiiconprovider.h" #include "peerlistdelegate.h" #include "peerlistsortmodel.h" #include "peersadditiondialog.h" #include "propertieswidget.h" -#include "speedlimitdialog.h" PeerListWidget::PeerListWidget(PropertiesWidget *parent) : QTreeView(parent) diff --git a/src/gui/properties/proplistdelegate.cpp b/src/gui/properties/proplistdelegate.cpp index 9a1aa401d..75d8e058e 100644 --- a/src/gui/properties/proplistdelegate.cpp +++ b/src/gui/properties/proplistdelegate.cpp @@ -45,7 +45,6 @@ #include "base/utils/misc.h" #include "base/utils/string.h" #include "propertieswidget.h" -#include "torrentcontentmodelitem.h" namespace { diff --git a/src/gui/properties/trackerlistwidget.cpp b/src/gui/properties/trackerlistwidget.cpp index 0caa12ecf..72dffd7e1 100644 --- a/src/gui/properties/trackerlistwidget.cpp +++ b/src/gui/properties/trackerlistwidget.cpp @@ -49,7 +49,6 @@ #include "base/bittorrent/trackerentry.h" #include "base/global.h" #include "base/preferences.h" -#include "base/utils/misc.h" #include "autoexpandabledialog.h" #include "guiiconprovider.h" #include "propertieswidget.h" diff --git a/src/gui/properties/trackersadditiondialog.cpp b/src/gui/properties/trackersadditiondialog.cpp index d57c728f4..b2de95e16 100644 --- a/src/gui/properties/trackersadditiondialog.cpp +++ b/src/gui/properties/trackersadditiondialog.cpp @@ -36,8 +36,6 @@ #include "base/bittorrent/trackerentry.h" #include "base/global.h" #include "base/net/downloadmanager.h" -#include "base/utils/fs.h" -#include "base/utils/misc.h" #include "guiiconprovider.h" #include "ui_trackersadditiondialog.h" diff --git a/src/gui/rss/automatedrssdownloader.cpp b/src/gui/rss/automatedrssdownloader.cpp index b5179a33f..09112f244 100644 --- a/src/gui/rss/automatedrssdownloader.cpp +++ b/src/gui/rss/automatedrssdownloader.cpp @@ -30,7 +30,6 @@ #include "automatedrssdownloader.h" #include -#include #include #include #include diff --git a/src/gui/rss/rsswidget.cpp b/src/gui/rss/rsswidget.cpp index 2ca6f8d6a..552702c89 100644 --- a/src/gui/rss/rsswidget.cpp +++ b/src/gui/rss/rsswidget.cpp @@ -31,14 +31,12 @@ #include "rsswidget.h" #include -#include #include #include #include #include #include #include -#include #include #include "base/bittorrent/session.h" diff --git a/src/gui/rss/rsswidget.h b/src/gui/rss/rsswidget.h index a4e693f0c..3174782d6 100644 --- a/src/gui/rss/rsswidget.h +++ b/src/gui/rss/rsswidget.h @@ -31,7 +31,6 @@ #ifndef RSSWIDGET_H #define RSSWIDGET_H -#include #include class QShortcut; diff --git a/src/gui/search/searchlistdelegate.cpp b/src/gui/search/searchlistdelegate.cpp index 11b25c679..dabe1961d 100644 --- a/src/gui/search/searchlistdelegate.cpp +++ b/src/gui/search/searchlistdelegate.cpp @@ -28,10 +28,8 @@ #include "searchlistdelegate.h" -#include #include #include -#include #include #include "base/utils/misc.h" diff --git a/src/gui/search/searchwidget.cpp b/src/gui/search/searchwidget.cpp index 632802c00..3fac10a2c 100644 --- a/src/gui/search/searchwidget.cpp +++ b/src/gui/search/searchwidget.cpp @@ -36,30 +36,18 @@ #endif #include -#include #include -#include -#include #include #include -#include -#include #include -#include -#include "base/bittorrent/session.h" #include "base/global.h" -#include "base/preferences.h" #include "base/search/searchpluginmanager.h" #include "base/search/searchhandler.h" #include "base/utils/foreignapps.h" -#include "base/utils/fs.h" -#include "addnewtorrentdialog.h" #include "guiiconprovider.h" #include "mainwindow.h" #include "pluginselectdialog.h" -#include "searchlistdelegate.h" -#include "searchsortmodel.h" #include "searchjobwidget.h" #include "ui_searchwidget.h" diff --git a/src/gui/statusbar.cpp b/src/gui/statusbar.cpp index 8c6fd4ef2..4575812a2 100644 --- a/src/gui/statusbar.cpp +++ b/src/gui/statusbar.cpp @@ -39,7 +39,6 @@ #include "base/bittorrent/session.h" #include "base/bittorrent/sessionstatus.h" #include "base/utils/misc.h" -#include "guiiconprovider.h" #include "speedlimitdialog.h" #include "utils.h" diff --git a/src/gui/tagfilterwidget.cpp b/src/gui/tagfilterwidget.cpp index 453e4ea07..d9548373c 100644 --- a/src/gui/tagfilterwidget.cpp +++ b/src/gui/tagfilterwidget.cpp @@ -29,8 +29,6 @@ #include "tagfilterwidget.h" #include -#include -#include #include #include diff --git a/src/gui/torrentcontentmodel.cpp b/src/gui/torrentcontentmodel.cpp index 902ef34bb..fe938c17f 100644 --- a/src/gui/torrentcontentmodel.cpp +++ b/src/gui/torrentcontentmodel.cpp @@ -52,7 +52,6 @@ #include "base/bittorrent/torrentinfo.h" #include "base/global.h" #include "base/utils/fs.h" -#include "base/utils/misc.h" #include "guiiconprovider.h" #include "torrentcontentmodelfile.h" #include "torrentcontentmodelfolder.h" diff --git a/src/gui/torrentcontentmodelitem.cpp b/src/gui/torrentcontentmodelitem.cpp index a6dc0402f..bcec140b2 100644 --- a/src/gui/torrentcontentmodelitem.cpp +++ b/src/gui/torrentcontentmodelitem.cpp @@ -28,10 +28,6 @@ #include "torrentcontentmodelitem.h" -#include - -#include "base/utils/misc.h" -#include "base/utils/fs.h" #include "torrentcontentmodelfolder.h" TorrentContentModelItem::TorrentContentModelItem(TorrentContentModelFolder *parent) diff --git a/src/gui/torrentcreatordialog.cpp b/src/gui/torrentcreatordialog.cpp index 00f59c783..c219ce1ba 100644 --- a/src/gui/torrentcreatordialog.cpp +++ b/src/gui/torrentcreatordialog.cpp @@ -30,7 +30,6 @@ #include "torrentcreatordialog.h" #include -#include #include #include #include diff --git a/src/gui/transferlistfilterswidget.cpp b/src/gui/transferlistfilterswidget.cpp index 4ef93d883..580dbca25 100644 --- a/src/gui/transferlistfilterswidget.cpp +++ b/src/gui/transferlistfilterswidget.cpp @@ -29,7 +29,6 @@ #include "transferlistfilterswidget.h" #include -#include #include #include #include @@ -49,12 +48,9 @@ #include "base/torrentfilter.h" #include "base/utils/fs.h" #include "base/utils/string.h" -#include "autoexpandabledialog.h" #include "categoryfilterwidget.h" #include "guiiconprovider.h" #include "tagfilterwidget.h" -#include "transferlistdelegate.h" -#include "transferlistmodel.h" #include "transferlistwidget.h" #include "utils.h" diff --git a/src/gui/transferlistmodel.cpp b/src/gui/transferlistmodel.cpp index eb98486ac..db3263dc8 100644 --- a/src/gui/transferlistmodel.cpp +++ b/src/gui/transferlistmodel.cpp @@ -38,7 +38,6 @@ #include "base/bittorrent/session.h" #include "base/bittorrent/torrenthandle.h" #include "base/global.h" -#include "base/torrentfilter.h" #include "base/utils/fs.h" static QIcon getIconByState(BitTorrent::TorrentState state); diff --git a/src/webui/api/serialize/serialize_torrent.cpp b/src/webui/api/serialize/serialize_torrent.cpp index 621cbb09c..f90ee30b7 100644 --- a/src/webui/api/serialize/serialize_torrent.cpp +++ b/src/webui/api/serialize/serialize_torrent.cpp @@ -30,10 +30,8 @@ #include -#include "base/bittorrent/session.h" #include "base/bittorrent/torrenthandle.h" #include "base/utils/fs.h" -#include "base/utils/string.h" namespace { diff --git a/src/webui/api/synccontroller.cpp b/src/webui/api/synccontroller.cpp index f3f27090f..ce068bf1a 100644 --- a/src/webui/api/synccontroller.cpp +++ b/src/webui/api/synccontroller.cpp @@ -40,7 +40,6 @@ #include "base/global.h" #include "base/net/geoipmanager.h" #include "base/preferences.h" -#include "base/utils/fs.h" #include "base/utils/string.h" #include "apierror.h" #include "freediskspacechecker.h" From 70f8882f87e583df1350a6296f1c33ec17a35cbc Mon Sep 17 00:00:00 2001 From: thalieht Date: Tue, 4 Jun 2019 11:11:42 +0300 Subject: [PATCH 3/3] Group Qt forward declarations separately from the others --- src/base/profile.h | 1 + src/base/rss/rss_autodownloader.h | 1 + src/base/rss/rss_autodownloadrule.h | 1 + src/base/rss/rss_session.h | 1 + src/base/scanfoldersmodel.h | 1 + src/base/search/searchdownloadhandler.h | 1 + src/base/utils/misc.h | 1 + src/base/utils/string.h | 1 + src/gui/categoryfiltermodel.h | 1 + src/gui/optionsdialog.h | 1 + src/gui/properties/peerlistwidget.h | 14 +++++++------- src/gui/properties/proplistdelegate.h | 1 + src/gui/properties/speedwidget.h | 1 + src/gui/rss/rsswidget.h | 5 +++-- src/gui/scanfoldersdelegate.h | 1 + src/gui/tagfiltermodel.h | 1 + src/gui/torrentcontentmodel.h | 1 + src/gui/torrentcontentmodelitem.h | 1 + src/gui/transferlistfilterswidget.h | 1 + src/webui/api/searchcontroller.h | 1 + 20 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/base/profile.h b/src/base/profile.h index 290248105..ce52193de 100644 --- a/src/base/profile.h +++ b/src/base/profile.h @@ -35,6 +35,7 @@ #include class QString; + class Application; namespace Private diff --git a/src/base/rss/rss_autodownloader.h b/src/base/rss/rss_autodownloader.h index 91dfe424c..16f6ef48e 100644 --- a/src/base/rss/rss_autodownloader.h +++ b/src/base/rss/rss_autodownloader.h @@ -40,6 +40,7 @@ class QThread; class QTimer; + class Application; class AsyncFileStorage; struct ProcessingJob; diff --git a/src/base/rss/rss_autodownloadrule.h b/src/base/rss/rss_autodownloadrule.h index 15e22b735..f4078fc49 100644 --- a/src/base/rss/rss_autodownloadrule.h +++ b/src/base/rss/rss_autodownloadrule.h @@ -35,6 +35,7 @@ class QDateTime; class QJsonObject; class QRegularExpression; + class TriStateBool; namespace RSS diff --git a/src/base/rss/rss_session.h b/src/base/rss/rss_session.h index de7fdd44f..e4d8b945d 100644 --- a/src/base/rss/rss_session.h +++ b/src/base/rss/rss_session.h @@ -68,6 +68,7 @@ #include class QThread; + class Application; class AsyncFileStorage; diff --git a/src/base/scanfoldersmodel.h b/src/base/scanfoldersmodel.h index a2c3e2151..212899d9c 100644 --- a/src/base/scanfoldersmodel.h +++ b/src/base/scanfoldersmodel.h @@ -33,6 +33,7 @@ #include class QStringList; + class FileSystemWatcher; class ScanFoldersModel : public QAbstractListModel diff --git a/src/base/search/searchdownloadhandler.h b/src/base/search/searchdownloadhandler.h index 229768100..6220b47b0 100644 --- a/src/base/search/searchdownloadhandler.h +++ b/src/base/search/searchdownloadhandler.h @@ -31,6 +31,7 @@ #include class QProcess; + class SearchPluginManager; class SearchDownloadHandler : public QObject diff --git a/src/base/utils/misc.h b/src/base/utils/misc.h index 7c9a0e371..539df3048 100644 --- a/src/base/utils/misc.h +++ b/src/base/utils/misc.h @@ -37,6 +37,7 @@ #endif class QString; + enum class ShutdownDialogAction; /* Miscellaneous functions that can be useful */ diff --git a/src/base/utils/string.h b/src/base/utils/string.h index 5ad1bfbad..a04ac6fc3 100644 --- a/src/base/utils/string.h +++ b/src/base/utils/string.h @@ -33,6 +33,7 @@ #include class QString; + class TriStateBool; namespace Utils diff --git a/src/gui/categoryfiltermodel.h b/src/gui/categoryfiltermodel.h index f4f550e7a..aaad75f79 100644 --- a/src/gui/categoryfiltermodel.h +++ b/src/gui/categoryfiltermodel.h @@ -32,6 +32,7 @@ #include class QModelIndex; + class CategoryModelItem; namespace BitTorrent diff --git a/src/gui/optionsdialog.h b/src/gui/optionsdialog.h index 1565fdd19..f66cabcba 100644 --- a/src/gui/optionsdialog.h +++ b/src/gui/optionsdialog.h @@ -34,6 +34,7 @@ class QAbstractButton; class QCloseEvent; class QListWidgetItem; + class AdvancedSettings; // actions on double-click on torrents diff --git a/src/gui/properties/peerlistwidget.h b/src/gui/properties/peerlistwidget.h index 2dc7de4cb..f49c5ecf4 100644 --- a/src/gui/properties/peerlistwidget.h +++ b/src/gui/properties/peerlistwidget.h @@ -35,18 +35,18 @@ #include #include -namespace Net -{ - class ReverseResolution; -} +class QSortFilterProxyModel; +class QStandardItem; +class QStandardItemModel; class PeerListDelegate; class PeerListSortModel; class PropertiesWidget; -class QSortFilterProxyModel; -class QStandardItem; -class QStandardItemModel; +namespace Net +{ + class ReverseResolution; +} namespace BitTorrent { diff --git a/src/gui/properties/proplistdelegate.h b/src/gui/properties/proplistdelegate.h index dd5e54105..016fbac98 100644 --- a/src/gui/properties/proplistdelegate.h +++ b/src/gui/properties/proplistdelegate.h @@ -35,6 +35,7 @@ class QAbstractItemModel; class QModelIndex; class QPainter; class QStyleOptionViewItem; + class PropertiesWidget; // Defines for properties list columns diff --git a/src/gui/properties/speedwidget.h b/src/gui/properties/speedwidget.h index 79979b2a0..d8a9870ed 100644 --- a/src/gui/properties/speedwidget.h +++ b/src/gui/properties/speedwidget.h @@ -38,6 +38,7 @@ class QHBoxLayout; class QLabel; class QMenu; class QVBoxLayout; + class PropertiesWidget; class ComboBoxMenuButton : public QComboBox diff --git a/src/gui/rss/rsswidget.h b/src/gui/rss/rsswidget.h index 3174782d6..d0246ad3e 100644 --- a/src/gui/rss/rsswidget.h +++ b/src/gui/rss/rsswidget.h @@ -33,11 +33,12 @@ #include +class QListWidgetItem; class QShortcut; +class QTreeWidgetItem; + class ArticleListWidget; class FeedListWidget; -class QListWidgetItem; -class QTreeWidgetItem; namespace Ui { diff --git a/src/gui/scanfoldersdelegate.h b/src/gui/scanfoldersdelegate.h index 4d08a2fd2..086a00a67 100644 --- a/src/gui/scanfoldersdelegate.h +++ b/src/gui/scanfoldersdelegate.h @@ -36,6 +36,7 @@ class QModelIndex; class QPainter; class QStyleOptionViewItem; class QTreeView; + class PropertiesWidget; class ScanFoldersDelegate : public QItemDelegate diff --git a/src/gui/tagfiltermodel.h b/src/gui/tagfiltermodel.h index 1dd8fd38b..1fe5a9004 100644 --- a/src/gui/tagfiltermodel.h +++ b/src/gui/tagfiltermodel.h @@ -34,6 +34,7 @@ #include class QModelIndex; + class TagModelItem; namespace BitTorrent diff --git a/src/gui/torrentcontentmodel.h b/src/gui/torrentcontentmodel.h index 7d02189d4..60d2e30ab 100644 --- a/src/gui/torrentcontentmodel.h +++ b/src/gui/torrentcontentmodel.h @@ -37,6 +37,7 @@ class QFileIconProvider; class QModelIndex; class QVariant; + class TorrentContentModelFile; namespace BitTorrent diff --git a/src/gui/torrentcontentmodelitem.h b/src/gui/torrentcontentmodelitem.h index 49d0516a0..e246d4a1b 100644 --- a/src/gui/torrentcontentmodelitem.h +++ b/src/gui/torrentcontentmodelitem.h @@ -34,6 +34,7 @@ #include "base/bittorrent/downloadpriority.h" class QVariant; + class TorrentContentModelFolder; class TorrentContentModelItem diff --git a/src/gui/transferlistfilterswidget.h b/src/gui/transferlistfilterswidget.h index ce054b531..dcdf99300 100644 --- a/src/gui/transferlistfilterswidget.h +++ b/src/gui/transferlistfilterswidget.h @@ -34,6 +34,7 @@ class QCheckBox; class QResizeEvent; + class TransferListWidget; namespace BitTorrent diff --git a/src/webui/api/searchcontroller.h b/src/webui/api/searchcontroller.h index c2accaefc..bfbc34dcd 100644 --- a/src/webui/api/searchcontroller.h +++ b/src/webui/api/searchcontroller.h @@ -37,6 +37,7 @@ class QJsonArray; class QJsonObject; class QStringList; + struct ISession; struct SearchResult;