chore(linux): Some more renames from kbp to core

keymanapp · Oct 18, 2023 · ba5485c · ba5485c
1 parent 3015f24
commit ba5485c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/core/src/kmx/kmx_processevent.cpp b/core/src/kmx/kmx_processevent.cpp
@@ -84,7 +84,7 @@ KMX_BOOL KMX_ProcessEvent::ProcessEvent(
 ) {
   LPKEYBOARD kbd = m_keyboard.Keyboard;
 
-  m_kbp_state = state;
+  m_core_state = state;
 
   // If debugging is enabled, then ...
   DeleteInternalDebugItems();
@@ -106,7 +106,7 @@ KMX_BOOL KMX_ProcessEvent::ProcessEvent(
 
   if (kbd->StartGroup[BEGIN_UNICODE] == (KMX_DWORD) -1) {
     DebugLog("Non-Unicode keyboards are not supported.");
-    m_kbp_state = nullptr;
+    m_core_state = nullptr;
     return FALSE;
   }
 
@@ -124,7 +124,7 @@ KMX_BOOL KMX_ProcessEvent::ProcessEvent(
   }
 
   if (!isKeyDown) {
-    m_kbp_state = nullptr;
+    m_core_state = nullptr;
     return FALSE;
   }
 
@@ -149,7 +149,7 @@ KMX_BOOL KMX_ProcessEvent::ProcessEvent(
     DeleteInternalDebugItems();
   }
 
-  m_kbp_state = nullptr;
+  m_core_state = nullptr;
 
   return !fOutputKeystroke;
 }
@@ -488,7 +488,7 @@ int KMX_ProcessEvent::PostString(PKMX_WCHAR str, LPKEYBOARD lpkb, PKMX_WCHAR end
 
       case CODE_CALL:
         p++;
-        m_kbp_state->imx_callback(*p-1);
+        m_core_state->imx_callback(*p-1);
         FoundUse = TRUE;
         break;
       case CODE_USE:          // use another group
@@ -519,7 +519,7 @@ int KMX_ProcessEvent::PostString(PKMX_WCHAR str, LPKEYBOARD lpkb, PKMX_WCHAR end
       case CODE_RESETOPT:
         p++;
         n1 = *p - 1;
-        GetOptions()->Reset(m_kbp_state->processor(), n1);
+        GetOptions()->Reset(m_core_state->processor(), n1);
         break;
       case CODE_SAVEOPT:
         p++;
@@ -792,8 +792,8 @@ PKMX_WCHAR KMX_ProcessEvent::GetSystemStore(LPKEYBOARD kb, KMX_DWORD SystemID)
 
 void KMX_ProcessEvent::CreateInternalDebugItems() {
   assert(m_debug_items == nullptr);
-  assert(m_kbp_state != nullptr);
-  m_debug_items = new KMX_DebugItems(&m_kbp_state->debug_items());
+  assert(m_core_state != nullptr);
+  m_debug_items = new KMX_DebugItems(&m_core_state->debug_items());
   m_options.SetInternalDebugItems(m_debug_items);
 }
 

diff --git a/core/src/kmx/kmx_processevent.h b/core/src/kmx/kmx_processevent.h
@@ -40,7 +40,7 @@ class KMX_ProcessEvent {
   PKMX_WCHAR m_miniContext;
   int m_miniContextIfLen; // number of if() statements excluded from start of m_miniContext
   KMSTATE m_state;
-  km_core_state *m_kbp_state;
+  km_core_state *m_core_state;
 
 
   kmx::KMX_Actions m_actions;

diff --git a/core/tests/unit/ldml/keyboards/meson.build b/core/tests/unit/ldml/keyboards/meson.build
@@ -1,5 +1,5 @@
 # Copyright:    © SIL International.
-# Description:  Cross platform build script to compile kmkbpldml API unit tests.
+# Description:  Cross platform build script to compile kmcoreldml API unit tests.
 # Create Date:  5 Aug 2022
 # Authors:      Marc Durdin
 #

diff --git a/core/tests/unit/ldml/meson.build b/core/tests/unit/ldml/meson.build
@@ -1,5 +1,5 @@
 # Copyright:    © SIL International.
-# Description:  Cross platform build script to compile kmkbpldml API unit tests.
+# Description:  Cross platform build script to compile kmcoreldml API unit tests.
 # Create Date:  5 Aug 2022
 # Authors:      Marc Durdin
 #