chore(core): rename kbp to core

keymanapp · Oct 24, 2023 · 8223792 · 8223792
1 parent 8217701
commit 8223792
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/core/src/action.cpp b/core/src/action.cpp
@@ -17,7 +17,7 @@
 #include "state.hpp"
 #include "option.hpp"
 
-km_core_actions * km::kbp::action_item_list_to_actions_object(
+km_core_actions * km::core::action_item_list_to_actions_object(
   km_core_action_item const *action_items
 ) {
   assert(action_items != nullptr);
@@ -94,7 +94,7 @@ km_core_actions * km::kbp::action_item_list_to_actions_object(
         break;
       case KM_CORE_IT_PERSIST_OPT:
         // TODO: lowpri: replace existing item if already present in options vector?
-        options.push_back(km::kbp::option(
+        options.push_back(km::core::option(
           static_cast<km_core_option_scope>(action_items->option->scope),
           action_items->option->key,
           action_items->option->value

diff --git a/core/src/action.hpp b/core/src/action.hpp
@@ -11,10 +11,10 @@
 #include <keyman/keyman_core_api.h>
 
 namespace km {
-namespace kbp
+namespace core
 {
   km_core_actions* action_item_list_to_actions_object(
     km_core_action_item const *action_items
   );
-} // namespace kbp
+} // namespace core
 } // namespace km
diff --git a/core/src/km_core_action_api.cpp b/core/src/km_core_action_api.cpp
@@ -17,7 +17,7 @@
 #include "state.hpp"
 #include "action.hpp"
 
-using namespace km::kbp;
+using namespace km::core;
 
 km_core_actions* km_core_state_get_actions(
   km_core_state const *state

diff --git a/core/tests/unit/kmnkbd/action_api.cpp b/core/tests/unit/kmnkbd/action_api.cpp
@@ -34,7 +34,7 @@ void test_two_backspaces() {
     end_action_item()
   };
 
-  km_core_actions *actions = km::kbp::action_item_list_to_actions_object(action_items);
+  km_core_actions *actions = km::core::action_item_list_to_actions_object(action_items);
 
   assert(actions->code_points_to_delete == 1);
   assert(std::u32string(actions->output) == U"");
@@ -61,7 +61,7 @@ void test_marker_text_interleaved() {
     end_action_item()
   };
 
-  km_core_actions *actions = km::kbp::action_item_list_to_actions_object(action_items);
+  km_core_actions *actions = km::core::action_item_list_to_actions_object(action_items);
 
   assert(actions->code_points_to_delete == 0);
   assert(std::u32string(actions->output) == U"ABD");
@@ -81,7 +81,7 @@ void test_alert() {
     end_action_item()
   };
 
-  km_core_actions *actions = km::kbp::action_item_list_to_actions_object(action_items);
+  km_core_actions *actions = km::core::action_item_list_to_actions_object(action_items);
 
   assert(actions->code_points_to_delete == 0);
   assert(std::u32string(actions->output) == U"");
@@ -101,7 +101,7 @@ void test_emit_keystroke() {
     end_action_item()
   };
 
-  km_core_actions *actions = km::kbp::action_item_list_to_actions_object(action_items);
+  km_core_actions *actions = km::core::action_item_list_to_actions_object(action_items);
 
   assert(actions->code_points_to_delete == 0);
   assert(std::u32string(actions->output) == U"");
@@ -122,7 +122,7 @@ void test_invalidate_context() {
     end_action_item()
   };
 
-  km_core_actions *actions = km::kbp::action_item_list_to_actions_object(action_items);
+  km_core_actions *actions = km::core::action_item_list_to_actions_object(action_items);
 
   assert(actions->code_points_to_delete == 0);
   assert(std::u32string(actions->output) == U"");
@@ -148,7 +148,7 @@ void test_persist_opt() {
     end_action_item()
   };
 
-  km_core_actions *actions = km::kbp::action_item_list_to_actions_object(action_items);
+  km_core_actions *actions = km::core::action_item_list_to_actions_object(action_items);
 
   assert(actions->code_points_to_delete == 0);
   assert(std::u32string(actions->output) == U"");
@@ -205,7 +205,7 @@ void teardown() {
 void setup(const char *keyboard, const km_core_cp* context) {
   teardown();
 
-  km::kbp::path path = km::kbp::path::join(arg_path, keyboard);
+  km::core::path path = km::core::path::join(arg_path, keyboard);
   try_status(km_core_keyboard_load(path.native().c_str(), &test_kb));
   try_status(km_core_state_create(test_kb, test_env_opts, &test_state));
   try_status(km_core_context_items_from_utf16(context, &citems));

diff --git a/linux/debian/libkeymancore.symbols b/linux/debian/libkeymancore.symbols
@@ -1,6 +1,7 @@
 libkeymancore.so.1 libkeymancore #MINVER#
 * Build-Depends-Package: libkeymancore-dev
 
+ km_core_actions_dispose@Base 17.0.197
  km_core_context_append@Base 17.0.195
  km_core_context_clear@Base 17.0.195
  km_core_context_get@Base 17.0.195
@@ -9,6 +10,7 @@ libkeymancore.so.1 libkeymancore #MINVER#
  km_core_context_items_from_utf16@Base 17.0.195
  km_core_context_items_from_utf8@Base 17.0.195
  km_core_context_items_to_utf16@Base 17.0.195
+ km_core_context_items_to_utf32@Base 17.0.197
  km_core_context_items_to_utf8@Base 17.0.195
  km_core_context_length@Base 17.0.195
  km_core_context_set@Base 17.0.195
@@ -28,11 +30,14 @@ libkeymancore.so.1 libkeymancore #MINVER#
  km_core_state_action_items@Base 17.0.195
  km_core_state_clone@Base 17.0.195
  km_core_state_context@Base 17.0.195
+ km_core_state_context_clear@Base 17.0.197
+ km_core_state_context_set_if_needed@Base 17.0.197
  km_core_state_create@Base 17.0.195
  km_core_state_debug_get@Base 17.0.195
  km_core_state_debug_items@Base 17.0.195
  km_core_state_debug_set@Base 17.0.195
  km_core_state_dispose@Base 17.0.195
+ km_core_state_get_actions@Base 17.0.197
  km_core_state_get_intermediate_context@Base 17.0.195
  km_core_state_imx_deregister_callback@Base 17.0.195
  km_core_state_imx_register_callback@Base 17.0.195