englebass pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=3433c1449e69bcc3701dd1ca204d5d4d2ba3853e

commit 3433c1449e69bcc3701dd1ca204d5d4d2ba3853e
Author: Sebastian Dransfeld <[email protected]>
Date:   Mon May 11 12:21:54 2015 +0200

    edje: rename variable
    
    Give variable a name which better describes its purpose.
---
 src/lib/edje/edje_calc.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 58f7633..31cfbd0 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -566,7 +566,7 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, 
const char *d1, doubl
 {
    Edje_Part_Description_Common *epd1;
    Edje_Part_Description_Common *epd2 = NULL;
-   Edje_Part_Description_Common *chosen_desc;
+   Edje_Part_Description_Common *last_desc;
    Eina_Bool change_w, change_h;
    Edje_Part_Description_Image *epdi;
 
@@ -624,13 +624,13 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part 
*ep, const char *d1, doubl
           ep->param2 = NULL;
        }
 
-   chosen_desc = ep->chosen_description;
+   last_desc = ep->chosen_description;
    ep->param1.description = epd1;
    ep->chosen_description = epd1;
-   if (chosen_desc)
+   if (last_desc)
      {
-        change_w = ep->chosen_description->fixed.w != chosen_desc->fixed.w;
-        change_h = ep->chosen_description->fixed.h != chosen_desc->fixed.h;
+        change_w = ep->chosen_description->fixed.w != last_desc->fixed.w;
+        change_h = ep->chosen_description->fixed.h != last_desc->fixed.h;
      }
    _edje_real_part_rel_to_apply(ed, ep, &ep->param1);
 
@@ -644,18 +644,18 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part 
*ep, const char *d1, doubl
           ep->chosen_description = epd2;
      }
 
-   if (chosen_desc != ep->chosen_description)
+   if (last_desc != ep->chosen_description)
      {
         if (ep->part->type == EDJE_PART_TYPE_EXTERNAL)
-          _edje_external_recalc_apply(ed, ep, NULL, chosen_desc);
-        else if ((chosen_desc) && (ep->part->type == EDJE_PART_TYPE_GROUP))
+          _edje_external_recalc_apply(ed, ep, NULL, last_desc);
+        else if ((last_desc) && (ep->part->type == EDJE_PART_TYPE_GROUP))
           {
              Edje_Size *min, *max, *pmin, *pmax;
 
              min = &ep->chosen_description->min;
              max = &ep->chosen_description->max;
-             pmin = &chosen_desc->min;
-             pmax = &chosen_desc->max;
+             pmin = &last_desc->min;
+             pmax = &last_desc->max;
              if (change_w || change_h ||
                 (((pmin->w == pmax->w) && (pmin->h == pmax->h) && (pmin->w > 
0) && (pmin->h > 0)) &&
                 (((min->w != max->w) || (min->h != max->h) || (min->w <= 0) || 
(min->h <= 0)))))

-- 


Reply via email to