erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-09 10:25:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

refactor(common/core/desktop): Rename Load method

Browse source 
Rename KMX_Environment::Load to KMX_Environment::Set.

Fixes #5435.
This commit is contained in:
Eberhard Beilharz 2021-07-08 09:04:31 +02:00
parent 5c838aafcd
commit 7d2f2cd928
No known key found for this signature in database
GPG key ID: 64A39A9E98B53105
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/core/desktop/src/kmx/kmx_capslock.cpp
View file

@ -11,10 +11,10 @@ void KMX_ProcessEvent::ResetCapsLock(void)
{
DebugLog("ResetCapsLock: enter");
if(m_keyboard.Keyboard->dwFlags & KF_CAPSALWAYSOFF)
if (m_keyboard.Keyboard->dwFlags & KF_CAPSALWAYSOFF)
{
DebugLog("ResetCapsLock: caps lock should be always off");
if(m_environment.capsLock())
if (m_environment.capsLock())
{
DebugLog("ResetCapsLock: caps lock is on, switching off caps lock");
m_actions.QueueAction(QIT_CAPSLOCK, 0);
@ -26,14 +26,14 @@ void KMX_ProcessEvent::ResetCapsLock(void)
void KMX_ProcessEvent::KeyCapsLockPress(KMX_BOOL FIsUp)
{
if(m_keyboard.Keyboard->dwFlags & KF_CAPSONONLY)
if (m_keyboard.Keyboard->dwFlags & KF_CAPSONONLY)
{
if(FIsUp && !m_environment.capsLock())
{
m_actions.QueueAction(QIT_CAPSLOCK, 1);
}
}
else if(m_keyboard.Keyboard->dwFlags & KF_CAPSALWAYSOFF)
else if (m_keyboard.Keyboard->dwFlags & KF_CAPSALWAYSOFF)
{
if(!FIsUp && m_environment.capsLock())
{
@ -47,7 +47,7 @@ void KMX_ProcessEvent::KeyShiftPress(KMX_BOOL FIsUp)
{
if(!m_environment.capsLock()) return;
if(m_keyboard.Keyboard->dwFlags & KF_SHIFTFREESCAPS)
if (m_keyboard.Keyboard->dwFlags & KF_SHIFTFREESCAPS)
{
if(!FIsUp)
{

14
common/core/desktop/src/kmx/kmx_environment.cpp
View file

@ -21,12 +21,12 @@ namespace {
}
KMX_Environment::KMX_Environment() {
Load(KM_KBP_KMX_ENV_PLATFORM, DEFAULT_PLATFORM);
Load(KM_KBP_KMX_ENV_BASELAYOUT, DEFAULT_BASELAYOUT);
Load(KM_KBP_KMX_ENV_BASELAYOUTALT, DEFAULT_BASELAYOUTALT);
Load(KM_KBP_KMX_ENV_SIMULATEALTGR, DEFAULT_SIMULATEALTGR);
Load(KM_KBP_KMX_ENV_CAPSLOCK, DEFAULT_CAPSLOCK);
Load(KM_KBP_KMX_ENV_BASELAYOUTGIVESCTRLRALTFORRALT, DEFAULT_BASELAYOUTGIVESCTRLRALTFORRALT);
Set(KM_KBP_KMX_ENV_PLATFORM, DEFAULT_PLATFORM);
Set(KM_KBP_KMX_ENV_BASELAYOUT, DEFAULT_BASELAYOUT);
Set(KM_KBP_KMX_ENV_BASELAYOUTALT, DEFAULT_BASELAYOUTALT);
Set(KM_KBP_KMX_ENV_SIMULATEALTGR, DEFAULT_SIMULATEALTGR);
Set(KM_KBP_KMX_ENV_CAPSLOCK, DEFAULT_CAPSLOCK);
Set(KM_KBP_KMX_ENV_BASELAYOUTGIVESCTRLRALTFORRALT, DEFAULT_BASELAYOUTGIVESCTRLRALTFORRALT);
}
@ -59,7 +59,7 @@ char16_t const * KMX_Environment::LookUp(std::u16string const & key) const {
}
void KMX_Environment::Load(std::u16string const & key, std::u16string const & value) {
void KMX_Environment::Set(std::u16string const & key, std::u16string const & value) {
assert(!key.empty());
if (!u16icmp(key.c_str(), KM_KBP_KMX_ENV_PLATFORM)) {

2
common/core/desktop/src/kmx/kmx_environment.h
View file

@ -20,7 +20,7 @@ private:
km_kbp_cp const * default_value);
public:
KMX_Environment();
void Load(std::u16string const & key, std::u16string const & value);
void Set(std::u16string const & key, std::u16string const & value);
char16_t const * LookUp(std::u16string const & key) const;
KMX_BOOL capsLock() const noexcept { return _capsLock; }

2
common/core/desktop/src/kmx/kmx_processor.cpp
View file

@ -61,7 +61,7 @@ namespace km {
persisted_store()[key] = value;
break;
case KM_KBP_OPT_ENVIRONMENT:
_kmx.GetEnvironment()->Load(key, value);
_kmx.GetEnvironment()->Set(key, value);
break;
default:
return option();