From 4429e9973f6a54d40052ec29d50e85681c7135c0 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Fri, 31 Jan 2025 16:20:03 +0100 Subject: [PATCH] StandardItemIconLoader : Rename LoadIcon Avoids conflict on Windows where windows headers define LoadIcon to LoadIconW with unicode. --- src/core/standarditemiconloader.cpp | 4 ++-- src/core/standarditemiconloader.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/standarditemiconloader.cpp b/src/core/standarditemiconloader.cpp index 99f4aa9b1..00c27430b 100644 --- a/src/core/standarditemiconloader.cpp +++ b/src/core/standarditemiconloader.cpp @@ -55,7 +55,7 @@ void StandardItemIconLoader::SetModel(QAbstractItemModel *model) { } -void StandardItemIconLoader::LoadIcon(const QUrl &art_automatic, const QUrl &art_manual, QStandardItem *for_item) { +void StandardItemIconLoader::LoadAlbumCover(const QUrl &art_automatic, const QUrl &art_manual, QStandardItem *for_item) { AlbumCoverLoaderOptions cover_options(AlbumCoverLoaderOptions::Option::ScaledImage); cover_options.desired_scaled_size = QSize(16, 16); @@ -64,7 +64,7 @@ void StandardItemIconLoader::LoadIcon(const QUrl &art_automatic, const QUrl &art } -void StandardItemIconLoader::LoadIcon(const Song &song, QStandardItem *for_item) { +void StandardItemIconLoader::LoadAlbumCover(const Song &song, QStandardItem *for_item) { AlbumCoverLoaderOptions cover_options(AlbumCoverLoaderOptions::Option::ScaledImage); cover_options.desired_scaled_size = QSize(16, 16); diff --git a/src/core/standarditemiconloader.h b/src/core/standarditemiconloader.h index 80bb3a445..07b215b13 100644 --- a/src/core/standarditemiconloader.h +++ b/src/core/standarditemiconloader.h @@ -46,8 +46,8 @@ class StandardItemIconLoader : public QObject { void SetModel(QAbstractItemModel *model); - void LoadIcon(const QUrl &art_automatic, const QUrl &art_manual, QStandardItem *for_item); - void LoadIcon(const Song &song, QStandardItem *for_item); + void LoadAlbumCover(const QUrl &art_automatic, const QUrl &art_manual, QStandardItem *for_item); + void LoadAlbumCover(const Song &song, QStandardItem *for_item); private Q_SLOTS: void AlbumCoverLoaded(const quint64 id, const AlbumCoverLoaderResult &result);