aboutsummaryrefslogtreecommitdiff
path: root/src/yuzu/configuration/configure_system.cpp
diff options
context:
space:
mode:
authorlat9nq <22451773+lat9nq@users.noreply.github.com>2023-06-06 22:30:02 -0400
committerlat9nq <22451773+lat9nq@users.noreply.github.com>2023-07-21 10:56:07 -0400
commit9e3c94bb3dd1a9065977930a985be43f6052044c (patch)
tree9c951e9ed9db274be7950cf70e9b58502100d7ba /src/yuzu/configuration/configure_system.cpp
parentf7948b7b64900451b34a639ca0564c6950b5e58e (diff)
configuration: Use IDs to sort holds
Diffstat (limited to 'src/yuzu/configuration/configure_system.cpp')
-rw-r--r--src/yuzu/configuration/configure_system.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp
index ae59d2ee7a..4b0e0a6490 100644
--- a/src/yuzu/configuration/configure_system.cpp
+++ b/src/yuzu/configuration/configure_system.cpp
@@ -109,8 +109,8 @@ void ConfigureSystem::Setup() {
auto& core_layout = *ui->core_widget->layout();
auto& system_layout = *ui->system_widget->layout();
- std::map<std::string, QWidget*> core_hold{};
- std::map<bool, std::map<std::string, QWidget*>> system_hold{};
+ std::map<u32, QWidget*> core_hold{};
+ std::map<u32, QWidget*> system_hold{};
std::forward_list<Settings::BasicSetting*> settings;
auto push = [&settings](std::forward_list<Settings::BasicSetting*>& list) {
@@ -165,10 +165,10 @@ void ConfigureSystem::Setup() {
switch (setting->Category()) {
case Settings::Category::Core:
- core_hold[setting->GetLabel()] = widget;
+ core_hold.emplace(setting->Id(), widget);
break;
case Settings::Category::System:
- system_hold[setting->IsEnum()].insert(std::pair{setting->GetLabel(), widget});
+ system_hold.emplace(setting->Id(), widget);
break;
default:
delete widget;
@@ -177,10 +177,7 @@ void ConfigureSystem::Setup() {
for (const auto& [label, widget] : core_hold) {
core_layout.addWidget(widget);
}
- for (const auto& [label, widget] : system_hold[true]) {
- system_layout.addWidget(widget);
- }
- for (const auto& [label, widget] : system_hold[false]) {
+ for (const auto& [id, widget] : system_hold) {
system_layout.addWidget(widget);
}
}