From 7d2f2cd928f60ddec0cb6db2b8145c4bbc858b2f Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 8 Jul 2021 09:04:31 +0200
Subject: [PATCH] refactor(common/core/desktop): Rename Load method

Rename KMX_Environment::Load to KMX_Environment::Set.

Fixes #5435.
---
 common/core/desktop/src/kmx/kmx_capslock.cpp    | 10 +++++-----
 common/core/desktop/src/kmx/kmx_environment.cpp | 14 +++++++-------
 common/core/desktop/src/kmx/kmx_environment.h   |  2 +-
 common/core/desktop/src/kmx/kmx_processor.cpp   |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/common/core/desktop/src/kmx/kmx_capslock.cpp b/common/core/desktop/src/kmx/kmx_capslock.cpp
index 63856be18d..cd11290af7 100644
--- a/common/core/desktop/src/kmx/kmx_capslock.cpp
+++ b/common/core/desktop/src/kmx/kmx_capslock.cpp
@@ -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)
     {
diff --git a/common/core/desktop/src/kmx/kmx_environment.cpp b/common/core/desktop/src/kmx/kmx_environment.cpp
index e2f7359469..1e166225c1 100644
--- a/common/core/desktop/src/kmx/kmx_environment.cpp
+++ b/common/core/desktop/src/kmx/kmx_environment.cpp
@@ -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)) {
diff --git a/common/core/desktop/src/kmx/kmx_environment.h b/common/core/desktop/src/kmx/kmx_environment.h
index c8c0e212df..f1ee70faf6 100644
--- a/common/core/desktop/src/kmx/kmx_environment.h
+++ b/common/core/desktop/src/kmx/kmx_environment.h
@@ -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; }
diff --git a/common/core/desktop/src/kmx/kmx_processor.cpp b/common/core/desktop/src/kmx/kmx_processor.cpp
index 14bc4b2756..18ec00d067 100644
--- a/common/core/desktop/src/kmx/kmx_processor.cpp
+++ b/common/core/desktop/src/kmx/kmx_processor.cpp
@@ -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();