discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5263f311f4557809662d9dc6f702ebfa0ad3ba83
commit 5263f311f4557809662d9dc6f702ebfa0ad3ba83 Author: Mike Blumenkrantz <[email protected]> Date: Wed Feb 14 21:14:52 2018 -0500 efl_widget_item: remove 'del' this now uses regular efl_del --- src/lib/elementary/efl_ui_multibuttonentry.c | 6 +++--- src/lib/elementary/efl_ui_multibuttonentry.eo | 8 ++++---- src/lib/elementary/efl_ui_widget.c | 4 ++-- src/lib/elementary/elc_ctxpopup.c | 2 +- src/lib/elementary/elc_fileselector.c | 2 +- src/lib/elementary/elc_hoversel.c | 2 +- src/lib/elementary/elc_naviframe.c | 12 ++++++------ src/lib/elementary/elc_popup.c | 2 +- src/lib/elementary/elm_flipselector.c | 2 +- src/lib/elementary/elm_genlist.c | 4 ++-- src/lib/elementary/elm_index.c | 6 +++--- src/lib/elementary/elm_main.c | 6 ++++++ src/lib/elementary/elm_menu.c | 4 ++-- src/lib/elementary/elm_object_item.h | 6 ++++++ src/lib/elementary/elm_segment_control.c | 2 +- src/lib/elementary/elm_toolbar.c | 6 +++--- src/lib/elementary/elm_widget_item.eo | 4 +--- 17 files changed, 44 insertions(+), 34 deletions(-) diff --git a/src/lib/elementary/efl_ui_multibuttonentry.c b/src/lib/elementary/efl_ui_multibuttonentry.c index d276ba9062..59784f9e10 100644 --- a/src/lib/elementary/efl_ui_multibuttonentry.c +++ b/src/lib/elementary/efl_ui_multibuttonentry.c @@ -515,7 +515,7 @@ _on_item_deleted(void *data, ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_temp_it, temp_it); if (VIEW(temp_it) == obj) { - elm_wdg_item_del(eo_temp_it); + efl_del(eo_temp_it); break; } } @@ -1097,7 +1097,7 @@ _layout_key_down_cb(void *data, Elm_Multibuttonentry_Item_Data *item = sd->selected_it; if (item && sd->editable) { - elm_wdg_item_del(EO_OBJ(item)); + efl_del(EO_OBJ(item)); elm_object_focus_set(sd->entry, EINA_TRUE); } } @@ -1808,7 +1808,7 @@ EOLIAN static void _efl_ui_multibuttonentry_clear(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd) { while (sd->items) - elm_wdg_item_del(eina_list_data_get(sd->items)); + efl_del(eina_list_data_get(sd->items)); sd->selected_it = NULL; _view_update(sd); diff --git a/src/lib/elementary/efl_ui_multibuttonentry.eo b/src/lib/elementary/efl_ui_multibuttonentry.eo index 552b191eca..31a952fc02 100644 --- a/src/lib/elementary/efl_ui_multibuttonentry.eo +++ b/src/lib/elementary/efl_ui_multibuttonentry.eo @@ -70,7 +70,7 @@ class Efl.Ui.Multibuttonentry (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Format) item_prepend { [[Prepend a new item to the multibuttonentry - See @Elm.Widget.Item.del to delete the item.]] + See @Efl.Object.del to delete the item.]] return: Elm.Widget.Item; [[A handle to the item added or NULL if not possible]] params { @@ -97,7 +97,7 @@ class Efl.Ui.Multibuttonentry (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Format) item_insert_before { [[Add a new item to the multibuttonentry before the indicated object reference. - See @Elm.Widget.Item.del to delete the item.]] + See @Efl.Object.del to delete the item.]] return: Elm.Widget.Item; [[A handle to the item added or NULL if not possible]] params { @@ -110,7 +110,7 @@ class Efl.Ui.Multibuttonentry (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Format) item_append { [[Append a new item to the multibuttonentry - See @Elm.Widget.Item.del to delete the item.]] + See @Efl.Object.del to delete the item.]] return: Elm.Widget.Item; [[A handle to the item added or NULL if not possible]] params { @@ -148,7 +148,7 @@ class Efl.Ui.Multibuttonentry (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Format) item_insert_after { [[Add a new item to the multibuttonentry after the indicated object - See @Elm.Widget.Item.del to delete the item.]] + See @Efl.Object.del to delete the item.]] return: Elm.Widget.Item; [[A handle to the item added or NULL if not possible]] params { diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c index 022825621f..a2c4614540 100644 --- a/src/lib/elementary/efl_ui_widget.c +++ b/src/lib/elementary/efl_ui_widget.c @@ -3996,7 +3996,7 @@ _elm_widget_item_efl_object_destructor(Eo *eo_item, Elm_Widget_Item_Data *item) * @ingroup Widget */ EOLIAN static void -_elm_widget_item_del(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item) +_elm_widget_item_efl_object_del(const Eo *eo_item, Elm_Widget_Item_Data *item) { ELM_WIDGET_ITEM_CHECK_OR_RETURN(item); ELM_WIDGET_ITEM_RETURN_IF_ONDEL(item); @@ -4006,7 +4006,7 @@ _elm_widget_item_del(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item) Eina_Bool del_ok; del_ok = elm_wdg_item_del_pre(item->eo_obj); if (del_ok) - efl_del(item->eo_obj); + efl_parent_set((Eo*)eo_item, NULL); return; } diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c index 5fc6ba39c4..35789d8fa2 100644 --- a/src/lib/elementary/elc_ctxpopup.c +++ b/src/lib/elementary/elc_ctxpopup.c @@ -867,7 +867,7 @@ _elm_ctxpopup_item_elm_widget_item_del_pre(Eo *eo_ctxpopup_it EINA_UNUSED, if (ctxpopup_it->list_item) { efl_unref(ctxpopup_it->list_item); - elm_wdg_item_del(ctxpopup_it->list_item); + efl_del(ctxpopup_it->list_item); ctxpopup_it->list_item = NULL; } diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c index d5d3d732cc..1b7c346f44 100644 --- a/src/lib/elementary/elc_fileselector.c +++ b/src/lib/elementary/elc_fileselector.c @@ -1820,7 +1820,7 @@ _resource_deleted(void *data, const Efl_Event *event) } } - if (it) elm_wdg_item_del(it); + if (it) efl_del(it); if (selected) { diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c index 2170c2110e..a922be558f 100644 --- a/src/lib/elementary/elc_hoversel.c +++ b/src/lib/elementary/elc_hoversel.c @@ -802,7 +802,7 @@ _elm_hoversel_clear(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd) EINA_LIST_FOREACH_SAFE(sd->items, l, ll, it) { - elm_wdg_item_del(it); + efl_del(it); } } diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c index 03ff37abe2..d05ad4701e 100644 --- a/src/lib/elementary/elc_naviframe.c +++ b/src/lib/elementary/elc_naviframe.c @@ -1182,7 +1182,7 @@ _on_item_pop_finished(void *data, elm_widget_tree_unfocusable_set(VIEW(it), EINA_FALSE); sd->popping = eina_list_remove(sd->popping, it); - elm_wdg_item_del(EO_OBJ(it)); + efl_del(EO_OBJ(it)); } /* "elm,state,new,pushed", @@ -1441,14 +1441,14 @@ _elm_naviframe_efl_canvas_group_group_del(Eo *obj, Elm_Naviframe_Data *sd) { it = EINA_INLIST_CONTAINER_GET(l, Elm_Naviframe_Item_Data); l = l->prev; - elm_wdg_item_del(EO_OBJ(it)); + efl_del(EO_OBJ(it)); } // No need to cleanup animator as it is an event on myself EINA_LIST_FREE(sd->ops, nfo) free(nfo); EINA_LIST_FREE(sd->popping, it) - elm_wdg_item_del(EO_OBJ(it)); + efl_del(EO_OBJ(it)); evas_object_del(sd->dummy_edje); @@ -1719,7 +1719,7 @@ _elm_naviframe_item_pop(Eo *obj, Elm_Naviframe_Data *sd) { efl_unref(eo_item); if (it->delete_me) - elm_wdg_item_del(eo_item); + efl_del(eo_item); else { /* To avoid multiple item pops, the auto pushed button deletes @@ -1783,7 +1783,7 @@ _elm_naviframe_item_pop(Eo *obj, Elm_Naviframe_Data *sd) _schedule_deferred(nfo, sd); } else - elm_wdg_item_del(eo_item); + efl_del(eo_item); on_error: return content; @@ -1811,7 +1811,7 @@ _elm_naviframe_item_pop_to(Eo *eo_it, Elm_Naviframe_Item_Data *it) l = l->prev; - elm_wdg_item_del(EO_OBJ(iit)); + efl_del(EO_OBJ(iit)); } sd->on_deletion = EINA_FALSE; diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index 9165ff3007..9920251437 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c @@ -216,7 +216,7 @@ _items_remove(Elm_Popup_Data *sd) if (!sd->items) return; EINA_LIST_FREE(sd->items, it) - elm_wdg_item_del(EO_OBJ(it)); + efl_del(EO_OBJ(it)); sd->items = NULL; } diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c index ac1cc717a0..0c592ee8b4 100644 --- a/src/lib/elementary/elm_flipselector.c +++ b/src/lib/elementary/elm_flipselector.c @@ -642,7 +642,7 @@ _elm_flipselector_efl_canvas_group_group_del(Eo *obj, Elm_Flipselector_Data *sd) if (sd->walking) ERR("flipselector deleted while walking.\n"); while (sd->items) - elm_wdg_item_del(DATA_GET(sd->items)); + efl_del(DATA_GET(sd->items)); ecore_timer_del(sd->spin); ecore_job_del(sd->view_update); diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index bc04f6dac9..4bba00ebca 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -1132,7 +1132,7 @@ _item_sub_items_clear(Elm_Gen_Item *it) EINA_LIST_FOREACH(it->item->items, l, eo_it2) tl = eina_list_append(tl, eo_it2); EINA_LIST_FREE(tl, eo_it2) - elm_wdg_item_del(eo_it2); + efl_del(eo_it2); } static void @@ -5870,7 +5870,7 @@ _internal_elm_genlist_clear(Evas_Object *obj) while (sd->items) { it = EINA_INLIST_CONTAINER_GET(sd->items->last, Elm_Gen_Item); - elm_wdg_item_del(EO_OBJ(it)); + efl_del(EO_OBJ(it)); } sd->pan_changed = EINA_TRUE; diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c index cde542d58a..af86e2b116 100644 --- a/src/lib/elementary/elm_index.c +++ b/src/lib/elementary/elm_index.c @@ -1122,7 +1122,7 @@ _elm_index_efl_canvas_group_group_del(Eo *obj, Elm_Index_Data *sd) Elm_Index_Omit *o; while (sd->items) - elm_wdg_item_del(sd->items->data); + efl_del(sd->items->data); EINA_LIST_FREE(sd->omit, o) free(o); @@ -1471,7 +1471,7 @@ _elm_index_item_sorted_insert(Eo *obj, Elm_Index_Data *sd, const char *letter, E const void *item_data = WIDGET_ITEM_DATA_GET(eo_item); if (cmp_data_func(WIDGET_ITEM_DATA_GET(eo_p_it), item_data) >= 0) WIDGET_ITEM_DATA_SET(eo_p_it, item_data); - elm_wdg_item_del(eo_item); + efl_del(eo_item); return NULL; } } @@ -1508,7 +1508,7 @@ _elm_index_item_clear(Eo *obj, Elm_Index_Data *sd) clear = eina_list_append(clear, eo_item); } EINA_LIST_FREE(clear, eo_item) - elm_wdg_item_del(eo_item); + efl_del(eo_item); } EOLIAN static void diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c index f588c1e95e..2c3777617d 100644 --- a/src/lib/elementary/elm_main.c +++ b/src/lib/elementary/elm_main.c @@ -2050,3 +2050,9 @@ elm_object_focus_region_show_mode_get(const Evas_Object *obj) { return elm_widget_focus_region_show_mode_get(obj); } + +EAPI void +elm_object_item_del(Eo *obj) +{ + efl_del(obj); +} diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c index db01aef4c3..3c670162d2 100644 --- a/src/lib/elementary/elm_menu.c +++ b/src/lib/elementary/elm_menu.c @@ -853,7 +853,7 @@ _elm_menu_efl_object_destructor(Eo *obj, Elm_Menu_Data *sd) Eina_List *itr, *itr2; Elm_Object_Item *eo_item; EINA_LIST_FOREACH_SAFE(sd->items, itr, itr2, eo_item) - elm_wdg_item_del(eo_item); + efl_del(eo_item); efl_destructor(efl_super(obj, MY_CLASS)); } @@ -1262,7 +1262,7 @@ _elm_menu_item_subitems_clear(Eo *eo_item EINA_UNUSED, Elm_Menu_Item_Data *it) EINA_LIST_FOREACH_SAFE(it->submenu.items, l, l_next, sub_it) - elm_wdg_item_del(sub_it); + efl_del(sub_it); } EOLIAN static Eina_Iterator* diff --git a/src/lib/elementary/elm_object_item.h b/src/lib/elementary/elm_object_item.h index 0bda61e1b5..2956ff2278 100644 --- a/src/lib/elementary/elm_object_item.h +++ b/src/lib/elementary/elm_object_item.h @@ -78,3 +78,9 @@ EAPI void *elm_object_item_data_get(const Elm_Object_Item *it); * @ingroup Elm_General */ EAPI void elm_object_item_data_set(Elm_Object_Item *it, void *data); + +/** Delete the given item. + * + * @ingroup Elm_General + */ +EAPI void elm_object_item_del(Elm_Object_Item *obj); diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c index 31cecb00c3..8d05a9b1c0 100644 --- a/src/lib/elementary/elm_segment_control.c +++ b/src/lib/elementary/elm_segment_control.c @@ -730,7 +730,7 @@ _elm_segment_control_item_del_at(Eo *obj, Elm_Segment_Control_Data *_pd EINA_UNU it = _item_find(obj, idx); if (!it) return; - elm_wdg_item_del(EO_OBJ(it)); + efl_del(EO_OBJ(it)); } EOLIAN static const char* diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index 313ccf78a1..009fac295b 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -2828,10 +2828,10 @@ _elm_toolbar_efl_canvas_group_group_del(Eo *obj, Elm_Toolbar_Data *sd) while (it) { next = ELM_TOOLBAR_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next); - elm_wdg_item_del(EO_OBJ(it)); + efl_del(EO_OBJ(it)); it = next; } - if (sd->more_item) elm_wdg_item_del(EO_OBJ(sd->more_item)); + if (sd->more_item) efl_del(EO_OBJ(sd->more_item)); ecore_timer_del(sd->long_timer); efl_canvas_group_del(efl_super(obj, MY_CLASS)); @@ -3356,7 +3356,7 @@ _elm_toolbar_shrink_mode_set(Eo *obj, Elm_Toolbar_Data *sd, Elm_Toolbar_Shrink_M if (sd->more_item) { - elm_wdg_item_del(EO_OBJ(sd->more_item)); + efl_del(EO_OBJ(sd->more_item)); sd->more_item = NULL; } diff --git a/src/lib/elementary/elm_widget_item.eo b/src/lib/elementary/elm_widget_item.eo index 9cf66386bb..ec8181cdab 100644 --- a/src/lib/elementary/elm_widget_item.eo +++ b/src/lib/elementary/elm_widget_item.eo @@ -211,9 +211,6 @@ class Elm.Widget.Item(Efl.Object, Efl.Access, Note: Every elm_object_item supports this API]] return: Efl.Canvas.Object; [[The widget object]] } - del { - [[Delete the given item.]] - } pre_notify_del @protected { [[notify deletion of widget item]] legacy: null; @@ -540,6 +537,7 @@ class Elm.Widget.Item(Efl.Object, Efl.Access, implements { Efl.Object.constructor; Efl.Object.destructor; + Efl.Object.del; Efl.Access.state_set { get; } Efl.Access.attributes { get; } Efl.Access.Component.extents { get; set; } --
