Make icon explicit argument

kraxarn · Jun 27, 2023 · 6a7b929 · 6a7b929
1 parent 426e781
commit 6a7b929
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/src/util/tooltip.cpp b/src/util/tooltip.cpp
@@ -14,9 +14,9 @@ Tooltip::Tooltip(lib::settings &settings,
 {
 }
 
-void Tooltip::set(QListWidgetItem *item, const lib::spt::track &track)
+void Tooltip::set(QListWidgetItem *item, const lib::spt::track &track, const QIcon &albumIcon)
 {
-	const auto icon = item->icon().pixmap(albumSize, albumSize);
+	const auto icon = albumIcon.pixmap(albumSize, albumSize);
 	item->setToolTip(tooltip(track, icon));
 }
 
@@ -29,9 +29,9 @@ void Tooltip::set(QTreeWidgetItem *item, const lib::spt::track &track)
 		});
 }
 
-void Tooltip::set(QTreeWidgetItem *item, const lib::spt::album &album)
+void Tooltip::set(QTreeWidgetItem *item, const lib::spt::album &album, const QIcon &albumIcon)
 {
-	const auto icon = item->icon(0).pixmap(albumSize, albumSize);
+	const auto icon = albumIcon.pixmap(albumSize, albumSize);
 	item->setToolTip(0, tooltip(album, icon));
 }
 

diff --git a/src/util/tooltip.hpp b/src/util/tooltip.hpp
@@ -16,9 +16,9 @@ class Tooltip
 	Tooltip(lib::settings &settings,
 		const lib::http_client &httpClient, lib::cache &cache);
 
-	void set(QListWidgetItem *item, const lib::spt::track &track);
+	void set(QListWidgetItem *item, const lib::spt::track &track, const QIcon &albumIcon);
 	void set(QTreeWidgetItem *item, const lib::spt::track &track);
-	void set(QTreeWidgetItem *item, const lib::spt::album &album);
+	void set(QTreeWidgetItem *item, const lib::spt::album &album, const QIcon &albumIcon);
 
 private:
 	static constexpr int iconSize = 16;

diff --git a/src/view/artist/albumslist.cpp b/src/view/artist/albumslist.cpp
@@ -178,5 +178,5 @@ void Artist::AlbumsList::onItemEntered(QTreeWidgetItem *item, int column)
 	}
 
 	const auto album = getAlbum(item);
-	tooltip.set(item, album);
+	tooltip.set(item, album, item->icon(0));
 }
diff --git a/src/view/artist/trackslist.cpp b/src/view/artist/trackslist.cpp
@@ -108,5 +108,5 @@ void Artist::TracksList::onItemEntered(QListWidgetItem *item)
 
 	const auto &trackData = item->data(static_cast<int>(DataRole::Track));
 	const auto &track = trackData.value<lib::spt::track>();
-	tooltip.set(item, track);
+	tooltip.set(item, track, item->icon());
 }
diff --git a/src/view/search/albums.cpp b/src/view/search/albums.cpp
@@ -76,5 +76,5 @@ void Search::Albums::onItemEntered(QTreeWidgetItem *item, int column)
 
 	const auto albumData = item->data(0, static_cast<int>(DataRole::Album));
 	const auto album = albumData.value<lib::spt::album>();
-	tooltip.set(item, album);
+	tooltip.set(item, album, item->icon(0));
 }