diff options
-rw-r--r-- | source/blender/editors/interface/interface_context_menu.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_wm_api.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/WM_keymap.h | 6 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 14 |
5 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/editors/interface/interface_context_menu.c b/source/blender/editors/interface/interface_context_menu.c index b6d9863f9b5..748d6e6c183 100644 --- a/source/blender/editors/interface/interface_context_menu.c +++ b/source/blender/editors/interface/interface_context_menu.c @@ -148,7 +148,7 @@ static uiBlock *menu_add_shortcut(bContext *C, ARegion *ar, void *arg) if (prop) { prop = IDP_CopyProperty(prop); } - WM_keymap_properties_reset(kmi, prop); + WM_keymap_item_properties_reset(kmi, prop); /* update and get pointers again */ WM_keyconfig_update(wm); diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 34faf13fa7e..3f904df6e00 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -847,7 +847,7 @@ static int rna_wmKeyMapItem_map_type_get(PointerRNA *ptr) { wmKeyMapItem *kmi = ptr->data; - return WM_keymap_map_type_get(kmi); + return WM_keymap_item_map_type_get(kmi); } static void rna_wmKeyMapItem_map_type_set(PointerRNA *ptr, int value) @@ -1169,7 +1169,7 @@ static void rna_wmKeyMapItem_idname_set(PointerRNA *ptr, const char *value) if (!STREQ(idname, kmi->idname)) { BLI_strncpy(kmi->idname, idname, sizeof(kmi->idname)); - WM_keymap_properties_reset(kmi, NULL); + WM_keymap_item_properties_reset(kmi, NULL); } } diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c index 3e7d16c636e..e4caeb2a5ae 100644 --- a/source/blender/makesrna/intern/rna_wm_api.c +++ b/source/blender/makesrna/intern/rna_wm_api.c @@ -82,7 +82,7 @@ static wmKeyMap *rna_keymap_active(wmKeyMap *km, bContext *C) static void rna_keymap_restore_item_to_default(wmKeyMap *km, bContext *C, wmKeyMapItem *kmi) { - WM_keymap_restore_item_to_default(C, km, kmi); + WM_keymap_item_restore_to_default(C, km, kmi); } static void rna_Operator_report(wmOperator *op, int type, const char *msg) diff --git a/source/blender/windowmanager/WM_keymap.h b/source/blender/windowmanager/WM_keymap.h index 06e970d8ba1..53488cd1f71 100644 --- a/source/blender/windowmanager/WM_keymap.h +++ b/source/blender/windowmanager/WM_keymap.h @@ -149,11 +149,11 @@ void WM_modalkeymap_assign(struct wmKeyMap *km, const char *opname); /* Keymap Editor */ void WM_keymap_restore_to_default(struct wmKeyMap *keymap, struct bContext *C); -void WM_keymap_properties_reset(struct wmKeyMapItem *kmi, struct IDProperty *properties); -void WM_keymap_restore_item_to_default(struct bContext *C, +void WM_keymap_item_properties_reset(struct wmKeyMapItem *kmi, struct IDProperty *properties); +void WM_keymap_item_restore_to_default(struct bContext *C, struct wmKeyMap *keymap, struct wmKeyMapItem *kmi); -int WM_keymap_map_type_get(struct wmKeyMapItem *kmi); +int WM_keymap_item_map_type_get(const struct wmKeyMapItem *kmi); /* Key Event */ diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index edb13642232..bae9a5de1e6 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -145,7 +145,7 @@ static void wm_keymap_item_properties_update_ot(wmKeyMapItem *kmi) } } -static void wm_keyconfig_properties_update_ot(ListBase *km_lb) +static void wm_keymap_item_properties_update_ot_from_list(ListBase *km_lb) { wmKeyMap *km; wmKeyMapItem *kmi; @@ -184,7 +184,7 @@ static bool wm_keymap_item_equals(wmKeyMapItem *a, wmKeyMapItem *b) } /* properties can be NULL, otherwise the arg passed is used and ownership is given to the kmi */ -void WM_keymap_properties_reset(wmKeyMapItem *kmi, struct IDProperty *properties) +void WM_keymap_item_properties_reset(wmKeyMapItem *kmi, struct IDProperty *properties) { if (LIKELY(kmi->ptr)) { WM_operator_properties_free(kmi->ptr); @@ -198,7 +198,7 @@ void WM_keymap_properties_reset(wmKeyMapItem *kmi, struct IDProperty *properties wm_keymap_item_properties_set(kmi); } -int WM_keymap_map_type_get(wmKeyMapItem *kmi) +int WM_keymap_item_map_type_get(const wmKeyMapItem *kmi) { if (ISTIMER(kmi->type)) { return KMI_TYPE_TIMER; @@ -1868,11 +1868,11 @@ void WM_keyconfig_update(wmWindowManager *wm) int i; for (i = 0; keymaps_lb[i]; i++) { - wm_keyconfig_properties_update_ot(keymaps_lb[i]); + wm_keymap_item_properties_update_ot_from_list(keymaps_lb[i]); } for (kc = wm->keyconfigs.first; kc; kc = kc->next) { - wm_keyconfig_properties_update_ot(&kc->keymaps); + wm_keymap_item_properties_update_ot_from_list(&kc->keymaps); } wm_keymap_update_flag &= ~WM_KEYMAP_UPDATE_OPERATORTYPE; @@ -1984,7 +1984,7 @@ wmKeyMap *WM_keymap_active(wmWindowManager *wm, wmKeyMap *keymap) * In the keymap editor the user key configuration is edited. * \{ */ -void WM_keymap_restore_item_to_default(bContext *C, wmKeyMap *keymap, wmKeyMapItem *kmi) +void WM_keymap_item_restore_to_default(bContext *C, wmKeyMap *keymap, wmKeyMapItem *kmi) { wmWindowManager *wm = CTX_wm_manager(C); wmKeyMap *defaultmap, *addonmap; @@ -2011,7 +2011,7 @@ void WM_keymap_restore_item_to_default(bContext *C, wmKeyMap *keymap, wmKeyMapIt /* restore to original */ if (!STREQ(orig->idname, kmi->idname)) { BLI_strncpy(kmi->idname, orig->idname, sizeof(kmi->idname)); - WM_keymap_properties_reset(kmi, NULL); + WM_keymap_item_properties_reset(kmi, NULL); } if (orig->properties) { |