diff options
author | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2021-09-02 21:40:55 -0400 |
---|---|---|
committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-10-07 13:50:13 -0400 |
commit | fb66a455c4c7c1e196fc1001a52325a33e50b127 (patch) | |
tree | 97782dab7d9b57b119c765e73a585a6b90484a43 /src/yuzu/configuration/configure_debug_tab.cpp | |
parent | f84328934f5e09894a69d9fa1d2f6a34c715321b (diff) |
yuzu qt: Remove global system instances from config, WaitTree, main
Diffstat (limited to 'src/yuzu/configuration/configure_debug_tab.cpp')
-rw-r--r-- | src/yuzu/configuration/configure_debug_tab.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/yuzu/configuration/configure_debug_tab.cpp b/src/yuzu/configuration/configure_debug_tab.cpp index 67d3692492..03f266adf5 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 <memory> #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<ConfigureDebug>( + system_, this)}, + cpu_debug_tab{std::make_unique<ConfigureCpuDebug>(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) { |