From 062c59b321deb8cf7814e1365b7f647222be44c6 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Mon, 28 Jun 2021 00:16:22 +0200 Subject: [PATCH] Rename FindSongs --- src/collection/collectionbackend.cpp | 6 +++--- src/collection/collectionbackend.h | 4 ++-- src/smartplaylists/playlistquerygenerator.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/collection/collectionbackend.cpp b/src/collection/collectionbackend.cpp index d801122a6..4b0edd2fd 100644 --- a/src/collection/collectionbackend.cpp +++ b/src/collection/collectionbackend.cpp @@ -1444,7 +1444,7 @@ void CollectionBackend::DeleteAll() { } -SongList CollectionBackend::FindSongs(const SmartPlaylistSearch &search) { +SongList CollectionBackend::SmartPlaylistsFindSongs(const SmartPlaylistSearch &search) { QMutexLocker l(db_->Mutex()); QSqlDatabase db(db_->Connect()); @@ -1469,10 +1469,10 @@ SongList CollectionBackend::FindSongs(const SmartPlaylistSearch &search) { } -SongList CollectionBackend::GetAllSongs() { +SongList CollectionBackend::SmartPlaylistsGetAllSongs() { // Get all the songs! - return FindSongs(SmartPlaylistSearch(SmartPlaylistSearch::Type_All, SmartPlaylistSearch::TermList(), SmartPlaylistSearch::Sort_FieldAsc, SmartPlaylistSearchTerm::Field_Artist, -1)); + return SmartPlaylistsFindSongs(SmartPlaylistSearch(SmartPlaylistSearch::Type_All, SmartPlaylistSearch::TermList(), SmartPlaylistSearch::Sort_FieldAsc, SmartPlaylistSearchTerm::Field_Artist, -1)); } diff --git a/src/collection/collectionbackend.h b/src/collection/collectionbackend.h index 61e4e17ae..ea4b772dd 100644 --- a/src/collection/collectionbackend.h +++ b/src/collection/collectionbackend.h @@ -193,8 +193,8 @@ class CollectionBackend : public CollectionBackendInterface { SongList GetSongsByFingerprint(const QString &fingerprint) override; - SongList GetAllSongs(); - SongList FindSongs(const SmartPlaylistSearch &search); + SongList SmartPlaylistsGetAllSongs(); + SongList SmartPlaylistsFindSongs(const SmartPlaylistSearch &search); Song::Source Source() const; diff --git a/src/smartplaylists/playlistquerygenerator.cpp b/src/smartplaylists/playlistquerygenerator.cpp index a75b7e7d5..a3f3922f3 100644 --- a/src/smartplaylists/playlistquerygenerator.cpp +++ b/src/smartplaylists/playlistquerygenerator.cpp @@ -86,7 +86,7 @@ PlaylistItemList PlaylistQueryGenerator::GenerateMore(const int count) { current_pos_ += search_copy.limit_; } - SongList songs = backend_->FindSongs(search_copy); + SongList songs = backend_->SmartPlaylistsFindSongs(search_copy); PlaylistItemList items; items.reserve(songs.count()); for (const Song &song : songs) {