erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-28 19:27:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

feat(windows): Apply suggestions from code review

Browse source 
Co-authored-by: Marc Durdin <marc@durdin.net>
This commit is contained in:
rc-swag 2021-09-22 16:11:36 +10:00 • committed by GitHub
parent deb358de5a
commit 64dbaad371
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
windows/src/engine/keyman32/keyboardoptions.cpp
View file

@ -293,7 +293,7 @@ UpdateKeyboardOptionsCore(
&retValue);
if (err_status != KM_KBP_STATUS_OK) {
SendDebugMessageFormat(
0, sdmKeyboard, 0, "SaveCoreOptions: km_kbp_state_option_lookup failed with error status [%d]", err_status);
0, sdmKeyboard, 0, "UpdateKeyboardOptionsCore: km_kbp_state_option_lookup failed with error status [%d]", err_status);
continue;
}
// compare to see if changed
@ -314,7 +314,7 @@ SaveKeyboardOptionsCore(LPINTKEYBOARDINFO kp) {
km_kbp_status err_status = km_kbp_keyboard_get_attrs(kp->lpCoreKeyboard, &keyboardAttrs);
if (err_status != KM_KBP_STATUS_OK) {
SendDebugMessageFormat(
0, sdmKeyboard, 0, "LoadKeyboardOptionsREGCore: km_kbp_keyboard_get_attrs failed with error status [%d]", err_status);
0, sdmKeyboard, 0, "SaveKeyboardOptionsCore: km_kbp_keyboard_get_attrs failed with error status [%d]", err_status);
return nullptr;
}
int listSize = (int)km_kbp_options_list_size(keyboardAttrs->default_options);
@ -329,7 +329,7 @@ SaveKeyboardOptionsCore(LPINTKEYBOARDINFO kp) {
km_kbp_state_option_lookup(kp->lpCoreKeyboardState, KM_KBP_OPT_KEYBOARD, kbDefaultOpts->key, &retValue);
if (err_status != KM_KBP_STATUS_OK) {
SendDebugMessageFormat(
0, sdmKeyboard, 0, "SaveCoreOptions: km_kbp_state_option_lookup failed with error status [%d]", err_status);
0, sdmKeyboard, 0, "SaveKeyboardOptionsCore: km_kbp_state_option_lookup failed with error status [%d]", err_status);
continue;
}
savedKeyboardOpts[i].key = CloneKMKBPCP(kbDefaultOpts->key);
@ -347,13 +347,13 @@ RestoreKeyboardOptionsCore(
km_kbp_status err_status = km_kbp_state_options_update(lpCoreKeyboardState, lpCoreKeyboardOptions);
if (err_status != KM_KBP_STATUS_OK) {
SendDebugMessageFormat(
0, sdmKeyboard, 0, "LoadKeyboardOptionsREGCore: km_kbp_state_options_update failed with error status [%d]", err_status);
0, sdmKeyboard, 0, "RestoreKeyboardOptionsCore: km_kbp_state_options_update failed with error status [%d]", err_status);
return FALSE;
}
return TRUE;
}
BOOL
void
DisposeKeyboardOptionsCore(km_kbp_option_item** lpCoreKeyboardOptions) {
size_t listSize = km_kbp_options_list_size(*lpCoreKeyboardOptions);
for (int i = 0; i < (int)listSize; i++) {

8
windows/src/engine/keyman32/keyboardoptions.h
View file

@ -26,7 +26,7 @@ void LoadSharedKeyboardOptions(LPINTKEYBOARDINFO kp);
* Updates the supplied Keyboard processor options list from the keyboard processor pointed
* to by the state pointer.
*
* @param lpCoreKeyboardState The core keyboardprocessor state which as the source options
* @param lpCoreKeyboardState The core keyboardprocessor state which has the source options
* @param[in,out] lpCoreKeyboardOptions The core keyboard options to be updated
* @return BOOL True if one or more options were updated
*/
@ -36,7 +36,7 @@ BOOL UpdateKeyboardOptionsCore(km_kbp_state* const lpCoreKeyboardState, km_kbp_o
* Returns a copy of the core keyboard processors current keyboard options
* The caller is responsible for freeing the returned km_kbp_option_item's list.
*
* @param kp A pointer the keyboard info object that constains the
* @param kp A pointer to the keyboard info object that contains the
* keyboardprocessor state and keyboard for the source options list.
*
* @return km_kbp_option_item* The copy of the options list or NULL if copy failed
@ -44,7 +44,7 @@ BOOL UpdateKeyboardOptionsCore(km_kbp_state* const lpCoreKeyboardState, km_kbp_o
km_kbp_option_item* SaveKeyboardOptionsCore(LPINTKEYBOARDINFO kp);
/**
* Restore the core keyboard processor options to from the supplied keyboard
* Restore the core keyboard processor options to the supplied keyboard
* list of `km_kbp_option_item`s
*
* @param lpCoreKeyboardState The state pointer for the keyboard processor
@ -79,4 +79,4 @@ void SaveKeyboardOptionREGCore(LPINTKEYBOARDINFO kp, LPCWSTR key, LPWSTR value);
*
* @param lpCoreKeyboardOptions keyboard options items to be freed
*/
BOOL DisposeKeyboardOptionsCore(km_kbp_option_item** lpCoreKeyboardOptions);
void DisposeKeyboardOptionsCore(km_kbp_option_item** lpCoreKeyboardOptions);