piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11798 from Dentomologist/remove_obsolete_widget_member_variable

Browse Source 
Qt/GeneralWidget and GraphicsWidget: Remove unused member variable
This commit is contained in:
Léo Lam 2023-04-28 01:20:50 +01:00 committed by GitHub
commit 88320f385d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp
View File

@ -26,13 +26,10 @@
#include "DolphinQt/QtUtils/ModalMessageBox.h"
#include "DolphinQt/Settings.h"
#include "UICommon/VideoUtils.h"
#include "VideoCommon/VideoBackendBase.h"
#include "VideoCommon/VideoConfig.h"
GeneralWidget::GeneralWidget(X11Utils::XRRConfiguration* xrr_config, GraphicsWindow* parent)
: m_xrr_config(xrr_config)
GeneralWidget::GeneralWidget(GraphicsWindow* parent)
{
CreateWidgets();
LoadSettings();

9
Source/Core/DolphinQt/Config/Graphics/GeneralWidget.h
View File

@ -16,16 +16,11 @@ class QRadioButton;
class QGridLayout;
class ToolTipComboBox;
namespace X11Utils
{
class XRRConfiguration;
}
class GeneralWidget final : public GraphicsWidget
{
Q_OBJECT
public:
explicit GeneralWidget(X11Utils::XRRConfiguration* xrr_config, GraphicsWindow* parent);
explicit GeneralWidget(GraphicsWindow* parent);
signals:
void BackendChanged(const QString& backend);
@ -55,6 +50,4 @@ private:
ConfigBool* m_render_main_window;
std::array<GraphicsRadioInt*, 4> m_shader_compilation_mode{};
ConfigBool* m_wait_for_shaders;
X11Utils::XRRConfiguration* m_xrr_config;
};

5
Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp
View File

@ -24,8 +24,7 @@
#include "VideoCommon/VideoBackendBase.h"
#include "VideoCommon/VideoConfig.h"
GraphicsWindow::GraphicsWindow(X11Utils::XRRConfiguration* xrr_config, MainWindow* parent)
: QDialog(parent), m_xrr_config(xrr_config)
GraphicsWindow::GraphicsWindow(MainWindow* parent) : QDialog(parent)
{
CreateMainLayout();
@ -46,7 +45,7 @@ void GraphicsWindow::CreateMainLayout()
main_layout->addWidget(tab_widget);
main_layout->addWidget(button_box);
auto* const general_widget = new GeneralWidget(m_xrr_config, this);
auto* const general_widget = new GeneralWidget(this);
auto* const enhancements_widget = new EnhancementsWidget(this);
auto* const hacks_widget = new HacksWidget(this);
auto* const advanced_widget = new AdvancedWidget(this);

9
Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.h
View File

@ -16,16 +16,11 @@ class QTabWidget;
class QDialogButtonBox;
class SoftwareRendererWidget;
namespace X11Utils
{
class XRRConfiguration;
}
class GraphicsWindow final : public QDialog
{
Q_OBJECT
public:
explicit GraphicsWindow(X11Utils::XRRConfiguration* xrr_config, MainWindow* parent);
explicit GraphicsWindow(MainWindow* parent);
signals:
void BackendChanged(const QString& backend);
@ -33,6 +28,4 @@ signals:
private:
void CreateMainLayout();
void OnBackendChanged(const QString& backend);
X11Utils::XRRConfiguration* m_xrr_config;
};

4
Source/Core/DolphinQt/MainWindow.cpp
View File

@ -1282,10 +1282,8 @@ void MainWindow::ShowGraphicsWindow()
"display", windowHandle())),
winId());
}
m_graphics_window = new GraphicsWindow(m_xrr_config.get(), this);
#else
m_graphics_window = new GraphicsWindow(nullptr, this);
#endif
m_graphics_window = new GraphicsWindow(this);
InstallHotkeyFilter(m_graphics_window);
}