Cleanup: Clang-Tidy readability-inconsistent-declaration-parameter-name fix

No functional changes

7 files changed, 31 insertions, 31 deletions

diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index c57fe6d4ba1..80f330d91ca 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -200,7 +200,7 @@ void WM_lib_reload(struct Library *lib, struct bContext *C, struct ReportList *r
 /* mouse cursors */
 void WM_cursor_set(struct wmWindow *win, int curs);
 bool WM_cursor_set_from_tool(struct wmWindow *win, const ScrArea *area, const ARegion *region);
-void WM_cursor_modal_set(struct wmWindow *win, int curs);
+void WM_cursor_modal_set(struct wmWindow *win, int val);
 void WM_cursor_modal_restore(struct wmWindow *win);
 void WM_cursor_wait(bool val);
 void WM_cursor_grab_enable(struct wmWindow *win, int wrap, bool hide, int bounds[4]);
@@ -269,20 +269,20 @@ typedef void (*wmUIHandlerRemoveFunc)(struct bContext *C, void *userdata);
 
 struct wmEventHandler_UI *WM_event_add_ui_handler(const struct bContext *C,
                                                   ListBase *handlers,
-                                                  wmUIHandlerFunc ui_handle,
-                                                  wmUIHandlerRemoveFunc ui_remove,
-                                                  void *userdata,
+                                                  wmUIHandlerFunc handle_fn,
+                                                  wmUIHandlerRemoveFunc remove_fn,
+                                                  void *user_data,
                                                   const char flag);
 void WM_event_remove_ui_handler(ListBase *handlers,
-                                wmUIHandlerFunc ui_handle,
-                                wmUIHandlerRemoveFunc ui_remove,
-                                void *userdata,
+                                wmUIHandlerFunc handle_fn,
+                                wmUIHandlerRemoveFunc remove_fn,
+                                void *user_data,
                                 const bool postpone);
 void WM_event_remove_area_handler(struct ListBase *handlers, void *area);
 void WM_event_free_ui_handler_all(struct bContext *C,
                                   ListBase *handlers,
-                                  wmUIHandlerFunc ui_handle,
-                                  wmUIHandlerRemoveFunc ui_remove);
+                                  wmUIHandlerFunc handle_fn,
+                                  wmUIHandlerRemoveFunc remove_fn);
 
 struct wmEventHandler_Op *WM_event_add_modal_handler(struct bContext *C, struct wmOperator *op);
 void WM_event_modal_handler_area_replace(wmWindow *win,
@@ -676,7 +676,7 @@ struct ID *WM_drag_ID(const struct wmDrag *drag, short idcode);
 struct ID *WM_drag_ID_from_event(const struct wmEvent *event, short idcode);
 
 /* Set OpenGL viewport and scissor */
-void wmViewport(const struct rcti *rect);
+void wmViewport(const struct rcti *winrct);
 void wmPartialViewport(rcti *drawrct, const rcti *winrct, const rcti *partialrct);
 void wmWindowViewport(struct wmWindow *win);
 
@@ -886,7 +886,7 @@ double WM_tooltip_time_closed(void);
 struct wmGenericCallback *WM_generic_callback_steal(struct wmGenericCallback *callback);
 void WM_generic_callback_free(struct wmGenericCallback *callback);
 
-void WM_generic_user_data_free(struct wmGenericUserData *user_data);
+void WM_generic_user_data_free(struct wmGenericUserData *wm_userdata);
 
 bool WM_region_use_viewport(struct ScrArea *area, struct ARegion *region);
 
diff --git a/source/blender/windowmanager/WM_toolsystem.h b/source/blender/windowmanager/WM_toolsystem.h
index 13d1666dc95..451f0ecd424 100644
--- a/source/blender/windowmanager/WM_toolsystem.h
+++ b/source/blender/windowmanager/WM_toolsystem.h
@@ -76,7 +76,7 @@ void WM_toolsystem_reinit_all(struct bContext *C, struct wmWindow *win);
 void WM_toolsystem_ref_set_from_runtime(struct bContext *C,
                                         struct WorkSpace *workspace,
                                         struct bToolRef *tref,
-                                        const struct bToolRef_Runtime *tool,
+                                        const struct bToolRef_Runtime *tref_rt,
                                         const char *idname);
 
 void WM_toolsystem_ref_sync_from_context(struct Main *bmain,
diff --git a/source/blender/windowmanager/gizmo/WM_gizmo_api.h b/source/blender/windowmanager/gizmo/WM_gizmo_api.h
index a4412ecce5c..70ddae4d724 100644
--- a/source/blender/windowmanager/gizmo/WM_gizmo_api.h
+++ b/source/blender/windowmanager/gizmo/WM_gizmo_api.h
@@ -96,7 +96,7 @@ void WM_gizmo_set_matrix_rotation_from_yz_axis(struct wmGizmo *gz,
                                                const float y_axis[3],
                                                const float z_axis[3]);
 
-void WM_gizmo_set_matrix_offset_location(struct wmGizmo *gz, const float origin[3]);
+void WM_gizmo_set_matrix_offset_location(struct wmGizmo *gz, const float offset[3]);
 void WM_gizmo_set_matrix_offset_rotation_from_z_axis(struct wmGizmo *gz, const float z_axis[3]);
 void WM_gizmo_set_matrix_offset_rotation_from_yz_axis(struct wmGizmo *gz,
                                                       const float y_axis[3],
@@ -130,20 +130,20 @@ void WM_gizmo_calc_matrix_final(const struct wmGizmo *gz, float r_mat[4][4]);
 
 /* properties */
 void WM_gizmo_properties_create_ptr(struct PointerRNA *ptr, struct wmGizmoType *gzt);
-void WM_gizmo_properties_create(struct PointerRNA *ptr, const char *opstring);
+void WM_gizmo_properties_create(struct PointerRNA *ptr, const char *gtstring);
 void WM_gizmo_properties_alloc(struct PointerRNA **ptr,
                                struct IDProperty **properties,
-                               const char *wtstring);
+                               const char *gtstring);
 void WM_gizmo_properties_sanitize(struct PointerRNA *ptr, const bool no_context);
 bool WM_gizmo_properties_default(struct PointerRNA *ptr, const bool do_update);
-void WM_gizmo_properties_reset(struct wmGizmo *op);
+void WM_gizmo_properties_reset(struct wmGizmo *gz);
 void WM_gizmo_properties_clear(struct PointerRNA *ptr);
 void WM_gizmo_properties_free(struct PointerRNA *ptr);
 
 /* wm_gizmo_type.c */
 const struct wmGizmoType *WM_gizmotype_find(const char *idname, bool quiet);
-void WM_gizmotype_append(void (*wtfunc)(struct wmGizmoType *));
-void WM_gizmotype_append_ptr(void (*mnpfunc)(struct wmGizmoType *, void *), void *userdata);
+void WM_gizmotype_append(void (*gtfunc)(struct wmGizmoType *));
+void WM_gizmotype_append_ptr(void (*gtfunc)(struct wmGizmoType *, void *), void *userdata);
 bool WM_gizmotype_remove(struct bContext *C, struct Main *bmain, const char *idname);
 void WM_gizmotype_remove_ptr(struct bContext *C, struct Main *bmain, struct wmGizmoType *gzt);
 void WM_gizmotype_iter(struct GHashIterator *ghi);
@@ -151,11 +151,11 @@ void WM_gizmotype_iter(struct GHashIterator *ghi);
 /* wm_gizmo_group_type.c */
 struct wmGizmoGroupType *WM_gizmogrouptype_find(const char *idname, bool quiet);
 struct wmGizmoGroupType *WM_gizmogrouptype_append(void (*wtfunc)(struct wmGizmoGroupType *));
-struct wmGizmoGroupType *WM_gizmogrouptype_append_ptr(void (*mnpfunc)(struct wmGizmoGroupType *,
-                                                                      void *),
+struct wmGizmoGroupType *WM_gizmogrouptype_append_ptr(void (*wtfunc)(struct wmGizmoGroupType *,
+                                                                     void *),
                                                       void *userdata);
 bool WM_gizmogrouptype_free(const char *idname);
-void WM_gizmogrouptype_free_ptr(struct wmGizmoGroupType *wt);
+void WM_gizmogrouptype_free_ptr(struct wmGizmoGroupType *gzgt);
 void WM_gizmogrouptype_iter(struct GHashIterator *ghi);
 
 struct wmGizmoGroupTypeRef *WM_gizmogrouptype_append_and_link(
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
index b64d544962d..a5e51d0d395 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
@@ -642,7 +642,7 @@ void GIZMOGROUP_OT_gizmo_tweak(wmOperatorType *ot)
 
 /** \} */
 
-wmKeyMap *wm_gizmogroup_tweak_modal_keymap(wmKeyConfig *kc)
+wmKeyMap *wm_gizmogroup_tweak_modal_keymap(wmKeyConfig *keyconf)
 {
   wmKeyMap *keymap;
   char name[KMAP_MAX_NAME];
@@ -658,14 +658,14 @@ wmKeyMap *wm_gizmogroup_tweak_modal_keymap(wmKeyConfig *kc)
   };
 
   STRNCPY(name, "Generic Gizmo Tweak Modal Map");
-  keymap = WM_modalkeymap_find(kc, name);
+  keymap = WM_modalkeymap_find(keyconf, name);
 
   /* this function is called for each spacetype, only needs to add map once */
   if (keymap && keymap->modal_items) {
     return NULL;
   }
 
-  keymap = WM_modalkeymap_ensure(kc, name, modal_items);
+  keymap = WM_modalkeymap_ensure(keyconf, name, modal_items);
 
   /* items for modal map */
   WM_modalkeymap_add_item(keymap, EVT_ESCKEY, KM_PRESS, KM_ANY, 0, TWEAK_MODAL_CANCEL);
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c
index d7ff2689a86..a39b10434e8 100644
--- a/source/blender/windowmanager/intern/wm_keymap.c
+++ b/source/blender/windowmanager/intern/wm_keymap.c
@@ -1761,13 +1761,13 @@ enum {
 
 static char wm_keymap_update_flag = 0;
 
-void WM_keyconfig_update_tag(wmKeyMap *km, wmKeyMapItem *kmi)
+void WM_keyconfig_update_tag(wmKeyMap *keymap, wmKeyMapItem *kmi)
 {
   /* quick tag to do delayed keymap updates */
   wm_keymap_update_flag |= WM_KEYMAP_UPDATE_RECONFIGURE;
 
-  if (km) {
-    km->flag |= KEYMAP_UPDATE;
+  if (keymap) {
+    keymap->flag |= KEYMAP_UPDATE;
   }
   if (kmi) {
     kmi->flag |= KMI_UPDATE;
diff --git a/source/blender/windowmanager/intern/wm_toolsystem.c b/source/blender/windowmanager/intern/wm_toolsystem.c
index 72969f34162..570d60f6c60 100644
--- a/source/blender/windowmanager/intern/wm_toolsystem.c
+++ b/source/blender/windowmanager/intern/wm_toolsystem.c
@@ -450,10 +450,10 @@ static bool toolsystem_key_ensure_check(const bToolKey *tkey)
   return false;
 }
 
-int WM_toolsystem_mode_from_spacetype(ViewLayer *view_layer, ScrArea *area, int spacetype)
+int WM_toolsystem_mode_from_spacetype(ViewLayer *view_layer, ScrArea *area, int space_type)
 {
   int mode = -1;
-  switch (spacetype) {
+  switch (space_type) {
     case SPACE_VIEW3D: {
       /* 'area' may be NULL in this case. */
       Object *obact = OBACT(view_layer);
diff --git a/source/blender/windowmanager/message_bus/wm_message_bus.h b/source/blender/windowmanager/message_bus/wm_message_bus.h
index 23a53eace52..7ae356cf806 100644
--- a/source/blender/windowmanager/message_bus/wm_message_bus.h
+++ b/source/blender/windowmanager/message_bus/wm_message_bus.h
@@ -155,7 +155,7 @@ typedef struct wmMsgSubscribeKey_Static {
   wmMsg_Static msg;
 } wmMsgSubscribeKey_Static;
 
-void WM_msgtypeinfo_init_static(wmMsgTypeInfo *msg_type);
+void WM_msgtypeinfo_init_static(wmMsgTypeInfo *msgtype_info);
 
 wmMsgSubscribeKey_Static *WM_msg_lookup_static(struct wmMsgBus *mbus,
                                                const wmMsgParams_Static *msg_key_params);
@@ -208,7 +208,7 @@ typedef struct wmMsgSubscribeKey_RNA {
 #  define _WM_MESSAGE_EXTERN_END
 #endif
 
-void WM_msgtypeinfo_init_rna(wmMsgTypeInfo *msg_type);
+void WM_msgtypeinfo_init_rna(wmMsgTypeInfo *msgtype_info);
 
 wmMsgSubscribeKey_RNA *WM_msg_lookup_rna(struct wmMsgBus *mbus,
                                          const wmMsgParams_RNA *msg_key_params);