From e9e41b925b6efeac4d3eadf049391ef81483528f Mon Sep 17 00:00:00 2001
From: Filoppi <filippotarpini@hotmail.it>
Date: Tue, 4 May 2021 23:48:55 +0300
Subject: [PATCH] InputCommon: follow coding conventions and rename GetState()
to UpdateState()
And remove useless include
---
.../Core/HW/WiimoteEmu/EmuSubroutines.cpp | 1 -
Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp | 10 +++----
.../ControlGroup/ModifySettingsButton.cpp | 30 +++++++++----------
.../ControlGroup/ModifySettingsButton.h | 12 ++++----
4 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
index bf71f7e6f6..391b0f2136 100644
--- a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
@@ -19,7 +19,6 @@
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Core/HW/WiimoteReal/WiimoteReal.h"
#include "InputCommon/ControllerEmu/ControlGroup/Attachments.h"
-#include "InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.h"
namespace WiimoteEmu
{
diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
index bb88790eca..4198ba3095 100644
--- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
@@ -428,7 +428,7 @@ void Wiimote::Update()
// Hotkey / settings modifier
// Data is later accessed in IsSideways and IsUpright
- m_hotkeys->GetState();
+ m_hotkeys->UpdateState();
// Update our motion simulations.
StepDynamics();
@@ -700,15 +700,15 @@ EncryptionKey Wiimote::GetExtensionEncryptionKey() const
bool Wiimote::IsSideways() const
{
- const bool sideways_modifier_toggle = m_hotkeys->getSettingsModifier()[0];
- const bool sideways_modifier_switch = m_hotkeys->getSettingsModifier()[2];
+ const bool sideways_modifier_toggle = m_hotkeys->GetSettingsModifier()[0];
+ const bool sideways_modifier_switch = m_hotkeys->GetSettingsModifier()[2];
return m_sideways_setting.GetValue() ^ sideways_modifier_toggle ^ sideways_modifier_switch;
}
bool Wiimote::IsUpright() const
{
- const bool upright_modifier_toggle = m_hotkeys->getSettingsModifier()[1];
- const bool upright_modifier_switch = m_hotkeys->getSettingsModifier()[3];
+ const bool upright_modifier_toggle = m_hotkeys->GetSettingsModifier()[1];
+ const bool upright_modifier_switch = m_hotkeys->GetSettingsModifier()[3];
return m_upright_setting.GetValue() ^ upright_modifier_toggle ^ upright_modifier_switch;
}
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<bool>();
- 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<bool>& ModifySettingsButton::isSettingToggled() const
+const std::vector<bool>& ModifySettingsButton::IsSettingToggled() const
{
- return associated_settings_toggle;
+ return m_associated_settings_toggle;
}
-const std::vector<bool>& ModifySettingsButton::getSettingsModifier() const
+const std::vector<bool>& 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<bool>& isSettingToggled() const;
- const std::vector<bool>& getSettingsModifier() const;
+ const std::vector<bool>& IsSettingToggled() const;
+ const std::vector<bool>& GetSettingsModifier() const;
private:
- std::vector<bool> threshold_exceeded; // internal calculation (if "state" was above threshold)
- std::vector<bool> associated_settings_toggle; // is setting toggled or hold?
- std::vector<bool> associated_settings; // result
+ std::vector<bool> m_threshold_exceeded; // internal calculation (if "state" was above threshold)
+ std::vector<bool> m_associated_settings_toggle; // is setting toggled or hold?
+ std::vector<bool> m_associated_settings; // result
};
} // namespace ControllerEmu