From 72b194cd7ea3700da5a701908b7d81ba86da965e Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Mon, 11 Jan 2021 16:48:46 +0100 Subject: [PATCH] Rename network to networkaccessmanager --- src/CMakeLists.txt | 4 ++-- src/core/mainwindow.cpp | 2 +- src/core/{network.cpp => networkaccessmanager.cpp} | 2 +- src/core/{network.h => networkaccessmanager.h} | 6 +++--- src/covermanager/albumcoverfetcher.cpp | 2 +- src/covermanager/albumcoverfetchersearch.cpp | 2 +- src/covermanager/albumcoverloader.cpp | 2 +- src/covermanager/coverfromurldialog.cpp | 2 +- src/covermanager/deezercoverprovider.cpp | 2 +- src/covermanager/discogscoverprovider.cpp | 2 +- src/covermanager/lastfmcoverprovider.cpp | 2 +- src/covermanager/musicbrainzcoverprovider.cpp | 2 +- src/covermanager/musixmatchcoverprovider.cpp | 2 +- src/covermanager/qobuzcoverprovider.cpp | 2 +- src/covermanager/spotifycoverprovider.cpp | 2 +- src/covermanager/tidalcoverprovider.cpp | 2 +- src/lyrics/auddlyricsprovider.cpp | 2 +- src/lyrics/chartlyricsprovider.cpp | 2 +- src/lyrics/geniuslyricsprovider.cpp | 2 +- src/lyrics/lololyricsprovider.cpp | 2 +- src/lyrics/musixmatchlyricsprovider.cpp | 2 +- src/lyrics/ovhlyricsprovider.cpp | 2 +- src/musicbrainz/acoustidclient.cpp | 2 +- src/musicbrainz/musicbrainzclient.cpp | 2 +- src/qobuz/qobuzbaserequest.cpp | 2 +- src/qobuz/qobuzfavoriterequest.cpp | 2 +- src/qobuz/qobuzrequest.cpp | 2 +- src/qobuz/qobuzservice.cpp | 2 +- src/qobuz/qobuzstreamurlrequest.cpp | 2 +- src/scrobbler/lastfmimport.cpp | 2 +- src/scrobbler/lastfmscrobbler.cpp | 2 +- src/scrobbler/librefmscrobbler.cpp | 2 +- src/scrobbler/listenbrainzscrobbler.cpp | 2 +- src/scrobbler/scrobblingapi20.cpp | 2 +- src/subsonic/subsonicservice.cpp | 2 +- src/tidal/tidalbaserequest.cpp | 2 +- src/tidal/tidalfavoriterequest.cpp | 2 +- src/tidal/tidalrequest.cpp | 2 +- src/tidal/tidalservice.cpp | 2 +- src/tidal/tidalstreamurlrequest.cpp | 2 +- 40 files changed, 43 insertions(+), 43 deletions(-) rename src/core/{network.cpp => networkaccessmanager.cpp} (98%) rename src/core/{network.h => networkaccessmanager.h} (92%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 85157a69..96c22317 100644 --- a/src/CMakeLists.txt +++ b/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 diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp index 35998358..fcf0944a 100644 --- a/src/core/mainwindow.cpp +++ b/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" diff --git a/src/core/network.cpp b/src/core/networkaccessmanager.cpp similarity index 98% rename from src/core/network.cpp rename to src/core/networkaccessmanager.cpp index bd1e2454..fca30afb 100644 --- a/src/core/network.cpp +++ b/src/core/networkaccessmanager.cpp @@ -31,7 +31,7 @@ #include #include -#include "network.h" +#include "networkaccessmanager.h" #include "threadsafenetworkdiskcache.h" NetworkAccessManager::NetworkAccessManager(QObject *parent) diff --git a/src/core/network.h b/src/core/networkaccessmanager.h similarity index 92% rename from src/core/network.h rename to src/core/networkaccessmanager.h index af404314..2732b034 100644 --- a/src/core/network.h +++ b/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 diff --git a/src/covermanager/albumcoverfetcher.cpp b/src/covermanager/albumcoverfetcher.cpp index 544c8a0a..9d31e735 100644 --- a/src/covermanager/albumcoverfetcher.cpp +++ b/src/covermanager/albumcoverfetcher.cpp @@ -27,7 +27,7 @@ #include #include -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/song.h" #include "albumcoverfetcher.h" #include "albumcoverfetchersearch.h" diff --git a/src/covermanager/albumcoverfetchersearch.cpp b/src/covermanager/albumcoverfetchersearch.cpp index db70dd70..4f5e361f 100644 --- a/src/covermanager/albumcoverfetchersearch.cpp +++ b/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" diff --git a/src/covermanager/albumcoverloader.cpp b/src/covermanager/albumcoverloader.cpp index 414e8b2e..d34a01dc 100644 --- a/src/covermanager/albumcoverloader.cpp +++ b/src/covermanager/albumcoverloader.cpp @@ -42,7 +42,7 @@ #include #include -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/song.h" #include "core/tagreaderclient.h" #include "core/utilities.h" diff --git a/src/covermanager/coverfromurldialog.cpp b/src/covermanager/coverfromurldialog.cpp index 20caeb6a..6b548f4c 100644 --- a/src/covermanager/coverfromurldialog.cpp +++ b/src/covermanager/coverfromurldialog.cpp @@ -31,7 +31,7 @@ #include #include -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "widgets/busyindicator.h" #include "coverfromurldialog.h" #include "ui_coverfromurldialog.h" diff --git a/src/covermanager/deezercoverprovider.cpp b/src/covermanager/deezercoverprovider.cpp index 930d1e34..0a9e8cd4 100644 --- a/src/covermanager/deezercoverprovider.cpp +++ b/src/covermanager/deezercoverprovider.cpp @@ -42,7 +42,7 @@ #include #include "core/application.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/logging.h" #include "core/song.h" #include "albumcoverfetcher.h" diff --git a/src/covermanager/discogscoverprovider.cpp b/src/covermanager/discogscoverprovider.cpp index 9b25db2b..d37f1849 100644 --- a/src/covermanager/discogscoverprovider.cpp +++ b/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" diff --git a/src/covermanager/lastfmcoverprovider.cpp b/src/covermanager/lastfmcoverprovider.cpp index 9d5b2e6a..0cd4896e 100644 --- a/src/covermanager/lastfmcoverprovider.cpp +++ b/src/covermanager/lastfmcoverprovider.cpp @@ -42,7 +42,7 @@ #include #include "core/application.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/logging.h" #include "jsoncoverprovider.h" diff --git a/src/covermanager/musicbrainzcoverprovider.cpp b/src/covermanager/musicbrainzcoverprovider.cpp index a7e92bf7..bbb2a74e 100644 --- a/src/covermanager/musicbrainzcoverprovider.cpp +++ b/src/covermanager/musicbrainzcoverprovider.cpp @@ -40,7 +40,7 @@ #include #include "core/application.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/logging.h" #include "albumcoverfetcher.h" #include "jsoncoverprovider.h" diff --git a/src/covermanager/musixmatchcoverprovider.cpp b/src/covermanager/musixmatchcoverprovider.cpp index da1ce5c2..51899265 100644 --- a/src/covermanager/musixmatchcoverprovider.cpp +++ b/src/covermanager/musixmatchcoverprovider.cpp @@ -35,7 +35,7 @@ #include #include "core/logging.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "albumcoverfetcher.h" #include "jsoncoverprovider.h" #include "musixmatchcoverprovider.h" diff --git a/src/covermanager/qobuzcoverprovider.cpp b/src/covermanager/qobuzcoverprovider.cpp index 8db03eaa..0465a297 100644 --- a/src/covermanager/qobuzcoverprovider.cpp +++ b/src/covermanager/qobuzcoverprovider.cpp @@ -40,7 +40,7 @@ #include #include "core/application.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/logging.h" #include "core/song.h" #include "internet/internetservices.h" diff --git a/src/covermanager/spotifycoverprovider.cpp b/src/covermanager/spotifycoverprovider.cpp index 72cea819..c35e88c0 100644 --- a/src/covermanager/spotifycoverprovider.cpp +++ b/src/covermanager/spotifycoverprovider.cpp @@ -44,7 +44,7 @@ #include #include "core/application.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/logging.h" #include "core/song.h" #include "core/utilities.h" diff --git a/src/covermanager/tidalcoverprovider.cpp b/src/covermanager/tidalcoverprovider.cpp index 4c2e3214..58da0e9e 100644 --- a/src/covermanager/tidalcoverprovider.cpp +++ b/src/covermanager/tidalcoverprovider.cpp @@ -39,7 +39,7 @@ #include #include "core/application.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/logging.h" #include "core/song.h" #include "internet/internetservices.h" diff --git a/src/lyrics/auddlyricsprovider.cpp b/src/lyrics/auddlyricsprovider.cpp index e2a9a526..96df03f2 100644 --- a/src/lyrics/auddlyricsprovider.cpp +++ b/src/lyrics/auddlyricsprovider.cpp @@ -36,7 +36,7 @@ #include #include "core/logging.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/utilities.h" #include "jsonlyricsprovider.h" #include "lyricsfetcher.h" diff --git a/src/lyrics/chartlyricsprovider.cpp b/src/lyrics/chartlyricsprovider.cpp index b4579ee6..84b933ef 100644 --- a/src/lyrics/chartlyricsprovider.cpp +++ b/src/lyrics/chartlyricsprovider.cpp @@ -33,7 +33,7 @@ #include #include "core/logging.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/utilities.h" #include "lyricsprovider.h" #include "lyricsfetcher.h" diff --git a/src/lyrics/geniuslyricsprovider.cpp b/src/lyrics/geniuslyricsprovider.cpp index a1d1a655..18b9ae4d 100644 --- a/src/lyrics/geniuslyricsprovider.cpp +++ b/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" diff --git a/src/lyrics/lololyricsprovider.cpp b/src/lyrics/lololyricsprovider.cpp index 1a9eab88..7ba8890d 100644 --- a/src/lyrics/lololyricsprovider.cpp +++ b/src/lyrics/lololyricsprovider.cpp @@ -34,7 +34,7 @@ #include #include "core/logging.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/utilities.h" #include "lyricsprovider.h" #include "lyricsfetcher.h" diff --git a/src/lyrics/musixmatchlyricsprovider.cpp b/src/lyrics/musixmatchlyricsprovider.cpp index 69abd2a0..cff38ed6 100644 --- a/src/lyrics/musixmatchlyricsprovider.cpp +++ b/src/lyrics/musixmatchlyricsprovider.cpp @@ -33,7 +33,7 @@ #include #include "core/logging.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/utilities.h" #include "jsonlyricsprovider.h" #include "lyricsfetcher.h" diff --git a/src/lyrics/ovhlyricsprovider.cpp b/src/lyrics/ovhlyricsprovider.cpp index 31b88ee8..4617679d 100644 --- a/src/lyrics/ovhlyricsprovider.cpp +++ b/src/lyrics/ovhlyricsprovider.cpp @@ -31,7 +31,7 @@ #include #include "core/logging.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/utilities.h" #include "lyricsfetcher.h" #include "jsonlyricsprovider.h" diff --git a/src/musicbrainz/acoustidclient.cpp b/src/musicbrainz/acoustidclient.cpp index e2c37630..b16ed45d 100644 --- a/src/musicbrainz/acoustidclient.cpp +++ b/src/musicbrainz/acoustidclient.cpp @@ -43,7 +43,7 @@ #include #include "acoustidclient.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/networktimeouts.h" #include "core/timeconstants.h" #include "core/logging.h" diff --git a/src/musicbrainz/musicbrainzclient.cpp b/src/musicbrainz/musicbrainzclient.cpp index 25db86d4..742917d5 100644 --- a/src/musicbrainz/musicbrainzclient.cpp +++ b/src/musicbrainz/musicbrainzclient.cpp @@ -46,7 +46,7 @@ #include #include "core/logging.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/networktimeouts.h" #include "core/utilities.h" #include "musicbrainzclient.h" diff --git a/src/qobuz/qobuzbaserequest.cpp b/src/qobuz/qobuzbaserequest.cpp index 727484b7..bba58559 100644 --- a/src/qobuz/qobuzbaserequest.cpp +++ b/src/qobuz/qobuzbaserequest.cpp @@ -37,7 +37,7 @@ #include #include "core/logging.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "qobuzservice.h" #include "qobuzbaserequest.h" diff --git a/src/qobuz/qobuzfavoriterequest.cpp b/src/qobuz/qobuzfavoriterequest.cpp index 78f7aa0c..c47a80f9 100644 --- a/src/qobuz/qobuzfavoriterequest.cpp +++ b/src/qobuz/qobuzfavoriterequest.cpp @@ -30,7 +30,7 @@ #include #include "core/logging.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/song.h" #include "qobuzservice.h" #include "qobuzbaserequest.h" diff --git a/src/qobuz/qobuzrequest.cpp b/src/qobuz/qobuzrequest.cpp index 6b5c9518..680372d6 100644 --- a/src/qobuz/qobuzrequest.cpp +++ b/src/qobuz/qobuzrequest.cpp @@ -33,7 +33,7 @@ #include #include "core/logging.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/song.h" #include "core/timeconstants.h" #include "core/application.h" diff --git a/src/qobuz/qobuzservice.cpp b/src/qobuz/qobuzservice.cpp index 92f17f33..19ac015e 100644 --- a/src/qobuz/qobuzservice.cpp +++ b/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" diff --git a/src/qobuz/qobuzstreamurlrequest.cpp b/src/qobuz/qobuzstreamurlrequest.cpp index 931070b5..355055d7 100644 --- a/src/qobuz/qobuzstreamurlrequest.cpp +++ b/src/qobuz/qobuzstreamurlrequest.cpp @@ -38,7 +38,7 @@ #include #include "core/logging.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/song.h" #include "core/timeconstants.h" #include "qobuzservice.h" diff --git a/src/scrobbler/lastfmimport.cpp b/src/scrobbler/lastfmimport.cpp index 9833900c..6fcd036c 100644 --- a/src/scrobbler/lastfmimport.cpp +++ b/src/scrobbler/lastfmimport.cpp @@ -39,7 +39,7 @@ #include #include -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/timeconstants.h" #include "core/logging.h" diff --git a/src/scrobbler/lastfmscrobbler.cpp b/src/scrobbler/lastfmscrobbler.cpp index d1592fd6..3a8fd431 100644 --- a/src/scrobbler/lastfmscrobbler.cpp +++ b/src/scrobbler/lastfmscrobbler.cpp @@ -22,7 +22,7 @@ #include #include "core/application.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "scrobblercache.h" #include "scrobblingapi20.h" diff --git a/src/scrobbler/librefmscrobbler.cpp b/src/scrobbler/librefmscrobbler.cpp index 54b0620f..a10e869c 100644 --- a/src/scrobbler/librefmscrobbler.cpp +++ b/src/scrobbler/librefmscrobbler.cpp @@ -22,7 +22,7 @@ #include #include "core/application.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "scrobblercache.h" #include "scrobblingapi20.h" diff --git a/src/scrobbler/listenbrainzscrobbler.cpp b/src/scrobbler/listenbrainzscrobbler.cpp index 4e550bfb..cebad3e1 100644 --- a/src/scrobbler/listenbrainzscrobbler.cpp +++ b/src/scrobbler/listenbrainzscrobbler.cpp @@ -39,7 +39,7 @@ #include #include "core/application.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/song.h" #include "core/timeconstants.h" #include "core/logging.h" diff --git a/src/scrobbler/scrobblingapi20.cpp b/src/scrobbler/scrobblingapi20.cpp index 32d2e711..a9271128 100644 --- a/src/scrobbler/scrobblingapi20.cpp +++ b/src/scrobbler/scrobblingapi20.cpp @@ -46,7 +46,7 @@ #include #include "core/application.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/song.h" #include "core/timeconstants.h" #include "core/logging.h" diff --git a/src/subsonic/subsonicservice.cpp b/src/subsonic/subsonicservice.cpp index d4a00493..257078af 100644 --- a/src/subsonic/subsonicservice.cpp +++ b/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" diff --git a/src/tidal/tidalbaserequest.cpp b/src/tidal/tidalbaserequest.cpp index e58e0b11..ab296bcf 100644 --- a/src/tidal/tidalbaserequest.cpp +++ b/src/tidal/tidalbaserequest.cpp @@ -36,7 +36,7 @@ #include #include "core/logging.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "tidalservice.h" #include "tidalbaserequest.h" diff --git a/src/tidal/tidalfavoriterequest.cpp b/src/tidal/tidalfavoriterequest.cpp index 8535b1a8..305da765 100644 --- a/src/tidal/tidalfavoriterequest.cpp +++ b/src/tidal/tidalfavoriterequest.cpp @@ -35,7 +35,7 @@ #include #include "core/logging.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/song.h" #include "tidalservice.h" #include "tidalbaserequest.h" diff --git a/src/tidal/tidalrequest.cpp b/src/tidal/tidalrequest.cpp index 6a204037..054fc098 100644 --- a/src/tidal/tidalrequest.cpp +++ b/src/tidal/tidalrequest.cpp @@ -33,7 +33,7 @@ #include #include "core/logging.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/song.h" #include "core/timeconstants.h" #include "core/application.h" diff --git a/src/tidal/tidalservice.cpp b/src/tidal/tidalservice.cpp index 3234df84..458abf9c 100644 --- a/src/tidal/tidalservice.cpp +++ b/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" diff --git a/src/tidal/tidalstreamurlrequest.cpp b/src/tidal/tidalstreamurlrequest.cpp index aa43152a..13079f8d 100644 --- a/src/tidal/tidalstreamurlrequest.cpp +++ b/src/tidal/tidalstreamurlrequest.cpp @@ -39,7 +39,7 @@ #include #include "core/logging.h" -#include "core/network.h" +#include "core/networkaccessmanager.h" #include "core/song.h" #include "settings/tidalsettingspage.h" #include "tidalservice.h"