diff --git a/src/internet/internetservice.h b/src/internet/internetservice.h index cb4fe1cb7..95b181069 100644 --- a/src/internet/internetservice.h +++ b/src/internet/internetservice.h @@ -127,8 +127,8 @@ class InternetService : public QObject { void RemoveArtists(SongList songs); void RemoveAlbums(SongList songs); - void RemoveSongs(SongList songs); - void RemoveSongs(SongMap songs); + void RemoveSongsByList(SongList songs); + void RemoveSongsByMap(SongMap songs); void StreamURLFailure(uint id, QUrl original_url, QString error); void StreamURLSuccess(uint id, QUrl original_url, QUrl stream_url, Song::FileType filetype, int samplerate, int bit_depth, qint64 duration); diff --git a/src/internet/internetsongsview.cpp b/src/internet/internetsongsview.cpp index 069b16030..ff75d6a71 100644 --- a/src/internet/internetsongsview.cpp +++ b/src/internet/internetsongsview.cpp @@ -63,7 +63,7 @@ InternetSongsView::InternetSongsView(Application *app, InternetService *service, ui_->filter_widget->AddMenuAction(action_configure); QObject::connect(ui_->view, &InternetCollectionView::GetSongs, this, &InternetSongsView::GetSongs); - QObject::connect(ui_->view, &InternetCollectionView::RemoveSongs, service_, QOverload::of(&InternetService::RemoveSongs)); + QObject::connect(ui_->view, &InternetCollectionView::RemoveSongs, service_, &InternetService::RemoveSongsByList); QObject::connect(ui_->refresh, &QPushButton::clicked, this, &InternetSongsView::GetSongs); QObject::connect(ui_->close, &QPushButton::clicked, this, &InternetSongsView::AbortGetSongs); diff --git a/src/internet/internettabsview.cpp b/src/internet/internettabsview.cpp index 5655215aa..3897292eb 100644 --- a/src/internet/internettabsview.cpp +++ b/src/internet/internettabsview.cpp @@ -138,7 +138,7 @@ InternetTabsView::InternetTabsView(Application *app, InternetService *service, c ui_->songs_collection->filter_widget()->AddMenuAction(action_configure); QObject::connect(ui_->songs_collection->view(), &InternetCollectionView::GetSongs, this, &InternetTabsView::GetSongs); - QObject::connect(ui_->songs_collection->view(), &InternetCollectionView::RemoveSongs, service_, QOverload::of(&InternetService::RemoveSongs)); + QObject::connect(ui_->songs_collection->view(), &InternetCollectionView::RemoveSongs, service_, &InternetService::RemoveSongsByList); QObject::connect(ui_->songs_collection->button_refresh(), &QPushButton::clicked, this, &InternetTabsView::GetSongs); QObject::connect(ui_->songs_collection->button_close(), &QPushButton::clicked, this, &InternetTabsView::AbortGetSongs); diff --git a/src/qobuz/qobuzservice.cpp b/src/qobuz/qobuzservice.cpp index ecc8cbff8..89117cec4 100644 --- a/src/qobuz/qobuzservice.cpp +++ b/src/qobuz/qobuzservice.cpp @@ -161,8 +161,8 @@ QobuzService::QobuzService(Application *app, QObject *parent) QObject::connect(this, &QobuzService::RemoveArtists, favorite_request_, &QobuzFavoriteRequest::RemoveArtists); QObject::connect(this, &QobuzService::RemoveAlbums, favorite_request_, &QobuzFavoriteRequest::RemoveAlbums); - QObject::connect(this, QOverload::of(&QobuzService::RemoveSongs), favorite_request_, QOverload::of(&QobuzFavoriteRequest::RemoveSongs)); - QObject::connect(this, QOverload::of(&QobuzService::RemoveSongs), favorite_request_, QOverload::of(&QobuzFavoriteRequest::RemoveSongs)); + QObject::connect(this, &QobuzService::RemoveSongsByList, favorite_request_, QOverload::of(&QobuzFavoriteRequest::RemoveSongs)); + QObject::connect(this, &QobuzService::RemoveSongsByMap, favorite_request_, QOverload::of(&QobuzFavoriteRequest::RemoveSongs)); QObject::connect(favorite_request_, &QobuzFavoriteRequest::ArtistsAdded, artists_collection_backend_, &CollectionBackend::AddOrUpdateSongs); QObject::connect(favorite_request_, &QobuzFavoriteRequest::AlbumsAdded, albums_collection_backend_, &CollectionBackend::AddOrUpdateSongs); diff --git a/src/tidal/tidalservice.cpp b/src/tidal/tidalservice.cpp index e5d3b9d88..01756d58b 100644 --- a/src/tidal/tidalservice.cpp +++ b/src/tidal/tidalservice.cpp @@ -181,8 +181,8 @@ TidalService::TidalService(Application *app, QObject *parent) QObject::connect(this, &TidalService::RemoveArtists, favorite_request_, &TidalFavoriteRequest::RemoveArtists); QObject::connect(this, &TidalService::RemoveAlbums, favorite_request_, &TidalFavoriteRequest::RemoveAlbums); - QObject::connect(this, QOverload::of(&TidalService::RemoveSongs), favorite_request_, QOverload::of(&TidalFavoriteRequest::RemoveSongs)); - QObject::connect(this, QOverload::of(&TidalService::RemoveSongs), favorite_request_, QOverload::of(&TidalFavoriteRequest::RemoveSongs)); + QObject::connect(this, &TidalService::RemoveSongsByList, favorite_request_, QOverload::of(&TidalFavoriteRequest::RemoveSongs)); + QObject::connect(this, &TidalService::RemoveSongsByMap, favorite_request_, QOverload::of(&TidalFavoriteRequest::RemoveSongs)); QObject::connect(favorite_request_, &TidalFavoriteRequest::RequestLogin, this, &TidalService::SendLogin);