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

remove some shadow declarations 

SVN revision: 59508
This commit is contained in:
Vincent Torri 2011-05-18 14:12:10 +00:00
parent f3ef64a31e
commit b3ed32be46
5 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
legacy/evas/src/lib/canvas/evas_events.c
View File

@ -315,7 +315,7 @@ evas_event_feed_mouse_up(Evas *e, int b, Evas_Button_Flags flags, unsigned int t
if (!e->pointer.button) if (!e->pointer.button)
{ {
Eina_List *ins; Eina_List *ins;
Eina_List *l; Eina_List *ll;
{ {
Evas_Event_Mouse_Out ev; Evas_Event_Mouse_Out ev;
Evas_Object *obj; Evas_Object *obj;
@ -337,7 +337,7 @@ evas_event_feed_mouse_up(Evas *e, int b, Evas_Button_Flags flags, unsigned int t
ins = evas_event_objects_event_list(e, NULL, e->pointer.x, e->pointer.y); ins = evas_event_objects_event_list(e, NULL, e->pointer.x, e->pointer.y);
/* go thru old list of in objects */ /* go thru old list of in objects */
copy = evas_event_list_copy(e->pointer.object.in); copy = evas_event_list_copy(e->pointer.object.in);
EINA_LIST_FOREACH(copy, l, obj) EINA_LIST_FOREACH(copy, ll, obj)
{ {
ev.canvas.x = e->pointer.x; ev.canvas.x = e->pointer.x;
ev.canvas.y = e->pointer.y; ev.canvas.y = e->pointer.y;
@ -1247,14 +1247,14 @@ evas_event_feed_key_up(Evas *e, const char *keyname, const char *key, const char
{ {
while (e->delete_grabs > 0) while (e->delete_grabs > 0)
{ {
Eina_List *l, *l_next; Eina_List *ll, *l_next;
Evas_Key_Grab *g; Evas_Key_Grab *gr;
e->delete_grabs--; e->delete_grabs--;
EINA_LIST_FOREACH_SAFE(e->grabs, l, l_next, g) EINA_LIST_FOREACH_SAFE(e->grabs, ll, l_next, gr)
{ {
if (g->delete_me) if (gr->delete_me)
evas_key_grab_free(g->object, g->keyname, g->modifiers, g->not_modifiers); evas_key_grab_free(gr->object, gr->keyname, gr->modifiers, gr->not_modifiers);
} }
} }
} }

8
legacy/evas/src/lib/canvas/evas_font_dir.c
View File

@ -416,10 +416,10 @@ evas_font_load(Evas *evas, const char *name, const char *source, int size)
font = evas->engine.func->font_load(evas->engine.data.output, (char *)nm, size, wanted_rend); font = evas->engine.func->font_load(evas->engine.data.output, (char *)nm, size, wanted_rend);
else /* search font path */ else /* search font path */
{ {
Eina_List *l; Eina_List *ll;
char *dir; char *dir;
EINA_LIST_FOREACH(evas->font_path, l, dir) EINA_LIST_FOREACH(evas->font_path, ll, dir)
{ {
const char *f_file; const char *f_file;
@ -479,10 +479,10 @@ evas_font_load(Evas *evas, const char *name, const char *source, int size)
evas->engine.func->font_add(evas->engine.data.output, font, (char *)nm, size, wanted_rend); evas->engine.func->font_add(evas->engine.data.output, font, (char *)nm, size, wanted_rend);
else else
{ {
Eina_List *l; Eina_List *ll;
char *dir; char *dir;
EINA_LIST_FOREACH(evas->font_path, l, dir) EINA_LIST_FOREACH(evas->font_path, ll, dir)
{ {
const char *f_file; const char *f_file;

12
legacy/evas/src/lib/canvas/evas_object_box.c
View File

@ -1373,7 +1373,7 @@ evas_object_box_layout_flow_horizontal(Evas_Object *o, Evas_Object_Box_Data *pri
int *row_max_h; int *row_max_h;
int *row_break; int *row_break;
int *row_width; int *row_width;
int off_y; int offset_y;
n_children = eina_list_count(priv->children); n_children = eina_list_count(priv->children);
if (!n_children) if (!n_children)
@ -1395,11 +1395,11 @@ evas_object_box_layout_flow_horizontal(Evas_Object *o, Evas_Object_Box_Data *pri
evas_object_geometry_get(o, &x, &y, &w, &h); evas_object_geometry_get(o, &x, &y, &w, &h);
_evas_object_box_layout_flow_horizontal_row_info_collect _evas_object_box_layout_flow_horizontal_row_info_collect
(priv, w, &row_count, row_max_h, row_break, row_width, &off_y, &max_h); (priv, w, &row_count, row_max_h, row_break, row_width, &offset_y, &max_h);
inc_y = 0; inc_y = 0;
v_justify = 0; v_justify = 0;
remain_y = h - (off_y + max_h); remain_y = h - (offset_y + max_h);
if (remain_y > 0) if (remain_y > 0)
{ {
@ -1554,7 +1554,7 @@ evas_object_box_layout_flow_vertical(Evas_Object *o, Evas_Object_Box_Data *priv,
int *col_max_w; int *col_max_w;
int *col_break; int *col_break;
int *col_height; int *col_height;
int off_x; int offset_x;
n_children = eina_list_count(priv->children); n_children = eina_list_count(priv->children);
if (!n_children) if (!n_children)
@ -1576,10 +1576,10 @@ evas_object_box_layout_flow_vertical(Evas_Object *o, Evas_Object_Box_Data *priv,
evas_object_geometry_get(o, &x, &y, &w, &h); evas_object_geometry_get(o, &x, &y, &w, &h);
_evas_object_box_layout_flow_vertical_col_info_collect _evas_object_box_layout_flow_vertical_col_info_collect
(priv, h, &col_count, col_max_w, col_break, col_height, &off_x, &max_w); (priv, h, &col_count, col_max_w, col_break, col_height, &offset_x, &max_w);
inc_x = 0; inc_x = 0;
remain_x = w - (off_x + max_w); remain_x = w - (offset_x + max_w);
if (remain_x > 0) if (remain_x > 0)
{ {

42
legacy/evas/src/lib/canvas/evas_rectangle.c
View File

@ -11,47 +11,47 @@ evas_rects_return_difference_rects(Eina_Array *rects, int x, int y, int w, int h
} }
else else
{ {
int x1[4], y1[4], i, j; int pt_x[4], pt_y[4], i, j;
if (x < xx) if (x < xx)
{ {
x1[0] = x; pt_x[0] = x;
x1[1] = xx; pt_x[1] = xx;
} }
else else
{ {
x1[0] = xx; pt_x[0] = xx;
x1[1] = x; pt_x[1] = x;
} }
if ((x + w) < (xx + ww)) if ((x + w) < (xx + ww))
{ {
x1[2] = x + w; pt_x[2] = x + w;
x1[3] = xx + ww; pt_x[3] = xx + ww;
} }
else else
{ {
x1[2] = xx + ww; pt_x[2] = xx + ww;
x1[3] = x + w; pt_x[3] = x + w;
} }
if (y < yy) if (y < yy)
{ {
y1[0] = y; pt_y[0] = y;
y1[1] = yy; pt_y[1] = yy;
} }
else else
{ {
y1[0] = yy; pt_y[0] = yy;
y1[1] = y; pt_y[1] = y;
} }
if ((y + h) < (yy + hh)) if ((y + h) < (yy + hh))
{ {
y1[2] = y + h; pt_y[2] = y + h;
y1[3] = yy + hh; pt_y[3] = yy + hh;
} }
else else
{ {
y1[2] = yy + hh; pt_y[2] = yy + hh;
y1[3] = y + h; pt_y[3] = y + h;
} }
for (j = 0; j < 3; j++) for (j = 0; j < 3; j++)
{ {
@ -60,10 +60,10 @@ evas_rects_return_difference_rects(Eina_Array *rects, int x, int y, int w, int h
int intsec1, intsec2; int intsec1, intsec2;
int tx, ty, tw, th; int tx, ty, tw, th;
tx = x1[i]; tx = pt_x[i];
ty = y1[j]; ty = pt_y[j];
tw = x1[i + 1] - x1[i]; tw = pt_x[i + 1] - pt_x[i];
th = y1[j + 1] - y1[j]; th = pt_y[j + 1] - pt_y[j];
intsec1 = (RECTS_INTERSECT(tx, ty, tw, th, x, y, w, h)); intsec1 = (RECTS_INTERSECT(tx, ty, tw, th, x, y, w, h));
intsec2 = (RECTS_INTERSECT(tx, ty, tw, th, xx, yy, ww, hh)); intsec2 = (RECTS_INTERSECT(tx, ty, tw, th, xx, yy, ww, hh));

28
legacy/evas/src/lib/canvas/evas_render.c
View File

@ -744,27 +744,27 @@ evas_render_mapped(Evas *e, Evas_Object *obj, void *context, void *surface,
} }
if (obj->smart.smart) if (obj->smart.smart)
{ {
Evas_Object *obj2; Evas_Object *o2;
EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(obj), obj2) EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(obj), o2)
{ {
if (!evas_object_is_visible(obj2) && if (!evas_object_is_visible(o2) &&
!evas_object_was_visible(obj2)) !evas_object_was_visible(o2))
{ {
obj2->changed = 0; o2->changed = 0;
obj2->changed_move_only = 0; o2->changed_move_only = 0;
obj2->changed_nomove = 0; o2->changed_nomove = 0;
obj2->changed_move = 0; o2->changed_move = 0;
continue; continue;
} }
if (obj2->changed) if (o2->changed)
{ {
// chlist(obj2, 0); // chlist(o2, 0);
changed = 1; changed = 1;
obj2->changed = 0; o2->changed = 0;
obj2->changed_move_only = 0; o2->changed_move_only = 0;
obj2->changed_nomove = 0; o2->changed_nomove = 0;
obj2->changed_move = 0; o2->changed_move = 0;
break; break;
} }
} }