diff options
| -rw-r--r-- | src/yuzu/configuration/configuration_shared.cpp | 16 | ||||
| -rw-r--r-- | src/yuzu/configuration/configuration_shared.h | 2 |
2 files changed, 0 insertions, 18 deletions
diff --git a/src/yuzu/configuration/configuration_shared.cpp b/src/yuzu/configuration/configuration_shared.cpp index 30b6f7b28..f9becab6e 100644 --- a/src/yuzu/configuration/configuration_shared.cpp +++ b/src/yuzu/configuration/configuration_shared.cpp | |||
| @@ -11,16 +11,6 @@ | |||
| 11 | #include "yuzu/configuration/configure_per_game.h" | 11 | #include "yuzu/configuration/configure_per_game.h" |
| 12 | 12 | ||
| 13 | void ConfigurationShared::ApplyPerGameSetting(Settings::Setting<bool>* setting, | 13 | void ConfigurationShared::ApplyPerGameSetting(Settings::Setting<bool>* setting, |
| 14 | const QCheckBox* checkbox) { | ||
| 15 | if (checkbox->checkState() == Qt::PartiallyChecked) { | ||
| 16 | setting->SetGlobal(true); | ||
| 17 | } else { | ||
| 18 | setting->SetGlobal(false); | ||
| 19 | setting->SetValue(checkbox->checkState() == Qt::Checked); | ||
| 20 | } | ||
| 21 | } | ||
| 22 | |||
| 23 | void ConfigurationShared::ApplyPerGameSetting(Settings::Setting<bool>* setting, | ||
| 24 | const QCheckBox* checkbox, | 14 | const QCheckBox* checkbox, |
| 25 | const CheckState& tracker) { | 15 | const CheckState& tracker) { |
| 26 | if (tracker == CheckState::Global) { | 16 | if (tracker == CheckState::Global) { |
| @@ -142,12 +132,6 @@ void ConfigurationShared::SetColoredComboBox(QComboBox* combobox, QWidget* targe | |||
| 142 | }); | 132 | }); |
| 143 | } | 133 | } |
| 144 | 134 | ||
| 145 | void ConfigurationShared::InsertGlobalItem(QComboBox* combobox) { | ||
| 146 | const QString use_global_text = ConfigurePerGame::tr("Use global configuration"); | ||
| 147 | combobox->insertItem(ConfigurationShared::USE_GLOBAL_INDEX, use_global_text); | ||
| 148 | combobox->insertSeparator(ConfigurationShared::USE_GLOBAL_SEPARATOR_INDEX); | ||
| 149 | } | ||
| 150 | |||
| 151 | void ConfigurationShared::InsertGlobalItem(QComboBox* combobox, int global_index) { | 135 | void ConfigurationShared::InsertGlobalItem(QComboBox* combobox, int global_index) { |
| 152 | const QString use_global_text = | 136 | const QString use_global_text = |
| 153 | ConfigurePerGame::tr("Use global configuration (%1)").arg(combobox->itemText(global_index)); | 137 | ConfigurePerGame::tr("Use global configuration (%1)").arg(combobox->itemText(global_index)); |
diff --git a/src/yuzu/configuration/configuration_shared.h b/src/yuzu/configuration/configuration_shared.h index e9d765b94..003148c68 100644 --- a/src/yuzu/configuration/configuration_shared.h +++ b/src/yuzu/configuration/configuration_shared.h | |||
| @@ -26,7 +26,6 @@ enum class CheckState { | |||
| 26 | 26 | ||
| 27 | void ApplyPerGameSetting(Settings::Setting<bool>* setting, const QCheckBox* checkbox, | 27 | void ApplyPerGameSetting(Settings::Setting<bool>* setting, const QCheckBox* checkbox, |
| 28 | const CheckState& tracker); | 28 | const CheckState& tracker); |
| 29 | void ApplyPerGameSetting(Settings::Setting<bool>* setting, const QCheckBox* checkbox); | ||
| 30 | void ApplyPerGameSetting(Settings::Setting<int>* setting, const QComboBox* combobox); | 29 | void ApplyPerGameSetting(Settings::Setting<int>* setting, const QComboBox* combobox); |
| 31 | void ApplyPerGameSetting(Settings::Setting<Settings::RendererBackend>* setting, | 30 | void ApplyPerGameSetting(Settings::Setting<Settings::RendererBackend>* setting, |
| 32 | const QComboBox* combobox); | 31 | const QComboBox* combobox); |
| @@ -48,7 +47,6 @@ void SetColoredTristate(QCheckBox* checkbox, const std::string& name, bool globa | |||
| 48 | void SetColoredComboBox(QComboBox* combobox, QWidget* target, const std::string& target_name, | 47 | void SetColoredComboBox(QComboBox* combobox, QWidget* target, const std::string& target_name, |
| 49 | int global); | 48 | int global); |
| 50 | 49 | ||
| 51 | void InsertGlobalItem(QComboBox* combobox); | ||
| 52 | void InsertGlobalItem(QComboBox* combobox, int global_index); | 50 | void InsertGlobalItem(QComboBox* combobox, int global_index); |
| 53 | 51 | ||
| 54 | } // namespace ConfigurationShared | 52 | } // namespace ConfigurationShared |