dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace use of QMultiMap::insertMulti with QMultiMap::insert

Browse Source
This commit is contained in:
Jonas Kvinge
2020-05-29 17:46:41 +02:00
parent 07282e3de6
commit bf5fea8951
7 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/playlist/playlist.cpp
View File

@@ -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<Song> songs_list;
QList<Song> songs_list;
for (const Song &song : songs) songs_list.append(song);
for (int i = 0; i < items_.size() ; i++) {
// Update current items list
QMutableLinkedListIterator<Song> it(songs_list);
QMutableListIterator<Song> 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));