From 5eb32b33c13581cde8c158d8a8743873cf1735c7 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sun, 5 Jan 2020 00:58:33 +0100 Subject: [PATCH] Replace QSet::toList() with QSet::values() --- src/globalsearch/spotifysearchprovider.cpp | 2 +- src/internet/podcasts/gpoddersync.cpp | 6 +++--- src/library/librarybackend.cpp | 2 +- src/musicbrainz/musicbrainzclient.cpp | 2 +- src/playlist/playlist.cpp | 2 +- src/playlist/playlistmanager.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/globalsearch/spotifysearchprovider.cpp b/src/globalsearch/spotifysearchprovider.cpp index 5e71ffc50..75936fa2c 100644 --- a/src/globalsearch/spotifysearchprovider.cpp +++ b/src/globalsearch/spotifysearchprovider.cpp @@ -264,7 +264,7 @@ QStringList SpotifySearchProvider::GetSuggestions(int count) { return QStringList(); } - QStringList all_suggestions = suggestions_.toList(); + QStringList all_suggestions = suggestions_.values(); std::mt19937 gen(std::time(0)); std::uniform_int_distribution<> random(0, all_suggestions.size() - 1); diff --git a/src/internet/podcasts/gpoddersync.cpp b/src/internet/podcasts/gpoddersync.cpp index 5fdca0fa9..79730d7fe 100644 --- a/src/internet/podcasts/gpoddersync.cpp +++ b/src/internet/podcasts/gpoddersync.cpp @@ -344,14 +344,14 @@ void GPodderSync::FlushUpdateQueue() { flushing_queue_ = true; mygpo::AddRemoveResultPtr reply(api_->addRemoveSubscriptions( - username_, DeviceId(), queued_add_subscriptions_.toList(), - queued_remove_subscriptions_.toList())); + username_, DeviceId(), queued_add_subscriptions_.values(), + queued_remove_subscriptions_.values())); qLog(Info) << "Sending" << all_urls.count() << "changes to gpodder.net"; NewClosure(reply, SIGNAL(finished()), this, SLOT(AddRemoveFinished(mygpo::AddRemoveResultPtr, QList)), - reply, all_urls.toList()); + reply, all_urls.values()); connect(reply.data(), SIGNAL(parseError()), SLOT(AddRemoveParseError())); connect(reply.data(), SIGNAL(requestError(QNetworkReply::NetworkError)), SLOT(AddRemoveRequestError(QNetworkReply::NetworkError))); diff --git a/src/library/librarybackend.cpp b/src/library/librarybackend.cpp index 0a0ef5da1..7aa6496cd 100644 --- a/src/library/librarybackend.cpp +++ b/src/library/librarybackend.cpp @@ -558,7 +558,7 @@ QStringList LibraryBackend::GetAllArtistsWithAlbums(const QueryOptions& opt) { artists << query2.Value(0).toString(); } - return QStringList(artists.toList()); + return QStringList(artists.values()); } LibraryBackend::AlbumList LibraryBackend::GetAllAlbums( diff --git a/src/musicbrainz/musicbrainzclient.cpp b/src/musicbrainz/musicbrainzclient.cpp index f2dd7683e..ab920b0fc 100644 --- a/src/musicbrainz/musicbrainzclient.cpp +++ b/src/musicbrainz/musicbrainzclient.cpp @@ -387,7 +387,7 @@ MusicBrainzClient::ResultList MusicBrainzClient::UniqueResults( const ResultList& results, UniqueResultsSortOption opt) { ResultList ret; if (opt == SortResults) { - ret = QSet::fromList(results).toList(); + ret = QSet::fromList(results).values(); std::sort(ret.begin(), ret.end()); } else { // KeepOriginalOrder // Qt doesn't provide a ordered set (QSet "stores values in an unspecified diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp index 05c63f8ae..93b2a3be5 100644 --- a/src/playlist/playlist.cpp +++ b/src/playlist/playlist.cpp @@ -2093,7 +2093,7 @@ void Playlist::ReshuffleIndices() { } // Shuffle them - QStringList shuffled_album_keys = album_key_set.toList(); + QStringList shuffled_album_keys = album_key_set.values(); std::random_shuffle(shuffled_album_keys.begin(), shuffled_album_keys.end()); diff --git a/src/playlist/playlistmanager.cpp b/src/playlist/playlistmanager.cpp index 9e423545e..5a7719267 100644 --- a/src/playlist/playlistmanager.cpp +++ b/src/playlist/playlistmanager.cpp @@ -547,7 +547,7 @@ QString PlaylistManager::GetNameForNewPlaylist(const SongList& songs) { } if (!various_artists && albums.size() == 1) { - result += " - " + albums.toList().first(); + result += " - " + albums.values().first(); } return result;