Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ItemHasCover(): Replace pointer with reference

Browse Source
This commit is contained in:
santigl 2017-03-06 15:09:01 -03:00 committed by John Maguire
parent 82f0d261fa
commit f5bd7ef5c0
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ui/albumcovermanager.cpp
View File

@ -384,7 +384,7 @@ void AlbumCoverManager::UpdateFilter() {
if (!should_hide) { if (!should_hide) {
total_count++; total_count++;
if (!ItemHasCover(item)) { if (!ItemHasCover(*item)) {
without_cover++; without_cover++;
} }
} }
@ -397,7 +397,7 @@ void AlbumCoverManager::UpdateFilter() {
bool AlbumCoverManager::ShouldHide(const QListWidgetItem& item, bool AlbumCoverManager::ShouldHide(const QListWidgetItem& item,
const QString& filter, const QString& filter,
HideCovers hide) const { HideCovers hide) const {
bool has_cover = ItemHasCover(&item); bool has_cover = ItemHasCover(item);
if (hide == Hide_WithCovers && has_cover) { if (hide == Hide_WithCovers && has_cover) {
return true; return true;
} else if (hide == Hide_WithoutCovers && !has_cover) { } else if (hide == Hide_WithoutCovers && !has_cover) {
@ -427,7 +427,7 @@ void AlbumCoverManager::FetchAlbumCovers() {
for (int i = 0; i < ui_->albums->count(); ++i) { for (int i = 0; i < ui_->albums->count(); ++i) {
QListWidgetItem* item = ui_->albums->item(i); QListWidgetItem* item = ui_->albums->item(i);
if (item->isHidden()) continue; if (item->isHidden()) continue;
if (ItemHasCover(item)) continue; if (ItemHasCover(*item)) continue;
quint64 id = cover_fetcher_->FetchAlbumCover( quint64 id = cover_fetcher_->FetchAlbumCover(
EffectiveAlbumArtistName(item), item->data(Role_AlbumName).toString()); EffectiveAlbumArtistName(item), item->data(Role_AlbumName).toString());
@ -498,7 +498,7 @@ bool AlbumCoverManager::eventFilter(QObject* obj, QEvent* event) {
bool some_with_covers = false; bool some_with_covers = false;
for (QListWidgetItem* item : context_menu_items_) { for (QListWidgetItem* item : context_menu_items_) {
if (ItemHasCover(item)) some_with_covers = true; if (ItemHasCover(*item)) some_with_covers = true;
} }
album_cover_choice_controller_->cover_from_file_action()->setEnabled( album_cover_choice_controller_->cover_from_file_action()->setEnabled(
@ -781,7 +781,7 @@ void AlbumCoverManager::ExportCovers() {
QListWidgetItem* item = ui_->albums->item(i); QListWidgetItem* item = ui_->albums->item(i);
// skip hidden and coverless albums // skip hidden and coverless albums
if (item->isHidden() || !ItemHasCover(item)) { if (item->isHidden() || !ItemHasCover(*item)) {
continue; continue;
} }
@ -853,6 +853,6 @@ QImage AlbumCoverManager::GenerateNoCoverImage(
return square_nocover; return square_nocover;
} }
bool AlbumCoverManager::ItemHasCover(const QListWidgetItem* item) const { bool AlbumCoverManager::ItemHasCover(const QListWidgetItem& item) const {
return item->icon().cacheKey() != no_cover_item_icon_.cacheKey(); return item.icon().cacheKey() != no_cover_item_icon_.cacheKey();
} }

2
src/ui/albumcovermanager.h
View File

@ -170,7 +170,7 @@ signals:
AlbumCoverExporter* cover_exporter_; AlbumCoverExporter* cover_exporter_;
QImage GenerateNoCoverImage(const QIcon& no_cover_icon) const; QImage GenerateNoCoverImage(const QIcon& no_cover_icon) const;
bool ItemHasCover(const QListWidgetItem* item) const; bool ItemHasCover(const QListWidgetItem& item) const;
QIcon artist_icon_; QIcon artist_icon_;
QIcon all_artists_icon_; QIcon all_artists_icon_;