remove some shadow declarations

SVN revision: 59508

diff --git a/legacy/evas/src/lib/canvas/evas_events.c b/legacy/evas/src/lib/canvas/evas_events.c
index fc7d5a59b3540ae667099f570dfb6d9a5c88f2bd..e4f9e91789107322034a94905cffd046532e237b 100644 (file)
--- a/legacy/evas/src/lib/canvas/evas_events.c
+++ b/legacy/evas/src/lib/canvas/evas_events.c
@@ -315,7 +315,7 @@ evas_event_feed_mouse_up(Evas *e, int b, Evas_Button_Flags flags, unsigned int t
    if (!e->pointer.button)
      {
        Eina_List *ins;
-       Eina_List *l;
+       Eina_List *ll;
          {
             Evas_Event_Mouse_Out ev;
             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);
             /* go thru old list of in objects */
             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.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)
                    {
-                      Eina_List *l, *l_next;
-                      Evas_Key_Grab *g;
+                      Eina_List *ll, *l_next;
+                      Evas_Key_Grab *gr;
 
                       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)
-                             evas_key_grab_free(g->object, g->keyname, g->modifiers, g->not_modifiers);
+                           if (gr->delete_me)
+                             evas_key_grab_free(gr->object, gr->keyname, gr->modifiers, gr->not_modifiers);
                         }
                    }
               }

