Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions core/docs/api/keyboards.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ Provides read-only information about a keyboard.
typedef struct {
km_core_cp const * version_string;
km_core_cp const * id;
km_core_path_name folder_path;
km_core_option_item const * default_options;
} km_core_keyboard_attrs;

Expand All @@ -33,9 +32,6 @@ typedef struct {
`id`
: Keyman keyboard ID string.

`folder_path`
: Path to the unpacked folder containing the keyboard and associated resources.

`default_options`
: Set of default values for any options included in the keyboard.

Expand Down Expand Up @@ -662,4 +658,4 @@ km_core_state_to_json(km_core_state const *state,
[km_core_event_flags]: processor#km_core_event_flags "km_core_event_flags enum"
[km_core_process_event]: processor#km_core_process_event "km_core_process_event function"
[km_core_event]: processor#km_core_event "km_core_event function"
[km_core_event_code]: processor#km_core_event_code "km_core_event_code enum"
[km_core_event_code]: processor#km_core_event_code "km_core_event_code enum"
8 changes: 0 additions & 8 deletions core/include/keyman/keyman_core_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -1011,11 +1011,6 @@ Provides read-only information about a keyboard.
typedef struct {
km_core_cu const * version_string;
km_core_cu const * id;

// TODO-web-core: Deprecate this field (#12497)
// KMN_DEPRECATED
km_core_path_name folder_path;

km_core_option_item const * default_options;
} km_core_keyboard_attrs;

Expand All @@ -1029,9 +1024,6 @@ typedef struct {
`id`
: Keyman keyboard ID string.

`folder_path`
: Path to the unpacked folder containing the keyboard and associated resources (deprecated).

`default_options`
: Set of default values for any options included in the keyboard.

Expand Down
2 changes: 0 additions & 2 deletions core/src/keyboard.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ keyboard_attributes::keyboard_attributes(std::u16string const & kbid,
options_store const &opts)
: _keyboard_id(kbid),
_version_string(version),
_folder_path(""),
_default_opts(opts)
{
// Ensure that the default_options array will be properly terminated.
Expand All @@ -38,7 +37,6 @@ keyboard_attributes::keyboard_attributes(std::u16string const & kbid,
keyboard_attributes::keyboard_attributes(keyboard_attributes &&rhs)
: _keyboard_id(std::move(rhs._keyboard_id)),
_version_string(std::move(rhs._version_string)),
_folder_path(""),
_default_opts(std::move(rhs._default_opts))
{
rhs.id = rhs.version_string = nullptr;
Expand Down
4 changes: 1 addition & 3 deletions core/src/keyboard.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ namespace core
{
std::u16string _keyboard_id;
std::u16string _version_string;
// unused and deprecated
core::path _folder_path;
std::vector<option> _default_opts;

void render();
Expand All @@ -36,7 +34,7 @@ namespace core
using options_store = decltype(_default_opts);

keyboard_attributes()
: km_core_keyboard_attrs {nullptr, nullptr, nullptr, nullptr} {}
: km_core_keyboard_attrs {nullptr, nullptr, nullptr} {}
keyboard_attributes(keyboard_attributes const &) = delete;
keyboard_attributes(keyboard_attributes &&);

Expand Down
1 change: 0 additions & 1 deletion developer/src/tike/main/Keyman.System.KeymanCore.pas
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@ function km_core_state_options_to_json(
km_core_keyboard_attrs = record
version_string: pkm_core_cu;
id: pkm_core_cu;
folder_path: km_core_path_name;
default_optons: pkm_core_option_item
end;

Expand Down