Merge pull request #11805 from Dentomologist/remove_graphicswidget

Qt: Remove GraphicsWidget class
dolphin-emu · Apr 30, 2023 · 2e39c79 · 2e39c79
2 parents 3c9162f + 5ca0430
commit 2e39c79
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 32 deletions.
diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt
@@ -77,7 +77,6 @@ add_executable(dolphin-emu
   Config/Graphics/EnhancementsWidget.h
   Config/Graphics/GeneralWidget.cpp
   Config/Graphics/GeneralWidget.h
-  Config/Graphics/GraphicsWidget.h
   Config/Graphics/GraphicsWindow.cpp
   Config/Graphics/GraphicsWindow.h
   Config/Graphics/HacksWidget.cpp

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

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

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

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

diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj
@@ -274,7 +274,6 @@
     <QtMoc Include="Config\Graphics\AdvancedWidget.h" />
     <QtMoc Include="Config\Graphics\EnhancementsWidget.h" />
     <QtMoc Include="Config\Graphics\GeneralWidget.h" />
-    <QtMoc Include="Config\Graphics\GraphicsWidget.h" />
     <QtMoc Include="Config\Graphics\GraphicsWindow.h" />
     <QtMoc Include="Config\Graphics\HacksWidget.h" />
     <QtMoc Include="Config\Graphics\PostProcessingConfigWindow.h" />