Qt/GeneralWidget and GraphicsWidget: Remove unused member variable
m_xrr_config was used by the GeneralWidget::GetAvailableResolutions
function to get the list of supported fullscreen resolutions when
HAVE_XRANDR was set. aa4088a
removed the ability to set that resolution
in the UI, leaving the GetAvailableResolutions function unused.
m_xrr_config is initialized in MainWindow which still uses it to toggle
fullscreen, but the references in GeneralWidget and GraphicsWidget
(which just ferried m_xrr_config from MainWindow to GeneralWidget) are
now unnecessary and removed in this commit.
This commit is contained in:
parent
a75d22d901
commit
b59ca9682e
|
@ -26,13 +26,10 @@
|
||||||
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
#include "DolphinQt/QtUtils/ModalMessageBox.h"
|
||||||
#include "DolphinQt/Settings.h"
|
#include "DolphinQt/Settings.h"
|
||||||
|
|
||||||
#include "UICommon/VideoUtils.h"
|
|
||||||
|
|
||||||
#include "VideoCommon/VideoBackendBase.h"
|
#include "VideoCommon/VideoBackendBase.h"
|
||||||
#include "VideoCommon/VideoConfig.h"
|
#include "VideoCommon/VideoConfig.h"
|
||||||
|
|
||||||
GeneralWidget::GeneralWidget(X11Utils::XRRConfiguration* xrr_config, GraphicsWindow* parent)
|
GeneralWidget::GeneralWidget(GraphicsWindow* parent)
|
||||||
: m_xrr_config(xrr_config)
|
|
||||||
{
|
{
|
||||||
CreateWidgets();
|
CreateWidgets();
|
||||||
LoadSettings();
|
LoadSettings();
|
||||||
|
|
|
@ -16,16 +16,11 @@ class QRadioButton;
|
||||||
class QGridLayout;
|
class QGridLayout;
|
||||||
class ToolTipComboBox;
|
class ToolTipComboBox;
|
||||||
|
|
||||||
namespace X11Utils
|
|
||||||
{
|
|
||||||
class XRRConfiguration;
|
|
||||||
}
|
|
||||||
|
|
||||||
class GeneralWidget final : public GraphicsWidget
|
class GeneralWidget final : public GraphicsWidget
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit GeneralWidget(X11Utils::XRRConfiguration* xrr_config, GraphicsWindow* parent);
|
explicit GeneralWidget(GraphicsWindow* parent);
|
||||||
signals:
|
signals:
|
||||||
void BackendChanged(const QString& backend);
|
void BackendChanged(const QString& backend);
|
||||||
|
|
||||||
|
@ -55,6 +50,4 @@ private:
|
||||||
ConfigBool* m_render_main_window;
|
ConfigBool* m_render_main_window;
|
||||||
std::array<GraphicsRadioInt*, 4> m_shader_compilation_mode{};
|
std::array<GraphicsRadioInt*, 4> m_shader_compilation_mode{};
|
||||||
ConfigBool* m_wait_for_shaders;
|
ConfigBool* m_wait_for_shaders;
|
||||||
|
|
||||||
X11Utils::XRRConfiguration* m_xrr_config;
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -24,8 +24,7 @@
|
||||||
#include "VideoCommon/VideoBackendBase.h"
|
#include "VideoCommon/VideoBackendBase.h"
|
||||||
#include "VideoCommon/VideoConfig.h"
|
#include "VideoCommon/VideoConfig.h"
|
||||||
|
|
||||||
GraphicsWindow::GraphicsWindow(X11Utils::XRRConfiguration* xrr_config, MainWindow* parent)
|
GraphicsWindow::GraphicsWindow(MainWindow* parent) : QDialog(parent)
|
||||||
: QDialog(parent), m_xrr_config(xrr_config)
|
|
||||||
{
|
{
|
||||||
CreateMainLayout();
|
CreateMainLayout();
|
||||||
|
|
||||||
|
@ -46,7 +45,7 @@ void GraphicsWindow::CreateMainLayout()
|
||||||
main_layout->addWidget(tab_widget);
|
main_layout->addWidget(tab_widget);
|
||||||
main_layout->addWidget(button_box);
|
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 enhancements_widget = new EnhancementsWidget(this);
|
||||||
auto* const hacks_widget = new HacksWidget(this);
|
auto* const hacks_widget = new HacksWidget(this);
|
||||||
auto* const advanced_widget = new AdvancedWidget(this);
|
auto* const advanced_widget = new AdvancedWidget(this);
|
||||||
|
|
|
@ -16,16 +16,11 @@ class QTabWidget;
|
||||||
class QDialogButtonBox;
|
class QDialogButtonBox;
|
||||||
class SoftwareRendererWidget;
|
class SoftwareRendererWidget;
|
||||||
|
|
||||||
namespace X11Utils
|
|
||||||
{
|
|
||||||
class XRRConfiguration;
|
|
||||||
}
|
|
||||||
|
|
||||||
class GraphicsWindow final : public QDialog
|
class GraphicsWindow final : public QDialog
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit GraphicsWindow(X11Utils::XRRConfiguration* xrr_config, MainWindow* parent);
|
explicit GraphicsWindow(MainWindow* parent);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void BackendChanged(const QString& backend);
|
void BackendChanged(const QString& backend);
|
||||||
|
@ -33,6 +28,4 @@ signals:
|
||||||
private:
|
private:
|
||||||
void CreateMainLayout();
|
void CreateMainLayout();
|
||||||
void OnBackendChanged(const QString& backend);
|
void OnBackendChanged(const QString& backend);
|
||||||
|
|
||||||
X11Utils::XRRConfiguration* m_xrr_config;
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -1282,10 +1282,8 @@ void MainWindow::ShowGraphicsWindow()
|
||||||
"display", windowHandle())),
|
"display", windowHandle())),
|
||||||
winId());
|
winId());
|
||||||
}
|
}
|
||||||
m_graphics_window = new GraphicsWindow(m_xrr_config.get(), this);
|
|
||||||
#else
|
|
||||||
m_graphics_window = new GraphicsWindow(nullptr, this);
|
|
||||||
#endif
|
#endif
|
||||||
|
m_graphics_window = new GraphicsWindow(this);
|
||||||
InstallHotkeyFilter(m_graphics_window);
|
InstallHotkeyFilter(m_graphics_window);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue