edje - use Eina_Bool.

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 2f9f1d2..017c199 100644 (file)
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -131,7 +131,7 @@ _edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, FLOAT_T pos, FLOAT_T
    ed->dirty = EINA_TRUE;
    ed->recalc_call = EINA_TRUE;
 #ifdef EDJE_CALC_CACHE
-   ep->invalidate = 1;
+   ep->invalidate = EINA_TRUE;
 #endif
 }
 
@@ -607,7 +607,7 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, const char *d1, doubl
    ed->dirty = EINA_TRUE;
    ed->recalc_call = EINA_TRUE;
 #ifdef EDJE_CALC_CACHE
-   ep->invalidate = 1;
+   ep->invalidate = EINA_TRUE;
 #endif
 }
 
@@ -846,7 +846,7 @@ _edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y)
      }
 
 #ifdef EDJE_CALC_CACHE
-   ep->invalidate = 1;
+   ep->invalidate = EINA_TRUE;
 #endif
    _edje_recalc(ed); /* won't do anything if dirty flag isn't set */
 }
@@ -3969,7 +3969,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
    if (ep->calculated == FLAG_XY)
      {
         ep->state = ed->state;
-        ep->invalidate = 0;
+        ep->invalidate = EINA_FALSE;
      }
 #else
    eina_cow_free(_edje_calc_params_map_cow, (const Eina_Cow_Data **) &lp1.map);

diff --git a/src/lib/edje/edje_callbacks.c b/src/lib/edje/edje_callbacks.c
index 9a508c7..5ea7efb 100644 (file)
--- a/src/lib/edje/edje_callbacks.c
+++ b/src/lib/edje/edje_callbacks.c
@@ -151,7 +151,7 @@ _edje_mouse_down_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc
      {
        rp->clicked_button = ev->button;
         if (!(ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD))
-         rp->still_in = 1;
+         rp->still_in = EINA_TRUE;
      }
 //   _edje_recalc_do(ed);
    _edje_thaw(ed);
@@ -209,7 +209,7 @@ _edje_mouse_up_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc E
                   ed->recalc_call = EINA_TRUE;
                  ed->dirty = EINA_TRUE;
 #ifdef EDJE_CALC_CACHE
-                 rp->invalidate = 1;
+                 rp->invalidate = EINA_TRUE;
 #endif
                  if (!ignored && rp->drag->started)
                    _edje_emit(ed, "drag,stop", rp->part->name);
@@ -225,7 +225,7 @@ _edje_mouse_up_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc E
        _edje_emit(ed, buf, rp->part->name);
      }
    rp->clicked_button = 0;
-   rp->still_in = 0;
+   rp->still_in = EINA_FALSE;
 
 //   _edje_recalc_do(ed);
    _edje_thaw(ed);
@@ -262,7 +262,7 @@ _edje_mouse_move_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc
      {
 
         if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
-          rp->still_in = 0;
+          rp->still_in = EINA_FALSE;
         else
           {
             Evas_Coord x, y, w, h;
@@ -270,7 +270,7 @@ _edje_mouse_move_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc
             evas_object_geometry_get(obj, &x, &y, &w, &h);
             if ((ev->cur.canvas.x < x) || (ev->cur.canvas.y < y) ||
                 (ev->cur.canvas.x >= (x + w)) || (ev->cur.canvas.y >= (y + h)))
-              rp->still_in = 0;
+              rp->still_in = EINA_FALSE;
           }
      }
    else
@@ -282,7 +282,7 @@ _edje_mouse_move_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc
             evas_object_geometry_get(obj, &x, &y, &w, &h);
             if ((ev->cur.canvas.x >= x) && (ev->cur.canvas.y >= y) &&
                 (ev->cur.canvas.x < (x + w)) && (ev->cur.canvas.y < (y + h)))
-              rp->still_in = 1;
+              rp->still_in = EINA_TRUE;
           }
      }
    _edje_freeze(ed);
@@ -297,7 +297,7 @@ _edje_mouse_move_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc
              ed->recalc_call = EINA_TRUE;
             ed->dirty = EINA_TRUE;
 #ifdef EDJE_CALC_CACHE
-            rp->invalidate = 1;
+            rp->invalidate = EINA_TRUE;
 #endif
          }
        _edje_recalc_do(ed);
@@ -321,7 +321,7 @@ _edje_mouse_move_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc
                   ed->recalc_call = EINA_TRUE;
                  ed->dirty = EINA_TRUE;
 #ifdef EDJE_CALC_CACHE
