Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

StandardItemIconLoader : Rename LoadIcon

Browse Source 
Avoids conflict on Windows where windows headers define LoadIcon to LoadIconW with unicode.
This commit is contained in:
Jonas Kvinge 2025-01-31 16:20:03 +01:00
parent 1572d241d5
commit 4429e9973f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/standarditemiconloader.cpp
View File

@ -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); AlbumCoverLoaderOptions cover_options(AlbumCoverLoaderOptions::Option::ScaledImage);
cover_options.desired_scaled_size = QSize(16, 16); 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); AlbumCoverLoaderOptions cover_options(AlbumCoverLoaderOptions::Option::ScaledImage);
cover_options.desired_scaled_size = QSize(16, 16); cover_options.desired_scaled_size = QSize(16, 16);

4
src/core/standarditemiconloader.h
View File

@ -46,8 +46,8 @@ class StandardItemIconLoader : public QObject {
void SetModel(QAbstractItemModel *model); void SetModel(QAbstractItemModel *model);
void LoadIcon(const QUrl &art_automatic, const QUrl &art_manual, QStandardItem *for_item); void LoadAlbumCover(const QUrl &art_automatic, const QUrl &art_manual, QStandardItem *for_item);
void LoadIcon(const Song &song, QStandardItem *for_item); void LoadAlbumCover(const Song &song, QStandardItem *for_item);
private Q_SLOTS: private Q_SLOTS:
void AlbumCoverLoaded(const quint64 id, const AlbumCoverLoaderResult &result); void AlbumCoverLoaded(const quint64 id, const AlbumCoverLoaderResult &result);