dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace Windows conflicting "LoadIcon" with "SetIcon"

Browse Source 
Windows headers defines LoadIcon to LoadIconW when UNICODE is defined.
This commit is contained in:
Jonas Kvinge
2025-01-31 16:10:23 +01:00
parent eae7e2a9e6
commit 1572d241d5
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/device/deviceinfo.cpp
View File

@@ -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; icon_name_ = "device"_L1;

2
src/device/deviceinfo.h
View File

@@ -98,7 +98,7 @@ class DeviceInfo : public SimpleTreeItem<DeviceInfo> {
DeviceDatabaseBackend::Device SaveToDb() const; DeviceDatabaseBackend::Device SaveToDb() const;
// Tries to load a good icon for the device. Sets icon_name_ and icon_. // 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) // Gets the best backend available (the one with the highest priority)
const Backend *BestBackend() const; const Backend *BestBackend() const;

10
src/device/devicemanager.cpp
View File

@@ -256,7 +256,7 @@ void DeviceManager::AddDeviceFromDB(DeviceInfo *info) {
for (const QString &icon_name : icon_names) { for (const QString &icon_name : icon_names) {
icons << icon_name; icons << icon_name;
} }
info->LoadIcon(icons, info->friendly_name_); info->SetIcon(icons, info->friendly_name_);
DeviceInfo *existing = FindEquivalentDevice(info); DeviceInfo *existing = FindEquivalentDevice(info);
if (existing) { if (existing) {
@@ -477,7 +477,7 @@ void DeviceManager::PhysicalDeviceAdded(const QString &id) {
if (info->database_id_ == -1 && info->BestBackend() && info->BestBackend()->lister_ == lister) { if (info->database_id_ == -1 && info->BestBackend() && info->BestBackend()->lister_ == lister) {
info->friendly_name_ = lister->MakeFriendlyName(id); info->friendly_name_ = lister->MakeFriendlyName(id);
info->size_ = lister->DeviceCapacity(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); QModelIndex idx = ItemToIndex(info);
if (idx.isValid()) Q_EMIT dataChanged(idx, idx); 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->backends_ << DeviceInfo::Backend(lister, id);
info->friendly_name_ = lister->MakeFriendlyName(id); info->friendly_name_ = lister->MakeFriendlyName(id);
info->size_ = lister->DeviceCapacity(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<int>(devices_.count()), static_cast<int>(devices_.count())); beginInsertRows(ItemToIndex(root_), static_cast<int>(devices_.count()), static_cast<int>(devices_.count()));
devices_ << info; devices_ << info;
endInsertRows(); endInsertRows();
@@ -808,7 +808,7 @@ void DeviceManager::RemoveFromDB(DeviceInfo *info, const QModelIndex &idx) {
const QString id = info->BestBackend()->unique_id_; const QString id = info->BestBackend()->unique_id_;
info->friendly_name_ = info->BestBackend()->lister_->MakeFriendlyName(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); Q_EMIT dataChanged(idx, idx);
} }
@@ -822,7 +822,7 @@ void DeviceManager::SetDeviceOptions(const QModelIndex &idx, const QString &frie
if (!info) return; if (!info) return;
info->friendly_name_ = friendly_name; 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_mode_ = mode;
info->transcode_format_ = format; info->transcode_format_ = format;