-                 rp->invalidate = 1;
+                 rp->invalidate = EINA_TRUE;
 #endif
                  _edje_recalc_do(ed);
               }

diff --git a/src/lib/edje/edje_embryo.c b/src/lib/edje/edje_embryo.c
index b9686af..a57fd99 100644 (file)
--- a/src/lib/edje/edje_embryo.c
+++ b/src/lib/edje/edje_embryo.c
@@ -2408,7 +2408,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
      }
 
 #ifdef EDJE_CALC_CACHE
-   rp->invalidate = 1;
+   rp->invalidate = EINA_TRUE;
 #endif
    ed->dirty = EINA_TRUE;
    return 0;

diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 7fc53fb..b6e0db9 100644 (file)
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -1590,9 +1590,9 @@ struct _Edje_Real_Part
    unsigned char             type; // 1
    unsigned char             calculated : 2; // 1
    unsigned char             calculating : 2; // 0
-   unsigned char             still_in   : 1; // 0
+   Eina_Bool                 still_in   : 1; // 0
 #ifdef EDJE_CALC_CACHE
-   unsigned char             invalidate : 1; // 0
+   Eina_Bool                 invalidate : 1; // 0
 #endif
 }; // 128
 // WITH EDJE_CALC_CACHE: 407

diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c
index 69acfba..3608a4e 100644 (file)
--- a/src/lib/edje/edje_program.c
+++ b/src/lib/edje/edje_program.c
@@ -1728,7 +1728,7 @@ _edje_param_native_set(Edje *ed, Edje_Real_Part *rp, const char *name, const Edj
                   if (rp->drag->val.x == FROM_DOUBLE(d)) return EINA_TRUE;
                   rp->drag->val.x = FROM_DOUBLE(d);
 #ifdef EDJE_CALC_CACHE
-                  rp->invalidate = 1;
+                  rp->invalidate = EINA_TRUE;
 #endif
                   _edje_dragable_pos_set
                      (ed, rp, rp->drag->val.x, rp->drag->val.y);
@@ -1747,7 +1747,7 @@ _edje_param_native_set(Edje *ed, Edje_Real_Part *rp, const char *name, const Edj
                   if (rp->drag->val.y == FROM_DOUBLE(d)) return EINA_TRUE;
                   rp->drag->val.y = FROM_DOUBLE(d);
 #ifdef EDJE_CALC_CACHE
-                  rp->invalidate = 1;
+                  rp->invalidate = EINA_TRUE;
 #endif
                   _edje_dragable_pos_set
                      (ed, rp, rp->drag->val.x, rp->drag->val.y);
@@ -1763,7 +1763,7 @@ _edje_param_native_set(Edje *ed, Edje_Real_Part *rp, const char *name, const Edj
                   ed->recalc_call = EINA_TRUE;
                   ed->dirty = EINA_TRUE;
 #ifdef EDJE_CALC_CACHE
-                  rp->invalidate = 1;
+                  rp->invalidate = EINA_TRUE;
 #endif
                   _edje_recalc(ed);
                   return EINA_TRUE;
@@ -1776,7 +1776,7 @@ _edje_param_native_set(Edje *ed, Edje_Real_Part *rp, const char *name, const Edj
                   ed->recalc_call = EINA_TRUE;
                   ed->dirty = EINA_TRUE;
 #ifdef EDJE_CALC_CACHE
-                  rp->invalidate = 1;
+                  rp->invalidate = EINA_TRUE;
 #endif
                   _edje_recalc(ed);
                   return EINA_TRUE;
@@ -1788,7 +1788,7 @@ _edje_param_native_set(Edje *ed, Edje_Real_Part *rp, const char *name, const Edj
                     return EINA_FALSE;
                   rp->drag->step.x = FROM_DOUBLE(CLAMP(param->d, 0.0, 1.0));
 #ifdef EDJE_CALC_CACHE
-                  rp->invalidate = 1;
+                  rp->invalidate = EINA_TRUE;
 #endif
                   return EINA_TRUE;
                }
@@ -1798,7 +1798,7 @@ _edje_param_native_set(Edje *ed, Edje_Real_Part *rp, const char *name, const Edj
                     return EINA_FALSE;
                   rp->drag->step.y = FROM_DOUBLE(CLAMP(param->d, 0.0, 1.0));
 #ifdef EDJE_CALC_CACHE
-                  rp->invalidate = 1;
+                  rp->invalidate = EINA_TRUE;
 #endif
                   return EINA_TRUE;
                }
@@ -1809,7 +1809,7 @@ _edje_param_native_set(Edje *ed, Edje_Real_Part *rp, const char *name, const Edj
                     return EINA_FALSE;
                   rp->drag->page.x = FROM_DOUBLE(CLAMP(param->d, 0.0, 1.0));
 #ifdef EDJE_CALC_CACHE
-                  rp->invalidate = 1;
+                  rp->invalidate = EINA_TRUE;
 #endif
                   return EINA_TRUE;
                }
@@ -1819,7 +1819,7 @@ _edje_param_native_set(Edje *ed, Edje_Real_Part *rp, const char *name, const Edj
                     return EINA_FALSE;
                   rp->drag->page.y = FROM_DOUBLE(CLAMP(param->d, 0.0, 1.0));
 #ifdef EDJE_CALC_CACHE
-                  rp->invalidate = 1;
+                  rp->invalidate = EINA_TRUE;
 #endif
                   return EINA_TRUE;
                }

diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 08182f6..d161f15 100644 (file)
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -105,7 +105,7 @@ _edje_user_definition_free(Edje_User_Defined *eud)
               eud->ed->dirty = EINA_TRUE;
               eud->ed->recalc_call = EINA_TRUE;
 #ifdef EDJE_CALC_CACHE
-              rp->invalidate = 1;
+              rp->invalidate = EINA_TRUE;
 #endif
               _edje_recalc_do(eud->ed);
            }
@@ -1287,7 +1287,7 @@ _edje_object_part_text_raw_set(Edje *ed, Evas_Object *obj, Edje_Real_Part *rp, c
    ed->recalc_call = EINA_TRUE;
    ed->recalc_hints = EINA_TRUE;
 #ifdef EDJE_CALC_CACHE
-   rp->invalidate = 1;
+   rp->invalidate = EINA_TRUE;
 #endif
    _edje_recalc(ed);
    if (ed->text_change.func)
@@ -1324,7 +1324,7 @@ _edje_object_part_text_raw_append(Edje *ed, Evas_Object *obj, Edje_Real_Part *rp
    ed->dirty = EINA_TRUE;
    ed->recalc_call = 1;
 #ifdef EDJE_CALC_CACHE
-   rp->invalidate = 1;
+   rp->invalidate = EINA_TRUE;
 #endif
    _edje_recalc(ed);
    if (ed->text_change.func)
@@ -1360,7 +1360,7 @@ _part_text_style_user_push(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    evas_textblock_style_free(ts);
    ed->recalc_hints = EINA_TRUE;
 #ifdef EDJE_CALC_CACHE
-   rp->invalidate = 1;
+   rp->invalidate = EINA_TRUE;
 #endif
    _edje_recalc(ed);
 }
@@ -1387,7 +1387,7 @@ _part_text_style_user_pop(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    evas_object_textblock_style_user_pop(rp->object);
    ed->recalc_hints = EINA_TRUE;
 #ifdef EDJE_CALC_CACHE
-   rp->invalidate = 1;
+   rp->invalidate = EINA_TRUE;
 #endif
    _edje_recalc(ed);
 }
@@ -1905,7 +1905,7 @@ _part_text_insert(Eo *obj, void *_pd, va_list *list)
    ed->recalc_call = EINA_TRUE;
    ed->recalc_hints = EINA_TRUE;
 #ifdef EDJE_CALC_CACHE
-   rp->invalidate = 1;
+   rp->invalidate = EINA_TRUE;
 #endif
    _edje_recalc(ed);
    if (ed->text_change.func)
@@ -1936,7 +1936,7 @@ _part_text_append(Eo *obj, void *_pd, va_list *list)
    ed->recalc_call = EINA_TRUE;
    ed->recalc_hints = EINA_TRUE;
 #ifdef EDJE_CALC_CACHE
-   rp->invalidate = 1;
+   rp->invalidate = EINA_TRUE;
 #endif
    _edje_recalc(ed);
    if (ed->text_change.func)
@@ -3759,7 +3759,7 @@ _part_unswallow(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
         ed->dirty = EINA_TRUE;
         ed->recalc_call = EINA_TRUE;
 #ifdef EDJE_CALC_CACHE
-        rp->invalidate = 1;
+        rp->invalidate = EINA_TRUE;
 #endif
         _edje_recalc_do(ed);
         return;
@@ -4288,7 +4288,7 @@ _part_drag_value_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    rp->drag->val.x = FROM_DOUBLE(dx);
    rp->drag->val.y = FROM_DOUBLE(dy);
 #ifdef EDJE_CALC_CACHE
-   rp->invalidate = 1;
+   rp->invalidate = EINA_TRUE;
 #endif
    _edje_dragable_pos_set(ed, rp, rp->drag->val.x, rp->drag->val.y);
    _edje_emit(ed, "drag,set", rp->part->name);
@@ -4401,7 +4401,7 @@ _part_drag_size_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    ed->dirty = EINA_TRUE;
    ed->recalc_call = EINA_TRUE;
 #ifdef EDJE_CALC_CACHE
-   rp->invalidate = 1;
+   rp->invalidate = EINA_TRUE;
 #endif
    _edje_recalc(ed);
    if (ret) *ret = EINA_TRUE;
@@ -4500,7 +4500,7 @@ _part_drag_step_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    rp->drag->step.x = FROM_DOUBLE(dx);
    rp->drag->step.y = FROM_DOUBLE(dy);
 #ifdef EDJE_CALC_CACHE
-   rp->invalidate = 1;
+   rp->invalidate = EINA_TRUE;
 #endif
    if (ret) *ret = EINA_TRUE;
 }
@@ -4598,7 +4598,7 @@ _part_drag_page_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    rp->drag->page.x = FROM_DOUBLE(dx);
    rp->drag->page.y = FROM_DOUBLE(dy);
 #ifdef EDJE_CALC_CACHE
-   rp->invalidate = 1;
+   rp->invalidate = EINA_TRUE;
 #endif
    if (ret) *ret = EINA_TRUE;
 }
@@ -4705,7 +4705,7 @@ _part_drag_step(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
         return;
      }
 #ifdef EDJE_CALC_CACHE
-   rp->invalidate = 1;
+   rp->invalidate = EINA_TRUE;
 #endif
    _edje_dragable_pos_set(ed, rp, rp->drag->val.x, rp->drag->val.y);
    _edje_emit(ed, "drag,step", rp->part->name);
@@ -4770,7 +4770,7 @@ _part_drag_page(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
         return;
      }
 #ifdef EDJE_CALC_CACHE
-   rp->invalidate = 1;
+   rp->invalidate = EINA_TRUE;
 #endif
    _edje_dragable_pos_set(ed, rp, rp->drag->val.x, rp->drag->val.y);
    _edje_emit(ed, "drag,page", rp->part->name);
@@ -5141,7 +5141,7 @@ _edje_child_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *child, void *ei
    ed->dirty = EINA_TRUE;
    ed->recalc_call = EINA_TRUE;
 #ifdef EDJE_CALC_CACHE
-   rp->invalidate = 1;
+   rp->invalidate = EINA_TRUE;
 #endif
    _edje_recalc(ed);
 }
@@ -5155,7 +5155,7 @@ _edje_child_add(Edje *ed, Edje_Real_Part *rp, Evas_Object *child)
    ed->dirty = EINA_TRUE;
    ed->recalc_call = EINA_TRUE;
 #ifdef EDJE_CALC_CACHE
-   rp->invalidate = 1;
+   rp->invalidate = EINA_TRUE;
 #endif
    _edje_recalc(ed);
 }
@@ -5169,7 +5169,7 @@ _edje_child_remove(Edje *ed, Edje_Real_Part *rp, Evas_Object *child)
    ed->dirty = EINA_TRUE;
    ed->recalc_call = EINA_TRUE;
 #ifdef EDJE_CALC_CACHE
-   rp->invalidate = 1;
+   rp->invalidate = EINA_TRUE;
 #endif
    _edje_recalc(ed);
 }
@@ -6358,7 +6358,7 @@ _edje_real_part_swallow_hints_update(Edje_Real_Part *rp)
      }
 
 #ifdef EDJE_CALC_CACHE
-     rp->invalidate = 1;
+     rp->invalidate = EINA_TRUE;
 #endif
 }
 
@@ -6431,7 +6431,7 @@ _edje_real_part_swallow(Edje *ed,
           }
      }
 #ifdef EDJE_CALC_CACHE
-   rp->invalidate = 1;
+   rp->invalidate = EINA_TRUE;
 #endif
    if (!obj_swallow) return;
    rp->typedata.swallow->swallowed_object = obj_swallow;