Reduce includes

src/tidal/tidalbaserequest.cpp

@@ -29,11 +29,11 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QSslError>
-#include <QJsonParseError>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
+#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/network.h"

src/tidal/tidalbaserequest.h

@@ -24,27 +24,22 @@
 
 #include <QtGlobal>
 #include <QObject>
+#include <QSet>
 #include <QList>
 #include <QPair>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
+#include <QStringList>
 #include <QUrl>
-#include <QNetworkReply>
 #include <QSslError>
 #include <QJsonObject>
-#include <QJsonArray>
 #include <QJsonValue>
 
-#include "core/song.h"
-#include "internet/internetservices.h"
-#include "internet/internetservice.h"
-#include "internet/internetsearch.h"
 #include "tidalservice.h"
 
-class Application;
+class QNetworkReply;
 class NetworkAccessManager;
-class TidalUrlHandler;
-class CollectionBackend;
-class CollectionModel;
 
 class TidalBaseRequest : public QObject {
   Q_OBJECT

src/tidal/tidalfavoriterequest.cpp

@@ -19,9 +19,11 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QObject>
 #include <QPair>
 #include <QList>
+#include <QMap>
 #include <QMultiMap>
 #include <QByteArray>
 #include <QString>
@@ -30,7 +32,7 @@
 #include <QUrlQuery>
 #include <QNetworkRequest>
 #include <QNetworkReply>
-#include <QJsonObject>
+#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/network.h"

src/tidal/tidalfavoriterequest.h

@@ -24,8 +24,8 @@
 
 #include <QObject>
 #include <QList>
+#include <QVariant>
 #include <QString>
-#include <QStringList>
 
 #include "tidalbaserequest.h"
 #include "core/song.h"

src/tidal/tidalrequest.cpp

@@ -24,10 +24,12 @@
 #include <QString>
 #include <QUrl>
 #include <QImage>
+#include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
+#include <QtDebug>
 
 #include "core/closure.h"
 #include "core/logging.h"
@@ -38,6 +40,7 @@
 #include "covermanager/albumcoverloader.h"
 #include "tidalservice.h"
 #include "tidalurlhandler.h"
+#include "tidalbaserequest.h"
 #include "tidalrequest.h"
 
 const char *TidalRequest::kResourcesUrl = "https://resources.tidal.com";

src/tidal/tidalrequest.h

@@ -25,22 +25,23 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QPair>
+#include <QSet>
 #include <QList>
 #include <QHash>
 #include <QMap>
 #include <QMultiMap>
 #include <QQueue>
+#include <QVariant>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
-#include <QNetworkReply>
 #include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonValue>
 
 #include "core/song.h"
 #include "tidalbaserequest.h"
 
+class QNetworkReply;
+class Application;
 class NetworkAccessManager;
 class TidalService;
 class TidalUrlHandler;

src/tidal/tidalservice.cpp

@@ -28,17 +28,19 @@
 #include <QPair>
 #include <QList>
 #include <QString>
+#include <QChar>
 #include <QUrl>
 #include <QUrlQuery>
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QSslError>
 #include <QTimer>
-#include <QJsonParseError>
+#include <QJsonValue>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QSettings>
 #include <QSortFilterProxyModel>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/player.h"
@@ -53,9 +55,11 @@
 #include "collection/collectionmodel.h"
 #include "tidalservice.h"
 #include "tidalurlhandler.h"
+#include "tidalbaserequest.h"
 #include "tidalrequest.h"
 #include "tidalfavoriterequest.h"
 #include "tidalstreamurlrequest.h"
+#include "settings/settingsdialog.h"
 #include "settings/tidalsettingspage.h"
 
 using std::shared_ptr;

src/tidal/tidalservice.h

@@ -27,19 +27,25 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QPair>
+#include <QSet>
 #include <QList>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
-#include <QNetworkReply>
-#include <QTimer>
-#include <QSortFilterProxyModel>
+#include <QDateTime>
+#include <QSslError>
 
 #include "core/song.h"
 #include "internet/internetservice.h"
 #include "internet/internetsearch.h"
 #include "settings/tidalsettingspage.h"
 
+class QSortFilterProxyModel;
+class QNetworkReply;
+class QTimer;
+
 class Application;
 class NetworkAccessManager;
 class TidalUrlHandler;

src/tidal/tidalstreamurlrequest.cpp

@@ -22,15 +22,20 @@
 #include <QObject>
 #include <QStandardPaths>
 #include <QMimeDatabase>
+#include <QMimeType>
+#include <QIODevice>
 #include <QFile>
 #include <QDir>
 #include <QList>
 #include <QByteArray>
 #include <QString>
 #include <QUrl>
+#include <QNetworkReply>
 #include <QJsonValue>
 #include <QJsonObject>
+#include <QJsonArray>
 #include <QXmlStreamReader>
+#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/network.h"

src/tidal/tidalstreamurlrequest.h

@@ -22,18 +22,20 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QObject>
+#include <QVariant>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
 
 #include "core/song.h"
+#include "tidalservice.h"
 #include "tidalbaserequest.h"
 #include "settings/tidalsettingspage.h"
 
 class QNetworkReply;
 class NetworkAccessManager;
-class TidalService;
 
 class TidalStreamURLRequest : public TidalBaseRequest {
   Q_OBJECT

src/tidal/tidalurlhandler.cpp

@@ -23,8 +23,6 @@
 
 #include "core/application.h"
 #include "core/taskmanager.h"
-#include "core/iconloader.h"
-#include "core/logging.h"
 #include "core/song.h"
 #include "tidal/tidalservice.h"
 #include "tidalurlhandler.h"

src/tidal/tidalurlhandler.h

@@ -20,6 +20,7 @@
 #ifndef TIDALURLHANDLER_H
 #define TIDALURLHANDLER_H
 
+#include <QtGlobal>
 #include <QObject>
 #include <QString>
 #include <QUrl>
@@ -29,7 +30,6 @@
 #include "tidal/tidalservice.h"
 
 class Application;
-class TidalService;
 
 class TidalUrlHandler : public UrlHandler {
   Q_OBJECT