From 1036aa21fcd5f20590dea38933c60eecfc9e9525 Mon Sep 17 00:00:00 2001 From: RickyRister Date: Sun, 24 Nov 2024 17:10:02 -0800 Subject: [PATCH] move default urls to static const --- cockatrice/src/settings/download_settings.cpp | 13 +++++++------ cockatrice/src/settings/download_settings.h | 2 ++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cockatrice/src/settings/download_settings.cpp b/cockatrice/src/settings/download_settings.cpp index 922ad74c5..adbe26363 100644 --- a/cockatrice/src/settings/download_settings.cpp +++ b/cockatrice/src/settings/download_settings.cpp @@ -2,6 +2,12 @@ #include "settings_manager.h" +const QStringList DownloadSettings::DEFAULT_DOWNLOAD_URLS = { + "https://api.scryfall.com/cards/!set:uuid!?format=image&face=!prop:side!", + "https://api.scryfall.com/cards/multiverse/!set:muid!?format=image", + "https://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=!set:muid!&type=card", + "https://gatherer.wizards.com/Handlers/Image.ashx?name=!name!&type=card"}; + DownloadSettings::DownloadSettings(const QString &settingPath, QObject *parent = nullptr) : SettingsManager(settingPath + "downloads.ini", parent) { @@ -19,10 +25,5 @@ QStringList DownloadSettings::getAllURLs() void DownloadSettings::resetToDefaultURLs() { - auto downloadURLs = QStringList(); - downloadURLs.append("https://api.scryfall.com/cards/!set:uuid!?format=image&face=!prop:side!"); - downloadURLs.append("https://api.scryfall.com/cards/multiverse/!set:muid!?format=image"); - downloadURLs.append("https://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=!set:muid!&type=card"); - downloadURLs.append("https://gatherer.wizards.com/Handlers/Image.ashx?name=!name!&type=card"); - setValue(QVariant::fromValue(downloadURLs), "urls", "downloads"); + setValue(QVariant::fromValue(DEFAULT_DOWNLOAD_URLS), "urls", "downloads"); } diff --git a/cockatrice/src/settings/download_settings.h b/cockatrice/src/settings/download_settings.h index fdc75abf2..a961199b3 100644 --- a/cockatrice/src/settings/download_settings.h +++ b/cockatrice/src/settings/download_settings.h @@ -10,6 +10,8 @@ class DownloadSettings : public SettingsManager Q_OBJECT friend class SettingsCache; + static const QStringList DEFAULT_DOWNLOAD_URLS; + public: explicit DownloadSettings(const QString &, QObject *);