From e9e41b925b6efeac4d3eadf049391ef81483528f Mon Sep 17 00:00:00 2001 From: Filoppi Date: Tue, 4 May 2021 23:48:55 +0300 Subject: InputCommon: follow coding conventions and rename GetState() to UpdateState() And remove useless include --- .../ControlGroup/ModifySettingsButton.cpp | 30 +++++++++++----------- .../ControlGroup/ModifySettingsButton.h | 12 ++++----- 2 files changed, 21 insertions(+), 21 deletions(-) (limited to 'Source/Core/InputCommon') diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp index 6dc200d1e1..1cf2b5a579 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp @@ -26,52 +26,52 @@ ModifySettingsButton::ModifySettingsButton(std::string button_name) void ModifySettingsButton::AddInput(std::string button_name, bool toggle) { ControlGroup::AddInput(Translate, std::move(button_name)); - threshold_exceeded.emplace_back(false); - associated_settings.emplace_back(false); - associated_settings_toggle.emplace_back(toggle); + m_threshold_exceeded.emplace_back(false); + m_associated_settings.emplace_back(false); + m_associated_settings_toggle.emplace_back(toggle); } -void ModifySettingsButton::GetState() +void ModifySettingsButton::UpdateState() { for (size_t i = 0; i < controls.size(); ++i) { const bool state = controls[i]->GetState(); - if (!associated_settings_toggle[i]) + if (!m_associated_settings_toggle[i]) { // not toggled - associated_settings[i] = state; + m_associated_settings[i] = state; } else { // toggle (loading savestates does not en-/disable toggle) // after we passed the threshold, we en-/disable. but after that, we don't change it // anymore - if (!threshold_exceeded[i] && state) + if (!m_threshold_exceeded[i] && state) { - associated_settings[i] = !associated_settings[i]; + m_associated_settings[i] = !m_associated_settings[i]; - if (associated_settings[i]) + if (m_associated_settings[i]) OSD::AddMessage(controls[i]->ui_name + ": on"); else OSD::AddMessage(controls[i]->ui_name + ": off"); - threshold_exceeded[i] = true; + m_threshold_exceeded[i] = true; } if (!state) - threshold_exceeded[i] = false; + m_threshold_exceeded[i] = false; } } } -const std::vector& ModifySettingsButton::isSettingToggled() const +const std::vector& ModifySettingsButton::IsSettingToggled() const { - return associated_settings_toggle; + return m_associated_settings_toggle; } -const std::vector& ModifySettingsButton::getSettingsModifier() const +const std::vector& ModifySettingsButton::GetSettingsModifier() const { - return associated_settings; + return m_associated_settings; } } // namespace ControllerEmu diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.h index 667f3e5c7a..b060aa0caa 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.h @@ -18,14 +18,14 @@ public: void AddInput(std::string button_name, bool toggle = false); - void GetState(); + void UpdateState(); - const std::vector& isSettingToggled() const; - const std::vector& getSettingsModifier() const; + const std::vector& IsSettingToggled() const; + const std::vector& GetSettingsModifier() const; private: - std::vector threshold_exceeded; // internal calculation (if "state" was above threshold) - std::vector associated_settings_toggle; // is setting toggled or hold? - std::vector associated_settings; // result + std::vector m_threshold_exceeded; // internal calculation (if "state" was above threshold) + std::vector m_associated_settings_toggle; // is setting toggled or hold? + std::vector m_associated_settings; // result }; } // namespace ControllerEmu -- cgit v1.2.3