style cleanup: var naming for ui list

3 files changed, 51 insertions, 51 deletions

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index ee6916822f0..8df47f033c4 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -6095,9 +6095,9 @@ static int ui_handle_list_event(bContext *C, wmEvent *event, ARegion *ar)
 	int value, min, max;
 
 	if (but && (event->val == KM_PRESS)) {
-		uiList *uilst = but->custom_data;
+		uiList *ui_list = but->custom_data;
 
-		if (uilst) {
+		if (ui_list) {
 			if (ELEM(event->type, UPARROWKEY, DOWNARROWKEY) ||
 				((ELEM(event->type, WHEELUPMOUSE, WHEELDOWNMOUSE) && event->alt)))
 			{
@@ -6109,12 +6109,12 @@ static int ui_handle_list_event(bContext *C, wmEvent *event, ARegion *ar)
 				else
 					value++;
 
-				CLAMP(value, 0, uilst->list_last_len - 1);
+				CLAMP(value, 0, ui_list->list_last_len - 1);
 
-				if (value < uilst->list_scroll)
-					uilst->list_scroll = value;
-				else if (value >= uilst->list_scroll + uilst->list_size)
-					uilst->list_scroll = value - uilst->list_size + 1;
+				if (value < ui_list->list_scroll)
+					ui_list->list_scroll = value;
+				else if (value >= ui_list->list_scroll + ui_list->list_size)
+					ui_list->list_scroll = value - ui_list->list_size + 1;
 
 				RNA_property_int_range(&but->rnapoin, but->rnaprop, &min, &max);
 				value = CLAMPIS(value, min, max);
@@ -6127,27 +6127,27 @@ static int ui_handle_list_event(bContext *C, wmEvent *event, ARegion *ar)
 			}
 			else if (ELEM(event->type, WHEELUPMOUSE, WHEELDOWNMOUSE) && event->shift) {
 				/* silly replacement for proper grip */
-				if (uilst->list_grip_size == 0)
-					uilst->list_grip_size = uilst->list_size;
+				if (ui_list->list_grip_size == 0)
+					ui_list->list_grip_size = ui_list->list_size;
 
 				if (event->type == WHEELUPMOUSE)
-					uilst->list_grip_size--;
+					ui_list->list_grip_size--;
 				else
-					uilst->list_grip_size++;
+					ui_list->list_grip_size++;
 
-				uilst->list_grip_size = MAX2(uilst->list_grip_size, 1);
+				ui_list->list_grip_size = MAX2(ui_list->list_grip_size, 1);
 
 				ED_region_tag_redraw(ar);
 
 				retval = WM_UI_HANDLER_BREAK;
 			}
 			else if (ELEM(event->type, WHEELUPMOUSE, WHEELDOWNMOUSE)) {
-				if (uilst->list_last_len > uilst->list_size) {
+				if (ui_list->list_last_len > ui_list->list_size) {
 					/* list template will clamp */
 					if (event->type == WHEELUPMOUSE)
-						uilst->list_scroll--;
+						ui_list->list_scroll--;
 					else
-						uilst->list_scroll++;
+						ui_list->list_scroll++;
 
 					ED_region_tag_redraw(ar);
 
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 19b44422ac0..f4af1f036a3 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -2308,13 +2308,13 @@ uiLayout *uiLayoutBox(uiLayout *layout)
 	return (uiLayout *)ui_layout_box(layout, ROUNDBOX);
 }
 
-uiLayout *uiLayoutListBox(uiLayout *layout, uiList *uilist, PointerRNA *ptr, PropertyRNA *prop, PointerRNA *actptr,
+uiLayout *uiLayoutListBox(uiLayout *layout, uiList *ui_list, PointerRNA *ptr, PropertyRNA *prop, PointerRNA *actptr,
                           PropertyRNA *actprop)
 {
 	uiLayoutItemBx *box = ui_layout_box(layout, LISTBOX);
 	uiBut *but = box->roundbox;
 
-	but->custom_data = uilist;
+	but->custom_data = ui_list;
 
 	but->rnasearchpoin = *ptr;
 	but->rnasearchprop = prop;
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 34f325abe76..a190f3dbacb 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -2328,7 +2328,7 @@ void uiTemplateGameStates(uiLayout *layout, PointerRNA *ptr, const char *propnam
 
 
 /************************* List Template **************************/
-static void uilist_draw_item_default(struct uiList *uilst, struct bContext *UNUSED(C), struct uiLayout *layout,
+static void uilist_draw_item_default(struct uiList *ui_list, struct bContext *UNUSED(C), struct uiLayout *layout,
                                      struct PointerRNA *UNUSED(dataptr), struct PointerRNA *itemptr, int icon,
                                      struct PointerRNA *UNUSED(active_dataptr), const char *UNUSED(active_propname),
                                      int UNUSED(index))
@@ -2340,7 +2340,7 @@ static void uilist_draw_item_default(struct uiList *uilst, struct bContext *UNUS
 	name = (namebuf) ? namebuf : "";
 
 	/* Simplest one! */
-	switch (uilst->layout_type) {
+	switch (ui_list->layout_type) {
 	case UILST_LAYOUT_GRID:
 		uiItemL(layout, "", icon);
 		break;
@@ -2361,8 +2361,8 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co
                     PointerRNA *dataptr, const char *propname, PointerRNA *active_dataptr,
                     const char *active_propname, int rows, int maxrows, int layout_type)
 {
-	uiListType *ult;
-	uiList *uilst = NULL;
+	uiListType *ui_list_type;
+	uiList *ui_list = NULL;
 	ARegion *ar;
 	uiListDrawItemFunc draw_item;
 
@@ -2373,7 +2373,7 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co
 	uiBlock *block, *subblock;
 	uiBut *but;
 
-	char uilst_id[UI_MAX_NAME_STR];
+	char ui_list_id[UI_MAX_NAME_STR];
 	char numstr[32];
 	int rnaicon = ICON_NONE, icon = ICON_NONE;
 	int i = 0, activei = 0;
@@ -2428,31 +2428,31 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co
 	activei = RNA_property_int_get(active_dataptr, activeprop);
 
 	/* Find the uiList type. */
-	ult = WM_uilisttype_find(listtype_name, FALSE);
+	ui_list_type = WM_uilisttype_find(listtype_name, FALSE);
 
-	if (ult == NULL) {
+	if (ui_list_type == NULL) {
 		RNA_warning("List type %s not found", listtype_name);
 		return;
 	}
 
-	draw_item = ult->draw_item ? ult->draw_item : uilist_draw_item_default;
+	draw_item = ui_list_type->draw_item ? ui_list_type->draw_item : uilist_draw_item_default;
 
 	/* Find or add the uiList to the current Region. */
 	/* We tag the list id with the list type... */
-	BLI_snprintf(uilst_id, sizeof(uilst_id), "%s_%s", ult->idname, list_id ? list_id : "");
+	BLI_snprintf(ui_list_id, sizeof(ui_list_id), "%s_%s", ui_list_type->idname, list_id ? list_id : "");
 
 	ar = CTX_wm_region(C);
-	uilst = BLI_findstring(&ar->uiLists, uilst_id, offsetof(uiList, list_id));
+	ui_list = BLI_findstring(&ar->ui_lists, ui_list_id, offsetof(uiList, list_id));
 
-	if (!uilst) {
-		uilst = MEM_callocN(sizeof(uiList), __func__);
-		BLI_strncpy(uilst->list_id, uilst_id, sizeof(uilst->list_id));
-		BLI_addtail(&ar->uiLists, uilst);
+	if (!ui_list) {
+		ui_list = MEM_callocN(sizeof(uiList), __func__);
+		BLI_strncpy(ui_list->list_id, ui_list_id, sizeof(ui_list->list_id));
+		BLI_addtail(&ar->ui_lists, ui_list);
 	}
 
 	/* Because we can't actually pass type across save&load... */
-	uilst->type = ult;
-	uilst->layout_type = layout_type;
+	ui_list->type = ui_list_type;
+	ui_list->layout_type = layout_type;
 
 	switch (layout_type) {
 	case UILST_LAYOUT_DEFAULT:
@@ -2461,11 +2461,11 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co
 			rows = 5;
 		if (maxrows == 0)
 			maxrows = 5;
-		if (uilst->list_grip_size != 0)
-			rows = uilst->list_grip_size;
+		if (ui_list->list_grip_size != 0)
+			rows = ui_list->list_grip_size;
 
 		/* layout */
-		box = uiLayoutListBox(layout, uilst, dataptr, prop, active_dataptr, activeprop);
+		box = uiLayoutListBox(layout, ui_list, dataptr, prop, active_dataptr, activeprop);
 		row = uiLayoutRow(box, FALSE);
 		col = uiLayoutColumn(row, TRUE);
 
@@ -2477,21 +2477,21 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co
 		items = CLAMPIS(len, rows, MAX2(rows, maxrows));
 
 		/* if list length changes and active is out of view, scroll to it */
-		if ((uilst->list_last_len != len) &&
-		    (activei < uilst->list_scroll || activei >= uilst->list_scroll + items)) {
-			uilst->list_scroll = activei;
+		if ((ui_list->list_last_len != len) &&
+		    (activei < ui_list->list_scroll || activei >= ui_list->list_scroll + items)) {
+			ui_list->list_scroll = activei;
 		}
 
-		uilst->list_scroll = MIN2(uilst->list_scroll, len - items);
-		uilst->list_scroll = MAX2(uilst->list_scroll, 0);
-		uilst->list_size = items;
-		uilst->list_last_len = len;
+		ui_list->list_scroll = min_ii(ui_list->list_scroll, len - items);
+		ui_list->list_scroll = max_ii(ui_list->list_scroll, 0);
+		ui_list->list_size = items;
+		ui_list->list_last_len = len;
 
 		if (dataptr->data && prop) {
 			/* create list items */
 			RNA_PROP_BEGIN (dataptr, itemptr, prop)
 			{
-				if (i >= uilst->list_scroll && i < uilst->list_scroll + items) {
+				if (i >= ui_list->list_scroll && i < ui_list->list_scroll + items) {
 					subblock = uiLayoutGetBlock(col);
 					overlap = uiLayoutOverlap(col);
 
@@ -2507,7 +2507,7 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co
 					icon = UI_rnaptr_icon_get(C, &itemptr, rnaicon, FALSE);
 					if (icon == ICON_DOT)
 						icon = ICON_NONE;
-					draw_item(uilst, C, sub, dataptr, &itemptr, icon, active_dataptr, active_propname, i);
+					draw_item(ui_list, C, sub, dataptr, &itemptr, icon, active_dataptr, active_propname, i);
 				}
 				i++;
 			}
@@ -2515,8 +2515,8 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co
 		}
 
 		/* add dummy buttons to fill space */
-		while (i < uilst->list_scroll + items) {
-			if (i >= uilst->list_scroll)
+		while (i < ui_list->list_scroll + items) {
+			if (i >= ui_list->list_scroll)
 				uiItemL(col, "", ICON_NONE);
 			i++;
 		}
@@ -2524,7 +2524,7 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co
 		/* add scrollbar */
 		if (len > items) {
 			col = uiLayoutColumn(row, FALSE);
-			uiDefButI(block, SCROLL, 0, "", 0, 0, UI_UNIT_X * 0.75, UI_UNIT_Y * items, &uilst->list_scroll,
+			uiDefButI(block, SCROLL, 0, "", 0, 0, UI_UNIT_X * 0.75, UI_UNIT_Y * items, &ui_list->list_scroll,
 			          0, len - items, items, 0, "");
 		}
 		break;
@@ -2541,7 +2541,7 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co
 					icon = UI_rnaptr_icon_get(C, &itemptr, rnaicon, FALSE);
 					if (icon == ICON_DOT)
 						icon = ICON_NONE;
-					draw_item(uilst, C, row, dataptr, &itemptr, icon, active_dataptr, active_propname, i);
+					draw_item(ui_list, C, row, dataptr, &itemptr, icon, active_dataptr, active_propname, i);
 				}
 
 				i++;
@@ -2561,7 +2561,7 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co
 			uiButSetFlag(but, UI_BUT_DISABLED);
 		break;
 	case UILST_LAYOUT_GRID:
-		box = uiLayoutListBox(layout, uilst, dataptr, prop, active_dataptr, activeprop);
+		box = uiLayoutListBox(layout, ui_list, dataptr, prop, active_dataptr, activeprop);
 		col = uiLayoutColumn(box, TRUE);
 		row = uiLayoutRow(col, FALSE);
 
@@ -2586,7 +2586,7 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co
 				sub = uiLayoutRow(overlap, FALSE);
 
 				icon = UI_rnaptr_icon_get(C, &itemptr, rnaicon, FALSE);
-				draw_item(uilst, C, sub, dataptr, &itemptr, icon, active_dataptr, active_propname, i);
+				draw_item(ui_list, C, sub, dataptr, &itemptr, icon, active_dataptr, active_propname, i);
 
 				i++;
 			}