Change to NetworkAccessManager

src/covermanager/albumcoverfetcher.cpp

@@ -22,7 +22,6 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QNetworkAccessManager>
 #include <QTimer>
 #include <QString>
 #include <QImage>
@@ -34,7 +33,7 @@
 
 const int AlbumCoverFetcher::kMaxConcurrentRequests = 5;
 
-AlbumCoverFetcher::AlbumCoverFetcher(CoverProviders *cover_providers, QObject *parent, QNetworkAccessManager *network)
+AlbumCoverFetcher::AlbumCoverFetcher(CoverProviders *cover_providers, QObject *parent, NetworkAccessManager *network)
     : QObject(parent),
       cover_providers_(cover_providers),
       network_(network ? network : new NetworkAccessManager(this)),

src/covermanager/albumcoverfetcher.h

@@ -35,7 +35,7 @@
 #include <QImage>
 
 class QTimer;
-class QNetworkAccessManager;
+class NetworkAccessManager;
 class CoverProviders;
 class AlbumCoverFetcherSearch;
 struct CoverSearchStatistics;
@@ -103,7 +103,7 @@ class AlbumCoverFetcher : public QObject {
   Q_OBJECT
 
  public:
-  explicit AlbumCoverFetcher(CoverProviders *cover_providers, QObject *parent = nullptr, QNetworkAccessManager *network = nullptr);
+  explicit AlbumCoverFetcher(CoverProviders *cover_providers, QObject *parent = nullptr, NetworkAccessManager *network = nullptr);
   ~AlbumCoverFetcher() override;
 
   static const int kMaxConcurrentRequests;
@@ -126,7 +126,7 @@ class AlbumCoverFetcher : public QObject {
   void AddRequest(const CoverSearchRequest &req);
 
   CoverProviders *cover_providers_;
-  QNetworkAccessManager *network_;
+  NetworkAccessManager *network_;
   quint64 next_id_;
 
   QQueue<CoverSearchRequest> queued_requests_;

src/covermanager/albumcoverfetchersearch.cpp

@@ -34,13 +34,13 @@
 #include <QUrl>
 #include <QImage>
 #include <QImageReader>
-#include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QtDebug>
 
 #include "core/logging.h"
 #include "core/utilities.h"
+#include "core/network.h"
 #include "core/networktimeouts.h"
 #include "albumcoverfetcher.h"
 #include "albumcoverfetchersearch.h"
@@ -52,8 +52,7 @@ const int AlbumCoverFetcherSearch::kImageLoadTimeoutMs = 6000;
 const int AlbumCoverFetcherSearch::kTargetSize = 500;
 const float AlbumCoverFetcherSearch::kGoodScore = 4.0;
 
-AlbumCoverFetcherSearch::AlbumCoverFetcherSearch(
+AlbumCoverFetcherSearch::AlbumCoverFetcherSearch(const CoverSearchRequest &request, NetworkAccessManager *network, QObject *parent)
-    const CoverSearchRequest &request, QNetworkAccessManager *network, QObject *parent)
     : QObject(parent),
       request_(request),
       image_load_timeout_(new NetworkTimeouts(kImageLoadTimeoutMs, this)),

src/covermanager/albumcoverfetchersearch.h

@@ -36,10 +36,10 @@
 #include "albumcoverfetcher.h"
 #include "coversearchstatistics.h"
 
-class QNetworkAccessManager;
 class QNetworkReply;
 class CoverProvider;
 class CoverProviders;
+class NetworkAccessManager;
 class NetworkTimeouts;
 
 // This class encapsulates a single search for covers initiated by an AlbumCoverFetcher.
@@ -49,7 +49,7 @@ class AlbumCoverFetcherSearch : public QObject {
   Q_OBJECT
 
  public:
-  explicit AlbumCoverFetcherSearch(const CoverSearchRequest &request, QNetworkAccessManager *network, QObject *parent);
+  explicit AlbumCoverFetcherSearch(const CoverSearchRequest &request, NetworkAccessManager *network, QObject *parent);
   ~AlbumCoverFetcherSearch() override;
 
   void Start(CoverProviders *cover_providers);
@@ -107,7 +107,7 @@ class AlbumCoverFetcherSearch : public QObject {
   typedef QPair<CoverSearchResult, QImage> CandidateImage;
   QMultiMap<float, CandidateImage> candidate_images_;
 
-  QNetworkAccessManager *network_;
+  NetworkAccessManager *network_;
 
   bool cancel_requested_;
 

src/covermanager/deezercoverprovider.h

@@ -32,7 +32,7 @@
 
 #include "jsoncoverprovider.h"
 
-class QNetworkAccessManager;
+class NetworkAccessManager;
 class QNetworkReply;
 class Application;
 
@@ -58,7 +58,7 @@ class DeezerCoverProvider : public JsonCoverProvider {
   static const char *kApiUrl;
   static const int kLimit;
 
-  QNetworkAccessManager *network_;
+  NetworkAccessManager *network_;
   QList<QNetworkReply*> replies_;
 
 };

src/covermanager/discogscoverprovider.h

@@ -40,7 +40,7 @@
 #include "jsoncoverprovider.h"
 #include "albumcoverfetcher.h"
 
-class QNetworkAccessManager;
+class NetworkAccessManager;
 class QNetworkReply;
 class QTimer;
 class Application;
@@ -99,7 +99,7 @@ class DiscogsCoverProvider : public JsonCoverProvider {
   static const char *kSecretKeyB64;
   static const int kRequestsDelay;
 
-  QNetworkAccessManager *network_;
+  NetworkAccessManager *network_;
   QTimer *timer_flush_requests_;
   QQueue<std::shared_ptr<DiscogsCoverSearchContext>> queue_search_requests_;
   QQueue<DiscogsCoverReleaseContext> queue_release_requests_;

src/covermanager/lastfmcoverprovider.h

@@ -31,7 +31,7 @@
 
 #include "jsoncoverprovider.h"
 
-class QNetworkAccessManager;
+class NetworkAccessManager;
 class QNetworkReply;
 class Application;
 
@@ -65,7 +65,7 @@ class LastFmCoverProvider : public JsonCoverProvider {
   static const char *kApiKey;
   static const char *kSecret;
 
-  QNetworkAccessManager *network_;
+  NetworkAccessManager *network_;
   QList<QNetworkReply*> replies_;
 
 };

src/covermanager/musicbrainzcoverprovider.h

@@ -32,10 +32,10 @@
 
 #include "jsoncoverprovider.h"
 
-class QNetworkAccessManager;
 class QNetworkReply;
 class QTimer;
 class Application;
+class NetworkAccessManager;
 
 class MusicbrainzCoverProvider : public JsonCoverProvider {
   Q_OBJECT
@@ -68,7 +68,7 @@ class MusicbrainzCoverProvider : public JsonCoverProvider {
   static const int kLimit;
   static const int kRequestsDelay;
 
-  QNetworkAccessManager *network_;
+  NetworkAccessManager *network_;
   QTimer *timer_flush_requests_;
   QQueue<SearchRequest> queue_search_requests_;
   QList<QNetworkReply*> replies_;

src/covermanager/musixmatchcoverprovider.h

@@ -30,8 +30,8 @@
 
 #include "jsoncoverprovider.h"
 
-class QNetworkAccessManager;
 class QNetworkReply;
+class NetworkAccessManager;
 
 class MusixmatchCoverProvider : public JsonCoverProvider {
   Q_OBJECT
@@ -50,7 +50,7 @@ class MusixmatchCoverProvider : public JsonCoverProvider {
   void HandleSearchReply(QNetworkReply *reply, const int id, const QString &artist, const QString &album);
 
  private:
-  QNetworkAccessManager *network_;
+  NetworkAccessManager *network_;
   QList<QNetworkReply*> replies_;
 
 };

src/covermanager/qobuzcoverprovider.h

@@ -33,9 +33,9 @@
 #include "jsoncoverprovider.h"
 #include "qobuz/qobuzservice.h"
 
-class QNetworkAccessManager;
 class QNetworkReply;
 class Application;
+class NetworkAccessManager;
 class QobuzService;
 
 class QobuzCoverProvider : public JsonCoverProvider {
@@ -65,7 +65,7 @@ class QobuzCoverProvider : public JsonCoverProvider {
   static const int kLimit;
 
   QobuzService *service_;
-  QNetworkAccessManager *network_;
+  NetworkAccessManager *network_;
   QList<QNetworkReply*> replies_;
 
   QString username_;

src/covermanager/spotifycoverprovider.h

@@ -36,9 +36,9 @@
 
 #include "jsoncoverprovider.h"
 
-class QNetworkAccessManager;
 class QNetworkReply;
 class Application;
+class NetworkAccessManager;
 class LocalRedirectServer;
 
 class SpotifyCoverProvider : public JsonCoverProvider {
@@ -80,7 +80,7 @@ class SpotifyCoverProvider : public JsonCoverProvider {
   static const char *kApiUrl;
   static const int kLimit;
 
-  QNetworkAccessManager *network_;
+  NetworkAccessManager *network_;
   LocalRedirectServer *server_;
   QStringList login_errors_;
   QString code_verifier_;

src/covermanager/tidalcoverprovider.h

@@ -35,9 +35,9 @@
 #include "jsoncoverprovider.h"
 #include "tidal/tidalservice.h"
 
-class QNetworkAccessManager;
 class QNetworkReply;
 class Application;
+class NetworkAccessManager;
 
 class TidalCoverProvider : public JsonCoverProvider {
   Q_OBJECT
@@ -65,7 +65,7 @@ class TidalCoverProvider : public JsonCoverProvider {
   static const int kLimit;
 
   TidalService *service_;
-  QNetworkAccessManager *network_;
+  NetworkAccessManager *network_;
   QList<QNetworkReply*> replies_;
 
 };

src/lyrics/auddlyricsprovider.h

@@ -32,8 +32,8 @@
 #include "jsonlyricsprovider.h"
 #include "lyricsfetcher.h"
 
-class QNetworkAccessManager;
 class QNetworkReply;
+class NetworkAccessManager;
 
 class AuddLyricsProvider : public JsonLyricsProvider {
   Q_OBJECT
@@ -56,7 +56,7 @@ class AuddLyricsProvider : public JsonLyricsProvider {
   static const char *kUrlSearch;
   static const char *kAPITokenB64;
   static const int kMaxLength;
-  QNetworkAccessManager *network_;
+  NetworkAccessManager *network_;
   QList<QNetworkReply*> replies_;
 
 };

src/lyrics/chartlyricsprovider.h

@@ -30,8 +30,8 @@
 #include "lyricsprovider.h"
 #include "lyricsfetcher.h"
 
-class QNetworkAccessManager;
 class QNetworkReply;
+class NetworkAccessManager;
 
 class ChartLyricsProvider : public LyricsProvider {
   Q_OBJECT
@@ -52,7 +52,7 @@ class ChartLyricsProvider : public LyricsProvider {
  private:
   static const char *kUrlSearch;
 
-  QNetworkAccessManager *network_;
+  NetworkAccessManager *network_;
   QList<QNetworkReply*> replies_;
 
 };

src/lyrics/geniuslyricsprovider.h

@@ -38,9 +38,8 @@
 #include "jsonlyricsprovider.h"
 #include "lyricsfetcher.h"
 
-class QNetworkAccessManager;
 class QNetworkReply;
-
+class NetworkAccessManager;
 class LocalRedirectServer;
 
 class GeniusLyricsProvider : public JsonLyricsProvider {
@@ -96,7 +95,7 @@ class GeniusLyricsProvider : public JsonLyricsProvider {
   static const char *kUrlSearch;
 
  private:
-  QNetworkAccessManager *network_;
+  NetworkAccessManager *network_;
   LocalRedirectServer *server_;
   QString code_verifier_;
   QString code_challenge_;

src/lyrics/lololyricsprovider.h

@@ -30,8 +30,8 @@
 
 #include "lyricsprovider.h"
 
-class QNetworkAccessManager;
 class QNetworkReply;
+class NetworkAccessManager;
 
 class LoloLyricsProvider : public LyricsProvider {
   Q_OBJECT
@@ -51,7 +51,7 @@ class LoloLyricsProvider : public LyricsProvider {
 
  private:
   static const char *kUrlSearch;
-  QNetworkAccessManager *network_;
+  NetworkAccessManager *network_;
   QList<QNetworkReply*> replies_;
 
 };

src/lyrics/musixmatchlyricsprovider.h

@@ -31,8 +31,8 @@
 #include "jsonlyricsprovider.h"
 #include "lyricsfetcher.h"
 
-class QNetworkAccessManager;
 class QNetworkReply;
+class NetworkAccessManager;
 
 class MusixmatchLyricsProvider : public JsonLyricsProvider {
   Q_OBJECT
@@ -51,7 +51,7 @@ class MusixmatchLyricsProvider : public JsonLyricsProvider {
   void HandleSearchReply(QNetworkReply *reply, const quint64 id, const QString &artist, const QString &album, const QString &title);
 
  private:
-  QNetworkAccessManager *network_;
+  NetworkAccessManager *network_;
   QList<QNetworkReply*> replies_;
 
 };

src/lyrics/ovhlyricsprovider.h

@@ -30,8 +30,8 @@
 
 #include "jsonlyricsprovider.h"
 
-class QNetworkAccessManager;
 class QNetworkReply;
+class NetworkAccessManager;
 
 class OVHLyricsProvider : public JsonLyricsProvider {
   Q_OBJECT
@@ -51,7 +51,7 @@ class OVHLyricsProvider : public JsonLyricsProvider {
 
  private:
   static const char *kUrlSearch;
-  QNetworkAccessManager *network_;
+  NetworkAccessManager *network_;
   QList<QNetworkReply*> replies_;
 
 };

src/musicbrainz/acoustidclient.h

@@ -28,8 +28,8 @@
 #include <QString>
 #include <QStringList>
 
-class QNetworkAccessManager;
 class QNetworkReply;
+class NetworkAccessManager;
 class NetworkTimeouts;
 
 class AcoustidClient : public QObject {
@@ -68,7 +68,7 @@ class AcoustidClient : public QObject {
   static const char *kUrl;
   static const int kDefaultTimeout;
 
-  QNetworkAccessManager *network_;
+  NetworkAccessManager *network_;
   NetworkTimeouts *timeouts_;
   QMap<int, QNetworkReply*> requests_;