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_debug_tab.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'src/yuzu/configuration/configure_debug_tab.cpp') diff --git a/src/yuzu/configuration/configure_debug_tab.cpp b/src/yuzu/configuration/configure_debug_tab.cpp index 67d369249..03f266adf 100644 --- a/src/yuzu/configuration/configure_debug_tab.cpp +++ b/src/yuzu/configuration/configure_debug_tab.cpp @@ -2,21 +2,30 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include "ui_configure_debug_tab.h" +#include "yuzu/configuration/configure_cpu_debug.h" +#include "yuzu/configuration/configure_debug.h" #include "yuzu/configuration/configure_debug_tab.h" -ConfigureDebugTab::ConfigureDebugTab(QWidget* parent) - : QWidget(parent), ui(new Ui::ConfigureDebugTab) { +ConfigureDebugTab::ConfigureDebugTab(Core::System& system_, QWidget* parent) + : QWidget(parent), + ui(new Ui::ConfigureDebugTab), system{system_}, debug_tab{std::make_unique( + system_, this)}, + cpu_debug_tab{std::make_unique(system_, this)} { ui->setupUi(this); + ui->tabWidget->addTab(debug_tab.get(), tr("Debug")); + ui->tabWidget->addTab(cpu_debug_tab.get(), tr("CPU")); + SetConfiguration(); } ConfigureDebugTab::~ConfigureDebugTab() = default; void ConfigureDebugTab::ApplyConfiguration() { - ui->debugTab->ApplyConfiguration(); - ui->cpuDebugTab->ApplyConfiguration(); + debug_tab->ApplyConfiguration(); + cpu_debug_tab->ApplyConfiguration(); } void ConfigureDebugTab::SetCurrentIndex(int index) { -- cgit v1.2.3