summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2016-05-17 17:14:47 +0100
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2016-05-17 17:50:43 +0100
commit7782c0bcb956263e4b58b9ee5640381fe7b3c4f9 (patch)
tree42845dcc2450ec2815c320379c83c2017fda4f57 /src/lib
parentf007380fb948f426d04778965ec4d192fe953cc2 (diff)
eolian: add event_prefix and have classes follow that or eo_prefix by default
Previously events used to use class name as a prefix and ignored eo_prefix when specified. This is no longer the case. Events follow eo_prefix by default now. In order to get around this for classes where this is undesirable, a new field event_prefix was added which takes priority over eo_prefix. If neither is specified, class name is used like previously. @feature
Diffstat (limited to '')
-rw-r--r--src/lib/ecore/ecore_exe.eo1
-rw-r--r--src/lib/ecore/ecore_idle_enterer.c2
-rw-r--r--src/lib/ecore/ecore_idle_exiter.c2
-rw-r--r--src/lib/ecore/ecore_idler.c2
-rw-r--r--src/lib/ecore/ecore_main.c6
-rw-r--r--src/lib/ecore/ecore_timer.c6
-rw-r--r--src/lib/ecore/efl_loop_fd.c4
-rw-r--r--src/lib/ecore_audio/ecore_audio_in.eo1
-rw-r--r--src/lib/ecore_audio/ecore_audio_out_pulse.eo1
-rw-r--r--src/lib/ecore_evas/ecore_evas.c4
-rw-r--r--src/lib/edje/edje_containers.c4
-rw-r--r--src/lib/edje/edje_object.eo1
-rw-r--r--src/lib/efl/interfaces/efl_container.eo1
-rw-r--r--src/lib/efl/interfaces/efl_vpath_manager.c4
-rw-r--r--src/lib/elementary/efl_ui_grid.c2
-rw-r--r--src/lib/elementary/elm_actionslider.eo1
-rw-r--r--src/lib/elementary/elm_app_server.c6
-rw-r--r--src/lib/elementary/elm_atspi_bridge.eo1
-rw-r--r--src/lib/elementary/elm_box.eo1
-rw-r--r--src/lib/elementary/elm_calendar.eo1
-rw-r--r--src/lib/elementary/elm_check.c6
-rw-r--r--src/lib/elementary/elm_clock.eo1
-rw-r--r--src/lib/elementary/elm_colorselector.eo1
-rw-r--r--src/lib/elementary/elm_combobox.eo1
-rw-r--r--src/lib/elementary/elm_conformant.eo1
-rw-r--r--src/lib/elementary/elm_ctxpopup.eo1
-rw-r--r--src/lib/elementary/elm_datetime.eo1
-rw-r--r--src/lib/elementary/elm_dayselector.c6
-rw-r--r--src/lib/elementary/elm_dayselector.eo1
-rw-r--r--src/lib/elementary/elm_diskselector.eo1
-rw-r--r--src/lib/elementary/elm_entry.c4
-rw-r--r--src/lib/elementary/elm_entry.eo1
-rw-r--r--src/lib/elementary/elm_fileselector.eo1
-rw-r--r--src/lib/elementary/elm_fileselector_button.eo1
-rw-r--r--src/lib/elementary/elm_fileselector_entry.eo1
-rw-r--r--src/lib/elementary/elm_flip.eo1
-rw-r--r--src/lib/elementary/elm_flipselector.eo1
-rw-r--r--src/lib/elementary/elm_frame.eo1
-rw-r--r--src/lib/elementary/elm_gengrid.eo1
-rw-r--r--src/lib/elementary/elm_gengrid_pan.eo1
-rw-r--r--src/lib/elementary/elm_genlist.eo1
-rw-r--r--src/lib/elementary/elm_genlist_pan.eo1
-rw-r--r--src/lib/elementary/elm_glview.c2
-rw-r--r--src/lib/elementary/elm_glview.eo1
-rw-r--r--src/lib/elementary/elm_hover.eo1
-rw-r--r--src/lib/elementary/elm_hoversel.eo1
-rw-r--r--src/lib/elementary/elm_icon.eo1
-rw-r--r--src/lib/elementary/elm_image.eo1
-rw-r--r--src/lib/elementary/elm_index.eo1
-rw-r--r--src/lib/elementary/elm_interface_atspi_accessible.c10
-rw-r--r--src/lib/elementary/elm_interface_atspi_image.c4
-rw-r--r--src/lib/elementary/elm_label.eo1
-rw-r--r--src/lib/elementary/elm_layout.eo1
-rw-r--r--src/lib/elementary/elm_list.eo1
-rw-r--r--src/lib/elementary/elm_map.eo1
-rw-r--r--src/lib/elementary/elm_map_pan.eo1
-rw-r--r--src/lib/elementary/elm_menu.eo1
-rw-r--r--src/lib/elementary/elm_multibuttonentry.eo1
-rw-r--r--src/lib/elementary/elm_naviframe.eo1
-rw-r--r--src/lib/elementary/elm_notify.eo1
-rw-r--r--src/lib/elementary/elm_pan.eo1
-rw-r--r--src/lib/elementary/elm_panes.eo1
-rw-r--r--src/lib/elementary/elm_photocam.eo1
-rw-r--r--src/lib/elementary/elm_photocam_pan.eo1
-rw-r--r--src/lib/elementary/elm_player.eo1
-rw-r--r--src/lib/elementary/elm_plug.eo1
-rw-r--r--src/lib/elementary/elm_popup.eo1
-rw-r--r--src/lib/elementary/elm_prefs.eo1
-rw-r--r--src/lib/elementary/elm_progressbar.eo1
-rw-r--r--src/lib/elementary/elm_radio.eo1
-rw-r--r--src/lib/elementary/elm_scroller.eo1
-rw-r--r--src/lib/elementary/elm_segment_control.eo1
-rw-r--r--src/lib/elementary/elm_slider.eo1
-rw-r--r--src/lib/elementary/elm_slideshow.eo1
-rw-r--r--src/lib/elementary/elm_slideshow_item.eo1
-rw-r--r--src/lib/elementary/elm_spinner.eo1
-rw-r--r--src/lib/elementary/elm_thumb.eo1
-rw-r--r--src/lib/elementary/elm_toolbar.eo1
-rw-r--r--src/lib/elementary/elm_web.eo1
-rw-r--r--src/lib/elementary/elm_widget.c2
-rw-r--r--src/lib/elementary/elm_widget.eo1
-rw-r--r--src/lib/elementary/elm_win.eo1
-rw-r--r--src/lib/emotion/emotion_object.eo1
-rw-r--r--src/lib/eo/eo_base_class.c8
-rw-r--r--src/lib/eo/eo_private.h2
-rw-r--r--src/lib/eolian/Eolian.h10
-rw-r--r--src/lib/eolian/database_class.c1
-rw-r--r--src/lib/eolian/database_class_api.c7
-rw-r--r--src/lib/eolian/database_event_api.c6
-rw-r--r--src/lib/eolian/eo_lexer.h6
-rw-r--r--src/lib/eolian/eo_parser.c10
-rw-r--r--src/lib/eolian/eolian_database.h1
-rw-r--r--src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh2
-rw-r--r--src/lib/eolian_cxx/grammar/parameters_generator.hh2
-rw-r--r--src/lib/evas/canvas/evas_box.eo1
-rw-r--r--src/lib/evas/canvas/evas_clip.c8
-rw-r--r--src/lib/evas/canvas/evas_object.eo1
-rw-r--r--src/lib/evas/canvas/evas_object_main.c4
98 files changed, 154 insertions, 56 deletions
diff --git a/src/lib/ecore/ecore_exe.eo b/src/lib/ecore/ecore_exe.eo
index 454133407d..3ee1a563fe 100644
--- a/src/lib/ecore/ecore_exe.eo
+++ b/src/lib/ecore/ecore_exe.eo
@@ -47,6 +47,7 @@ class Ecore.Exe (Eo.Base, Efl.Control)
47 47
48 legacy_prefix: ecore_exe; 48 legacy_prefix: ecore_exe;
49 eo_prefix: ecore_obj_exe; 49 eo_prefix: ecore_obj_exe;
50 event_prefix: ecore_exe;
50 methods { 51 methods {
51 @property command { 52 @property command {
52 [[Control the command that's executed. FIXME: May need a split/rename.]] 53 [[Control the command that's executed. FIXME: May need a split/rename.]]
diff --git a/src/lib/ecore/ecore_idle_enterer.c b/src/lib/ecore/ecore_idle_enterer.c
index 0cefb05d0f..3ef93c6aa2 100644
--- a/src/lib/ecore/ecore_idle_enterer.c
+++ b/src/lib/ecore/ecore_idle_enterer.c
@@ -11,7 +11,7 @@
11 11
12EO_CALLBACKS_ARRAY_DEFINE(ecore_idle_enterer_callbacks, 12EO_CALLBACKS_ARRAY_DEFINE(ecore_idle_enterer_callbacks,
13 { EFL_LOOP_EVENT_IDLE_ENTER, _ecore_factorized_idle_process }, 13 { EFL_LOOP_EVENT_IDLE_ENTER, _ecore_factorized_idle_process },
14 { EO_BASE_EVENT_DEL, _ecore_factorized_idle_event_del }); 14 { EO_EVENT_DEL, _ecore_factorized_idle_event_del });
15 15
16 16
17EAPI Ecore_Idle_Enterer * 17EAPI Ecore_Idle_Enterer *
diff --git a/src/lib/ecore/ecore_idle_exiter.c b/src/lib/ecore/ecore_idle_exiter.c
index acd7294385..3f51c4e689 100644
--- a/src/lib/ecore/ecore_idle_exiter.c
+++ b/src/lib/ecore/ecore_idle_exiter.c
@@ -11,7 +11,7 @@
11 11
12EO_CALLBACKS_ARRAY_DEFINE(ecore_idle_exiter_callbacks, 12EO_CALLBACKS_ARRAY_DEFINE(ecore_idle_exiter_callbacks,
13 { EFL_LOOP_EVENT_IDLE_EXIT, _ecore_factorized_idle_process }, 13 { EFL_LOOP_EVENT_IDLE_EXIT, _ecore_factorized_idle_process },
14 { EO_BASE_EVENT_DEL, _ecore_factorized_idle_event_del }); 14 { EO_EVENT_DEL, _ecore_factorized_idle_event_del });
15 15
16EAPI Ecore_Idle_Exiter * 16EAPI Ecore_Idle_Exiter *
17ecore_idle_exiter_add(Ecore_Task_Cb func, 17ecore_idle_exiter_add(Ecore_Task_Cb func,
diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c
index c751a5ae25..f0d6cd7e6f 100644
--- a/src/lib/ecore/ecore_idler.c
+++ b/src/lib/ecore/ecore_idler.c
@@ -102,7 +102,7 @@ _ecore_factorized_idle_add(const Eo_Callback_Array_Item *desc,
102 102
103EO_CALLBACKS_ARRAY_DEFINE(ecore_idler_callbacks, 103EO_CALLBACKS_ARRAY_DEFINE(ecore_idler_callbacks,
104 { EFL_LOOP_EVENT_IDLE, _ecore_factorized_idle_process }, 104 { EFL_LOOP_EVENT_IDLE, _ecore_factorized_idle_process },
105 { EO_BASE_EVENT_DEL, _ecore_factorized_idle_event_del }); 105 { EO_EVENT_DEL, _ecore_factorized_idle_event_del });
106 106
107EAPI Ecore_Idler * 107EAPI Ecore_Idler *
108ecore_idler_add(Ecore_Task_Cb func, 108ecore_idler_add(Ecore_Task_Cb func,
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 2415f2a873..0db106384c 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -2790,8 +2790,8 @@ _check_event_catcher_del(void *data, const Eo_Event *event)
2790} 2790}
2791 2791
2792EO_CALLBACKS_ARRAY_DEFINE(event_catcher_watch, 2792EO_CALLBACKS_ARRAY_DEFINE(event_catcher_watch,
2793 { EO_BASE_EVENT_CALLBACK_ADD, _check_event_catcher_add }, 2793 { EO_EVENT_CALLBACK_ADD, _check_event_catcher_add },
2794 { EO_BASE_EVENT_CALLBACK_DEL, _check_event_catcher_del }); 2794 { EO_EVENT_CALLBACK_DEL, _check_event_catcher_del });
2795 2795
2796EOLIAN static Eo_Base * 2796EOLIAN static Eo_Base *
2797_efl_loop_eo_base_constructor(Eo *obj, Efl_Loop_Data *pd) 2797_efl_loop_eo_base_constructor(Eo *obj, Efl_Loop_Data *pd)
@@ -2899,7 +2899,7 @@ _efl_loop_timeout_force_cancel_cb(void *data, const Eo_Event *event EINA_UNUSED)
2899 2899
2900EO_CALLBACKS_ARRAY_DEFINE(timeout, 2900EO_CALLBACKS_ARRAY_DEFINE(timeout,
2901 { EFL_TIMER_EVENT_TICK, _efl_loop_timeout_cb }, 2901 { EFL_TIMER_EVENT_TICK, _efl_loop_timeout_cb },
2902 { EO_BASE_EVENT_DEL, _efl_loop_timeout_force_cancel_cb }); 2902 { EO_EVENT_DEL, _efl_loop_timeout_force_cancel_cb });
2903 2903
2904static void 2904static void
2905_efl_loop_timeout(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, Eina_Promise_Owner *promise, double time, const void *data) 2905_efl_loop_timeout(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, Eina_Promise_Owner *promise, double time, const void *data)
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index d8dd17930f..a1226eb94e 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -116,8 +116,8 @@ _check_timer_event_catcher_del(void *data, const Eo_Event *event)
116} 116}
117 117
118EO_CALLBACKS_ARRAY_DEFINE(timer_watch, 118EO_CALLBACKS_ARRAY_DEFINE(timer_watch,
119 { EO_BASE_EVENT_CALLBACK_ADD, _check_timer_event_catcher_add }, 119 { EO_EVENT_CALLBACK_ADD, _check_timer_event_catcher_add },
120 { EO_BASE_EVENT_CALLBACK_DEL, _check_timer_event_catcher_del }); 120 { EO_EVENT_CALLBACK_DEL, _check_timer_event_catcher_del });
121 121
122EOLIAN static Eo * 122EOLIAN static Eo *
123_efl_timer_eo_base_constructor(Eo *obj, Efl_Timer_Data *timer) 123_efl_timer_eo_base_constructor(Eo *obj, Efl_Timer_Data *timer)
@@ -179,7 +179,7 @@ _ecore_timer_legacy_tick(void *data, const Eo_Event *event)
179 179
180EO_CALLBACKS_ARRAY_DEFINE(legacy_timer, 180EO_CALLBACKS_ARRAY_DEFINE(legacy_timer,
181 { EFL_TIMER_EVENT_TICK, _ecore_timer_legacy_tick }, 181 { EFL_TIMER_EVENT_TICK, _ecore_timer_legacy_tick },
182 { EO_BASE_EVENT_DEL, _ecore_timer_legacy_del }); 182 { EO_EVENT_DEL, _ecore_timer_legacy_del });
183 183
184EAPI Ecore_Timer * 184EAPI Ecore_Timer *
185ecore_timer_add(double in, 185ecore_timer_add(double in,
diff --git a/src/lib/ecore/efl_loop_fd.c b/src/lib/ecore/efl_loop_fd.c
index fbef974827..4e105ef485 100644
--- a/src/lib/ecore/efl_loop_fd.c
+++ b/src/lib/ecore/efl_loop_fd.c
@@ -151,8 +151,8 @@ _check_fd_event_catcher_del(void *data, const Eo_Event *event)
151} 151}
152 152
153EO_CALLBACKS_ARRAY_DEFINE(fd_watch, 153EO_CALLBACKS_ARRAY_DEFINE(fd_watch,
154 { EO_BASE_EVENT_CALLBACK_ADD, _check_fd_event_catcher_add }, 154 { EO_EVENT_CALLBACK_ADD, _check_fd_event_catcher_add },
155 { EO_BASE_EVENT_CALLBACK_DEL, _check_fd_event_catcher_del }); 155 { EO_EVENT_CALLBACK_DEL, _check_fd_event_catcher_del });
156 156
157static Eo_Base * 157static Eo_Base *
158_efl_loop_fd_eo_base_constructor(Eo *obj, Efl_Loop_Fd_Data *pd) 158_efl_loop_fd_eo_base_constructor(Eo *obj, Efl_Loop_Fd_Data *pd)
diff --git a/src/lib/ecore_audio/ecore_audio_in.eo b/src/lib/ecore_audio/ecore_audio_in.eo
index 3ef596b6ff..7ab998cd97 100644
--- a/src/lib/ecore_audio/ecore_audio_in.eo
+++ b/src/lib/ecore_audio/ecore_audio_in.eo
@@ -2,6 +2,7 @@ class Ecore.Audio.In (Ecore.Audio)
2{ 2{
3 [[Ecore Audio input object.]] 3 [[Ecore Audio input object.]]
4 eo_prefix: ecore_audio_obj_in; 4 eo_prefix: ecore_audio_obj_in;
5 event_prefix: ecore_audio_in;
5 data: Ecore_Audio_Input; 6 data: Ecore_Audio_Input;
6 methods { 7 methods {
7 @property speed { 8 @property speed {
diff --git a/src/lib/ecore_audio/ecore_audio_out_pulse.eo b/src/lib/ecore_audio/ecore_audio_out_pulse.eo
index 58ee140567..770aa744cb 100644
--- a/src/lib/ecore_audio/ecore_audio_out_pulse.eo
+++ b/src/lib/ecore_audio/ecore_audio_out_pulse.eo
@@ -2,6 +2,7 @@ class Ecore.Audio.Out.Pulse (Ecore.Audio.Out)
2{ 2{
3 [[Ecore audio ouput for PulseAudio.]] 3 [[Ecore audio ouput for PulseAudio.]]
4 eo_prefix: ecore_audio_obj_out_pulse; 4 eo_prefix: ecore_audio_obj_out_pulse;
5 event_prefix: ecore_audio_out_pulse;
5 implements { 6 implements {
6 Eo.Base.constructor; 7 Eo.Base.constructor;
7 Eo.Base.destructor; 8 Eo.Base.destructor;
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 4d4ed591a0..effe5848bc 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -3226,8 +3226,8 @@ _check_animator_event_catcher_del(void *data, const Eo_Event *event)
3226} 3226}
3227 3227
3228EO_CALLBACKS_ARRAY_DEFINE(animator_watch, 3228EO_CALLBACKS_ARRAY_DEFINE(animator_watch,
3229 { EO_BASE_EVENT_CALLBACK_ADD, _check_animator_event_catcher_add }, 3229 { EO_EVENT_CALLBACK_ADD, _check_animator_event_catcher_add },
3230 { EO_BASE_EVENT_CALLBACK_DEL, _check_animator_event_catcher_del }); 3230 { EO_EVENT_CALLBACK_DEL, _check_animator_event_catcher_del });
3231 3231
3232EAPI void 3232EAPI void
3233_ecore_evas_register(Ecore_Evas *ee) 3233_ecore_evas_register(Ecore_Evas *ee)
diff --git a/src/lib/edje/edje_containers.c b/src/lib/edje/edje_containers.c
index f6d7155495..59a7399a93 100644
--- a/src/lib/edje/edje_containers.c
+++ b/src/lib/edje/edje_containers.c
@@ -47,7 +47,7 @@ _edje_box_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp)
47 if (eo) return eo; 47 if (eo) return eo;
48 48
49 eo = eo_add(BOX_CLASS, obj, efl_canvas_layout_internal_box_real_part_set(eo_self, ed, rp, rp->part->name)); 49 eo = eo_add(BOX_CLASS, obj, efl_canvas_layout_internal_box_real_part_set(eo_self, ed, rp, rp->part->name));
50 eo_event_callback_add(eo, EO_BASE_EVENT_DEL, _del_cb, rp); 50 eo_event_callback_add(eo, EO_EVENT_DEL, _del_cb, rp);
51 51
52 rp->typedata.container->eo_proxy = eo; 52 rp->typedata.container->eo_proxy = eo;
53 return eo; 53 return eo;
@@ -266,7 +266,7 @@ _edje_table_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp)
266 if (eo) return eo; 266 if (eo) return eo;
267 267
268 eo = eo_add(TABLE_CLASS, obj, efl_canvas_layout_internal_table_real_part_set(eo_self, ed, rp, rp->part->name)); 268 eo = eo_add(TABLE_CLASS, obj, efl_canvas_layout_internal_table_real_part_set(eo_self, ed, rp, rp->part->name));
269 eo_event_callback_add(eo, EO_BASE_EVENT_DEL, _del_cb, rp); 269 eo_event_callback_add(eo, EO_EVENT_DEL, _del_cb, rp);
270 270
271 rp->typedata.container->eo_proxy = eo; 271 rp->typedata.container->eo_proxy = eo;
272 return eo; 272 return eo;
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index 64c438667c..24eda63bfa 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -4,6 +4,7 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container)
4{ 4{
5 legacy_prefix: edje_object; 5 legacy_prefix: edje_object;
6 eo_prefix: edje_obj; 6 eo_prefix: edje_obj;
7 event_prefix: edje_object;
7 data: Edje; 8 data: Edje;
8 methods { 9 methods {
9 @property update_hints { 10 @property update_hints {
diff --git a/src/lib/efl/interfaces/efl_container.eo b/src/lib/efl/interfaces/efl_container.eo
index 8e46e1d424..d650ad2854 100644
--- a/src/lib/efl/interfaces/efl_container.eo
+++ b/src/lib/efl/interfaces/efl_container.eo
@@ -2,6 +2,7 @@ interface Efl.Container (Efl.Gfx)
2{ 2{
3 [[API common to all UI container objects.]] 3 [[API common to all UI container objects.]]
4 eo_prefix: efl_content; 4 eo_prefix: efl_content;
5 event_prefix: efl_container;
5 methods { 6 methods {
6 @property content { 7 @property content {
7 [[Swallowed sub-object contained in this object.]] 8 [[Swallowed sub-object contained in this object.]]
diff --git a/src/lib/efl/interfaces/efl_vpath_manager.c b/src/lib/efl/interfaces/efl_vpath_manager.c
index 59be446be4..8a4d752e85 100644
--- a/src/lib/efl/interfaces/efl_vpath_manager.c
+++ b/src/lib/efl/interfaces/efl_vpath_manager.c
@@ -54,7 +54,7 @@ static Eina_Bool
54_cb_vpath_del(void *data, const Eo_Event *event) 54_cb_vpath_del(void *data, const Eo_Event *event)
55{ 55{
56 efl_vpath_manager_unregister(EFL_VPATH_MANAGER_CLASS, event->obj); 56 efl_vpath_manager_unregister(EFL_VPATH_MANAGER_CLASS, event->obj);
57 eo_event_callback_del(event->obj, EO_BASE_EVENT_DEL, _cb_vpath_del, data); 57 eo_event_callback_del(event->obj, EO_EVENT_DEL, _cb_vpath_del, data);
58 return EINA_TRUE; 58 return EINA_TRUE;
59} 59}
60 60
@@ -64,7 +64,7 @@ _efl_vpath_manager_register(Eo *obj, void *pd EINA_UNUSED, int priority, Efl_Vpa
64 Efl_Vpath_Manager_Entry *entry = malloc(sizeof(Efl_Vpath_Manager_Entry)); 64 Efl_Vpath_Manager_Entry *entry = malloc(sizeof(Efl_Vpath_Manager_Entry));
65 entry->vpath = vpath; 65 entry->vpath = vpath;
66 entry->priority = priority; 66 entry->priority = priority;
67 eo_event_callback_add(vpath, EO_BASE_EVENT_DEL, _cb_vpath_del, obj); 67 eo_event_callback_add(vpath, EO_EVENT_DEL, _cb_vpath_del, obj);
68 vpath_manager.list = eina_list_sorted_insert 68 vpath_manager.list = eina_list_sorted_insert
69 (vpath_manager.list, EINA_COMPARE_CB(_register_sort_cb), entry); 69 (vpath_manager.list, EINA_COMPARE_CB(_register_sort_cb), entry);
70} 70}
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 2638dc067c..d7c3fbbd28 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -67,7 +67,7 @@ struct _Custom_Table_Data
67}; 67};
68 68
69EO_CALLBACKS_ARRAY_DEFINE(subobj_callbacks, 69EO_CALLBACKS_ARRAY_DEFINE(subobj_callbacks,
70 { EO_BASE_EVENT_DEL, _subobj_del_cb }); 70 { EO_EVENT_DEL, _subobj_del_cb });
71 71
72static inline Eina_Bool 72static inline Eina_Bool
73_horiz(Efl_Orient dir) 73_horiz(Efl_Orient dir)
diff --git a/src/lib/elementary/elm_actionslider.eo b/src/lib/elementary/elm_actionslider.eo
index ade5fcd6e5..8c2d1db875 100644
--- a/src/lib/elementary/elm_actionslider.eo
+++ b/src/lib/elementary/elm_actionslider.eo
@@ -21,6 +21,7 @@ class Elm.Actionslider (Elm.Layout, Evas.Selectable_Interface)
21 21
22 legacy_prefix: elm_actionslider; 22 legacy_prefix: elm_actionslider;
23 eo_prefix: elm_obj_actionslider; 23 eo_prefix: elm_obj_actionslider;
24 event_prefix: elm_actionslider;
24 methods { 25 methods {
25 @property indicator_pos { 26 @property indicator_pos {
26 [[Actionslider position indicator]] 27 [[Actionslider position indicator]]
diff --git a/src/lib/elementary/elm_app_server.c b/src/lib/elementary/elm_app_server.c
index e0e275b59d..1f481cb1e9 100644
--- a/src/lib/elementary/elm_app_server.c
+++ b/src/lib/elementary/elm_app_server.c
@@ -51,7 +51,7 @@ _view_append(Elm_App_Server_Data *data, Elm_App_Server_View *view)
51 } 51 }
52 52
53 eina_hash_add(data->views, view_id, view); 53 eina_hash_add(data->views, view_id, view);
54 eo_event_callback_add(view, EO_BASE_EVENT_DEL, _view_del_cb, data); 54 eo_event_callback_add(view, EO_EVENT_DEL, _view_del_cb, data);
55 return EINA_TRUE; 55 return EINA_TRUE;
56} 56}
57 57
@@ -263,7 +263,7 @@ _elm_app_server_constructor(Eo *obj, Elm_App_Server_Data *data, const char *pkg,
263 elm_app_server_view_icon_set(view, icon_name); 263 elm_app_server_view_icon_set(view, icon_name);
264 elm_app_server_view_progress_set(view, progress); 264 elm_app_server_view_progress_set(view, progress);
265 elm_app_server_view_new_events_set(view, new_events); 265 elm_app_server_view_new_events_set(view, new_events);
266 eo_event_callback_add(view, EO_BASE_EVENT_DEL, _view_del_cb, data); 266 eo_event_callback_add(view, EO_EVENT_DEL, _view_del_cb, data);
267 elm_app_server_view_shallow(view); 267 elm_app_server_view_shallow(view);
268 268
269 eina_hash_add(data->views, view_id, view); 269 eina_hash_add(data->views, view_id, view);
@@ -433,7 +433,7 @@ _elm_app_server_eo_base_destructor(Eo *obj, Elm_App_Server_Data *data)
433 EINA_ITERATOR_FOREACH(iter, view) 433 EINA_ITERATOR_FOREACH(iter, view)
434 { 434 {
435 //do not modify hash when iterating 435 //do not modify hash when iterating
436 eo_event_callback_del(view, EO_BASE_EVENT_DEL, _view_del_cb, data); 436 eo_event_callback_del(view, EO_EVENT_DEL, _view_del_cb, data);
437 eo_unref(view); 437 eo_unref(view);
438 } 438 }
439 eina_iterator_free(iter); 439 eina_iterator_free(iter);
diff --git a/src/lib/elementary/elm_atspi_bridge.eo b/src/lib/elementary/elm_atspi_bridge.eo
index 1c2582eca8..f1fe41739c 100644
--- a/src/lib/elementary/elm_atspi_bridge.eo
+++ b/src/lib/elementary/elm_atspi_bridge.eo
@@ -2,6 +2,7 @@ class Elm.Atspi.Bridge (Eo.Base)
2{ 2{
3 legacy_prefix: elm_atspi_bridge; 3 legacy_prefix: elm_atspi_bridge;
4 eo_prefix: elm_obj_atspi_bridge; 4 eo_prefix: elm_obj_atspi_bridge;
5 event_prefix: elm_atspi_bridge;
5 methods { 6 methods {
6 @property connected { 7 @property connected {
7 get { 8 get {
diff --git a/src/lib/elementary/elm_box.eo b/src/lib/elementary/elm_box.eo
index 01ddc3b768..165662d028 100644
--- a/src/lib/elementary/elm_box.eo
+++ b/src/lib/elementary/elm_box.eo
@@ -5,6 +5,7 @@ class Elm.Box (Elm.Widget)
5{ 5{
6 legacy_prefix: elm_box; 6 legacy_prefix: elm_box;
7 eo_prefix: elm_obj_box; 7 eo_prefix: elm_obj_box;
8 event_prefix: elm_box;
8 methods { 9 methods {
9 @property homogeneous { 10 @property homogeneous {
10 set { 11 set {
diff --git a/src/lib/elementary/elm_calendar.eo b/src/lib/elementary/elm_calendar.eo
index 7ea111e197..5a9bd4b13c 100644
--- a/src/lib/elementary/elm_calendar.eo
+++ b/src/lib/elementary/elm_calendar.eo
@@ -82,6 +82,7 @@ class Elm.Calendar (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
82 ]] 82 ]]
83 legacy_prefix: elm_calendar; 83 legacy_prefix: elm_calendar;
84 eo_prefix: elm_obj_calendar; 84 eo_prefix: elm_obj_calendar;
85 event_prefix: elm_calendar;
85 methods { 86 methods {
86 @property first_day_of_week { 87 @property first_day_of_week {
87 [[The first day of week to use on calendar widgets'.]] 88 [[The first day of week to use on calendar widgets'.]]
diff --git a/src/lib/elementary/elm_check.c b/src/lib/elementary/elm_check.c
index a113bc523b..2cc5bdf50a 100644
--- a/src/lib/elementary/elm_check.c
+++ b/src/lib/elementary/elm_check.c
@@ -75,7 +75,7 @@ _activate(Evas_Object *obj)
75 _elm_access_say(E_("State: Off")); 75 _elm_access_say(E_("State: Off"));
76 } 76 }
77 77
78 eo_event_callback_call(obj, ELM_CHECK_EVENT_CHANGED, NULL); 78 eo_event_callback_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL);
79 79
80 if (_elm_config->atspi_mode) 80 if (_elm_config->atspi_mode)
81 elm_interface_atspi_accessible_state_changed_signal_emit(obj, 81 elm_interface_atspi_accessible_state_changed_signal_emit(obj,
@@ -251,7 +251,7 @@ _on_check_off(void *data,
251 if (sd->statep) *sd->statep = efl_ui_nstate_value_get(obj); 251 if (sd->statep) *sd->statep = efl_ui_nstate_value_get(obj);
252 252
253 elm_layout_signal_emit(obj, "elm,state,check,off", "elm"); 253 elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
254 eo_event_callback_call(obj, ELM_CHECK_EVENT_CHANGED, NULL); 254 eo_event_callback_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL);
255 255
256 if (_elm_config->atspi_mode) 256 if (_elm_config->atspi_mode)
257 elm_interface_atspi_accessible_state_changed_signal_emit(data, 257 elm_interface_atspi_accessible_state_changed_signal_emit(data,
@@ -272,7 +272,7 @@ _on_check_on(void *data,
272 efl_ui_nstate_value_set(obj, 1); 272 efl_ui_nstate_value_set(obj, 1);
273 if (sd->statep) *sd->statep = efl_ui_nstate_value_get(obj); 273 if (sd->statep) *sd->statep = efl_ui_nstate_value_get(obj);
274 elm_layout_signal_emit(obj, "elm,state,check,on", "elm"); 274 elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
275 eo_event_callback_call(obj, ELM_CHECK_EVENT_CHANGED, NULL); 275 eo_event_callback_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL);
276 276
277 if (_elm_config->atspi_mode) 277 if (_elm_config->atspi_mode)
278 elm_interface_atspi_accessible_state_changed_signal_emit(data, 278 elm_interface_atspi_accessible_state_changed_signal_emit(data,
diff --git a/src/lib/elementary/elm_clock.eo b/src/lib/elementary/elm_clock.eo
index 4946c1e8c6..0b9610a9b5 100644
--- a/src/lib/elementary/elm_clock.eo
+++ b/src/lib/elementary/elm_clock.eo
@@ -30,6 +30,7 @@ class Elm.Clock (Elm.Layout)
30 ]] 30 ]]
31 legacy_prefix: elm_clock; 31 legacy_prefix: elm_clock;
32 eo_prefix: elm_obj_clock; 32 eo_prefix: elm_obj_clock;
33 event_prefix: elm_clock;
33 methods { 34 methods {
34 @property show_am_pm { 35 @property show_am_pm {
35 [[If the given clock widget must show hours in military or am/pm mode 36 [[If the given clock widget must show hours in military or am/pm mode
diff --git a/src/lib/elementary/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo
index ac2f650bb3..61d4191abb 100644
--- a/src/lib/elementary/elm_colorselector.eo
+++ b/src/lib/elementary/elm_colorselector.eo
@@ -17,6 +17,7 @@ class Elm.Colorselector (Elm.Layout, Elm.Interface.Atspi_Widget_Action,
17{ 17{
18 legacy_prefix: elm_colorselector; 18 legacy_prefix: elm_colorselector;
19 eo_prefix: elm_obj_colorselector; 19 eo_prefix: elm_obj_colorselector;
20 event_prefix: elm_colorselector;
20 methods { 21 methods {
21 @property color { 22 @property color {
22 set { 23 set {
diff --git a/src/lib/elementary/elm_combobox.eo b/src/lib/elementary/elm_combobox.eo
index a23d26b8db..89ec590662 100644
--- a/src/lib/elementary/elm_combobox.eo
+++ b/src/lib/elementary/elm_combobox.eo
@@ -4,6 +4,7 @@ class Elm.Combobox (Elm.Button, Evas.Selectable_Interface,
4{ 4{
5 legacy_prefix: elm_combobox; 5 legacy_prefix: elm_combobox;
6 eo_prefix: elm_obj_combobox; 6 eo_prefix: elm_obj_combobox;
7 event_prefix: elm_combobox;
7 methods { 8 methods {
8 @property expanded { 9 @property expanded {
9 get { 10 get {
diff --git a/src/lib/elementary/elm_conformant.eo b/src/lib/elementary/elm_conformant.eo
index e6488365ab..d28013ee87 100644
--- a/src/lib/elementary/elm_conformant.eo
+++ b/src/lib/elementary/elm_conformant.eo
@@ -2,6 +2,7 @@ class Elm.Conformant (Elm.Layout)
2{ 2{
3 legacy_prefix: elm_conformant; 3 legacy_prefix: elm_conformant;
4 eo_prefix: elm_obj_conformant; 4 eo_prefix: elm_obj_conformant;
5 event_prefix: elm_conformant;
5 implements { 6 implements {
6 class.constructor; 7 class.constructor;
7 Eo.Base.constructor; 8 Eo.Base.constructor;
diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo
index 1e776048ca..92da68e240 100644
--- a/src/lib/elementary/elm_ctxpopup.eo
+++ b/src/lib/elementary/elm_ctxpopup.eo
@@ -12,6 +12,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Efl.Orientati
12{ 12{
13 legacy_prefix: elm_ctxpopup; 13 legacy_prefix: elm_ctxpopup;
14 eo_prefix: elm_obj_ctxpopup; 14 eo_prefix: elm_obj_ctxpopup;
15 event_prefix: elm_ctxpopup;
15 methods { 16 methods {
16 @property auto_hide_disabled { 17 @property auto_hide_disabled {
17 set { 18 set {
diff --git a/src/lib/elementary/elm_datetime.eo b/src/lib/elementary/elm_datetime.eo
index 33af5f9319..ed2dabb8d1 100644
--- a/src/lib/elementary/elm_datetime.eo
+++ b/src/lib/elementary/elm_datetime.eo
@@ -19,6 +19,7 @@ class Elm.Datetime (Elm.Layout)
19{ 19{
20 legacy_prefix: elm_datetime; 20 legacy_prefix: elm_datetime;
21 eo_prefix: elm_obj_datetime; 21 eo_prefix: elm_obj_datetime;
22 event_prefix: elm_datetime;
22 methods { 23 methods {
23 @property format { 24 @property format {
24 set { 25 set {
diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c
index b23d29d105..f97381a478 100644
--- a/src/lib/elementary/elm_dayselector.c
+++ b/src/lib/elementary/elm_dayselector.c
@@ -196,7 +196,7 @@ _item_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
196{ 196{
197 Elm_Dayselector_Item_Data *it = data; 197 Elm_Dayselector_Item_Data *it = data;
198 198
199 eo_event_callback_call(WIDGET(it), ELM_CHECK_EVENT_CHANGED, (void *)it->day); 199 eo_event_callback_call(WIDGET(it), EFL_UI_CHECK_EVENT_CHANGED, (void *)it->day);
200 200
201 return EINA_TRUE; 201 return EINA_TRUE;
202} 202}
@@ -270,7 +270,7 @@ _elm_dayselector_efl_container_content_set(Eo *obj, Elm_Dayselector_Data *sd, co
270 elm_layout_signal_emit(obj, buf, "elm"); 270 elm_layout_signal_emit(obj, buf, "elm");
271 271
272 eo_event_callback_add 272 eo_event_callback_add
273 (VIEW(it), ELM_CHECK_EVENT_CHANGED, _item_clicked_cb, it); 273 (VIEW(it), EFL_UI_CHECK_EVENT_CHANGED, _item_clicked_cb, it);
274 evas_object_event_callback_add 274 evas_object_event_callback_add
275 (VIEW(it), EVAS_CALLBACK_DEL, _item_del_cb, obj); 275 (VIEW(it), EVAS_CALLBACK_DEL, _item_del_cb, obj);
276 276
@@ -318,7 +318,7 @@ _elm_dayselector_efl_container_content_unset(Eo *obj, Elm_Dayselector_Data *sd,
318 if (!content) return NULL; 318 if (!content) return NULL;
319 319
320 sd->items = eina_list_remove(sd->items, it); 320 sd->items = eina_list_remove(sd->items, it);
321 eo_event_callback_del(content, ELM_CHECK_EVENT_CHANGED, _item_clicked_cb, it); 321 eo_event_callback_del(content, EFL_UI_CHECK_EVENT_CHANGED, _item_clicked_cb, it);
322 evas_object_event_callback_del(content, EVAS_CALLBACK_DEL, _item_del_cb); 322 evas_object_event_callback_del(content, EVAS_CALLBACK_DEL, _item_del_cb);
323 323
324 elm_object_signal_callback_del 324 elm_object_signal_callback_del
diff --git a/src/lib/elementary/elm_dayselector.eo b/src/lib/elementary/elm_dayselector.eo
index 1a3563b5d4..9f357e216e 100644
--- a/src/lib/elementary/elm_dayselector.eo
+++ b/src/lib/elementary/elm_dayselector.eo
@@ -21,6 +21,7 @@ class Elm.Dayselector (Elm.Layout)
21{ 21{
22 legacy_prefix: elm_dayselector; 22 legacy_prefix: elm_dayselector;
23 eo_prefix: elm_obj_dayselector; 23 eo_prefix: elm_obj_dayselector;
24 event_prefix: elm_dayselector;
24 methods { 25 methods {
25 @property week_start { 26 @property week_start {
26 set { 27 set {
diff --git a/src/lib/elementary/elm_diskselector.eo b/src/lib/elementary/elm_diskselector.eo
index 471cae49c0..6a9857f88e 100644
--- a/src/lib/elementary/elm_diskselector.eo
+++ b/src/lib/elementary/elm_diskselector.eo
@@ -5,6 +5,7 @@ class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable,
5{ 5{
6 legacy_prefix: elm_diskselector; 6 legacy_prefix: elm_diskselector;
7 eo_prefix: elm_obj_diskselector; 7 eo_prefix: elm_obj_diskselector;
8 event_prefix: elm_diskselector;
8 methods { 9 methods {
9 @property side_text_max_length { 10 @property side_text_max_length {
10 set { 11 set {
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 75fb2c26d2..d6b17b7c26 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -3945,8 +3945,8 @@ _elm_entry_eo_base_constructor(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
3945 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 3945 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
3946 evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); 3946 evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
3947 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY); 3947 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY);
3948 eo_event_callback_add(obj, EO_BASE_EVENT_CALLBACK_ADD, _cb_added, NULL); 3948 eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL);
3949 eo_event_callback_add(obj, EO_BASE_EVENT_CALLBACK_DEL, _cb_deleted, NULL); 3949 eo_event_callback_add(obj, EO_EVENT_CALLBACK_DEL, _cb_deleted, NULL);
3950 3950
3951 return obj; 3951 return obj;
3952} 3952}
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index 340c6f04f4..e883205c88 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -120,6 +120,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
120{ 120{
121 legacy_prefix: elm_entry; 121 legacy_prefix: elm_entry;
122 eo_prefix: elm_obj_entry; 122 eo_prefix: elm_obj_entry;
123 event_prefix: elm_entry;
123 methods { 124 methods {
124 @property scrollable { 125 @property scrollable {
125 set { 126 set {
diff --git a/src/lib/elementary/elm_fileselector.eo b/src/lib/elementary/elm_fileselector.eo
index ada217e93e..d41300df12 100644
--- a/src/lib/elementary/elm_fileselector.eo
+++ b/src/lib/elementary/elm_fileselector.eo
@@ -4,6 +4,7 @@ class Elm.Fileselector (Elm.Layout, Elm.Interface.Fileselector,
4{ 4{
5 legacy_prefix: elm_fileselector; 5 legacy_prefix: elm_fileselector;
6 eo_prefix: elm_obj_fileselector; 6 eo_prefix: elm_obj_fileselector;
7 event_prefix: elm_fileselector;
7 methods { 8 methods {
8 @property buttons_ok_cancel { 9 @property buttons_ok_cancel {
9 set { 10 set {
diff --git a/src/lib/elementary/elm_fileselector_button.eo b/src/lib/elementary/elm_fileselector_button.eo
index 4c7667bc3e..a025ee2a5e 100644
--- a/src/lib/elementary/elm_fileselector_button.eo
+++ b/src/lib/elementary/elm_fileselector_button.eo
@@ -2,6 +2,7 @@ class Elm.Fileselector_Button (Elm.Button, Elm.Interface.Fileselector)
2{ 2{
3 legacy_prefix: elm_fileselector_button; 3 legacy_prefix: elm_fileselector_button;
4 eo_prefix: elm_obj_fileselector_button; 4 eo_prefix: elm_obj_fileselector_button;
5 event_prefix: elm_fileselector_button;
5 methods { 6 methods {
6 @property inwin_mode { 7 @property inwin_mode {
7 set { 8 set {
diff --git a/src/lib/elementary/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo
index e824ed1921..1cd1feb3e3 100644
--- a/src/lib/elementary/elm_fileselector_entry.eo
+++ b/src/lib/elementary/elm_fileselector_entry.eo
@@ -3,6 +3,7 @@ class Elm.Fileselector_Entry (Elm.Layout, Elm.Interface.Fileselector,
3{ 3{
4 legacy_prefix: elm_fileselector_entry; 4 legacy_prefix: elm_fileselector_entry;
5 eo_prefix: elm_obj_fileselector_entry; 5 eo_prefix: elm_obj_fileselector_entry;
6 event_prefix: elm_fileselector_entry;
6 methods { 7 methods {
7 @property inwin_mode { 8 @property inwin_mode {
8 set { 9 set {
diff --git a/src/lib/elementary/elm_flip.eo b/src/lib/elementary/elm_flip.eo
index 9421585b30..335f10e40d 100644
--- a/src/lib/elementary/elm_flip.eo
+++ b/src/lib/elementary/elm_flip.eo
@@ -37,6 +37,7 @@ class Elm.Flip (Elm.Widget, Efl.Container)
37{ 37{
38 legacy_prefix: elm_flip; 38 legacy_prefix: elm_flip;
39 eo_prefix: elm_obj_flip; 39 eo_prefix: elm_obj_flip;
40 event_prefix: elm_flip;
40 methods { 41 methods {
41 @property interaction { 42 @property interaction {
42 set { 43 set {
diff --git a/src/lib/elementary/elm_flipselector.eo b/src/lib/elementary/elm_flipselector.eo
index 9466fcbeae..93e3b74d14 100644
--- a/src/lib/elementary/elm_flipselector.eo
+++ b/src/lib/elementary/elm_flipselector.eo
@@ -4,6 +4,7 @@ class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin,
4{ 4{
5 legacy_prefix: elm_flipselector; 5 legacy_prefix: elm_flipselector;
6 eo_prefix: elm_obj_flipselector; 6 eo_prefix: elm_obj_flipselector;
7 event_prefix: elm_flipselector;
7 methods { 8 methods {
8 @property items { 9 @property items {
9 get { 10 get {
diff --git a/src/lib/elementary/elm_frame.eo b/src/lib/elementary/elm_frame.eo
index 455f785301..714cf124fe 100644
--- a/src/lib/elementary/elm_frame.eo
+++ b/src/lib/elementary/elm_frame.eo
@@ -2,6 +2,7 @@ class Elm.Frame (Elm.Layout, Evas.Clickable_Interface)
2{ 2{
3 legacy_prefix: elm_frame; 3 legacy_prefix: elm_frame;
4 eo_prefix: elm_obj_frame; 4 eo_prefix: elm_obj_frame;
5 event_prefix: elm_frame;
5 methods { 6 methods {
6 @property collapse { 7 @property collapse {
7 set { 8 set {
diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo
index 15dcd4fb86..8724c31a82 100644
--- a/src/lib/elementary/elm_gengrid.eo
+++ b/src/lib/elementary/elm_gengrid.eo
@@ -13,6 +13,7 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
13{ 13{
14 legacy_prefix: elm_gengrid; 14 legacy_prefix: elm_gengrid;
15 eo_prefix: elm_obj_gengrid; 15 eo_prefix: elm_obj_gengrid;
16 event_prefix: elm_gengrid;
16 methods { 17 methods {
17 @property align { 18 @property align {
18 set { 19 set {
diff --git a/src/lib/elementary/elm_gengrid_pan.eo b/src/lib/elementary/elm_gengrid_pan.eo
index 6d9f8d4de4..f88623f975 100644
--- a/src/lib/elementary/elm_gengrid_pan.eo
+++ b/src/lib/elementary/elm_gengrid_pan.eo
@@ -2,6 +2,7 @@ class Elm.Gengrid.Pan (Elm.Pan)
2{ 2{
3 legacy_prefix: elm_gengrid_pan; 3 legacy_prefix: elm_gengrid_pan;
4 eo_prefix: elm_obj_gengrid_pan; 4 eo_prefix: elm_obj_gengrid_pan;
5 event_prefix: elm_gengrid_pan;
5 implements { 6 implements {
6 class.constructor; 7 class.constructor;
7 Eo.Base.destructor; 8 Eo.Base.destructor;
diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo
index 851a284736..d8606969a6 100644
--- a/src/lib/elementary/elm_genlist.eo
+++ b/src/lib/elementary/elm_genlist.eo
@@ -8,6 +8,7 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
8{ 8{
9 legacy_prefix: elm_genlist; 9 legacy_prefix: elm_genlist;
10 eo_prefix: elm_obj_genlist; 10 eo_prefix: elm_obj_genlist;
11 event_prefix: elm_genlist;
11 methods { 12 methods {
12 @property homogeneous { 13 @property homogeneous {
13 set { 14 set {
diff --git a/src/lib/elementary/elm_genlist_pan.eo b/src/lib/elementary/elm_genlist_pan.eo
index 12855303be..9df361666e 100644
--- a/src/lib/elementary/elm_genlist_pan.eo
+++ b/src/lib/elementary/elm_genlist_pan.eo
@@ -2,6 +2,7 @@ class Elm.Genlist.Pan (Elm.Pan)
2{ 2{
3 legacy_prefix: elm_genlist_pan; 3 legacy_prefix: elm_genlist_pan;
4 eo_prefix: elm_obj_genlist_pan; 4 eo_prefix: elm_obj_genlist_pan;
5 event_prefix: elm_genlist_pan;
5 implements { 6 implements {
6 class.constructor; 7 class.constructor;
7 Eo.Base.destructor; 8 Eo.Base.destructor;
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c
index 14c18f2c1f..582fed50b4 100644
--- a/src/lib/elementary/elm_glview.c
+++ b/src/lib/elementary/elm_glview.c
@@ -364,7 +364,7 @@ _elm_glview_version_constructor(Eo *obj, Elm_Glview_Data *sd,
364 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 364 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
365 evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); 365 evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
366 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION); 366 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION);
367 eo_event_callback_add(obj, EO_BASE_EVENT_CALLBACK_ADD, _cb_added, NULL); 367 eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL);
368} 368}
369 369
370EOLIAN static Eo * 370EOLIAN static Eo *
diff --git a/src/lib/elementary/elm_glview.eo b/src/lib/elementary/elm_glview.eo
index a5eb38f0f3..a3bd087744 100644
--- a/src/lib/elementary/elm_glview.eo
+++ b/src/lib/elementary/elm_glview.eo
@@ -84,6 +84,7 @@ class Elm.Glview (Elm.Widget, Efl.Gfx.View)
84{ 84{
85 legacy_prefix: elm_glview; 85 legacy_prefix: elm_glview;
86 eo_prefix: elm_obj_glview; 86 eo_prefix: elm_obj_glview;
87 event_prefix: elm_glview;
87 methods { 88 methods {
88 version_constructor { 89 version_constructor {
89 [[Constructor with context version number.]] 90 [[Constructor with context version number.]]
diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo
index 44a8117bdd..260fd5bf13 100644
--- a/src/lib/elementary/elm_hover.eo
+++ b/src/lib/elementary/elm_hover.eo
@@ -11,6 +11,7 @@ class Elm.Hover (Elm.Layout, Evas.Clickable_Interface, Elm.Interface.Atspi_Widge
11{ 11{
12 legacy_prefix: elm_hover; 12 legacy_prefix: elm_hover;
13 eo_prefix: elm_obj_hover; 13 eo_prefix: elm_obj_hover;
14 event_prefix: elm_hover;
14 methods { 15 methods {
15 @property target { 16 @property target {
16 set { 17 set {
diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo
index 2906712a33..98d1fbf11c 100644
--- a/src/lib/elementary/elm_hoversel.eo
+++ b/src/lib/elementary/elm_hoversel.eo
@@ -5,6 +5,7 @@ class Elm.Hoversel (Elm.Button, Evas.Selectable_Interface,
5{ 5{
6 legacy_prefix: elm_hoversel; 6 legacy_prefix: elm_hoversel;
7 eo_prefix: elm_obj_hoversel; 7 eo_prefix: elm_obj_hoversel;
8 event_prefix: elm_hoversel;
8 methods { 9 methods {
9 @property horizontal { 10 @property horizontal {
10 [[Control if the hoversel should expand horizontally. 11 [[Control if the hoversel should expand horizontally.
diff --git a/src/lib/elementary/elm_icon.eo b/src/lib/elementary/elm_icon.eo
index fb0d631087..8cca5c5280 100644
--- a/src/lib/elementary/elm_icon.eo
+++ b/src/lib/elementary/elm_icon.eo
@@ -10,6 +10,7 @@ class Elm.Icon (Elm.Image)
10{ 10{
11 legacy_prefix: elm_icon; 11 legacy_prefix: elm_icon;
12 eo_prefix: elm_obj_icon; 12 eo_prefix: elm_obj_icon;
13 event_prefix: elm_icon;
13 methods { 14 methods {
14 } 15 }
15 implements { 16 implements {
diff --git a/src/lib/elementary/elm_image.eo b/src/lib/elementary/elm_image.eo
index cacf6ac4d0..b2940f5a70 100644
--- a/src/lib/elementary/elm_image.eo
+++ b/src/lib/elementary/elm_image.eo
@@ -48,6 +48,7 @@ class Elm.Image (Elm.Widget, Evas.Clickable_Interface, Evas.Draggable_Interface,
48{ 48{
49 legacy_prefix: elm_image; 49 legacy_prefix: elm_image;
50 eo_prefix: elm_obj_image; 50 eo_prefix: elm_obj_image;
51 event_prefix: elm_image;
51 methods { 52 methods {
52 @property scale_type { 53 @property scale_type {
53 [[Control how the internal image is scaled. 54 [[Control how the internal image is scaled.
diff --git a/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo
index 691e3175f2..f623b0f418 100644
--- a/src/lib/elementary/elm_index.eo
+++ b/src/lib/elementary/elm_index.eo
@@ -2,6 +2,7 @@ class Elm.Index (Elm.Layout, Evas.Clickable_Interface, Evas.Selectable_Interface
2{ 2{
3 legacy_prefix: elm_index; 3 legacy_prefix: elm_index;
4 eo_prefix: elm_obj_index; 4 eo_prefix: elm_obj_index;
5 event_prefix: elm_index;
5 methods { 6 methods {
6 @property autohide_disabled { 7 @property autohide_disabled {
7 [[Enable or disable auto hiding feature for a given index widget.]] 8 [[Enable or disable auto hiding feature for a given index widget.]]
diff --git a/src/lib/elementary/elm_interface_atspi_accessible.c b/src/lib/elementary/elm_interface_atspi_accessible.c
index 75853fa348..bccb2d38ed 100644
--- a/src/lib/elementary/elm_interface_atspi_accessible.c
+++ b/src/lib/elementary/elm_interface_atspi_accessible.c
@@ -454,7 +454,7 @@ elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
454 if (!eina_list_data_find(rel->objects, rel_obj)) 454 if (!eina_list_data_find(rel->objects, rel_obj))
455 { 455 {
456 rel->objects = eina_list_append(rel->objects, rel_obj); 456 rel->objects = eina_list_append(rel->objects, rel_obj);
457 eo_event_callback_add((Eo *) rel_obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set); 457 eo_event_callback_add((Eo *) rel_obj, EO_EVENT_DEL, _on_rel_obj_del, set);
458 } 458 }
459 return EINA_TRUE; 459 return EINA_TRUE;
460 } 460 }
@@ -467,7 +467,7 @@ elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
467 rel->objects = eina_list_append(rel->objects, rel_obj); 467 rel->objects = eina_list_append(rel->objects, rel_obj);
468 *set = eina_list_append(*set, rel); 468 *set = eina_list_append(*set, rel);
469 469
470 eo_event_callback_add((Eo *) rel_obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set); 470 eo_event_callback_add((Eo *) rel_obj, EO_EVENT_DEL, _on_rel_obj_del, set);
471 return EINA_TRUE; 471 return EINA_TRUE;
472} 472}
473 473
@@ -483,7 +483,7 @@ elm_atspi_relation_set_relation_remove(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
483 { 483 {
484 if (eina_list_data_find(rel->objects, rel_obj)) 484 if (eina_list_data_find(rel->objects, rel_obj))
485 { 485 {
486 eo_event_callback_del((Eo *) rel_obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set); 486 eo_event_callback_del((Eo *) rel_obj, EO_EVENT_DEL, _on_rel_obj_del, set);
487 rel->objects = eina_list_remove(rel->objects, rel_obj); 487 rel->objects = eina_list_remove(rel->objects, rel_obj);
488 } 488 }
489 if (!rel->objects) 489 if (!rel->objects)
@@ -508,7 +508,7 @@ elm_atspi_relation_set_relation_type_remove(Elm_Atspi_Relation_Set *set, Elm_Ats
508 if (rel->type == type) 508 if (rel->type == type)
509 { 509 {
510 EINA_LIST_FOREACH(rel->objects, l, obj) 510 EINA_LIST_FOREACH(rel->objects, l, obj)
511 eo_event_callback_del(obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set); 511 eo_event_callback_del(obj, EO_EVENT_DEL, _on_rel_obj_del, set);
512 *set = eina_list_remove(*set, rel); 512 *set = eina_list_remove(*set, rel);
513 elm_atspi_relation_free(rel); 513 elm_atspi_relation_free(rel);
514 return; 514 return;
@@ -526,7 +526,7 @@ elm_atspi_relation_set_free(Elm_Atspi_Relation_Set set)
526 EINA_LIST_FREE(set, rel) 526 EINA_LIST_FREE(set, rel)
527 { 527 {
528 EINA_LIST_FOREACH(rel->objects, l, obj) 528 EINA_LIST_FOREACH(rel->objects, l, obj)
529 eo_event_callback_del(obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set); 529 eo_event_callback_del(obj, EO_EVENT_DEL, _on_rel_obj_del, set);
530 elm_atspi_relation_free(rel); 530 elm_atspi_relation_free(rel);
531 } 531 }
532} 532}
diff --git a/src/lib/elementary/elm_interface_atspi_image.c b/src/lib/elementary/elm_interface_atspi_image.c
index 7ee1e97ca9..255ec4fb26 100644
--- a/src/lib/elementary/elm_interface_atspi_image.c
+++ b/src/lib/elementary/elm_interface_atspi_image.c
@@ -34,13 +34,13 @@ _elm_interface_atspi_image_description_set(Eo *obj, void *sd EINA_UNUSED, const
34 if (old_descr) 34 if (old_descr)
35 { 35 {
36 eina_stringshare_del(old_descr); 36 eina_stringshare_del(old_descr);
37 eo_event_callback_del(obj, EO_BASE_EVENT_DEL, _free_desc_cb, old_descr); 37 eo_event_callback_del(obj, EO_EVENT_DEL, _free_desc_cb, old_descr);
38 } 38 }
39 39
40 if (descr) 40 if (descr)
41 { 41 {
42 eo_key_data_set(obj, key, descr); 42 eo_key_data_set(obj, key, descr);
43 eo_event_callback_add(obj, EO_BASE_EVENT_DEL, _free_desc_cb, descr); 43 eo_event_callback_add(obj, EO_EVENT_DEL, _free_desc_cb, descr);
44 } 44 }
45} 45}
46 46
diff --git a/src/lib/elementary/elm_label.eo b/src/lib/elementary/elm_label.eo
index 01c4ed4e93..569bd74ff8 100644
--- a/src/lib/elementary/elm_label.eo
+++ b/src/lib/elementary/elm_label.eo
@@ -12,6 +12,7 @@ class Elm.Label (Elm.Layout)
12{ 12{
13 legacy_prefix: elm_label; 13 legacy_prefix: elm_label;
14 eo_prefix: elm_obj_label; 14 eo_prefix: elm_obj_label;
15 event_prefix: elm_label;
15 methods { 16 methods {
16 @property wrap_width { 17 @property wrap_width {
17 [[Control wrap width of the label 18 [[Control wrap width of the label
diff --git a/src/lib/elementary/elm_layout.eo b/src/lib/elementary/elm_layout.eo
index cb0a1522b3..fbb9894fb5 100644
--- a/src/lib/elementary/elm_layout.eo
+++ b/src/lib/elementary/elm_layout.eo
@@ -21,6 +21,7 @@ class Elm.Layout (Elm.Widget, Efl.Container, Efl.File)
21{ 21{
22 legacy_prefix: elm_layout; 22 legacy_prefix: elm_layout;
23 eo_prefix: elm_obj_layout; 23 eo_prefix: elm_obj_layout;
24 event_prefix: elm_layout;
24 data: Elm_Layout_Smart_Data; 25 data: Elm_Layout_Smart_Data;
25 methods { 26 methods {
26 @property edje_object_can_access { 27 @property edje_object_can_access {
diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo
index 5e243d90db..a1c0713089 100644
--- a/src/lib/elementary/elm_list.eo
+++ b/src/lib/elementary/elm_list.eo
@@ -42,6 +42,7 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
42{ 42{
43 legacy_prefix: elm_list; 43 legacy_prefix: elm_list;
44 eo_prefix: elm_obj_list; 44 eo_prefix: elm_obj_list;
45 event_prefix: elm_list;
45 methods { 46 methods {
46 @property horizontal { 47 @property horizontal {
47 [[Control horizontal mode on the list object. 48 [[Control horizontal mode on the list object.
diff --git a/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo
index a814062347..c169bbf88b 100644
--- a/src/lib/elementary/elm_map.eo
+++ b/src/lib/elementary/elm_map.eo
@@ -75,6 +75,7 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
75{ 75{
76 legacy_prefix: elm_map; 76 legacy_prefix: elm_map;
77 eo_prefix: elm_obj_map; 77 eo_prefix: elm_obj_map;
78 event_prefix: elm_map;
78 methods { 79 methods {
79 @property zoom { 80 @property zoom {
80 set { 81 set {
diff --git a/src/lib/elementary/elm_map_pan.eo b/src/lib/elementary/elm_map_pan.eo
index 9e5fe019ef..8c6672b1bf 100644
--- a/src/lib/elementary/elm_map_pan.eo
+++ b/src/lib/elementary/elm_map_pan.eo
@@ -2,6 +2,7 @@ class Elm.Map.Pan (Elm.Pan)
2{ 2{
3 legacy_prefix: elm_map_pan; 3 legacy_prefix: elm_map_pan;
4 eo_prefix: elm_obj_map_pan; 4 eo_prefix: elm_obj_map_pan;
5 event_prefix: elm_map_pan;
5 implements { 6 implements {
6 class.constructor; 7 class.constructor;
7 Eo.Base.destructor; 8 Eo.Base.destructor;
diff --git a/src/lib/elementary/elm_menu.eo b/src/lib/elementary/elm_menu.eo
index a82a82ece6..f1fb2a5cde 100644
--- a/src/lib/elementary/elm_menu.eo
+++ b/src/lib/elementary/elm_menu.eo
@@ -2,6 +2,7 @@ class Elm.Menu (Elm.Widget, Evas.Clickable_Interface, Elm.Interface.Atspi.Select
2{ 2{
3 legacy_prefix: elm_menu; 3 legacy_prefix: elm_menu;
4 eo_prefix: elm_obj_menu; 4 eo_prefix: elm_obj_menu;
5 event_prefix: elm_menu;
5 methods { 6 methods {
6 @property selected_item { 7 @property selected_item {
7 get { 8 get {
diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo
index fd95c55743..f6c1d4220f 100644
--- a/src/lib/elementary/elm_multibuttonentry.eo
+++ b/src/lib/elementary/elm_multibuttonentry.eo
@@ -5,6 +5,7 @@ class Elm.Multibuttonentry (Elm.Layout)
5{ 5{
6 legacy_prefix: elm_multibuttonentry; 6 legacy_prefix: elm_multibuttonentry;
7 eo_prefix: elm_obj_multibuttonentry; 7 eo_prefix: elm_obj_multibuttonentry;
8 event_prefix: elm_multibuttonentry;
8 methods { 9 methods {
9 @property editable { 10 @property editable {
10 [[Control if the multibuttonentry is to be editable or not. 11 [[Control if the multibuttonentry is to be editable or not.
diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo
index bbd1ebf7f8..c390458331 100644
--- a/src/lib/elementary/elm_naviframe.eo
+++ b/src/lib/elementary/elm_naviframe.eo
@@ -2,6 +2,7 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
2{ 2{
3 legacy_prefix: elm_naviframe; 3 legacy_prefix: elm_naviframe;
4 eo_prefix: elm_obj_naviframe; 4 eo_prefix: elm_obj_naviframe;
5 event_prefix: elm_naviframe;
5 methods { 6 methods {
6 @property event_enabled { 7 @property event_enabled {
7 [[Control the event enabled when pushing/popping items 8 [[Control the event enabled when pushing/popping items
diff --git a/src/lib/elementary/elm_notify.eo b/src/lib/elementary/elm_notify.eo
index e2a59813f9..b1a3e6c04e 100644
--- a/src/lib/elementary/elm_notify.eo
+++ b/src/lib/elementary/elm_notify.eo
@@ -2,6 +2,7 @@ class Elm.Notify (Elm.Widget, Efl.Container)
2{ 2{
3 legacy_prefix: elm_notify; 3 legacy_prefix: elm_notify;
4 eo_prefix: elm_obj_notify; 4 eo_prefix: elm_obj_notify;
5 event_prefix: elm_notify;
5 methods { 6 methods {
6 @property align { 7 @property align {
7 set { 8 set {
diff --git a/src/lib/elementary/elm_pan.eo b/src/lib/elementary/elm_pan.eo
index e6752479ac..26cec489c7 100644
--- a/src/lib/elementary/elm_pan.eo
+++ b/src/lib/elementary/elm_pan.eo
@@ -2,6 +2,7 @@ class Elm.Pan (Evas.Smart.Clipped)
2{ 2{
3 legacy_prefix: elm_pan; 3 legacy_prefix: elm_pan;
4 eo_prefix: elm_obj_pan; 4 eo_prefix: elm_obj_pan;
5 event_prefix: elm_pan;
5 data: Elm_Pan_Smart_Data; 6 data: Elm_Pan_Smart_Data;
6 methods { 7 methods {
7 @property gravity { 8 @property gravity {
diff --git a/src/lib/elementary/elm_panes.eo b/src/lib/elementary/elm_panes.eo
index d9c3402789..b245c49063 100644
--- a/src/lib/elementary/elm_panes.eo
+++ b/src/lib/elementary/elm_panes.eo
@@ -3,6 +3,7 @@ class Elm.Panes (Elm.Layout, Efl.Orientation,
3{ 3{
4 legacy_prefix: elm_panes; 4 legacy_prefix: elm_panes;
5 eo_prefix: elm_obj_panes; 5 eo_prefix: elm_obj_panes;
6 event_prefix: elm_panes;
6 methods { 7 methods {
7 @property content_left_size { 8 @property content_left_size {
8 [[Set the size proportion of panes widget's left side. 9 [[Set the size proportion of panes widget's left side.
diff --git a/src/lib/elementary/elm_photocam.eo b/src/lib/elementary/elm_photocam.eo
index df21efe0da..0877df75a2 100644
--- a/src/lib/elementary/elm_photocam.eo
+++ b/src/lib/elementary/elm_photocam.eo
@@ -17,6 +17,7 @@ class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable,
17{ 17{
18 legacy_prefix: elm_photocam; 18 legacy_prefix: elm_photocam;
19 eo_prefix: elm_obj_photocam; 19 eo_prefix: elm_obj_photocam;
20 event_prefix: elm_photocam;
20 methods { 21 methods {
21 @property paused { 22 @property paused {
22 set { 23 set {
diff --git a/src/lib/elementary/elm_photocam_pan.eo b/src/lib/elementary/elm_photocam_pan.eo
index 52a393c086..d22efa9305 100644
--- a/src/lib/elementary/elm_photocam_pan.eo
+++ b/src/lib/elementary/elm_photocam_pan.eo
@@ -2,6 +2,7 @@ class Elm.Photocam.Pan (Elm.Pan)
2{ 2{
3 legacy_prefix: elm_photocam_pan; 3 legacy_prefix: elm_photocam_pan;
4 eo_prefix: elm_obj_photocam_pan; 4 eo_prefix: elm_obj_photocam_pan;
5 event_prefix: elm_photocam_pan;
5 implements { 6 implements {
6 class.constructor; 7 class.constructor;
7 Eo.Base.destructor; 8 Eo.Base.destructor;
diff --git a/src/lib/elementary/elm_player.eo b/src/lib/elementary/elm_player.eo
index 119070fa6c..e218b0923a 100644
--- a/src/lib/elementary/elm_player.eo
+++ b/src/lib/elementary/elm_player.eo
@@ -2,6 +2,7 @@ class Elm.Player (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
2{ 2{
3 legacy_prefix: elm_player; 3 legacy_prefix: elm_player;
4 eo_prefix: elm_obj_player; 4 eo_prefix: elm_obj_player;
5 event_prefix: elm_player;
5 implements { 6 implements {
6 class.constructor; 7 class.constructor;
7 Eo.Base.constructor; 8 Eo.Base.constructor;
diff --git a/src/lib/elementary/elm_plug.eo b/src/lib/elementary/elm_plug.eo
index b863212fab..9dab7da203 100644
--- a/src/lib/elementary/elm_plug.eo
+++ b/src/lib/elementary/elm_plug.eo
@@ -2,6 +2,7 @@ class Elm.Plug (Elm.Widget, Evas.Clickable_Interface)
2{ 2{
3 legacy_prefix: elm_plug; 3 legacy_prefix: elm_plug;
4 eo_prefix: elm_obj_plug; 4 eo_prefix: elm_obj_plug;
5 event_prefix: elm_plug;
5 data: null; 6 data: null;
6 methods { 7 methods {
7 @property image_object { 8 @property image_object {
diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo
index abc680bddd..76ce4b2c3d 100644
--- a/src/lib/elementary/elm_popup.eo
+++ b/src/lib/elementary/elm_popup.eo
@@ -27,6 +27,7 @@ class Elm.Popup (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
27{ 27{
28 legacy_prefix: elm_popup; 28 legacy_prefix: elm_popup;
29 eo_prefix: elm_obj_popup; 29 eo_prefix: elm_obj_popup;
30 event_prefix: elm_popup;
30 methods { 31 methods {
31 @property align { 32 @property align {
32 set { 33 set {
diff --git a/src/lib/elementary/elm_prefs.eo b/src/lib/elementary/elm_prefs.eo
index 8ea05b017b..1cde554ea8 100644
--- a/src/lib/elementary/elm_prefs.eo
+++ b/src/lib/elementary/elm_prefs.eo
@@ -7,6 +7,7 @@ class Elm.Prefs (Elm.Widget, Efl.File)
7{ 7{
8 legacy_prefix: elm_prefs; 8 legacy_prefix: elm_prefs;
9 eo_prefix: elm_obj_prefs; 9 eo_prefix: elm_obj_prefs;
10 event_prefix: elm_prefs;
10 methods { 11 methods {
11 @property data { 12 @property data {
12 [[Set user data for a given prefs widget 13 [[Set user data for a given prefs widget
diff --git a/src/lib/elementary/elm_progressbar.eo b/src/lib/elementary/elm_progressbar.eo
index a9a7a44baf..754a86b959 100644
--- a/src/lib/elementary/elm_progressbar.eo
+++ b/src/lib/elementary/elm_progressbar.eo
@@ -3,6 +3,7 @@ class Elm.Progressbar (Elm.Layout, Efl.Ui.Progress,
3{ 3{
4 legacy_prefix: elm_progressbar; 4 legacy_prefix: elm_progressbar;
5 eo_prefix: elm_obj_progressbar; 5 eo_prefix: elm_obj_progressbar;
6 event_prefix: elm_progressbar;
6 methods { 7 methods {
7 @property pulse { 8 @property pulse {
8 [[Control whether a given progress bar widget is at "pulsing mode" or not. 9 [[Control whether a given progress bar widget is at "pulsing mode" or not.
diff --git a/src/lib/elementary/elm_radio.eo b/src/lib/elementary/elm_radio.eo
index 09586fee04..a0d3eb7327 100644
--- a/src/lib/elementary/elm_radio.eo
+++ b/src/lib/elementary/elm_radio.eo
@@ -2,6 +2,7 @@ class Elm.Radio (Elm.Check, Elm.Interface.Atspi_Widget_Action)
2{ 2{
3 legacy_prefix: elm_radio; 3 legacy_prefix: elm_radio;
4 eo_prefix: elm_obj_radio; 4 eo_prefix: elm_obj_radio;
5 event_prefix: elm_radio;
5 methods { 6 methods {
6 @property state_value { 7 @property state_value {
7 set { 8 set {
diff --git a/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo
index c0c5c7f501..5afed725e4 100644
--- a/src/lib/elementary/elm_scroller.eo
+++ b/src/lib/elementary/elm_scroller.eo
@@ -4,6 +4,7 @@ class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable,
4{ 4{
5 legacy_prefix: elm_scroller; 5 legacy_prefix: elm_scroller;
6 eo_prefix: elm_obj_scroller; 6 eo_prefix: elm_obj_scroller;
7 event_prefix: elm_scroller;
7 methods { 8 methods {
8 @property propagate_events { 9 @property propagate_events {
9 set { 10 set {
diff --git a/src/lib/elementary/elm_segment_control.eo b/src/lib/elementary/elm_segment_control.eo
index 37d8390cfe..794520718d 100644
--- a/src/lib/elementary/elm_segment_control.eo
+++ b/src/lib/elementary/elm_segment_control.eo
@@ -2,6 +2,7 @@ class Elm.Segment_Control (Elm.Layout)
2{ 2{
3 legacy_prefix: elm_segment_control; 3 legacy_prefix: elm_segment_control;
4 eo_prefix: elm_obj_segment_control; 4 eo_prefix: elm_obj_segment_control;
5 event_prefix: elm_segment_control;
5 methods { 6 methods {
6 @property item_count { 7 @property item_count {
7 get { 8 get {
diff --git a/src/lib/elementary/elm_slider.eo b/src/lib/elementary/elm_slider.eo
index 22904319b8..a933d6770a 100644
--- a/src/lib/elementary/elm_slider.eo
+++ b/src/lib/elementary/elm_slider.eo
@@ -8,6 +8,7 @@ class Elm.Slider (Elm.Layout, Efl.Ui.Progress,
8{ 8{
9 legacy_prefix: elm_slider; 9 legacy_prefix: elm_slider;
10 eo_prefix: elm_obj_slider; 10 eo_prefix: elm_obj_slider;
11 event_prefix: elm_slider;
11 methods { 12 methods {
12 @property indicator_format { 13 @property indicator_format {
13 set { 14 set {
diff --git a/src/lib/elementary/elm_slideshow.eo b/src/lib/elementary/elm_slideshow.eo
index 71777bad6f..f278f787ee 100644
--- a/src/lib/elementary/elm_slideshow.eo
+++ b/src/lib/elementary/elm_slideshow.eo
@@ -4,6 +4,7 @@ class Elm.Slideshow (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
4{ 4{
5 eo_prefix: elm_obj_slideshow; 5 eo_prefix: elm_obj_slideshow;
6 legacy_prefix: elm_slideshow; 6 legacy_prefix: elm_slideshow;
7 event_prefix: elm_slideshow;
7 methods { 8 methods {
8 @property cache_after { 9 @property cache_after {
9 set { 10 set {
diff --git a/src/lib/elementary/elm_slideshow_item.eo b/src/lib/elementary/elm_slideshow_item.eo
index 66dff3d1f7..82a56e803b 100644
--- a/src/lib/elementary/elm_slideshow_item.eo
+++ b/src/lib/elementary/elm_slideshow_item.eo
@@ -2,6 +2,7 @@ class Elm.Slideshow.Item(Elm.Widget.Item)
2{ 2{
3 legacy_prefix: elm_slideshow_item; 3 legacy_prefix: elm_slideshow_item;
4 eo_prefix: elm_obj_slideshow_item; 4 eo_prefix: elm_obj_slideshow_item;
5 event_prefix: elm_slideshow_item;
5 methods { 6 methods {
6 show { 7 show {
7 [[Display a given slideshow widget's item, programmatically. 8 [[Display a given slideshow widget's item, programmatically.
diff --git a/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo
index 513a5b1218..5ff0cec236 100644
--- a/src/lib/elementary/elm_spinner.eo
+++ b/src/lib/elementary/elm_spinner.eo
@@ -3,6 +3,7 @@ class Elm.Spinner (Elm.Layout, Efl.Ui.Spin,
3{ 3{
4 legacy_prefix: elm_spinner; 4 legacy_prefix: elm_spinner;
5 eo_prefix: elm_obj_spinner; 5 eo_prefix: elm_obj_spinner;
6 event_prefix: elm_spinner;
6 methods { 7 methods {
7 @property wrap { 8 @property wrap {
8 [[Control whether the spinner should wrap when it reaches its minimum or maximum value. 9 [[Control whether the spinner should wrap when it reaches its minimum or maximum value.
diff --git a/src/lib/elementary/elm_thumb.eo b/src/lib/elementary/elm_thumb.eo
index b27c9d5e3e..adf491d3e2 100644
--- a/src/lib/elementary/elm_thumb.eo
+++ b/src/lib/elementary/elm_thumb.eo
@@ -4,6 +4,7 @@ class Elm.Thumb (Elm.Layout, Efl.File, Evas.Clickable_Interface,
4{ 4{
5 legacy_prefix: elm_thumb; 5 legacy_prefix: elm_thumb;
6 eo_prefix: elm_obj_thumb; 6 eo_prefix: elm_obj_thumb;
7 event_prefix: elm_thumb;
7 implements { 8 implements {
8 class.constructor; 9 class.constructor;
9 Eo.Base.constructor; 10 Eo.Base.constructor;
diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo
index ad0a775b2e..108795156f 100644
--- a/src/lib/elementary/elm_toolbar.eo
+++ b/src/lib/elementary/elm_toolbar.eo
@@ -30,6 +30,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation,
30{ 30{
31 legacy_prefix: elm_toolbar; 31 legacy_prefix: elm_toolbar;
32 eo_prefix: elm_obj_toolbar; 32 eo_prefix: elm_obj_toolbar;
33 event_prefix: elm_toolbar;
33 methods { 34 methods {
34 @property homogeneous { 35 @property homogeneous {
35 [[Control homogeneous mode. 36 [[Control homogeneous mode.
diff --git a/src/lib/elementary/elm_web.eo b/src/lib/elementary/elm_web.eo
index b377cdeb84..15d6df72e2 100644
--- a/src/lib/elementary/elm_web.eo
+++ b/src/lib/elementary/elm_web.eo
@@ -18,6 +18,7 @@ class Elm.Web (Elm.Widget)
18{ 18{
19 legacy_prefix: elm_web; 19 legacy_prefix: elm_web;
20 eo_prefix: elm_obj_web; 20 eo_prefix: elm_obj_web;
21 event_prefix: elm_web;
21 methods { 22 methods {
22 @property text_matches_highlight @virtual_pure { 23 @property text_matches_highlight @virtual_pure {
23 set { 24 set {
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index ebc60101c8..ce97e8ecff 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -4501,7 +4501,7 @@ _elm_widget_item_eo_base_constructor(Eo *eo_item, Elm_Widget_Item_Data *item)
4501 4501
4502 item->widget = widget; 4502 item->widget = widget;
4503 item->eo_obj = eo_item; 4503 item->eo_obj = eo_item;
4504 eo_event_callback_add(eo_item, EO_BASE_EVENT_DEL, _eo_del_cb, NULL); 4504 eo_event_callback_add(eo_item, EO_EVENT_DEL, _eo_del_cb, NULL);
4505 4505
4506 return eo_item; 4506 return eo_item;
4507} 4507}
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index 699846600d..a31f9552db 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -24,6 +24,7 @@ abstract Elm.Widget (Evas.Object.Smart, Elm.Interface.Atspi_Accessible, Elm.Inte
24{ 24{
25 legacy_prefix: elm_widget; 25 legacy_prefix: elm_widget;
26 eo_prefix: elm_obj_widget; 26 eo_prefix: elm_obj_widget;
27 event_prefix: elm_widget;
27 data: Elm_Widget_Smart_Data; 28 data: Elm_Widget_Smart_Data;
28 methods { 29 methods {
29 @property focus { 30 @property focus {
diff --git a/src/lib/elementary/elm_win.eo b/src/lib/elementary/elm_win.eo
index f596c263dc..428cac41da 100644
--- a/src/lib/elementary/elm_win.eo
+++ b/src/lib/elementary/elm_win.eo
@@ -166,6 +166,7 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
166{ 166{
167 legacy_prefix: elm_win; 167 legacy_prefix: elm_win;
168 eo_prefix: elm_obj_win; 168 eo_prefix: elm_obj_win;
169 event_prefix: elm_win;
169 methods { 170 methods {
170 @property keyboard_win { 171 @property keyboard_win {
171 set { 172 set {
diff --git a/src/lib/emotion/emotion_object.eo b/src/lib/emotion/emotion_object.eo
index c6abdb8ef3..b449492754 100644
--- a/src/lib/emotion/emotion_object.eo
+++ b/src/lib/emotion/emotion_object.eo
@@ -1,6 +1,7 @@
1class Emotion.Object (Evas.Object.Smart, Efl.File, Efl.Player, Efl.Image, Efl.Image.Load) { 1class Emotion.Object (Evas.Object.Smart, Efl.File, Efl.Player, Efl.Image, Efl.Image.Load) {
2 legacy_prefix: emotion_object; 2 legacy_prefix: emotion_object;
3 eo_prefix: emotion_obj; 3 eo_prefix: emotion_obj;
4 event_prefix: emotion_object;
4 methods { 5 methods {
5 @property option { 6 @property option {
6 set { 7 set {
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index 588fbf1d59..f8785c3b54 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -927,7 +927,7 @@ _eo_base_event_callback_priority_add(Eo *obj, Eo_Base_Data *pd,
927 cb->priority = priority; 927 cb->priority = priority;
928 _eo_callbacks_sorted_insert(pd, cb); 928 _eo_callbacks_sorted_insert(pd, cb);
929 929
930 eo_event_callback_call(obj, EO_BASE_EVENT_CALLBACK_ADD, (void *)arr); 930 eo_event_callback_call(obj, EO_EVENT_CALLBACK_ADD, (void *)arr);
931 931
932 return EINA_TRUE; 932 return EINA_TRUE;
933} 933}
@@ -950,7 +950,7 @@ _eo_base_event_callback_del(Eo *obj, Eo_Base_Data *pd,
950 cb->delete_me = EINA_TRUE; 950 cb->delete_me = EINA_TRUE;
951 pd->deletions_waiting = EINA_TRUE; 951 pd->deletions_waiting = EINA_TRUE;
952 _eo_callbacks_clear(pd); 952 _eo_callbacks_clear(pd);
953 eo_event_callback_call(obj, EO_BASE_EVENT_CALLBACK_DEL, (void *)arr); 953 eo_event_callback_call(obj, EO_EVENT_CALLBACK_DEL, (void *)arr);
954 return EINA_TRUE; 954 return EINA_TRUE;
955 } 955 }
956 } 956 }
@@ -980,7 +980,7 @@ _eo_base_event_callback_array_priority_add(Eo *obj, Eo_Base_Data *pd,
980 cb->func_array = EINA_TRUE; 980 cb->func_array = EINA_TRUE;
981 _eo_callbacks_sorted_insert(pd, cb); 981 _eo_callbacks_sorted_insert(pd, cb);
982 982
983 eo_event_callback_call(obj, EO_BASE_EVENT_CALLBACK_ADD, (void *)array); 983 eo_event_callback_call(obj, EO_EVENT_CALLBACK_ADD, (void *)array);
984 984
985 return EINA_TRUE; 985 return EINA_TRUE;
986} 986}
@@ -1001,7 +1001,7 @@ _eo_base_event_callback_array_del(Eo *obj, Eo_Base_Data *pd,
1001 pd->deletions_waiting = EINA_TRUE; 1001 pd->deletions_waiting = EINA_TRUE;
1002 _eo_callbacks_clear(pd); 1002 _eo_callbacks_clear(pd);
1003 1003
1004 eo_event_callback_call(obj, EO_BASE_EVENT_CALLBACK_DEL, (void *)array); 1004 eo_event_callback_call(obj, EO_EVENT_CALLBACK_DEL, (void *)array);
1005 return EINA_TRUE; 1005 return EINA_TRUE;
1006 } 1006 }
1007 } 1007 }
diff --git a/src/lib/eo/eo_private.h b/src/lib/eo/eo_private.h
index 5fe5bd75a7..e448bbd2ba 100644
--- a/src/lib/eo/eo_private.h
+++ b/src/lib/eo/eo_private.h
@@ -214,7 +214,7 @@ _eo_del_internal(const char *file, int line, _Eo_Object *obj)
214 214
215 const _Eo_Class *klass = obj->klass; 215 const _Eo_Class *klass = obj->klass;
216 216
217 eo_event_callback_call(_eo_obj_id_get(obj), EO_BASE_EVENT_DEL, NULL); 217 eo_event_callback_call(_eo_obj_id_get(obj), EO_EVENT_DEL, NULL);
218 218
219 _eo_condtor_reset(obj); 219 _eo_condtor_reset(obj);
220 220
diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index c8a51fafa0..4b52c08018 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -586,6 +586,16 @@ EAPI Eina_Stringshare *eolian_class_legacy_prefix_get(const Eolian_Class *klass)
586EAPI Eina_Stringshare* eolian_class_eo_prefix_get(const Eolian_Class *klass); 586EAPI Eina_Stringshare* eolian_class_eo_prefix_get(const Eolian_Class *klass);
587 587
588/* 588/*
589 * @brief Returns the event prefix of a class
590 *
591 * @param[in] klass the class
592 * @return the event prefix
593 *
594 * @ingroup Eolian
595 */
596EAPI Eina_Stringshare* eolian_class_event_prefix_get(const Eolian_Class *klass);
597
598/*
589 * @brief Returns the data type of a class 599 * @brief Returns the data type of a class
590 * 600 *
591 * @param[in] klass the class 601 * @param[in] klass the class
diff --git a/src/lib/eolian/database_class.c b/src/lib/eolian/database_class.c
index 28a179171f..f3faa9b0cc 100644
--- a/src/lib/eolian/database_class.c
+++ b/src/lib/eolian/database_class.c
@@ -35,6 +35,7 @@ database_class_del(Eolian_Class *cl)
35 if (cl->full_name) eina_stringshare_del(cl->full_name); 35 if (cl->full_name) eina_stringshare_del(cl->full_name);
36 if (cl->legacy_prefix) eina_stringshare_del(cl->legacy_prefix); 36 if (cl->legacy_prefix) eina_stringshare_del(cl->legacy_prefix);
37 if (cl->eo_prefix) eina_stringshare_del(cl->eo_prefix); 37 if (cl->eo_prefix) eina_stringshare_del(cl->eo_prefix);
38 if (cl->ev_prefix) eina_stringshare_del(cl->ev_prefix);
38 if (cl->data_type) eina_stringshare_del(cl->data_type); 39 if (cl->data_type) eina_stringshare_del(cl->data_type);
39 40
40 database_doc_del(cl->doc); 41 database_doc_del(cl->doc);
diff --git a/src/lib/eolian/database_class_api.c b/src/lib/eolian/database_class_api.c
index 946246d207..30ebc6a699 100644
--- a/src/lib/eolian/database_class_api.c
+++ b/src/lib/eolian/database_class_api.c
@@ -85,6 +85,13 @@ eolian_class_eo_prefix_get(const Eolian_Class *cl)
85} 85}
86 86
87EAPI Eina_Stringshare* 87EAPI Eina_Stringshare*
88eolian_class_event_prefix_get(const Eolian_Class *cl)
89{
90 EINA_SAFETY_ON_NULL_RETURN_VAL(cl, NULL);
91 return cl->ev_prefix;
92}
93
94EAPI Eina_Stringshare*
88eolian_class_data_type_get(const Eolian_Class *cl) 95eolian_class_data_type_get(const Eolian_Class *cl)
89{ 96{
90 EINA_SAFETY_ON_NULL_RETURN_VAL(cl, NULL); 97 EINA_SAFETY_ON_NULL_RETURN_VAL(cl, NULL);
diff --git a/src/lib/eolian/database_event_api.c b/src/lib/eolian/database_event_api.c
index 1ef52ece15..5d69041783 100644
--- a/src/lib/eolian/database_event_api.c
+++ b/src/lib/eolian/database_event_api.c
@@ -59,8 +59,10 @@ eolian_event_c_name_get(const Eolian_Event *event)
59{ 59{
60 char buf[512]; 60 char buf[512];
61 char *tmp = buf; 61 char *tmp = buf;
62 snprintf(buf, sizeof(buf), "%s_EVENT_%s", event->klass->full_name, 62 const char *pfx = event->klass->ev_prefix;
63 event->name); 63 if (!pfx) pfx = event->klass->eo_prefix;
64 if (!pfx) pfx = event->klass->full_name;
65 snprintf(buf, sizeof(buf), "%s_EVENT_%s", pfx, event->name);
64 eina_str_toupper(&tmp); 66 eina_str_toupper(&tmp);
65 while ((tmp = strpbrk(tmp, ".,"))) *tmp = '_'; 67 while ((tmp = strpbrk(tmp, ".,"))) *tmp = '_';
66 return eina_stringshare_add(buf); 68 return eina_stringshare_add(buf);
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index e84b3c1005..34b8bea3f5 100644
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -25,14 +25,14 @@ enum Tokens
25#define KEYWORDS KW(class), KW(const), KW(enum), KW(return), KW(struct), \ 25#define KEYWORDS KW(class), KW(const), KW(enum), KW(return), KW(struct), \
26 \ 26 \
27 KW(abstract), KW(constructor), KW(constructors), KW(data), \ 27 KW(abstract), KW(constructor), KW(constructors), KW(data), \
28 KW(destructor), KW(eo), KW(eo_prefix), KW(events), KW(free), \ 28 KW(destructor), KW(eo), KW(eo_prefix), KW(event_prefix), KW(events), KW(free), \
29 KW(get), KW(implements), KW(import), KW(interface), KW(keys), KW(legacy), \ 29 KW(get), KW(implements), KW(import), KW(interface), KW(keys), KW(legacy), \
30 KW(legacy_prefix), KW(methods), KW(mixin), KW(own), KW(params), \ 30 KW(legacy_prefix), KW(methods), KW(mixin), KW(own), KW(params), \
31 KW(set), KW(type), KW(values), KW(var), KWAT(auto), KWAT(beta), \ 31 KW(set), KW(type), KW(values), KW(var), KWAT(auto), KWAT(beta), \
32 KWAT(c_only), KWAT(class), KWAT(const), KWAT(empty), KWAT(extern), \ 32 KWAT(c_only), KWAT(class), KWAT(const), KWAT(empty), KWAT(extern), \
33 KWAT(free), KWAT(hot), KWAT(restart), KWAT(in), KWAT(inout), KWAT(nonull), KWAT(nullable), \ 33 KWAT(free), KWAT(hot), KWAT(in), KWAT(inout), KWAT(nonull), KWAT(nullable), \
34 KWAT(optional), KWAT(out), KWAT(private), KWAT(property), \ 34 KWAT(optional), KWAT(out), KWAT(private), KWAT(property), \
35 KWAT(protected), KWAT(virtual_pure), KWAT(warn_unused), \ 35 KWAT(protected), KWAT(restart), KWAT(virtual_pure), KWAT(warn_unused), \
36 \ 36 \
37 KW(byte), KW(ubyte), KW(char), KW(short), KW(ushort), KW(int), KW(uint), \ 37 KW(byte), KW(ubyte), KW(char), KW(short), KW(ushort), KW(int), KW(uint), \
38 KW(long), KW(ulong), KW(llong), KW(ullong), \ 38 KW(long), KW(ulong), KW(llong), KW(ullong), \
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index aac1ce4770..203821e67f 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -1684,6 +1684,7 @@ parse_class_body(Eo_Lexer *ls, Eolian_Class_Type type)
1684{ 1684{
1685 Eina_Bool has_legacy_prefix = EINA_FALSE, 1685 Eina_Bool has_legacy_prefix = EINA_FALSE,
1686 has_eo_prefix = EINA_FALSE, 1686 has_eo_prefix = EINA_FALSE,
1687 has_event_prefix = EINA_FALSE,
1687 has_data = EINA_FALSE, 1688 has_data = EINA_FALSE,
1688 has_methods = EINA_FALSE, 1689 has_methods = EINA_FALSE,
1689 has_implements = EINA_FALSE, 1690 has_implements = EINA_FALSE,
@@ -1714,6 +1715,15 @@ parse_class_body(Eo_Lexer *ls, Eolian_Class_Type type)
1714 eo_lexer_get(ls); 1715 eo_lexer_get(ls);
1715 check_next(ls, ';'); 1716 check_next(ls, ';');
1716 break; 1717 break;
1718 case KW_event_prefix:
1719 CASE_LOCK(ls, event_prefix, "event prefix definition")
1720 eo_lexer_get(ls);
1721 check_next(ls, ':');
1722 _validate_pfx(ls);
1723 ls->tmp.kls->ev_prefix = eina_stringshare_ref(ls->t.value.s);
1724 eo_lexer_get(ls);
1725 check_next(ls, ';');
1726 break;
1717 case KW_data: 1727 case KW_data:
1718 if (type == EOLIAN_CLASS_INTERFACE) return; 1728 if (type == EOLIAN_CLASS_INTERFACE) return;
1719 CASE_LOCK(ls, data, "data definition") 1729 CASE_LOCK(ls, data, "data definition")
diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h
index a232ff6be9..97f65d4b8a 100644
--- a/src/lib/eolian/eolian_database.h
+++ b/src/lib/eolian/eolian_database.h
@@ -88,6 +88,7 @@ struct _Eolian_Class
88 Eolian_Documentation *doc; 88 Eolian_Documentation *doc;
89 Eina_Stringshare *legacy_prefix; 89 Eina_Stringshare *legacy_prefix;
90 Eina_Stringshare *eo_prefix; 90 Eina_Stringshare *eo_prefix;
91 Eina_Stringshare *ev_prefix;
91 Eina_Stringshare *data_type; 92 Eina_Stringshare *data_type;
92 Eina_List *inherits; /* List Eina_Stringshare * */ 93 Eina_List *inherits; /* List Eina_Stringshare * */
93 Eina_List *properties; /* List prop_name -> Eolian_Function */ 94 Eina_List *properties; /* List prop_name -> Eolian_Function */
diff --git a/src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh b/src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh
index 21395e9c1a..03d6283b0a 100644
--- a/src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh
+++ b/src/lib/eolian_cxx/grammar/eo_class_constructors_generator.hh
@@ -173,7 +173,7 @@ operator<<(std::ostream& out, functors_constructor_methods const& x)
173 { 173 {
174 if (d.is_cb) 174 if (d.is_cb)
175 d.out << tab(3) 175 d.out << tab(3)
176 << "eo_event_callback_add(_eoptr, EO_BASE_EVENT_DEL, " 176 << "eo_event_callback_add(_eoptr, EO_EVENT_DEL, "
177 << "&::efl::eolian::free_callback_callback<" 177 << "&::efl::eolian::free_callback_callback<"
178 << parameter_no_ref_type(d.type, d.name) 178 << parameter_no_ref_type(d.type, d.name)
179 << ">, " << callback_tmp(d.name) << ");" << endl; 179 << ">, " << callback_tmp(d.name) << ");" << endl;
diff --git a/src/lib/eolian_cxx/grammar/parameters_generator.hh b/src/lib/eolian_cxx/grammar/parameters_generator.hh
index 9d27926364..dd692f3044 100644
--- a/src/lib/eolian_cxx/grammar/parameters_generator.hh
+++ b/src/lib/eolian_cxx/grammar/parameters_generator.hh
@@ -123,7 +123,7 @@ operator<<(std::ostream& out, callback_parameter_free_ev_add const& x)
123{ 123{
124 out 124 out
125 << "eo_event_callback_add(" << x._eo_raw_expr 125 << "eo_event_callback_add(" << x._eo_raw_expr
126 << ", EO_BASE_EVENT_DEL, &::efl::eolian::free_callback_callback<" 126 << ", EO_EVENT_DEL, &::efl::eolian::free_callback_callback<"
127 << parameter_no_ref_type(x._type, x._name) << ">, " 127 << parameter_no_ref_type(x._type, x._name) << ">, "
128 << callback_tmp(x._name) << ");"; 128 << callback_tmp(x._name) << ");";
129 return out; 129 return out;
diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo
index 56ec70c2ef..2e91e7d270 100644
--- a/src/lib/evas/canvas/evas_box.eo
+++ b/src/lib/evas/canvas/evas_box.eo
@@ -8,6 +8,7 @@ class Evas.Box (Evas.Smart.Clipped)
8{ 8{
9 legacy_prefix: evas_object_box; 9 legacy_prefix: evas_object_box;
10 eo_prefix: evas_obj_box; 10 eo_prefix: evas_obj_box;
11 event_prefix: evas_box;
11 data: Evas_Object_Box_Data; 12 data: Evas_Object_Box_Data;
12 methods { 13 methods {
13 @property align { 14 @property align {
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index 89c102ac94..aae5f4ddf1 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -327,7 +327,7 @@ _evas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *
327 state_write->clipper = NULL; 327 state_write->clipper = NULL;
328 EINA_COW_STATE_WRITE_END(obj, state_write, cur); 328 EINA_COW_STATE_WRITE_END(obj, state_write, cur);
329 if (obj->prev->clipper != old_clip) 329 if (obj->prev->clipper != old_clip)
330 eo_event_callback_del(old_clip->object, EO_BASE_EVENT_DEL, _clipper_del_cb, eo_obj); 330 eo_event_callback_del(old_clip->object, EO_EVENT_DEL, _clipper_del_cb, eo_obj);
331 } 331 }
332 332
333 /* image object clipper */ 333 /* image object clipper */
@@ -359,7 +359,7 @@ _evas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *
359 state_write->clipper = clip; 359 state_write->clipper = clip;
360 EINA_COW_STATE_WRITE_END(obj, state_write, cur); 360 EINA_COW_STATE_WRITE_END(obj, state_write, cur);
361 if (obj->prev->clipper != clip) 361 if (obj->prev->clipper != clip)
362 eo_event_callback_add(clip->object, EO_BASE_EVENT_DEL, _clipper_del_cb, eo_obj); 362 eo_event_callback_add(clip->object, EO_EVENT_DEL, _clipper_del_cb, eo_obj);
363 363
364 clip->clip.cache_clipees_answer = eina_list_free(clip->clip.cache_clipees_answer); 364 clip->clip.cache_clipees_answer = eina_list_free(clip->clip.cache_clipees_answer);
365 clip->clip.clipees = eina_list_append(clip->clip.clipees, obj); 365 clip->clip.clipees = eina_list_append(clip->clip.clipees, obj);
@@ -456,7 +456,7 @@ _evas_object_clip_unset(Eo *eo_obj, Evas_Object_Protected_Data *obj)
456 state_write->clipper = NULL; 456 state_write->clipper = NULL;
457 EINA_COW_STATE_WRITE_END(obj, state_write, cur); 457 EINA_COW_STATE_WRITE_END(obj, state_write, cur);
458 if (obj->prev->clipper != old_clip) 458 if (obj->prev->clipper != old_clip)
459 eo_event_callback_del(old_clip->object, EO_BASE_EVENT_DEL, _clipper_del_cb, eo_obj); 459 eo_event_callback_del(old_clip->object, EO_EVENT_DEL, _clipper_del_cb, eo_obj);
460 } 460 }
461 461
462 evas_object_change(eo_obj, obj); 462 evas_object_change(eo_obj, obj);
@@ -510,7 +510,7 @@ _evas_object_clip_prev_reset(Evas_Object_Protected_Data *obj, Eina_Bool cur_prev
510 EINA_COW_STATE_WRITE_END(obj, state_write, prev); 510 EINA_COW_STATE_WRITE_END(obj, state_write, prev);
511 } 511 }
512 if (clip != obj->cur->clipper) 512 if (clip != obj->cur->clipper)
513 eo_event_callback_del(clip->object, EO_BASE_EVENT_DEL, _clipper_del_cb, obj->object); 513 eo_event_callback_del(clip->object, EO_EVENT_DEL, _clipper_del_cb, obj->object);
514 } 514 }
515} 515}
516 516
diff --git a/src/lib/evas/canvas/evas_object.eo b/src/lib/evas/canvas/evas_object.eo
index 92734509cc..c16284e588 100644
--- a/src/lib/evas/canvas/evas_object.eo
+++ b/src/lib/evas/canvas/evas_object.eo
@@ -4,6 +4,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx, Efl.Gfx.Stack, Ef
4{ 4{
5 legacy_prefix: evas_object; 5 legacy_prefix: evas_object;
6 eo_prefix: evas_obj; 6 eo_prefix: evas_obj;
7 event_prefix: evas_object;
7 data: Evas_Object_Protected_Data; 8 data: Evas_Object_Protected_Data;
8 methods { 9 methods {
9 legacy_ctor @protected { 10 legacy_ctor @protected {
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 59b8457cf5..45bc61ff53 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -148,8 +148,8 @@ _check_event_catcher_del(void *data, const Eo_Event *event)
148} 148}
149 149
150EO_CALLBACKS_ARRAY_DEFINE(event_catcher_watch, 150EO_CALLBACKS_ARRAY_DEFINE(event_catcher_watch,
151 { EO_BASE_EVENT_CALLBACK_ADD, _check_event_catcher_add }, 151 { EO_EVENT_CALLBACK_ADD, _check_event_catcher_add },
152 { EO_BASE_EVENT_CALLBACK_DEL, _check_event_catcher_del }); 152 { EO_EVENT_CALLBACK_DEL, _check_event_catcher_del });
153 153
154EOLIAN static Eo * 154EOLIAN static Eo *
155_evas_object_eo_base_constructor(Eo *eo_obj, Evas_Object_Protected_Data *obj) 155_evas_object_eo_base_constructor(Eo *eo_obj, Evas_Object_Protected_Data *obj)