summaryrefslogtreecommitdiff
path: root/src/yuzu/configuration/configuration_shared.cpp
diff options
context:
space:
mode:
authorlat9nq <lat9nq@virginia.edu>2020-07-14 15:40:02 -0400
committerlat9nq <lat9nq@virginia.edu>2020-07-19 13:26:55 -0400
commit335aef78c43ec5b488575b5eb790ae6e32ec7b63 (patch)
tree1cbceacb97deb6125564a99ced9e662edf3bcad8 /src/yuzu/configuration/configuration_shared.cpp
parent55ac28769aec7df378e8afe97b015bb2a56a7fd5 (diff)
configuration_shared: Make CheckState strongly typed
Also gets rid of unnecessary explicit namespace usage.
Diffstat (limited to 'src/yuzu/configuration/configuration_shared.cpp')
-rw-r--r--src/yuzu/configuration/configuration_shared.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/yuzu/configuration/configuration_shared.cpp b/src/yuzu/configuration/configuration_shared.cpp
index e6141e6a9..30b6f7b28 100644
--- a/src/yuzu/configuration/configuration_shared.cpp
+++ b/src/yuzu/configuration/configuration_shared.cpp
@@ -95,42 +95,42 @@ void ConfigurationShared::SetHighlight(QWidget* widget, const std::string& name,
void ConfigurationShared::SetColoredTristate(QCheckBox* checkbox, const std::string& name,
const Settings::Setting<bool>& setting,
- ConfigurationShared::CheckState& tracker) {
+ CheckState& tracker) {
if (setting.UsingGlobal()) {
tracker = CheckState::Global;
} else {
tracker = (setting.GetValue() == setting.GetValue(true)) ? CheckState::On : CheckState::Off;
}
SetHighlight(checkbox, name, tracker != CheckState::Global);
- QObject::connect(
- checkbox, &QCheckBox::clicked, checkbox, [checkbox, name, setting, &tracker]() {
- tracker =
- static_cast<ConfigurationShared::CheckState>((tracker + 1) % CheckState::Count);
- if (tracker == CheckState::Global) {
- checkbox->setChecked(setting.GetValue(true));
- }
- SetHighlight(checkbox, name, tracker != CheckState::Global);
- });
+ QObject::connect(checkbox, &QCheckBox::clicked, checkbox,
+ [checkbox, name, setting, &tracker]() {
+ tracker = static_cast<CheckState>((static_cast<int>(tracker) + 1) %
+ static_cast<int>(CheckState::Count));
+ if (tracker == CheckState::Global) {
+ checkbox->setChecked(setting.GetValue(true));
+ }
+ SetHighlight(checkbox, name, tracker != CheckState::Global);
+ });
}
void ConfigurationShared::SetColoredTristate(QCheckBox* checkbox, const std::string& name,
bool global, bool state, bool global_state,
- ConfigurationShared::CheckState& tracker) {
+ CheckState& tracker) {
if (global) {
tracker = CheckState::Global;
} else {
tracker = (state == global_state) ? CheckState::On : CheckState::Off;
}
SetHighlight(checkbox, name, tracker != CheckState::Global);
- QObject::connect(
- checkbox, &QCheckBox::clicked, checkbox, [checkbox, name, global_state, &tracker]() {
- tracker =
- static_cast<ConfigurationShared::CheckState>((tracker + 1) % CheckState::Count);
- if (tracker == CheckState::Global) {
- checkbox->setChecked(global_state);
- }
- SetHighlight(checkbox, name, tracker != CheckState::Global);
- });
+ QObject::connect(checkbox, &QCheckBox::clicked, checkbox,
+ [checkbox, name, global_state, &tracker]() {
+ tracker = static_cast<CheckState>((static_cast<int>(tracker) + 1) %
+ static_cast<int>(CheckState::Count));
+ if (tracker == CheckState::Global) {
+ checkbox->setChecked(global_state);
+ }
+ SetHighlight(checkbox, name, tracker != CheckState::Global);
+ });
}
void ConfigurationShared::SetColoredComboBox(QComboBox* combobox, QWidget* target,