Skip to content

Commit

Permalink
Qt: Remove GraphicsWidget class
Browse files Browse the repository at this point in the history
The old tooltip description box used GraphicsWidget to provide shared
code to the Graphics config panes for adding descriptions to their
settings.

The description box has been replaced by BalloonTips and serves no
further purpose, so remove it and have the Graphics panes derive from
QWidget instead.
  • Loading branch information
Dentomologist committed Apr 29, 2023
1 parent d95a852 commit 5ca0430
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 32 deletions.
1 change: 0 additions & 1 deletion Source/Core/DolphinQt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#pragma once

#include "DolphinQt/Config/Graphics/GraphicsWidget.h"
#include <QWidget>

class ConfigBool;
class ConfigChoice;
Expand All @@ -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();
Expand Down
8 changes: 4 additions & 4 deletions Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include <array>

#include "DolphinQt/Config/Graphics/GraphicsWidget.h"
#include <QWidget>

class ConfigBool;
class ConfigChoice;
Expand All @@ -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();
Expand Down
9 changes: 5 additions & 4 deletions Source/Core/DolphinQt/Config/Graphics/GeneralWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
#pragma once

#include <array>
#include "DolphinQt/Config/Graphics/GraphicsWidget.h"

#include <QWidget>

class ConfigBool;
class ConfigChoice;
Expand All @@ -16,7 +17,7 @@ class QRadioButton;
class QGridLayout;
class ToolTipComboBox;

class GeneralWidget final : public GraphicsWidget
class GeneralWidget final : public QWidget
{
Q_OBJECT
public:
Expand All @@ -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();
Expand Down
14 changes: 0 additions & 14 deletions Source/Core/DolphinQt/Config/Graphics/GraphicsWidget.h

This file was deleted.

8 changes: 4 additions & 4 deletions Source/Core/DolphinQt/Config/Graphics/HacksWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
1 change: 0 additions & 1 deletion Source/Core/DolphinQt/DolphinQt.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,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" />
Expand Down

0 comments on commit 5ca0430

Please sign in to comment.