From bbaafb53144cb9473f15524e4c111637e36df001 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 5 Mar 2019 17:00:37 -0500 Subject: [PATCH] efl_ui_focus_parent_provider_gen: remove all legacy usage from eo files this takes the current generated output from eolian for legacy code in efl and adds it to the tree, then removes legacy references from the corresponding eo files. in the case where the entire eo file was for a legacy object, that eo file has been removed from the tree ref T7724 Reviewed-by: Cedric BAIL Differential Revision: https://phab.enlightenment.org/D8210 --- src/Makefile_Elementary.am | 3 +- .../efl_ui_focus_parent_provider_gen.c | 4 +- .../efl_ui_focus_parent_provider_gen.eo | 27 ------- .../efl_ui_focus_parent_provider_gen_eo.c | 60 ++++++++++++++ .../efl_ui_focus_parent_provider_gen_eo.h | 78 +++++++++++++++++++ src/lib/elementary/elm_gengrid.c | 2 +- src/lib/elementary/elm_genlist.c | 2 +- src/lib/elementary/meson.build | 2 +- 8 files changed, 145 insertions(+), 33 deletions(-) delete mode 100644 src/lib/elementary/efl_ui_focus_parent_provider_gen.eo create mode 100644 src/lib/elementary/efl_ui_focus_parent_provider_gen_eo.c create mode 100644 src/lib/elementary/efl_ui_focus_parent_provider_gen_eo.h diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index 0ca9be82cc..f072336100 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -156,7 +156,6 @@ elm_private_eolian_files = \ lib/elementary/efl_ui_win_part.eo \ lib/elementary/efl_ui_focus_parent_provider.eo \ lib/elementary/efl_ui_focus_parent_provider_standard.eo \ - lib/elementary/efl_ui_focus_parent_provider_gen.eo \ lib/elementary/efl_ui_state_model.eo \ tests/elementary/focus_test.eo \ tests/elementary/focus_test_sub_main.eo \ @@ -396,6 +395,7 @@ lib/elementary/elm_widget_item_container_eo.c \ lib/elementary/elm_widget_item_eo.c \ lib/elementary/elm_widget_item_eo.legacy.c \ lib/elementary/elm_widget_item_static_focus_eo.c \ +lib/elementary/efl_ui_focus_parent_provider_gen_eo.c \ $(NULL) elm_legacy_eo_headers = \ @@ -615,6 +615,7 @@ lib/elementary/elm_widget_item_eo.h \ lib/elementary/elm_widget_item_eo.legacy.h \ lib/elementary/elm_widget_item_static_focus_eo.h \ lib/elementary/elm_widget_item_static_focus_eo.legacy.h \ +lib/elementary/efl_ui_focus_parent_provider_gen_eo.h \ $(NULL) diff --git a/src/lib/elementary/efl_ui_focus_parent_provider_gen.c b/src/lib/elementary/efl_ui_focus_parent_provider_gen.c index 515898e9e2..1ad1ab2ae1 100644 --- a/src/lib/elementary/efl_ui_focus_parent_provider_gen.c +++ b/src/lib/elementary/efl_ui_focus_parent_provider_gen.c @@ -4,7 +4,7 @@ #include #include "elm_priv.h" -#include "efl_ui_focus_parent_provider_gen.eo.h" +#include "efl_ui_focus_parent_provider_gen_eo.h" #include "efl_ui_focus_composition_adapter.eo.h" typedef struct { @@ -119,4 +119,4 @@ _efl_ui_focus_parent_provider_gen_item_fetch(Eo *obj EINA_UNUSED, Efl_Ui_Focus_P return item; } -#include "efl_ui_focus_parent_provider_gen.eo.c" +#include "efl_ui_focus_parent_provider_gen_eo.c" diff --git a/src/lib/elementary/efl_ui_focus_parent_provider_gen.eo b/src/lib/elementary/efl_ui_focus_parent_provider_gen.eo deleted file mode 100644 index 8cf0135610..0000000000 --- a/src/lib/elementary/efl_ui_focus_parent_provider_gen.eo +++ /dev/null @@ -1,27 +0,0 @@ -class @beta Efl.Ui.Focus.Parent_Provider_Gen extends Efl.Object implements Efl.Ui.Focus.Parent_Provider { - [[EFL UI Focus Parent Provider Gen class]] - methods { - @property content_item_map { - [[Content item map property]] - values { - map : hash; [[Item map]] - } - } - @property container { - [[Container property]] - values { - container : Efl.Ui.Widget; [[Container widget]] - } - } - item_fetch { - [[Fetch the item where the item is a subchild from]] - params { - widget : Efl.Ui.Widget; - } - return : Efl.Ui.Widget; - } - } - implements { - Efl.Ui.Focus.Parent_Provider.find_logical_parent; - } -} diff --git a/src/lib/elementary/efl_ui_focus_parent_provider_gen_eo.c b/src/lib/elementary/efl_ui_focus_parent_provider_gen_eo.c new file mode 100644 index 0000000000..5f5a73d9ff --- /dev/null +++ b/src/lib/elementary/efl_ui_focus_parent_provider_gen_eo.c @@ -0,0 +1,60 @@ + +void _efl_ui_focus_parent_provider_gen_content_item_map_set(Eo *obj, Efl_Ui_Focus_Parent_Provider_Gen_Data *pd, Eina_Hash *map); + +EOAPI EFL_VOID_FUNC_BODYV(efl_ui_focus_parent_provider_gen_content_item_map_set, EFL_FUNC_CALL(map), Eina_Hash *map); + +Eina_Hash *_efl_ui_focus_parent_provider_gen_content_item_map_get(const Eo *obj, Efl_Ui_Focus_Parent_Provider_Gen_Data *pd); + +EOAPI EFL_FUNC_BODY_CONST(efl_ui_focus_parent_provider_gen_content_item_map_get, Eina_Hash *, NULL); + +void _efl_ui_focus_parent_provider_gen_container_set(Eo *obj, Efl_Ui_Focus_Parent_Provider_Gen_Data *pd, Efl_Ui_Widget *container); + +EOAPI EFL_VOID_FUNC_BODYV(efl_ui_focus_parent_provider_gen_container_set, EFL_FUNC_CALL(container), Efl_Ui_Widget *container); + +Efl_Ui_Widget *_efl_ui_focus_parent_provider_gen_container_get(const Eo *obj, Efl_Ui_Focus_Parent_Provider_Gen_Data *pd); + +EOAPI EFL_FUNC_BODY_CONST(efl_ui_focus_parent_provider_gen_container_get, Efl_Ui_Widget *, NULL); + +Efl_Ui_Widget *_efl_ui_focus_parent_provider_gen_item_fetch(Eo *obj, Efl_Ui_Focus_Parent_Provider_Gen_Data *pd, Efl_Ui_Widget *widget); + +EOAPI EFL_FUNC_BODYV(efl_ui_focus_parent_provider_gen_item_fetch, Efl_Ui_Widget *, NULL, EFL_FUNC_CALL(widget), Efl_Ui_Widget *widget); + +Efl_Ui_Focus_Object *_efl_ui_focus_parent_provider_gen_efl_ui_focus_parent_provider_find_logical_parent(Eo *obj, Efl_Ui_Focus_Parent_Provider_Gen_Data *pd, Efl_Ui_Focus_Object *widget); + + +static Eina_Bool +_efl_ui_focus_parent_provider_gen_class_initializer(Efl_Class *klass) +{ + const Efl_Object_Ops *opsp = NULL; + + const Efl_Object_Property_Reflection_Ops *ropsp = NULL; + +#ifndef EFL_UI_FOCUS_PARENT_PROVIDER_GEN_EXTRA_OPS +#define EFL_UI_FOCUS_PARENT_PROVIDER_GEN_EXTRA_OPS +#endif + + EFL_OPS_DEFINE(ops, + EFL_OBJECT_OP_FUNC(efl_ui_focus_parent_provider_gen_content_item_map_set, _efl_ui_focus_parent_provider_gen_content_item_map_set), + EFL_OBJECT_OP_FUNC(efl_ui_focus_parent_provider_gen_content_item_map_get, _efl_ui_focus_parent_provider_gen_content_item_map_get), + EFL_OBJECT_OP_FUNC(efl_ui_focus_parent_provider_gen_container_set, _efl_ui_focus_parent_provider_gen_container_set), + EFL_OBJECT_OP_FUNC(efl_ui_focus_parent_provider_gen_container_get, _efl_ui_focus_parent_provider_gen_container_get), + EFL_OBJECT_OP_FUNC(efl_ui_focus_parent_provider_gen_item_fetch, _efl_ui_focus_parent_provider_gen_item_fetch), + EFL_OBJECT_OP_FUNC(efl_ui_focus_parent_provider_find_logical_parent, _efl_ui_focus_parent_provider_gen_efl_ui_focus_parent_provider_find_logical_parent), + EFL_UI_FOCUS_PARENT_PROVIDER_GEN_EXTRA_OPS + ); + opsp = &ops; + + return efl_class_functions_set(klass, opsp, ropsp); +} + +static const Efl_Class_Description _efl_ui_focus_parent_provider_gen_class_desc = { + EO_VERSION, + "Efl.Ui.Focus.Parent_Provider_Gen", + EFL_CLASS_TYPE_REGULAR, + sizeof(Efl_Ui_Focus_Parent_Provider_Gen_Data), + _efl_ui_focus_parent_provider_gen_class_initializer, + NULL, + NULL +}; + +EFL_DEFINE_CLASS(efl_ui_focus_parent_provider_gen_class_get, &_efl_ui_focus_parent_provider_gen_class_desc, EFL_OBJECT_CLASS, EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE, NULL); diff --git a/src/lib/elementary/efl_ui_focus_parent_provider_gen_eo.h b/src/lib/elementary/efl_ui_focus_parent_provider_gen_eo.h new file mode 100644 index 0000000000..1200debba4 --- /dev/null +++ b/src/lib/elementary/efl_ui_focus_parent_provider_gen_eo.h @@ -0,0 +1,78 @@ +#ifndef _EFL_UI_FOCUS_PARENT_PROVIDER_GEN_EO_H_ +#define _EFL_UI_FOCUS_PARENT_PROVIDER_GEN_EO_H_ + +#ifndef _EFL_UI_FOCUS_PARENT_PROVIDER_GEN_EO_CLASS_TYPE +#define _EFL_UI_FOCUS_PARENT_PROVIDER_GEN_EO_CLASS_TYPE + +typedef Eo Efl_Ui_Focus_Parent_Provider_Gen; + +#endif + +#ifndef _EFL_UI_FOCUS_PARENT_PROVIDER_GEN_EO_TYPES +#define _EFL_UI_FOCUS_PARENT_PROVIDER_GEN_EO_TYPES + + +#endif +#ifdef EFL_BETA_API_SUPPORT +/** EFL UI Focus Parent Provider Gen class + * + * @ingroup Efl_Ui_Focus_Parent_Provider_Gen + */ +#define EFL_UI_FOCUS_PARENT_PROVIDER_GEN_CLASS efl_ui_focus_parent_provider_gen_class_get() + +EWAPI const Efl_Class *efl_ui_focus_parent_provider_gen_class_get(void); + +/** + * @brief Content item map property + * + * @param[in] obj The object. + * @param[in] map Item map + * + * @ingroup Efl_Ui_Focus_Parent_Provider_Gen + */ +EOAPI void efl_ui_focus_parent_provider_gen_content_item_map_set(Eo *obj, Eina_Hash *map); + +/** + * @brief Content item map property + * + * @param[in] obj The object. + * + * @return Item map + * + * @ingroup Efl_Ui_Focus_Parent_Provider_Gen + */ +EOAPI Eina_Hash *efl_ui_focus_parent_provider_gen_content_item_map_get(const Eo *obj); + +/** + * @brief Container property + * + * @param[in] obj The object. + * @param[in] container Container widget + * + * @ingroup Efl_Ui_Focus_Parent_Provider_Gen + */ +EOAPI void efl_ui_focus_parent_provider_gen_container_set(Eo *obj, Efl_Ui_Widget *container); + +/** + * @brief Container property + * + * @param[in] obj The object. + * + * @return Container widget + * + * @ingroup Efl_Ui_Focus_Parent_Provider_Gen + */ +EOAPI Efl_Ui_Widget *efl_ui_focus_parent_provider_gen_container_get(const Eo *obj); + +/** + * @brief Fetch the item where the item is a subchild from + * + * @param[in] obj The object. + * @param[in] widget + * + * @ingroup Efl_Ui_Focus_Parent_Provider_Gen + */ +EOAPI Efl_Ui_Widget *efl_ui_focus_parent_provider_gen_item_fetch(Eo *obj, Efl_Ui_Widget *widget); +#endif /* EFL_BETA_API_SUPPORT */ + +#endif diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index fe0d42622a..f2ba6c5aa7 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -13,7 +13,7 @@ #include "elm_priv.h" #include "elm_widget_gengrid.h" #include "elm_interface_scrollable.h" -#include "efl_ui_focus_parent_provider_gen.eo.h" +#include "efl_ui_focus_parent_provider_gen_eo.h" #include "efl_ui_focus_composition_adapter.eo.h" #include "elm_gengrid_item_eo.h" #include "elm_gengrid_pan_eo.h" diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 3bb2f6b93a..2be903d0a3 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -16,7 +16,7 @@ #include "elm_priv.h" #include "elm_widget_genlist.h" #include "elm_interface_scrollable.h" -#include "efl_ui_focus_parent_provider_gen.eo.h" +#include "efl_ui_focus_parent_provider_gen_eo.h" #include "efl_ui_focus_composition_adapter.eo.h" #include "elm_genlist_item_eo.h" #include "elm_genlist_pan_eo.h" diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build index 43e67b47dc..acadec73fc 100644 --- a/src/lib/elementary/meson.build +++ b/src/lib/elementary/meson.build @@ -232,7 +232,6 @@ priv_eo_files = [ 'efl_ui_focus_composition_adapter.eo', 'efl_ui_focus_parent_provider.eo', 'efl_ui_focus_parent_provider_standard.eo', - 'efl_ui_focus_parent_provider_gen.eo', 'efl_ui_state_model.eo', 'efl_ui_selection_manager.eo', 'efl_datetime_manager.eo', @@ -810,6 +809,7 @@ elementary_pub_headers = [ 'elm_widget_item_eo.legacy.h', 'elm_widget_item_static_focus_eo.h', 'elm_widget_item_static_focus_eo.legacy.h', + 'efl_ui_focus_parent_provider_gen_eo.h', ] elementary_header_src = [