ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11805 from Dentomologist/remove_graphicswidget 

Qt: Remove GraphicsWidget class
This commit is contained in:
Léo Lam 2023-04-30 02:15:30 +01:00 committed by GitHub
parent 3c9162f35e 5ca0430cb2
commit 2e39c79984
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/DolphinQt/CMakeLists.txt
View File

@ -77,7 +77,6 @@ add_executable(dolphin-emu
Config/Graphics/EnhancementsWidget.h Config/Graphics/EnhancementsWidget.h
Config/Graphics/GeneralWidget.cpp Config/Graphics/GeneralWidget.cpp
Config/Graphics/GeneralWidget.h Config/Graphics/GeneralWidget.h
Config/Graphics/GraphicsWidget.h
Config/Graphics/GraphicsWindow.cpp Config/Graphics/GraphicsWindow.cpp
Config/Graphics/GraphicsWindow.h Config/Graphics/GraphicsWindow.h
Config/Graphics/HacksWidget.cpp Config/Graphics/HacksWidget.cpp

8
Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.h
View File

@ -3,7 +3,7 @@
#pragma once #pragma once
#include "DolphinQt/Config/Graphics/GraphicsWidget.h" #include <QWidget>
class ConfigBool; class ConfigBool;
class ConfigChoice; class ConfigChoice;
@ -14,15 +14,15 @@ class QComboBox;
class QSpinBox; class QSpinBox;
class ToolTipCheckBox; class ToolTipCheckBox;
class AdvancedWidget final : public GraphicsWidget class AdvancedWidget final : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit AdvancedWidget(GraphicsWindow* parent); explicit AdvancedWidget(GraphicsWindow* parent);
private: private:
void LoadSettings() override; void LoadSettings();
void SaveSettings() override; void SaveSettings();
void CreateWidgets(); void CreateWidgets();
void ConnectWidgets(); void ConnectWidgets();

8
Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.h
View File

@ -5,7 +5,7 @@
#include <array> #include <array>
#include "DolphinQt/Config/Graphics/GraphicsWidget.h" #include <QWidget>
class ConfigBool; class ConfigBool;
class ConfigChoice; class ConfigChoice;
@ -17,15 +17,15 @@ class QPushButton;
class QSlider; class QSlider;
class ToolTipComboBox; class ToolTipComboBox;
class EnhancementsWidget final : public GraphicsWidget class EnhancementsWidget final : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit EnhancementsWidget(GraphicsWindow* parent); explicit EnhancementsWidget(GraphicsWindow* parent);
private: private:
void LoadSettings() override; void LoadSettings();
void SaveSettings() override; void SaveSettings();
void CreateWidgets(); void CreateWidgets();
void ConnectWidgets(); void ConnectWidgets();

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

@ -4,7 +4,8 @@
#pragma once #pragma once
#include <array> #include <array>
#include "DolphinQt/Config/Graphics/GraphicsWidget.h"
#include <QWidget>
class ConfigBool; class ConfigBool;
class ConfigChoice; class ConfigChoice;
@ -16,7 +17,7 @@ class QRadioButton;
class QGridLayout; class QGridLayout;
class ToolTipComboBox; class ToolTipComboBox;
class GeneralWidget final : public GraphicsWidget class GeneralWidget final : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
@ -25,8 +26,8 @@ signals:
void BackendChanged(const QString& backend); void BackendChanged(const QString& backend);
private: private:
void LoadSettings() override; void LoadSettings();
void SaveSettings() override; void SaveSettings();
void CreateWidgets(); void CreateWidgets();
void ConnectWidgets(); void ConnectWidgets();

14
Source/Core/DolphinQt/Config/Graphics/GraphicsWidget.h
View File

@ -1,14 +0,0 @@
// Copyright 2017 Dolphin Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include <QWidget>
class GraphicsWidget : public QWidget
{
Q_OBJECT
protected:
virtual void LoadSettings() = 0;
virtual void SaveSettings() = 0;
};

8
Source/Core/DolphinQt/Config/Graphics/HacksWidget.h
View File

@ -3,22 +3,22 @@
#pragma once #pragma once
#include "DolphinQt/Config/Graphics/GraphicsWidget.h" #include <QWidget>
class ConfigBool; class ConfigBool;
class GraphicsWindow; class GraphicsWindow;
class QLabel; class QLabel;
class ToolTipSlider; class ToolTipSlider;
class HacksWidget final : public GraphicsWidget class HacksWidget final : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit HacksWidget(GraphicsWindow* parent); explicit HacksWidget(GraphicsWindow* parent);
private: private:
void LoadSettings() override; void LoadSettings();
void SaveSettings() override; void SaveSettings();
void OnBackendChanged(const QString& backend_name); void OnBackendChanged(const QString& backend_name);

1
Source/Core/DolphinQt/DolphinQt.vcxproj
View File

@ -274,7 +274,6 @@
<QtMoc Include="Config\Graphics\AdvancedWidget.h" /> <QtMoc Include="Config\Graphics\AdvancedWidget.h" />
<QtMoc Include="Config\Graphics\EnhancementsWidget.h" /> <QtMoc Include="Config\Graphics\EnhancementsWidget.h" />
<QtMoc Include="Config\Graphics\GeneralWidget.h" /> <QtMoc Include="Config\Graphics\GeneralWidget.h" />
<QtMoc Include="Config\Graphics\GraphicsWidget.h" />
<QtMoc Include="Config\Graphics\GraphicsWindow.h" /> <QtMoc Include="Config\Graphics\GraphicsWindow.h" />
<QtMoc Include="Config\Graphics\HacksWidget.h" /> <QtMoc Include="Config\Graphics\HacksWidget.h" />
<QtMoc Include="Config\Graphics\PostProcessingConfigWindow.h" /> <QtMoc Include="Config\Graphics\PostProcessingConfigWindow.h" />