diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt index 0704dd54c2..4e9810609c 100644 --- 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 index c445523932..3d89b04ef0 100644 --- 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 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 index 7ce0e337a8..90d25a7040 100644 --- a/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.h +++ b/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.h @@ -5,7 +5,7 @@ #include -#include "DolphinQt/Config/Graphics/GraphicsWidget.h" +#include 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 index 54b9437229..346eec9013 100644 --- a/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.h +++ b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.h @@ -4,7 +4,8 @@ #pragma once #include -#include "DolphinQt/Config/Graphics/GraphicsWidget.h" + +#include 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 @@ signals: 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 deleted file mode 100644 index b823d6e2a6..0000000000 --- a/Source/Core/DolphinQt/Config/Graphics/GraphicsWidget.h +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2017 Dolphin Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include - -class GraphicsWidget : public QWidget -{ - Q_OBJECT -protected: - virtual void LoadSettings() = 0; - virtual void SaveSettings() = 0; -}; diff --git a/Source/Core/DolphinQt/Config/Graphics/HacksWidget.h b/Source/Core/DolphinQt/Config/Graphics/HacksWidget.h index 37b6e5e9ff..995a901ad4 100644 --- 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 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 index 8517068622..a0b815fd45 100644 --- a/Source/Core/DolphinQt/DolphinQt.vcxproj +++ b/Source/Core/DolphinQt/DolphinQt.vcxproj @@ -273,7 +273,6 @@ -