diff options
author | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2023-06-14 02:35:24 +0200 |
---|---|---|
committer | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2023-07-21 16:56:54 +0200 |
commit | 3240d199a29ca8a8d21f5008045767a7cb89b51d (patch) | |
tree | 82332df3cb9318cd7dfdffb1f9af4794ada0a23d | |
parent | settings: Delete cpu_accuracy_first_time (diff) | |
download | yuzu-3240d199a29ca8a8d21f5008045767a7cb89b51d.tar yuzu-3240d199a29ca8a8d21f5008045767a7cb89b51d.tar.gz yuzu-3240d199a29ca8a8d21f5008045767a7cb89b51d.tar.bz2 yuzu-3240d199a29ca8a8d21f5008045767a7cb89b51d.tar.lz yuzu-3240d199a29ca8a8d21f5008045767a7cb89b51d.tar.xz yuzu-3240d199a29ca8a8d21f5008045767a7cb89b51d.tar.zst yuzu-3240d199a29ca8a8d21f5008045767a7cb89b51d.zip |
-rw-r--r-- | src/yuzu/configuration/config.cpp | 81 | ||||
-rw-r--r-- | src/yuzu/configuration/config.h | 47 |
2 files changed, 0 insertions, 128 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index ffd4c623d..5755e5b2d 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -171,66 +171,6 @@ bool Config::IsCustomConfig() { return type == ConfigType::PerGameConfig; } -/* {Read,Write}BasicSetting and WriteGlobalSetting templates must be defined here before their - * usages later in this file. This allows explicit definition of some types that don't work - * nicely with the general version. - */ - -// Explicit std::string definition: Qt can't implicitly convert a std::string to a QVariant, nor -// can it implicitly convert a QVariant back to a {std::,Q}string -template <> -void Config::ReadBasicSetting(Settings::Setting<std::string>& setting) { - const QString name = QString::fromStdString(setting.GetLabel()); - const auto default_value = QString::fromStdString(setting.GetDefault()); - if (qt_config->value(name + QStringLiteral("/default"), false).toBool()) { - setting.SetValue(default_value.toStdString()); - } else { - setting.SetValue(qt_config->value(name, default_value).toString().toStdString()); - } -} - -template <typename Type, bool ranged> -void Config::ReadBasicSetting(Settings::Setting<Type, ranged>& setting) { - const QString name = QString::fromStdString(setting.GetLabel()); - const Type default_value = setting.GetDefault(); - if (qt_config->value(name + QStringLiteral("/default"), false).toBool()) { - setting.SetValue(default_value); - } else { - setting.SetValue( - static_cast<QVariant>(qt_config->value(name, default_value)).value<Type>()); - } -} - -// Explicit std::string definition: Qt can't implicitly convert a std::string to a QVariant -template <> -void Config::WriteBasicSetting(const Settings::Setting<std::string>& setting) { - const QString name = QString::fromStdString(setting.GetLabel()); - const std::string& value = setting.GetValue(); - qt_config->setValue(name + QStringLiteral("/default"), value == setting.GetDefault()); - qt_config->setValue(name, QString::fromStdString(value)); -} - -template <typename Type, bool ranged> -void Config::WriteBasicSetting(const Settings::Setting<Type, ranged>& setting) { - const QString name = QString::fromStdString(setting.GetLabel()); - const Type value = setting.GetValue(); - qt_config->setValue(name + QStringLiteral("/default"), value == setting.GetDefault()); - qt_config->setValue(name, value); -} - -template <typename Type, bool ranged> -void Config::WriteGlobalSetting(const Settings::SwitchableSetting<Type, ranged>& setting) { - const QString name = QString::fromStdString(setting.GetLabel()); - const Type& value = setting.GetValue(global); - if (!global) { - qt_config->setValue(name + QStringLiteral("/use_global"), setting.UsingGlobal()); - } - if (global || !setting.UsingGlobal()) { - qt_config->setValue(name + QStringLiteral("/default"), value == setting.GetDefault()); - qt_config->setValue(name, value); - } -} - void Config::ReadPlayerValue(std::size_t player_index) { const QString player_prefix = [this, player_index] { if (type == ConfigType::InputProfile) { @@ -1230,27 +1170,6 @@ QVariant Config::ReadSetting(const QString& name, const QVariant& default_value) return result; } -template <typename Type, bool ranged> -void Config::ReadGlobalSetting(Settings::SwitchableSetting<Type, ranged>& setting) { - QString name = QString::fromStdString(setting.GetLabel()); - const bool use_global = qt_config->value(name + QStringLiteral("/use_global"), true).toBool(); - setting.SetGlobal(use_global); - if (global || !use_global) { - setting.SetValue(static_cast<QVariant>( - ReadSetting(name, QVariant::fromValue<Type>(setting.GetDefault()))) - .value<Type>()); - } -} - -template <typename Type> -void Config::ReadSettingGlobal(Type& setting, const QString& name, - const QVariant& default_value) const { - const bool use_global = qt_config->value(name + QStringLiteral("/use_global"), true).toBool(); - if (global || !use_global) { - setting = ReadSetting(name, default_value).value<Type>(); - } -} - void Config::WriteSetting(const QString& name, const QVariant& value) { qt_config->setValue(name, value); } diff --git a/src/yuzu/configuration/config.h b/src/yuzu/configuration/config.h index c00e717b8..a68f291a2 100644 --- a/src/yuzu/configuration/config.h +++ b/src/yuzu/configuration/config.h @@ -139,18 +139,6 @@ private: QVariant ReadSetting(const QString& name, const QVariant& default_value) const; /** - * Only reads a setting from the qt_config if the current config is a global config, or if the - * current config is a custom config and the setting is overriding the global setting. Otherwise - * it does nothing. - * - * @param setting The variable to be modified - * @param name The setting's identifier - * @param default_value The value to use when the setting is not already present in the config - */ - template <typename Type> - void ReadSettingGlobal(Type& setting, const QString& name, const QVariant& default_value) const; - - /** * Writes a setting to the qt_config. * * @param name The setting's idetentifier @@ -164,41 +152,6 @@ private: void WriteSetting(const QString& name, const QVariant& value, const QVariant& default_value, bool use_global); - /** - * Reads a value from the qt_config and applies it to the setting, using its label and default - * value. If the config is a custom config, this will also read the global state of the setting - * and apply that information to it. - * - * @param The setting - */ - template <typename Type, bool ranged> - void ReadGlobalSetting(Settings::SwitchableSetting<Type, ranged>& setting); - - /** - * Sets a value to the qt_config using the setting's label and default value. If the config is a - * custom config, it will apply the global state, and the custom value if needed. - * - * @param The setting - */ - template <typename Type, bool ranged> - void WriteGlobalSetting(const Settings::SwitchableSetting<Type, ranged>& setting); - - /** - * Reads a value from the qt_config using the setting's label and default value and applies the - * value to the setting. - * - * @param The setting - */ - template <typename Type, bool ranged> - void ReadBasicSetting(Settings::Setting<Type, ranged>& setting); - - /** Sets a value from the setting in the qt_config using the setting's label and default value. - * - * @param The setting - */ - template <typename Type, bool ranged> - void WriteBasicSetting(const Settings::Setting<Type, ranged>& setting); - void ReadCategory(Settings::Category category); void WriteCategory(Settings::Category category); void ReadSettingGeneric(Settings::BasicSetting* const setting); |