Merge pull request #10752 from thalieht/fw-declare

Forward declare and remove some unused #include

src/base/bittorrent/addtorrentparams.h

@@ -33,10 +33,11 @@
 #include <QVector>
 
 #include "../tristatebool.h"
-#include "downloadpriority.h"
 
 namespace BitTorrent
 {
+    enum class DownloadPriority;
+
     struct AddTorrentParams
     {
         QString name;

src/base/bittorrent/peerinfo.cpp

@@ -28,6 +28,8 @@
 
 #include "peerinfo.h"
 
+#include <QBitArray>
+
 #include "base/bittorrent/torrenthandle.h"
 #include "base/net/geoipmanager.h"
 #include "base/unicodestrings.h"

src/base/bittorrent/peerinfo.h

@@ -31,10 +31,11 @@
 
 #include <libtorrent/peer_info.hpp>
 
-#include <QBitArray>
 #include <QCoreApplication>
 #include <QHostAddress>
 
+class QBitArray;
+
 namespace BitTorrent
 {
     class TorrentHandle;

src/base/bittorrent/private/resumedatasavingmanager.cpp

@@ -29,7 +29,6 @@
 #include "resumedatasavingmanager.h"
 
 #include <QByteArray>
-#include <QDebug>
 #include <QSaveFile>
 
 #include "base/logger.h"

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

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"

src/base/bittorrent/torrenthandle.h

@@ -45,7 +45,6 @@
 #include <QVector>
 
 #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;

src/base/bittorrent/trackerentry.h

@@ -30,7 +30,6 @@
 #define BITTORRENT_TRACKERENTRY_H
 
 #include <libtorrent/announce_entry.hpp>
-#include <libtorrent/torrent_info.hpp>
 
 class QString;
 

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

src/base/http/connection.h

@@ -34,13 +34,12 @@
 #include <QElapsedTimer>
 #include <QObject>
 
-#include "types.h"
-
 class QTcpSocket;
 
 namespace Http
 {
     class IRequestHandler;
+    struct Response;
 
     class Connection : public QObject
     {

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:

src/base/http/responsegenerator.cpp

@@ -31,6 +31,7 @@
 
 #include <QDateTime>
 
+#include "base/http/types.h"
 #include "base/utils/gzip.h"
 
 QByteArray Http::toByteArray(Response response)

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);

src/base/net/downloadmanager.h

@@ -32,7 +32,6 @@
 
 #include <QHash>
 #include <QNetworkAccessManager>
-#include <QNetworkRequest>
 #include <QObject>
 #include <QQueue>
 #include <QSet>

src/base/net/geoipmanager.cpp

@@ -30,7 +30,6 @@
 #include "geoipmanager.h"
 
 #include <QDateTime>
-#include <QDebug>
 #include <QDir>
 #include <QFile>
 #include <QHostAddress>

src/base/net/geoipmanager.h

@@ -30,7 +30,6 @@
 #ifndef NET_GEOIPMANAGER_H
 #define NET_GEOIPMANAGER_H
 
-#include <QCache>
 #include <QObject>
 
 class QHostAddress;

src/base/net/private/geoipdatabase.cpp

@@ -32,7 +32,6 @@
 #include <QHostAddress>
 #include <QVariant>
 
-#include "base/types.h"
 #include "geoipdatabase.h"
 
 namespace

src/base/net/smtp.h

@@ -36,7 +36,6 @@
 #include <QAbstractSocket>
 #include <QByteArray>
 #include <QHash>
-#include <QMetaType>
 #include <QObject>
 #include <QString>
 

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;
 

src/base/preferences.h

@@ -31,13 +31,13 @@
 #define PREFERENCES_H
 
 #include <QList>
-#include <QStringList>
 
 #include "base/utils/net.h"
 
 class QDateTime;
 class QNetworkCookie;
 class QSize;
+class QStringList;
 class QTime;
 class QVariant;
 

src/base/profile.h

@@ -35,6 +35,7 @@
 #include <QSettings>
 
 class QString;
+
 class Application;
 
 namespace Private

src/base/rss/rss_autodownloader.cpp

@@ -30,7 +30,6 @@
 
 #include <QDataStream>
 #include <QDebug>
-#include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonValue>

src/base/rss/rss_autodownloader.h

@@ -40,6 +40,7 @@
 
 class QThread;
 class QTimer;
+
 class Application;
 class AsyncFileStorage;
 struct ProcessingJob;

src/base/rss/rss_autodownloadrule.cpp

@@ -32,7 +32,6 @@
 #include <algorithm>
 
 #include <QDebug>
-#include <QDir>
 #include <QHash>
 #include <QJsonArray>
 #include <QJsonObject>

src/base/rss/rss_autodownloadrule.h

@@ -35,6 +35,7 @@
 class QDateTime;
 class QJsonObject;
 class QRegularExpression;
+
 class TriStateBool;
 
 namespace RSS

src/base/rss/rss_session.cpp

@@ -31,14 +31,12 @@
 #include "rss_session.h"
 
 #include <QDebug>
-#include <QDir>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonValue>
 #include <QSaveFile>
 #include <QString>
 #include <QThread>
-#include <QVariantHash>
 
 #include "../asyncfilestorage.h"
 #include "../global.h"

src/base/rss/rss_session.h

@@ -68,6 +68,7 @@
 #include <QTimer>
 
 class QThread;
+
 class Application;
 class AsyncFileStorage;
 

src/base/scanfoldersmodel.h

@@ -33,6 +33,7 @@
 #include <QList>
 
 class QStringList;
+
 class FileSystemWatcher;
 
 class ScanFoldersModel : public QAbstractListModel

src/base/search/searchdownloadhandler.h

@@ -31,6 +31,7 @@
 #include <QObject>
 
 class QProcess;
+
 class SearchPluginManager;
 
 class SearchDownloadHandler : public QObject

src/base/search/searchpluginmanager.cpp

@@ -31,7 +31,6 @@
 
 #include <memory>
 
-#include <QDebug>
 #include <QDir>
 #include <QDirIterator>
 #include <QDomDocument>

src/base/utils/fs.cpp

@@ -49,7 +49,6 @@
 #include <unistd.h>
 #endif
 
-#include <QCoreApplication>
 #include <QDebug>
 #include <QDir>
 #include <QDirIterator>

src/base/utils/misc.h

@@ -37,6 +37,7 @@
 #endif
 
 class QString;
+
 enum class ShutdownDialogAction;
 
 /*  Miscellaneous functions that can be useful */

src/base/utils/password.cpp

@@ -37,7 +37,6 @@
 
 #include "bytearray.h"
 #include "random.h"
-#include "string.h"
 
 namespace Utils
 {

src/base/utils/string.h

@@ -31,7 +31,8 @@
 #define UTILS_STRING_H
 
 #include <QLatin1String>
-#include <QString>
+
+class QString;
 
 class TriStateBool;