Reduce includes

src/qobuz/qobuzbaserequest.cpp

@@ -19,6 +19,8 @@
 
 #include "config.h"
 
+#include <algorithm>
+
 #include <QObject>
 #include <QByteArray>
 #include <QPair>
@@ -28,13 +30,12 @@
 #include <QUrlQuery>
 #include <QNetworkRequest>
 #include <QNetworkReply>
-#include <QJsonParseError>
+#include <QSslError>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
 
-#include "core/logging.h"
 #include "core/network.h"
 #include "qobuzservice.h"
 #include "qobuzbaserequest.h"

src/qobuz/qobuzbaserequest.h

@@ -24,26 +24,21 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QList>
 #include <QPair>
+#include <QSet>
+#include <QList>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
-#include <QUrl>
-#include <QNetworkReply>
+#include <QStringList>
 #include <QJsonObject>
-#include <QJsonArray>
 #include <QJsonValue>
 
 #include "core/song.h"
-#include "internet/internetservices.h"
-#include "internet/internetservice.h"
-#include "internet/internetsearch.h"
 #include "qobuzservice.h"
 
-class Application;
+class QNetworkReply;
 class NetworkAccessManager;
-class QobuzUrlHandler;
-class CollectionBackend;
-class CollectionModel;
 
 class QobuzBaseRequest : public QObject {
   Q_OBJECT

src/qobuz/qobuzfavoriterequest.cpp

@@ -27,6 +27,7 @@
 #include <QUrl>
 #include <QUrlQuery>
 #include <QNetworkReply>
+#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/network.h"

src/qobuz/qobuzrequest.cpp

@@ -21,14 +21,15 @@
 
 #include <QObject>
 #include <QByteArray>
-#include <QDir>
 #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"
@@ -39,6 +40,7 @@
 #include "covermanager/albumcoverloader.h"
 #include "qobuzservice.h"
 #include "qobuzurlhandler.h"
+#include "qobuzbaserequest.h"
 #include "qobuzrequest.h"
 
 const int QobuzRequest::kMaxConcurrentArtistsRequests = 3;

src/qobuz/qobuzrequest.h

@@ -25,22 +25,22 @@
 #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 "qobuzbaserequest.h"
 
+class QNetworkReply;
 class Application;
 class NetworkAccessManager;
 class QobuzService;

src/qobuz/qobuzservice.cpp

@@ -22,8 +22,6 @@
 #include <memory>
 
 #include <QObject>
-#include <QDesktopServices>
-#include <QCryptographicHash>
 #include <QByteArray>
 #include <QPair>
 #include <QList>
@@ -33,11 +31,13 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QTimer>
-#include <QJsonParseError>
+#include <QJsonValue>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QSettings>
 #include <QSortFilterProxyModel>
+#include <QSslError>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/player.h"
@@ -52,9 +52,11 @@
 #include "collection/collectionmodel.h"
 #include "qobuzservice.h"
 #include "qobuzurlhandler.h"
+#include "qobuzbaserequest.h"
 #include "qobuzrequest.h"
 #include "qobuzfavoriterequest.h"
 #include "qobuzstreamurlrequest.h"
+#include "settings/settingsdialog.h"
 #include "settings/qobuzsettingspage.h"
 
 using std::shared_ptr;

src/qobuz/qobuzservice.h

@@ -27,19 +27,22 @@
 #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 <QSslError>
 
 #include "core/song.h"
 #include "internet/internetservice.h"
 #include "internet/internetsearch.h"
-#include "settings/qobuzsettingspage.h"
 
-class QThread;
+class QTimer;
+class QNetworkReply;
+class QSortFilterProxyModel;
 class Application;
 class NetworkAccessManager;
 class QobuzUrlHandler;

src/qobuz/qobuzstreamurlrequest.cpp

@@ -19,23 +19,28 @@
 
 #include "config.h"
 
+#include <algorithm>
+
 #include <QObject>
 #include <QMimeDatabase>
-#include <QFile>
-#include <QDir>
+#include <QMimeType>
+#include <QPair>
 #include <QList>
 #include <QByteArray>
 #include <QString>
+#include <QChar>
 #include <QUrl>
 #include <QDateTime>
+#include <QNetworkReply>
+#include <QCryptographicHash>
 #include <QJsonValue>
 #include <QJsonObject>
+#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/network.h"
 #include "core/song.h"
 #include "core/timeconstants.h"
-#include "settings/qobuzsettingspage.h"
 #include "qobuzservice.h"
 #include "qobuzbaserequest.h"
 #include "qobuzstreamurlrequest.h"

src/qobuz/qobuzstreamurlrequest.h

@@ -22,7 +22,9 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QObject>
+#include <QVariant>
 #include <QString>
 #include <QStringList>
 #include <QUrl>

src/qobuz/qobuzurlhandler.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 "qobuz/qobuzservice.h"
 #include "qobuzurlhandler.h"

src/qobuz/qobuzurlhandler.h

@@ -20,6 +20,7 @@
 #ifndef QOBUZURLHANDLER_H
 #define QOBUZURLHANDLER_H
 
+#include <QtGlobal>
 #include <QObject>
 #include <QString>
 #include <QUrl>
@@ -29,7 +30,6 @@
 #include "qobuz/qobuzservice.h"
 
 class Application;
-class QobuzService;
 
 class QobuzUrlHandler : public UrlHandler {
   Q_OBJECT