From fb66a455c4c7c1e196fc1001a52325a33e50b127 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Thu, 2 Sep 2021 21:40:55 -0400 Subject: yuzu qt: Remove global system instances from config, WaitTree, main --- src/yuzu/configuration/configure_profile_manager.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/yuzu/configuration/configure_profile_manager.cpp') diff --git a/src/yuzu/configuration/configure_profile_manager.cpp b/src/yuzu/configuration/configure_profile_manager.cpp index 136614bf8..2ba65c638 100644 --- a/src/yuzu/configuration/configure_profile_manager.cpp +++ b/src/yuzu/configuration/configure_profile_manager.cpp @@ -76,9 +76,9 @@ QString GetProfileUsernameFromUser(QWidget* parent, const QString& description_t } } // Anonymous namespace -ConfigureProfileManager::ConfigureProfileManager(QWidget* parent) +ConfigureProfileManager::ConfigureProfileManager(Core::System& system_, QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureProfileManager), - profile_manager(std::make_unique()) { + profile_manager(std::make_unique()), system{system_} { ui->setupUi(this); tree_view = new QTreeView; @@ -137,7 +137,7 @@ void ConfigureProfileManager::RetranslateUI() { } void ConfigureProfileManager::SetConfiguration() { - enabled = !Core::System::GetInstance().IsPoweredOn(); + enabled = !system.IsPoweredOn(); item_model->removeRows(0, item_model->rowCount()); list_items.clear(); @@ -180,8 +180,6 @@ void ConfigureProfileManager::ApplyConfiguration() { if (!enabled) { return; } - - Core::System::GetInstance().ApplySettings(); } void ConfigureProfileManager::SelectUser(const QModelIndex& index) { -- cgit v1.2.3