mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-12-25 15:21:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13232 from TryTwo/PR_hotfix

Browse Source 
Qt crash hotfix
This commit is contained in:
JMC47 2024-12-23 18:04:51 -05:00 committed by GitHub
commit f9ce2b9d76
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinQt/Config/ConfigControls/ConfigBool.h
View File

@ -6,11 +6,7 @@
#include "DolphinQt/Config/ConfigControls/ConfigControl.h"
#include "DolphinQt/Config/ToolTipControls/ToolTipCheckBox.h"
namespace Config
{
template <typename T>
class Info;
}
#include "Common/Config/ConfigInfo.h"
class ConfigBool final : public ConfigControl<ToolTipCheckBox>
{
@ -26,6 +22,6 @@ protected:
private:
void Update();
const Config::Info<bool>& m_setting;
const Config::Info<bool> m_setting;
bool m_reverse;
};

8
Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.h
View File

@ -10,11 +10,7 @@
#include "DolphinQt/Config/ConfigControls/ConfigControl.h"
#include "DolphinQt/Config/ToolTipControls/ToolTipComboBox.h"
namespace Config
{
template <typename T>
class Info;
}
#include "Common/Config/ConfigInfo.h"
class ConfigChoice final : public ConfigControl<ToolTipComboBox>
{
@ -48,7 +44,7 @@ protected:
private:
void Update(int index);
const Config::Info<std::string>& m_setting;
const Config::Info<std::string> m_setting;
bool m_text_is_data = false;
};

8
Source/Core/DolphinQt/Config/ConfigControls/ConfigFloatSlider.h
View File

@ -6,11 +6,7 @@
#include "DolphinQt/Config/ConfigControls/ConfigControl.h"
#include "DolphinQt/Config/ToolTipControls/ToolTipSlider.h"
namespace Config
{
template <typename T>
class Info;
}
#include "Common/Config/ConfigInfo.h"
// Automatically converts an int slider into a float one.
// Do not read the int values or ranges directly from it.
@ -31,5 +27,5 @@ protected:
private:
float m_minimum;
float m_step;
const Config::Info<float>& m_setting;
const Config::Info<float> m_setting;
};

8
Source/Core/DolphinQt/Config/ConfigControls/ConfigInteger.h
View File

@ -9,11 +9,7 @@
#include "DolphinQt/Config/ConfigControls/ConfigControl.h"
#include "DolphinQt/Config/ToolTipControls/ToolTipSpinBox.h"
namespace Config
{
template <typename T>
class Info;
}
#include "Common/Config/ConfigInfo.h"
class ConfigInteger final : public ConfigControl<ToolTipSpinBox>
{
@ -29,7 +25,7 @@ protected:
void OnConfigChanged() override;
private:
const Config::Info<int>& m_setting;
const Config::Info<int> m_setting;
};
class ConfigIntegerLabel final : public QLabel

8
Source/Core/DolphinQt/Config/ConfigControls/ConfigRadio.h
View File

@ -6,11 +6,7 @@
#include "DolphinQt/Config/ConfigControls/ConfigControl.h"
#include "DolphinQt/Config/ToolTipControls/ToolTipRadioButton.h"
namespace Config
{
template <typename T>
class Info;
}
#include "Common/Config/ConfigInfo.h"
class ConfigRadioInt final : public ConfigControl<ToolTipRadioButton>
{
@ -31,6 +27,6 @@ protected:
private:
void Update();
const Config::Info<int>& m_setting;
const Config::Info<int> m_setting;
int m_value;
};

8
Source/Core/DolphinQt/Config/ConfigControls/ConfigSlider.h
View File

@ -9,11 +9,7 @@
#include "DolphinQt/Config/ConfigControls/ConfigControl.h"
#include "DolphinQt/Config/ToolTipControls/ToolTipSlider.h"
namespace Config
{
template <typename T>
class Info;
}
#include "Common/Config/ConfigInfo.h"
class ConfigSlider final : public ConfigControl<ToolTipSlider>
{
@ -29,7 +25,7 @@ protected:
void OnConfigChanged() override;
private:
const Config::Info<int>& m_setting;
const Config::Info<int> m_setting;
};
class ConfigSliderLabel final : public QLabel