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

Rename some variables to snake_case

This commit is contained in:
Megamouse 2021-02-02 19:20:45 +01:00
parent a6a92f7b6b
commit fd1f2ca1c6
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rpcs3/rpcs3qt/emu_settings.cpp
View File

@ -96,8 +96,8 @@ void emu_settings::LoadSettings(const std::string& title_id)
if (default_error.empty()) if (default_error.empty())
{ {
m_defaultSettings = default_config; m_default_settings = default_config;
m_currentSettings = YAML::Clone(default_config); m_current_settings = YAML::Clone(default_config);
} }
else else
{ {
@ -114,7 +114,7 @@ void emu_settings::LoadSettings(const std::string& title_id)
if (global_error.empty()) if (global_error.empty())
{ {
m_currentSettings += global_config; m_current_settings += global_config;
} }
else else
{ {
@ -148,7 +148,7 @@ void emu_settings::LoadSettings(const std::string& title_id)
if (custom_error.empty()) if (custom_error.empty())
{ {
m_currentSettings += custom_config; m_current_settings += custom_config;
} }
else else
{ {
@ -164,7 +164,7 @@ void emu_settings::LoadSettings(const std::string& title_id)
void emu_settings::SaveSettings() void emu_settings::SaveSettings()
{ {
YAML::Emitter out; YAML::Emitter out;
emit_data(out, m_currentSettings); emit_data(out, m_current_settings);
std::string config_name; std::string config_name;
@ -652,12 +652,12 @@ void emu_settings::EnhanceRadioButton(QButtonGroup* button_group, emu_settings_t
std::vector<std::string> emu_settings::GetLibrariesControl() std::vector<std::string> emu_settings::GetLibrariesControl()
{ {
return m_currentSettings["Core"]["Libraries Control"].as<std::vector<std::string>, std::initializer_list<std::string>>({}); return m_current_settings["Core"]["Libraries Control"].as<std::vector<std::string>, std::initializer_list<std::string>>({});
} }
void emu_settings::SaveSelectedLibraries(const std::vector<std::string>& libs) void emu_settings::SaveSelectedLibraries(const std::vector<std::string>& libs)
{ {
m_currentSettings["Core"]["Libraries Control"] = libs; m_current_settings["Core"]["Libraries Control"] = libs;
} }
QStringList emu_settings::GetSettingOptions(emu_settings_type type) const QStringList emu_settings::GetSettingOptions(emu_settings_type type) const
@ -667,7 +667,7 @@ QStringList emu_settings::GetSettingOptions(emu_settings_type type) const
std::string emu_settings::GetSettingDefault(emu_settings_type type) const std::string emu_settings::GetSettingDefault(emu_settings_type type) const
{ {
if (auto node = cfg_adapter::get_node(m_defaultSettings, settings_location[type]); node && node.IsScalar()) if (auto node = cfg_adapter::get_node(m_default_settings, settings_location[type]); node && node.IsScalar())
{ {
return node.Scalar(); return node.Scalar();
} }
@ -678,7 +678,7 @@ std::string emu_settings::GetSettingDefault(emu_settings_type type) const
std::string emu_settings::GetSetting(emu_settings_type type) const std::string emu_settings::GetSetting(emu_settings_type type) const
{ {
if (auto node = cfg_adapter::get_node(m_currentSettings, settings_location[type]); node && node.IsScalar()) if (auto node = cfg_adapter::get_node(m_current_settings, settings_location[type]); node && node.IsScalar())
{ {
return node.Scalar(); return node.Scalar();
} }
@ -689,7 +689,7 @@ std::string emu_settings::GetSetting(emu_settings_type type) const
void emu_settings::SetSetting(emu_settings_type type, const std::string& val) void emu_settings::SetSetting(emu_settings_type type, const std::string& val)
{ {
cfg_adapter::get_node(m_currentSettings, settings_location[type]) = val; cfg_adapter::get_node(m_current_settings, settings_location[type]) = val;
} }
void emu_settings::OpenCorrectionDialog(QWidget* parent) void emu_settings::OpenCorrectionDialog(QWidget* parent)

4
rpcs3/rpcs3qt/emu_settings.h
View File

@ -93,7 +93,7 @@ public Q_SLOTS:
/** Writes the unsaved settings to file. Used in settings dialog on accept.*/ /** Writes the unsaved settings to file. Used in settings dialog on accept.*/
void SaveSettings(); void SaveSettings();
private: private:
YAML::Node m_defaultSettings; // The default settings as a YAML node. YAML::Node m_default_settings; // The default settings as a YAML node.
YAML::Node m_currentSettings; // The current settings as a YAML node. YAML::Node m_current_settings; // The current settings as a YAML node.
std::string m_title_id; std::string m_title_id;
}; };

1
rpcs3/rpcs3qt/settings_dialog.cpp
View File

@ -26,7 +26,6 @@
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/system_config.h" #include "Emu/system_config.h"
#include "Emu/title.h" #include "Emu/title.h"
#include "Crypto/unself.h"
#include <set> #include <set>
#include <unordered_set> #include <unordered_set>