chore(linux): Rename namespace kbp to core

keymanapp · Oct 19, 2023 · 604fbc1 · 604fbc1
1 parent 52bb859
commit 604fbc1
Show file tree

Hide file tree

Showing 74 changed files with 246 additions and 246 deletions.
diff --git a/common/include/kmx_file.h b/common/include/kmx_file.h
@@ -28,7 +28,7 @@ typedef KMX_WORD  __attribute__((aligned(1))) KMX_WORD_unaligned;
 #ifdef KM_CORE_LIBRARY
 // TODO: move this to a common namespace keyman::common::kmx_file or similar in the future
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 #endif
 
@@ -404,6 +404,6 @@ static_assert(sizeof(COMP_KEYBOARD) == KEYBOARDFILEHEADER_SIZE, "COMP_KEYBOARD m
 
 #ifdef KM_CORE_LIBRARY
 } // namespace kmx
-} // namespace kbp
+} // namespace core
 } // namespace km
 #endif
diff --git a/core/meson.build b/core/meson.build
@@ -25,7 +25,7 @@ py = import('python')
 python = py.find_installation()
 
 # TODO: Shared includes may use namespaces, etc which need future tidyup.
-# For now, we use KM_CORE_LIBRARY to inject the km::kbp::kmx namespace
+# For now, we use KM_CORE_LIBRARY to inject the km::core::kmx namespace
 defns += ['-DKM_CORE_LIBRARY']
 
 # #define DEBUG when we are on a debug build

diff --git a/core/src/context.hpp b/core/src/context.hpp
@@ -15,7 +15,7 @@
 class json;
 
 namespace km {
-namespace kbp
+namespace core
 {
 
 // This will likely be replaced with a class implementing a more space
@@ -39,13 +39,13 @@ void context::push_marker(uint32_t marker) {
   emplace_back(km_core_context_item { KM_CORE_CT_MARKER, {0,}, {marker} });
 }
 
-} // namespace kbp
+} // namespace core
 } // namespace km
 
-json & operator << (json &, km::kbp::context const &);
+json & operator << (json &, km::core::context const &);
 json & operator << (json &, km_core_context_item const &);
 
 
-struct km_core_context : public km::kbp::context
+struct km_core_context : public km::core::context
 {
 };
diff --git a/core/src/debug.hpp b/core/src/debug.hpp
@@ -13,7 +13,7 @@
 #include <keyman/keyman_core_api_debug.h>
 
 namespace km {
-namespace kbp
+namespace core
 {
 
 class debug_items : public std::vector<km_core_state_debug_item>
@@ -66,6 +66,6 @@ void debug_items::set_enabled(bool value) noexcept {
   _is_enabled = value;
 }
 
-} // namespace kbp
+} // namespace core
 } // namespace km
 
diff --git a/core/src/debuglog.cpp b/core/src/debuglog.cpp
@@ -9,7 +9,7 @@
 #include "debuglog.h"
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 
 #define TAB "\t"

diff --git a/core/src/debuglog.h b/core/src/debuglog.h
@@ -3,7 +3,7 @@
 #include <keyman/keyman_core_api_bits.h>
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 
 extern KMX_BOOL g_debug_ToConsole, g_debug_KeymanLog, g_silent;
@@ -17,11 +17,11 @@ extern const struct modifier_names s_modifier_names[];
 extern const char *s_key_names[];
 
 #ifdef _MSC_VER
-#define DebugLog(msg,...) (km::kbp::kmx::ShouldDebug() ? km::kbp::kmx::DebugLog_1(__FILE__, __LINE__, __FUNCTION__, (msg),__VA_ARGS__) : 0)
+#define DebugLog(msg,...) (km::core::kmx::ShouldDebug() ? km::core::kmx::DebugLog_1(__FILE__, __LINE__, __FUNCTION__, (msg),__VA_ARGS__) : 0)
 #define console_error(msg,...) write_console(TRUE, (msg), __VA_ARGS__)
 #define console_log(msg,...) write_console(FALSE, (msg), __VA_ARGS__)
 #else
-#define DebugLog(msg,...) (km::kbp::kmx::ShouldDebug() ? km::kbp::kmx::DebugLog_1(__FILE__, __LINE__, __FUNCTION__, (msg), ##__VA_ARGS__) : 0)
+#define DebugLog(msg,...) (km::core::kmx::ShouldDebug() ? km::core::kmx::DebugLog_1(__FILE__, __LINE__, __FUNCTION__, (msg), ##__VA_ARGS__) : 0)
 #define console_error(msg,...) write_console(TRUE, (msg), ##__VA_ARGS__)
 #define console_log(msg,...) write_console(FALSE, (msg), ##__VA_ARGS__)
 #endif

diff --git a/core/src/keyboard.cpp b/core/src/keyboard.cpp
@@ -8,7 +8,7 @@
 #include "keyboard.hpp"
 #include "jsonpp.hpp"
 
