Cleanup: use 'r_' prefix for output arguments

Also pass some args as 'const'.

4 files changed, 18 insertions, 13 deletions

diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h
index 1c260bb826a..910cf362a37 100644
--- a/source/blender/editors/include/ED_image.h
+++ b/source/blender/editors/include/ED_image.h
@@ -65,14 +65,14 @@ int ED_space_image_get_display_channel_mask(struct ImBuf *ibuf);
 void ED_space_image_release_buffer(struct SpaceImage *sima, struct ImBuf *ibuf, void *lock);
 bool ED_space_image_has_buffer(struct SpaceImage *sima);
 
-void ED_space_image_get_size(struct SpaceImage *sima, int *width, int *height);
-void ED_space_image_get_size_fl(struct SpaceImage *sima, float size[2]);
-void ED_space_image_get_aspect(struct SpaceImage *sima, float *aspx, float *aspy);
+void ED_space_image_get_size(struct SpaceImage *sima, int *r_width, int *r_height);
+void ED_space_image_get_size_fl(struct SpaceImage *sima, float r_size[2]);
+void ED_space_image_get_aspect(struct SpaceImage *sima, float *r_aspx, float *r_aspy);
 void ED_space_image_get_zoom(struct SpaceImage *sima,
                              struct ARegion *region,
-                             float *zoomx,
-                             float *zoomy);
-void ED_space_image_get_uv_aspect(struct SpaceImage *sima, float *aspx, float *aspy);
+                             float *r_zoomx,
+                             float *r_zoomy);
+void ED_space_image_get_uv_aspect(struct SpaceImage *sima, float *r_aspx, float *r_aspy);
 
 void ED_space_image_scopes_update(const struct bContext *C,
                                   struct SpaceImage *sima,
@@ -83,14 +83,17 @@ void ED_space_image_paint_update(struct Main *bmain,
                                  struct wmWindowManager *wm,
                                  struct Scene *scene);
 
-void ED_image_get_uv_aspect(struct Image *ima, struct ImageUser *iuser, float *aspx, float *aspy);
+void ED_image_get_uv_aspect(struct Image *ima,
+                            struct ImageUser *iuser,
+                            float *r_aspx,
+                            float *r_aspy);
 void ED_image_mouse_pos(struct SpaceImage *sima,
                         struct ARegion *region,
                         const int mval[2],
                         float co[2]);
 void ED_image_view_center_to_point(struct SpaceImage *sima, float x, float y);
 void ED_image_point_pos(
-    struct SpaceImage *sima, struct ARegion *region, float x, float y, float *xr, float *yr);
+    struct SpaceImage *sima, struct ARegion *region, float x, float y, float *r_x, float *r_y);
 void ED_image_point_pos__reverse(struct SpaceImage *sima,
                                  struct ARegion *region,
                                  const float co[2],
diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h
index 511b33bacc5..8c565536c71 100644
--- a/source/blender/editors/include/ED_uvedit.h
+++ b/source/blender/editors/include/ED_uvedit.h
@@ -188,7 +188,7 @@ bool ED_uvedit_nearest_uv_multi(const struct Scene *scene,
                                 float r_uv[2]);
 
 void ED_uvedit_get_aspect(
-    const struct Scene *scene, struct Object *ob, struct BMesh *em, float *aspx, float *aspy);
+    const struct Scene *scene, struct Object *ob, struct BMesh *em, float *r_aspx, float *r_aspy);
 
 /* uvedit_unwrap_ops.c */
 void ED_uvedit_live_unwrap_begin(struct Scene *scene, struct Object *obedit);
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index 06de4705ac6..bb065ee0008 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -674,8 +674,10 @@ bool ED_view3d_distance_set_from_location(struct RegionView3D *rv3d,
                                           const float dist_co[3],
                                           const float dist_min);
 
-float ED_scene_grid_scale(const struct Scene *scene, const char **grid_unit);
-float ED_view3d_grid_scale(const struct Scene *scene, struct View3D *v3d, const char **grid_unit);
+float ED_scene_grid_scale(const struct Scene *scene, const char **r_grid_unit);
+float ED_view3d_grid_scale(const struct Scene *scene,
+                           struct View3D *v3d,
+                           const char **r_grid_unit);
 void ED_view3d_grid_steps(const struct Scene *scene,
                           struct View3D *v3d,
                           struct RegionView3D *rv3d,
@@ -683,7 +685,7 @@ void ED_view3d_grid_steps(const struct Scene *scene,
 float ED_view3d_grid_view_scale(struct Scene *scene,
                                 struct View3D *v3d,
                                 struct RegionView3D *rv3d,
-                                const char **grid_unit);
+                                const char **r_grid_unit);
 
 void ED_scene_draw_fps(const struct Scene *scene, int xoffset, int *yoffset);
 
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index bb2edef8adc..1fa6e5b12c1 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -2362,7 +2362,7 @@ void UI_drop_color_copy(struct wmDrag *drag, struct wmDropBox *drop);
 bool UI_drop_color_poll(struct bContext *C,
                         struct wmDrag *drag,
                         const struct wmEvent *event,
-                        const char **tooltip);
+                        const char **r_tooltip);
 
 bool UI_context_copy_to_selected_list(struct bContext *C,
                                       struct PointerRNA *ptr,