diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-05-30 08:01:46 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-30 08:02:49 +0300 |
commit | 2437a8b6f02144d796829a32461878ff2160c791 (patch) | |
tree | 94f4130590dd05eb275e45299b12fd74503de595 /source/blender/windowmanager/gizmo | |
parent | fee600f4798082b73ff668fc0cc45535e2a949e5 (diff) |
Cleanup: rename callbacks to match the struct member name
Diffstat (limited to 'source/blender/windowmanager/gizmo')
3 files changed, 13 insertions, 12 deletions
diff --git a/source/blender/windowmanager/gizmo/WM_gizmo_api.h b/source/blender/windowmanager/gizmo/WM_gizmo_api.h index 7aaf7da9a5b..d2634d8d8d6 100644 --- a/source/blender/windowmanager/gizmo/WM_gizmo_api.h +++ b/source/blender/windowmanager/gizmo/WM_gizmo_api.h @@ -236,12 +236,12 @@ void WM_gizmo_target_property_subscribe_all(struct wmGizmo *gz, /* wmGizmoGroup */ /* Callbacks for 'wmGizmoGroupType.setup_keymap' */ -struct wmKeyMap *WM_gizmogroup_keymap_generic(const struct wmGizmoGroupType *gzgt, - struct wmKeyConfig *kc); -struct wmKeyMap *WM_gizmogroup_keymap_generic_select(const struct wmGizmoGroupType *gzgt, - struct wmKeyConfig *kc); -struct wmKeyMap *WM_gizmogroup_keymap_generic_drag(const struct wmGizmoGroupType *gzgt, - struct wmKeyConfig *kc); +struct wmKeyMap *WM_gizmogroup_setup_keymap_generic(const struct wmGizmoGroupType *gzgt, + struct wmKeyConfig *kc); +struct wmKeyMap *WM_gizmogroup_setup_keymap_generic_select(const struct wmGizmoGroupType *gzgt, + struct wmKeyConfig *kc); +struct wmKeyMap *WM_gizmogroup_setup_keymap_generic_drag(const struct wmGizmoGroupType *gzgt, + struct wmKeyConfig *kc); /* Utility functions (not callbacks). */ struct wmKeyMap *WM_gizmo_keymap_generic_with_keyconfig(struct wmKeyConfig *kc); diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c index b9de69122c4..bea951e7708 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c @@ -651,12 +651,13 @@ wmKeyMap *wm_gizmogroup_tweak_modal_keymap(wmKeyConfig *kc) * * \{ */ -wmKeyMap *WM_gizmogroup_keymap_generic(const wmGizmoGroupType *UNUSED(gzgt), wmKeyConfig *kc) +wmKeyMap *WM_gizmogroup_setup_keymap_generic(const wmGizmoGroupType *UNUSED(gzgt), wmKeyConfig *kc) { return WM_gizmo_keymap_generic_with_keyconfig(kc); } -wmKeyMap *WM_gizmogroup_keymap_generic_drag(const wmGizmoGroupType *UNUSED(gzgt), wmKeyConfig *kc) +wmKeyMap *WM_gizmogroup_setup_keymap_generic_drag(const wmGizmoGroupType *UNUSED(gzgt), + wmKeyConfig *kc) { return WM_gizmo_keymap_generic_drag_with_keyconfig(kc); } @@ -709,8 +710,8 @@ static wmKeyMap *WM_gizmogroup_keymap_template_select_ex( return km; } -wmKeyMap *WM_gizmogroup_keymap_generic_select(const wmGizmoGroupType *UNUSED(gzgt), - wmKeyConfig *kc) +wmKeyMap *WM_gizmogroup_setup_keymap_generic_select(const wmGizmoGroupType *UNUSED(gzgt), + wmKeyConfig *kc) { struct wmGizmoMapType_Params params = { .spaceid = SPACE_EMPTY, diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c index d09e088af7f..dcc70222a48 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c @@ -97,10 +97,10 @@ static void wm_gizmogrouptype_append__end(wmGizmoGroupType *gzgt) /* if not set, use default */ if (gzgt->setup_keymap == NULL) { if (gzgt->flag & WM_GIZMOGROUPTYPE_SELECT) { - gzgt->setup_keymap = WM_gizmogroup_keymap_generic_select; + gzgt->setup_keymap = WM_gizmogroup_setup_keymap_generic_select; } else { - gzgt->setup_keymap = WM_gizmogroup_keymap_generic; + gzgt->setup_keymap = WM_gizmogroup_setup_keymap_generic; } } |