-using namespace km::kbp;
+using namespace km::core;
 
 
 inline
@@ -54,7 +54,7 @@ keyboard_attributes & keyboard_attributes::operator = (keyboard_attributes &&rhs
 }
 
 
-json & km::kbp::operator << (json & j, km::kbp::keyboard_attributes const & kb)
+json & km::core::operator << (json & j, km::core::keyboard_attributes const & kb)
 {
   j << json::object
       << "id" << kb.id

diff --git a/core/src/keyboard.hpp b/core/src/keyboard.hpp
@@ -20,13 +20,13 @@
 class json;
 
 namespace km {
-namespace kbp
+namespace core
 {
   class keyboard_attributes : public km_core_keyboard_attrs
   {
     std::u16string      _keyboard_id;
     std::u16string      _version_string;
-    kbp::path           _folder_path;
+    core::path           _folder_path;
     std::vector<option> _default_opts;
 
     void render();
@@ -48,15 +48,15 @@ namespace kbp
     keyboard_attributes & operator = (keyboard_attributes const &) = delete;
     keyboard_attributes & operator = (keyboard_attributes &&);
 
-    friend json & operator << (json &, km::kbp::keyboard_attributes const &);
+    friend json & operator << (json &, km::core::keyboard_attributes const &);
 
     options_store const &   default_opts_store() const noexcept { return _default_opts; }
     options_store &         default_opts_store() noexcept { return _default_opts; }
 
     path_type const     &   path() const noexcept { return _folder_path; }
   };
 
-  json & operator << (json &, km::kbp::keyboard_attributes const &);
+  json & operator << (json &, km::core::keyboard_attributes const &);
 
-} // namespace kbp
+} // namespace core
 } // namespace km
diff --git a/core/src/km_core_context_api.cpp b/core/src/km_core_context_api.cpp
@@ -252,7 +252,7 @@ km_core_context_item_list_size(km_core_context_item const *context_items)
   return n;
 }
 
-json & operator << (json & j, km::kbp::context const & ctxt) {
+json & operator << (json & j, km::core::context const & ctxt) {
   j << json::array;
   for (auto & i: ctxt)  j << i;
   return j << json::close;

diff --git a/core/src/km_core_debug_api.cpp b/core/src/km_core_debug_api.cpp
@@ -13,7 +13,7 @@
 #include "processor.hpp"
 #include "state.hpp"
 
-using namespace km::kbp;
+using namespace km::core;
 
 km_core_status
 km_core_state_debug_set(

diff --git a/core/src/km_core_keyboard_api.cpp b/core/src/km_core_keyboard_api.cpp
@@ -18,7 +18,7 @@
 #include "ldml/ldml_processor.hpp"
 #include "mock/mock_processor.hpp"
 
-using namespace km::kbp;
+using namespace km::core;
 
 namespace
 {

diff --git a/core/src/km_core_state_api.cpp b/core/src/km_core_state_api.cpp
@@ -18,7 +18,7 @@
 #include "processor.hpp"
 #include "state.hpp"
 
-using namespace km::kbp;
+using namespace km::core;
 
 // Forward declarations
 class context;

diff --git a/core/src/kmx/kmx_actions.cpp b/core/src/kmx/kmx_actions.cpp
@@ -4,7 +4,7 @@
 */
 #include <kmx/kmx_processevent.h>
 
-using namespace km::kbp;
+using namespace km::core;
 using namespace kmx;
 
 void KMX_Actions::ResetQueue()

diff --git a/core/src/kmx/kmx_actions.h b/core/src/kmx/kmx_actions.h
@@ -8,7 +8,7 @@
 #include "kmx_base.h"
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 
 #define MAXACTIONQUEUE  1024
@@ -59,6 +59,6 @@ class KMX_Actions
 };
 
 } // namespace kmx
-} // namespace kbp
+} // namespace core
 } // namespace km
 
diff --git a/core/src/kmx/kmx_base.h b/core/src/kmx/kmx_base.h
@@ -11,7 +11,7 @@
 #endif
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 
 typedef struct tagSTORE
@@ -95,5 +95,5 @@ typedef struct tagKMSTATE
 enum ProcessStringReturn { psrPostMessages, psrCheckMatches };
 
 } // namespace kmx
-} // namespace kbp
+} // namespace core
 } // namespace km
diff --git a/core/src/kmx/kmx_capslock.cpp b/core/src/kmx/kmx_capslock.cpp
@@ -5,7 +5,7 @@
 #include <keyman/keyman_core_api_consts.h>
 #include <kmx/kmx_processevent.h>
 
