Rename network to networkaccessmanager

src/CMakeLists.txt

@@ -18,7 +18,7 @@ set(SOURCES
   core/mergedproxymodel.cpp
   core/multisortfilterproxy.cpp
   core/musicstorage.cpp
-  core/network.cpp
+  core/networkaccessmanager.cpp
   core/threadsafenetworkdiskcache.cpp
   core/networktimeouts.cpp
   core/networkproxyfactory.cpp
@@ -257,7 +257,7 @@ set(HEADERS
   core/deletefiles.h
   core/filesystemwatcherinterface.h
   core/mergedproxymodel.h
-  core/network.h
+  core/networkaccessmanager.h
   core/threadsafenetworkdiskcache.h
   core/networktimeouts.h
   core/qtfslistener.h

src/core/mainwindow.cpp

@@ -72,7 +72,7 @@
 
 #include "core/logging.h"
 #include "core/closure.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 
 #include "mainwindow.h"
 #include "ui_mainwindow.h"

src/core/networkaccessmanager.cpp

@@ -31,7 +31,7 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 
-#include "network.h"
+#include "networkaccessmanager.h"
 #include "threadsafenetworkdiskcache.h"
 
 NetworkAccessManager::NetworkAccessManager(QObject *parent)

src/core/networkaccessmanager.h

@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef NETWORK_H
-#define NETWORK_H
+#ifndef NETWORKACCESSMANAGER_H
+#define NETWORKACCESSMANAGER_H
 
 #include "config.h"
 
@@ -42,4 +42,4 @@ class NetworkAccessManager : public QNetworkAccessManager {
   QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData) override;
 };
 
-#endif  // NETWORK_H
+#endif  // NETWORKACCESSMANAGER_H

src/covermanager/albumcoverfetcher.cpp

@@ -27,7 +27,7 @@
 #include <QString>
 #include <QImage>
 
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/song.h"
 #include "albumcoverfetcher.h"
 #include "albumcoverfetchersearch.h"

src/covermanager/albumcoverfetchersearch.cpp

@@ -40,7 +40,7 @@
 
 #include "core/logging.h"
 #include "core/utilities.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/networktimeouts.h"
 #include "albumcoverfetcher.h"
 #include "albumcoverfetchersearch.h"

src/covermanager/albumcoverloader.cpp

@@ -42,7 +42,7 @@
 #include <QNetworkRequest>
 #include <QSettings>
 
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/song.h"
 #include "core/tagreaderclient.h"
 #include "core/utilities.h"

src/covermanager/coverfromurldialog.cpp

@@ -31,7 +31,7 @@
 #include <QNetworkRequest>
 #include <QUrl>
 
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "widgets/busyindicator.h"
 #include "coverfromurldialog.h"
 #include "ui_coverfromurldialog.h"

src/covermanager/deezercoverprovider.cpp

@@ -42,7 +42,7 @@
 #include <QtDebug>
 
 #include "core/application.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/logging.h"
 #include "core/song.h"
 #include "albumcoverfetcher.h"

src/covermanager/discogscoverprovider.cpp

@@ -50,7 +50,7 @@
 
 #include "core/application.h"
 #include "core/logging.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/utilities.h"
 #include "albumcoverfetcher.h"
 #include "jsoncoverprovider.h"

src/covermanager/lastfmcoverprovider.cpp

@@ -42,7 +42,7 @@
 #include <QtDebug>
 
 #include "core/application.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/logging.h"
 
 #include "jsoncoverprovider.h"

src/covermanager/musicbrainzcoverprovider.cpp

@@ -40,7 +40,7 @@
 #include <QtDebug>
 
 #include "core/application.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/logging.h"
 #include "albumcoverfetcher.h"
 #include "jsoncoverprovider.h"

src/covermanager/musixmatchcoverprovider.cpp

@@ -35,7 +35,7 @@
 #include <QtDebug>
 
 #include "core/logging.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "albumcoverfetcher.h"
 #include "jsoncoverprovider.h"
 #include "musixmatchcoverprovider.h"

src/covermanager/qobuzcoverprovider.cpp

@@ -40,7 +40,7 @@
 #include <QtDebug>
 
 #include "core/application.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/logging.h"
 #include "core/song.h"
 #include "internet/internetservices.h"

src/covermanager/spotifycoverprovider.cpp

@@ -44,7 +44,7 @@
 #include <QtDebug>
 
 #include "core/application.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/logging.h"
 #include "core/song.h"
 #include "core/utilities.h"

src/covermanager/tidalcoverprovider.cpp

@@ -39,7 +39,7 @@
 #include <QtDebug>
 
 #include "core/application.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/logging.h"
 #include "core/song.h"
 #include "internet/internetservices.h"

src/lyrics/auddlyricsprovider.cpp

@@ -36,7 +36,7 @@
 #include <QtDebug>
 
 #include "core/logging.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/utilities.h"
 #include "jsonlyricsprovider.h"
 #include "lyricsfetcher.h"

src/lyrics/chartlyricsprovider.cpp

@@ -33,7 +33,7 @@
 #include <QXmlStreamReader>
 
 #include "core/logging.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/utilities.h"
 #include "lyricsprovider.h"
 #include "lyricsfetcher.h"

src/lyrics/geniuslyricsprovider.cpp

@@ -47,7 +47,7 @@
 
 #include "core/logging.h"
 #include "core/utilities.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "internet/localredirectserver.h"
 #include "jsonlyricsprovider.h"
 #include "lyricsfetcher.h"

src/lyrics/lololyricsprovider.cpp

@@ -34,7 +34,7 @@
 #include <QtDebug>
 
 #include "core/logging.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/utilities.h"
 #include "lyricsprovider.h"
 #include "lyricsfetcher.h"

src/lyrics/musixmatchlyricsprovider.cpp

@@ -33,7 +33,7 @@
 #include <QtDebug>
 
 #include "core/logging.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/utilities.h"
 #include "jsonlyricsprovider.h"
 #include "lyricsfetcher.h"

src/lyrics/ovhlyricsprovider.cpp

@@ -31,7 +31,7 @@
 #include <QtDebug>
 
 #include "core/logging.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/utilities.h"
 #include "lyricsfetcher.h"
 #include "jsonlyricsprovider.h"

src/musicbrainz/acoustidclient.cpp

@@ -43,7 +43,7 @@
 #include <QJsonValue>
 
 #include "acoustidclient.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/networktimeouts.h"
 #include "core/timeconstants.h"
 #include "core/logging.h"

src/musicbrainz/musicbrainzclient.cpp

@@ -46,7 +46,7 @@
 #include <QtDebug>
 
 #include "core/logging.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/networktimeouts.h"
 #include "core/utilities.h"
 #include "musicbrainzclient.h"

src/qobuz/qobuzbaserequest.cpp

@@ -37,7 +37,7 @@
 #include <QJsonValue>
 
 #include "core/logging.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "qobuzservice.h"
 #include "qobuzbaserequest.h"
 

src/qobuz/qobuzfavoriterequest.cpp

@@ -30,7 +30,7 @@
 #include <QtDebug>
 
 #include "core/logging.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/song.h"
 #include "qobuzservice.h"
 #include "qobuzbaserequest.h"

src/qobuz/qobuzrequest.cpp

@@ -33,7 +33,7 @@
 #include <QtDebug>
 
 #include "core/logging.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/song.h"
 #include "core/timeconstants.h"
 #include "core/application.h"

src/qobuz/qobuzservice.cpp

@@ -42,7 +42,7 @@
 #include "core/application.h"
 #include "core/player.h"
 #include "core/logging.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/database.h"
 #include "core/song.h"
 #include "core/utilities.h"

src/qobuz/qobuzstreamurlrequest.cpp

@@ -38,7 +38,7 @@
 #include <QtDebug>
 
 #include "core/logging.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/song.h"
 #include "core/timeconstants.h"
 #include "qobuzservice.h"

src/scrobbler/lastfmimport.cpp

@@ -39,7 +39,7 @@
 #include <QJsonArray>
 #include <QJsonValue>
 
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/timeconstants.h"
 #include "core/logging.h"
 

src/scrobbler/lastfmscrobbler.cpp

@@ -22,7 +22,7 @@
 #include <QObject>
 
 #include "core/application.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 
 #include "scrobblercache.h"
 #include "scrobblingapi20.h"

src/scrobbler/librefmscrobbler.cpp

@@ -22,7 +22,7 @@
 #include <QObject>
 
 #include "core/application.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 
 #include "scrobblercache.h"
 #include "scrobblingapi20.h"

src/scrobbler/listenbrainzscrobbler.cpp

@@ -39,7 +39,7 @@
 #include <QtDebug>
 
 #include "core/application.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/song.h"
 #include "core/timeconstants.h"
 #include "core/logging.h"

src/scrobbler/scrobblingapi20.cpp

@@ -46,7 +46,7 @@
 #include <QtDebug>
 
 #include "core/application.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/song.h"
 #include "core/timeconstants.h"
 #include "core/logging.h"

src/subsonic/subsonicservice.cpp

@@ -46,7 +46,7 @@
 #include "core/application.h"
 #include "core/player.h"
 #include "core/logging.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/database.h"
 #include "core/song.h"
 #include "collection/collectionbackend.h"

src/tidal/tidalbaserequest.cpp

@@ -36,7 +36,7 @@
 #include <QtDebug>
 
 #include "core/logging.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "tidalservice.h"
 #include "tidalbaserequest.h"
 

src/tidal/tidalfavoriterequest.cpp

@@ -35,7 +35,7 @@
 #include <QtDebug>
 
 #include "core/logging.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/song.h"
 #include "tidalservice.h"
 #include "tidalbaserequest.h"

src/tidal/tidalrequest.cpp

@@ -33,7 +33,7 @@
 #include <QtDebug>
 
 #include "core/logging.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/song.h"
 #include "core/timeconstants.h"
 #include "core/application.h"

src/tidal/tidalservice.cpp

@@ -45,7 +45,7 @@
 #include "core/application.h"
 #include "core/player.h"
 #include "core/logging.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/database.h"
 #include "core/song.h"
 #include "core/utilities.h"

src/tidal/tidalstreamurlrequest.cpp

@@ -39,7 +39,7 @@
 #include <QtDebug>
 
 #include "core/logging.h"
-#include "core/network.h"
+#include "core/networkaccessmanager.h"
 #include "core/song.h"
 #include "settings/tidalsettingspage.h"
 #include "tidalservice.h"