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_dialog.h | 38 ++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

(limited to 'src/yuzu/configuration/configure_dialog.h')

diff --git a/src/yuzu/configuration/configure_dialog.h b/src/yuzu/configuration/configure_dialog.h
index abe019635..32ddfd4e0 100644
--- a/src/yuzu/configuration/configure_dialog.h
+++ b/src/yuzu/configuration/configure_dialog.h
@@ -7,6 +7,25 @@
 #include <memory>
 #include <QDialog>
 
+namespace Core {
+class System;
+}
+
+class ConfigureAudio;
+class ConfigureCpu;
+class ConfigureDebugTab;
+class ConfigureFilesystem;
+class ConfigureGeneral;
+class ConfigureGraphics;
+class ConfigureGraphicsAdvanced;
+class ConfigureHotkeys;
+class ConfigureInput;
+class ConfigureProfileManager;
+class ConfigureSystem;
+class ConfigureNetwork;
+class ConfigureUi;
+class ConfigureWeb;
+
 class HotkeyRegistry;
 
 namespace InputCommon {
@@ -22,7 +41,7 @@ class ConfigureDialog : public QDialog {
 
 public:
     explicit ConfigureDialog(QWidget* parent, HotkeyRegistry& registry,
-                             InputCommon::InputSubsystem* input_subsystem);
+                             InputCommon::InputSubsystem* input_subsystem, Core::System& system_);
     ~ConfigureDialog() override;
 
     void ApplyConfiguration();
@@ -45,4 +64,21 @@ private:
 
     std::unique_ptr<Ui::ConfigureDialog> ui;
     HotkeyRegistry& registry;
+
+    Core::System& system;
+
+    std::unique_ptr<ConfigureAudio> audio_tab;
+    std::unique_ptr<ConfigureCpu> cpu_tab;
+    std::unique_ptr<ConfigureDebugTab> debug_tab_tab;
+    std::unique_ptr<ConfigureFilesystem> filesystem_tab;
+    std::unique_ptr<ConfigureGeneral> general_tab;
+    std::unique_ptr<ConfigureGraphics> graphics_tab;
+    std::unique_ptr<ConfigureGraphicsAdvanced> graphics_advanced_tab;
+    std::unique_ptr<ConfigureHotkeys> hotkeys_tab;
+    std::unique_ptr<ConfigureInput> input_tab;
+    std::unique_ptr<ConfigureNetwork> network_tab;
+    std::unique_ptr<ConfigureProfileManager> profile_tab;
+    std::unique_ptr<ConfigureSystem> system_tab;
+    std::unique_ptr<ConfigureUi> ui_tab;
+    std::unique_ptr<ConfigureWeb> web_tab;
 };
-- 
cgit v1.2.3