bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e922d753b809ac12c7640e75f21c6c061952c594
commit e922d753b809ac12c7640e75f21c6c061952c594 Author: Marcel Hollerbach <marcel-hollerb...@t-online.de> Date: Mon Sep 25 17:52:46 2017 +0200 efl_ui_clock: remove old api! --- src/lib/elementary/efl_ui_clock.c | 64 -------------------------------------- src/lib/elementary/efl_ui_clock.eo | 2 -- 2 files changed, 66 deletions(-) diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c index 6ab8fd99e0..6a36883a20 100644 --- a/src/lib/elementary/efl_ui_clock.c +++ b/src/lib/elementary/efl_ui_clock.c @@ -417,42 +417,6 @@ _efl_ui_clock_efl_ui_translatable_translation_update(Eo *obj, Efl_Ui_Clock_Data efl_ui_translatable_translation_update(efl_super(obj, MY_CLASS)); } -static Eina_List * -_clock_items_get(const Evas_Object *obj) -{ - Eina_List *items = NULL; - Clock_Field *field; - unsigned int idx; - Clock_Field *sorted_fields[EFL_UI_CLOCK_TYPE_COUNT]; - - EFL_UI_CLOCK_DATA_GET(obj, sd); - - for (idx = 0; idx < EFL_UI_CLOCK_TYPE_COUNT; idx++) - { - field = sd->field_list + idx; - sorted_fields[field->location] = field; - } - - for (idx = 0; idx < EFL_UI_CLOCK_TYPE_COUNT; idx++) - { - field = sorted_fields[idx]; - if (field->fmt_exist && field->visible) - items = eina_list_append(items, field->item_obj); - } - - // ACCESS - if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) - items = eina_list_append(items, sd->access_obj); - - return items; -} - -EOLIAN static Eina_Bool -_efl_ui_clock_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Clock_Data *_pd EINA_UNUSED) -{ - return EINA_TRUE; -} - EOLIAN static void _efl_ui_clock_pause_set(Eo *obj EINA_UNUSED, Efl_Ui_Clock_Data *sd, Eina_Bool paused) { @@ -485,34 +449,6 @@ _efl_ui_clock_edit_mode_get(Eo *obj EINA_UNUSED, Efl_Ui_Clock_Data *sd) } EOLIAN static Eina_Bool -_efl_ui_clock_elm_widget_focus_next(Eo *obj, Efl_Ui_Clock_Data *_pd EINA_UNUSED, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item) -{ - const Eina_List *items; - Eina_List *(*list_free)(Eina_List *list); - void *(*list_data_get)(const Eina_List *list); - - Eina_Bool int_ret; - - if ((items = elm_obj_widget_focus_custom_chain_get(obj))) - { - list_data_get = eina_list_data_get; - list_free = NULL; - } - else - { - items = _clock_items_get(obj); - list_data_get = eina_list_data_get; - list_free = eina_list_free; - if (!items) return EINA_FALSE; - } - - int_ret = elm_widget_focus_list_next_get(obj, items, list_data_get, dir, next, next_item); - if (list_free) list_free((Eina_List *)items); - - return int_ret; -} - -EOLIAN static Eina_Bool _efl_ui_clock_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Clock_Data *sd, Elm_Object_Item *item EINA_UNUSED) { Eina_Bool int_ret = EINA_FALSE; diff --git a/src/lib/elementary/efl_ui_clock.eo b/src/lib/elementary/efl_ui_clock.eo index 319147a3b7..3bb315d25f 100644 --- a/src/lib/elementary/efl_ui_clock.eo +++ b/src/lib/elementary/efl_ui_clock.eo @@ -225,8 +225,6 @@ class Efl.Ui.Clock (Efl.Ui.Layout) class.constructor; Efl.Object.constructor; Elm.Widget.theme_apply; - Elm.Widget.focus_next_manager_is; - Elm.Widget.focus_next; Elm.Widget.on_disabled_update; Elm.Widget.on_focus_update; Efl.Ui.Translatable.translation_update; --