[Bf-blender-cvs] [dcdc0f177a3] master: Cleanup: use const variables
Campbell Barton
noreply at git.blender.org
Mon Jan 4 07:41:52 CET 2021
Commit: dcdc0f177a3907085a2f8208ceb5680ab4b57142
Author: Campbell Barton
Date: Mon Jan 4 17:02:13 2021 +1100
Branches: master
https://developer.blender.org/rBdcdc0f177a3907085a2f8208ceb5680ab4b57142
Cleanup: use const variables
===================================================================
M source/blender/editors/interface/interface.c
M source/blender/editors/interface/interface_context_menu.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_icons.c
M source/blender/editors/interface/interface_layout.c
M source/blender/editors/interface/interface_template_search_menu.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/interface/interface_widgets.c
M source/blender/editors/interface/view2d_ops.c
===================================================================
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index f514588e132..9644e6e0238 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -132,10 +132,10 @@ static bool ui_but_is_unit_radians(const uiBut *but)
void ui_block_to_window_fl(const ARegion *region, uiBlock *block, float *r_x, float *r_y)
{
- int getsizex = BLI_rcti_size_x(®ion->winrct) + 1;
- int getsizey = BLI_rcti_size_y(®ion->winrct) + 1;
- int sx = region->winrct.xmin;
- int sy = region->winrct.ymin;
+ const int getsizex = BLI_rcti_size_x(®ion->winrct) + 1;
+ const int getsizey = BLI_rcti_size_y(®ion->winrct) + 1;
+ const int sx = region->winrct.xmin;
+ const int sy = region->winrct.ymin;
float gx = *r_x;
float gy = *r_y;
@@ -188,21 +188,21 @@ float ui_block_to_window_scale(const ARegion *region, uiBlock *block)
/* for mouse cursor */
void ui_window_to_block_fl(const ARegion *region, uiBlock *block, float *r_x, float *r_y)
{
- int getsizex = BLI_rcti_size_x(®ion->winrct) + 1;
- int getsizey = BLI_rcti_size_y(®ion->winrct) + 1;
- int sx = region->winrct.xmin;
- int sy = region->winrct.ymin;
+ const int getsizex = BLI_rcti_size_x(®ion->winrct) + 1;
+ const int getsizey = BLI_rcti_size_y(®ion->winrct) + 1;
+ const int sx = region->winrct.xmin;
+ const int sy = region->winrct.ymin;
- float a = 0.5f * ((float)getsizex) * block->winmat[0][0];
- float b = 0.5f * ((float)getsizex) * block->winmat[1][0];
- float c = 0.5f * ((float)getsizex) * (1.0f + block->winmat[3][0]);
+ const float a = 0.5f * ((float)getsizex) * block->winmat[0][0];
+ const float b = 0.5f * ((float)getsizex) * block->winmat[1][0];
+ const float c = 0.5f * ((float)getsizex) * (1.0f + block->winmat[3][0]);
- float d = 0.5f * ((float)getsizey) * block->winmat[0][1];
- float e = 0.5f * ((float)getsizey) * block->winmat[1][1];
- float f = 0.5f * ((float)getsizey) * (1.0f + block->winmat[3][1]);
+ const float d = 0.5f * ((float)getsizey) * block->winmat[0][1];
+ const float e = 0.5f * ((float)getsizey) * block->winmat[1][1];
+ const float f = 0.5f * ((float)getsizey) * (1.0f + block->winmat[3][1]);
- float px = *r_x - sx;
- float py = *r_y - sy;
+ const float px = *r_x - sx;
+ const float py = *r_y - sy;
*r_y = (a * (py - f) + d * (c - px)) / (a * e - d * b);
*r_x = (px - b * (*r_y) - c) / a;
@@ -387,7 +387,7 @@ static void ui_block_bounds_calc_text(uiBlock *block, float offset)
* offsets). */
if (bt->next && ui_but_is_row_alignment_group(bt, bt->next)) {
int width = 0;
- int alignnr = bt->alignnr;
+ const int alignnr = bt->alignnr;
for (col_bt = bt; col_bt && col_bt->alignnr == alignnr; col_bt = col_bt->next) {
width += BLI_rctf_size_x(&col_bt->rect);
col_bt->rect.xmin += x1addval;
@@ -421,7 +421,7 @@ static void ui_block_bounds_calc_text(uiBlock *block, float offset)
for (col_bt = init_col_bt; col_bt; col_bt = col_bt->next) {
/* Recognize a horizontally arranged alignment group and skip its items. */
if (col_bt->next && ui_but_is_row_alignment_group(col_bt, col_bt->next)) {
- int alignnr = col_bt->alignnr;
+ const int alignnr = col_bt->alignnr;
for (; col_bt && col_bt->alignnr == alignnr; col_bt = col_bt->next) {
/* pass */
}
@@ -465,7 +465,7 @@ void ui_block_bounds_calc(uiBlock *block)
/* hardcoded exception... but that one is annoying with larger safety */
uiBut *bt = block->buttons.first;
- int xof = ((bt && STRPREFIX(bt->str, "ERROR")) ? 10 : 40) * U.dpi_fac;
+ const int xof = ((bt && STRPREFIX(bt->str, "ERROR")) ? 10 : 40) * U.dpi_fac;
block->safety.xmin = block->rect.xmin - xof;
block->safety.ymin = block->rect.ymin - xof;
@@ -478,16 +478,16 @@ static void ui_block_bounds_calc_centered(wmWindow *window, uiBlock *block)
/* note: this is used for the splash where window bounds event has not been
* updated by ghost, get the window bounds from ghost directly */
- int xmax = WM_window_pixels_x(window);
- int ymax = WM_window_pixels_y(window);
+ const int xmax = WM_window_pixels_x(window);
+ const int ymax = WM_window_pixels_y(window);
ui_block_bounds_calc(block);
- int width = BLI_rctf_size_x(&block->rect);
- int height = BLI_rctf_size_y(&block->rect);
+ const int width = BLI_rctf_size_x(&block->rect);
+ const int height = BLI_rctf_size_y(&block->rect);
- int startx = (xmax * 0.5f) - (width * 0.5f);
- int starty = (ymax * 0.5f) - (height * 0.5f);
+ const int startx = (xmax * 0.5f) - (width * 0.5f);
+ const int starty = (ymax * 0.5f) - (height * 0.5f);
UI_block_translate(block, startx - block->rect.xmin, starty - block->rect.ymin);
@@ -511,13 +511,13 @@ static void ui_block_bounds_calc_centered_pie(uiBlock *block)
static void ui_block_bounds_calc_popup(
wmWindow *window, uiBlock *block, eBlockBoundsCalc bounds_calc, const int xy[2], int r_xy[2])
{
- int oldbounds = block->bounds;
+ const int oldbounds = block->bounds;
/* compute mouse position with user defined offset */
ui_block_bounds_calc(block);
- int xmax = WM_window_pixels_x(window);
- int ymax = WM_window_pixels_y(window);
+ const int xmax = WM_window_pixels_x(window);
+ const int ymax = WM_window_pixels_y(window);
int oldwidth = BLI_rctf_size_x(&block->rect);
int oldheight = BLI_rctf_size_y(&block->rect);
@@ -535,8 +535,8 @@ static void ui_block_bounds_calc_popup(
ui_block_bounds_calc(block);
/* and we adjust the position to fit within window */
- int width = BLI_rctf_size_x(&block->rect);
- int height = BLI_rctf_size_y(&block->rect);
+ const int width = BLI_rctf_size_x(&block->rect);
+ const int height = BLI_rctf_size_y(&block->rect);
/* avoid divide by zero below, caused by calling with no UI, but better not crash */
oldwidth = oldwidth > 0 ? oldwidth : MAX2(1, width);
@@ -545,7 +545,8 @@ static void ui_block_bounds_calc_popup(
/* offset block based on mouse position, user offset is scaled
* along in case we resized the block in ui_block_bounds_calc_text */
rcti rect;
- int raw_x = rect.xmin = xy[0] + block->rect.xmin + (block->bounds_offset[0] * width) / oldwidth;
+ const int raw_x = rect.xmin = xy[0] + block->rect.xmin +
+ (block->bounds_offset[0] * width) / oldwidth;
int raw_y = rect.ymin = xy[1] + block->rect.ymin +
(block->bounds_offset[1] * height) / oldheight;
rect.xmax = rect.xmin + width;
@@ -1700,7 +1701,7 @@ static bool ui_but_icon_extra_is_visible_search_eyedropper(uiBut *but)
}
StructRNA *type = RNA_property_pointer_type(&but->rnapoin, but->rnaprop);
- short idcode = RNA_type_to_ID_code(type);
+ const short idcode = RNA_type_to_ID_code(type);
return ((but->editstr == NULL) && (idcode == ID_OB || OB_DATA_SUPPORT_ID(idcode)));
}
@@ -2739,7 +2740,7 @@ void ui_but_string_get_ex(uiBut *but,
}
if (but->rnaprop && ELEM(but->type, UI_BTYPE_TEXT, UI_BTYPE_SEARCH_MENU, UI_BTYPE_TAB)) {
- PropertyType type = RNA_property_type(but->rnaprop);
+ const PropertyType type = RNA_property_type(but->rnaprop);
int buf_len;
const char *buf = NULL;
@@ -2798,7 +2799,7 @@ void ui_but_string_get_ex(uiBut *but,
}
else {
/* number editing */
- double value = ui_but_value_get(but);
+ const double value = ui_but_value_get(but);
PropertySubType subtype = PROP_NONE;
if (but->rnaprop) {
@@ -2864,7 +2865,7 @@ char *ui_but_string_get_dynamic(uiBut *but, int *r_str_size)
*r_str_size = 1;
if (but->rnaprop && ELEM(but->type, UI_BTYPE_TEXT, UI_BTYPE_SEARCH_MENU)) {
- PropertyType type = RNA_property_type(but->rnaprop);
+ const PropertyType type = RNA_property_type(but->rnaprop);
if (type == PROP_STRING) {
/* RNA string */
@@ -3031,7 +3032,7 @@ bool ui_but_string_set(bContext *C, uiBut *but, const char *str)
{
if (but->rnaprop && but->rnapoin.data && ELEM(but->type, UI_BTYPE_TEXT, UI_BTYPE_SEARCH_MENU)) {
if (RNA_property_editable(&but->rnapoin, but->rnaprop)) {
- PropertyType type = RNA_property_type(but->rnaprop);
+ const PropertyType type = RNA_property_type(but->rnaprop);
if (type == PROP_STRING) {
/* RNA string */
@@ -3719,7 +3720,7 @@ static void ui_but_update_ex(uiBut *but, const bool validate)
case UI_BTYPE_LABEL:
if (ui_but_is_float(but)) {
UI_GET_BUT_VALUE_INIT(but, value);
- int prec = ui_but_calc_float_precision(but, value);
+ const int prec = ui_but_calc_float_precision(but, value);
BLI_snprintf(but->drawstr, sizeof(but->drawstr), "%s%.*f", but->str, prec, value);
}
else {
@@ -4020,7 +4021,7 @@ static uiBut *ui_def_but(uiBlock *block,
but->retval = retval;
- int slen = strlen(str);
+ const int slen = strlen(str);
ui_but_string_set_internal(but, str, slen);
but->rect.xmin = x;
@@ -4448,7 +4449,7 @@ static uiBut *ui_def_but_rna(uiBlock *block,
value = (int)max;
}
- int i = RNA_enum_from_value(item, value);
+ const int i = RNA_enum_from_value(item, value);
if (i != -1) {
if (!str) {
@@ -6709,7 +6710,7 @@ static void operator_enum_search_update_fn(const struct bContext *C,
}
const EnumPropertyItem **filtered_items;
- int filtered_amount = BLI_string_search_query(search, str, (void ***)&filtered_items);
+ const int filtered_amount = BLI_string_search_query(search, str, (void ***)&filtered_items);
for (int i = 0; i < filtered_amount; i++) {
const EnumPropertyItem *item = filtered_items[i];
diff --git a/source/blender/editors/interface/interface_context_menu.c b/source/blender/editors/interface/interface_context_menu.c
index 54ebb3d5746..09e3d39c603 100644
--- a/source/blender/editors/interface/interface_context_menu.c
+++ b/source/blender/editors/interface/interface_context_menu.c
@@ -230,7 +230,7 @@ static uiBlock *menu_add_shortcut(bContext *C, ARegion *region, void *arg)
* than being found on adding later... */
wmKeyMap *km = WM_keymap_guess_opname(C, idname);
wmKeyMapItem *kmi = WM_keymap_add_item(km, idname, EVT_AKEY, KM_PRESS,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list