From b11b4be7cb764bc0c1aa6c563ccf41a3d1b335dd Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Fri, 5 May 2023 23:31:24 -0400 Subject: [PATCH] configure_per_game: Rename group to tab_group --- src/yuzu/configuration/configure_per_game.cpp | 18 +++++++++--------- src/yuzu/configuration/configure_per_game.h | 3 ++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/yuzu/configuration/configure_per_game.cpp b/src/yuzu/configuration/configure_per_game.cpp index c54d7e76f..7ec0bf9d3 100644 --- a/src/yuzu/configuration/configure_per_game.cpp +++ b/src/yuzu/configuration/configure_per_game.cpp @@ -42,22 +42,22 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::st std::vector& vk_device_records, Core::System& system_) : QDialog(parent), ui(std::make_unique()), title_id{title_id_}, - system{system_}, group{std::make_shared>()} { + system{system_}, tab_group{std::make_shared>()} { const auto file_path = std::filesystem::path(Common::FS::ToU8String(file_name)); const auto config_file_name = title_id == 0 ? Common::FS::PathToUTF8String(file_path.filename()) : fmt::format("{:016X}", title_id); game_config = std::make_unique(config_file_name, Config::ConfigType::PerGameConfig); addons_tab = std::make_unique(system_, this); - audio_tab = std::make_unique(system_, group, this); - cpu_tab = std::make_unique(system_, group, this); - general_tab = std::make_unique(system_, group, this); - graphics_advanced_tab = std::make_unique(system_, group, this); + audio_tab = std::make_unique(system_, tab_group, this); + cpu_tab = std::make_unique(system_, tab_group, this); + general_tab = std::make_unique(system_, tab_group, this); + graphics_advanced_tab = std::make_unique(system_, tab_group, this); graphics_tab = std::make_unique( - system_, vk_device_records, [&]() { graphics_advanced_tab->ExposeComputeOption(); }, group, - this); + system_, vk_device_records, [&]() { graphics_advanced_tab->ExposeComputeOption(); }, + tab_group, this); input_tab = std::make_unique(system_, game_config.get(), this); - system_tab = std::make_unique(system_, group, this); + system_tab = std::make_unique(system_, tab_group, this); ui->setupUi(this); @@ -90,7 +90,7 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::st ConfigurePerGame::~ConfigurePerGame() = default; void ConfigurePerGame::ApplyConfiguration() { - for (const auto tab : *group) { + for (const auto tab : *tab_group) { tab->ApplyConfiguration(); } addons_tab->ApplyConfiguration(); diff --git a/src/yuzu/configuration/configure_per_game.h b/src/yuzu/configuration/configure_per_game.h index 5326e70e6..9fceff414 100644 --- a/src/yuzu/configuration/configure_per_game.h +++ b/src/yuzu/configuration/configure_per_game.h @@ -75,7 +75,8 @@ private: std::unique_ptr game_config; Core::System& system; - std::shared_ptr> group; + std::shared_ptr> tab_group; + std::unique_ptr addons_tab; std::unique_ptr audio_tab; std::unique_ptr cpu_tab;