summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-05 17:00:37 -0500
committerCedric BAIL <cedric.bail@free.fr>2019-03-07 14:16:44 -0800
commitbbaafb53144cb9473f15524e4c111637e36df001 (patch)
tree0bc3d93357851c67c1e95560704a313c1e45790b /src
parent5ae716f7b35aa40ba14d999e46c64f6f4a1abdc6 (diff)
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 <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D8210
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Elementary.am3
-rw-r--r--src/lib/elementary/efl_ui_focus_parent_provider_gen.c4
-rw-r--r--src/lib/elementary/efl_ui_focus_parent_provider_gen.eo27
-rw-r--r--src/lib/elementary/efl_ui_focus_parent_provider_gen_eo.c60
-rw-r--r--src/lib/elementary/efl_ui_focus_parent_provider_gen_eo.h78
-rw-r--r--src/lib/elementary/elm_gengrid.c2
-rw-r--r--src/lib/elementary/elm_genlist.c2
-rw-r--r--src/lib/elementary/meson.build2
8 files changed, 145 insertions, 33 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 0ca9be8..f072336 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -156,7 +156,6 @@ elm_private_eolian_files = \
156 lib/elementary/efl_ui_win_part.eo \ 156 lib/elementary/efl_ui_win_part.eo \
157 lib/elementary/efl_ui_focus_parent_provider.eo \ 157 lib/elementary/efl_ui_focus_parent_provider.eo \
158 lib/elementary/efl_ui_focus_parent_provider_standard.eo \ 158 lib/elementary/efl_ui_focus_parent_provider_standard.eo \
159 lib/elementary/efl_ui_focus_parent_provider_gen.eo \
160 lib/elementary/efl_ui_state_model.eo \ 159 lib/elementary/efl_ui_state_model.eo \
161 tests/elementary/focus_test.eo \ 160 tests/elementary/focus_test.eo \
162 tests/elementary/focus_test_sub_main.eo \ 161 tests/elementary/focus_test_sub_main.eo \
@@ -396,6 +395,7 @@ lib/elementary/elm_widget_item_container_eo.c \
396lib/elementary/elm_widget_item_eo.c \ 395lib/elementary/elm_widget_item_eo.c \
397lib/elementary/elm_widget_item_eo.legacy.c \ 396lib/elementary/elm_widget_item_eo.legacy.c \
398lib/elementary/elm_widget_item_static_focus_eo.c \ 397lib/elementary/elm_widget_item_static_focus_eo.c \
398lib/elementary/efl_ui_focus_parent_provider_gen_eo.c \
399$(NULL) 399$(NULL)
400 400
401elm_legacy_eo_headers = \ 401elm_legacy_eo_headers = \
@@ -615,6 +615,7 @@ lib/elementary/elm_widget_item_eo.h \
615lib/elementary/elm_widget_item_eo.legacy.h \ 615lib/elementary/elm_widget_item_eo.legacy.h \
616lib/elementary/elm_widget_item_static_focus_eo.h \ 616lib/elementary/elm_widget_item_static_focus_eo.h \
617lib/elementary/elm_widget_item_static_focus_eo.legacy.h \ 617lib/elementary/elm_widget_item_static_focus_eo.legacy.h \
618lib/elementary/efl_ui_focus_parent_provider_gen_eo.h \
618$(NULL) 619$(NULL)
619 620
620 621
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 515898e..1ad1ab2 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 @@
4 4
5#include <Elementary.h> 5#include <Elementary.h>
6#include "elm_priv.h" 6#include "elm_priv.h"
7#include "efl_ui_focus_parent_provider_gen.eo.h" 7#include "efl_ui_focus_parent_provider_gen_eo.h"
8#include "efl_ui_focus_composition_adapter.eo.h" 8#include "efl_ui_focus_composition_adapter.eo.h"
9 9
10typedef struct { 10typedef struct {
@@ -119,4 +119,4 @@ _efl_ui_focus_parent_provider_gen_item_fetch(Eo *obj EINA_UNUSED, Efl_Ui_Focus_P
119 return item; 119 return item;
120} 120}
121 121
122#include "efl_ui_focus_parent_provider_gen.eo.c" 122#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 8cf0135..0000000
--- a/src/lib/elementary/efl_ui_focus_parent_provider_gen.eo
+++ /dev/null
@@ -1,27 +0,0 @@
1class @beta Efl.Ui.Focus.Parent_Provider_Gen extends Efl.Object implements Efl.Ui.Focus.Parent_Provider {
2 [[EFL UI Focus Parent Provider Gen class]]
3 methods {
4 @property content_item_map {
5 [[Content item map property]]
6 values {
7 map : hash<Efl.Ui.Widget, Elm.Widget.Item>; [[Item map]]
8 }
9 }
10 @property container {
11 [[Container property]]
12 values {
13 container : Efl.Ui.Widget; [[Container widget]]
14 }
15 }
16 item_fetch {
17 [[Fetch the item where the item is a subchild from]]
18 params {
19 widget : Efl.Ui.Widget;
20 }
21 return : Efl.Ui.Widget;
22 }
23 }
24 implements {
25 Efl.Ui.Focus.Parent_Provider.find_logical_parent;
26 }
27}
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 0000000..5f5a73d
--- /dev/null
+++ b/src/lib/elementary/efl_ui_focus_parent_provider_gen_eo.c
@@ -0,0 +1,60 @@
1
2void _efl_ui_focus_parent_provider_gen_content_item_map_set(Eo *obj, Efl_Ui_Focus_Parent_Provider_Gen_Data *pd, Eina_Hash *map);
3
4EOAPI EFL_VOID_FUNC_BODYV(efl_ui_focus_parent_provider_gen_content_item_map_set, EFL_FUNC_CALL(map), Eina_Hash *map);
5
6Eina_Hash *_efl_ui_focus_parent_provider_gen_content_item_map_get(const Eo *obj, Efl_Ui_Focus_Parent_Provider_Gen_Data *pd);
7
8EOAPI EFL_FUNC_BODY_CONST(efl_ui_focus_parent_provider_gen_content_item_map_get, Eina_Hash *, NULL);
9
10void _efl_ui_focus_parent_provider_gen_container_set(Eo *obj, Efl_Ui_Focus_Parent_Provider_Gen_Data *pd, Efl_Ui_Widget *container);
11
12EOAPI EFL_VOID_FUNC_BODYV(efl_ui_focus_parent_provider_gen_container_set, EFL_FUNC_CALL(container), Efl_Ui_Widget *container);
13
14Efl_Ui_Widget *_efl_ui_focus_parent_provider_gen_container_get(const Eo *obj, Efl_Ui_Focus_Parent_Provider_Gen_Data *pd);
15
16EOAPI EFL_FUNC_BODY_CONST(efl_ui_focus_parent_provider_gen_container_get, Efl_Ui_Widget *, NULL);
17
18Efl_Ui_Widget *_efl_ui_focus_parent_provider_gen_item_fetch(Eo *obj, Efl_Ui_Focus_Parent_Provider_Gen_Data *pd, Efl_Ui_Widget *widget);
19
20EOAPI EFL_FUNC_BODYV(efl_ui_focus_parent_provider_gen_item_fetch, Efl_Ui_Widget *, NULL, EFL_FUNC_CALL(widget), Efl_Ui_Widget *widget);
21
22Efl_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);
23
24
25static Eina_Bool
26_efl_ui_focus_parent_provider_gen_class_initializer(Efl_Class *klass)
27{
28 const Efl_Object_Ops *opsp = NULL;
29
30 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
31
32#ifndef EFL_UI_FOCUS_PARENT_PROVIDER_GEN_EXTRA_OPS
33#define EFL_UI_FOCUS_PARENT_PROVIDER_GEN_EXTRA_OPS
34#endif
35
36 EFL_OPS_DEFINE(ops,
37 EFL_OBJECT_OP_FUNC(efl_ui_focus_parent_provider_gen_content_item_map_set, _efl_ui_focus_parent_provider_gen_content_item_map_set),
38 EFL_OBJECT_OP_FUNC(efl_ui_focus_parent_provider_gen_content_item_map_get, _efl_ui_focus_parent_provider_gen_content_item_map_get),
39 EFL_OBJECT_OP_FUNC(efl_ui_focus_parent_provider_gen_container_set, _efl_ui_focus_parent_provider_gen_container_set),
40 EFL_OBJECT_OP_FUNC(efl_ui_focus_parent_provider_gen_container_get, _efl_ui_focus_parent_provider_gen_container_get),
41 EFL_OBJECT_OP_FUNC(efl_ui_focus_parent_provider_gen_item_fetch, _efl_ui_focus_parent_provider_gen_item_fetch),
42 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),
43 EFL_UI_FOCUS_PARENT_PROVIDER_GEN_EXTRA_OPS
44 );
45 opsp = &ops;
46
47 return efl_class_functions_set(klass, opsp, ropsp);
48}
49
50static const Efl_Class_Description _efl_ui_focus_parent_provider_gen_class_desc = {
51 EO_VERSION,
52 "Efl.Ui.Focus.Parent_Provider_Gen",
53 EFL_CLASS_TYPE_REGULAR,
54 sizeof(Efl_Ui_Focus_Parent_Provider_Gen_Data),
55 _efl_ui_focus_parent_provider_gen_class_initializer,
56 NULL,
57 NULL
58};
59
60EFL_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 0000000..1200deb
--- /dev/null
+++ b/src/lib/elementary/efl_ui_focus_parent_provider_gen_eo.h
@@ -0,0 +1,78 @@
1#ifndef _EFL_UI_FOCUS_PARENT_PROVIDER_GEN_EO_H_
2#define _EFL_UI_FOCUS_PARENT_PROVIDER_GEN_EO_H_
3
4#ifndef _EFL_UI_FOCUS_PARENT_PROVIDER_GEN_EO_CLASS_TYPE
5#define _EFL_UI_FOCUS_PARENT_PROVIDER_GEN_EO_CLASS_TYPE
6
7typedef Eo Efl_Ui_Focus_Parent_Provider_Gen;
8
9#endif
10
11#ifndef _EFL_UI_FOCUS_PARENT_PROVIDER_GEN_EO_TYPES
12#define _EFL_UI_FOCUS_PARENT_PROVIDER_GEN_EO_TYPES
13
14
15#endif
16#ifdef EFL_BETA_API_SUPPORT
17/** EFL UI Focus Parent Provider Gen class
18 *
19 * @ingroup Efl_Ui_Focus_Parent_Provider_Gen
20 */
21#define EFL_UI_FOCUS_PARENT_PROVIDER_GEN_CLASS efl_ui_focus_parent_provider_gen_class_get()
22
23EWAPI const Efl_Class *efl_ui_focus_parent_provider_gen_class_get(void);
24
25/**
26 * @brief Content item map property
27 *
28 * @param[in] obj The object.
29 * @param[in] map Item map
30 *
31 * @ingroup Efl_Ui_Focus_Parent_Provider_Gen
32 */
33EOAPI void efl_ui_focus_parent_provider_gen_content_item_map_set(Eo *obj, Eina_Hash *map);
34
35/**
36 * @brief Content item map property
37 *
38 * @param[in] obj The object.
39 *
40 * @return Item map
41 *
42 * @ingroup Efl_Ui_Focus_Parent_Provider_Gen
43 */
44EOAPI Eina_Hash *efl_ui_focus_parent_provider_gen_content_item_map_get(const Eo *obj);
45
46/**
47 * @brief Container property
48 *
49 * @param[in] obj The object.
50 * @param[in] container Container widget
51 *
52 * @ingroup Efl_Ui_Focus_Parent_Provider_Gen
53 */
54EOAPI void efl_ui_focus_parent_provider_gen_container_set(Eo *obj, Efl_Ui_Widget *container);
55
56/**
57 * @brief Container property
58 *
59 * @param[in] obj The object.
60 *
61 * @return Container widget
62 *
63 * @ingroup Efl_Ui_Focus_Parent_Provider_Gen
64 */
65EOAPI Efl_Ui_Widget *efl_ui_focus_parent_provider_gen_container_get(const Eo *obj);
66
67/**
68 * @brief Fetch the item where the item is a subchild from
69 *
70 * @param[in] obj The object.
71 * @param[in] widget
72 *
73 * @ingroup Efl_Ui_Focus_Parent_Provider_Gen
74 */
75EOAPI Efl_Ui_Widget *efl_ui_focus_parent_provider_gen_item_fetch(Eo *obj, Efl_Ui_Widget *widget);
76#endif /* EFL_BETA_API_SUPPORT */
77
78#endif
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index fe0d426..f2ba6c5 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -13,7 +13,7 @@
13#include "elm_priv.h" 13#include "elm_priv.h"
14#include "elm_widget_gengrid.h" 14#include "elm_widget_gengrid.h"
15#include "elm_interface_scrollable.h" 15#include "elm_interface_scrollable.h"
16#include "efl_ui_focus_parent_provider_gen.eo.h" 16#include "efl_ui_focus_parent_provider_gen_eo.h"
17#include "efl_ui_focus_composition_adapter.eo.h" 17#include "efl_ui_focus_composition_adapter.eo.h"
18#include "elm_gengrid_item_eo.h" 18#include "elm_gengrid_item_eo.h"
19#include "elm_gengrid_pan_eo.h" 19#include "elm_gengrid_pan_eo.h"
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 3bb2f6b..2be903d 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -16,7 +16,7 @@
16#include "elm_priv.h" 16#include "elm_priv.h"
17#include "elm_widget_genlist.h" 17#include "elm_widget_genlist.h"
18#include "elm_interface_scrollable.h" 18#include "elm_interface_scrollable.h"
19#include "efl_ui_focus_parent_provider_gen.eo.h" 19#include "efl_ui_focus_parent_provider_gen_eo.h"
20#include "efl_ui_focus_composition_adapter.eo.h" 20#include "efl_ui_focus_composition_adapter.eo.h"
21#include "elm_genlist_item_eo.h" 21#include "elm_genlist_item_eo.h"
22#include "elm_genlist_pan_eo.h" 22#include "elm_genlist_pan_eo.h"
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 43e67b4..acadec7 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -232,7 +232,6 @@ priv_eo_files = [
232 'efl_ui_focus_composition_adapter.eo', 232 'efl_ui_focus_composition_adapter.eo',
233 'efl_ui_focus_parent_provider.eo', 233 'efl_ui_focus_parent_provider.eo',
234 'efl_ui_focus_parent_provider_standard.eo', 234 'efl_ui_focus_parent_provider_standard.eo',
235 'efl_ui_focus_parent_provider_gen.eo',
236 'efl_ui_state_model.eo', 235 'efl_ui_state_model.eo',
237 'efl_ui_selection_manager.eo', 236 'efl_ui_selection_manager.eo',
238 'efl_datetime_manager.eo', 237 'efl_datetime_manager.eo',
@@ -810,6 +809,7 @@ elementary_pub_headers = [
810 'elm_widget_item_eo.legacy.h', 809 'elm_widget_item_eo.legacy.h',
811 'elm_widget_item_static_focus_eo.h', 810 'elm_widget_item_static_focus_eo.h',
812 'elm_widget_item_static_focus_eo.legacy.h', 811 'elm_widget_item_static_focus_eo.legacy.h',
812 'efl_ui_focus_parent_provider_gen_eo.h',
813] 813]
814 814
815elementary_header_src = [ 815elementary_header_src = [