diff options
author | Julian Eisel <julian@blender.org> | 2020-03-06 18:56:42 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-03-06 19:19:23 +0300 |
commit | b2ee1770d4c31078518f4ec9edd5196a41345162 (patch) | |
tree | 6b7f6ff9057322245fc3b3407bece3f1c0cb3eb5 /source/blender/makesrna/intern | |
parent | b825a95ec311a169d33fe21e28418f11a516c82f (diff) |
Cleanup: Rename ARegion variables from ar to region
The old convention was easy to confuse with ScrArea.
Part of https://developer.blender.org/T74432.
This is mostly a batch rename with some manual fixing. Only single word
variable names are changed, no prefixed/suffixed names.
Brecht van Lommel and Campbell Barton both gave me a green light for
this convention change.
Also ran clan clang format on affected files.
Diffstat (limited to 'source/blender/makesrna/intern')
-rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 105 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_space_api.c | 12 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_wm_gizmo.c | 6 |
3 files changed, 62 insertions, 61 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 97959ba8899..8123d02714a 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -579,16 +579,16 @@ static void area_region_from_regiondata(bScreen *sc, ARegion **r_ar) { ScrArea *sa; - ARegion *ar; + ARegion *region; *r_sa = NULL; *r_ar = NULL; for (sa = sc->areabase.first; sa; sa = sa->next) { - for (ar = sa->regionbase.first; ar; ar = ar->next) { - if (ar->regiondata == regiondata) { + for (region = sa->regionbase.first; region; region = region->next) { + if (region->regiondata == regiondata) { *r_sa = sa; - *r_ar = ar; + *r_ar = region; return; } } @@ -612,9 +612,9 @@ static bool rna_Space_bool_from_region_flag_get_by_type(PointerRNA *ptr, const int region_flag) { ScrArea *sa = rna_area_from_space(ptr); - ARegion *ar = BKE_area_find_region_type(sa, region_type); - if (ar) { - return (ar->flag & region_flag); + ARegion *region = BKE_area_find_region_type(sa, region_type); + if (region) { + return (region->flag & region_flag); } return false; } @@ -625,11 +625,11 @@ static void rna_Space_bool_from_region_flag_set_by_type(PointerRNA *ptr, bool value) { ScrArea *sa = rna_area_from_space(ptr); - ARegion *ar = BKE_area_find_region_type(sa, region_type); - if (ar && (ar->alignment != RGN_ALIGN_NONE)) { - SET_FLAG_FROM_TEST(ar->flag, value, region_flag); + ARegion *region = BKE_area_find_region_type(sa, region_type); + if (region && (region->alignment != RGN_ALIGN_NONE)) { + SET_FLAG_FROM_TEST(region->flag, value, region_flag); } - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); } static void rna_Space_bool_from_region_flag_update_by_type(bContext *C, @@ -638,22 +638,22 @@ static void rna_Space_bool_from_region_flag_update_by_type(bContext *C, const int region_flag) { ScrArea *sa = rna_area_from_space(ptr); - ARegion *ar = BKE_area_find_region_type(sa, region_type); - if (ar) { + ARegion *region = BKE_area_find_region_type(sa, region_type); + if (region) { if (region_flag == RGN_FLAG_HIDDEN) { /* Only support animation when the area is in the current context. */ - if (ar->overlap && (sa == CTX_wm_area(C))) { - ED_region_visibility_change_update_animated(C, sa, ar); + if (region->overlap && (sa == CTX_wm_area(C))) { + ED_region_visibility_change_update_animated(C, sa, region); } else { - ED_region_visibility_change_update(C, sa, ar); + ED_region_visibility_change_update(C, sa, region); } } else if (region_flag == RGN_FLAG_HIDDEN_BY_USER) { - if (!(ar->flag & RGN_FLAG_HIDDEN_BY_USER) != !(ar->flag & RGN_FLAG_HIDDEN)) { - ED_region_toggle_hidden(C, ar); + if (!(region->flag & RGN_FLAG_HIDDEN_BY_USER) != !(region->flag & RGN_FLAG_HIDDEN)) { + ED_region_toggle_hidden(C, region); - if ((ar->flag & RGN_FLAG_HIDDEN_BY_USER) == 0) { + if ((region->flag & RGN_FLAG_HIDDEN_BY_USER) == 0) { ED_area_type_hud_ensure(C, sa); } } @@ -774,12 +774,12 @@ static void rna_Space_show_region_hud_update(bContext *C, PointerRNA *ptr) static bool rna_Space_view2d_sync_get(PointerRNA *ptr) { ScrArea *sa; - ARegion *ar; + ARegion *region; sa = rna_area_from_space(ptr); /* can be NULL */ - ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW); - if (ar) { - View2D *v2d = &ar->v2d; + region = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW); + if (region) { + View2D *v2d = ®ion->v2d; return (v2d->flag & V2D_VIEWSYNC_SCREEN_TIME) != 0; } @@ -789,12 +789,12 @@ static bool rna_Space_view2d_sync_get(PointerRNA *ptr) static void rna_Space_view2d_sync_set(PointerRNA *ptr, bool value) { ScrArea *sa; - ARegion *ar; + ARegion *region; sa = rna_area_from_space(ptr); /* can be NULL */ - ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW); - if (ar) { - View2D *v2d = &ar->v2d; + region = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW); + if (region) { + View2D *v2d = ®ion->v2d; if (value) { v2d->flag |= V2D_VIEWSYNC_SCREEN_TIME; } @@ -809,14 +809,14 @@ static void rna_Space_view2d_sync_update(Main *UNUSED(bmain), PointerRNA *ptr) { ScrArea *sa; - ARegion *ar; + ARegion *region; sa = rna_area_from_space(ptr); /* can be NULL */ - ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW); + region = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW); - if (ar) { + if (region) { bScreen *sc = (bScreen *)ptr->owner_id; - View2D *v2d = &ar->v2d; + View2D *v2d = ®ion->v2d; UI_view2d_sync(sc, sa, v2d, V2D_LOCK_SET); } @@ -879,8 +879,8 @@ static PointerRNA rna_SpaceView3D_region_3d_get(PointerRNA *ptr) void *regiondata = NULL; if (sa) { ListBase *regionbase = (sa->spacedata.first == v3d) ? &sa->regionbase : &v3d->regionbase; - ARegion *ar = regionbase->last; /* always last in list, weak .. */ - regiondata = ar->regiondata; + ARegion *region = regionbase->last; /* always last in list, weak .. */ + regiondata = region->regiondata; } return rna_pointer_inherit_refine(ptr, &RNA_RegionView3D, regiondata); @@ -893,16 +893,17 @@ static void rna_SpaceView3D_region_quadviews_begin(CollectionPropertyIterator *i ScrArea *sa = rna_area_from_space(ptr); int i = 3; - ARegion *ar = ((sa && sa->spacedata.first == v3d) ? &sa->regionbase : &v3d->regionbase)->last; + ARegion *region = + ((sa && sa->spacedata.first == v3d) ? &sa->regionbase : &v3d->regionbase)->last; ListBase lb = {NULL, NULL}; - if (ar && ar->alignment == RGN_ALIGN_QSPLIT) { - while (i-- && ar) { - ar = ar->prev; + if (region && region->alignment == RGN_ALIGN_QSPLIT) { + while (i-- && region) { + region = region->prev; } if (i < 0) { - lb.first = ar; + lb.first = region; } } @@ -921,11 +922,11 @@ static void rna_RegionView3D_quadview_update(Main *UNUSED(main), PointerRNA *ptr) { ScrArea *sa; - ARegion *ar; + ARegion *region; - rna_area_region_from_regiondata(ptr, &sa, &ar); - if (sa && ar && ar->alignment == RGN_ALIGN_QSPLIT) { - ED_view3d_quadview_update(sa, ar, false); + rna_area_region_from_regiondata(ptr, &sa, ®ion); + if (sa && region && region->alignment == RGN_ALIGN_QSPLIT) { + ED_view3d_quadview_update(sa, region, false); } } @@ -935,11 +936,11 @@ static void rna_RegionView3D_quadview_clip_update(Main *UNUSED(main), PointerRNA *ptr) { ScrArea *sa; - ARegion *ar; + ARegion *region; - rna_area_region_from_regiondata(ptr, &sa, &ar); - if (sa && ar && ar->alignment == RGN_ALIGN_QSPLIT) { - ED_view3d_quadview_update(sa, ar, true); + rna_area_region_from_regiondata(ptr, &sa, ®ion); + if (sa && region && region->alignment == RGN_ALIGN_QSPLIT) { + ED_view3d_quadview_update(sa, region, true); } } @@ -1508,15 +1509,15 @@ static void rna_SpaceImageEditor_zoom_get(PointerRNA *ptr, float *values) { SpaceImage *sima = (SpaceImage *)ptr->data; ScrArea *sa; - ARegion *ar; + ARegion *region; values[0] = values[1] = 1; /* find aregion */ sa = rna_area_from_space(ptr); /* can be NULL */ - ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW); - if (ar) { - ED_space_image_get_zoom(sima, ar, &values[0], &values[1]); + region = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW); + if (region) { + ED_space_image_get_zoom(sima, region, &values[0], &values[1]); } } @@ -2209,9 +2210,9 @@ static void rna_SpaceNodeEditor_cursor_location_from_region(SpaceNode *snode, int x, int y) { - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); - UI_view2d_region_to_view(&ar->v2d, x, y, &snode->cursor[0], &snode->cursor[1]); + UI_view2d_region_to_view(®ion->v2d, x, y, &snode->cursor[0], &snode->cursor[1]); snode->cursor[0] /= UI_DPI_FAC; snode->cursor[1] /= UI_DPI_FAC; } diff --git a/source/blender/makesrna/intern/rna_space_api.c b/source/blender/makesrna/intern/rna_space_api.c index cbaa407646f..84c80e56d0d 100644 --- a/source/blender/makesrna/intern/rna_space_api.c +++ b/source/blender/makesrna/intern/rna_space_api.c @@ -35,11 +35,11 @@ static void rna_RegionView3D_update(ID *id, RegionView3D *rv3d, bContext *C) bScreen *sc = (bScreen *)id; ScrArea *sa; - ARegion *ar; + ARegion *region; - area_region_from_regiondata(sc, rv3d, &sa, &ar); + area_region_from_regiondata(sc, rv3d, &sa, ®ion); - if (sa && ar && sa->spacetype == SPACE_VIEW3D) { + if (sa && region && sa->spacetype == SPACE_VIEW3D) { Main *bmain = CTX_data_main(C); View3D *v3d = sa->spacedata.first; wmWindowManager *wm = CTX_wm_manager(C); @@ -51,7 +51,7 @@ static void rna_RegionView3D_update(ID *id, RegionView3D *rv3d, bContext *C) ViewLayer *view_layer = WM_window_get_active_view_layer(win); Depsgraph *depsgraph = BKE_scene_get_depsgraph(bmain, scene, view_layer, true); - ED_view3d_update_viewmat(depsgraph, scene, v3d, ar, NULL, NULL, NULL, false); + ED_view3d_update_viewmat(depsgraph, scene, v3d, region, NULL, NULL, NULL, false); break; } } @@ -64,9 +64,9 @@ static void rna_SpaceTextEditor_region_location_from_cursor( bScreen *sc = (bScreen *)id; ScrArea *sa = BKE_screen_find_area_from_space(sc, (SpaceLink *)st); if (sa) { - ARegion *ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW); + ARegion *region = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW); const int cursor_co[2] = {line, column}; - ED_text_region_location_from_cursor(st, ar, cursor_co, r_pixel_pos); + ED_text_region_location_from_cursor(st, region, cursor_co, r_pixel_pos); } } diff --git a/source/blender/makesrna/intern/rna_wm_gizmo.c b/source/blender/makesrna/intern/rna_wm_gizmo.c index 0bd6769d3ad..da12c782052 100644 --- a/source/blender/makesrna/intern/rna_wm_gizmo.c +++ b/source/blender/makesrna/intern/rna_wm_gizmo.c @@ -259,9 +259,9 @@ static wmGizmo *rna_GizmoProperties_find_operator(PointerRNA *ptr) for (bScreen *screen = G_MAIN->screens.first; screen; screen = screen->id.next) { IDProperty *properties = ptr->data; for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { - for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) { - if (ar->gizmo_map) { - wmGizmoMap *gzmap = ar->gizmo_map; + for (ARegion *region = sa->regionbase.first; region; region = region->next) { + if (region->gizmo_map) { + wmGizmoMap *gzmap = region->gizmo_map; for (wmGizmoGroup *gzgroup = WM_gizmomap_group_list(gzmap)->first; gzgroup; gzgroup = gzgroup->next) { for (wmGizmo *gz = gzgroup->gizmos.first; gz; gz = gz->next) { |