summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2019-03-21 21:29:00 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2019-03-22 16:04:32 +0900
commit44d0cb926098e34185d4a2cbc1ab1a705e50d25e (patch)
tree6bff8f9fd2205454a35e9692cb4dc81f2b01291a
parent0225db71c06cae4108813b3ce2ff92273ce9e53c (diff)
elm_atspi_bridge: 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.am7
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c2
-rw-r--r--src/lib/elementary/elm_atspi_bridge.eo24
-rw-r--r--src/lib/elementary/elm_atspi_bridge.h5
-rw-r--r--src/lib/elementary/elm_atspi_bridge_eo.c66
-rw-r--r--src/lib/elementary/elm_atspi_bridge_eo.h51
-rw-r--r--src/lib/elementary/elm_atspi_bridge_eo.legacy.c6
-rw-r--r--src/lib/elementary/elm_atspi_bridge_eo.legacy.h28
-rw-r--r--src/lib/elementary/elm_priv.h1
-rw-r--r--src/lib/elementary/meson.build4
10 files changed, 163 insertions, 31 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index b1fad382cc..4b132104f0 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -143,7 +143,6 @@ elm_public_eolian_files += \
143 lib/elementary/efl_ui_progressbar_legacy_part.eo \ 143 lib/elementary/efl_ui_progressbar_legacy_part.eo \
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 \
147 lib/elementary/efl_ui_image_zoomable_pan.eo \ 146 lib/elementary/efl_ui_image_zoomable_pan.eo \
148 $(NULL) 147 $(NULL)
149 148
@@ -256,6 +255,8 @@ lib/elementary/elm_access_eo.legacy.c \
256lib/elementary/elm_actionslider_eo.c \ 255lib/elementary/elm_actionslider_eo.c \
257lib/elementary/elm_actionslider_eo.legacy.c \ 256lib/elementary/elm_actionslider_eo.legacy.c \
258lib/elementary/elm_atspi_app_object_eo.c \ 257lib/elementary/elm_atspi_app_object_eo.c \
258lib/elementary/elm_atspi_bridge_eo.c \
259lib/elementary/elm_atspi_bridge_eo.legacy.c \
259lib/elementary/elm_box_eo.c \ 260lib/elementary/elm_box_eo.c \
260lib/elementary/elm_box_eo.legacy.c \ 261lib/elementary/elm_box_eo.legacy.c \
261lib/elementary/elm_bubble_eo.c \ 262lib/elementary/elm_bubble_eo.c \
@@ -435,6 +436,7 @@ lib/elementary/efl_ui_win_socket_legacy_eo.legacy.h \
435lib/elementary/elm_access_eo.legacy.h \ 436lib/elementary/elm_access_eo.legacy.h \
436lib/elementary/elm_actionslider_eo.legacy.h \ 437lib/elementary/elm_actionslider_eo.legacy.h \
437lib/elementary/elm_atspi_app_object_eo.legacy.h \ 438lib/elementary/elm_atspi_app_object_eo.legacy.h \
439lib/elementary/elm_atspi_bridge_eo.legacy.h \
438lib/elementary/elm_box_eo.legacy.h \ 440lib/elementary/elm_box_eo.legacy.h \
439lib/elementary/elm_bubble_eo.legacy.h \ 441lib/elementary/elm_bubble_eo.legacy.h \
440lib/elementary/elm_calendar_eo.legacy.h \ 442lib/elementary/elm_calendar_eo.legacy.h \
@@ -543,6 +545,7 @@ lib/elementary/efl_ui_win_socket_legacy_eo.h \
543lib/elementary/elm_access_eo.h \ 545lib/elementary/elm_access_eo.h \
544lib/elementary/elm_actionslider_eo.h \ 546lib/elementary/elm_actionslider_eo.h \
545lib/elementary/elm_atspi_app_object_eo.h \ 547lib/elementary/elm_atspi_app_object_eo.h \
548lib/elementary/elm_atspi_bridge_eo.h \
546lib/elementary/elm_box_eo.h \ 549lib/elementary/elm_box_eo.h \
547lib/elementary/elm_bubble_eo.h \ 550lib/elementary/elm_bubble_eo.h \
548lib/elementary/elm_calendar_eo.h \ 551lib/elementary/elm_calendar_eo.h \
@@ -645,7 +648,6 @@ includesdir = $(includedir)/elementary-@VMAJ@
645 648
646includesunstable_HEADERS = \ 649includesunstable_HEADERS = \
647 lib/elementary/elm_gen_common.h \ 650 lib/elementary/elm_gen_common.h \
648 lib/elementary/elm_atspi_bridge.h \
649 lib/elementary/efl_access_object.h \ 651 lib/elementary/efl_access_object.h \
650 lib/elementary/efl_access_text.h \ 652 lib/elementary/efl_access_text.h \
651 lib/elementary/efl_access_widget_action.h \ 653 lib/elementary/efl_access_widget_action.h \
@@ -802,6 +804,7 @@ includesub_HEADERS = \
802 lib/elementary/elm_actionslider_legacy.h \ 804 lib/elementary/elm_actionslider_legacy.h \
803 lib/elementary/elm_app.h \ 805 lib/elementary/elm_app.h \
804 lib/elementary/elm_atspi_app_object.h \ 806 lib/elementary/elm_atspi_app_object.h \
807 lib/elementary/elm_atspi_bridge.h \
805 lib/elementary/elm_authors.h \ 808 lib/elementary/elm_authors.h \
806 lib/elementary/elm_bg.h \ 809 lib/elementary/elm_bg.h \
807 lib/elementary/elm_bg_legacy.h \ 810 lib/elementary/elm_bg_legacy.h \
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index e1dc3ef241..c689557d6c 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -4801,4 +4801,4 @@ _elm_atspi_bridge_efl_object_destructor(Eo *obj, Elm_Atspi_Bridge_Data *pd)
4801 efl_destructor(efl_super(obj, ELM_ATSPI_BRIDGE_CLASS)); 4801 efl_destructor(efl_super(obj, ELM_ATSPI_BRIDGE_CLASS));
4802} 4802}
4803 4803
4804#include "elm_atspi_bridge.eo.c" 4804#include "elm_atspi_bridge_eo.c"
diff --git a/src/lib/elementary/elm_atspi_bridge.eo b/src/lib/elementary/elm_atspi_bridge.eo
deleted file mode 100644
index 8ed0f1a25b..0000000000
--- a/src/lib/elementary/elm_atspi_bridge.eo
+++ /dev/null
@@ -1,24 +0,0 @@
1class Elm.Atspi.Bridge extends Efl.Object
2{
3 [[AT-SPI bridge class]]
4 eo_prefix: elm_obj_atspi_bridge;
5 event_prefix: elm_atspi_bridge;
6 methods {
7 @property connected {
8 get {
9 [[Indicate if connection with AT-SPI2 bus has been established.]]
10 values {
11 ret: bool; [[$true if connection has been established, $false otherwise]]
12 }
13 }
14 }
15 }
16 implements {
17 Efl.Object.constructor;
18 Efl.Object.destructor;
19 }
20 events {
21 connected: void; [[Connected with AT-SPI2 bus]]
22 disconnected: void; [[Disconnected from AT-SPI2 bus]]
23 }
24}
diff --git a/src/lib/elementary/elm_atspi_bridge.h b/src/lib/elementary/elm_atspi_bridge.h
index 5e5673b2b0..c889027b58 100644
--- a/src/lib/elementary/elm_atspi_bridge.h
+++ b/src/lib/elementary/elm_atspi_bridge.h
@@ -1,3 +1,4 @@
1#ifdef EFL_BETA_API_SUPPORT 1#ifndef EFL_NOLEGACY_API_SUPPORT
2#include "elm_atspi_bridge.eo.h" 2#include "elm_atspi_bridge_eo.legacy.h"
3#endif 3#endif
4
diff --git a/src/lib/elementary/elm_atspi_bridge_eo.c b/src/lib/elementary/elm_atspi_bridge_eo.c
new file mode 100644
index 0000000000..a844f08278
--- /dev/null
+++ b/src/lib/elementary/elm_atspi_bridge_eo.c
@@ -0,0 +1,66 @@
1EWAPI const Efl_Event_Description _ELM_ATSPI_BRIDGE_EVENT_CONNECTED =
2 EFL_EVENT_DESCRIPTION("connected");
3EWAPI const Efl_Event_Description _ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED =
4 EFL_EVENT_DESCRIPTION("disconnected");
5
6Eina_Bool _elm_atspi_bridge_connected_get(const Eo *obj, Elm_Atspi_Bridge_Data *pd);
7
8
9static Eina_Value
10__eolian_elm_atspi_bridge_connected_get_reflect(Eo *obj)
11{
12 Eina_Bool val = elm_obj_atspi_bridge_connected_get(obj);
13 return eina_value_bool_init(val);
14}
15
16EOAPI EFL_FUNC_BODY_CONST(elm_obj_atspi_bridge_connected_get, Eina_Bool, 0);
17
18Efl_Object *_elm_atspi_bridge_efl_object_constructor(Eo *obj, Elm_Atspi_Bridge_Data *pd);
19
20
21void _elm_atspi_bridge_efl_object_destructor(Eo *obj, Elm_Atspi_Bridge_Data *pd);
22
23
24static Eina_Bool
25_elm_atspi_bridge_class_initializer(Efl_Class *klass)
26{
27 const Efl_Object_Ops *opsp = NULL;
28
29 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
30
31#ifndef ELM_ATSPI_BRIDGE_EXTRA_OPS
32#define ELM_ATSPI_BRIDGE_EXTRA_OPS
33#endif
34
35 EFL_OPS_DEFINE(ops,
36 EFL_OBJECT_OP_FUNC(elm_obj_atspi_bridge_connected_get, _elm_atspi_bridge_connected_get),
37 EFL_OBJECT_OP_FUNC(efl_constructor, _elm_atspi_bridge_efl_object_constructor),
38 EFL_OBJECT_OP_FUNC(efl_destructor, _elm_atspi_bridge_efl_object_destructor),
39 ELM_ATSPI_BRIDGE_EXTRA_OPS
40 );
41 opsp = &ops;
42
43 static const Efl_Object_Property_Reflection refl_table[] = {
44 {"connected", NULL, __eolian_elm_atspi_bridge_connected_get_reflect},
45 };
46 static const Efl_Object_Property_Reflection_Ops rops = {
47 refl_table, EINA_C_ARRAY_LENGTH(refl_table)
48 };
49 ropsp = &rops;
50
51 return efl_class_functions_set(klass, opsp, ropsp);
52}
53
54static const Efl_Class_Description _elm_atspi_bridge_class_desc = {
55 EO_VERSION,
56 "Elm.Atspi.Bridge",
57 EFL_CLASS_TYPE_REGULAR,
58 sizeof(Elm_Atspi_Bridge_Data),
59 _elm_atspi_bridge_class_initializer,
60 NULL,
61 NULL
62};
63
64EFL_DEFINE_CLASS(elm_atspi_bridge_class_get, &_elm_atspi_bridge_class_desc, EFL_OBJECT_CLASS, NULL);
65
66#include "elm_atspi_bridge_eo.legacy.c"
diff --git a/src/lib/elementary/elm_atspi_bridge_eo.h b/src/lib/elementary/elm_atspi_bridge_eo.h
new file mode 100644
index 0000000000..180544d25c
--- /dev/null
+++ b/src/lib/elementary/elm_atspi_bridge_eo.h
@@ -0,0 +1,51 @@
1#ifndef _ELM_ATSPI_BRIDGE_EO_H_
2#define _ELM_ATSPI_BRIDGE_EO_H_
3
4#ifndef _ELM_ATSPI_BRIDGE_EO_CLASS_TYPE
5#define _ELM_ATSPI_BRIDGE_EO_CLASS_TYPE
6
7typedef Eo Elm_Atspi_Bridge;
8
9#endif
10
11#ifndef _ELM_ATSPI_BRIDGE_EO_TYPES
12#define _ELM_ATSPI_BRIDGE_EO_TYPES
13
14
15#endif
16/** AT-SPI bridge class
17 *
18 * @ingroup Elm_Atspi_Bridge
19 */
20#define ELM_ATSPI_BRIDGE_CLASS elm_atspi_bridge_class_get()
21
22EWAPI const Efl_Class *elm_atspi_bridge_class_get(void);
23
24/**
25 * @brief Indicate if connection with AT-SPI2 bus has been established.
26 *
27 * @param[in] obj The object.
28 *
29 * @return @c true if connection has been established, @c false otherwise
30 *
31 * @ingroup Elm_Atspi_Bridge
32 */
33EOAPI Eina_Bool elm_obj_atspi_bridge_connected_get(const Eo *obj);
34
35EWAPI extern const Efl_Event_Description _ELM_ATSPI_BRIDGE_EVENT_CONNECTED;
36
37/** Connected with AT-SPI2 bus
38 *
39 * @ingroup Elm_Atspi_Bridge
40 */
41#define ELM_ATSPI_BRIDGE_EVENT_CONNECTED (&(_ELM_ATSPI_BRIDGE_EVENT_CONNECTED))
42
43EWAPI extern const Efl_Event_Description _ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED;
44
45/** Disconnected from AT-SPI2 bus
46 *
47 * @ingroup Elm_Atspi_Bridge
48 */
49#define ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED (&(_ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED))
50
51#endif
diff --git a/src/lib/elementary/elm_atspi_bridge_eo.legacy.c b/src/lib/elementary/elm_atspi_bridge_eo.legacy.c
new file mode 100644
index 0000000000..8f6ffebcc8
--- /dev/null
+++ b/src/lib/elementary/elm_atspi_bridge_eo.legacy.c
@@ -0,0 +1,6 @@
1
2EAPI Eina_Bool
3elm_atspi_bridge_connected_get(const Elm_Atspi_Bridge *obj)
4{
5 return elm_obj_atspi_bridge_connected_get(obj);
6}
diff --git a/src/lib/elementary/elm_atspi_bridge_eo.legacy.h b/src/lib/elementary/elm_atspi_bridge_eo.legacy.h
new file mode 100644
index 0000000000..ed90721eb6
--- /dev/null
+++ b/src/lib/elementary/elm_atspi_bridge_eo.legacy.h
@@ -0,0 +1,28 @@
1#ifndef _ELM_ATSPI_BRIDGE_EO_LEGACY_H_
2#define _ELM_ATSPI_BRIDGE_EO_LEGACY_H_
3
4#ifndef _ELM_ATSPI_BRIDGE_EO_CLASS_TYPE
5#define _ELM_ATSPI_BRIDGE_EO_CLASS_TYPE
6
7typedef Eo Elm_Atspi_Bridge;
8
9#endif
10
11#ifndef _ELM_ATSPI_BRIDGE_EO_TYPES
12#define _ELM_ATSPI_BRIDGE_EO_TYPES
13
14
15#endif
16
17/**
18 * @brief Indicate if connection with AT-SPI2 bus has been established.
19 *
20 * @param[in] obj The object.
21 *
22 * @return @c true if connection has been established, @c false otherwise
23 *
24 * @ingroup Elm_Atspi_Bridge_Group
25 */
26EAPI Eina_Bool elm_atspi_bridge_connected_get(const Elm_Atspi_Bridge *obj);
27
28#endif
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index b92c176de8..f6974a9ba0 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -68,6 +68,7 @@
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_atspi_app_object_eo.h"
71#include "elm_atspi_bridge_eo.h"
71#include "elm_box_eo.h" 72#include "elm_box_eo.h"
72#include "elm_bubble_eo.h" 73#include "elm_bubble_eo.h"
73#include "elm_calendar_eo.h" 74#include "elm_calendar_eo.h"
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 44b3e17b04..c67bbf32f8 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -171,7 +171,6 @@ pub_eo_files = [
171 'efl_ui_progressbar_legacy_part.eo', 171 'efl_ui_progressbar_legacy_part.eo',
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',
175 'efl_ui_image_zoomable_pan.eo', 174 'efl_ui_image_zoomable_pan.eo',
176 'efl_ui_text_part.eo', 175 'efl_ui_text_part.eo',
177 'efl_ui_caching_factory.eo', 176 'efl_ui_caching_factory.eo',
@@ -260,7 +259,6 @@ eolian_include_directories += ['-I', meson.current_source_dir()]
260 259
261elementary_headers_unstable = [ 260elementary_headers_unstable = [
262 'elm_gen_common.h', 261 'elm_gen_common.h',
263 'elm_atspi_bridge.h',
264 'efl_access_object.h', 262 'efl_access_object.h',
265 'efl_access_text.h', 263 'efl_access_text.h',
266 'efl_access_widget_action.h', 264 'efl_access_widget_action.h',
@@ -413,6 +411,8 @@ elementary_pub_headers = [
413 'elm_app.h', 411 'elm_app.h',
414 'elm_atspi_app_object.h', 412 'elm_atspi_app_object.h',
415 'elm_atspi_app_object_eo.legacy.h', 413 'elm_atspi_app_object_eo.legacy.h',
414 'elm_atspi_bridge.h',
415 'elm_atspi_bridge_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',