From 72e6a3069d45d589fb078c80f4a7a30f979aa5cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= <Bruebach.Lukas@bdosecurity.de>
Date: Wed, 9 Jul 2025 21:42:24 +0200
Subject: [PATCH] Fixups.

Took 2 minutes
---
 .../picture_loader/picture_loader_local.cpp   | 28 +++++++------------
 .../ui/picture_loader/picture_loader_local.h  |  2 --
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp b/cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp
index f6ef3f704..0d9d45738 100644
--- a/cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp
+++ b/cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp
@@ -11,13 +11,10 @@ static constexpr int REFRESH_INTERVAL_MS = 10 * 1000;
 
 PictureLoaderLocal::PictureLoaderLocal(QObject *parent)
     : QObject(parent), picsPath(SettingsCache::instance().getPicsPath()),
-      customPicsPath(SettingsCache::instance().getCustomPicsPath()),
-      overrideAllCardArtWithPersonalPreference(SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference())
+      customPicsPath(SettingsCache::instance().getCustomPicsPath())
 {
     // Hook up signals to settings
     connect(&SettingsCache::instance(), &SettingsCache::picsPathChanged, this, &PictureLoaderLocal::picsPathChanged);
-    connect(&SettingsCache::instance(), &SettingsCache::overrideAllCardArtWithPersonalPreferenceChanged, this,
-            &PictureLoaderLocal::setOverrideAllCardArtWithPersonalPreference);
 
     refreshIndex();
 
@@ -89,15 +86,15 @@ QImage PictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName,
     // Order is cardName_providerId, cardName_setName_collectorNumber, setName-collectorNumber-cardName and then just
     // generically cardName, if the user has decided to override every printing. Most-to-least specific.
 
-    const QStringList nameVariants = {!providerId.isEmpty() ? QString("%1_%2").arg(correctedCardName, providerId)
-                                                            : QString(),
-                                      (!setName.isEmpty() && !collectorNumber.isEmpty())
-                                          ? QString("%1_%2_%3").arg(correctedCardName, setName, collectorNumber)
-                                          : QString(),
-                                      (!setName.isEmpty() && !collectorNumber.isEmpty())
-                                          ? QString("%1-%2-%3").arg(setName, collectorNumber, correctedCardName)
-                                          : QString(),
-                                      correctedCardName};
+    QStringList nameVariants;
+    if (!providerId.isEmpty()) {
+        nameVariants << QString("%1_%2").arg(correctedCardName, providerId);
+    }
+    if (!setName.isEmpty() && !collectorNumber.isEmpty()) {
+        nameVariants << QString("%1_%2_%3").arg(correctedCardName, setName, collectorNumber)
+                     << QString("%1-%2-%3").arg(setName, collectorNumber, correctedCardName);
+    }
+    nameVariants << correctedCardName;
 
     for (const QString &nameVariant : nameVariants) {
         if (nameVariant.isEmpty()) {
@@ -144,8 +141,3 @@ void PictureLoaderLocal::picsPathChanged()
     picsPath = SettingsCache::instance().getPicsPath();
     customPicsPath = SettingsCache::instance().getCustomPicsPath();
 }
-
-void PictureLoaderLocal::setOverrideAllCardArtWithPersonalPreference(bool _overrideAllCardArtWithPersonalPreference)
-{
-    overrideAllCardArtWithPersonalPreference = _overrideAllCardArtWithPersonalPreference;
-}
diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_local.h b/cockatrice/src/client/ui/picture_loader/picture_loader_local.h
index d5aac09f3..38b9fd0c3 100644
--- a/cockatrice/src/client/ui/picture_loader/picture_loader_local.h
+++ b/cockatrice/src/client/ui/picture_loader/picture_loader_local.h
@@ -24,7 +24,6 @@ public:
 
 private:
     QString picsPath, customPicsPath;
-    bool overrideAllCardArtWithPersonalPreference;
 
     QMultiHash<QString, QString> customFolderIndex; // multimap of cardName to picPaths
     QTimer *refreshTimer;
@@ -38,7 +37,6 @@ private:
 
 private slots:
     void picsPathChanged();
-    void setOverrideAllCardArtWithPersonalPreference(bool _overrideAllCardArtWithPersonalPreference);
 };
 
 #endif // PICTURE_LOADER_LOCAL_H