Move icon loading to device model

2019-03-22 23:10:42 +01:00
parent 4148c289af
commit 4e599e2aba
4 changed files with 43 additions and 11 deletions
--- a/src/device/deviceinfo.cpp
+++ b/src/device/deviceinfo.cpp
@@ -64,14 +64,7 @@ void DeviceInfo::InitFromDb(const DeviceDatabaseBackend::Device &dev) {
  size_ = dev.size_;
  transcode_mode_ = dev.transcode_mode_;
  transcode_format_ = dev.transcode_format_;
-
-  QStringList icon_names = dev.icon_name_.split(',');
-  QVariantList icons;
-  for (const QString &icon_name : icon_names) {
-    icons << icon_name;
-  }
-
-  LoadIcon(icons, friendly_name_);
+  icon_name_ = dev.icon_name_;

  QStringList unique_ids = dev.unique_id_.split(',');
  for (const QString &id : unique_ids) {