From f4751b1547423ee1e83d7b15955c4ab25d4c3c80 Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Wed, 26 Apr 2023 16:44:33 -0700 Subject: [PATCH] Qt/GraphicsWindow: Remove unnecessary member variables These variables are only used in CreateMainLayout and can thus be local instead. --- .../Config/Graphics/GraphicsWindow.cpp | 39 +++++++++---------- .../Config/Graphics/GraphicsWindow.h | 15 ------- 2 files changed, 19 insertions(+), 35 deletions(-) diff --git a/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp b/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp index e4e1978c8a..e346a6d0dd 100644 --- a/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp @@ -37,32 +37,31 @@ GraphicsWindow::GraphicsWindow(X11Utils::XRRConfiguration* xrr_config, MainWindo void GraphicsWindow::CreateMainLayout() { - auto* main_layout = new QVBoxLayout(); - m_tab_widget = new QTabWidget(); - m_button_box = new QDialogButtonBox(QDialogButtonBox::Close); + auto* const main_layout = new QVBoxLayout(); + auto* const tab_widget = new QTabWidget(); + auto* const button_box = new QDialogButtonBox(QDialogButtonBox::Close); - connect(m_button_box, &QDialogButtonBox::rejected, this, &QDialog::reject); + connect(button_box, &QDialogButtonBox::rejected, this, &QDialog::reject); - main_layout->addWidget(m_tab_widget); - main_layout->addWidget(m_button_box); + main_layout->addWidget(tab_widget); + main_layout->addWidget(button_box); - m_general_widget = new GeneralWidget(m_xrr_config, this); - m_enhancements_widget = new EnhancementsWidget(this); - m_hacks_widget = new HacksWidget(this); - m_advanced_widget = new AdvancedWidget(this); + auto* const general_widget = new GeneralWidget(m_xrr_config, this); + auto* const enhancements_widget = new EnhancementsWidget(this); + auto* const hacks_widget = new HacksWidget(this); + auto* const advanced_widget = new AdvancedWidget(this); - connect(m_general_widget, &GeneralWidget::BackendChanged, this, - &GraphicsWindow::OnBackendChanged); + connect(general_widget, &GeneralWidget::BackendChanged, this, &GraphicsWindow::OnBackendChanged); - m_wrapped_general = GetWrappedWidget(m_general_widget, this, 50, 100); - m_wrapped_enhancements = GetWrappedWidget(m_enhancements_widget, this, 50, 100); - m_wrapped_hacks = GetWrappedWidget(m_hacks_widget, this, 50, 100); - m_wrapped_advanced = GetWrappedWidget(m_advanced_widget, this, 50, 100); + QWidget* const wrapped_general = GetWrappedWidget(general_widget, this, 50, 100); + QWidget* const wrapped_enhancements = GetWrappedWidget(enhancements_widget, this, 50, 100); + QWidget* const wrapped_hacks = GetWrappedWidget(hacks_widget, this, 50, 100); + QWidget* const wrapped_advanced = GetWrappedWidget(advanced_widget, this, 50, 100); - m_tab_widget->addTab(m_wrapped_general, tr("General")); - m_tab_widget->addTab(m_wrapped_enhancements, tr("Enhancements")); - m_tab_widget->addTab(m_wrapped_hacks, tr("Hacks")); - m_tab_widget->addTab(m_wrapped_advanced, tr("Advanced")); + tab_widget->addTab(wrapped_general, tr("General")); + tab_widget->addTab(wrapped_enhancements, tr("Enhancements")); + tab_widget->addTab(wrapped_hacks, tr("Hacks")); + tab_widget->addTab(wrapped_advanced, tr("Advanced")); setLayout(main_layout); } diff --git a/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.h b/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.h index 68bab30064..050b22d15a 100644 --- a/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.h +++ b/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.h @@ -34,20 +34,5 @@ private: void CreateMainLayout(); void OnBackendChanged(const QString& backend); - QTabWidget* m_tab_widget; - QDialogButtonBox* m_button_box; - - AdvancedWidget* m_advanced_widget; - EnhancementsWidget* m_enhancements_widget; - HacksWidget* m_hacks_widget; - GeneralWidget* m_general_widget; - SoftwareRendererWidget* m_software_renderer; - - QWidget* m_wrapped_advanced; - QWidget* m_wrapped_enhancements; - QWidget* m_wrapped_hacks; - QWidget* m_wrapped_general; - QWidget* m_wrapped_software; - X11Utils::XRRConfiguration* m_xrr_config; };