From bf5fea8951a73d70b09bad8540cda6590158ce3e Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Fri, 29 May 2020 17:46:41 +0200 Subject: [PATCH] Replace use of QMultiMap::insertMulti with QMultiMap::insert --- src/covermanager/albumcoverfetchersearch.cpp | 4 +++- src/covermanager/albumcoverfetchersearch.h | 3 ++- src/playlist/playlist.cpp | 9 +++++---- src/playlist/playlist.h | 1 + src/subsonic/subsonicrequest.cpp | 4 ++-- src/tidal/tidalfavoriterequest.cpp | 2 +- src/tidal/tidalrequest.cpp | 4 ++-- 7 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/covermanager/albumcoverfetchersearch.cpp b/src/covermanager/albumcoverfetchersearch.cpp index 7db62aecc..e137b3932 100644 --- a/src/covermanager/albumcoverfetchersearch.cpp +++ b/src/covermanager/albumcoverfetchersearch.cpp @@ -28,6 +28,8 @@ #include #include #include +#include +#include #include #include #include @@ -250,7 +252,7 @@ void AlbumCoverFetcherSearch::ProviderCoverFetchFinished(QNetworkReply *reply) { QImage image; if (image.loadFromData(reply->readAll())) { result.score += ScoreImage(image); - candidate_images_.insertMulti(result.score, CandidateImage(result, image)); + candidate_images_.insert(result.score, CandidateImage(result, image)); qLog(Debug) << reply->url() << "from" << result.provider << "scored" << result.score; } else { diff --git a/src/covermanager/albumcoverfetchersearch.h b/src/covermanager/albumcoverfetchersearch.h index f50cd6721..e98d451bd 100644 --- a/src/covermanager/albumcoverfetchersearch.h +++ b/src/covermanager/albumcoverfetchersearch.h @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -102,7 +103,7 @@ class AlbumCoverFetcherSearch : public QObject { // QMap is sorted by key (score). Values are (result, image) typedef QPair CandidateImage; - QMap candidate_images_; + QMultiMap candidate_images_; QNetworkAccessManager *network_; diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp index 079cfe94c..5ed6b8363 100644 --- a/src/playlist/playlist.cpp +++ b/src/playlist/playlist.cpp @@ -954,7 +954,7 @@ void Playlist::InsertItemsWithoutUndo(const PlaylistItemList &items, int pos, bo if (item->source() == Song::Source_Collection) { int id = item->Metadata().id(); if (id != -1) { - collection_items_by_id_.insertMulti(id, item); + collection_items_by_id_.insert(id, item); } } @@ -1030,12 +1030,13 @@ void Playlist::UpdateItems(const SongList &songs) { // we want to update: if an item corresponds to the song (we rely on URL for this), we update the item with the new metadata, // then we remove song from our list because we will not need to check it again. // And we also update undo actions. - QLinkedList songs_list; + + QList songs_list; for (const Song &song : songs) songs_list.append(song); for (int i = 0; i < items_.size() ; i++) { // Update current items list - QMutableLinkedListIterator it(songs_list); + QMutableListIterator it(songs_list); while (it.hasNext()) { const Song &song = it.next(); const PlaylistItemPtr &item = items_[i]; @@ -1044,7 +1045,7 @@ void Playlist::UpdateItems(const SongList &songs) { if (song.is_collection_song()) { new_item = PlaylistItemPtr(new CollectionPlaylistItem(song)); if (collection_items_by_id_.contains(song.id(), item)) collection_items_by_id_.remove(song.id(), item); - collection_items_by_id_.insertMulti(song.id(), new_item); + collection_items_by_id_.insert(song.id(), new_item); } else { new_item = PlaylistItemPtr(new SongPlaylistItem(song)); diff --git a/src/playlist/playlist.h b/src/playlist/playlist.h index 7011cf0d0..eed1ebe79 100644 --- a/src/playlist/playlist.h +++ b/src/playlist/playlist.h @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include diff --git a/src/subsonic/subsonicrequest.cpp b/src/subsonic/subsonicrequest.cpp index 8d0477839..73f8d4b4a 100644 --- a/src/subsonic/subsonicrequest.cpp +++ b/src/subsonic/subsonicrequest.cpp @@ -688,7 +688,7 @@ void SubsonicRequest::AddAlbumCoverRequest(Song &song) { if (!cover_url.isValid()) return; if (album_covers_requests_sent_.contains(cover_url)) { - album_covers_requests_sent_.insertMulti(cover_url, &song); + album_covers_requests_sent_.insert(cover_url, &song); return; } @@ -698,7 +698,7 @@ void SubsonicRequest::AddAlbumCoverRequest(Song &song) { request.filename = Song::ImageCacheDir(Song::Source_Subsonic) + "/" + cover_url_query.queryItemValue("id"); if (request.filename.isEmpty()) return; - album_covers_requests_sent_.insertMulti(cover_url, &song); + album_covers_requests_sent_.insert(cover_url, &song); ++album_covers_requested_; album_cover_requests_queue_.enqueue(request); diff --git a/src/tidal/tidalfavoriterequest.cpp b/src/tidal/tidalfavoriterequest.cpp index 53d89c4fb..c5e4927c9 100644 --- a/src/tidal/tidalfavoriterequest.cpp +++ b/src/tidal/tidalfavoriterequest.cpp @@ -217,7 +217,7 @@ void TidalFavoriteRequest::RemoveFavorites(const FavoriteType type, const SongLi break; } if (!ids.contains(id)) ids << id; - songs_map.insertMulti(id, song); + songs_map.insert(id, song); } for (const QString &id : ids) { diff --git a/src/tidal/tidalrequest.cpp b/src/tidal/tidalrequest.cpp index a7cb94240..df2a27141 100644 --- a/src/tidal/tidalrequest.cpp +++ b/src/tidal/tidalrequest.cpp @@ -1092,7 +1092,7 @@ void TidalRequest::GetAlbumCovers() { void TidalRequest::AddAlbumCoverRequest(Song &song) { if (album_covers_requests_sent_.contains(song.album_id())) { - album_covers_requests_sent_.insertMulti(song.album_id(), &song); + album_covers_requests_sent_.insert(song.album_id(), &song); return; } @@ -1102,7 +1102,7 @@ void TidalRequest::AddAlbumCoverRequest(Song &song) { request.filename = app_->album_cover_loader()->CoverFilePath(song.source(), song.effective_albumartist(), song.effective_album(), song.album_id(), QString(), request.url); if (request.filename.isEmpty()) return; - album_covers_requests_sent_.insertMulti(song.album_id(), &song); + album_covers_requests_sent_.insert(song.album_id(), &song); ++album_covers_requested_; album_cover_requests_queue_.enqueue(request);