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

No functional changes

42 files changed, 161 insertions, 155 deletions

diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c
index f608038a95a..ef86b132a60 100644
--- a/source/blender/editors/animation/keyframes_edit.c
+++ b/source/blender/editors/animation/keyframes_edit.c
@@ -916,10 +916,10 @@ static short snap_bezier_value(KeyframeEditData *ked, BezTriple *bezt)
   return 0;
 }
 
-KeyframeEditFunc ANIM_editkeyframes_snap(short type)
+KeyframeEditFunc ANIM_editkeyframes_snap(short mode)
 {
   /* eEditKeyframes_Snap */
-  switch (type) {
+  switch (mode) {
     case SNAP_KEYS_NEARFRAME: /* snap to nearest frame */
       return snap_bezier_nearest;
     case SNAP_KEYS_CURFRAME: /* snap to current frame */
@@ -1030,9 +1030,9 @@ static short mirror_bezier_value(KeyframeEditData *ked, BezTriple *bezt)
 
 /* Note: for markers and 'value', the values to use must be supplied as the first float value */
 // calchandles_fcurve
-KeyframeEditFunc ANIM_editkeyframes_mirror(short type)
+KeyframeEditFunc ANIM_editkeyframes_mirror(short mode)
 {
-  switch (type) {
+  switch (mode) {
     case MIRROR_KEYS_CURFRAME: /* mirror over current frame */
       return mirror_bezier_cframe;
     case MIRROR_KEYS_YAXIS: /* mirror over frame 0 */
@@ -1184,9 +1184,9 @@ static short set_bezier_free(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
 
 /* Set all selected Bezier Handles to a single type */
 // calchandles_fcurve
-KeyframeEditFunc ANIM_editkeyframes_handles(short code)
+KeyframeEditFunc ANIM_editkeyframes_handles(short mode)
 {
-  switch (code) {
+  switch (mode) {
     case HD_AUTO: /* auto */
       return set_bezier_auto;
     case HD_AUTO_ANIM: /* auto clamped */
@@ -1312,9 +1312,9 @@ static short set_bezt_sine(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
 
 /* Set the interpolation type of the selected BezTriples in each F-Curve to the specified one */
 // ANIM_editkeyframes_ipocurve_ipotype() !
-KeyframeEditFunc ANIM_editkeyframes_ipo(short code)
+KeyframeEditFunc ANIM_editkeyframes_ipo(short mode)
 {
-  switch (code) {
+  switch (mode) {
     /* interpolation */
     case BEZT_IPO_CONST: /* constant */
       return set_bezt_constant;
@@ -1391,9 +1391,9 @@ static short set_keytype_moving_hold(KeyframeEditData *UNUSED(ked), BezTriple *b
 }
 
 /* Set the interpolation type of the selected BezTriples in each F-Curve to the specified one */
-KeyframeEditFunc ANIM_editkeyframes_keytype(short code)
+KeyframeEditFunc ANIM_editkeyframes_keytype(short mode)
 {
-  switch (code) {
+  switch (mode) {
     case BEZT_KEYTYPE_BREAKDOWN: /* breakdown */
       return set_keytype_breakdown;
 
diff --git a/source/blender/editors/armature/armature_intern.h b/source/blender/editors/armature/armature_intern.h
index 9a04425a083..438bb8e447b 100644
--- a/source/blender/editors/armature/armature_intern.h
+++ b/source/blender/editors/armature/armature_intern.h
@@ -228,14 +228,14 @@ EditBone *make_boneList(struct ListBase *edbo, struct ListBase *bones, struct Bo
 /* duplicate method */
 void preEditBoneDuplicate(struct ListBase *editbones);
 void postEditBoneDuplicate(struct ListBase *editbones, struct Object *ob);
-struct EditBone *duplicateEditBone(struct EditBone *curBone,
+struct EditBone *duplicateEditBone(struct EditBone *cur_bone,
                                    const char *name,
                                    struct ListBase *editbones,
                                    struct Object *ob);
 
 /* duplicate method (cross objects) */
 /* editbones is the target list */
-struct EditBone *duplicateEditBoneObjects(struct EditBone *curBone,
+struct EditBone *duplicateEditBoneObjects(struct EditBone *cur_bone,
                                           const char *name,
                                           struct ListBase *editbones,
                                           struct Object *src_ob,
diff --git a/source/blender/editors/armature/armature_naming.c b/source/blender/editors/armature/armature_naming.c
index 544d86d4c47..60a1434ed42 100644
--- a/source/blender/editors/armature/armature_naming.c
+++ b/source/blender/editors/armature/armature_naming.c
@@ -81,13 +81,13 @@ static bool editbone_unique_check(void *arg, const char *name)
 }
 
 /* If bone is already in list, pass it as param to ignore it. */
-void ED_armature_ebone_unique_name(ListBase *edbo, char *name, EditBone *bone)
+void ED_armature_ebone_unique_name(ListBase *ebones, char *name, EditBone *bone)
 {
   struct {
     ListBase *lb;
     void *bone;
   } data;
-  data.lb = edbo;
+  data.lb = ebones;
   data.bone = bone;
 
   BLI_uniquename_cb(editbone_unique_check, &data, DATA_("Bone"), '.', name, sizeof(bone->name));
diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c
index ceacd3333d5..1534ea3287f 100644
--- a/source/blender/editors/armature/meshlaplacian.c
+++ b/source/blender/editors/armature/meshlaplacian.c
@@ -651,13 +651,13 @@ static float heat_limit_weight(float weight)
 void heat_bone_weighting(Object *ob,
                          Mesh *me,
                          float (*verts)[3],
-                         int numsource,
+                         int numbones,
                          bDeformGroup **dgrouplist,
                          bDeformGroup **dgroupflip,
                          float (*root)[3],
                          float (*tip)[3],
                          const int *selected,
-                         const char **err_str)
+                         const char **error_str)
 {
   LaplacianSystem *sys;
   MLoopTri *mlooptri;
@@ -672,7 +672,7 @@ void heat_bone_weighting(Object *ob,
   bool use_vert_sel = (me->editflag & ME_EDIT_PAINT_VERT_SEL) != 0;
   bool use_face_sel = (me->editflag & ME_EDIT_PAINT_FACE_SEL) != 0;
 
-  *err_str = NULL;
+  *error_str = NULL;
 
   /* bone heat needs triangulated faces */
   tottri = poly_to_tri_count(me->totpoly, me->totloop);
@@ -714,7 +714,7 @@ void heat_bone_weighting(Object *ob,
   sys->heat.verts = verts;
   sys->heat.root = root;
   sys->heat.tip = tip;
-  sys->heat.numsource = numsource;
+  sys->heat.numsource = numbones;
 
   heat_ray_tree_create(sys);
   heat_laplacian_create(sys);
@@ -729,13 +729,13 @@ void heat_bone_weighting(Object *ob,
   }
 
   /* compute weights per bone */
-  for (j = 0; j < numsource; j++) {
+  for (j = 0; j < numbones; j++) {
     if (!selected[j]) {
       continue;
     }
 
     firstsegment = (j == 0 || dgrouplist[j - 1] != dgrouplist[j]);
-    lastsegment = (j == numsource - 1 || dgrouplist[j] != dgrouplist[j + 1]);
+    lastsegment = (j == numbones - 1 || dgrouplist[j] != dgrouplist[j + 1]);
     bbone = !(firstsegment && lastsegment);
 
     /* clear weights */
@@ -805,8 +805,8 @@ void heat_bone_weighting(Object *ob,
         }
       }
     }
-    else if (*err_str == NULL) {
-      *err_str = N_("Bone Heat Weighting: failed to find solution for one or more bones");
+    else if (*error_str == NULL) {
+      *error_str = N_("Bone Heat Weighting: failed to find solution for one or more bones");
       break;
     }
 
diff --git a/source/blender/editors/armature/meshlaplacian.h b/source/blender/editors/armature/meshlaplacian.h
index 0405e361b2f..7e7b64c7510 100644
--- a/source/blender/editors/armature/meshlaplacian.h
+++ b/source/blender/editors/armature/meshlaplacian.h
@@ -56,7 +56,7 @@ void heat_bone_weighting(struct Object *ob,
                          float (*root)[3],
                          float (*tip)[3],
                          const int *selected,
-                         const char **error);
+                         const char **error_str);
 
 #ifdef RIGID_DEFORM
 /* As-Rigid-As-Possible Deformation */
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);
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index ec44d97c51b..2b9d684ad96 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -742,7 +742,7 @@ void ui_searchbox_free(struct bContext *C, struct ARegion *region);
 void ui_but_search_refresh(uiButSearch *but);
 
 /* interface_region_menu_popup.c */
-int ui_but_menu_step(uiBut *but, int step);
+int ui_but_menu_step(uiBut *but, int direction);
 bool ui_but_menu_step_poll(const uiBut *but);
 uiBut *ui_popup_menu_memory_get(struct uiBlock *block);
 void ui_popup_menu_memory_set(uiBlock *block, struct uiBut *but);
@@ -762,14 +762,14 @@ uiPopupBlockHandle *ui_popup_block_create(struct bContext *C,
 uiPopupBlockHandle *ui_popup_menu_create(struct bContext *C,
                                          struct ARegion *butregion,
                                          uiBut *but,
-                                         uiMenuCreateFunc create_func,
+                                         uiMenuCreateFunc menu_func,
                                          void *arg);
 
 /* interface_region_popover.c */
 uiPopupBlockHandle *ui_popover_panel_create(struct bContext *C,
                                             struct ARegion *butregion,
                                             uiBut *but,
-                                            uiMenuCreateFunc create_func,
+                                            uiMenuCreateFunc menu_func,
                                             void *arg);
 
 /* interface_region_menu_pie.c */
@@ -878,7 +878,7 @@ extern uiBut *ui_but_find_select_in_enum(uiBut *but, int direction);
 bool ui_but_is_editing(const uiBut *but);
 float ui_block_calc_pie_segment(struct uiBlock *block, const float event_xy[2]);
 
-void ui_but_add_shortcut(uiBut *but, const char *key_str, const bool do_strip);
+void ui_but_add_shortcut(uiBut *but, const char *shortcut_str, const bool do_strip);
 void ui_but_clipboard_free(void);
 bool ui_but_rna_equals(const uiBut *a, const uiBut *b);
 bool ui_but_rna_equals_ex(const uiBut *but,
@@ -886,7 +886,7 @@ bool ui_but_rna_equals_ex(const uiBut *but,
                           const PropertyRNA *prop,
                           int index);
 uiBut *ui_but_find_old(uiBlock *block_old, const uiBut *but_new);
-uiBut *ui_but_find_new(uiBlock *block_old, const uiBut *but_new);
+uiBut *ui_but_find_new(uiBlock *block_new, const uiBut *but_old);
 
 #ifdef WITH_INPUT_IME
 void ui_but_ime_reposition(uiBut *but, int x, int y, bool complete);
diff --git a/source/blender/editors/interface/interface_region_popover.c b/source/blender/editors/interface/interface_region_popover.c
index 9ef68e9e187..80776c8d26e 100644
--- a/source/blender/editors/interface/interface_region_popover.c
+++ b/source/blender/editors/interface/interface_region_popover.c
@@ -340,13 +340,13 @@ int UI_popover_panel_invoke(bContext *C, const char *idname, bool keep_open, Rep
  * \param from_active_button: Use the active button for positioning,
  * use when the popover is activated from an operator instead of directly from the button.
  */
-uiPopover *UI_popover_begin(bContext *C, int ui_size_x, bool from_active_button)
+uiPopover *UI_popover_begin(bContext *C, int ui_menu_width, bool from_active_button)
 {
   uiPopover *pup = MEM_callocN(sizeof(uiPopover), "popover menu");
-  if (ui_size_x == 0) {
-    ui_size_x = U.widget_unit * UI_POPOVER_WIDTH_UNITS;
+  if (ui_menu_width == 0) {
+    ui_menu_width = U.widget_unit * UI_POPOVER_WIDTH_UNITS;
   }
-  pup->ui_size_x = ui_size_x;
+  pup->ui_size_x = ui_menu_width;
 
   ARegion *butregion = NULL;
   uiBut *but = NULL;
diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c
index 6facee77c1e..515fbab86bc 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -258,7 +258,7 @@ static void knife_input_ray_segment(KnifeTool_OpData *kcd,
                                     const float mval[2],
                                     const float ofs,
                                     float r_origin[3],
-                                    float r_dest[3]);
+                                    float r_origin_ofs[3]);
 
 static bool knife_verts_edge_in_face(KnifeVert *v1, KnifeVert *v2, BMFace *f);
 
diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c
index e98c7a18361..bdd5094a9ef 100644
--- a/source/blender/editors/object/object_constraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@ -576,22 +576,22 @@ static int constraint_type_get(Object *owner, bPoseChannel *pchan)
 /* checks validity of object pointers, and NULLs,
  * if Bone doesn't exist it sets the CONSTRAINT_DISABLE flag.
  */
-static void test_constraints(Main *bmain, Object *owner, bPoseChannel *pchan)
+static void test_constraints(Main *bmain, Object *ob, bPoseChannel *pchan)
 {
   bConstraint *curcon;
   ListBase *conlist = NULL;
   int type;
 
-  if (owner == NULL) {
+  if (ob == NULL) {
     return;
   }
 
-  type = constraint_type_get(owner, pchan);
+  type = constraint_type_get(ob, pchan);
 
   /* Get the constraint list for this object */
   switch (type) {
     case CONSTRAINT_OBTYPE_OBJECT:
-      conlist = &owner->constraints;
+      conlist = &ob->constraints;
       break;
     case CONSTRAINT_OBTYPE_BONE:
       conlist = &pchan->constraints;
@@ -601,46 +601,46 @@ static void test_constraints(Main *bmain, Object *owner, bPoseChannel *pchan)
   /* Check all constraints - is constraint valid? */
   if (conlist) {
     for (curcon = conlist->first; curcon; curcon = curcon->next) {
-      test_constraint(bmain, owner, pchan, curcon, type);
+      test_constraint(bmain, ob, pchan, curcon, type);
     }
   }
 }
 
-void object_test_constraints(Main *bmain, Object *owner)
+void object_test_constraints(Main *bmain, Object *ob)
 {
-  if (owner->constraints.first) {
-    test_constraints(bmain, owner, NULL);
+  if (ob->constraints.first) {
+    test_constraints(bmain, ob, NULL);
   }
 
-  if (owner->type == OB_ARMATURE && owner->pose) {
+  if (ob->type == OB_ARMATURE && ob->pose) {
     bPoseChannel *pchan;
 
-    for (pchan = owner->pose->chanbase.first; pchan; pchan = pchan->next) {
+    for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
       if (pchan->constraints.first) {
-        test_constraints(bmain, owner, pchan);
+        test_constraints(bmain, ob, pchan);
       }
     }
   }
 }
 
-static void object_test_constraint(Main *bmain, Object *owner, bConstraint *con)
+static void object_test_constraint(Main *bmain, Object *ob, bConstraint *con)
 {
-  if (owner->type == OB_ARMATURE && owner->pose) {
-    if (BLI_findindex(&owner->constraints, con) != -1) {
-      test_constraint(bmain, owner, NULL, con, CONSTRAINT_OBTYPE_OBJECT);
+  if (ob->type == OB_ARMATURE && ob->pose) {
+    if (BLI_findindex(&ob->constraints, con) != -1) {
+      test_constraint(bmain, ob, NULL, con, CONSTRAINT_OBTYPE_OBJECT);
     }
     else {
       bPoseChannel *pchan;
-      for (pchan = owner->pose->chanbase.first; pchan; pchan = pchan->next) {
+      for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
         if (BLI_findindex(&pchan->constraints, con) != -1) {
-          test_constraint(bmain, owner, pchan, con, CONSTRAINT_OBTYPE_BONE);
+          test_constraint(bmain, ob, pchan, con, CONSTRAINT_OBTYPE_BONE);
           break;
         }
       }
     }
   }
   else {
-    test_constraint(bmain, owner, NULL, con, CONSTRAINT_OBTYPE_OBJECT);
+    test_constraint(bmain, ob, NULL, con, CONSTRAINT_OBTYPE_OBJECT);
   }
 }
 
diff --git a/source/blender/editors/screen/screen_intern.h b/source/blender/editors/screen/screen_intern.h
index a5b5e222ae9..a03e65d8a9d 100644
--- a/source/blender/editors/screen/screen_intern.h
+++ b/source/blender/editors/screen/screen_intern.h
@@ -41,7 +41,7 @@ struct bContextDataResult;
 
 /* area.c */
 void ED_area_data_copy(ScrArea *area_dst, ScrArea *area_src, const bool do_free);
-void ED_area_data_swap(ScrArea *sa1, ScrArea *sa2);
+void ED_area_data_swap(ScrArea *area_dst, ScrArea *area_src);
 void region_toggle_hidden(struct bContext *C, ARegion *region, const bool do_fade);
 
 /* screen_edit.c */
diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h
index 65f78a2d988..a1894e1b4c6 100644
--- a/source/blender/editors/sculpt_paint/paint_intern.h
+++ b/source/blender/editors/sculpt_paint/paint_intern.h
@@ -214,15 +214,15 @@ void paint_2d_gradient_fill(const struct bContext *C,
                             void *ps);
 void *paint_proj_new_stroke(struct bContext *C, struct Object *ob, const float mouse[2], int mode);
 void paint_proj_stroke(const struct bContext *C,
-                       void *ps,
-                       const float prevmval_i[2],
-                       const float mval_i[2],
+                       void *ps_handle_p,
+                       const float prev_pos[2],
+                       const float pos[2],
                        const bool eraser,
                        float pressure,
                        float distance,
                        float size);
-void paint_proj_redraw(const struct bContext *C, void *pps, bool final);
-void paint_proj_stroke_done(void *ps);
+void paint_proj_redraw(const struct bContext *C, void *ps_handle_p, bool final);
+void paint_proj_stroke_done(void *ps_handle_p);
 
 void paint_brush_color_get(struct Scene *scene,
                            struct Brush *br,
diff --git a/source/blender/editors/space_file/filelist.h b/source/blender/editors/space_file/filelist.h
index 53937e7a743..051b811b001 100644
--- a/source/blender/editors/space_file/filelist.h
+++ b/source/blender/editors/space_file/filelist.h
@@ -51,7 +51,7 @@ void folderlist_free(struct ListBase *folderlist);
 struct ListBase *folderlist_duplicate(ListBase *folderlist);
 void folderlist_popdir(struct ListBase *folderlist, char *dir);
 void folderlist_pushdir(struct ListBase *folderlist, const char *dir);
-const char *folderlist_peeklastdir(struct ListBase *folderdist);
+const char *folderlist_peeklastdir(struct ListBase *folderlist);
 int folderlist_clear_next(struct SpaceFile *sfile);
 
 void filelist_setsorting(struct FileList *filelist, const short sort, bool invert_sort);
diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c
index b1c94c2668f..0b3c98a392e 100644
--- a/source/blender/editors/space_file/fsmenu.c
+++ b/source/blender/editors/space_file/fsmenu.c
@@ -241,13 +241,13 @@ int ED_fsmenu_get_nentries(struct FSMenu *fsmenu, FSMenuCategory category)
   return count;
 }
 
-FSMenuEntry *ED_fsmenu_get_entry(struct FSMenu *fsmenu, FSMenuCategory category, int index)
+FSMenuEntry *ED_fsmenu_get_entry(struct FSMenu *fsmenu, FSMenuCategory category, int idx)
 {
   FSMenuEntry *fsm_iter;
 
-  for (fsm_iter = ED_fsmenu_get_category(fsmenu, category); fsm_iter && index;
+  for (fsm_iter = ED_fsmenu_get_category(fsmenu, category); fsm_iter && idx;
        fsm_iter = fsm_iter->next) {
-    index--;
+    idx--;
   }
 
   return fsm_iter;
diff --git a/source/blender/editors/space_file/fsmenu.h b/source/blender/editors/space_file/fsmenu.h
index c4af27a25aa..6296314d40a 100644
--- a/source/blender/editors/space_file/fsmenu.h
+++ b/source/blender/editors/space_file/fsmenu.h
@@ -48,10 +48,10 @@ void fsmenu_insert_entry(struct FSMenu *fsmenu,
 void fsmenu_entry_refresh_valid(struct FSMenuEntry *fsentry);
 
 /** Return whether the entry was created by the user and can be saved and deleted */
-short fsmenu_can_save(struct FSMenu *fsmenu, enum FSMenuCategory category, int index);
+short fsmenu_can_save(struct FSMenu *fsmenu, enum FSMenuCategory category, int idx);
 
 /** Removes the fsmenu entry at the given \a index. */
-void fsmenu_remove_entry(struct FSMenu *fsmenu, enum FSMenuCategory category, int index);
+void fsmenu_remove_entry(struct FSMenu *fsmenu, enum FSMenuCategory category, int idx);
 
 /** saves the 'bookmarks' to the specified file */
 void fsmenu_write_file(struct FSMenu *fsmenu, const char *filename);
diff --git a/source/blender/editors/space_graph/graph_intern.h b/source/blender/editors/space_graph/graph_intern.h
index d00e911e3fc..c39ffdf42ed 100644
--- a/source/blender/editors/space_graph/graph_intern.h
+++ b/source/blender/editors/space_graph/graph_intern.h
@@ -83,7 +83,7 @@ void get_graph_keyframe_extents(struct bAnimContext *ac,
                                 float *xmax,
                                 float *ymin,
                                 float *ymax,
-                                const bool do_selected,
+                                const bool do_sel_only,
                                 const bool include_handles);
 
 void GRAPH_OT_previewrange_set(struct wmOperatorType *ot);
diff --git a/source/blender/editors/space_info/info_draw.c b/source/blender/editors/space_info/info_draw.c
index 595da97c75a..414bce29502 100644
--- a/source/blender/editors/space_info/info_draw.c
+++ b/source/blender/editors/space_info/info_draw.c
@@ -258,10 +258,10 @@ static int info_textview_main__internal(const SpaceInfo *sinfo,
 void *info_text_pick(const SpaceInfo *sinfo,
                      const ARegion *region,
                      const ReportList *reports,
-                     int mval_y)
+                     int mouse_y)
 {
   void *mval_pick_item = NULL;
-  const int mval[2] = {0, mval_y};
+  const int mval[2] = {0, mouse_y};
 
   info_textview_main__internal(sinfo, region, reports, false, mval, &mval_pick_item, NULL);
   return (void *)mval_pick_item;
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index eae8bd05a93..206167869ed 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -556,35 +556,35 @@ void ED_node_composit_default(const bContext *C, struct Scene *sce)
 
 /* assumes nothing being done in ntree yet, sets the default in/out node */
 /* called from shading buttons or header */
-void ED_node_texture_default(const bContext *C, Tex *tx)
+void ED_node_texture_default(const bContext *C, Tex *tex)
 {
   bNode *in, *out;
   bNodeSocket *fromsock, *tosock;
 
   /* but lets check it anyway */
-  if (tx->nodetree) {
+  if (tex->nodetree) {
     if (G.debug & G_DEBUG) {
       printf("error in texture initialize\n");
     }
     return;
   }
 
-  tx->nodetree = ntreeAddTree(NULL, "Texture Nodetree", ntreeType_Texture->idname);
+  tex->nodetree = ntreeAddTree(NULL, "Texture Nodetree", ntreeType_Texture->idname);
 
-  out = nodeAddStaticNode(C, tx->nodetree, TEX_NODE_OUTPUT);
+  out = nodeAddStaticNode(C, tex->nodetree, TEX_NODE_OUTPUT);
   out->locx = 300.0f;
   out->locy = 300.0f;
 
-  in = nodeAddStaticNode(C, tx->nodetree, TEX_NODE_CHECKER);
+  in = nodeAddStaticNode(C, tex->nodetree, TEX_NODE_CHECKER);
   in->locx = 10.0f;
   in->locy = 300.0f;
-  nodeSetActive(tx->nodetree, in);
+  nodeSetActive(tex->nodetree, in);
 
   fromsock = in->outputs.first;
   tosock = out->inputs.first;
-  nodeAddLink(tx->nodetree, in, fromsock, out, tosock);
+  nodeAddLink(tex->nodetree, in, fromsock, out, tosock);
 
-  ntreeUpdateTree(CTX_data_main(C), tx->nodetree);
+  ntreeUpdateTree(CTX_data_main(C), tex->nodetree);
 }
 
 /* Here we set the active tree(s), even called for each redraw now, so keep it fast :) */
diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c
index 654bb94cc78..c5be96470ec 100644
--- a/source/blender/editors/space_node/node_templates.c
+++ b/source/blender/editors/space_node/node_templates.c
@@ -664,7 +664,7 @@ static void ui_template_node_link_menu(bContext *C, uiLayout *layout, void *but_
 }
 
 void uiTemplateNodeLink(
-    uiLayout *layout, bContext *C, bNodeTree *ntree, bNode *node, bNodeSocket *sock)
+    uiLayout *layout, bContext *C, bNodeTree *ntree, bNode *node, bNodeSocket *input)
 {
   uiBlock *block = uiLayoutGetBlock(layout);
   NodeLinkArg *arg;
@@ -674,17 +674,17 @@ void uiTemplateNodeLink(
   arg = MEM_callocN(sizeof(NodeLinkArg), "NodeLinkArg");
   arg->ntree = ntree;
   arg->node = node;
-  arg->sock = sock;
+  arg->sock = input;
 
   PointerRNA node_ptr;
   RNA_pointer_create((ID *)ntree, &RNA_Node, node, &node_ptr);
-  node_socket_color_get(C, ntree, &node_ptr, sock, socket_col);
+  node_socket_color_get(C, ntree, &node_ptr, input, socket_col);
 
   UI_block_layout_set_current(block, layout);
 
-  if (sock->link || sock->type == SOCK_SHADER || (sock->flag & SOCK_HIDE_VALUE)) {
+  if (input->link || input->type == SOCK_SHADER || (input->flag & SOCK_HIDE_VALUE)) {
     char name[UI_MAX_NAME_STR];
-    ui_node_sock_name(ntree, sock, name);
+    ui_node_sock_name(ntree, input, name);
     but = uiDefMenuBut(
         block, ui_template_node_link_menu, NULL, name, 0, 0, UI_UNIT_X * 4, UI_UNIT_Y, "");
   }
@@ -694,14 +694,14 @@ void uiTemplateNodeLink(
   }
 
   UI_but_type_set_menu_from_pulldown(but);
-  UI_but_node_link_set(but, sock, socket_col);
+  UI_but_node_link_set(but, input, socket_col);
   UI_but_drawflag_enable(but, UI_BUT_ICON_LEFT);
 
   but->poin = (char *)but;
   but->func_argN = arg;
 
-  if (sock->link && sock->link->fromnode) {
-    if (sock->link->fromnode->flag & NODE_ACTIVE_TEXTURE) {
+  if (input->link && input->link->fromnode) {
+    if (input->link->fromnode->flag & NODE_ACTIVE_TEXTURE) {
       but->flag |= UI_BUT_NODE_ACTIVE;
     }
   }
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index bd283777397..7e7fdf4bab2 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -495,7 +495,7 @@ TreeElement *outliner_find_item_at_y(const SpaceOutliner *space_outliner,
 TreeElement *outliner_find_item_at_x_in_row(const SpaceOutliner *space_outliner,
                                             const TreeElement *parent_te,
                                             float view_co_x,
-                                            bool *multiple_objects);
+                                            bool *row_merged);
 TreeElement *outliner_find_tse(struct SpaceOutliner *space_outliner, const TreeStoreElem *tse);
 TreeElement *outliner_find_tree_element(ListBase *lb, const TreeStoreElem *store_elem);
 TreeElement *outliner_find_parent_element(ListBase *lb,
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index 2a13f9d6a66..01b6e636ded 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -981,7 +981,7 @@ static void singleuser_world_fn(bContext *C,
 }
 
 /**
- * \param select_recurse: Set to false for operations which are already
+ * \param recurse_selected: Set to false for operations which are already
  * recursively operating on their children.
  */
 void outliner_do_object_operation_ex(bContext *C,
@@ -991,7 +991,7 @@ void outliner_do_object_operation_ex(bContext *C,
                                      ListBase *lb,
                                      outliner_operation_fn operation_fn,
                                      void *user_data,
-                                     bool select_recurse)
+                                     bool recurse_selected)
 {
   TreeElement *te;
   for (te = lb->first; te; te = te->next) {
@@ -1013,7 +1013,7 @@ void outliner_do_object_operation_ex(bContext *C,
       }
     }
     if (TSELEM_OPEN(tselem, space_outliner)) {
-      if ((select_handled == false) || select_recurse) {
+      if ((select_handled == false) || recurse_selected) {
         outliner_do_object_operation_ex(C,
                                         reports,
                                         scene_act,
@@ -1021,7 +1021,7 @@ void outliner_do_object_operation_ex(bContext *C,
                                         &te->subtree,
                                         operation_fn,
                                         NULL,
-                                        select_recurse);
+                                        recurse_selected);
       }
     }
   }
diff --git a/source/blender/editors/space_outliner/outliner_utils.c b/source/blender/editors/space_outliner/outliner_utils.c
index 25dc7bc271e..8ec1db9a928 100644
--- a/source/blender/editors/space_outliner/outliner_utils.c
+++ b/source/blender/editors/space_outliner/outliner_utils.c
@@ -113,7 +113,7 @@ TreeElement *outliner_find_item_at_y(const SpaceOutliner *space_outliner,
 
 static TreeElement *outliner_find_item_at_x_in_row_recursive(const TreeElement *parent_te,
                                                              float view_co_x,
-                                                             bool *r_merged)
+                                                             bool *row_merged)
 {
   TreeElement *child_te = parent_te->subtree.first;
 
@@ -125,13 +125,13 @@ static TreeElement *outliner_find_item_at_x_in_row_recursive(const TreeElement *
       return child_te;
     }
     if ((child_te->flag & TE_ICONROW_MERGED) && over_element) {
-      if (r_merged) {
-        *r_merged = true;
+      if (row_merged) {
+        *row_merged = true;
       }
       return child_te;
     }
 
-    TreeElement *te = outliner_find_item_at_x_in_row_recursive(child_te, view_co_x, r_merged);
+    TreeElement *te = outliner_find_item_at_x_in_row_recursive(child_te, view_co_x, row_merged);
     if (te != child_te) {
       return te;
     }
@@ -152,11 +152,11 @@ static TreeElement *outliner_find_item_at_x_in_row_recursive(const TreeElement *
 TreeElement *outliner_find_item_at_x_in_row(const SpaceOutliner *space_outliner,
                                             const TreeElement *parent_te,
                                             float view_co_x,
-                                            bool *r_merged)
+                                            bool *row_merged)
 {
   /* if parent_te is opened, it doesn't show children in row */
   if (!TSELEM_OPEN(TREESTORE(parent_te), space_outliner)) {
-    return outliner_find_item_at_x_in_row_recursive(parent_te, view_co_x, r_merged);
+    return outliner_find_item_at_x_in_row_recursive(parent_te, view_co_x, row_merged);
   }
 
   return (TreeElement *)parent_te;
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 298ed927b44..2f094661863 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1764,7 +1764,7 @@ void sequencer_draw_preview(const bContext *C,
                             ARegion *region,
                             SpaceSeq *sseq,
                             int cfra,
-                            int frame_ofs,
+                            int offset,
                             bool draw_overlay,
                             bool draw_backdrop)
 {
@@ -1785,7 +1785,7 @@ void sequencer_draw_preview(const bContext *C,
 
   /* Get image. */
   ibuf = sequencer_ibuf_get(
-      bmain, region, depsgraph, scene, sseq, cfra, frame_ofs, names[sseq->multiview_eye]);
+      bmain, region, depsgraph, scene, sseq, cfra, offset, names[sseq->multiview_eye]);
 
   /* Setup off-screen buffers. */
   GPUViewport *viewport = WM_draw_region_get_viewport(region);
diff --git a/source/blender/editors/space_sequencer/sequencer_scopes.c b/source/blender/editors/space_sequencer/sequencer_scopes.c
index ba573032350..58a6f274310 100644
--- a/source/blender/editors/space_sequencer/sequencer_scopes.c
+++ b/source/blender/editors/space_sequencer/sequencer_scopes.c
@@ -398,17 +398,17 @@ static void draw_zebra_float(ImBuf *src, ImBuf *ibuf, float perc)
   }
 }
 
-ImBuf *make_zebra_view_from_ibuf(ImBuf *src, float perc)
+ImBuf *make_zebra_view_from_ibuf(ImBuf *ibuf, float perc)
 {
-  ImBuf *ibuf = IMB_allocImBuf(src->x, src->y, 32, IB_rect);
+  ImBuf *new_ibuf = IMB_allocImBuf(ibuf->x, ibuf->y, 32, IB_rect);
 
-  if (src->rect_float) {
-    draw_zebra_float(src, ibuf, perc);
+  if (ibuf->rect_float) {
+    draw_zebra_float(ibuf, new_ibuf, perc);
   }
   else {
-    draw_zebra_byte(src, ibuf, perc);
+    draw_zebra_byte(ibuf, new_ibuf, perc);
   }
-  return ibuf;
+  return new_ibuf;
 }
 
 static void draw_histogram_marker(ImBuf *ibuf, int x)
diff --git a/source/blender/editors/space_text/text_intern.h b/source/blender/editors/space_text/text_intern.h
index abafad4c241..e3c0e436ac4 100644
--- a/source/blender/editors/space_text/text_intern.h
+++ b/source/blender/editors/space_text/text_intern.h
@@ -82,7 +82,7 @@ void wrap_offset(const struct SpaceText *st,
                  int *offc);
 void wrap_offset_in_line(const struct SpaceText *st,
                          struct ARegion *region,
-                         struct TextLine *linep,
+                         struct TextLine *linein,
                          int cursin,
                          int *offl,
                          int *offc);
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 5912bea4919..ab08c9a804a 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -284,7 +284,7 @@ static void viewops_data_alloc(bContext *C, wmOperator *op)
 }
 
 void view3d_orbit_apply_dyn_ofs(float r_ofs[3],
-                                const float ofs_init[3],
+                                const float ofs_old[3],
                                 const float viewquat_old[4],
                                 const float viewquat_new[4],
                                 const float dyn_ofs[3])
@@ -295,7 +295,7 @@ void view3d_orbit_apply_dyn_ofs(float r_ofs[3],
 
   invert_qt_normalized(q);
 
-  sub_v3_v3v3(r_ofs, ofs_init, dyn_ofs);
+  sub_v3_v3v3(r_ofs, ofs_old, dyn_ofs);
   mul_qt_v3(q, r_ofs);
   add_v3_v3(r_ofs, dyn_ofs);
 }
diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c
index 556b5d51505..6ce76c478df 100644
--- a/source/blender/editors/space_view3d/view3d_fly.c
+++ b/source/blender/editors/space_view3d/view3d_fly.c
@@ -229,7 +229,7 @@ typedef struct FlyInfo {
 #ifdef WITH_INPUT_NDOF
 static void flyApply_ndof(bContext *C, FlyInfo *fly, bool is_confirm);
 #endif /* WITH_INPUT_NDOF */
-static int flyApply(bContext *C, struct FlyInfo *fly, bool force_autokey);
+static int flyApply(bContext *C, struct FlyInfo *fly, bool is_confirm);
 
 static void drawFlyPixel(const struct bContext *UNUSED(C), ARegion *UNUSED(region), void *arg)
 {
diff --git a/source/blender/editors/space_view3d/view3d_project.c b/source/blender/editors/space_view3d/view3d_project.c
index c790a8659ee..e073cb43962 100644
--- a/source/blender/editors/space_view3d/view3d_project.c
+++ b/source/blender/editors/space_view3d/view3d_project.c
@@ -73,13 +73,13 @@ void ED_view3d_project_float_v2_m4(const ARegion *region,
  * \note use #ED_view3d_ob_project_mat_get to get projecting mat
  */
 void ED_view3d_project_float_v3_m4(const ARegion *region,
-                                   const float vec[3],
+                                   const float co[3],
                                    float r_co[3],
                                    float mat[4][4])
 {
   float vec4[4];
 
-  copy_v3_v3(vec4, vec);
+  copy_v3_v3(vec4, co);
   vec4[3] = 1.0;
   /* r_co[0] = IS_CLIPPED; */ /* always overwritten */
 
diff --git a/source/blender/editors/space_view3d/view3d_walk.c b/source/blender/editors/space_view3d/view3d_walk.c
index 2fb44c29d2e..ef389918eb4 100644
--- a/source/blender/editors/space_view3d/view3d_walk.c
+++ b/source/blender/editors/space_view3d/view3d_walk.c
@@ -308,7 +308,7 @@ typedef struct WalkInfo {
 #ifdef WITH_INPUT_NDOF
 static void walkApply_ndof(bContext *C, WalkInfo *walk, bool is_confirm);
 #endif /* WITH_INPUT_NDOF */
-static int walkApply(bContext *C, struct WalkInfo *walk, bool force_autokey);
+static int walkApply(bContext *C, struct WalkInfo *walk, bool is_confirm);
 static float getVelocityZeroTime(const float gravity, const float velocity);
 
 static void drawWalkPixel(const struct bContext *UNUSED(C), ARegion *region, void *arg)
diff --git a/source/blender/editors/undo/ed_undo.c b/source/blender/editors/undo/ed_undo.c
index 50e0bb1f1c2..d0e08c2c460 100644
--- a/source/blender/editors/undo/ed_undo.c
+++ b/source/blender/editors/undo/ed_undo.c
@@ -641,7 +641,7 @@ void ED_undo_operator_repeat_cb(bContext *C, void *arg_op, void *UNUSED(arg_unus
   ED_undo_operator_repeat(C, (wmOperator *)arg_op);
 }
 
-void ED_undo_operator_repeat_cb_evt(bContext *C, void *arg_op, int UNUSED(arg_event))
+void ED_undo_operator_repeat_cb_evt(bContext *C, void *arg_op, int UNUSED(arg_unused))
 {
   ED_undo_operator_repeat(C, (wmOperator *)arg_op);
 }
diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.h b/source/blender/editors/uvedit/uvedit_parametrizer.h
index ee1eb4f63bf..de021adb4f0 100644
--- a/source/blender/editors/uvedit/uvedit_parametrizer.h
+++ b/source/blender/editors/uvedit/uvedit_parametrizer.h
@@ -60,7 +60,7 @@ void param_face_add(ParamHandle *handle,
 void param_edge_set_seam(ParamHandle *handle, ParamKey *vkeys);
 
 void param_construct_end(ParamHandle *handle, ParamBool fill, ParamBool impl);
-void param_delete(ParamHandle *chart);
+void param_delete(ParamHandle *handle);
 
 /* Least Squares Conformal Maps:
  * -----------------------------