diff --git a/legacy/evas/src/lib/canvas/evas_font_dir.c b/legacy/evas/src/lib/canvas/evas_font_dir.c
index 79b9b59e77e6b81405ff230062964d2c2c3e697a..c33afd4710b65a2a4c4ba39c4e3ea880a3588247 100644 (file)
--- a/legacy/evas/src/lib/canvas/evas_font_dir.c
+++ b/legacy/evas/src/lib/canvas/evas_font_dir.c
@@ -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);
                  else /* search font path */
                    {
-                      Eina_List *l;
+                      Eina_List *ll;
                       char *dir;
 
-                      EINA_LIST_FOREACH(evas->font_path, l, dir)
+                      EINA_LIST_FOREACH(evas->font_path, ll, dir)
                         {
                            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);
                  else
                    {
-                      Eina_List *l;
+                      Eina_List *ll;
                       char *dir;
 
-                      EINA_LIST_FOREACH(evas->font_path, l, dir)
+                      EINA_LIST_FOREACH(evas->font_path, ll, dir)
                         {
                            const char *f_file;
 

diff --git a/legacy/evas/src/lib/canvas/evas_object_box.c b/legacy/evas/src/lib/canvas/evas_object_box.c
index ae5563f3783894cd66a8da787f01c65ab1293a71..4fd5675e5fa08de041a4e8083b2d68449f6f283c 100644 (file)
--- a/legacy/evas/src/lib/canvas/evas_object_box.c
+++ b/legacy/evas/src/lib/canvas/evas_object_box.c
@@ -1373,7 +1373,7 @@ evas_object_box_layout_flow_horizontal(Evas_Object *o, Evas_Object_Box_Data *pri
    int *row_max_h;
    int *row_break;
    int *row_width;
-   int off_y;
+   int offset_y;
 
    n_children = eina_list_count(priv->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_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;
    v_justify = 0;
-   remain_y = h - (off_y + max_h);
+   remain_y = h - (offset_y + max_h);
 
    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_break;
    int *col_height;
-   int off_x;
+   int offset_x;
 
    n_children = eina_list_count(priv->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_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;
-   remain_x = w - (off_x + max_w);
+   remain_x = w - (offset_x + max_w);
 
    if (remain_x > 0)
      {

diff --git a/legacy/evas/src/lib/canvas/evas_rectangle.c b/legacy/evas/src/lib/canvas/evas_rectangle.c
index 217acc5f68965181f41112890f1adbf86a973bc8..da6b701625110fb2a8fdba9e813cebde9932b6c4 100644 (file)
--- a/legacy/evas/src/lib/canvas/evas_rectangle.c
+++ b/legacy/evas/src/lib/canvas/evas_rectangle.c
@@ -11,47 +11,47 @@ evas_rects_return_difference_rects(Eina_Array *rects, int x, int y, int w, int h
      }
    else
      {
-       int x1[4], y1[4], i, j;
+       int pt_x[4], pt_y[4], i, j;
 
        if (x < xx)
          {
-            x1[0] = x;
-            x1[1] = xx;
+            pt_x[0] = x;
+            pt_x[1] = xx;
          }
        else
          {
-            x1[0] = xx;
-            x1[1] = x;
+            pt_x[0] = xx;
+            pt_x[1] = x;
          }
        if ((x + w) < (xx + ww))
          {
-            x1[2] = x + w;
-            x1[3] = xx + ww;
+            pt_x[2] = x + w;
+            pt_x[3] = xx + ww;
          }
        else
          {
-            x1[2] = xx + ww;
-            x1[3] = x + w;
+            pt_x[2] = xx + ww;
+            pt_x[3] = x + w;
          }
        if (y < yy)
          {
-            y1[0] = y;
-            y1[1] = yy;
+            pt_y[0] = y;
+            pt_y[1] = yy;
          }
        else
          {
-            y1[0] = yy;
-            y1[1] = y;
+            pt_y[0] = yy;
+            pt_y[1] = y;
          }
        if ((y + h) < (yy + hh))
          {
-            y1[2] = y + h;
-            y1[3] = yy + hh;
+            pt_y[2] = y + h;
+            pt_y[3] = yy + hh;
          }
        else
          {
-            y1[2] = yy + hh;
-            y1[3] = y + h;
+            pt_y[2] = yy + hh;
+            pt_y[3] = y + h;
          }
        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 tx, ty, tw, th;
 
-                 tx = x1[i];
-                 ty = y1[j];
-                 tw = x1[i + 1] - x1[i];
-                 th = y1[j + 1] - y1[j];
+                 tx = pt_x[i];
+                 ty = pt_y[j];
+                 tw = pt_x[i + 1] - pt_x[i];
+                 th = pt_y[j + 1] - pt_y[j];
 
                  intsec1 = (RECTS_INTERSECT(tx, ty, tw, th, x, y, w, h));
                  intsec2 = (RECTS_INTERSECT(tx, ty, tw, th, xx, yy, ww, hh));

diff --git a/legacy/evas/src/lib/canvas/evas_render.c b/legacy/evas/src/lib/canvas/evas_render.c
index 6beac80eec177c31965736a00495e2e09f845e49..e20ec12e97bf723588920b4b8571dbbffd0c8654 100644 (file)
--- a/legacy/evas/src/lib/canvas/evas_render.c
+++ b/legacy/evas/src/lib/canvas/evas_render.c
@@ -744,27 +744,27 @@ evas_render_mapped(Evas *e, Evas_Object *obj, void *context, void *surface,
           }
         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) &&
-                      !evas_object_was_visible(obj2))
+                  if (!evas_object_is_visible(o2) &&
+                      !evas_object_was_visible(o2))
                     {
-                       obj2->changed = 0;
-                       obj2->changed_move_only = 0;
-                       obj2->changed_nomove = 0;
-                       obj2->changed_move = 0;
+                       o2->changed = 0;
+                       o2->changed_move_only = 0;
+                       o2->changed_nomove = 0;
+                       o2->changed_move = 0;
                        continue;
                     }
-                  if (obj2->changed)
+                  if (o2->changed)
                     {
-//                       chlist(obj2, 0);
+//                       chlist(o2, 0);
                        changed = 1;
-                       obj2->changed = 0;
-                       obj2->changed_move_only = 0;
-                       obj2->changed_nomove = 0;
-                       obj2->changed_move = 0;
+                       o2->changed = 0;
+                       o2->changed_move_only = 0;
+                       o2->changed_nomove = 0;
+                       o2->changed_move = 0;
                        break;
                     }
                }