From 2115232a16d81d28dbdb8042ed8e9316858514c6 Mon Sep 17 00:00:00 2001 From: Sebastian Parborg Date: Fri, 4 Sep 2020 20:59:13 +0200 Subject: Cleanup: Clang-Tidy readability-inconsistent-declaration-parameter-name fix No functional changes --- source/blender/editors/include/ED_armature.h | 2 +- source/blender/editors/include/ED_fileselect.h | 2 +- source/blender/editors/include/ED_keyframes_draw.h | 8 ++-- source/blender/editors/include/ED_keyframing.h | 9 ++-- source/blender/editors/include/ED_mesh.h | 4 +- source/blender/editors/include/ED_object.h | 2 +- source/blender/editors/include/ED_paint.h | 8 ++-- source/blender/editors/include/ED_space_api.h | 4 +- source/blender/editors/include/ED_time_scrub_ui.h | 2 +- source/blender/editors/include/ED_transform.h | 4 +- source/blender/editors/include/ED_view3d.h | 2 +- source/blender/editors/include/UI_interface.h | 49 ++++++++++++---------- 12 files changed, 51 insertions(+), 45 deletions(-) (limited to 'source/blender/editors/include') diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h index 62f4c068de0..47633033b6c 100644 --- a/source/blender/editors/include/ED_armature.h +++ b/source/blender/editors/include/ED_armature.h @@ -148,7 +148,7 @@ EditBone *ED_armature_ebone_add_primitive(struct Object *obedit_arm, /* armature_edit.c */ float ED_armature_ebone_roll_to_vector(const EditBone *bone, - const float new_up_axis[3], + const float align_axis[3], const bool axis_only); void ED_armature_origin_set( struct Main *bmain, struct Object *ob, const float cursor[3], int centermode, int around); diff --git a/source/blender/editors/include/ED_fileselect.h b/source/blender/editors/include/ED_fileselect.h index deda0861b60..47b8eb543f4 100644 --- a/source/blender/editors/include/ED_fileselect.h +++ b/source/blender/editors/include/ED_fileselect.h @@ -199,7 +199,7 @@ void ED_fsmenu_set_category(struct FSMenu *fsmenu, int ED_fsmenu_get_nentries(struct FSMenu *fsmenu, FSMenuCategory category); -struct FSMenuEntry *ED_fsmenu_get_entry(struct FSMenu *fsmenu, FSMenuCategory category, int index); +struct FSMenuEntry *ED_fsmenu_get_entry(struct FSMenu *fsmenu, FSMenuCategory category, int idx); char *ED_fsmenu_entry_get_path(struct FSMenuEntry *fsentry); void ED_fsmenu_entry_set_path(struct FSMenuEntry *fsentry, const char *path); diff --git a/source/blender/editors/include/ED_keyframes_draw.h b/source/blender/editors/include/ED_keyframes_draw.h index adc1e09821e..1a2c2936efe 100644 --- a/source/blender/editors/include/ED_keyframes_draw.h +++ b/source/blender/editors/include/ED_keyframes_draw.h @@ -147,8 +147,8 @@ void draw_keyframe_shape(float x, unsigned int size_id, unsigned int color_id, unsigned int outline_color_id, - unsigned int linemask_id, - short ipo_type, + unsigned int flags_id, + short handle_type, short extreme_type); /* ******************************* Methods ****************************** */ @@ -264,10 +264,10 @@ void mask_to_keylist(struct bDopeSheet *UNUSED(ads), short compare_ak_cfraPtr(void *node, void *data); /* Checks if ActKeyColumn has any block data */ -bool actkeyblock_is_valid(ActKeyColumn *ab); +bool actkeyblock_is_valid(ActKeyColumn *ac); /* Checks if ActKeyColumn can be used as a block (i.e. drawn/used to detect "holds") */ -int actkeyblock_get_valid_hold(ActKeyColumn *ab); +int actkeyblock_get_valid_hold(ActKeyColumn *ac); #ifdef __cplusplus } diff --git a/source/blender/editors/include/ED_keyframing.h b/source/blender/editors/include/ED_keyframing.h index 7f833cd59bf..869be81ca43 100644 --- a/source/blender/editors/include/ED_keyframing.h +++ b/source/blender/editors/include/ED_keyframing.h @@ -105,8 +105,11 @@ int insert_bezt_fcurve(struct FCurve *fcu, const struct BezTriple *bezt, eInsert * already exists. It will insert a keyframe using the current value being keyframed. * Returns the index at which a keyframe was added (or -1 if failed) */ -int insert_vert_fcurve( - struct FCurve *fcu, float x, float y, eBezTriple_KeyframeType keytype, eInsertKeyFlags flag); +int insert_vert_fcurve(struct FCurve *fcu, + float x, + float y, + eBezTriple_KeyframeType keyframe_type, + eInsertKeyFlags flag); /* -------- */ @@ -266,7 +269,7 @@ int ANIM_scene_get_keyingset_index(struct Scene *scene, struct KeyingSet *ks); /* Get Keying Set to use for Auto-Keyframing some transforms */ struct KeyingSet *ANIM_get_keyingset_for_autokeying(const struct Scene *scene, - const char *tranformKSName); + const char *transformKSName); /* Dynamically populate an enum of Keying Sets */ const struct EnumPropertyItem *ANIM_keying_sets_enum_itemf(struct bContext *C, diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index 660e4de09d3..85e7a491feb 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.h @@ -68,7 +68,7 @@ void EDBM_verts_mirror_cache_begin(struct BMEditMesh *em, const bool use_self, const bool use_select, const bool respecthide, - const bool use_toplogy); + const bool use_topology); void EDBM_verts_mirror_apply(struct BMEditMesh *em, const int sel_from, const int sel_to); struct BMVert *EDBM_verts_mirror_get(struct BMEditMesh *em, struct BMVert *v); struct BMEdge *EDBM_verts_mirror_get_edge(struct BMEditMesh *em, struct BMEdge *e); @@ -111,7 +111,7 @@ struct UvElementMap *BM_uv_element_map_create(struct BMesh *bm, const bool uv_selected, const bool use_winding, const bool do_islands); -void BM_uv_element_map_free(struct UvElementMap *vmap); +void BM_uv_element_map_free(struct UvElementMap *element_map); struct UvElement *BM_uv_element_get(struct UvElementMap *map, struct BMFace *efa, struct BMLoop *l); diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index d69c1227ee0..bf9e30b756f 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -265,7 +265,7 @@ void ED_object_base_init_transform_on_add(struct Object *object, const float loc[3], const float rot[3]); float ED_object_new_primitive_matrix(struct bContext *C, - struct Object *editob, + struct Object *obedit, const float loc[3], const float rot[3], float primmat[4][4]); diff --git a/source/blender/editors/include/ED_paint.h b/source/blender/editors/include/ED_paint.h index 3412d62317e..39c5e3521d6 100644 --- a/source/blender/editors/include/ED_paint.h +++ b/source/blender/editors/include/ED_paint.h @@ -65,16 +65,16 @@ void ED_image_undo_restore(struct UndoStep *us); void ED_image_undosys_type(struct UndoType *ut); -void *ED_image_paint_tile_find(struct ListBase *undo_tiles, - struct Image *ima, +void *ED_image_paint_tile_find(struct ListBase *paint_tiles, + struct Image *image, struct ImBuf *ibuf, struct ImageUser *iuser, int x_tile, int y_tile, unsigned short **r_mask, bool validate); -void *ED_image_paint_tile_push(struct ListBase *undo_tiles, - struct Image *ima, +void *ED_image_paint_tile_push(struct ListBase *paint_tiles, + struct Image *image, struct ImBuf *ibuf, struct ImBuf **tmpibuf, struct ImageUser *iuser, diff --git a/source/blender/editors/include/ED_space_api.h b/source/blender/editors/include/ED_space_api.h index f3e867e8360..47c2d4f790c 100644 --- a/source/blender/editors/include/ED_space_api.h +++ b/source/blender/editors/include/ED_space_api.h @@ -67,9 +67,9 @@ void ED_file_exit(void); #define REGION_DRAW_PRE_VIEW 2 #define REGION_DRAW_BACKDROP 3 -void *ED_region_draw_cb_activate(struct ARegionType *, +void *ED_region_draw_cb_activate(struct ARegionType *art, void (*draw)(const struct bContext *, struct ARegion *, void *), - void *custumdata, + void *customdata, int type); void ED_region_draw_cb_draw(const struct bContext *, struct ARegion *, int); void ED_region_draw_cb_exit(struct ARegionType *, void *); diff --git a/source/blender/editors/include/ED_time_scrub_ui.h b/source/blender/editors/include/ED_time_scrub_ui.h index 216e67dd820..6420aaf5ef0 100644 --- a/source/blender/editors/include/ED_time_scrub_ui.h +++ b/source/blender/editors/include/ED_time_scrub_ui.h @@ -34,7 +34,7 @@ struct wmEvent; void ED_time_scrub_draw_current_frame(const struct ARegion *region, const struct Scene *scene, bool display_seconds, - bool draw_vert_line); + bool draw_line); void ED_time_scrub_draw(const struct ARegion *region, const struct Scene *scene, diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h index 4c4672edffc..b53740a531f 100644 --- a/source/blender/editors/include/ED_transform.h +++ b/source/blender/editors/include/ED_transform.h @@ -119,7 +119,7 @@ struct TransformOrientation; struct bContext; void BIF_clearTransformOrientation(struct bContext *C); -void BIF_removeTransformOrientation(struct bContext *C, struct TransformOrientation *ts); +void BIF_removeTransformOrientation(struct bContext *C, struct TransformOrientation *target); void BIF_removeTransformOrientationIndex(struct bContext *C, int index); bool BIF_createTransformOrientation(struct bContext *C, struct ReportList *reports, @@ -127,7 +127,7 @@ bool BIF_createTransformOrientation(struct bContext *C, const bool use_view, const bool activate, const bool overwrite); -void BIF_selectTransformOrientation(struct bContext *C, struct TransformOrientation *ts); +void BIF_selectTransformOrientation(struct bContext *C, struct TransformOrientation *target); void ED_getTransformOrientationMatrix(const struct bContext *C, float orientation_mat[3][3], diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index ddbea592238..d3eb6c00f57 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -677,7 +677,7 @@ void ED_view3d_lock_clear(struct View3D *v3d); float ED_view3d_offset_distance(const float mat[4][4], const float ofs[3], - const float dist_fallback); + const float fallback_dist); void ED_view3d_distance_set(struct RegionView3D *rv3d, const float dist); bool ED_view3d_distance_set_from_location(struct RegionView3D *rv3d, const float dist_co[3], diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index af282bde550..b23f8ae11c9 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -559,9 +559,9 @@ uiPopupMenu *UI_popup_menu_begin_ex(struct bContext *C, const char *title, const char *block_name, int icon) ATTR_NONNULL(); -void UI_popup_menu_end(struct bContext *C, struct uiPopupMenu *head); +void UI_popup_menu_end(struct bContext *C, struct uiPopupMenu *pup); bool UI_popup_menu_end_or_cancel(struct bContext *C, struct uiPopupMenu *head); -struct uiLayout *UI_popup_menu_layout(uiPopupMenu *head); +struct uiLayout *UI_popup_menu_layout(uiPopupMenu *pup); void UI_popup_menu_reports(struct bContext *C, struct ReportList *reports) ATTR_NONNULL(); int UI_popup_menu_invoke(struct bContext *C, const char *idname, struct ReportList *reports) @@ -581,8 +581,8 @@ int UI_popover_panel_invoke(struct bContext *C, uiPopover *UI_popover_begin(struct bContext *C, int menu_width, bool from_active_button) ATTR_NONNULL(1); -void UI_popover_end(struct bContext *C, struct uiPopover *head, struct wmKeyMap *keymap); -struct uiLayout *UI_popover_layout(uiPopover *head); +void UI_popover_end(struct bContext *C, struct uiPopover *pup, struct wmKeyMap *keymap); +struct uiLayout *UI_popover_layout(uiPopover *pup); void UI_popover_once_clear(uiPopover *pup); /* interface_region_menu_pie.c */ @@ -720,7 +720,7 @@ void UI_but_drag_set_path(uiBut *but, const char *path, const bool use_free); void UI_but_drag_set_name(uiBut *but, const char *name); void UI_but_drag_set_value(uiBut *but); void UI_but_drag_set_image( - uiBut *but, const char *path, int icon, struct ImBuf *ima, float scale, const bool use_free); + uiBut *but, const char *path, int icon, struct ImBuf *imb, float scale, const bool use_free); bool UI_but_active_drop_name(struct bContext *C); bool UI_but_active_drop_color(struct bContext *C); @@ -774,10 +774,10 @@ uiBut *uiDefBut(uiBlock *block, int type, int retval, const char *str, - int x1, - int y1, - short x2, - short y2, + int x, + int y, + short width, + short height, void *poin, float min, float max, @@ -957,10 +957,10 @@ uiBut *uiDefIconBut(uiBlock *block, int type, int retval, int icon, - int x1, - int y1, - short x2, - short y2, + int x, + int y, + short width, + short height, void *poin, float min, float max, @@ -1143,10 +1143,10 @@ uiBut *uiDefIconTextBut(uiBlock *block, int retval, int icon, const char *str, - int x1, - int y1, - short x2, - short y2, + int x, + int y, + short width, + short height, void *poin, float min, float max, @@ -1452,7 +1452,7 @@ uiBut *uiDefIconMenuBut(uiBlock *block, uiBut *uiDefBlockBut(uiBlock *block, uiBlockCreateFunc func, - void *func_arg1, + void *arg, const char *str, int x, int y, @@ -1879,7 +1879,7 @@ void uiLayoutSetContextFromBut(uiLayout *layout, uiBut *but); void uiLayoutSetOperatorContext(uiLayout *layout, int opcontext); void uiLayoutSetActive(uiLayout *layout, bool active); void uiLayoutSetActiveDefault(uiLayout *layout, bool active_default); -void uiLayoutSetActivateInit(uiLayout *layout, bool active); +void uiLayoutSetActivateInit(uiLayout *layout, bool activate_init); void uiLayoutSetEnabled(uiLayout *layout, bool enabled); void uiLayoutSetRedAlert(uiLayout *layout, bool redalert); void uiLayoutSetAlignment(uiLayout *layout, char alignment); @@ -2057,7 +2057,10 @@ void uiTemplateColorPicker(uiLayout *layout, bool lock, bool lock_luminosity, bool cubic); -void uiTemplatePalette(uiLayout *layout, struct PointerRNA *ptr, const char *propname, bool color); +void uiTemplatePalette(uiLayout *layout, + struct PointerRNA *ptr, + const char *propname, + bool colors); void uiTemplateCryptoPicker(uiLayout *layout, struct PointerRNA *ptr, const char *propname); void uiTemplateLayers(uiLayout *layout, struct PointerRNA *ptr, @@ -2241,7 +2244,7 @@ void uiItemFullO_ptr(uiLayout *layout, int flag, PointerRNA *r_opptr); void uiItemFullO(uiLayout *layout, - const char *idname, + const char *opname, const char *name, int icon, struct IDProperty *properties, @@ -2378,7 +2381,7 @@ void uiItemSpacer(uiLayout *layout); void uiItemPopoverPanel_ptr( uiLayout *layout, struct bContext *C, struct PanelType *pt, const char *name, int icon); void uiItemPopoverPanel( - uiLayout *layout, struct bContext *C, const char *panelname, const char *name, int icon); + uiLayout *layout, struct bContext *C, const char *panel_type, const char *name, int icon); void uiItemPopoverPanelFromGroup(uiLayout *layout, struct bContext *C, int space_id, @@ -2458,7 +2461,7 @@ void UI_context_active_but_prop_get_templateID(struct bContext *C, struct ID *UI_context_active_but_get_tab_ID(struct bContext *C); uiBut *UI_region_active_but_get(struct ARegion *region); -uiBut *UI_region_but_find_rect_over(const struct ARegion *region, const struct rcti *isect); +uiBut *UI_region_but_find_rect_over(const struct ARegion *region, const struct rcti *rect_px); uiBlock *UI_region_block_find_mouse_over(const struct ARegion *region, const int xy[2], bool only_clip); -- cgit v1.2.3