From 1572d241d5f43a5adcb29049a8ba004fb43a8b36 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Fri, 31 Jan 2025 16:10:23 +0100 Subject: [PATCH] Replace Windows conflicting "LoadIcon" with "SetIcon" Windows headers defines LoadIcon to LoadIconW when UNICODE is defined. --- src/device/deviceinfo.cpp | 2 +- src/device/deviceinfo.h | 2 +- src/device/devicemanager.cpp | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/device/deviceinfo.cpp b/src/device/deviceinfo.cpp index 135b96e5b..77cc1f8b2 100644 --- a/src/device/deviceinfo.cpp +++ b/src/device/deviceinfo.cpp @@ -90,7 +90,7 @@ const DeviceInfo::Backend *DeviceInfo::BestBackend() const { } -void DeviceInfo::LoadIcon(const QVariantList &icons, const QString &name_hint) { +void DeviceInfo::SetIcon(const QVariantList &icons, const QString &name_hint) { icon_name_ = "device"_L1; diff --git a/src/device/deviceinfo.h b/src/device/deviceinfo.h index 1bd916a54..6585759a2 100644 --- a/src/device/deviceinfo.h +++ b/src/device/deviceinfo.h @@ -98,7 +98,7 @@ class DeviceInfo : public SimpleTreeItem { DeviceDatabaseBackend::Device SaveToDb() const; // Tries to load a good icon for the device. Sets icon_name_ and icon_. - void LoadIcon(const QVariantList &icons, const QString &name_hint); + void SetIcon(const QVariantList &icons, const QString &name_hint); // Gets the best backend available (the one with the highest priority) const Backend *BestBackend() const; diff --git a/src/device/devicemanager.cpp b/src/device/devicemanager.cpp index c5421284f..4eebb4a8c 100644 --- a/src/device/devicemanager.cpp +++ b/src/device/devicemanager.cpp @@ -256,7 +256,7 @@ void DeviceManager::AddDeviceFromDB(DeviceInfo *info) { for (const QString &icon_name : icon_names) { icons << icon_name; } - info->LoadIcon(icons, info->friendly_name_); + info->SetIcon(icons, info->friendly_name_); DeviceInfo *existing = FindEquivalentDevice(info); if (existing) { @@ -477,7 +477,7 @@ void DeviceManager::PhysicalDeviceAdded(const QString &id) { if (info->database_id_ == -1 && info->BestBackend() && info->BestBackend()->lister_ == lister) { info->friendly_name_ = lister->MakeFriendlyName(id); info->size_ = lister->DeviceCapacity(id); - info->LoadIcon(lister->DeviceIcons(id), info->friendly_name_); + info->SetIcon(lister->DeviceIcons(id), info->friendly_name_); } QModelIndex idx = ItemToIndex(info); if (idx.isValid()) Q_EMIT dataChanged(idx, idx); @@ -488,7 +488,7 @@ void DeviceManager::PhysicalDeviceAdded(const QString &id) { info->backends_ << DeviceInfo::Backend(lister, id); info->friendly_name_ = lister->MakeFriendlyName(id); info->size_ = lister->DeviceCapacity(id); - info->LoadIcon(lister->DeviceIcons(id), info->friendly_name_); + info->SetIcon(lister->DeviceIcons(id), info->friendly_name_); beginInsertRows(ItemToIndex(root_), static_cast(devices_.count()), static_cast(devices_.count())); devices_ << info; endInsertRows(); @@ -808,7 +808,7 @@ void DeviceManager::RemoveFromDB(DeviceInfo *info, const QModelIndex &idx) { const QString id = info->BestBackend()->unique_id_; info->friendly_name_ = info->BestBackend()->lister_->MakeFriendlyName(id); - info->LoadIcon(info->BestBackend()->lister_->DeviceIcons(id), info->friendly_name_); + info->SetIcon(info->BestBackend()->lister_->DeviceIcons(id), info->friendly_name_); Q_EMIT dataChanged(idx, idx); } @@ -822,7 +822,7 @@ void DeviceManager::SetDeviceOptions(const QModelIndex &idx, const QString &frie if (!info) return; info->friendly_name_ = friendly_name; - info->LoadIcon(QVariantList() << icon_name, friendly_name); + info->SetIcon(QVariantList() << icon_name, friendly_name); info->transcode_mode_ = mode; info->transcode_format_ = format;