From 15e9605b7d1e4609c3c506ad3c3aebd2caee2e30 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 7 Mar 2019 10:48:33 -0500 Subject: [PATCH] elm_widget: remove usage of eo types in legacy functions Reviewed-by: Xavi Artigas Differential Revision: https://phab.enlightenment.org/D8225 --- src/lib/elementary/elm_widget_item_eo.c | 16 ++++++++-------- src/lib/elementary/elm_widget_item_eo.h | 8 ++++---- src/lib/elementary/elm_widget_item_eo.legacy.c | 8 ++++---- src/lib/elementary/elm_widget_item_eo.legacy.h | 8 ++++---- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/lib/elementary/elm_widget_item_eo.c b/src/lib/elementary/elm_widget_item_eo.c index 903a72fee5..45a874259a 100644 --- a/src/lib/elementary/elm_widget_item_eo.c +++ b/src/lib/elementary/elm_widget_item_eo.c @@ -405,21 +405,21 @@ void _elm_widget_item_del_pre(Eo *obj, Elm_Widget_Item_Data *pd); EOAPI EFL_VOID_FUNC_BODY(elm_wdg_item_del_pre); -Efl_Canvas_Object *_elm_widget_item_focus_next_object_get(const Eo *obj, Elm_Widget_Item_Data *pd, Efl_Ui_Focus_Direction dir); +Efl_Canvas_Object *_elm_widget_item_focus_next_object_get(const Eo *obj, Elm_Widget_Item_Data *pd, Elm_Focus_Direction dir); -EOAPI EFL_FUNC_BODYV_CONST(elm_wdg_item_focus_next_object_get, Efl_Canvas_Object *, NULL, EFL_FUNC_CALL(dir), Efl_Ui_Focus_Direction dir); +EOAPI EFL_FUNC_BODYV_CONST(elm_wdg_item_focus_next_object_get, Efl_Canvas_Object *, NULL, EFL_FUNC_CALL(dir), Elm_Focus_Direction dir); -void _elm_widget_item_focus_next_object_set(Eo *obj, Elm_Widget_Item_Data *pd, Efl_Canvas_Object *next, Efl_Ui_Focus_Direction dir); +void _elm_widget_item_focus_next_object_set(Eo *obj, Elm_Widget_Item_Data *pd, Efl_Canvas_Object *next, Elm_Focus_Direction dir); -EOAPI EFL_VOID_FUNC_BODYV(elm_wdg_item_focus_next_object_set, EFL_FUNC_CALL(next, dir), Efl_Canvas_Object *next, Efl_Ui_Focus_Direction dir); +EOAPI EFL_VOID_FUNC_BODYV(elm_wdg_item_focus_next_object_set, EFL_FUNC_CALL(next, dir), Efl_Canvas_Object *next, Elm_Focus_Direction dir); -Elm_Widget_Item *_elm_widget_item_focus_next_item_get(const Eo *obj, Elm_Widget_Item_Data *pd, Efl_Ui_Focus_Direction dir); +Elm_Widget_Item *_elm_widget_item_focus_next_item_get(const Eo *obj, Elm_Widget_Item_Data *pd, Elm_Focus_Direction dir); -EOAPI EFL_FUNC_BODYV_CONST(elm_wdg_item_focus_next_item_get, Elm_Widget_Item *, NULL, EFL_FUNC_CALL(dir), Efl_Ui_Focus_Direction dir); +EOAPI EFL_FUNC_BODYV_CONST(elm_wdg_item_focus_next_item_get, Elm_Widget_Item *, NULL, EFL_FUNC_CALL(dir), Elm_Focus_Direction dir); -void _elm_widget_item_focus_next_item_set(Eo *obj, Elm_Widget_Item_Data *pd, Elm_Widget_Item *next_item, Efl_Ui_Focus_Direction dir); +void _elm_widget_item_focus_next_item_set(Eo *obj, Elm_Widget_Item_Data *pd, Elm_Widget_Item *next_item, Elm_Focus_Direction dir); -EOAPI EFL_VOID_FUNC_BODYV(elm_wdg_item_focus_next_item_set, EFL_FUNC_CALL(next_item, dir), Elm_Widget_Item *next_item, Efl_Ui_Focus_Direction dir); +EOAPI EFL_VOID_FUNC_BODYV(elm_wdg_item_focus_next_item_set, EFL_FUNC_CALL(next_item, dir), Elm_Widget_Item *next_item, Elm_Focus_Direction dir); Efl_Object *_elm_widget_item_efl_object_constructor(Eo *obj, Elm_Widget_Item_Data *pd); diff --git a/src/lib/elementary/elm_widget_item_eo.h b/src/lib/elementary/elm_widget_item_eo.h index c6b6bed171..f077e2152d 100644 --- a/src/lib/elementary/elm_widget_item_eo.h +++ b/src/lib/elementary/elm_widget_item_eo.h @@ -838,7 +838,7 @@ EOAPI void elm_wdg_item_del_pre(Eo *obj); * * @ingroup Elm_Widget_Item */ -EOAPI Efl_Canvas_Object *elm_wdg_item_focus_next_object_get(const Eo *obj, Efl_Ui_Focus_Direction dir); +EOAPI Efl_Canvas_Object *elm_wdg_item_focus_next_object_get(const Eo *obj, Elm_Focus_Direction dir); /** * @brief Set the next object with specific focus direction. @@ -851,7 +851,7 @@ EOAPI Efl_Canvas_Object *elm_wdg_item_focus_next_object_get(const Eo *obj, Efl_U * * @ingroup Elm_Widget_Item */ -EOAPI void elm_wdg_item_focus_next_object_set(Eo *obj, Efl_Canvas_Object *next, Efl_Ui_Focus_Direction dir); +EOAPI void elm_wdg_item_focus_next_object_set(Eo *obj, Efl_Canvas_Object *next, Elm_Focus_Direction dir); /** * @brief Get the next object item with specific focus direction. @@ -865,7 +865,7 @@ EOAPI void elm_wdg_item_focus_next_object_set(Eo *obj, Efl_Canvas_Object *next, * * @ingroup Elm_Widget_Item */ -EOAPI Elm_Widget_Item *elm_wdg_item_focus_next_item_get(const Eo *obj, Efl_Ui_Focus_Direction dir); +EOAPI Elm_Widget_Item *elm_wdg_item_focus_next_item_get(const Eo *obj, Elm_Focus_Direction dir); /** * @brief Set the next object item with specific focus direction. @@ -878,6 +878,6 @@ EOAPI Elm_Widget_Item *elm_wdg_item_focus_next_item_get(const Eo *obj, Efl_Ui_Fo * * @ingroup Elm_Widget_Item */ -EOAPI void elm_wdg_item_focus_next_item_set(Eo *obj, Elm_Widget_Item *next_item, Efl_Ui_Focus_Direction dir); +EOAPI void elm_wdg_item_focus_next_item_set(Eo *obj, Elm_Widget_Item *next_item, Elm_Focus_Direction dir); #endif diff --git a/src/lib/elementary/elm_widget_item_eo.legacy.c b/src/lib/elementary/elm_widget_item_eo.legacy.c index c50797f7cd..52f54730fb 100644 --- a/src/lib/elementary/elm_widget_item_eo.legacy.c +++ b/src/lib/elementary/elm_widget_item_eo.legacy.c @@ -258,25 +258,25 @@ elm_object_item_access_order_unset(Elm_Widget_Item *obj) } EAPI Efl_Canvas_Object * -elm_object_item_focus_next_object_get(const Elm_Widget_Item *obj, Efl_Ui_Focus_Direction dir) +elm_object_item_focus_next_object_get(const Elm_Widget_Item *obj, Elm_Focus_Direction dir) { return elm_wdg_item_focus_next_object_get(obj, dir); } EAPI void -elm_object_item_focus_next_object_set(Elm_Widget_Item *obj, Efl_Canvas_Object *next, Efl_Ui_Focus_Direction dir) +elm_object_item_focus_next_object_set(Elm_Widget_Item *obj, Efl_Canvas_Object *next, Elm_Focus_Direction dir) { elm_wdg_item_focus_next_object_set(obj, next, dir); } EAPI Elm_Widget_Item * -elm_object_item_focus_next_item_get(const Elm_Widget_Item *obj, Efl_Ui_Focus_Direction dir) +elm_object_item_focus_next_item_get(const Elm_Widget_Item *obj, Elm_Focus_Direction dir) { return elm_wdg_item_focus_next_item_get(obj, dir); } EAPI void -elm_object_item_focus_next_item_set(Elm_Widget_Item *obj, Elm_Widget_Item *next_item, Efl_Ui_Focus_Direction dir) +elm_object_item_focus_next_item_set(Elm_Widget_Item *obj, Elm_Widget_Item *next_item, Elm_Focus_Direction dir) { elm_wdg_item_focus_next_item_set(obj, next_item, dir); } diff --git a/src/lib/elementary/elm_widget_item_eo.legacy.h b/src/lib/elementary/elm_widget_item_eo.legacy.h index a48f446141..d1fc974928 100644 --- a/src/lib/elementary/elm_widget_item_eo.legacy.h +++ b/src/lib/elementary/elm_widget_item_eo.legacy.h @@ -754,7 +754,7 @@ EAPI void elm_object_item_access_order_unset(Elm_Widget_Item *obj); * * @ingroup Elm_Object_Item_Group */ -EAPI Efl_Canvas_Object *elm_object_item_focus_next_object_get(const Elm_Widget_Item *obj, Efl_Ui_Focus_Direction dir); +EAPI Efl_Canvas_Object *elm_object_item_focus_next_object_get(const Elm_Widget_Item *obj, Elm_Focus_Direction dir); /** * @brief Set the next object with specific focus direction. @@ -767,7 +767,7 @@ EAPI Efl_Canvas_Object *elm_object_item_focus_next_object_get(const Elm_Widget_I * * @ingroup Elm_Object_Item_Group */ -EAPI void elm_object_item_focus_next_object_set(Elm_Widget_Item *obj, Efl_Canvas_Object *next, Efl_Ui_Focus_Direction dir); +EAPI void elm_object_item_focus_next_object_set(Elm_Widget_Item *obj, Efl_Canvas_Object *next, Elm_Focus_Direction dir); /** * @brief Get the next object item with specific focus direction. @@ -781,7 +781,7 @@ EAPI void elm_object_item_focus_next_object_set(Elm_Widget_Item *obj, Efl_Canvas * * @ingroup Elm_Object_Item_Group */ -EAPI Elm_Widget_Item *elm_object_item_focus_next_item_get(const Elm_Widget_Item *obj, Efl_Ui_Focus_Direction dir); +EAPI Elm_Widget_Item *elm_object_item_focus_next_item_get(const Elm_Widget_Item *obj, Elm_Focus_Direction dir); /** * @brief Set the next object item with specific focus direction. @@ -794,6 +794,6 @@ EAPI Elm_Widget_Item *elm_object_item_focus_next_item_get(const Elm_Widget_Item * * @ingroup Elm_Object_Item_Group */ -EAPI void elm_object_item_focus_next_item_set(Elm_Widget_Item *obj, Elm_Widget_Item *next_item, Efl_Ui_Focus_Direction dir); +EAPI void elm_object_item_focus_next_item_set(Elm_Widget_Item *obj, Elm_Widget_Item *next_item, Elm_Focus_Direction dir); #endif