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/bootmanager.h | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/yuzu/bootmanager.h')

diff --git a/src/yuzu/bootmanager.h b/src/yuzu/bootmanager.h
index 54c4e2142..8d7ab8c2e 100644
--- a/src/yuzu/bootmanager.h
+++ b/src/yuzu/bootmanager.h
@@ -34,13 +34,14 @@ enum class MouseButton;
 
 namespace VideoCore {
 enum class LoadCallbackStage;
-}
+class RendererBase;
+} // namespace VideoCore
 
 class EmuThread final : public QThread {
     Q_OBJECT
 
 public:
-    explicit EmuThread();
+    explicit EmuThread(Core::System& system_);
     ~EmuThread() override;
 
     /**
@@ -101,6 +102,7 @@ private:
     std::condition_variable_any running_cv;
     Common::Event running_wait{};
     std::atomic_bool running_guard{false};
+    Core::System& system;
 
 signals:
     /**
@@ -131,7 +133,8 @@ class GRenderWindow : public QWidget, public Core::Frontend::EmuWindow {
 
 public:
     explicit GRenderWindow(GMainWindow* parent, EmuThread* emu_thread_,
-                           std::shared_ptr<InputCommon::InputSubsystem> input_subsystem_);
+                           std::shared_ptr<InputCommon::InputSubsystem> input_subsystem_,
+                           Core::System& system_);
     ~GRenderWindow() override;
 
     // EmuWindow implementation.
@@ -232,6 +235,8 @@ private:
 
     std::array<std::size_t, 16> touch_ids{};
 
+    Core::System& system;
+
 protected:
     void showEvent(QShowEvent* event) override;
     bool eventFilter(QObject* object, QEvent* event) override;
-- 
cgit v1.2.3