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_general.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/yuzu/configuration/configure_general.cpp')

diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp
index 1f647a0d1..70f067ea7 100644
--- a/src/yuzu/configuration/configure_general.cpp
+++ b/src/yuzu/configuration/configure_general.cpp
@@ -15,8 +15,8 @@
 #include "yuzu/configuration/configure_general.h"
 #include "yuzu/uisettings.h"
 
-ConfigureGeneral::ConfigureGeneral(QWidget* parent)
-    : QWidget(parent), ui(new Ui::ConfigureGeneral) {
+ConfigureGeneral::ConfigureGeneral(Core::System& system_, QWidget* parent)
+    : QWidget(parent), ui(new Ui::ConfigureGeneral), system{system_} {
     ui->setupUi(this);
 
     SetupPerGameUI();
@@ -35,7 +35,7 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent)
 ConfigureGeneral::~ConfigureGeneral() = default;
 
 void ConfigureGeneral::SetConfiguration() {
-    const bool runtime_lock = !Core::System::GetInstance().IsPoweredOn();
+    const bool runtime_lock = !system.IsPoweredOn();
 
     ui->use_multi_core->setEnabled(runtime_lock);
     ui->use_multi_core->setChecked(Settings::values.use_multi_core.GetValue());
-- 
cgit v1.2.3


From 493905665c2e9ea200301b44dcee599933f5b62c Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Fri, 30 Jul 2021 10:07:32 -0400
Subject: configuration: Add const qualifier where able

---
 src/yuzu/configuration/configure_general.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/yuzu/configuration/configure_general.cpp')

diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp
index 70f067ea7..e562e89e5 100644
--- a/src/yuzu/configuration/configure_general.cpp
+++ b/src/yuzu/configuration/configure_general.cpp
@@ -15,7 +15,7 @@
 #include "yuzu/configuration/configure_general.h"
 #include "yuzu/uisettings.h"
 
-ConfigureGeneral::ConfigureGeneral(Core::System& system_, QWidget* parent)
+ConfigureGeneral::ConfigureGeneral(const Core::System& system_, QWidget* parent)
     : QWidget(parent), ui(new Ui::ConfigureGeneral), system{system_} {
     ui->setupUi(this);
 
-- 
cgit v1.2.3