summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2019-03-21 21:06:09 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2019-03-22 16:04:29 +0900
commit0225db71c06cae4108813b3ce2ff92273ce9e53c (patch)
treedf831bcc53b3cae47f3c028c94de6ab00e0df51f
parentbb81ccdac13c4529cff4fd6f5b5df337fa83b262 (diff)
elm_atspi_app_object: 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
-rw-r--r--src/Makefile_Elementary.am4
-rw-r--r--src/lib/elementary/elm_atspi_app_object.c2
-rw-r--r--src/lib/elementary/elm_atspi_app_object.eo12
-rw-r--r--src/lib/elementary/elm_atspi_app_object.h4
-rw-r--r--src/lib/elementary/elm_atspi_app_object_eo.c55
-rw-r--r--src/lib/elementary/elm_atspi_app_object_eo.h24
-rw-r--r--src/lib/elementary/elm_atspi_app_object_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_priv.h1
-rw-r--r--src/lib/elementary/meson.build2
9 files changed, 105 insertions, 16 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index c006680071..b1fad382cc 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -144,7 +144,6 @@ elm_public_eolian_files += \
144 lib/elementary/elm_multibuttonentry_part.eo \ 144 lib/elementary/elm_multibuttonentry_part.eo \
145 lib/elementary/elm_interface_scrollable.eo \ 145 lib/elementary/elm_interface_scrollable.eo \
146 lib/elementary/elm_atspi_bridge.eo \ 146 lib/elementary/elm_atspi_bridge.eo \
147 lib/elementary/elm_atspi_app_object.eo \
148 lib/elementary/efl_ui_image_zoomable_pan.eo \ 147 lib/elementary/efl_ui_image_zoomable_pan.eo \
149 $(NULL) 148 $(NULL)
150 149
@@ -256,6 +255,7 @@ lib/elementary/elm_access_eo.c \
256lib/elementary/elm_access_eo.legacy.c \ 255lib/elementary/elm_access_eo.legacy.c \
257lib/elementary/elm_actionslider_eo.c \ 256lib/elementary/elm_actionslider_eo.c \
258lib/elementary/elm_actionslider_eo.legacy.c \ 257lib/elementary/elm_actionslider_eo.legacy.c \
258lib/elementary/elm_atspi_app_object_eo.c \
259lib/elementary/elm_box_eo.c \ 259lib/elementary/elm_box_eo.c \
260lib/elementary/elm_box_eo.legacy.c \ 260lib/elementary/elm_box_eo.legacy.c \
261lib/elementary/elm_bubble_eo.c \ 261lib/elementary/elm_bubble_eo.c \
@@ -434,6 +434,7 @@ lib/elementary/efl_ui_win_legacy_eo.legacy.h \
434lib/elementary/efl_ui_win_socket_legacy_eo.legacy.h \ 434lib/elementary/efl_ui_win_socket_legacy_eo.legacy.h \
435lib/elementary/elm_access_eo.legacy.h \ 435lib/elementary/elm_access_eo.legacy.h \
436lib/elementary/elm_actionslider_eo.legacy.h \ 436lib/elementary/elm_actionslider_eo.legacy.h \
437lib/elementary/elm_atspi_app_object_eo.legacy.h \
437lib/elementary/elm_box_eo.legacy.h \ 438lib/elementary/elm_box_eo.legacy.h \
438lib/elementary/elm_bubble_eo.legacy.h \ 439lib/elementary/elm_bubble_eo.legacy.h \
439lib/elementary/elm_calendar_eo.legacy.h \ 440lib/elementary/elm_calendar_eo.legacy.h \
@@ -541,6 +542,7 @@ lib/elementary/efl_ui_win_legacy_eo.h \
541lib/elementary/efl_ui_win_socket_legacy_eo.h \ 542lib/elementary/efl_ui_win_socket_legacy_eo.h \
542lib/elementary/elm_access_eo.h \ 543lib/elementary/elm_access_eo.h \
543lib/elementary/elm_actionslider_eo.h \ 544lib/elementary/elm_actionslider_eo.h \
545lib/elementary/elm_atspi_app_object_eo.h \
544lib/elementary/elm_box_eo.h \ 546lib/elementary/elm_box_eo.h \
545lib/elementary/elm_bubble_eo.h \ 547lib/elementary/elm_bubble_eo.h \
546lib/elementary/elm_calendar_eo.h \ 548lib/elementary/elm_calendar_eo.h \
diff --git a/src/lib/elementary/elm_atspi_app_object.c b/src/lib/elementary/elm_atspi_app_object.c
index 77cfe7f93c..e1ef62ac91 100644
--- a/src/lib/elementary/elm_atspi_app_object.c
+++ b/src/lib/elementary/elm_atspi_app_object.c
@@ -70,4 +70,4 @@ _elm_atspi_app_object_efl_access_object_role_get(const Eo *obj EINA_UNUSED, Elm_
70 return EFL_ACCESS_ROLE_APPLICATION; 70 return EFL_ACCESS_ROLE_APPLICATION;
71} 71}
72 72
73#include "elm_atspi_app_object.eo.c" 73#include "elm_atspi_app_object_eo.c"
diff --git a/src/lib/elementary/elm_atspi_app_object.eo b/src/lib/elementary/elm_atspi_app_object.eo
deleted file mode 100644
index e63e233923..0000000000
--- a/src/lib/elementary/elm_atspi_app_object.eo
+++ /dev/null
@@ -1,12 +0,0 @@
1class Elm.Atspi.App.Object extends Efl.Object implements Efl.Access.Object
2{
3 [[AT-SPI application object class]]
4 data: Elm_Atspi_App_Object_Data;
5 implements {
6 Efl.Object.destructor;
7 Efl.Access.Object.i18n_name { get; }
8 Efl.Access.Object.description { get; set; }
9 Efl.Access.Object.role { get; }
10 Efl.Access.Object.access_children { get; }
11 }
12}
diff --git a/src/lib/elementary/elm_atspi_app_object.h b/src/lib/elementary/elm_atspi_app_object.h
index f460ffd83e..e67e5524ff 100644
--- a/src/lib/elementary/elm_atspi_app_object.h
+++ b/src/lib/elementary/elm_atspi_app_object.h
@@ -1 +1,3 @@
1#include "elm_atspi_app_object.eo.h" 1#ifndef EFL_NOLEGACY_API_SUPPORT
2#include "elm_atspi_app_object_eo.legacy.h"
3#endif
diff --git a/src/lib/elementary/elm_atspi_app_object_eo.c b/src/lib/elementary/elm_atspi_app_object_eo.c
new file mode 100644
index 0000000000..2158c09038
--- /dev/null
+++ b/src/lib/elementary/elm_atspi_app_object_eo.c
@@ -0,0 +1,55 @@
1
2void _elm_atspi_app_object_efl_object_destructor(Eo *obj, Elm_Atspi_App_Object_Data *pd);
3
4
5const char *_elm_atspi_app_object_efl_access_object_i18n_name_get(const Eo *obj, Elm_Atspi_App_Object_Data *pd);
6
7
8void _elm_atspi_app_object_efl_access_object_description_set(Eo *obj, Elm_Atspi_App_Object_Data *pd, const char *description);
9
10
11const char *_elm_atspi_app_object_efl_access_object_description_get(const Eo *obj, Elm_Atspi_App_Object_Data *pd);
12
13
14Efl_Access_Role _elm_atspi_app_object_efl_access_object_role_get(const Eo *obj, Elm_Atspi_App_Object_Data *pd);
15
16
17Eina_List *_elm_atspi_app_object_efl_access_object_access_children_get(const Eo *obj, Elm_Atspi_App_Object_Data *pd);
18
19
20static Eina_Bool
21_elm_atspi_app_object_class_initializer(Efl_Class *klass)
22{
23 const Efl_Object_Ops *opsp = NULL;
24
25 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
26
27#ifndef ELM_ATSPI_APP_OBJECT_EXTRA_OPS
28#define ELM_ATSPI_APP_OBJECT_EXTRA_OPS
29#endif
30
31 EFL_OPS_DEFINE(ops,
32 EFL_OBJECT_OP_FUNC(efl_destructor, _elm_atspi_app_object_efl_object_destructor),
33 EFL_OBJECT_OP_FUNC(efl_access_object_i18n_name_get, _elm_atspi_app_object_efl_access_object_i18n_name_get),
34 EFL_OBJECT_OP_FUNC(efl_access_object_description_set, _elm_atspi_app_object_efl_access_object_description_set),
35 EFL_OBJECT_OP_FUNC(efl_access_object_description_get, _elm_atspi_app_object_efl_access_object_description_get),
36 EFL_OBJECT_OP_FUNC(efl_access_object_role_get, _elm_atspi_app_object_efl_access_object_role_get),
37 EFL_OBJECT_OP_FUNC(efl_access_object_access_children_get, _elm_atspi_app_object_efl_access_object_access_children_get),
38 ELM_ATSPI_APP_OBJECT_EXTRA_OPS
39 );
40 opsp = &ops;
41
42 return efl_class_functions_set(klass, opsp, ropsp);
43}
44
45static const Efl_Class_Description _elm_atspi_app_object_class_desc = {
46 EO_VERSION,
47 "Elm.Atspi.App.Object",
48 EFL_CLASS_TYPE_REGULAR,
49 sizeof(Elm_Atspi_App_Object_Data),
50 _elm_atspi_app_object_class_initializer,
51 NULL,
52 NULL
53};
54
55EFL_DEFINE_CLASS(elm_atspi_app_object_class_get, &_elm_atspi_app_object_class_desc, EFL_OBJECT_CLASS, EFL_ACCESS_OBJECT_MIXIN, NULL);
diff --git a/src/lib/elementary/elm_atspi_app_object_eo.h b/src/lib/elementary/elm_atspi_app_object_eo.h
new file mode 100644
index 0000000000..0dff0ba000
--- /dev/null
+++ b/src/lib/elementary/elm_atspi_app_object_eo.h
@@ -0,0 +1,24 @@
1#ifndef _ELM_ATSPI_APP_OBJECT_EO_H_
2#define _ELM_ATSPI_APP_OBJECT_EO_H_
3
4#ifndef _ELM_ATSPI_APP_OBJECT_EO_CLASS_TYPE
5#define _ELM_ATSPI_APP_OBJECT_EO_CLASS_TYPE
6
7typedef Eo Elm_Atspi_App_Object;
8
9#endif
10
11#ifndef _ELM_ATSPI_APP_OBJECT_EO_TYPES
12#define _ELM_ATSPI_APP_OBJECT_EO_TYPES
13
14
15#endif
16/** AT-SPI application object class
17 *
18 * @ingroup Elm_Atspi_App_Object
19 */
20#define ELM_ATSPI_APP_OBJECT_CLASS elm_atspi_app_object_class_get()
21
22EWAPI const Efl_Class *elm_atspi_app_object_class_get(void);
23
24#endif
diff --git a/src/lib/elementary/elm_atspi_app_object_eo.legacy.h b/src/lib/elementary/elm_atspi_app_object_eo.legacy.h
new file mode 100644
index 0000000000..993c31100f
--- /dev/null
+++ b/src/lib/elementary/elm_atspi_app_object_eo.legacy.h
@@ -0,0 +1,17 @@
1#ifndef _ELM_ATSPI_APP_OBJECT_EO_LEGACY_H_
2#define _ELM_ATSPI_APP_OBJECT_EO_LEGACY_H_
3
4#ifndef _ELM_ATSPI_APP_OBJECT_EO_CLASS_TYPE
5#define _ELM_ATSPI_APP_OBJECT_EO_CLASS_TYPE
6
7typedef Eo Elm_Atspi_App_Object;
8
9#endif
10
11#ifndef _ELM_ATSPI_APP_OBJECT_EO_TYPES
12#define _ELM_ATSPI_APP_OBJECT_EO_TYPES
13
14
15#endif
16
17#endif
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index cf9b553c12..b92c176de8 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -67,6 +67,7 @@
67# include "elm_code_private.h" 67# include "elm_code_private.h"
68#include "elm_access_eo.h" 68#include "elm_access_eo.h"
69#include "elm_actionslider_eo.h" 69#include "elm_actionslider_eo.h"
70#include "elm_atspi_app_object_eo.h"
70#include "elm_box_eo.h" 71#include "elm_box_eo.h"
71#include "elm_bubble_eo.h" 72#include "elm_bubble_eo.h"
72#include "elm_calendar_eo.h" 73#include "elm_calendar_eo.h"
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 4f3b3b7d4b..44b3e17b04 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -172,7 +172,6 @@ pub_eo_files = [
172 'elm_multibuttonentry_part.eo', 172 'elm_multibuttonentry_part.eo',
173 'elm_interface_scrollable.eo', 173 'elm_interface_scrollable.eo',
174 'elm_atspi_bridge.eo', 174 'elm_atspi_bridge.eo',
175 'elm_atspi_app_object.eo',
176 'efl_ui_image_zoomable_pan.eo', 175 'efl_ui_image_zoomable_pan.eo',
177 'efl_ui_text_part.eo', 176 'efl_ui_text_part.eo',
178 'efl_ui_caching_factory.eo', 177 'efl_ui_caching_factory.eo',
@@ -413,6 +412,7 @@ elementary_pub_headers = [
413 'elm_actionslider_legacy.h', 412 'elm_actionslider_legacy.h',
414 'elm_app.h', 413 'elm_app.h',
415 'elm_atspi_app_object.h', 414 'elm_atspi_app_object.h',
415 'elm_atspi_app_object_eo.legacy.h',
416 'elm_authors.h', 416 'elm_authors.h',
417 'elm_bg.h', 417 'elm_bg.h',
418 'elm_bg_legacy.h', 418 'elm_bg_legacy.h',