kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui.list: Fix shadow variable warnings 

node2 didn't conflict, just making it consistent with nodedata2
This commit is contained in:
Jean-Philippe Andre 2018-01-18 14:13:05 +09:00
parent 50a082cab9
commit 50e0099ceb
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lib/elementary/efl_ui_list_precise_layouter.c
View File

@ -155,17 +155,17 @@ _item_min_calc(Efl_Ui_List_Precise_Layouter_Data *pd, Efl_Ui_List_LayoutItem* it
pd->min.w = min.w; pd->min.w = min.w;
else if (pd->min.w == item->min.w) else if (pd->min.w == item->min.w)
{ {
Efl_Ui_List_SegArray_Node *node; Efl_Ui_List_SegArray_Node *node2;
Eina_Accessor *nodes = efl_ui_list_segarray_node_accessor_get(pd->segarray); Eina_Accessor *nodes = efl_ui_list_segarray_node_accessor_get(pd->segarray);
pd->min.w = min.w; pd->min.w = min.w;
EINA_ACCESSOR_FOREACH(nodes, i, node) EINA_ACCESSOR_FOREACH(nodes, i, node2)
{ {
Efl_Ui_List_Precise_Layouter_Node_Data *nodedata = node->layout_data; Efl_Ui_List_Precise_Layouter_Node_Data *nodedata2 = node2->layout_data;
if (pd->min.w < nodedata->min.w) if (pd->min.w < nodedata2->min.w)
pd->min.w = nodedata->min.w; pd->min.w = nodedata2->min.w;
if (item->min.w == nodedata->min.w) if (item->min.w == nodedata2->min.w)
break; break;
} }
eina_accessor_free(nodes); eina_accessor_free(nodes);
@ -280,17 +280,17 @@ _child_removed_cb(void *data, const Efl_Event *event)
if (pd->min.w == litem->min.w) if (pd->min.w == litem->min.w)
{ {
Efl_Ui_List_SegArray_Node *node; Efl_Ui_List_SegArray_Node *node2;
Eina_Accessor *nodes = efl_ui_list_segarray_node_accessor_get(pd->segarray); Eina_Accessor *nodes = efl_ui_list_segarray_node_accessor_get(pd->segarray);
pd->min.w = 0; pd->min.w = 0;
EINA_ACCESSOR_FOREACH(nodes, i, node) EINA_ACCESSOR_FOREACH(nodes, i, node2)
{ {
Efl_Ui_List_Precise_Layouter_Node_Data *nodedata = node->layout_data; Efl_Ui_List_Precise_Layouter_Node_Data *nodedata2 = node2->layout_data;
if (pd->min.w < nodedata->min.w) if (pd->min.w < nodedata2->min.w)
pd->min.w = nodedata->min.w; pd->min.w = nodedata2->min.w;
if (litem->min.w == nodedata->min.w) if (litem->min.w == nodedata2->min.w)
break; break;
} }
eina_accessor_free(nodes); eina_accessor_free(nodes);