elementary: make del_pre not return a bool and force rely on Eo ref counting.

Differential Revision: https://phab.enlightenment.org/D6071

diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index 4995f0a..13fbfaf 100644 (file)
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -4350,17 +4350,14 @@ _elm_widget_item_efl_object_del(const Eo *eo_item, Elm_Widget_Item_Data *item)
    item->on_deletion = EINA_TRUE;
 
    //Widget item delete callback
-   Eina_Bool del_ok;
-   del_ok = elm_wdg_item_del_pre(item->eo_obj);
-   if (del_ok)
-      efl_parent_set((Eo*)eo_item, NULL);
+   elm_wdg_item_del_pre(item->eo_obj);
+   efl_parent_set((Eo*)eo_item, NULL);
    return;
 }
 
-EOLIAN static Eina_Bool
+EOLIAN static void
 _elm_widget_item_del_pre(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item EINA_UNUSED)
 {
-   return EINA_TRUE;
 }
 
 /**

diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index 2a7d935..24ad3d1 100644 (file)
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -864,12 +864,12 @@ _elm_ctxpopup_item_elm_widget_item_disable(Eo *eo_ctxpopup_it,
      (ctxpopup_it->list_item, elm_wdg_item_disabled_get(eo_ctxpopup_it));
 }
 
-EOLIAN static Eina_Bool
+EOLIAN static void
 _elm_ctxpopup_item_elm_widget_item_del_pre(Eo *eo_ctxpopup_it EINA_UNUSED,
                                            Elm_Ctxpopup_Item_Data *ctxpopup_it)
 {
    ELM_CTXPOPUP_DATA_GET(WIDGET(ctxpopup_it), sd);
-   if (!sd) return EINA_FALSE;
+   if (!sd) return ;
 
    if (ctxpopup_it->list_item)
      {
@@ -878,7 +878,7 @@ _elm_ctxpopup_item_elm_widget_item_del_pre(Eo *eo_ctxpopup_it EINA_UNUSED,
         ctxpopup_it->list_item = NULL;
      }
 
-   return EINA_TRUE;
+   return ;
 }
 
 EOLIAN static void

diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index d62be2e..db56784 100644 (file)
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -3919,11 +3919,10 @@ _elm_gengrid_item_elm_widget_item_disable(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *i
      }
 }
 
-EOLIAN static Eina_Bool
+EOLIAN static void
 _elm_gengrid_item_elm_widget_item_del_pre(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it)
 {
    _item_del(it);
-   return EINA_TRUE;
 }
 
 EOLIAN static Evas_Object *

diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 45f58bf..1a3e600 100644 (file)
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -6264,7 +6264,7 @@ _elm_genlist_item_elm_widget_item_disable(Eo *eo_it, Elm_Gen_Item *it)
      }
 }
 
-EOLIAN static Eina_Bool
+EOLIAN static void
 _elm_genlist_item_elm_widget_item_del_pre(Eo *eo_it EINA_UNUSED,
                                           Elm_Gen_Item *it)
 {
@@ -6276,7 +6276,6 @@ _elm_genlist_item_elm_widget_item_del_pre(Eo *eo_it EINA_UNUSED,
      efl_access_children_changed_del_signal_emit(WIDGET(it),eo_it);
 
    _item_del(it);
-   return EINA_TRUE;
 }
 
 EOLIAN static void

diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index af29e21..e292fdb 100644 (file)
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -82,7 +82,7 @@ static Eina_Bool _key_action_move(Evas_Object *obj, const char *params);
 static Eina_Bool _key_action_select(Evas_Object *obj, const char *params);
 static Eina_Bool _key_action_escape(Evas_Object *obj, const char *params);
 
-EOLIAN static Eina_Bool _elm_list_item_elm_widget_item_del_pre(Eo *eo_item EINA_UNUSED, Elm_List_Item_Data *item);
+EOLIAN static void _elm_list_item_elm_widget_item_del_pre(Eo *eo_item EINA_UNUSED, Elm_List_Item_Data *item);
 static const Elm_Action key_actions[] = {
    {"move", _key_action_move},
    {"select", _key_action_select},
@@ -2070,7 +2070,7 @@ _elm_list_item_elm_widget_item_part_text_get(const Eo *eo_it, Elm_List_Item_Data
  2. elm_widget_item_del() should be called instead of the combination of
  _elm_list_item_free() + elm_widget_item_free()
  */
-EOLIAN static Eina_Bool
+EOLIAN static void
 _elm_list_item_elm_widget_item_del_pre(Eo *eo_item, Elm_List_Item_Data *item)
 {
    Evas_Object *obj = WIDGET(item);
@@ -2085,11 +2085,11 @@ _elm_list_item_elm_widget_item_del_pre(Eo *eo_item, Elm_List_Item_Data *item)
 
    if (sd->walking > 0)
      {
-        if (item->deleted) return EINA_FALSE;
+        if (item->deleted) return ;
         item->deleted = EINA_TRUE;
         efl_ref(eo_item);
         sd->to_delete = eina_list_append(sd->to_delete, item);
-        return EINA_FALSE;
+        return ;
      }
 
    sd->items = eina_list_remove_list(sd->items, item->node);
@@ -2101,8 +2101,6 @@ _elm_list_item_elm_widget_item_del_pre(Eo *eo_item, Elm_List_Item_Data *item)
 
    _elm_list_unwalk(obj, sd);
    evas_object_unref(obj);
-
-   return EINA_TRUE;
 }
 
 EOLIAN static void _elm_list_item_elm_widget_item_signal_emit(Eo *eo_it EINA_UNUSED, Elm_List_Item_Data *it,

diff --git a/src/lib/elementary/elm_widget_item.eo b/src/lib/elementary/elm_widget_item.eo
index 18afa78..1f2f6e8 100644 (file)
--- a/src/lib/elementary/elm_widget_item.eo
+++ b/src/lib/elementary/elm_widget_item.eo
@@ -498,7 +498,6 @@ class Elm.Widget.Item(Efl.Object, Efl.Access.Object,
            del_pre @protected {
               [[Delete pre widget item]]
                 legacy: null;
-                return: bool; [[$true on success, $false otherwise]]
            }
            focus_next_object_get @const {
                 [[Get the next object with specific focus direction.