diff --git a/cockatrice/src/database/interface/interface_card_preference_provider.h b/cockatrice/src/database/interface/interface_card_preference_provider.h index e205fccfc..ea599f5e8 100644 --- a/cockatrice/src/database/interface/interface_card_preference_provider.h +++ b/cockatrice/src/database/interface/interface_card_preference_provider.h @@ -3,10 +3,11 @@ #include -class ICardPreferenceProvider { +class ICardPreferenceProvider +{ public: virtual ~ICardPreferenceProvider() = default; virtual QString getCardPreferenceOverride(const QString &cardName) const = 0; }; -#endif //COCKATRICE_INTERFACE_CARD_PREFERENCE_PROVIDER_H +#endif // COCKATRICE_INTERFACE_CARD_PREFERENCE_PROVIDER_H diff --git a/cockatrice/src/database/interface/noop_card_preference_provider.h b/cockatrice/src/database/interface/noop_card_preference_provider.h index 56f715dbf..6e4bf7d73 100644 --- a/cockatrice/src/database/interface/noop_card_preference_provider.h +++ b/cockatrice/src/database/interface/noop_card_preference_provider.h @@ -2,11 +2,13 @@ #define COCKATRICE_NOOP_CARD_PREFERENCE_PROVIDER_H #include "interface_card_preference_provider.h" -class NoopCardPreferenceProvider : public ICardPreferenceProvider { +class NoopCardPreferenceProvider : public ICardPreferenceProvider +{ public: - QString getCardPreferenceOverride(const QString &) const override { + QString getCardPreferenceOverride(const QString &) const override + { return {}; } }; -#endif //COCKATRICE_NOOP_CARD_PREFERENCE_PROVIDER_H +#endif // COCKATRICE_NOOP_CARD_PREFERENCE_PROVIDER_H diff --git a/cockatrice/src/database/interface/settings_card_preference_provider.h b/cockatrice/src/database/interface/settings_card_preference_provider.h index 3c9e6cdc2..fa1ff04f4 100644 --- a/cockatrice/src/database/interface/settings_card_preference_provider.h +++ b/cockatrice/src/database/interface/settings_card_preference_provider.h @@ -1,13 +1,15 @@ #ifndef COCKATRICE_SETTINGS_CARD_PREFERENCE_PROVIDER_H #define COCKATRICE_SETTINGS_CARD_PREFERENCE_PROVIDER_H -#include "interface_card_preference_provider.h" #include "../../settings/cache_settings.h" +#include "interface_card_preference_provider.h" -class SettingsCardPreferenceProvider : public ICardPreferenceProvider { +class SettingsCardPreferenceProvider : public ICardPreferenceProvider +{ public: - QString getCardPreferenceOverride(const QString &cardName) const override { + QString getCardPreferenceOverride(const QString &cardName) const override + { return SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardName); } }; -#endif //COCKATRICE_SETTINGS_CARD_PREFERENCE_PROVIDER_H +#endif // COCKATRICE_SETTINGS_CARD_PREFERENCE_PROVIDER_H