From ba5485c92de8ccfc5f266726fc45d9ca3d57f673 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 18 Oct 2023 16:32:09 +0200
Subject: [PATCH] chore(linux): Some more renames from kbp to core

---
 core/src/kmx/kmx_processevent.cpp          | 16 ++++++++--------
 core/src/kmx/kmx_processevent.h            |  2 +-
 core/tests/unit/ldml/keyboards/meson.build |  2 +-
 core/tests/unit/ldml/meson.build           |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/src/kmx/kmx_processevent.cpp b/core/src/kmx/kmx_processevent.cpp
index 655c5992f54..8e07e963c0f 100644
--- 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
index 0710a7f2fcf..4ccd8831d87 100644
--- 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
index eea0b519ac6..8c1ccff573b 100644
--- 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
index c02d64bf184..2416906473f 100644
--- 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
 #