-using namespace km::kbp;
+using namespace km::core;
 using namespace kmx;
 
 /**

diff --git a/core/src/kmx/kmx_consts.cpp b/core/src/kmx/kmx_consts.cpp
@@ -2,7 +2,7 @@
 #include "kmx_processevent.h"
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 
 const struct char_to_vkey s_char_to_vkey[] = {
@@ -105,5 +105,5 @@ const struct char_to_vkey s_char_to_vkey[] = {
 };
 
 } // namespace kmx
-} // namespace kbp
+} // namespace core
 } // namespace km
diff --git a/core/src/kmx/kmx_context.cpp b/core/src/kmx/kmx_context.cpp
@@ -4,7 +4,7 @@
 */
 #include <kmx/kmx_processevent.h>
 
-using namespace km::kbp;
+using namespace km::core;
 using namespace kmx;
 
 /* KMX_Context */

diff --git a/core/src/kmx/kmx_context.h b/core/src/kmx/kmx_context.h
@@ -10,7 +10,7 @@
 #define MAXCONTEXT 64
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 
 class KMX_Context
@@ -118,5 +118,5 @@ class KMX_Context
 };
 
 } // namespace kmx
-} // namespace kbp
+} // namespace core
 } // namespace km
diff --git a/core/src/kmx/kmx_conversion.cpp b/core/src/kmx/kmx_conversion.cpp
@@ -3,7 +3,7 @@
 
 #include "kmx_processevent.h"
 
-using namespace km::kbp;
+using namespace km::core;
 using namespace kmx;
 
 /* This array is lifted from preservedkeymap.cpp */
@@ -116,7 +116,7 @@ const struct
 };
 
 
-KMX_BOOL km::kbp::kmx::MapUSCharToVK(KMX_WORD ch, PKMX_WORD puKey, PKMX_DWORD puShiftFlags) {
+KMX_BOOL km::core::kmx::MapUSCharToVK(KMX_WORD ch, PKMX_WORD puKey, PKMX_DWORD puShiftFlags) {
   assert(puKey != NULL);
   assert(puShiftFlags != NULL);
   if (ch >= 0x20 && ch < 0x7F) {

diff --git a/core/src/kmx/kmx_conversion.h b/core/src/kmx/kmx_conversion.h
@@ -3,7 +3,7 @@
 #include "kmx_base.h"
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 
 #define VK_SPACE  0x20
@@ -32,5 +32,5 @@ namespace kmx {
 KMX_BOOL MapUSCharToVK(KMX_WORD ch, PKMX_WORD puKey, PKMX_DWORD puShiftFlags);
 
 } // namespace kmx
-} // namespace kbp
+} // namespace core
 } // namespace km
diff --git a/core/src/kmx/kmx_debugger.cpp b/core/src/kmx/kmx_debugger.cpp
@@ -8,7 +8,7 @@
 
 #include <kmx/kmx_processevent.h>
 
-using namespace km::kbp;
+using namespace km::core;
 using namespace kmx;
 
 void KMX_DebugItems::push_item(
@@ -93,4 +93,4 @@ void KMX_DebugItems::fill_store_offsets(km_core_state_debug_kmx_info *info, PKMX
   }
 
   info->store_offsets[n] = 0xFFFF;
-}
+}
diff --git a/core/src/kmx/kmx_debugger.h b/core/src/kmx/kmx_debugger.h
@@ -14,7 +14,7 @@
 #include <debug.hpp>
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 
 class KMX_DebugItems
@@ -143,5 +143,5 @@ KMX_DebugItems::push_rule_exit(
 }
 
 } // namespace kmx
-} // namespace kbp
-} // namespace km
+} // namespace core
+} // namespace km
diff --git a/core/src/kmx/kmx_environment.cpp b/core/src/kmx/kmx_environment.cpp
@@ -7,7 +7,7 @@
 #include <state.hpp>
 #include <option.hpp>
 
-using namespace km::kbp;
+using namespace km::core;
 using namespace kmx;
 
 namespace {

diff --git a/core/src/kmx/kmx_environment.h b/core/src/kmx/kmx_environment.h
@@ -5,7 +5,7 @@
 #include "kmx_base.h"
 
 namespace km {
-namespace kbp {
+namespace core {
 namespace kmx {
 
 class KMX_Environment {
@@ -30,5 +30,5 @@ class KMX_Environment {
 };
 
 } // namespace kmx
-} // namespace kbp
+} // namespace core
 } // namespace km
diff --git a/core/src/kmx/kmx_file.cpp b/core/src/kmx/kmx_file.cpp
@@ -6,7 +6,7 @@
 #include <assert.h>
 #include "kmx_file_validator.hpp"
 
-using namespace km::kbp;
+using namespace km::core;
 using namespace kmx;
 
 #if defined(_WIN32) || defined(_WIN64)
@@ -20,7 +20,7 @@ KMX_BOOL KMX_ProcessEvent::Load(km_core_path_name KeyboardName)
   return TRUE;
 }
 
-const int km::kbp::kmx::CODE__SIZE[] = {
+const int km::core::kmx::CODE__SIZE[] = {
     -1,  // undefined                0x00
     1,   // CODE_ANY                 0x01
     2,   // CODE_INDEX               0x02