summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ecore/ecore_idler.c4
-rw-r--r--src/lib/ecore/ecore_main.c12
-rw-r--r--src/lib/ecore/ecore_private.h4
-rw-r--r--src/lib/ecore/ecore_timer.c8
-rw-r--r--src/lib/ecore/efl_io_copier.c12
-rw-r--r--src/lib/ecore/efl_io_stderr.c4
-rw-r--r--src/lib/ecore/efl_io_stdin.c4
-rw-r--r--src/lib/ecore/efl_io_stdout.c4
-rw-r--r--src/lib/ecore/efl_loop_fd.c4
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_pulse.c4
-rw-r--r--src/lib/ecore_con/ecore_con_url.c6
-rw-r--r--src/lib/ecore_con/efl_net_dialer_http.c6
-rw-r--r--src/lib/ecore_con/efl_net_server_fd.c4
-rw-r--r--src/lib/ecore_con/efl_net_server_tcp.c2
-rw-r--r--src/lib/ecore_con/efl_net_socket_fd.c6
-rw-r--r--src/lib/ecore_evas/ecore_evas.c4
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.c2
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_shape.c2
-rw-r--r--src/lib/ector/software/ector_renderer_software_shape.c2
-rw-r--r--src/lib/edje/edje_callbacks.c20
-rw-r--r--src/lib/edje/edje_multisense.c4
-rw-r--r--src/lib/edje/edje_private.h2
-rw-r--r--src/lib/edje/edje_program.c2
-rw-r--r--src/lib/efl/interfaces/efl_vpath_manager.c2
-rw-r--r--src/lib/elementary/efl_ui_box.c4
-rw-r--r--src/lib/elementary/efl_ui_frame.c2
-rw-r--r--src/lib/elementary/efl_ui_grid.c4
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.c2
-rw-r--r--src/lib/elementary/efl_ui_text.c20
-rw-r--r--src/lib/elementary/efl_ui_video.c24
-rw-r--r--src/lib/elementary/efl_ui_win.c14
-rw-r--r--src/lib/elementary/elc_combobox.c10
-rw-r--r--src/lib/elementary/elc_fileselector.c52
-rw-r--r--src/lib/elementary/elc_fileselector_button.c4
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c6
-rw-r--r--src/lib/elementary/elc_hoversel.c14
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c16
-rw-r--r--src/lib/elementary/elc_naviframe.c6
-rw-r--r--src/lib/elementary/elc_player.c52
-rw-r--r--src/lib/elementary/elc_popup.c16
-rw-r--r--src/lib/elementary/elm_app_server.c2
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c58
-rw-r--r--src/lib/elementary/elm_box.c8
-rw-r--r--src/lib/elementary/elm_cnp.c2
-rw-r--r--src/lib/elementary/elm_code_widget.c8
-rw-r--r--src/lib/elementary/elm_color_class.c6
-rw-r--r--src/lib/elementary/elm_colorselector.c12
-rw-r--r--src/lib/elementary/elm_conform.c10
-rw-r--r--src/lib/elementary/elm_dayselector.c2
-rw-r--r--src/lib/elementary/elm_entry.c8
-rw-r--r--src/lib/elementary/elm_genlist.c2
-rw-r--r--src/lib/elementary/elm_glview.c4
-rw-r--r--src/lib/elementary/elm_helper.c2
-rw-r--r--src/lib/elementary/elm_helper.h2
-rw-r--r--src/lib/elementary/elm_interface_atspi_accessible.c4
-rw-r--r--src/lib/elementary/elm_interface_atspi_image.c2
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c30
-rw-r--r--src/lib/elementary/elm_main.c2
-rw-r--r--src/lib/elementary/elm_map.c4
-rw-r--r--src/lib/elementary/elm_menu.c6
-rw-r--r--src/lib/elementary/elm_panel.c2
-rw-r--r--src/lib/elementary/elm_photo.c2
-rw-r--r--src/lib/elementary/elm_photocam.c6
-rw-r--r--src/lib/elementary/elm_spinner.c20
-rw-r--r--src/lib/elementary/elm_store.c4
-rw-r--r--src/lib/elementary/elm_view_form.c2
-rw-r--r--src/lib/elementary/elm_view_list.c20
-rw-r--r--src/lib/elementary/elm_widget.c20
-rw-r--r--src/lib/eo/Eo.h6
-rw-r--r--src/lib/eo/efl_object.eo2
-rw-r--r--src/lib/eo/eo_base_class.c8
-rw-r--r--src/lib/eolian/database_type.c2
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c10
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node.c4
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node_callback.h4
-rw-r--r--src/lib/evas/canvas/evas_clip.c4
-rw-r--r--src/lib/evas/canvas/evas_device.c2
-rw-r--r--src/lib/evas/canvas/evas_events.c4
-rw-r--r--src/lib/evas/canvas/evas_filter_mixin.c2
-rw-r--r--src/lib/evas/canvas/evas_object_box.c6
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c2
-rw-r--r--src/lib/evas/canvas/evas_object_table.c4
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c2
-rw-r--r--src/lib/evas/canvas/evas_object_vg.c2
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c2
-rw-r--r--src/lib/evas/canvas/evas_vg_root_node.c2
86 files changed, 344 insertions, 344 deletions
diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c
index 69c62071a6..e80f9fb8ef 100644
--- a/src/lib/ecore/ecore_idler.c
+++ b/src/lib/ecore/ecore_idler.c
@@ -21,13 +21,13 @@ struct _Ecore_Factorized_Idle
21}; 21};
22 22
23void 23void
24_ecore_factorized_idle_event_del(void *data, const Eo_Event *event EINA_UNUSED) 24_ecore_factorized_idle_event_del(void *data, const Efl_Event *event EINA_UNUSED)
25{ 25{
26 _ecore_factorized_idle_del(data); 26 _ecore_factorized_idle_del(data);
27} 27}
28 28
29void 29void
30_ecore_factorized_idle_process(void *data, const Eo_Event *event EINA_UNUSED) 30_ecore_factorized_idle_process(void *data, const Efl_Event *event EINA_UNUSED)
31{ 31{
32 Ecore_Factorized_Idle *idler = data; 32 Ecore_Factorized_Idle *idler = data;
33 33
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 7d0c5d1a5c..5191052126 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -2772,7 +2772,7 @@ _efl_loop_efl_object_provider_find(Eo *obj, Efl_Loop_Data *pd, const Efl_Object
2772} 2772}
2773 2773
2774static void 2774static void
2775_check_event_catcher_add(void *data, const Eo_Event *event) 2775_check_event_catcher_add(void *data, const Efl_Event *event)
2776{ 2776{
2777 const Efl_Callback_Array_Item *array = event->info; 2777 const Efl_Callback_Array_Item *array = event->info;
2778 Efl_Loop_Data *pd = data; 2778 Efl_Loop_Data *pd = data;
@@ -2788,7 +2788,7 @@ _check_event_catcher_add(void *data, const Eo_Event *event)
2788} 2788}
2789 2789
2790static void 2790static void
2791_check_event_catcher_del(void *data, const Eo_Event *event) 2791_check_event_catcher_del(void *data, const Efl_Event *event)
2792{ 2792{
2793 const Efl_Callback_Array_Item *array = event->info; 2793 const Efl_Callback_Array_Item *array = event->info;
2794 Efl_Loop_Data *pd = data; 2794 Efl_Loop_Data *pd = data;
@@ -2902,8 +2902,8 @@ ecore_loop_arguments_send(int argc, const char **argv)
2902 eina_promise_then(job, _efl_loop_arguments_send, _efl_loop_arguments_cancel, arga); 2902 eina_promise_then(job, _efl_loop_arguments_send, _efl_loop_arguments_cancel, arga);
2903} 2903}
2904 2904
2905static void _efl_loop_timeout_force_cancel_cb(void *data, const Eo_Event *event EINA_UNUSED); 2905static void _efl_loop_timeout_force_cancel_cb(void *data, const Efl_Event *event EINA_UNUSED);
2906static void _efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED); 2906static void _efl_loop_timeout_cb(void *data, const Efl_Event *event EINA_UNUSED);
2907 2907
2908EFL_CALLBACKS_ARRAY_DEFINE(timeout, 2908EFL_CALLBACKS_ARRAY_DEFINE(timeout,
2909 { EFL_LOOP_TIMER_EVENT_TICK, _efl_loop_timeout_cb }, 2909 { EFL_LOOP_TIMER_EVENT_TICK, _efl_loop_timeout_cb },
@@ -2913,13 +2913,13 @@ EFL_CALLBACKS_ARRAY_DEFINE(timeout,
2913static void _efl_loop_internal_cancel(Efl_Internal_Promise *p); 2913static void _efl_loop_internal_cancel(Efl_Internal_Promise *p);
2914 2914
2915static void 2915static void
2916_efl_loop_timeout_force_cancel_cb(void *data, const Eo_Event *event EINA_UNUSED) 2916_efl_loop_timeout_force_cancel_cb(void *data, const Efl_Event *event EINA_UNUSED)
2917{ 2917{
2918 _efl_loop_internal_cancel(data); 2918 _efl_loop_internal_cancel(data);
2919} 2919}
2920 2920
2921static void 2921static void
2922_efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED) 2922_efl_loop_timeout_cb(void *data, const Efl_Event *event EINA_UNUSED)
2923{ 2923{
2924 Efl_Internal_Promise *t = data; 2924 Efl_Internal_Promise *t = data;
2925 2925
diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h
index eaf5a3b0a8..e476b32700 100644
--- a/src/lib/ecore/ecore_private.h
+++ b/src/lib/ecore/ecore_private.h
@@ -167,8 +167,8 @@ Ecore_Factorized_Idle *_ecore_factorized_idle_add(const Efl_Callback_Array_Item*
167 Ecore_Task_Cb func, 167 Ecore_Task_Cb func,
168 const void *data); 168 const void *data);
169void *_ecore_factorized_idle_del(Ecore_Idler *idler); 169void *_ecore_factorized_idle_del(Ecore_Idler *idler);
170void _ecore_factorized_idle_process(void *data, const Eo_Event *event); 170void _ecore_factorized_idle_process(void *data, const Efl_Event *event);
171void _ecore_factorized_idle_event_del(void *data, const Eo_Event *event); 171void _ecore_factorized_idle_event_del(void *data, const Efl_Event *event);
172 172
173void _ecore_idler_all_call(Eo *loop); 173void _ecore_idler_all_call(Eo *loop);
174int _ecore_idler_exist(Eo *loop); 174int _ecore_idler_exist(Eo *loop);
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index 67cd247736..f7b9cbd61c 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -75,7 +75,7 @@ ecore_timer_precision_set(double value)
75} 75}
76 76
77static void 77static void
78_check_timer_event_catcher_add(void *data, const Eo_Event *event) 78_check_timer_event_catcher_add(void *data, const Efl_Event *event)
79{ 79{
80 const Efl_Callback_Array_Item *array = event->info; 80 const Efl_Callback_Array_Item *array = event->info;
81 Efl_Loop_Timer_Data *timer = data; 81 Efl_Loop_Timer_Data *timer = data;
@@ -95,7 +95,7 @@ _check_timer_event_catcher_add(void *data, const Eo_Event *event)
95} 95}
96 96
97static void 97static void
98_check_timer_event_catcher_del(void *data, const Eo_Event *event) 98_check_timer_event_catcher_del(void *data, const Efl_Event *event)
99{ 99{
100 const Efl_Callback_Array_Item *array = event->info; 100 const Efl_Callback_Array_Item *array = event->info;
101 Efl_Loop_Timer_Data *timer = data; 101 Efl_Loop_Timer_Data *timer = data;
@@ -152,7 +152,7 @@ struct _Ecore_Timer_Legacy
152}; 152};
153 153
154static void 154static void
155_ecore_timer_legacy_del(void *data, const Eo_Event *event EINA_UNUSED) 155_ecore_timer_legacy_del(void *data, const Efl_Event *event EINA_UNUSED)
156{ 156{
157 Ecore_Timer_Legacy *legacy = data; 157 Ecore_Timer_Legacy *legacy = data;
158 158
@@ -160,7 +160,7 @@ _ecore_timer_legacy_del(void *data, const Eo_Event *event EINA_UNUSED)
160} 160}
161 161
162static void 162static void
163_ecore_timer_legacy_tick(void *data, const Eo_Event *event) 163_ecore_timer_legacy_tick(void *data, const Efl_Event *event)
164{ 164{
165 Ecore_Timer_Legacy *legacy = data; 165 Ecore_Timer_Legacy *legacy = data;
166 166
diff --git a/src/lib/ecore/efl_io_copier.c b/src/lib/ecore/efl_io_copier.c
index b75182b2bf..dbe2ab8469 100644
--- a/src/lib/ecore/efl_io_copier.c
+++ b/src/lib/ecore/efl_io_copier.c
@@ -285,7 +285,7 @@ _efl_io_copier_write(Eo *o, Efl_Io_Copier_Data *pd)
285} 285}
286 286
287static void 287static void
288_efl_io_copier_source_can_read_changed(void *data, const Eo_Event *event EINA_UNUSED) 288_efl_io_copier_source_can_read_changed(void *data, const Efl_Event *event EINA_UNUSED)
289{ 289{
290 Eo *o = data; 290 Eo *o = data;
291 Efl_Io_Copier_Data *pd = efl_data_scope_get(o, MY_CLASS); 291 Efl_Io_Copier_Data *pd = efl_data_scope_get(o, MY_CLASS);
@@ -298,7 +298,7 @@ _efl_io_copier_source_can_read_changed(void *data, const Eo_Event *event EINA_UN
298} 298}
299 299
300static void 300static void
301_efl_io_copier_source_eos(void *data, const Eo_Event *event EINA_UNUSED) 301_efl_io_copier_source_eos(void *data, const Efl_Event *event EINA_UNUSED)
302{ 302{
303 Eo *o = data; 303 Eo *o = data;
304 Efl_Io_Copier_Data *pd = efl_data_scope_get(o, MY_CLASS); 304 Efl_Io_Copier_Data *pd = efl_data_scope_get(o, MY_CLASS);
@@ -324,7 +324,7 @@ _efl_io_copier_source_size_apply(Eo *o, Efl_Io_Copier_Data *pd)
324} 324}
325 325
326static void 326static void
327_efl_io_copier_source_resized(void *data, const Eo_Event *event EINA_UNUSED) 327_efl_io_copier_source_resized(void *data, const Efl_Event *event EINA_UNUSED)
328{ 328{
329 Eo *o = data; 329 Eo *o = data;
330 Efl_Io_Copier_Data *pd = efl_data_scope_get(o, MY_CLASS); 330 Efl_Io_Copier_Data *pd = efl_data_scope_get(o, MY_CLASS);
@@ -332,7 +332,7 @@ _efl_io_copier_source_resized(void *data, const Eo_Event *event EINA_UNUSED)
332} 332}
333 333
334static void 334static void
335_efl_io_copier_source_closed(void *data, const Eo_Event *event EINA_UNUSED) 335_efl_io_copier_source_closed(void *data, const Efl_Event *event EINA_UNUSED)
336{ 336{
337 Eo *o = data; 337 Eo *o = data;
338 Efl_Io_Copier_Data *pd = efl_data_scope_get(o, MY_CLASS); 338 Efl_Io_Copier_Data *pd = efl_data_scope_get(o, MY_CLASS);
@@ -398,7 +398,7 @@ _efl_io_copier_source_set(Eo *o, Efl_Io_Copier_Data *pd, Efl_Io_Reader *source)
398} 398}
399 399
400static void 400static void
401_efl_io_copier_destination_can_write_changed(void *data, const Eo_Event *event EINA_UNUSED) 401_efl_io_copier_destination_can_write_changed(void *data, const Efl_Event *event EINA_UNUSED)
402{ 402{
403 Eo *o = data; 403 Eo *o = data;
404 Efl_Io_Copier_Data *pd = efl_data_scope_get(o, MY_CLASS); 404 Efl_Io_Copier_Data *pd = efl_data_scope_get(o, MY_CLASS);
@@ -411,7 +411,7 @@ _efl_io_copier_destination_can_write_changed(void *data, const Eo_Event *event E
411} 411}
412 412
413static void 413static void
414_efl_io_copier_destination_closed(void *data, const Eo_Event *event EINA_UNUSED) 414_efl_io_copier_destination_closed(void *data, const Efl_Event *event EINA_UNUSED)
415{ 415{
416 Eo *o = data; 416 Eo *o = data;
417 Efl_Io_Copier_Data *pd = efl_data_scope_get(o, MY_CLASS); 417 Efl_Io_Copier_Data *pd = efl_data_scope_get(o, MY_CLASS);
diff --git a/src/lib/ecore/efl_io_stderr.c b/src/lib/ecore/efl_io_stderr.c
index c41308afbb..b6090280f2 100644
--- a/src/lib/ecore/efl_io_stderr.c
+++ b/src/lib/ecore/efl_io_stderr.c
@@ -11,13 +11,13 @@
11#define MY_CLASS EFL_IO_STDERR_CLASS 11#define MY_CLASS EFL_IO_STDERR_CLASS
12 12
13static void 13static void
14_efl_io_stderr_event_write(void *data EINA_UNUSED, const Eo_Event *event) 14_efl_io_stderr_event_write(void *data EINA_UNUSED, const Efl_Event *event)
15{ 15{
16 efl_io_writer_can_write_set(event->object, EINA_TRUE); 16 efl_io_writer_can_write_set(event->object, EINA_TRUE);
17} 17}
18 18
19static void 19static void
20_efl_io_stderr_event_error(void *data EINA_UNUSED, const Eo_Event *event) 20_efl_io_stderr_event_error(void *data EINA_UNUSED, const Efl_Event *event)
21{ 21{
22 efl_io_writer_can_write_set(event->object, EINA_FALSE); 22 efl_io_writer_can_write_set(event->object, EINA_FALSE);
23} 23}
diff --git a/src/lib/ecore/efl_io_stdin.c b/src/lib/ecore/efl_io_stdin.c
index 640d512353..679068b7a9 100644
--- a/src/lib/ecore/efl_io_stdin.c
+++ b/src/lib/ecore/efl_io_stdin.c
@@ -11,14 +11,14 @@
11#define MY_CLASS EFL_IO_STDIN_CLASS 11#define MY_CLASS EFL_IO_STDIN_CLASS
12 12
13static void 13static void
14_efl_io_stdin_event_read(void *data EINA_UNUSED, const Eo_Event *event) 14_efl_io_stdin_event_read(void *data EINA_UNUSED, const Efl_Event *event)
15{ 15{
16 efl_io_reader_can_read_set(event->object, EINA_TRUE); 16 efl_io_reader_can_read_set(event->object, EINA_TRUE);
17 efl_io_reader_eos_set(event->object, EINA_FALSE); 17 efl_io_reader_eos_set(event->object, EINA_FALSE);
18} 18}
19 19
20static void 20static void
21_efl_io_stdin_event_error(void *data EINA_UNUSED, const Eo_Event *event) 21_efl_io_stdin_event_error(void *data EINA_UNUSED, const Efl_Event *event)
22{ 22{
23 efl_io_reader_can_read_set(event->object, EINA_FALSE); 23 efl_io_reader_can_read_set(event->object, EINA_FALSE);
24 efl_io_reader_eos_set(event->object, EINA_TRUE); 24 efl_io_reader_eos_set(event->object, EINA_TRUE);
diff --git a/src/lib/ecore/efl_io_stdout.c b/src/lib/ecore/efl_io_stdout.c
index df4c31631c..df20c9fb91 100644
--- a/src/lib/ecore/efl_io_stdout.c
+++ b/src/lib/ecore/efl_io_stdout.c
@@ -11,13 +11,13 @@
11#define MY_CLASS EFL_IO_STDOUT_CLASS 11#define MY_CLASS EFL_IO_STDOUT_CLASS
12 12
13static void 13static void
14_efl_io_stdout_event_write(void *data EINA_UNUSED, const Eo_Event *event) 14_efl_io_stdout_event_write(void *data EINA_UNUSED, const Efl_Event *event)
15{ 15{
16 efl_io_writer_can_write_set(event->object, EINA_TRUE); 16 efl_io_writer_can_write_set(event->object, EINA_TRUE);
17} 17}
18 18
19static void 19static void
20_efl_io_stdout_event_error(void *data EINA_UNUSED, const Eo_Event *event) 20_efl_io_stdout_event_error(void *data EINA_UNUSED, const Efl_Event *event)
21{ 21{
22 efl_io_writer_can_write_set(event->object, EINA_FALSE); 22 efl_io_writer_can_write_set(event->object, EINA_FALSE);
23} 23}
diff --git a/src/lib/ecore/efl_loop_fd.c b/src/lib/ecore/efl_loop_fd.c
index 9c9f7a56f9..b04e77df68 100644
--- a/src/lib/ecore/efl_loop_fd.c
+++ b/src/lib/ecore/efl_loop_fd.c
@@ -93,7 +93,7 @@ _efl_loop_fd_fd_file_get(Eo *obj EINA_UNUSED, Efl_Loop_Fd_Data *pd)
93} 93}
94 94
95static void 95static void
96_check_fd_event_catcher_add(void *data, const Eo_Event *event) 96_check_fd_event_catcher_add(void *data, const Efl_Event *event)
97{ 97{
98 const Efl_Callback_Array_Item *array = event->info; 98 const Efl_Callback_Array_Item *array = event->info;
99 Efl_Loop_Fd_Data *fd = data; 99 Efl_Loop_Fd_Data *fd = data;
@@ -120,7 +120,7 @@ _check_fd_event_catcher_add(void *data, const Eo_Event *event)
120} 120}
121 121
122static void 122static void
123_check_fd_event_catcher_del(void *data, const Eo_Event *event) 123_check_fd_event_catcher_del(void *data, const Efl_Event *event)
124{ 124{
125 const Efl_Callback_Array_Item *array = event->info; 125 const Efl_Callback_Array_Item *array = event->info;
126 Efl_Loop_Fd_Data *fd = data; 126 Efl_Loop_Fd_Data *fd = data;
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
index 58130b273e..edbbb197f0 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
@@ -89,7 +89,7 @@ static void _write_cb(pa_stream *stream, size_t len, void *data)
89 } 89 }
90} 90}
91 91
92static void _update_samplerate_cb(void *data EINA_UNUSED, const Eo_Event *event) 92static void _update_samplerate_cb(void *data EINA_UNUSED, const Efl_Event *event)
93{ 93{
94 pa_stream *stream = NULL; 94 pa_stream *stream = NULL;
95 int samplerate = 0; 95 int samplerate = 0;
@@ -146,7 +146,7 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
146 return ret; 146 return ret;
147} 147}
148 148
149static void _delayed_attach_cb(void *data, const Eo_Event *event) 149static void _delayed_attach_cb(void *data, const Efl_Event *event)
150{ 150{
151 Eo *in = data; 151 Eo *in = data;
152 efl_event_callback_del(event->object, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in); 152 efl_event_callback_del(event->object, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in);
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index 9c5a83c838..7fbd0c7d75 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -162,7 +162,7 @@ ecore_con_url_pipeline_get(void)
162extern Ecore_Con_Socks *_ecore_con_proxy_global; 162extern Ecore_Con_Socks *_ecore_con_proxy_global;
163 163
164static void 164static void
165_efl_network_url_event_complete_cb(void *data EINA_UNUSED, const Eo_Event *event) 165_efl_network_url_event_complete_cb(void *data EINA_UNUSED, const Efl_Event *event)
166{ 166{
167 Ecore_Con_Event_Url_Complete *e, *f = event->info; 167 Ecore_Con_Event_Url_Complete *e, *f = event->info;
168 168
@@ -182,7 +182,7 @@ _efl_network_url_event_complete_cb(void *data EINA_UNUSED, const Eo_Event *event
182} 182}
183 183
184static void 184static void
185_efl_network_url_event_data_cb(void *data EINA_UNUSED, const Eo_Event *event) 185_efl_network_url_event_data_cb(void *data EINA_UNUSED, const Efl_Event *event)
186{ 186{
187 Ecore_Con_Event_Url_Data *e; 187 Ecore_Con_Event_Url_Data *e;
188 Efl_Network_Event_Url_Data *f = event->info; 188 Efl_Network_Event_Url_Data *f = event->info;
@@ -199,7 +199,7 @@ _efl_network_url_event_data_cb(void *data EINA_UNUSED, const Eo_Event *event)
199} 199}
200 200
201static void 201static void
202_efl_network_url_event_progress_cb(void *data EINA_UNUSED, const Eo_Event *event) 202_efl_network_url_event_progress_cb(void *data EINA_UNUSED, const Efl_Event *event)
203{ 203{
204 Ecore_Con_Event_Url_Progress *e, *f = event->info; 204 Ecore_Con_Event_Url_Progress *e, *f = event->info;
205 205
diff --git a/src/lib/ecore_con/efl_net_dialer_http.c b/src/lib/ecore_con/efl_net_dialer_http.c
index 06c5743d3c..8b34b75047 100644
--- a/src/lib/ecore_con/efl_net_dialer_http.c
+++ b/src/lib/ecore_con/efl_net_dialer_http.c
@@ -268,7 +268,7 @@ _efl_net_dialer_http_curlm_check(Efl_Net_Dialer_Http_Curlm *cm)
268} 268}
269 269
270static void 270static void
271_efl_net_dialer_http_curlm_timer_do(void *data, const Eo_Event *ev EINA_UNUSED) 271_efl_net_dialer_http_curlm_timer_do(void *data, const Efl_Event *ev EINA_UNUSED)
272{ 272{
273 Efl_Net_Dialer_Http_Curlm *cm = data; 273 Efl_Net_Dialer_Http_Curlm *cm = data;
274 CURLMcode r; 274 CURLMcode r;
@@ -312,7 +312,7 @@ _efl_net_dialer_http_curlm_timer_schedule(CURLM *multi EINA_UNUSED, long timeout
312// it seems the Eo_Loop_Fd isn't working properly when we change connections... 312// it seems the Eo_Loop_Fd isn't working properly when we change connections...
313// as it's still built on top of Ecore_Fd_Handler, then use it directly. 313// as it's still built on top of Ecore_Fd_Handler, then use it directly.
314static void 314static void
315_efl_net_dialer_http_curlm_event_fd_read(void *data, const Eo_Event *event) 315_efl_net_dialer_http_curlm_event_fd_read(void *data, const Efl_Event *event)
316{ 316{
317 Efl_Net_Dialer_Http_Curlm *cm = data; 317 Efl_Net_Dialer_Http_Curlm *cm = data;
318 int fd = efl_loop_fd_get(event->object); 318 int fd = efl_loop_fd_get(event->object);
@@ -327,7 +327,7 @@ _efl_net_dialer_http_curlm_event_fd_read(void *data, const Eo_Event *event)
327} 327}
328 328
329static void 329static void
330_efl_net_dialer_http_curlm_event_fd_write(void *data, const Eo_Event *event) 330_efl_net_dialer_http_curlm_event_fd_write(void *data, const Efl_Event *event)
331{ 331{
332 Efl_Net_Dialer_Http_Curlm *cm = data; 332 Efl_Net_Dialer_Http_Curlm *cm = data;
333 int fd = efl_loop_fd_get(event->object); 333 int fd = efl_loop_fd_get(event->object);
diff --git a/src/lib/ecore_con/efl_net_server_fd.c b/src/lib/ecore_con/efl_net_server_fd.c
index 9d457f4187..505c82c277 100644
--- a/src/lib/ecore_con/efl_net_server_fd.c
+++ b/src/lib/ecore_con/efl_net_server_fd.c
@@ -59,7 +59,7 @@ efl_net_accept4(int fd, struct sockaddr *addr, socklen_t *addrlen, Eina_Bool clo
59} 59}
60 60
61static void 61static void
62_efl_net_server_fd_event_read(void *data EINA_UNUSED, const Eo_Event *event) 62_efl_net_server_fd_event_read(void *data EINA_UNUSED, const Efl_Event *event)
63{ 63{
64 Eo *o = event->object; 64 Eo *o = event->object;
65 unsigned int count, limit; 65 unsigned int count, limit;
@@ -101,7 +101,7 @@ _efl_net_server_fd_event_read(void *data EINA_UNUSED, const Eo_Event *event)
101} 101}
102 102
103static void 103static void
104_efl_net_server_fd_event_error(void *data EINA_UNUSED, const Eo_Event *event) 104_efl_net_server_fd_event_error(void *data EINA_UNUSED, const Efl_Event *event)
105{ 105{
106 Eo *o = event->object; 106 Eo *o = event->object;
107 Eina_Error err = EBADF; 107 Eina_Error err = EBADF;
diff --git a/src/lib/ecore_con/efl_net_server_tcp.c b/src/lib/ecore_con/efl_net_server_tcp.c
index 23b670b769..6eb04a77f1 100644
--- a/src/lib/ecore_con/efl_net_server_tcp.c
+++ b/src/lib/ecore_con/efl_net_server_tcp.c
@@ -142,7 +142,7 @@ _efl_net_server_tcp_efl_net_server_serve(Eo *o, void *pd EINA_UNUSED, const char
142static Efl_Callback_Array_Item *_efl_net_server_tcp_client_cbs(void); 142static Efl_Callback_Array_Item *_efl_net_server_tcp_client_cbs(void);
143 143
144static void 144static void
145_efl_net_server_tcp_client_event_closed(void *data, const Eo_Event *event) 145_efl_net_server_tcp_client_event_closed(void *data, const Efl_Event *event)
146{ 146{
147 Eo *server = data; 147 Eo *server = data;
148 Eo *client = event->object; 148 Eo *client = event->object;
diff --git a/src/lib/ecore_con/efl_net_socket_fd.c b/src/lib/ecore_con/efl_net_socket_fd.c
index e963d08c49..0cc9152918 100644
--- a/src/lib/ecore_con/efl_net_socket_fd.c
+++ b/src/lib/ecore_con/efl_net_socket_fd.c
@@ -35,20 +35,20 @@ typedef struct _Efl_Net_Socket_Fd_Data
35} Efl_Net_Socket_Fd_Data; 35} Efl_Net_Socket_Fd_Data;
36 36
37static void 37static void
38_efl_net_socket_fd_event_read(void *data EINA_UNUSED, const Eo_Event *event) 38_efl_net_socket_fd_event_read(void *data EINA_UNUSED, const Efl_Event *event)
39{ 39{
40 efl_io_reader_can_read_set(event->object, EINA_TRUE); 40 efl_io_reader_can_read_set(event->object, EINA_TRUE);
41 efl_io_reader_eos_set(event->object, EINA_FALSE); 41 efl_io_reader_eos_set(event->object, EINA_FALSE);
42} 42}
43 43
44static void 44static void
45_efl_net_socket_fd_event_write(void *data EINA_UNUSED, const Eo_Event *event) 45_efl_net_socket_fd_event_write(void *data EINA_UNUSED, const Efl_Event *event)
46{ 46{
47 efl_io_writer_can_write_set(event->object, EINA_TRUE); 47 efl_io_writer_can_write_set(event->object, EINA_TRUE);
48} 48}
49 49
50static void 50static void
51_efl_net_socket_fd_event_error(void *data EINA_UNUSED, const Eo_Event *event) 51_efl_net_socket_fd_event_error(void *data EINA_UNUSED, const Efl_Event *event)
52{ 52{
53 efl_io_writer_can_write_set(event->object, EINA_FALSE); 53 efl_io_writer_can_write_set(event->object, EINA_FALSE);
54 efl_io_reader_can_read_set(event->object, EINA_FALSE); 54 efl_io_reader_can_read_set(event->object, EINA_FALSE);
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index f67175f3ad..7543cbffcb 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -3162,7 +3162,7 @@ _ecore_evas_animator_fallback(void *data)
3162} 3162}
3163 3163
3164static void 3164static void
3165_check_animator_event_catcher_add(void *data, const Eo_Event *event) 3165_check_animator_event_catcher_add(void *data, const Efl_Event *event)
3166{ 3166{
3167 const Efl_Callback_Array_Item *array = event->info; 3167 const Efl_Callback_Array_Item *array = event->info;
3168 Ecore_Evas *ee = data; 3168 Ecore_Evas *ee = data;
@@ -3196,7 +3196,7 @@ _check_animator_event_catcher_add(void *data, const Eo_Event *event)
3196} 3196}
3197 3197
3198static void 3198static void
3199_check_animator_event_catcher_del(void *data, const Eo_Event *event) 3199_check_animator_event_catcher_del(void *data, const Efl_Event *event)
3200{ 3200{
3201 const Efl_Callback_Array_Item *array = event->info; 3201 const Efl_Callback_Array_Item *array = event->info;
3202 Ecore_Evas *ee = data; 3202 Ecore_Evas *ee = data;
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
index de7376b76d..6f67fb6262 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
@@ -76,7 +76,7 @@ struct _Ector_Renderer_Cairo_Shape_Data
76}; 76};
77 77
78static void 78static void
79_ector_renderer_cairo_shape_path_changed(void *data, const Eo_Event *event EINA_UNUSED) 79_ector_renderer_cairo_shape_path_changed(void *data, const Efl_Event *event EINA_UNUSED)
80{ 80{
81 Ector_Renderer_Cairo_Shape_Data *pd = data; 81 Ector_Renderer_Cairo_Shape_Data *pd = data;
82 82
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.c b/src/lib/ector/gl/ector_renderer_gl_shape.c
index 1e9a7277ea..401ed0ff0e 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.c
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.c
@@ -21,7 +21,7 @@ struct _Ector_Renderer_GL_Shape_Data
21}; 21};
22 22
23static void 23static void
24_ector_renderer_gl_shape_path_changed(void *data, const Eo_Event *event EINA_UNUSED) 24_ector_renderer_gl_shape_path_changed(void *data, const Efl_Event *event EINA_UNUSED)
25{ 25{
26 Ector_Renderer_GL_Shape_Data *pd = data; 26 Ector_Renderer_GL_Shape_Data *pd = data;
27 27
diff --git a/src/lib/ector/software/ector_renderer_software_shape.c b/src/lib/ector/software/ector_renderer_software_shape.c
index 35aedf0980..50fcddf12b 100644
--- a/src/lib/ector/software/ector_renderer_software_shape.c
+++ b/src/lib/ector/software/ector_renderer_software_shape.c
@@ -680,7 +680,7 @@ _ector_renderer_software_shape_efl_gfx_shape_path_set(Eo *obj,
680 680
681 681
682static void 682static void
683_ector_renderer_software_shape_path_changed(void *data, const Eo_Event *event EINA_UNUSED) 683_ector_renderer_software_shape_path_changed(void *data, const Efl_Event *event EINA_UNUSED)
684{ 684{
685 Ector_Renderer_Software_Shape_Data *pd = data; 685 Ector_Renderer_Software_Shape_Data *pd = data;
686 686
diff --git a/src/lib/edje/edje_callbacks.c b/src/lib/edje/edje_callbacks.c
index 5187a24154..9ec3287cad 100644
--- a/src/lib/edje/edje_callbacks.c
+++ b/src/lib/edje/edje_callbacks.c
@@ -4,7 +4,7 @@
4#include "interfaces/efl_common_internal.h" 4#include "interfaces/efl_common_internal.h"
5 5
6static void 6static void
7_edje_hold_signal_cb(void *data, const Eo_Event *event) 7_edje_hold_signal_cb(void *data, const Efl_Event *event)
8{ 8{
9 Efl_Input_Hold *ev; 9 Efl_Input_Hold *ev;
10 Edje *ed; 10 Edje *ed;
@@ -21,7 +21,7 @@ _edje_hold_signal_cb(void *data, const Eo_Event *event)
21} 21}
22 22
23static void 23static void
24_edje_focus_in_signal_cb(void *data, const Eo_Event *event) 24_edje_focus_in_signal_cb(void *data, const Efl_Event *event)
25{ 25{
26 Edje *ed; 26 Edje *ed;
27 Edje_Real_Part *rp; 27 Edje_Real_Part *rp;
@@ -35,7 +35,7 @@ _edje_focus_in_signal_cb(void *data, const Eo_Event *event)
35} 35}
36 36
37static void 37static void
38_edje_focus_out_signal_cb(void *data, const Eo_Event *event) 38_edje_focus_out_signal_cb(void *data, const Efl_Event *event)
39{ 39{
40 Edje *ed; 40 Edje *ed;
41 Edje_Real_Part *rp; 41 Edje_Real_Part *rp;
@@ -49,7 +49,7 @@ _edje_focus_out_signal_cb(void *data, const Eo_Event *event)
49} 49}
50 50
51static void 51static void
52_edje_mouse_in_signal_cb(void *data, const Eo_Event *event) 52_edje_mouse_in_signal_cb(void *data, const Efl_Event *event)
53{ 53{
54 Efl_Input_Pointer_Data *ev; 54 Efl_Input_Pointer_Data *ev;
55 Edje *ed; 55 Edje *ed;
@@ -68,7 +68,7 @@ _edje_mouse_in_signal_cb(void *data, const Eo_Event *event)
68} 68}
69 69
70static void 70static void
71_edje_mouse_out_signal_cb(void *data, const Eo_Event *event) 71_edje_mouse_out_signal_cb(void *data, const Efl_Event *event)
72{ 72{
73 Efl_Input_Pointer_Data *ev; 73 Efl_Input_Pointer_Data *ev;
74 Edje *ed; 74 Edje *ed;
@@ -87,7 +87,7 @@ _edje_mouse_out_signal_cb(void *data, const Eo_Event *event)
87} 87}
88 88
89static void 89static void
90_edje_mouse_down_signal_cb(void *data, const Eo_Event *event) 90_edje_mouse_down_signal_cb(void *data, const Efl_Event *event)
91{ 91{
92 Efl_Input_Pointer_Data *ev; 92 Efl_Input_Pointer_Data *ev;
93 Edje *ed; 93 Edje *ed;
@@ -156,7 +156,7 @@ _edje_mouse_down_signal_cb(void *data, const Eo_Event *event)
156} 156}
157 157
158static void 158static void
159_edje_mouse_up_signal_cb(void *data, const Eo_Event *event) 159_edje_mouse_up_signal_cb(void *data, const Efl_Event *event)
160{ 160{
161 Efl_Input_Pointer_Data *ev; 161 Efl_Input_Pointer_Data *ev;
162 Edje *ed; 162 Edje *ed;
@@ -229,7 +229,7 @@ _edje_mouse_up_signal_cb(void *data, const Eo_Event *event)
229} 229}
230 230
231static void 231static void
232_edje_mouse_move_signal_cb(void *data, const Eo_Event *event) 232_edje_mouse_move_signal_cb(void *data, const Efl_Event *event)
233{ 233{
234 Efl_Input_Pointer_Data *ev; 234 Efl_Input_Pointer_Data *ev;
235 Edje *ed; 235 Edje *ed;
@@ -336,7 +336,7 @@ _edje_mouse_move_signal_cb(void *data, const Eo_Event *event)
336} 336}
337 337
338static void 338static void
339_edje_mouse_wheel_signal_cb(void *data, const Eo_Event *event) 339_edje_mouse_wheel_signal_cb(void *data, const Efl_Event *event)
340{ 340{
341 Efl_Input_Pointer_Data *ev; 341 Efl_Input_Pointer_Data *ev;
342 Edje *ed; 342 Edje *ed;
@@ -361,7 +361,7 @@ _edje_mouse_wheel_signal_cb(void *data, const Eo_Event *event)
361} 361}
362 362
363void 363void
364_edje_timer_cb(void *data, const Eo_Event *event EINA_UNUSED) 364_edje_timer_cb(void *data, const Efl_Event *event EINA_UNUSED)
365{ 365{
366 double t; 366 double t;
367 Eina_List *l; 367 Eina_List *l;
diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c
index 6af9c08146..b9590ed6c7 100644
--- a/src/lib/edje/edje_multisense.c
+++ b/src/lib/edje/edje_multisense.c
@@ -8,13 +8,13 @@ static int outs = 0;
8static Eina_Bool outfail = EINA_FALSE; 8static Eina_Bool outfail = EINA_FALSE;
9 9
10static void 10static void
11_play_finished(void *data EINA_UNUSED, const Eo_Event *event) 11_play_finished(void *data EINA_UNUSED, const Efl_Event *event)
12{ 12{
13 efl_del(event->object); 13 efl_del(event->object);
14} 14}
15 15
16static void 16static void
17_out_fail(void *data EINA_UNUSED, const Eo_Event *event) 17_out_fail(void *data EINA_UNUSED, const Efl_Event *event)
18{ 18{
19 outfail = EINA_TRUE; 19 outfail = EINA_TRUE;
20 efl_del(event->object); 20 efl_del(event->object);
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index ebb47ba7e9..4b4b46abea 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -2415,7 +2415,7 @@ void _edje_recalc_do(Edje *ed);
2415int _edje_part_dragable_calc(Edje *ed, Edje_Real_Part *ep, FLOAT_T *x, FLOAT_T *y); 2415int _edje_part_dragable_calc(Edje *ed, Edje_Real_Part *ep, FLOAT_T *x, FLOAT_T *y);
2416void _edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y); 2416void _edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y);
2417 2417
2418void _edje_timer_cb(void *data, const Eo_Event *event); 2418void _edje_timer_cb(void *data, const Efl_Event *event);
2419Eina_Bool _edje_pending_timer_cb(void *data); 2419Eina_Bool _edje_pending_timer_cb(void *data);
2420void _edje_callbacks_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp); 2420void _edje_callbacks_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp);
2421void _edje_callbacks_focus_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp); 2421void _edje_callbacks_focus_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp);
diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c
index 7cb6222423..ee183d5cde 100644
--- a/src/lib/edje/edje_program.c
+++ b/src/lib/edje/edje_program.c
@@ -10,7 +10,7 @@ static double _edje_transition_duration_scale = 0;
10static Eina_Bool 10static Eina_Bool
11_edje_animator_cb(void *data) 11_edje_animator_cb(void *data)
12{ 12{
13 const Eo_Event event = { NULL, NULL, NULL }; 13 const Efl_Event event = { NULL, NULL, NULL };
14 _edje_timer_cb(data, &event); 14 _edje_timer_cb(data, &event);
15 return EINA_TRUE; 15 return EINA_TRUE;
16} 16}
diff --git a/src/lib/efl/interfaces/efl_vpath_manager.c b/src/lib/efl/interfaces/efl_vpath_manager.c
index e79e25e1ef..cae265c187 100644
--- a/src/lib/efl/interfaces/efl_vpath_manager.c
+++ b/src/lib/efl/interfaces/efl_vpath_manager.c
@@ -51,7 +51,7 @@ _register_sort_cb(Efl_Vpath_Manager_Entry *e1, Efl_Vpath_Manager_Entry *e2)
51} 51}
52 52
53static void 53static void
54_cb_vpath_del(void *data, const Eo_Event *event) 54_cb_vpath_del(void *data, const Efl_Event *event)
55{ 55{
56 efl_vpath_manager_unregister(EFL_VPATH_MANAGER_CLASS, event->object); 56 efl_vpath_manager_unregister(EFL_VPATH_MANAGER_CLASS, event->object);
57 efl_event_callback_del(event->object, EFL_EVENT_DEL, _cb_vpath_del, data); 57 efl_event_callback_del(event->object, EFL_EVENT_DEL, _cb_vpath_del, data);
diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index c8124d0cd5..25a7a6ec8c 100644
--- a/src/lib/elementary/efl_ui_box.c
+++ b/src/lib/elementary/efl_ui_box.c
@@ -24,7 +24,7 @@ _efl_ui_box_list_data_get(const Eina_List *list)
24} 24}
25 25
26static void 26static void
27_child_added_cb_proxy(void *data, const Eo_Event *event) 27_child_added_cb_proxy(void *data, const Efl_Event *event)
28{ 28{
29 Evas_Object *box = data; 29 Evas_Object *box = data;
30 Evas_Object_Box_Option *opt = event->info; 30 Evas_Object_Box_Option *opt = event->info;
@@ -33,7 +33,7 @@ _child_added_cb_proxy(void *data, const Eo_Event *event)
33} 33}
34 34
35static void 35static void
36_child_removed_cb_proxy(void *data, const Eo_Event *event) 36_child_removed_cb_proxy(void *data, const Efl_Event *event)
37{ 37{
38 Evas_Object *box = data; 38 Evas_Object *box = data;
39 Evas_Object *child = event->info; 39 Evas_Object *child = event->info;
diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c
index 5e89c04959..6c453d42e6 100644
--- a/src/lib/elementary/efl_ui_frame.c
+++ b/src/lib/elementary/efl_ui_frame.c
@@ -97,7 +97,7 @@ _efl_ui_frame_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Efl_Ui_Frame_Data
97} 97}
98 98
99static void 99static void
100_recalc(void *data, const Eo_Event *event EINA_UNUSED) 100_recalc(void *data, const Efl_Event *event EINA_UNUSED)
101{ 101{
102 elm_layout_sizing_eval(data); 102 elm_layout_sizing_eval(data);
103} 103}
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 3b673e97b3..5c8db37991 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -8,7 +8,7 @@
8 8
9typedef struct _Custom_Table_Data Custom_Table_Data; 9typedef struct _Custom_Table_Data Custom_Table_Data;
10 10
11static void _subobj_del_cb(void *data, const Eo_Event *event); 11static void _subobj_del_cb(void *data, const Efl_Event *event);
12static void _item_remove(Efl_Ui_Grid *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj); 12static void _item_remove(Efl_Ui_Grid *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj);
13 13
14struct _Custom_Table_Data 14struct _Custom_Table_Data
@@ -338,7 +338,7 @@ _efl_ui_grid_efl_pack_pack_padding_get(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED
338} 338}
339 339
340static void 340static void
341_subobj_del_cb(void *data, const Eo_Event *event) 341_subobj_del_cb(void *data, const Efl_Event *event)
342{ 342{
343 Efl_Ui_Grid *obj = data; 343 Efl_Ui_Grid *obj = data;
344 Efl_Ui_Grid_Data *pd = efl_data_scope_get(obj, EFL_UI_GRID_CLASS); 344 Efl_Ui_Grid_Data *pd = efl_data_scope_get(obj, EFL_UI_GRID_CLASS);
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c
index e531382e78..a55737801a 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.c
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.c
@@ -502,7 +502,7 @@ _entry_selection_get(Efl_Ui_Internal_Text_Interactive *obj, Efl_Ui_Internal_Text
502} 502}
503 503
504static void 504static void
505_sel_cursor_changed(void *data, const Eo_Event *event EINA_UNUSED) 505_sel_cursor_changed(void *data, const Efl_Event *event EINA_UNUSED)
506{ 506{
507 Efl_Canvas_Text_Cursor *obj = data; 507 Efl_Canvas_Text_Cursor *obj = data;
508 508
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 8475fdf579..6995260be0 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -256,9 +256,9 @@ static void _create_selection_handlers(Evas_Object *obj, Efl_Ui_Text_Data *sd, c
256static void _magnifier_move(void *data); 256static void _magnifier_move(void *data);
257static void _update_decorations(Eo *obj); 257static void _update_decorations(Eo *obj);
258static void _create_text_cursors(Efl_Ui_Text_Data *sd); 258static void _create_text_cursors(Efl_Ui_Text_Data *sd);
259static void _efl_ui_text_changed_cb(void *data EINA_UNUSED, const Eo_Event *event); 259static void _efl_ui_text_changed_cb(void *data EINA_UNUSED, const Efl_Event *event);
260static void _efl_ui_text_selection_changed_cb(void *data EINA_UNUSED, const Eo_Event *event); 260static void _efl_ui_text_selection_changed_cb(void *data EINA_UNUSED, const Efl_Event *event);
261static void _efl_ui_text_cursor_changed_cb(void *data EINA_UNUSED, const Eo_Event *event); 261static void _efl_ui_text_cursor_changed_cb(void *data EINA_UNUSED, const Efl_Event *event);
262static void _efl_ui_text_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED); 262static void _efl_ui_text_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED);
263static void _efl_ui_text_select_none(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd); 263static void _efl_ui_text_select_none(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd);
264static void _efl_ui_text_anchor_hover_end(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd); 264static void _efl_ui_text_anchor_hover_end(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd);
@@ -1259,7 +1259,7 @@ _hover_del_job(void *data)
1259} 1259}
1260 1260
1261static void 1261static void
1262_hover_dismissed_cb(void *data, const Eo_Event *event EINA_UNUSED) 1262_hover_dismissed_cb(void *data, const Efl_Event *event EINA_UNUSED)
1263{ 1263{
1264 EFL_UI_TEXT_DATA_GET(data, sd); 1264 EFL_UI_TEXT_DATA_GET(data, sd);
1265 1265
@@ -2260,7 +2260,7 @@ _anchor_hover_del_cb(void *data,
2260} 2260}
2261 2261
2262static void 2262static void
2263_anchor_hover_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) 2263_anchor_hover_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED)
2264{ 2264{
2265 EFL_UI_TEXT_DATA_GET(data, sd); 2265 EFL_UI_TEXT_DATA_GET(data, sd);
2266 _efl_ui_text_anchor_hover_end(data, sd); 2266 _efl_ui_text_anchor_hover_end(data, sd);
@@ -3554,7 +3554,7 @@ _efl_ui_text_elm_layout_theme_enable(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd E
3554} 3554}
3555 3555
3556static void 3556static void
3557_cb_added(void *data EINA_UNUSED, const Eo_Event *ev) 3557_cb_added(void *data EINA_UNUSED, const Efl_Event *ev)
3558{ 3558{
3559 const Efl_Callback_Array_Item *event = ev->info; 3559 const Efl_Callback_Array_Item *event = ev->info;
3560 3560
@@ -3564,7 +3564,7 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
3564} 3564}
3565 3565
3566static void 3566static void
3567_cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev) 3567_cb_deleted(void *data EINA_UNUSED, const Efl_Event *ev)
3568{ 3568{
3569 const Efl_Callback_Array_Item *event = ev->info; 3569 const Efl_Callback_Array_Item *event = ev->info;
3570 3570
@@ -5398,14 +5398,14 @@ _decoration_defer_all(Eo *obj)
5398} 5398}
5399 5399
5400static void 5400static void
5401_efl_ui_text_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) 5401_efl_ui_text_changed_cb(void *data, const Efl_Event *event EINA_UNUSED)
5402{ 5402{
5403 _decoration_defer_all(data); 5403 _decoration_defer_all(data);
5404 _entry_changed_handle(data, EFL_UI_TEXT_EVENT_CHANGED); 5404 _entry_changed_handle(data, EFL_UI_TEXT_EVENT_CHANGED);
5405} 5405}
5406 5406
5407static void 5407static void
5408_efl_ui_text_cursor_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) 5408_efl_ui_text_cursor_changed_cb(void *data, const Efl_Event *event EINA_UNUSED)
5409{ 5409{
5410 EFL_UI_TEXT_DATA_GET(data, sd); 5410 EFL_UI_TEXT_DATA_GET(data, sd);
5411 sd->cur_changed = EINA_TRUE; 5411 sd->cur_changed = EINA_TRUE;
@@ -5415,7 +5415,7 @@ _efl_ui_text_cursor_changed_cb(void *data, const Eo_Event *event EINA_UNUSED)
5415} 5415}
5416 5416
5417static void 5417static void
5418_efl_ui_text_selection_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) 5418_efl_ui_text_selection_changed_cb(void *data, const Efl_Event *event EINA_UNUSED)
5419{ 5419{
5420 Eo *obj = data; 5420 Eo *obj = data;
5421 Eo *start, *end; 5421 Eo *start, *end;
diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c
index eb8814671f..8c107a31cd 100644
--- a/src/lib/elementary/efl_ui_video.c
+++ b/src/lib/elementary/efl_ui_video.c
@@ -28,17 +28,17 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
28 28
29 29
30static void 30static void
31_on_open_done(void *data, const Eo_Event *event); 31_on_open_done(void *data, const Efl_Event *event);
32static void 32static void
33_on_playback_started(void *data, const Eo_Event *event); 33_on_playback_started(void *data, const Efl_Event *event);
34static void 34static void
35_on_playback_finished(void *data, const Eo_Event *event); 35_on_playback_finished(void *data, const Efl_Event *event);
36static void 36static void
37_on_aspect_ratio_updated(void *data, const Eo_Event *event); 37_on_aspect_ratio_updated(void *data, const Efl_Event *event);
38static void 38static void
39_on_title_changed(void *data, const Eo_Event *event); 39_on_title_changed(void *data, const Efl_Event *event);
40static void 40static void
41_on_audio_level_changed(void *data, const Eo_Event *event); 41_on_audio_level_changed(void *data, const Efl_Event *event);
42 42
43static Eina_Bool _key_action_move(Evas_Object *obj, const char *params); 43static Eina_Bool _key_action_move(Evas_Object *obj, const char *params);
44static Eina_Bool _key_action_play(Evas_Object *obj, const char *params); 44static Eina_Bool _key_action_play(Evas_Object *obj, const char *params);
@@ -158,13 +158,13 @@ _on_size_hints_changed(void *data EINA_UNUSED,
158} 158}
159 159
160static void 160static void
161_on_open_done(void *data, const Eo_Event *event EINA_UNUSED) 161_on_open_done(void *data, const Efl_Event *event EINA_UNUSED)
162{ 162{
163 elm_layout_signal_emit(data, "elm,video,open", "elm"); 163 elm_layout_signal_emit(data, "elm,video,open", "elm");
164} 164}
165 165
166static void 166static void
167_on_playback_started(void *data, const Eo_Event *event EINA_UNUSED) 167_on_playback_started(void *data, const Efl_Event *event EINA_UNUSED)
168{ 168{
169 elm_layout_signal_emit(data, "elm,video,play", "elm"); 169 elm_layout_signal_emit(data, "elm,video,play", "elm");
170 170
@@ -173,7 +173,7 @@ _on_playback_started(void *data, const Eo_Event *event EINA_UNUSED)
173} 173}
174 174
175static void 175static void
176_on_playback_finished(void *data, const Eo_Event *event EINA_UNUSED) 176_on_playback_finished(void *data, const Efl_Event *event EINA_UNUSED)
177{ 177{
178 EFL_UI_VIDEO_DATA_GET(data, sd); 178 EFL_UI_VIDEO_DATA_GET(data, sd);
179 emotion_object_play_set(sd->emotion, EINA_FALSE); 179 emotion_object_play_set(sd->emotion, EINA_FALSE);
@@ -181,13 +181,13 @@ _on_playback_finished(void *data, const Eo_Event *event EINA_UNUSED)
181} 181}
182 182
183static void 183static void
184_on_aspect_ratio_updated(void *data, const Eo_Event *event EINA_UNUSED) 184_on_aspect_ratio_updated(void *data, const Efl_Event *event EINA_UNUSED)
185{ 185{
186 elm_layout_sizing_eval(data); 186 elm_layout_sizing_eval(data);
187} 187}
188 188
189static void 189static void
190_on_title_changed(void *data, const Eo_Event *event EINA_UNUSED) 190_on_title_changed(void *data, const Efl_Event *event EINA_UNUSED)
191{ 191{
192 const char *title; 192 const char *title;
193 193
@@ -199,7 +199,7 @@ _on_title_changed(void *data, const Eo_Event *event EINA_UNUSED)
199} 199}
200 200
201static void 201static void
202_on_audio_level_changed(void *data, const Eo_Event *event EINA_UNUSED) 202_on_audio_level_changed(void *data, const Efl_Event *event EINA_UNUSED)
203{ 203{
204 (void)data; 204 (void)data;
205} 205}
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 2c842499a8..c31b3f3180 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1664,7 +1664,7 @@ _efl_ui_win_elm_widget_event(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED, Evas_Obj
1664 1664
1665/* forward events sent to evas to the window */ 1665/* forward events sent to evas to the window */
1666static void 1666static void
1667_evas_event_key_cb(void *data, const Eo_Event *ev) 1667_evas_event_key_cb(void *data, const Efl_Event *ev)
1668{ 1668{
1669 Eo *win = data; 1669 Eo *win = data;
1670 Eo *evt = ev->info; 1670 Eo *evt = ev->info;
@@ -1682,7 +1682,7 @@ _evas_event_key_cb(void *data, const Eo_Event *ev)
1682} 1682}
1683 1683
1684static void 1684static void
1685_evas_event_pointer_cb(void *data, const Eo_Event *ev) 1685_evas_event_pointer_cb(void *data, const Efl_Event *ev)
1686{ 1686{
1687 Eo *win = data; 1687 Eo *win = data;
1688 Eo *evt = ev->info; 1688 Eo *evt = ev->info;
@@ -1697,7 +1697,7 @@ _evas_event_pointer_cb(void *data, const Eo_Event *ev)
1697 1697
1698/* feed events from the window to evas - for fake inputs */ 1698/* feed events from the window to evas - for fake inputs */
1699static void 1699static void
1700_evas_event_key_feed_fake_cb(void *data, const Eo_Event *ev) 1700_evas_event_key_feed_fake_cb(void *data, const Efl_Event *ev)
1701{ 1701{
1702 Eo *evas = data; 1702 Eo *evas = data;
1703 Efl_Input_Event *evt = ev->info; 1703 Efl_Input_Event *evt = ev->info;
@@ -1717,7 +1717,7 @@ _evas_event_key_feed_fake_cb(void *data, const Eo_Event *ev)
1717} 1717}
1718 1718
1719static void 1719static void
1720_evas_event_pointer_feed_fake_cb(void *data, const Eo_Event *ev) 1720_evas_event_pointer_feed_fake_cb(void *data, const Efl_Event *ev)
1721{ 1721{
1722 Eo *evas = data; 1722 Eo *evas = data;
1723 Efl_Input_Event *evt = ev->info; 1723 Efl_Input_Event *evt = ev->info;
@@ -1832,7 +1832,7 @@ _elm_win_evas_device_changed(void *data,
1832} 1832}
1833 1833
1834static void 1834static void
1835_win_event_add_cb(void *data, const Eo_Event *ev) 1835_win_event_add_cb(void *data, const Efl_Event *ev)
1836{ 1836{
1837 const Efl_Callback_Array_Item *array = ev->info; 1837 const Efl_Callback_Array_Item *array = ev->info;
1838 Efl_Ui_Win_Data *sd = data; 1838 Efl_Ui_Win_Data *sd = data;
@@ -1941,7 +1941,7 @@ _win_event_add_cb(void *data, const Eo_Event *ev)
1941} 1941}
1942 1942
1943static void 1943static void
1944_win_event_del_cb(void *data, const Eo_Event *ev) 1944_win_event_del_cb(void *data, const Efl_Event *ev)
1945{ 1945{
1946 const Efl_Callback_Array_Item *array = ev->info; 1946 const Efl_Callback_Array_Item *array = ev->info;
1947 Efl_Ui_Win_Data *sd = data; 1947 Efl_Ui_Win_Data *sd = data;
@@ -5797,7 +5797,7 @@ _elm_win_focus_auto_hide(Evas_Object *obj)
5797} 5797}
5798 5798
5799static void 5799static void
5800_on_atspi_bus_connected(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 5800_on_atspi_bus_connected(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
5801{ 5801{
5802 Evas_Object *win; 5802 Evas_Object *win;
5803 Eina_List *l; 5803 Eina_List *l;
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index 6fec7a7d5e..e73fea8848 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -96,7 +96,7 @@ _elm_combobox_elm_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd)
96} 96}
97 97
98static void 98static void
99_on_hover_clicked(void *data, const Eo_Event *event) 99_on_hover_clicked(void *data, const Efl_Event *event)
100{ 100{
101 const char *dismissstr; 101 const char *dismissstr;
102 102
@@ -213,7 +213,7 @@ _on_item_pressed(void *data , Evas_Object *obj EINA_UNUSED, void *event)
213} 213}
214 214
215static void 215static void
216_gl_filter_finished_cb(void *data, const Eo_Event *event) 216_gl_filter_finished_cb(void *data, const Efl_Event *event)
217{ 217{
218 char buf[1024]; 218 char buf[1024];
219 ELM_COMBOBOX_DATA_GET(data, sd); 219 ELM_COMBOBOX_DATA_GET(data, sd);
@@ -245,20 +245,20 @@ _gl_filter_finished_cb(void *data, const Eo_Event *event)
245} 245}
246 246
247static void 247static void
248_on_aborted(void *data, const Eo_Event *event EINA_UNUSED) 248_on_aborted(void *data, const Efl_Event *event EINA_UNUSED)
249{ 249{
250 ELM_COMBOBOX_DATA_GET(data, sd); 250 ELM_COMBOBOX_DATA_GET(data, sd);
251 if (sd->expanded) elm_combobox_hover_end(data); 251 if (sd->expanded) elm_combobox_hover_end(data);
252} 252}
253 253
254static void 254static void
255_on_changed(void *data, const Eo_Event *event EINA_UNUSED) 255_on_changed(void *data, const Efl_Event *event EINA_UNUSED)
256{ 256{
257 efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CHANGED, NULL); 257 efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CHANGED, NULL);
258} 258}
259 259
260static void 260static void
261_on_clicked(void *data, const Eo_Event *event EINA_UNUSED) 261_on_clicked(void *data, const Efl_Event *event EINA_UNUSED)
262{ 262{
263 elm_combobox_hover_begin(data); 263 elm_combobox_hover_begin(data);
264} 264}
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 99ec2654c4..799c0bd961 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -73,14 +73,14 @@ static const Elm_Action key_actions[] = {
73 {NULL, NULL} 73 {NULL, NULL}
74}; 74};
75 75
76static void _ok(void *data, const Eo_Event *event); 76static void _ok(void *data, const Efl_Event *event);
77static void _canc(void *data, const Eo_Event *event); 77static void _canc(void *data, const Efl_Event *event);
78static void _on_dir_up(void *data, const Eo_Event *event); 78static void _on_dir_up(void *data, const Efl_Event *event);
79static void _populate(Evas_Object *obj, Efl_Model *model, Elm_Object_Item *parent_it, Efl_Model *selected); 79static void _populate(Evas_Object *obj, Efl_Model *model, Elm_Object_Item *parent_it, Efl_Model *selected);
80static Elm_Fileselector_Item_Data *_selected_item_data_get(Elm_Fileselector_Data *sd); 80static Elm_Fileselector_Item_Data *_selected_item_data_get(Elm_Fileselector_Data *sd);
81 81
82static void _resource_created(void *, const Eo_Event *); 82static void _resource_created(void *, const Efl_Event *);
83static void _resource_deleted(void *, const Eo_Event *); 83static void _resource_deleted(void *, const Efl_Event *);
84static void _listing_request_cleanup(Listing_Request *); 84static void _listing_request_cleanup(Listing_Request *);
85 85
86EFL_CALLBACKS_ARRAY_DEFINE(monitoring_callbacks, 86EFL_CALLBACKS_ARRAY_DEFINE(monitoring_callbacks,
@@ -243,7 +243,7 @@ _elm_fileselector_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd)
243static Eina_Bool 243static Eina_Bool
244_key_action_select(Evas_Object *obj, const char *params EINA_UNUSED) 244_key_action_select(Evas_Object *obj, const char *params EINA_UNUSED)
245{ 245{
246 Eo_Event event = {}; 246 Efl_Event event = {};
247 _ok(obj, &event); 247 _ok(obj, &event);
248 return EINA_TRUE; 248 return EINA_TRUE;
249} 249}
@@ -251,7 +251,7 @@ _key_action_select(Evas_Object *obj, const char *params EINA_UNUSED)
251static Eina_Bool 251static Eina_Bool
252_key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED) 252_key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED)
253{ 253{
254 Eo_Event event = {}; 254 Efl_Event event = {};
255 _canc(obj, &event); 255 _canc(obj, &event);
256 return EINA_TRUE; 256 return EINA_TRUE;
257} 257}
@@ -1008,7 +1008,7 @@ _populate(Evas_Object *obj,
1008} 1008}
1009 1009
1010static void 1010static void
1011_on_list_expanded(void *data, const Eo_Event *event) 1011_on_list_expanded(void *data, const Efl_Event *event)
1012{ 1012{
1013 Elm_Object_Item *it = event->info; 1013 Elm_Object_Item *it = event->info;
1014 const Elm_Fileselector_Item_Data *it_data = elm_object_item_data_get(it); 1014 const Elm_Fileselector_Item_Data *it_data = elm_object_item_data_get(it);
@@ -1017,7 +1017,7 @@ _on_list_expanded(void *data, const Eo_Event *event)
1017} 1017}
1018 1018
1019static void 1019static void
1020_on_list_contracted(void *data EINA_UNUSED, const Eo_Event *event) 1020_on_list_contracted(void *data EINA_UNUSED, const Efl_Event *event)
1021{ 1021{
1022 Elm_Object_Item *it = event->info; 1022 Elm_Object_Item *it = event->info;
1023 1023
@@ -1025,7 +1025,7 @@ _on_list_contracted(void *data EINA_UNUSED, const Eo_Event *event)
1025} 1025}
1026 1026
1027static void 1027static void
1028_on_list_expand_req(void *data EINA_UNUSED, const Eo_Event *event) 1028_on_list_expand_req(void *data EINA_UNUSED, const Efl_Event *event)
1029{ 1029{
1030 Elm_Object_Item *it = event->info; 1030 Elm_Object_Item *it = event->info;
1031 1031
@@ -1033,7 +1033,7 @@ _on_list_expand_req(void *data EINA_UNUSED, const Eo_Event *event)
1033} 1033}
1034 1034
1035static void 1035static void
1036_on_list_contract_req(void *data EINA_UNUSED, const Eo_Event *event) 1036_on_list_contract_req(void *data EINA_UNUSED, const Efl_Event *event)
1037{ 1037{
1038 Elm_Object_Item *it = event->info; 1038 Elm_Object_Item *it = event->info;
1039 1039
@@ -1088,7 +1088,7 @@ _schedule_populate(Evas_Object *fs,
1088} 1088}
1089 1089
1090static void 1090static void
1091_on_item_activated(void *data, const Eo_Event *event) 1091_on_item_activated(void *data, const Efl_Event *event)
1092{ 1092{
1093 //This event_info could be a list or gengrid item 1093 //This event_info could be a list or gengrid item
1094 Elm_Object_Item *it = event->info; 1094 Elm_Object_Item *it = event->info;
@@ -1140,7 +1140,7 @@ _clear_selections(Elm_Fileselector_Data *sd, Elm_Object_Item *last_selected)
1140} 1140}
1141 1141
1142static void 1142static void
1143_on_item_selected(void *data, const Eo_Event *event) 1143_on_item_selected(void *data, const Efl_Event *event)
1144{ 1144{
1145 //This event_info could be a list or gengrid item 1145 //This event_info could be a list or gengrid item
1146 Elm_Object_Item *it = event->info; 1146 Elm_Object_Item *it = event->info;
@@ -1231,7 +1231,7 @@ _on_item_selected(void *data, const Eo_Event *event)
1231} 1231}
1232 1232
1233static void 1233static void
1234_on_item_unselected(void *data, const Eo_Event *event) 1234_on_item_unselected(void *data, const Efl_Event *event)
1235{ 1235{
1236 Eina_List *li, *l; 1236 Eina_List *li, *l;
1237 const Elm_Fileselector_Item_Data *it_data; 1237 const Elm_Fileselector_Item_Data *it_data;
@@ -1273,7 +1273,7 @@ _on_item_unselected(void *data, const Eo_Event *event)
1273} 1273}
1274 1274
1275static void 1275static void
1276_on_dir_up(void *data, const Eo_Event *event EINA_UNUSED) 1276_on_dir_up(void *data, const Efl_Event *event EINA_UNUSED)
1277{ 1277{
1278 Evas_Object *fs = data; 1278 Evas_Object *fs = data;
1279 Efl_Model *parent = NULL; 1279 Efl_Model *parent = NULL;
@@ -1287,7 +1287,7 @@ _on_dir_up(void *data, const Eo_Event *event EINA_UNUSED)
1287} 1287}
1288 1288
1289static void 1289static void
1290_home(void *data, const Eo_Event *event EINA_UNUSED) 1290_home(void *data, const Efl_Event *event EINA_UNUSED)
1291{ 1291{
1292 Evas_Object *fs = data; 1292 Evas_Object *fs = data;
1293 ELM_FILESELECTOR_DATA_GET(fs, sd); 1293 ELM_FILESELECTOR_DATA_GET(fs, sd);
@@ -1318,7 +1318,7 @@ _current_filter_changed(void *data,
1318} 1318}
1319 1319
1320static void 1320static void
1321_ok(void *data, const Eo_Event *event EINA_UNUSED) 1321_ok(void *data, const Efl_Event *event EINA_UNUSED)
1322{ 1322{
1323 const char *name; 1323 const char *name;
1324 const char *selection = NULL; 1324 const char *selection = NULL;
@@ -1367,7 +1367,7 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED)
1367} 1367}
1368 1368
1369static void 1369static void
1370_canc(void *data, const Eo_Event *event EINA_UNUSED) 1370_canc(void *data, const Efl_Event *event EINA_UNUSED)
1371{ 1371{
1372 Evas_Object *fs = data; 1372 Evas_Object *fs = data;
1373 1373
@@ -1470,7 +1470,7 @@ _on_text_activated_set_path_then_error(void *data, Eina_Error err EINA_UNUSED)
1470} 1470}
1471 1471
1472static void 1472static void
1473_on_text_activated(void *data, const Eo_Event *event) 1473_on_text_activated(void *data, const Efl_Event *event)
1474{ 1474{
1475 Evas_Object *fs = data; 1475 Evas_Object *fs = data;
1476 const char *path; 1476 const char *path;
@@ -1515,7 +1515,7 @@ _anchors_undo(void *data)
1515} 1515}
1516 1516
1517static void 1517static void
1518_on_text_focused(void *data, const Eo_Event *event EINA_UNUSED) 1518_on_text_focused(void *data, const Efl_Event *event EINA_UNUSED)
1519{ 1519{
1520 ELM_FILESELECTOR_DATA_GET(data, sd); 1520 ELM_FILESELECTOR_DATA_GET(data, sd);
1521 1521
@@ -1524,14 +1524,14 @@ _on_text_focused(void *data, const Eo_Event *event EINA_UNUSED)
1524} 1524}
1525 1525
1526static void 1526static void
1527_on_text_unfocused(void *data, const Eo_Event *event EINA_UNUSED) 1527_on_text_unfocused(void *data, const Efl_Event *event EINA_UNUSED)
1528{ 1528{
1529 ELM_FILESELECTOR_DATA_GET(data, sd); 1529 ELM_FILESELECTOR_DATA_GET(data, sd);
1530 _anchors_do(data, sd->path); 1530 _anchors_do(data, sd->path);
1531} 1531}
1532 1532
1533static void 1533static void
1534_anchor_clicked(void *data, const Eo_Event *event) 1534_anchor_clicked(void *data, const Efl_Event *event)
1535{ 1535{
1536 Elm_Entry_Anchor_Info *info = event->info; 1536 Elm_Entry_Anchor_Info *info = event->info;
1537 Evas_Object *fs = data; 1537 Evas_Object *fs = data;
@@ -1560,7 +1560,7 @@ _anchor_clicked(void *data, const Eo_Event *event)
1560} 1560}
1561 1561
1562static void 1562static void
1563_files_key_down(void *data, const Eo_Event *event) 1563_files_key_down(void *data, const Efl_Event *event)
1564{ 1564{
1565 Efl_Input_Key *ev = event->info; 1565 Efl_Input_Key *ev = event->info;
1566 Evas_Object *par, *searchbar; 1566 Evas_Object *par, *searchbar;
@@ -1736,7 +1736,7 @@ cancel:
1736} 1736}
1737 1737
1738static void 1738static void
1739_resource_created(void *data, const Eo_Event *event) 1739_resource_created(void *data, const Efl_Event *event)
1740{ 1740{
1741 Elm_Fileselector *fs = data; 1741 Elm_Fileselector *fs = data;
1742 Efl_Model_Children_Event* evt = event->info; 1742 Efl_Model_Children_Event* evt = event->info;
@@ -1775,7 +1775,7 @@ _resource_created(void *data, const Eo_Event *event)
1775} 1775}
1776 1776
1777static void 1777static void
1778_resource_deleted(void *data, const Eo_Event *event) 1778_resource_deleted(void *data, const Efl_Event *event)
1779{ 1779{
1780 Evas_Object *obj = data; 1780 Evas_Object *obj = data;
1781 Efl_Model_Children_Event* evt = event->info; 1781 Efl_Model_Children_Event* evt = event->info;
@@ -1858,7 +1858,7 @@ _resource_deleted(void *data, const Eo_Event *event)
1858} 1858}
1859 1859
1860static void 1860static void
1861_preedit_cb(void *data, const Eo_Event *event) 1861_preedit_cb(void *data, const Efl_Event *event)
1862{ 1862{
1863 ELM_FILESELECTOR_DATA_GET(data, sd); 1863 ELM_FILESELECTOR_DATA_GET(data, sd);
1864 1864
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 1a4a69d6ac..a234861b07 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -89,7 +89,7 @@ _replace_path_then_error(void *data, Eina_Error err EINA_UNUSED)
89} 89}
90 90
91static void 91static void
92_selection_done(void *data, const Eo_Event *event) 92_selection_done(void *data, const Efl_Event *event)
93{ 93{
94 Elm_Fileselector_Button_Data *sd = data; 94 Elm_Fileselector_Button_Data *sd = data;
95 Efl_Model *model = event->info; 95 Efl_Model *model = event->info;
@@ -197,7 +197,7 @@ _activate(Elm_Fileselector_Button_Data *sd)
197} 197}
198 198
199static void 199static void
200_button_clicked(void *data, const Eo_Event *event EINA_UNUSED) 200_button_clicked(void *data, const Efl_Event *event EINA_UNUSED)
201{ 201{
202 _activate(data); 202 _activate(data);
203} 203}
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 5ffcab5067..aff611da6c 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -48,7 +48,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
48 48
49#define SIG_FWD(name, event) \ 49#define SIG_FWD(name, event) \
50 static void \ 50 static void \
51 _##name##_fwd(void *data, const Eo_Event *ev EINA_UNUSED) \ 51 _##name##_fwd(void *data, const Efl_Event *ev EINA_UNUSED) \
52 { \ 52 { \
53 efl_event_callback_legacy_call(data, event, ev->info); \ 53 efl_event_callback_legacy_call(data, event, ev->info); \
54 } 54 }
@@ -97,7 +97,7 @@ _file_chosen_path_then_error(void *data, Eina_Error err)
97} 97}
98 98
99static void 99static void
100_FILE_CHOSEN_fwd(void *data, const Eo_Event *event) 100_FILE_CHOSEN_fwd(void *data, const Efl_Event *event)
101{ 101{
102 Efl_Model *model = event->info; 102 Efl_Model *model = event->info;
103 Eina_Promise *promise = NULL; 103 Eina_Promise *promise = NULL;
@@ -115,7 +115,7 @@ _FILE_CHOSEN_fwd(void *data, const Eo_Event *event)
115} 115}
116 116
117static void 117static void
118_ACTIVATED_fwd(void *data, const Eo_Event *event) 118_ACTIVATED_fwd(void *data, const Efl_Event *event)
119{ 119{
120 const char *file; 120 const char *file;
121 Efl_Model *bmodel, *model; 121 Efl_Model *bmodel, *model;
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index d9495ccafe..fb4b4dddbd 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -110,7 +110,7 @@ _elm_hoversel_elm_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd)
110} 110}
111 111
112static void 112static void
113_on_hover_clicked(void *data, const Eo_Event *event) 113_on_hover_clicked(void *data, const Efl_Event *event)
114{ 114{
115 const char *dismissstr; 115 const char *dismissstr;
116 116
@@ -152,7 +152,7 @@ _auto_update(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
152} 152}
153 153
154static void 154static void
155_on_item_clicked(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 155_on_item_clicked(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
156{ 156{
157 Elm_Hoversel_Item_Data *item = data; 157 Elm_Hoversel_Item_Data *item = data;
158 Evas_Object *obj2 = WIDGET(item); 158 Evas_Object *obj2 = WIDGET(item);
@@ -169,7 +169,7 @@ _on_item_clicked(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
169} 169}
170 170
171static void 171static void
172_item_focused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 172_item_focused_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
173{ 173{
174 Elm_Hoversel_Item_Data *it = data; 174 Elm_Hoversel_Item_Data *it = data;
175 175
@@ -177,7 +177,7 @@ _item_focused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
177} 177}
178 178
179static void 179static void
180_item_unfocused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 180_item_unfocused_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
181{ 181{
182 Elm_Hoversel_Item_Data *it = data; 182 Elm_Hoversel_Item_Data *it = data;
183 183
@@ -434,13 +434,13 @@ _activate(Evas_Object *obj)
434} 434}
435 435
436static void 436static void
437_on_clicked(void *data, const Eo_Event *event EINA_UNUSED) 437_on_clicked(void *data, const Efl_Event *event EINA_UNUSED)
438{ 438{
439 _activate(data); 439 _activate(data);
440} 440}
441 441
442static void 442static void
443_on_parent_del(void *data, const Eo_Event *ev EINA_UNUSED) 443_on_parent_del(void *data, const Efl_Event *ev EINA_UNUSED)
444{ 444{
445 elm_hoversel_hover_parent_set(data, NULL); 445 elm_hoversel_hover_parent_set(data, NULL);
446} 446}
@@ -540,7 +540,7 @@ _on_move_resize(void * data,
540} 540}
541 541
542static void 542static void
543_on_parent_resize(void *data, const Eo_Event *ev EINA_UNUSED) 543_on_parent_resize(void *data, const Efl_Event *ev EINA_UNUSED)
544{ 544{
545 Evas_Object *obj = (Evas_Object *)data; 545 Evas_Object *obj = (Evas_Object *)data;
546 ELM_HOVERSEL_DATA_GET(obj, sd); 546 ELM_HOVERSEL_DATA_GET(obj, sd);
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index a1d9e8b89b..472b71e3a6 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -45,10 +45,10 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
45 {NULL, NULL} 45 {NULL, NULL}
46}; 46};
47 47
48static void _entry_changed_cb(void *data, const Eo_Event *event); 48static void _entry_changed_cb(void *data, const Efl_Event *event);
49static void _entry_focus_in_cb(void *data, const Eo_Event *event); 49static void _entry_focus_in_cb(void *data, const Efl_Event *event);
50static void _entry_focus_out_cb(void *data, const Eo_Event *event); 50static void _entry_focus_out_cb(void *data, const Efl_Event *event);
51static void _entry_clicked_cb(void *data, const Eo_Event *event); 51static void _entry_clicked_cb(void *data, const Efl_Event *event);
52 52
53EFL_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb, 53EFL_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb,
54 { ELM_ENTRY_EVENT_CHANGED, _entry_changed_cb }, 54 { ELM_ENTRY_EVENT_CHANGED, _entry_changed_cb },
@@ -1036,7 +1036,7 @@ _entry_resize_cb(void *data,
1036} 1036}
1037 1037
1038static void 1038static void
1039_entry_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) 1039_entry_changed_cb(void *data, const Efl_Event *event EINA_UNUSED)
1040{ 1040{
1041 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd); 1041 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
1042 const char *str; 1042 const char *str;
@@ -1046,7 +1046,7 @@ _entry_changed_cb(void *data, const Eo_Event *event EINA_UNUSED)
1046} 1046}
1047 1047
1048static void 1048static void
1049_entry_focus_in_cb(void *data, const Eo_Event *event EINA_UNUSED) 1049_entry_focus_in_cb(void *data, const Efl_Event *event EINA_UNUSED)
1050{ 1050{
1051 Elm_Multibuttonentry_Item_Data *item = NULL; 1051 Elm_Multibuttonentry_Item_Data *item = NULL;
1052 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd); 1052 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
@@ -1060,7 +1060,7 @@ _entry_focus_in_cb(void *data, const Eo_Event *event EINA_UNUSED)
1060} 1060}
1061 1061
1062static void 1062static void
1063_entry_focus_out_cb(void *data, const Eo_Event *event EINA_UNUSED) 1063_entry_focus_out_cb(void *data, const Efl_Event *event EINA_UNUSED)
1064{ 1064{
1065 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd); 1065 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
1066 const char *str; 1066 const char *str;
@@ -1071,7 +1071,7 @@ _entry_focus_out_cb(void *data, const Eo_Event *event EINA_UNUSED)
1071} 1071}
1072 1072
1073static void 1073static void
1074_entry_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) 1074_entry_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED)
1075{ 1075{
1076 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd); 1076 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
1077 1077
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 5e85567f82..c447fdaec7 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -42,7 +42,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
42 {NULL, NULL} 42 {NULL, NULL}
43}; 43};
44 44
45static void _on_item_back_btn_clicked(void *data, const Eo_Event *event); 45static void _on_item_back_btn_clicked(void *data, const Efl_Event *event);
46 46
47static Eina_Bool _key_action_top_item_get(Evas_Object *obj, const char *params); 47static Eina_Bool _key_action_top_item_get(Evas_Object *obj, const char *params);
48 48
@@ -954,7 +954,7 @@ _elm_naviframe_elm_layout_sizing_eval(Eo *obj, Elm_Naviframe_Data *sd)
954} 954}
955 955
956static void 956static void
957_on_item_back_btn_clicked(void *data, const Eo_Event *event) 957_on_item_back_btn_clicked(void *data, const Efl_Event *event)
958{ 958{
959 /* Since edje has the event queue, clicked event could be happened 959 /* Since edje has the event queue, clicked event could be happened
960 multiple times on some heavy environment. This callback del will 960 multiple times on some heavy environment. This callback del will
@@ -1414,7 +1414,7 @@ _send_signal(Elm_Naviframe_Item_Data *it, const char *sig)
1414} 1414}
1415 1415
1416static void 1416static void
1417_deferred(void *data, const Eo_Event *event EINA_UNUSED) 1417_deferred(void *data, const Efl_Event *event EINA_UNUSED)
1418{ 1418{
1419 Elm_Naviframe_Data *nfd = data; 1419 Elm_Naviframe_Data *nfd = data;
1420 Elm_Naviframe_Op *nfo; 1420 Elm_Naviframe_Op *nfo;
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index 0714ac4272..86c4165436 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -60,13 +60,13 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
60 { NULL, NULL } 60 { NULL, NULL }
61}; 61};
62 62
63static void _update_frame(void *data, const Eo_Event *event); 63static void _update_frame(void *data, const Efl_Event *event);
64static void _update_slider(void *data, const Eo_Event *event); 64static void _update_slider(void *data, const Efl_Event *event);
65static void _play_started(void *data, const Eo_Event *event); 65static void _play_started(void *data, const Efl_Event *event);
66static void _play_finished(void *data, const Eo_Event *event); 66static void _play_finished(void *data, const Efl_Event *event);
67static void _update_position(void *data, const Eo_Event *event); 67static void _update_position(void *data, const Efl_Event *event);
68static void _drag_start(void *data, const Eo_Event *event); 68static void _drag_start(void *data, const Efl_Event *event);
69static void _drag_stop(void *data, const Eo_Event *event); 69static void _drag_stop(void *data, const Efl_Event *event);
70 70
71static Eina_Bool _key_action_move(Evas_Object *obj, const char *params); 71static Eina_Bool _key_action_move(Evas_Object *obj, const char *params);
72static Eina_Bool _key_action_play(Evas_Object *obj, const char *params); 72static Eina_Bool _key_action_play(Evas_Object *obj, const char *params);
@@ -238,7 +238,7 @@ _elm_player_elm_layout_sizing_eval(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
238} 238}
239 239
240static void 240static void
241_update_slider(void *data, const Eo_Event *event EINA_UNUSED) 241_update_slider(void *data, const Efl_Event *event EINA_UNUSED)
242{ 242{
243 double pos, length; 243 double pos, length;
244 Eina_Bool seekable; 244 Eina_Bool seekable;
@@ -259,7 +259,7 @@ _update_slider(void *data, const Eo_Event *event EINA_UNUSED)
259} 259}
260 260
261static void 261static void
262_update_frame(void *data, const Eo_Event *event) 262_update_frame(void *data, const Efl_Event *event)
263{ 263{
264 ELM_PLAYER_DATA_GET(data, sd); 264 ELM_PLAYER_DATA_GET(data, sd);
265 if (!sd) return; 265 if (!sd) return;
@@ -267,7 +267,7 @@ _update_frame(void *data, const Eo_Event *event)
267} 267}
268 268
269static void 269static void
270_update_position(void *data, const Eo_Event *event EINA_UNUSED) 270_update_position(void *data, const Efl_Event *event EINA_UNUSED)
271{ 271{
272 double pos; 272 double pos;
273 ELM_PLAYER_DATA_GET(data, sd); 273 ELM_PLAYER_DATA_GET(data, sd);
@@ -278,21 +278,21 @@ _update_position(void *data, const Eo_Event *event EINA_UNUSED)
278} 278}
279 279
280static void 280static void
281_drag_start(void *data, const Eo_Event *event EINA_UNUSED) 281_drag_start(void *data, const Efl_Event *event EINA_UNUSED)
282{ 282{
283 ELM_PLAYER_DATA_GET(data, sd); 283 ELM_PLAYER_DATA_GET(data, sd);
284 sd->dragging = EINA_TRUE; 284 sd->dragging = EINA_TRUE;
285} 285}
286 286
287static void 287static void
288_drag_stop(void *data, const Eo_Event *event EINA_UNUSED) 288_drag_stop(void *data, const Efl_Event *event EINA_UNUSED)
289{ 289{
290 ELM_PLAYER_DATA_GET(data, sd); 290 ELM_PLAYER_DATA_GET(data, sd);
291 sd->dragging = EINA_FALSE; 291 sd->dragging = EINA_FALSE;
292} 292}
293 293
294static void 294static void
295_update_volume(void *data, const Eo_Event *event EINA_UNUSED) 295_update_volume(void *data, const Efl_Event *event EINA_UNUSED)
296{ 296{
297 double vol; 297 double vol;
298 ELM_PLAYER_DATA_GET(data, sd); 298 ELM_PLAYER_DATA_GET(data, sd);
@@ -303,7 +303,7 @@ _update_volume(void *data, const Eo_Event *event EINA_UNUSED)
303} 303}
304 304
305static void 305static void
306_forward(void *data, const Eo_Event *event EINA_UNUSED) 306_forward(void *data, const Efl_Event *event EINA_UNUSED)
307{ 307{
308 double pos, length; 308 double pos, length;
309 ELM_PLAYER_DATA_GET(data, sd); 309 ELM_PLAYER_DATA_GET(data, sd);
@@ -319,21 +319,21 @@ _forward(void *data, const Eo_Event *event EINA_UNUSED)
319} 319}
320 320
321static void 321static void
322_info(void *data, const Eo_Event *event EINA_UNUSED) 322_info(void *data, const Efl_Event *event EINA_UNUSED)
323{ 323{
324 elm_layout_signal_emit(data, "elm,button,info", "elm"); 324 elm_layout_signal_emit(data, "elm,button,info", "elm");
325 efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_INFO_CLICKED, NULL); 325 efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_INFO_CLICKED, NULL);
326} 326}
327 327
328static void 328static void
329_next(void *data, const Eo_Event *event EINA_UNUSED) 329_next(void *data, const Efl_Event *event EINA_UNUSED)
330{ 330{
331 elm_layout_signal_emit(data, "elm,button,next", "elm"); 331 elm_layout_signal_emit(data, "elm,button,next", "elm");
332 efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_NEXT_CLICKED, NULL); 332 efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_NEXT_CLICKED, NULL);
333} 333}
334 334
335static void 335static void
336_pause(void *data, const Eo_Event *event EINA_UNUSED) 336_pause(void *data, const Efl_Event *event EINA_UNUSED)
337{ 337{
338 ELM_PLAYER_DATA_GET(data, sd); 338 ELM_PLAYER_DATA_GET(data, sd);
339 339
@@ -343,7 +343,7 @@ _pause(void *data, const Eo_Event *event EINA_UNUSED)
343} 343}
344 344
345static void 345static void
346_play(void *data, const Eo_Event *event EINA_UNUSED) 346_play(void *data, const Efl_Event *event EINA_UNUSED)
347{ 347{
348 ELM_PLAYER_DATA_GET(data, sd); 348 ELM_PLAYER_DATA_GET(data, sd);
349 349
@@ -353,14 +353,14 @@ _play(void *data, const Eo_Event *event EINA_UNUSED)
353} 353}
354 354
355static void 355static void
356_prev(void *data, const Eo_Event *event EINA_UNUSED) 356_prev(void *data, const Efl_Event *event EINA_UNUSED)
357{ 357{
358 efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_PREV_CLICKED, NULL); 358 efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_PREV_CLICKED, NULL);
359 elm_layout_signal_emit(data, "elm,button,prev", "elm"); 359 elm_layout_signal_emit(data, "elm,button,prev", "elm");
360} 360}
361 361
362static void 362static void
363_rewind(void *data, const Eo_Event *event EINA_UNUSED) 363_rewind(void *data, const Efl_Event *event EINA_UNUSED)
364{ 364{
365 double pos; 365 double pos;
366 ELM_PLAYER_DATA_GET(data, sd); 366 ELM_PLAYER_DATA_GET(data, sd);
@@ -375,14 +375,14 @@ _rewind(void *data, const Eo_Event *event EINA_UNUSED)
375} 375}
376 376
377static void 377static void
378_stop(void *data, const Eo_Event *event EINA_UNUSED) 378_stop(void *data, const Efl_Event *event EINA_UNUSED)
379{ 379{
380 elm_layout_signal_emit(data, "elm,button,stop", "elm"); 380 elm_layout_signal_emit(data, "elm,button,stop", "elm");
381 efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_QUALITY_CLICKED, NULL); 381 efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_QUALITY_CLICKED, NULL);
382} 382}
383 383
384static void 384static void
385_eject(void *data, const Eo_Event *event EINA_UNUSED) 385_eject(void *data, const Efl_Event *event EINA_UNUSED)
386{ 386{
387 ELM_PLAYER_DATA_GET(data, sd); 387 ELM_PLAYER_DATA_GET(data, sd);
388 388
@@ -409,7 +409,7 @@ _mute_toggle(Evas_Object *obj)
409} 409}
410 410
411static void 411static void
412_volume(void *data, const Eo_Event *event EINA_UNUSED) 412_volume(void *data, const Efl_Event *event EINA_UNUSED)
413{ 413{
414 elm_layout_signal_emit(data, "elm,button,volume", "elm"); 414 elm_layout_signal_emit(data, "elm,button,volume", "elm");
415 _mute_toggle(data); 415 _mute_toggle(data);
@@ -417,7 +417,7 @@ _volume(void *data, const Eo_Event *event EINA_UNUSED)
417} 417}
418 418
419static void 419static void
420_mute(void *data, const Eo_Event *event EINA_UNUSED) 420_mute(void *data, const Efl_Event *event EINA_UNUSED)
421{ 421{
422 elm_layout_signal_emit(data, "elm,button,mute", "elm"); 422 elm_layout_signal_emit(data, "elm,button,mute", "elm");
423 _mute_toggle(data); 423 _mute_toggle(data);
@@ -425,13 +425,13 @@ _mute(void *data, const Eo_Event *event EINA_UNUSED)
425} 425}
426 426
427static void 427static void
428_play_started(void *data, const Eo_Event *event EINA_UNUSED) 428_play_started(void *data, const Efl_Event *event EINA_UNUSED)
429{ 429{
430 elm_layout_signal_emit(data, "elm,player,play", "elm"); 430 elm_layout_signal_emit(data, "elm,player,play", "elm");
431} 431}
432 432
433static void 433static void
434_play_finished(void *data, const Eo_Event *event EINA_UNUSED) 434_play_finished(void *data, const Efl_Event *event EINA_UNUSED)
435{ 435{
436 elm_layout_signal_emit(data, "elm,player,pause", "elm"); 436 elm_layout_signal_emit(data, "elm,player,pause", "elm");
437} 437}
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index b2a1029c36..4c7fc2fc3d 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -49,10 +49,10 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
49static Eina_Bool _key_action_move(Evas_Object *obj, const char *params); 49static Eina_Bool _key_action_move(Evas_Object *obj, const char *params);
50static Eina_Bool _key_action_escape(Evas_Object *obj, const char *params); 50static Eina_Bool _key_action_escape(Evas_Object *obj, const char *params);
51static void _parent_geom_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED); 51static void _parent_geom_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED);
52static void _block_clicked_cb(void *data, const Eo_Event *event); 52static void _block_clicked_cb(void *data, const Efl_Event *event);
53static void _timeout_cb(void *data, const Eo_Event *event); 53static void _timeout_cb(void *data, const Efl_Event *event);
54 54
55static void _hide_effect_finished_cb(void *data, const Eo_Event *event); 55static void _hide_effect_finished_cb(void *data, const Efl_Event *event);
56 56
57static const Elm_Action key_actions[] = { 57static const Elm_Action key_actions[] = {
58 {"move", _key_action_move}, 58 {"move", _key_action_move},
@@ -102,20 +102,20 @@ _visuals_set(Evas_Object *obj)
102} 102}
103 103
104static void 104static void
105_block_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) 105_block_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED)
106{ 106{
107 efl_event_callback_legacy_call(data, ELM_POPUP_EVENT_BLOCK_CLICKED, NULL); 107 efl_event_callback_legacy_call(data, ELM_POPUP_EVENT_BLOCK_CLICKED, NULL);
108} 108}
109 109
110static void 110static void
111_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED) 111_timeout_cb(void *data, const Efl_Event *event EINA_UNUSED)
112{ 112{
113 evas_object_hide(data); 113 evas_object_hide(data);
114 efl_event_callback_legacy_call(data, ELM_POPUP_EVENT_TIMEOUT, NULL); 114 efl_event_callback_legacy_call(data, ELM_POPUP_EVENT_TIMEOUT, NULL);
115} 115}
116 116
117static void 117static void
118_hide_effect_finished_cb(void *data, const Eo_Event *event EINA_UNUSED) 118_hide_effect_finished_cb(void *data, const Efl_Event *event EINA_UNUSED)
119{ 119{
120 efl_event_callback_legacy_call(data, ELM_POPUP_EVENT_DISMISSED, NULL); 120 efl_event_callback_legacy_call(data, ELM_POPUP_EVENT_DISMISSED, NULL);
121} 121}
@@ -879,7 +879,7 @@ _elm_popup_item_elm_widget_item_signal_emit(Eo *eo_it EINA_UNUSED, Elm_Popup_Ite
879} 879}
880 880
881static void 881static void
882_item_focused_cb(void *data, const Eo_Event *event EINA_UNUSED) 882_item_focused_cb(void *data, const Efl_Event *event EINA_UNUSED)
883{ 883{
884 Elm_Popup_Item_Data *it = data; 884 Elm_Popup_Item_Data *it = data;
885 885
@@ -887,7 +887,7 @@ _item_focused_cb(void *data, const Eo_Event *event EINA_UNUSED)
887} 887}
888 888
889static void 889static void
890_item_unfocused_cb(void *data, const Eo_Event *event EINA_UNUSED) 890_item_unfocused_cb(void *data, const Efl_Event *event EINA_UNUSED)
891{ 891{
892 Elm_Popup_Item_Data *it = data; 892 Elm_Popup_Item_Data *it = data;
893 893
diff --git a/src/lib/elementary/elm_app_server.c b/src/lib/elementary/elm_app_server.c
index 3a795df169..cb853dd116 100644
--- a/src/lib/elementary/elm_app_server.c
+++ b/src/lib/elementary/elm_app_server.c
@@ -29,7 +29,7 @@ typedef struct
29} Elm_App_Server_Data; 29} Elm_App_Server_Data;
30 30
31static void 31static void
32_view_del_cb(void *data, const Eo_Event *event) 32_view_del_cb(void *data, const Efl_Event *event)
33{ 33{
34 Elm_App_Server_Data *cdata = data; 34 Elm_App_Server_Data *cdata = data;
35 eina_hash_del(cdata->views, NULL, event->object); 35 eina_hash_del(cdata->views, NULL, event->object);
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index 8b87a760c6..fbb08a3a7c 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -115,18 +115,18 @@ static Eo *_instance;
115static int _init_count = 0; 115static int _init_count = 0;
116 116
117// Object Event handlers 117// Object Event handlers
118static void _state_changed_signal_send(void *data, const Eo_Event *event); 118static void _state_changed_signal_send(void *data, const Efl_Event *event);
119static void _bounds_changed_signal_send(void *data, const Eo_Event *event); 119static void _bounds_changed_signal_send(void *data, const Efl_Event *event);
120static void _property_changed_signal_send(void *data, const Eo_Event *event); 120static void _property_changed_signal_send(void *data, const Efl_Event *event);
121static void _children_changed_signal_send(void *data, const Eo_Event *event); 121static void _children_changed_signal_send(void *data, const Efl_Event *event);
122static void _window_signal_send(void *data, const Eo_Event *event); 122static void _window_signal_send(void *data, const Efl_Event *event);
123static void _visible_data_changed_signal_send(void *data, const Eo_Event *event); 123static void _visible_data_changed_signal_send(void *data, const Efl_Event *event);
124static void _active_descendant_changed_signal_send(void *data, const Eo_Event *event); 124static void _active_descendant_changed_signal_send(void *data, const Efl_Event *event);
125static void _selection_signal_send(void *data, const Eo_Event *event); 125static void _selection_signal_send(void *data, const Efl_Event *event);
126static void _text_text_inserted_send(void *data, const Eo_Event *event); 126static void _text_text_inserted_send(void *data, const Efl_Event *event);
127static void _text_text_removed_send(void *data, const Eo_Event *event); 127static void _text_text_removed_send(void *data, const Efl_Event *event);
128static void _text_caret_moved_send(void *data, const Eo_Event *event); 128static void _text_caret_moved_send(void *data, const Efl_Event *event);
129static void _text_selection_changed_send(void *data, const Eo_Event *event); 129static void _text_selection_changed_send(void *data, const Efl_Event *event);
130 130
131// bridge private methods 131// bridge private methods
132static void _bridge_object_register(Eo *bridge, Eo *obj); 132static void _bridge_object_register(Eo *bridge, Eo *obj);
@@ -140,8 +140,8 @@ static void _bridge_iter_object_reference_append(Eo *bridge, Eldbus_Message_Iter
140static void _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj); 140static void _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj);
141static Eina_Bool _elm_atspi_bridge_key_filter(void *data, void *loop, int type, void *event); 141static Eina_Bool _elm_atspi_bridge_key_filter(void *data, void *loop, int type, void *event);
142static void _object_desktop_reference_append(Eldbus_Message_Iter *iter); 142static void _object_desktop_reference_append(Eldbus_Message_Iter *iter);
143static void _on_object_add(void *data, const Eo_Event *event); 143static void _on_object_add(void *data, const Efl_Event *event);
144static void _on_object_del(void *data, const Eo_Event *event); 144static void _on_object_del(void *data, const Efl_Event *event);
145 145
146typedef struct { 146typedef struct {
147 const Efl_Event_Description *desc; 147 const Efl_Event_Description *desc;
@@ -3815,7 +3815,7 @@ _handle_listener_change(void *data, const Eldbus_Message *msg EINA_UNUSED)
3815} 3815}
3816 3816
3817static void 3817static void
3818_state_changed_signal_send(void *data, const Eo_Event *event) 3818_state_changed_signal_send(void *data, const Efl_Event *event)
3819{ 3819{
3820 Elm_Atspi_Event_State_Changed_Data *state_data = event->info; 3820 Elm_Atspi_Event_State_Changed_Data *state_data = event->info;
3821 const char *type_desc; 3821 const char *type_desc;
@@ -3841,7 +3841,7 @@ _state_changed_signal_send(void *data, const Eo_Event *event)
3841} 3841}
3842 3842
3843static void 3843static void
3844_bounds_changed_signal_send(void *data, const Eo_Event *event) 3844_bounds_changed_signal_send(void *data, const Efl_Event *event)
3845{ 3845{
3846 Elm_Atspi_Event_Geometry_Changed_Data *geo_data = event->info; 3846 Elm_Atspi_Event_Geometry_Changed_Data *geo_data = event->info;
3847 3847
@@ -3851,7 +3851,7 @@ _bounds_changed_signal_send(void *data, const Eo_Event *event)
3851} 3851}
3852 3852
3853static void 3853static void
3854_property_changed_signal_send(void *data, const Eo_Event *event) 3854_property_changed_signal_send(void *data, const Efl_Event *event)
3855{ 3855{
3856 const char *property = event->info; 3856 const char *property = event->info;
3857 char *atspi_desc; 3857 char *atspi_desc;
@@ -3902,7 +3902,7 @@ _property_changed_signal_send(void *data, const Eo_Event *event)
3902} 3902}
3903 3903
3904static void 3904static void
3905_visible_data_changed_signal_send(void *data, const Eo_Event *event) 3905_visible_data_changed_signal_send(void *data, const Efl_Event *event)
3906{ 3906{
3907 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); 3907 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
3908 3908
@@ -3918,7 +3918,7 @@ _visible_data_changed_signal_send(void *data, const Eo_Event *event)
3918} 3918}
3919 3919
3920static void 3920static void
3921_active_descendant_changed_signal_send(void *data, const Eo_Event *event) 3921_active_descendant_changed_signal_send(void *data, const Efl_Event *event)
3922{ 3922{
3923 Eo *child = event->info; 3923 Eo *child = event->info;
3924 int idx; 3924 int idx;
@@ -3939,7 +3939,7 @@ _active_descendant_changed_signal_send(void *data, const Eo_Event *event)
3939} 3939}
3940 3940
3941static void 3941static void
3942_children_changed_signal_send(void *data, const Eo_Event *event) 3942_children_changed_signal_send(void *data, const Efl_Event *event)
3943{ 3943{
3944 const char *atspi_desc = NULL; 3944 const char *atspi_desc = NULL;
3945 Elm_Atspi_Event_Children_Changed_Data *ev_data = event->info; 3945 Elm_Atspi_Event_Children_Changed_Data *ev_data = event->info;
@@ -3980,7 +3980,7 @@ _children_changed_signal_send(void *data, const Eo_Event *event)
3980} 3980}
3981 3981
3982static void 3982static void
3983_window_signal_send(void *data, const Eo_Event *event) 3983_window_signal_send(void *data, const Efl_Event *event)
3984{ 3984{
3985 enum _Atspi_Window_Signals type; 3985 enum _Atspi_Window_Signals type;
3986 3986
@@ -4024,7 +4024,7 @@ _window_signal_send(void *data, const Eo_Event *event)
4024} 4024}
4025 4025
4026static void 4026static void
4027_selection_signal_send(void *data, const Eo_Event *event) 4027_selection_signal_send(void *data, const Efl_Event *event)
4028{ 4028{
4029 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); 4029 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
4030 4030
@@ -4122,7 +4122,7 @@ static void _bridge_signal_send(Eo *bridge, Eo *obj, const char *infc, const Eld
4122} 4122}
4123 4123
4124static void 4124static void
4125_text_caret_moved_send(void *data, const Eo_Event *event) 4125_text_caret_moved_send(void *data, const Efl_Event *event)
4126{ 4126{
4127 int cursor_pos = 0; 4127 int cursor_pos = 0;
4128 4128
@@ -4138,7 +4138,7 @@ _text_caret_moved_send(void *data, const Eo_Event *event)
4138} 4138}
4139 4139
4140static void 4140static void
4141_text_text_inserted_send(void *data, const Eo_Event *event) 4141_text_text_inserted_send(void *data, const Efl_Event *event)
4142{ 4142{
4143 Elm_Atspi_Text_Change_Info *info = event->info; 4143 Elm_Atspi_Text_Change_Info *info = event->info;
4144 4144
@@ -4152,7 +4152,7 @@ _text_text_inserted_send(void *data, const Eo_Event *event)
4152} 4152}
4153 4153
4154static void 4154static void
4155_text_text_removed_send(void *data, const Eo_Event *event) 4155_text_text_removed_send(void *data, const Efl_Event *event)
4156{ 4156{
4157 Elm_Atspi_Text_Change_Info *info = event->info; 4157 Elm_Atspi_Text_Change_Info *info = event->info;
4158 4158
@@ -4166,7 +4166,7 @@ _text_text_removed_send(void *data, const Eo_Event *event)
4166} 4166}
4167 4167
4168static void 4168static void
4169_text_selection_changed_send(void *data, const Eo_Event *event) 4169_text_selection_changed_send(void *data, const Efl_Event *event)
4170{ 4170{
4171 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); 4171 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
4172 4172
@@ -4200,7 +4200,7 @@ _bridge_object_unregister(Eo *bridge, Eo *obj)
4200} 4200}
4201 4201
4202static void 4202static void
4203_on_object_add(void *data, const Eo_Event *event) 4203_on_object_add(void *data, const Efl_Event *event)
4204{ 4204{
4205 Eldbus_Message *sig; 4205 Eldbus_Message *sig;
4206 Eldbus_Message_Iter *iter; 4206 Eldbus_Message_Iter *iter;
@@ -4215,7 +4215,7 @@ _on_object_add(void *data, const Eo_Event *event)
4215} 4215}
4216 4216
4217static void 4217static void
4218_on_object_del(void *data, const Eo_Event *event) 4218_on_object_del(void *data, const Efl_Event *event)
4219{ 4219{
4220 Eldbus_Message *sig; 4220 Eldbus_Message *sig;
4221 4221
@@ -4351,7 +4351,7 @@ _interfaces_register(Eo *bridge)
4351} 4351}
4352 4352
4353static void 4353static void
4354_bridge_accessible_event_dispatch(void *data, const Eo_Event *event) 4354_bridge_accessible_event_dispatch(void *data, const Efl_Event *event)
4355{ 4355{
4356 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); 4356 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
4357 4357
diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c
index 700078ee8e..83501a7235 100644
--- a/src/lib/elementary/elm_box.c
+++ b/src/lib/elementary/elm_box.c
@@ -30,7 +30,7 @@ _elm_box_list_data_get(const Eina_List *list)
30} 30}
31 31
32static void 32static void
33_child_added_cb_proxy(void *data, const Eo_Event *event) 33_child_added_cb_proxy(void *data, const Efl_Event *event)
34{ 34{
35 Evas_Object *box = data; 35 Evas_Object *box = data;
36 Evas_Object_Box_Option *opt = event->info; 36 Evas_Object_Box_Option *opt = event->info;
@@ -38,7 +38,7 @@ _child_added_cb_proxy(void *data, const Eo_Event *event)
38} 38}
39 39
40static void 40static void
41_child_removed_cb_proxy(void *data, const Eo_Event *event) 41_child_removed_cb_proxy(void *data, const Efl_Event *event)
42{ 42{
43 Evas_Object *box = data; 43 Evas_Object *box = data;
44 Evas_Object *child = event->info; 44 Evas_Object *child = event->info;
@@ -177,7 +177,7 @@ _transition_animation(void *data)
177} 177}
178 178
179static void 179static void
180_transition_layout_child_added(void *data, const Eo_Event *event) 180_transition_layout_child_added(void *data, const Efl_Event *event)
181{ 181{
182 Transition_Animation_Data *tad; 182 Transition_Animation_Data *tad;
183 Evas_Object_Box_Option *opt = event->info; 183 Evas_Object_Box_Option *opt = event->info;
@@ -192,7 +192,7 @@ _transition_layout_child_added(void *data, const Eo_Event *event)
192} 192}
193 193
194static void 194static void
195_transition_layout_child_removed(void *data, const Eo_Event *event) 195_transition_layout_child_removed(void *data, const Efl_Event *event)
196{ 196{
197 Eina_List *l; 197 Eina_List *l;
198 Transition_Animation_Data *tad; 198 Transition_Animation_Data *tad;
diff --git a/src/lib/elementary/elm_cnp.c b/src/lib/elementary/elm_cnp.c
index 41d1dc418e..be0b642efe 100644
--- a/src/lib/elementary/elm_cnp.c
+++ b/src/lib/elementary/elm_cnp.c
@@ -1773,7 +1773,7 @@ _x11_dnd_status(void *data EINA_UNUSED, int etype EINA_UNUSED, void *ev)
1773} 1773}
1774 1774
1775static void 1775static void
1776_x11_win_rotation_changed_cb(void *data, const Eo_Event *event) 1776_x11_win_rotation_changed_cb(void *data, const Efl_Event *event)
1777{ 1777{
1778 Evas_Object *win = data; 1778 Evas_Object *win = data;
1779 int rot = elm_win_rotation_get(event->object); 1779 int rot = elm_win_rotation_get(event->object);
diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c
index 99cf1411cc..246f5eea3a 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -449,7 +449,7 @@ _elm_code_widget_fill(Elm_Code_Widget *widget)
449} 449}
450 450
451static void 451static void
452_elm_code_widget_line_cb(void *data, const Eo_Event *event) 452_elm_code_widget_line_cb(void *data, const Efl_Event *event)
453{ 453{
454 Elm_Code_Line *line; 454 Elm_Code_Line *line;
455 Elm_Code_Widget *widget; 455 Elm_Code_Widget *widget;
@@ -461,7 +461,7 @@ _elm_code_widget_line_cb(void *data, const Eo_Event *event)
461} 461}
462 462
463static void 463static void
464_elm_code_widget_file_cb(void *data, const Eo_Event *event EINA_UNUSED) 464_elm_code_widget_file_cb(void *data, const Efl_Event *event EINA_UNUSED)
465{ 465{
466 Elm_Code_Widget *widget; 466 Elm_Code_Widget *widget;
467 467
@@ -471,7 +471,7 @@ _elm_code_widget_file_cb(void *data, const Eo_Event *event EINA_UNUSED)
471} 471}
472 472
473static void 473static void
474_elm_code_widget_selection_cb(void *data, const Eo_Event *event EINA_UNUSED) 474_elm_code_widget_selection_cb(void *data, const Efl_Event *event EINA_UNUSED)
475{ 475{
476 Elm_Code_Widget *widget; 476 Elm_Code_Widget *widget;
477 477
@@ -481,7 +481,7 @@ _elm_code_widget_selection_cb(void *data, const Eo_Event *event EINA_UNUSED)
481} 481}
482 482
483static void 483static void
484_elm_code_widget_selection_clear_cb(void *data, const Eo_Event *event EINA_UNUSED) 484_elm_code_widget_selection_clear_cb(void *data, const Efl_Event *event EINA_UNUSED)
485{ 485{
486 Elm_Code_Widget *widget; 486 Elm_Code_Widget *widget;
487 487
diff --git a/src/lib/elementary/elm_color_class.c b/src/lib/elementary/elm_color_class.c
index 5dde9a59ff..f88b8efbc5 100644
--- a/src/lib/elementary/elm_color_class.c
+++ b/src/lib/elementary/elm_color_class.c
@@ -128,7 +128,7 @@ _colorclass_select(void *data, Evas_Object *obj EINA_UNUSED, const char *sig, co
128} 128}
129 129
130static void 130static void
131_colorclass_changed(void *data, const Eo_Event *event EINA_UNUSED) 131_colorclass_changed(void *data, const Efl_Event *event EINA_UNUSED)
132{ 132{
133 Colorclass_UI *cc = data; 133 Colorclass_UI *cc = data;
134 134
@@ -151,7 +151,7 @@ _colorclass_changed(void *data, const Eo_Event *event EINA_UNUSED)
151} 151}
152 152
153static void 153static void
154_colorclass_reset(void *data, const Eo_Event *event EINA_UNUSED) 154_colorclass_reset(void *data, const Efl_Event *event EINA_UNUSED)
155{ 155{
156 Colorclass_UI *cc = data; 156 Colorclass_UI *cc = data;
157 Colorclass color; 157 Colorclass color;
@@ -193,7 +193,7 @@ _colorclass_reset(void *data, const Eo_Event *event EINA_UNUSED)
193} 193}
194 194
195static void 195static void
196_colorclass_activate(void *data, const Eo_Event *event) 196_colorclass_activate(void *data, const Efl_Event *event)
197{ 197{
198 Colorclass_UI *cc = data; 198 Colorclass_UI *cc = data;
199 Elm_Object_Item *it = event->info; 199 Elm_Object_Item *it = event->info;
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index a2b67cd3b3..189d341f87 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -649,7 +649,7 @@ _unselect_selected_item(Elm_Colorselector_Data *sd)
649} 649}
650 650
651static void 651static void
652_spinner_changed_cb(void *data, const Eo_Event *event) 652_spinner_changed_cb(void *data, const Efl_Event *event)
653{ 653{
654 Elm_Colorselector_Data *sd = data; 654 Elm_Colorselector_Data *sd = data;
655 Evas_Object *parent; 655 Evas_Object *parent;
@@ -708,7 +708,7 @@ _x11_elm_widget_xwin_get(const Evas_Object *obj)
708} 708}
709 709
710static void 710static void
711_start_grab_pick_cb(void *data, const Eo_Event *event) 711_start_grab_pick_cb(void *data, const Efl_Event *event)
712{ 712{
713 Evas_Object *o = data; 713 Evas_Object *o = data;
714 714
@@ -1028,7 +1028,7 @@ _colorbar_move_cb(void *data,
1028} 1028}
1029 1029
1030static void 1030static void
1031_button_clicked_cb(void *data, const Eo_Event *event) 1031_button_clicked_cb(void *data, const Efl_Event *event)
1032{ 1032{
1033 Color_Bar_Data *cb_data = data; 1033 Color_Bar_Data *cb_data = data;
1034 double x, y, step; 1034 double x, y, step;
@@ -1072,7 +1072,7 @@ _button_clicked_cb(void *data, const Eo_Event *event)
1072} 1072}
1073 1073
1074static void 1074static void
1075_button_repeat_cb(void *data, const Eo_Event *event EINA_UNUSED) 1075_button_repeat_cb(void *data, const Efl_Event *event EINA_UNUSED)
1076{ 1076{
1077 Color_Bar_Data *cb_data = data; 1077 Color_Bar_Data *cb_data = data;
1078 double x, y, step; 1078 double x, y, step;
@@ -2018,7 +2018,7 @@ _key_action_move(Evas_Object *obj, const char *params)
2018 } 2018 }
2019 else if (sd->focused == ELM_COLORSELECTOR_COMPONENTS) 2019 else if (sd->focused == ELM_COLORSELECTOR_COMPONENTS)
2020 { 2020 {
2021 Eo_Event event = {}; 2021 Efl_Event event = {};
2022 event.object = sd->cb_data[sd->sel_color_type]->lbt; 2022 event.object = sd->cb_data[sd->sel_color_type]->lbt;
2023 _button_clicked_cb(sd->cb_data[sd->sel_color_type], &event); 2023 _button_clicked_cb(sd->cb_data[sd->sel_color_type], &event);
2024 } 2024 }
@@ -2032,7 +2032,7 @@ _key_action_move(Evas_Object *obj, const char *params)
2032 } 2032 }
2033 else if (sd->focused == ELM_COLORSELECTOR_COMPONENTS) 2033 else if (sd->focused == ELM_COLORSELECTOR_COMPONENTS)
2034 { 2034 {
2035 Eo_Event event = {}; 2035 Efl_Event event = {};
2036 event.object = sd->cb_data[sd->sel_color_type]->rbt; 2036 event.object = sd->cb_data[sd->sel_color_type]->rbt;
2037 _button_clicked_cb(sd->cb_data[sd->sel_color_type], &event); 2037 _button_clicked_cb(sd->cb_data[sd->sel_color_type], &event);
2038 } 2038 }
diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c
index c27e589522..facac03e16 100644
--- a/src/lib/elementary/elm_conform.c
+++ b/src/lib/elementary/elm_conform.c
@@ -353,7 +353,7 @@ _land_indicator_connect_cb(void *data)
353} 353}
354 354
355static void 355static void
356_land_indicator_disconnected(void *data, const Eo_Event *event EINA_UNUSED) 356_land_indicator_disconnected(void *data, const Efl_Event *event EINA_UNUSED)
357{ 357{
358 Evas_Object *conform = data; 358 Evas_Object *conform = data;
359 359
@@ -364,7 +364,7 @@ _land_indicator_disconnected(void *data, const Eo_Event *event EINA_UNUSED)
364} 364}
365 365
366static void 366static void
367_port_indicator_disconnected(void *data, const Eo_Event *event EINA_UNUSED) 367_port_indicator_disconnected(void *data, const Efl_Event *event EINA_UNUSED)
368{ 368{
369 Evas_Object *conform = data; 369 Evas_Object *conform = data;
370 370
@@ -509,7 +509,7 @@ _indicator_opacity_set(Evas_Object *conformant, Elm_Win_Indicator_Opacity_Mode i
509} 509}
510 510
511static void 511static void
512_on_indicator_mode_changed(void *data, const Eo_Event *event) 512_on_indicator_mode_changed(void *data, const Efl_Event *event)
513{ 513{
514 Evas_Object *conformant = data; 514 Evas_Object *conformant = data;
515 Evas_Object *win = event->object; 515 Evas_Object *win = event->object;
@@ -528,7 +528,7 @@ _on_indicator_mode_changed(void *data, const Eo_Event *event)
528} 528}
529 529
530static void 530static void
531_on_rotation_changed(void *data, const Eo_Event *event EINA_UNUSED) 531_on_rotation_changed(void *data, const Efl_Event *event EINA_UNUSED)
532{ 532{
533 int rot = 0; 533 int rot = 0;
534 Evas_Object *win = event->object; 534 Evas_Object *win = event->object;
@@ -1000,7 +1000,7 @@ _elm_conformant_efl_object_constructor(Eo *obj, Elm_Conformant_Data *sd)
1000 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1000 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1001 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); 1001 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
1002 1002
1003 Eo_Event event = {}; 1003 Efl_Event event = {};
1004 event.object = sd->win; 1004 event.object = sd->win;
1005 sd->win = elm_widget_top_get(obj); 1005 sd->win = elm_widget_top_get(obj);
1006 _on_indicator_mode_changed(obj, &event); 1006 _on_indicator_mode_changed(obj, &event);
diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c
index 60e8583a05..6a8a30bc00 100644
--- a/src/lib/elementary/elm_dayselector.c
+++ b/src/lib/elementary/elm_dayselector.c
@@ -195,7 +195,7 @@ _item_signal_emit_cb(void *data,
195} 195}
196 196
197static void 197static void
198_item_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) 198_item_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED)
199{ 199{
200 Elm_Dayselector_Item_Data *it = data; 200 Elm_Dayselector_Item_Data *it = data;
201 201
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 84a799916b..d7bbdf423d 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -1386,7 +1386,7 @@ _hover_del_job(void *data)
1386} 1386}
1387 1387
1388static void 1388static void
1389_hover_dismissed_cb(void *data, const Eo_Event *event EINA_UNUSED) 1389_hover_dismissed_cb(void *data, const Efl_Event *event EINA_UNUSED)
1390{ 1390{
1391 ELM_ENTRY_DATA_GET(data, sd); 1391 ELM_ENTRY_DATA_GET(data, sd);
1392 1392
@@ -2493,7 +2493,7 @@ _anchor_hover_del_cb(void *data,
2493} 2493}
2494 2494
2495static void 2495static void
2496_anchor_hover_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) 2496_anchor_hover_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED)
2497{ 2497{
2498 elm_entry_anchor_hover_end(data); 2498 elm_entry_anchor_hover_end(data);
2499} 2499}
@@ -3980,7 +3980,7 @@ elm_entry_add(Evas_Object *parent)
3980} 3980}
3981 3981
3982static void 3982static void
3983_cb_added(void *data EINA_UNUSED, const Eo_Event *ev) 3983_cb_added(void *data EINA_UNUSED, const Efl_Event *ev)
3984{ 3984{
3985 const Efl_Callback_Array_Item *event = ev->info; 3985 const Efl_Callback_Array_Item *event = ev->info;
3986 3986
@@ -3990,7 +3990,7 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
3990} 3990}
3991 3991
3992static void 3992static void
3993_cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev) 3993_cb_deleted(void *data EINA_UNUSED, const Efl_Event *ev)
3994{ 3994{
3995 const Efl_Callback_Array_Item *event = ev->info; 3995 const Efl_Callback_Array_Item *event = ev->info;
3996 3996
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 267ca9c3fb..7c0cc151cd 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -2016,7 +2016,7 @@ _item_realize(Elm_Gen_Item *it,
2016} 2016}
2017 2017
2018static void 2018static void
2019_tree_effect_animator_cb(void *data, const Eo_Event *event EINA_UNUSED) 2019_tree_effect_animator_cb(void *data, const Efl_Event *event EINA_UNUSED)
2020{ 2020{
2021 int in = 0; 2021 int in = 0;
2022 const Eina_List *l; 2022 const Eina_List *l;
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c
index af88b15e03..0bf9029384 100644
--- a/src/lib/elementary/elm_glview.c
+++ b/src/lib/elementary/elm_glview.c
@@ -110,7 +110,7 @@ _elm_glview_efl_canvas_group_group_resize(Eo *obj, Elm_Glview_Data *sd, Evas_Coo
110} 110}
111 111
112static void 112static void
113_render_cb(void *obj, const Eo_Event *event EINA_UNUSED) 113_render_cb(void *obj, const Efl_Event *event EINA_UNUSED)
114{ 114{
115 ELM_GLVIEW_DATA_GET(obj, sd); 115 ELM_GLVIEW_DATA_GET(obj, sd);
116 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ); 116 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, );
@@ -318,7 +318,7 @@ _elm_glview_efl_canvas_group_group_del(Eo *obj, Elm_Glview_Data *sd)
318} 318}
319 319
320static void 320static void
321_cb_added(void *data EINA_UNUSED, const Eo_Event *ev) 321_cb_added(void *data EINA_UNUSED, const Efl_Event *ev)
322{ 322{
323 const Efl_Callback_Array_Item *event = ev->info; 323 const Efl_Callback_Array_Item *event = ev->info;
324 324
diff --git a/src/lib/elementary/elm_helper.c b/src/lib/elementary/elm_helper.c
index ebeea80121..7b4c327d71 100644
--- a/src/lib/elementary/elm_helper.c
+++ b/src/lib/elementary/elm_helper.c
@@ -39,7 +39,7 @@ elm_validator_regexp_status_get(Elm_Validator_Regexp *validator)
39} 39}
40 40
41EAPI void 41EAPI void
42elm_validator_regexp_helper(void *data, const Eo_Event *event) 42elm_validator_regexp_helper(void *data, const Efl_Event *event)
43{ 43{
44 Elm_Validate_Content *vc = event->info; 44 Elm_Validate_Content *vc = event->info;
45 Elm_Validator_Regexp *validator = (Elm_Validator_Regexp *)data; 45 Elm_Validator_Regexp *validator = (Elm_Validator_Regexp *)data;
diff --git a/src/lib/elementary/elm_helper.h b/src/lib/elementary/elm_helper.h
index e2e01f9836..df117369a5 100644
--- a/src/lib/elementary/elm_helper.h
+++ b/src/lib/elementary/elm_helper.h
@@ -100,7 +100,7 @@ elm_validator_regexp_status_get(Elm_Validator_Regexp *validator) EINA_ARG_NONNUL
100 * @since 1.14 100 * @since 1.14
101 */ 101 */
102EAPI void 102EAPI void
103elm_validator_regexp_helper(void *data, const Eo_Event *event); 103elm_validator_regexp_helper(void *data, const Efl_Event *event);
104#endif 104#endif
105 105
106/** 106/**
diff --git a/src/lib/elementary/elm_interface_atspi_accessible.c b/src/lib/elementary/elm_interface_atspi_accessible.c
index 5bbfb48727..9f576aa7d7 100644
--- a/src/lib/elementary/elm_interface_atspi_accessible.c
+++ b/src/lib/elementary/elm_interface_atspi_accessible.c
@@ -343,7 +343,7 @@ _elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_
343 return; 343 return;
344 } 344 }
345 345
346 Eo_Event ev; 346 Efl_Event ev;
347 ev.object = accessible; 347 ev.object = accessible;
348 ev.desc = event; 348 ev.desc = event;
349 ev.info = event_info; 349 ev.info = event_info;
@@ -415,7 +415,7 @@ elm_atspi_relation_clone(const Elm_Atspi_Relation *relation)
415} 415}
416 416
417static void 417static void
418_on_rel_obj_del(void *data, const Eo_Event *event) 418_on_rel_obj_del(void *data, const Efl_Event *event)
419{ 419{
420 Elm_Atspi_Relation_Set *set = data; 420 Elm_Atspi_Relation_Set *set = data;
421 Elm_Atspi_Relation *rel; 421 Elm_Atspi_Relation *rel;
diff --git a/src/lib/elementary/elm_interface_atspi_image.c b/src/lib/elementary/elm_interface_atspi_image.c
index 2e2be438b9..510a6545c2 100644
--- a/src/lib/elementary/elm_interface_atspi_image.c
+++ b/src/lib/elementary/elm_interface_atspi_image.c
@@ -9,7 +9,7 @@
9#include "elm_priv.h" 9#include "elm_priv.h"
10 10
11static void 11static void
12_free_desc_cb(void *data, const Eo_Event *event EINA_UNUSED) 12_free_desc_cb(void *data, const Efl_Event *event EINA_UNUSED)
13{ 13{
14 eina_stringshare_del(data); 14 eina_stringshare_del(data);
15} 15}
diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index 67f955d6d4..819ba2bbf1 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -59,13 +59,13 @@ _elm_scroll_wanted_coordinates_update(Elm_Scrollable_Smart_Interface_Data *sid,
59 Evas_Coord x, 59 Evas_Coord x,
60 Evas_Coord y); 60 Evas_Coord y);
61 61
62static void _elm_scroll_hold_animator(void *data, const Eo_Event *event); 62static void _elm_scroll_hold_animator(void *data, const Efl_Event *event);
63static void _elm_scroll_on_hold_animator(void *data, const Eo_Event *event); 63static void _elm_scroll_on_hold_animator(void *data, const Efl_Event *event);
64static void _elm_scroll_scroll_to_y_animator(void *data, const Eo_Event *event); 64static void _elm_scroll_scroll_to_y_animator(void *data, const Efl_Event *event);
65static void _elm_scroll_scroll_to_x_animator(void *data, const Eo_Event *event); 65static void _elm_scroll_scroll_to_x_animator(void *data, const Efl_Event *event);
66static void _elm_scroll_bounce_y_animator(void *data, const Eo_Event *event); 66static void _elm_scroll_bounce_y_animator(void *data, const Efl_Event *event);
67static void _elm_scroll_bounce_x_animator(void *data, const Eo_Event *event); 67static void _elm_scroll_bounce_x_animator(void *data, const Efl_Event *event);
68static void _elm_scroll_momentum_animator(void *data, const Eo_Event *event); 68static void _elm_scroll_momentum_animator(void *data, const Efl_Event *event);
69 69
70static double 70static double
71_round(double value, int pos) 71_round(double value, int pos)
@@ -1302,7 +1302,7 @@ _elm_scroll_momentum_end(Elm_Scrollable_Smart_Interface_Data *sid)
1302} 1302}
1303 1303
1304static void 1304static void
1305_elm_scroll_bounce_x_animator(void *data, const Eo_Event *event EINA_UNUSED) 1305_elm_scroll_bounce_x_animator(void *data, const Efl_Event *event EINA_UNUSED)
1306{ 1306{
1307 ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(data, sid); 1307 ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(data, sid);
1308 Evas_Coord x, y, dx, w, odx, ed, md; 1308 Evas_Coord x, y, dx, w, odx, ed, md;
@@ -1356,7 +1356,7 @@ _elm_scroll_bounce_x_animator(void *data, const Eo_Event *event EINA_UNUSED)
1356} 1356}
1357 1357
1358static void 1358static void
1359_elm_scroll_bounce_y_animator(void *data, const Eo_Event *event EINA_UNUSED) 1359_elm_scroll_bounce_y_animator(void *data, const Efl_Event *event EINA_UNUSED)
1360{ 1360{
1361 ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(data, sid); 1361 ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(data, sid);
1362 Evas_Coord x, y, dy, h, ody, ed, md; 1362 Evas_Coord x, y, dy, h, ody, ed, md;
@@ -2087,7 +2087,7 @@ _paging_is_enabled(Elm_Scrollable_Smart_Interface_Data *sid)
2087} 2087}
2088 2088
2089static void 2089static void
2090_elm_scroll_momentum_animator(void *data, const Eo_Event *event EINA_UNUSED) 2090_elm_scroll_momentum_animator(void *data, const Efl_Event *event EINA_UNUSED)
2091{ 2091{
2092 double t, at, dt, p, r; 2092 double t, at, dt, p, r;
2093 Elm_Scrollable_Smart_Interface_Data *sid = data; 2093 Elm_Scrollable_Smart_Interface_Data *sid = data;
@@ -2264,7 +2264,7 @@ _elm_scroll_page_y_get(Elm_Scrollable_Smart_Interface_Data *sid,
2264} 2264}
2265 2265
2266static void 2266static void
2267_elm_scroll_scroll_to_x_animator(void *data, const Eo_Event *event EINA_UNUSED) 2267_elm_scroll_scroll_to_x_animator(void *data, const Efl_Event *event EINA_UNUSED)
2268{ 2268{
2269 Elm_Scrollable_Smart_Interface_Data *sid = data; 2269 Elm_Scrollable_Smart_Interface_Data *sid = data;
2270 Evas_Coord px, py; 2270 Evas_Coord px, py;
@@ -2301,7 +2301,7 @@ _elm_scroll_scroll_to_x_animator(void *data, const Eo_Event *event EINA_UNUSED)
2301} 2301}
2302 2302
2303static void 2303static void
2304_elm_scroll_scroll_to_y_animator(void *data, const Eo_Event *event EINA_UNUSED) 2304_elm_scroll_scroll_to_y_animator(void *data, const Efl_Event *event EINA_UNUSED)
2305{ 2305{
2306 Elm_Scrollable_Smart_Interface_Data *sid = data; 2306 Elm_Scrollable_Smart_Interface_Data *sid = data;
2307 Evas_Coord px, py; 2307 Evas_Coord px, py;
@@ -3097,7 +3097,7 @@ _elm_scroll_hold_enterer(void *data)
3097} 3097}
3098 3098
3099static void 3099static void
3100_elm_scroll_hold_animator(void *data, const Eo_Event *event EINA_UNUSED) 3100_elm_scroll_hold_animator(void *data, const Efl_Event *event EINA_UNUSED)
3101{ 3101{
3102 Elm_Scrollable_Smart_Interface_Data *sid = data; 3102 Elm_Scrollable_Smart_Interface_Data *sid = data;
3103 3103
@@ -3107,7 +3107,7 @@ _elm_scroll_hold_animator(void *data, const Eo_Event *event EINA_UNUSED)
3107} 3107}
3108 3108
3109static void 3109static void
3110_elm_scroll_on_hold_animator(void *data, const Eo_Event *event EINA_UNUSED) 3110_elm_scroll_on_hold_animator(void *data, const Efl_Event *event EINA_UNUSED)
3111{ 3111{
3112 double t, td; 3112 double t, td;
3113 double vx, vy; 3113 double vx, vy;
@@ -3812,7 +3812,7 @@ _elm_scroll_pan_resized_cb(void *data,
3812 3812
3813/* even external pan objects get this */ 3813/* even external pan objects get this */
3814static void 3814static void
3815_elm_scroll_pan_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) 3815_elm_scroll_pan_changed_cb(void *data, const Efl_Event *event EINA_UNUSED)
3816{ 3816{
3817 Evas_Coord w = 0, h = 0; 3817 Evas_Coord w = 0, h = 0;
3818 Elm_Scrollable_Smart_Interface_Data *sid = data; 3818 Elm_Scrollable_Smart_Interface_Data *sid = data;
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index fd3169e479..e21241fb1e 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -853,7 +853,7 @@ static void *qr_handle = NULL;
853static int (*qr_main)(int argc, 853static int (*qr_main)(int argc,
854 char **argv) = NULL; 854 char **argv) = NULL;
855static void (*qre_main)(void *data, 855static void (*qre_main)(void *data,
856 const Eo_Event *ev) = NULL; 856 const Efl_Event *ev) = NULL;
857 857
858EAPI Eina_Bool 858EAPI Eina_Bool
859elm_quicklaunch_prepare(int argc, 859elm_quicklaunch_prepare(int argc,
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index 30ef651725..b731242185 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -1146,7 +1146,7 @@ _zoom_do(Elm_Map_Data *sd,
1146} 1146}
1147 1147
1148static void 1148static void
1149_zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) 1149_zoom_anim_cb(void *data, const Efl_Event *event EINA_UNUSED)
1150{ 1150{
1151 ELM_MAP_DATA_GET(data, sd); 1151 ELM_MAP_DATA_GET(data, sd);
1152 1152
@@ -1165,7 +1165,7 @@ _zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
1165} 1165}
1166 1166
1167static void 1167static void
1168_zoom_bring_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) 1168_zoom_bring_anim_cb(void *data, const Efl_Event *event EINA_UNUSED)
1169{ 1169{
1170 ELM_MAP_DATA_GET(data, sd); 1170 ELM_MAP_DATA_GET(data, sd);
1171 1171
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index c2cd644b5a..8ec5507a9b 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -424,7 +424,7 @@ _menu_hide(void *data,
424} 424}
425 425
426static void 426static void
427_hover_dismissed_cb(void *data, const Eo_Event *event) 427_hover_dismissed_cb(void *data, const Efl_Event *event)
428{ 428{
429 _menu_hide(data, event->object, event->info); 429 _menu_hide(data, event->object, event->info);
430 efl_event_callback_legacy_call 430 efl_event_callback_legacy_call
@@ -519,7 +519,7 @@ _menu_item_inactivate_cb(void *data,
519} 519}
520 520
521static void 521static void
522_block_menu(void *_sd, const Eo_Event *event EINA_UNUSED) 522_block_menu(void *_sd, const Efl_Event *event EINA_UNUSED)
523{ 523{
524 const Eina_List *l; 524 const Eina_List *l;
525 Elm_Object_Item *eo_current; 525 Elm_Object_Item *eo_current;
@@ -535,7 +535,7 @@ _block_menu(void *_sd, const Eo_Event *event EINA_UNUSED)
535} 535}
536 536
537static void 537static void
538_unblock_menu(void *_sd, const Eo_Event *event EINA_UNUSED) 538_unblock_menu(void *_sd, const Efl_Event *event EINA_UNUSED)
539{ 539{
540 const Eina_List *l; 540 const Eina_List *l;
541 Elm_Object_Item *eo_current; 541 Elm_Object_Item *eo_current;
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index db43b9a84f..0568892cb0 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/elm_panel.c
@@ -1098,7 +1098,7 @@ _elm_panel_efl_canvas_group_group_move(Eo *obj, Elm_Panel_Data *sd, Evas_Coord x
1098// FIXME: This is definitively not an animator, but a pre calc function 1098// FIXME: This is definitively not an animator, but a pre calc function
1099// Not sure if I can hook on smart calc or on RENDER_PRE, will be left for later 1099// Not sure if I can hook on smart calc or on RENDER_PRE, will be left for later
1100static void 1100static void
1101_elm_panel_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) 1101_elm_panel_anim_cb(void *data, const Efl_Event *event EINA_UNUSED)
1102{ 1102{
1103 Evas_Object *obj = data; 1103 Evas_Object *obj = data;
1104 ELM_PANEL_DATA_GET(obj, sd); 1104 ELM_PANEL_DATA_GET(obj, sd);
diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c
index 3431aca04c..0a2022e57c 100644
--- a/src/lib/elementary/elm_photo.c
+++ b/src/lib/elementary/elm_photo.c
@@ -235,7 +235,7 @@ _elm_photo_internal_image_follow(Evas_Object *obj)
235} 235}
236 236
237static void 237static void
238_on_thumb_done(void *data, const Eo_Event *event EINA_UNUSED) 238_on_thumb_done(void *data, const Efl_Event *event EINA_UNUSED)
239{ 239{
240 _elm_photo_internal_image_follow(data); 240 _elm_photo_internal_image_follow(data);
241} 241}
diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/elm_photocam.c
index 831bcb15a4..5876646e66 100644
--- a/src/lib/elementary/elm_photocam.c
+++ b/src/lib/elementary/elm_photocam.c
@@ -767,7 +767,7 @@ _zoom_do(Evas_Object *obj,
767} 767}
768 768
769static void 769static void
770_zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) 770_zoom_anim_cb(void *data, const Efl_Event *event EINA_UNUSED)
771{ 771{
772 double t; 772 double t;
773 Evas_Object *obj = data; 773 Evas_Object *obj = data;
@@ -1034,7 +1034,7 @@ _elm_photocam_elm_widget_event(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED, Evas
1034} 1034}
1035 1035
1036static void 1036static void
1037_bounce_eval(void *data, const Eo_Event *event EINA_UNUSED) 1037_bounce_eval(void *data, const Efl_Event *event EINA_UNUSED)
1038{ 1038{
1039 Evas_Object *obj = data; 1039 Evas_Object *obj = data;
1040 ELM_PHOTOCAM_DATA_GET(obj, sd); 1040 ELM_PHOTOCAM_DATA_GET(obj, sd);
@@ -1950,7 +1950,7 @@ done:
1950 if (an) 1950 if (an)
1951 { 1951 {
1952 // FIXME: If one day we do support partial animator in photocam, this would require change 1952 // FIXME: If one day we do support partial animator in photocam, this would require change
1953 Eo_Event event = {}; 1953 Efl_Event event = {};
1954 event.object = evas_object_evas_get(obj); 1954 event.object = evas_object_evas_get(obj);
1955 _zoom_anim_cb(obj, &event); 1955 _zoom_anim_cb(obj, &event);
1956 // FIXME: Unhandled. 1956 // FIXME: Unhandled.
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index c64addb210..547c045b0c 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -42,13 +42,13 @@ static Eina_Bool _key_action_spin(Evas_Object *obj, const char *params);
42static Eina_Bool _key_action_toggle(Evas_Object *obj, const char *params); 42static Eina_Bool _key_action_toggle(Evas_Object *obj, const char *params);
43 43
44static void 44static void
45_inc_dec_button_clicked_cb(void *data, const Eo_Event *event); 45_inc_dec_button_clicked_cb(void *data, const Efl_Event *event);
46static void 46static void
47_inc_dec_button_pressed_cb(void *data, const Eo_Event *event); 47_inc_dec_button_pressed_cb(void *data, const Efl_Event *event);
48static void 48static void
49_inc_dec_button_unpressed_cb(void *data, const Eo_Event *event); 49_inc_dec_button_unpressed_cb(void *data, const Efl_Event *event);
50static void 50static void
51_inc_dec_button_mouse_move_cb(void *data, const Eo_Event *event); 51_inc_dec_button_mouse_move_cb(void *data, const Efl_Event *event);
52 52
53static const Elm_Action key_actions[] = { 53static const Elm_Action key_actions[] = {
54 {"spin", _key_action_spin}, 54 {"spin", _key_action_spin},
@@ -413,7 +413,7 @@ _entry_value_apply(Evas_Object *obj)
413} 413}
414 414
415static void 415static void
416_entry_activated_cb(void *data, const Eo_Event *event EINA_UNUSED) 416_entry_activated_cb(void *data, const Efl_Event *event EINA_UNUSED)
417{ 417{
418 _entry_value_apply(data); 418 _entry_value_apply(data);
419} 419}
@@ -831,7 +831,7 @@ _button_inc_dec_stop_cb(void *data,
831} 831}
832 832
833static void 833static void
834_inc_dec_button_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) 834_inc_dec_button_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED)
835{ 835{
836 ELM_SPINNER_DATA_GET(data, sd); 836 ELM_SPINNER_DATA_GET(data, sd);
837 837
@@ -845,7 +845,7 @@ _inc_dec_button_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
845} 845}
846 846
847static void 847static void
848_inc_dec_button_pressed_cb(void *data, const Eo_Event *event) 848_inc_dec_button_pressed_cb(void *data, const Efl_Event *event)
849{ 849{
850 ELM_SPINNER_DATA_GET(data, sd); 850 ELM_SPINNER_DATA_GET(data, sd);
851 851
@@ -862,7 +862,7 @@ _inc_dec_button_pressed_cb(void *data, const Eo_Event *event)
862} 862}
863 863
864static void 864static void
865_inc_dec_button_unpressed_cb(void *data, const Eo_Event *event EINA_UNUSED) 865_inc_dec_button_unpressed_cb(void *data, const Efl_Event *event EINA_UNUSED)
866{ 866{
867 ELM_SPINNER_DATA_GET(data, sd); 867 ELM_SPINNER_DATA_GET(data, sd);
868 868
@@ -876,13 +876,13 @@ _inc_dec_button_unpressed_cb(void *data, const Eo_Event *event EINA_UNUSED)
876} 876}
877 877
878static void 878static void
879_text_button_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) 879_text_button_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED)
880{ 880{
881 _toggle_entry(data); 881 _toggle_entry(data);
882} 882}
883 883
884static void 884static void
885_inc_dec_button_mouse_move_cb(void *data, const Eo_Event *event) 885_inc_dec_button_mouse_move_cb(void *data, const Efl_Event *event)
886{ 886{
887 Efl_Input_Pointer *ev = event->info; 887 Efl_Input_Pointer *ev = event->info;
888 ELM_SPINNER_DATA_GET(data, sd); 888 ELM_SPINNER_DATA_GET(data, sd);
diff --git a/src/lib/elementary/elm_store.c b/src/lib/elementary/elm_store.c
index 84aefebc1b..ec27b8905e 100644
--- a/src/lib/elementary/elm_store.c
+++ b/src/lib/elementary/elm_store.c
@@ -224,7 +224,7 @@ _store_item_eval(void *data)
224} 224}
225 225
226static void 226static void
227_store_genlist_item_realized(void *data, const Eo_Event *event) 227_store_genlist_item_realized(void *data, const Efl_Event *event)
228{ 228{
229 Elm_Store *st = data; 229 Elm_Store *st = data;
230 Elm_Object_Item *gli = event->info; 230 Elm_Object_Item *gli = event->info;
@@ -237,7 +237,7 @@ _store_genlist_item_realized(void *data, const Eo_Event *event)
237} 237}
238 238
239static void 239static void
240_store_genlist_item_unrealized(void *data, const Eo_Event *event) 240_store_genlist_item_unrealized(void *data, const Efl_Event *event)
241{ 241{
242 Elm_Store *st = data; 242 Elm_Store *st = data;
243 Elm_Object_Item *gli = event->info; 243 Elm_Object_Item *gli = event->info;
diff --git a/src/lib/elementary/elm_view_form.c b/src/lib/elementary/elm_view_form.c
index d6dd99312d..06d3d63041 100644
--- a/src/lib/elementary/elm_view_form.c
+++ b/src/lib/elementary/elm_view_form.c
@@ -92,7 +92,7 @@ _efl_model_promise_error_cb(void* data, Eina_Error error EINA_UNUSED)
92} 92}
93 93
94static void 94static void
95_efl_model_properties_change_cb(void *data, const Eo_Event *event) 95_efl_model_properties_change_cb(void *data, const Efl_Event *event)
96{ 96{
97 const Efl_Model_Property_Event *evt = event->info; 97 const Efl_Model_Property_Event *evt = event->info;
98 Eina_Promise *promise; 98 Eina_Promise *promise;
diff --git a/src/lib/elementary/elm_view_list.c b/src/lib/elementary/elm_view_list.c
index aed293d7f3..31407c3692 100644
--- a/src/lib/elementary/elm_view_list.c
+++ b/src/lib/elementary/elm_view_list.c
@@ -48,12 +48,12 @@ struct _View_List_ValueItem
48}; 48};
49 49
50static void _efl_model_load_children(View_List_ItemData *); 50static void _efl_model_load_children(View_List_ItemData *);
51static void _efl_model_children_count_change_cb(void *, const Eo_Event *event); 51static void _efl_model_children_count_change_cb(void *, const Efl_Event *event);
52static void _efl_model_properties_change_cb(void *, const Eo_Event *event); 52static void _efl_model_properties_change_cb(void *, const Efl_Event *event);
53 53
54static void _expand_request_cb(void *data EINA_UNUSED, const Eo_Event *event); 54static void _expand_request_cb(void *data EINA_UNUSED, const Efl_Event *event);
55static void _contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event); 55static void _contract_request_cb(void *data EINA_UNUSED, const Efl_Event *event);
56static void _contracted_cb(void *data EINA_UNUSED, const Eo_Event *event); 56static void _contracted_cb(void *data EINA_UNUSED, const Efl_Event *event);
57 57
58/* --- Genlist Callbacks --- */ 58/* --- Genlist Callbacks --- */
59EFL_CALLBACKS_ARRAY_DEFINE(model_callbacks, 59EFL_CALLBACKS_ARRAY_DEFINE(model_callbacks,
@@ -243,7 +243,7 @@ _item_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part)
243} 243}
244 244
245static void 245static void
246_expand_request_cb(void *data EINA_UNUSED, const Eo_Event *event) 246_expand_request_cb(void *data EINA_UNUSED, const Efl_Event *event)
247{ 247{
248 Elm_Object_Item *item = event->info; 248 Elm_Object_Item *item = event->info;
249 View_List_ItemData *idata = elm_object_item_data_get(item); 249 View_List_ItemData *idata = elm_object_item_data_get(item);
@@ -256,7 +256,7 @@ _expand_request_cb(void *data EINA_UNUSED, const Eo_Event *event)
256} 256}
257 257
258static void 258static void
259_contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event) 259_contract_request_cb(void *data EINA_UNUSED, const Efl_Event *event)
260{ 260{
261 Elm_Object_Item *item = event->info; 261 Elm_Object_Item *item = event->info;
262 View_List_ItemData *idata = elm_object_item_data_get(item); 262 View_List_ItemData *idata = elm_object_item_data_get(item);
@@ -266,7 +266,7 @@ _contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event)
266} 266}
267 267
268static void 268static void
269_contracted_cb(void *data EINA_UNUSED, const Eo_Event *event) 269_contracted_cb(void *data EINA_UNUSED, const Efl_Event *event)
270{ 270{
271 Elm_Object_Item *glit = event->info; 271 Elm_Object_Item *glit = event->info;
272 elm_genlist_item_subitems_clear(glit); 272 elm_genlist_item_subitems_clear(glit);
@@ -287,7 +287,7 @@ _genlist_deleted(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_
287 287
288/* --- Efl_Model Callbacks --- */ 288/* --- Efl_Model Callbacks --- */
289static void 289static void
290_efl_model_properties_change_cb(void *data, const Eo_Event *event) 290_efl_model_properties_change_cb(void *data, const Efl_Event *event)
291{ 291{
292 View_List_ItemData *idata = data; 292 View_List_ItemData *idata = data;
293 Efl_Model_Property_Event *evt = event->info; 293 Efl_Model_Property_Event *evt = event->info;
@@ -339,7 +339,7 @@ _efl_model_load_children(View_List_ItemData *pdata)
339} 339}
340 340
341static void 341static void
342_efl_model_children_count_change_cb(void *data, const Eo_Event *event EINA_UNUSED) 342_efl_model_children_count_change_cb(void *data, const Efl_Event *event EINA_UNUSED)
343{ 343{
344 View_List_ItemData *idata = data; 344 View_List_ItemData *idata = data;
345 EINA_SAFETY_ON_NULL_RETURN(idata); 345 EINA_SAFETY_ON_NULL_RETURN(idata);
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 136d67f9db..618c735651 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -102,11 +102,11 @@ _elm_scrollable_is(const Evas_Object *obj)
102static void 102static void
103elm_widget_disabled_internal(Eo *obj, Eina_Bool disabled); 103elm_widget_disabled_internal(Eo *obj, Eina_Bool disabled);
104static void 104static void
105_on_sub_obj_del(void *data, const Eo_Event *event); 105_on_sub_obj_del(void *data, const Efl_Event *event);
106static void 106static void
107_on_sub_obj_hide(void *data, const Eo_Event *event); 107_on_sub_obj_hide(void *data, const Efl_Event *event);
108static void 108static void
109_propagate_event(void *data, const Eo_Event *event); 109_propagate_event(void *data, const Efl_Event *event);
110 110
111EFL_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks, 111EFL_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks,
112 { EFL_EVENT_DEL, _on_sub_obj_del }, 112 { EFL_EVENT_DEL, _on_sub_obj_del },
@@ -249,13 +249,13 @@ _parents_unfocus(Evas_Object *obj)
249} 249}
250 250
251static void 251static void
252_on_sub_obj_hide(void *data EINA_UNUSED, const Eo_Event *event) 252_on_sub_obj_hide(void *data EINA_UNUSED, const Efl_Event *event)
253{ 253{
254 elm_widget_focus_hide_handle(event->object); 254 elm_widget_focus_hide_handle(event->object);
255} 255}
256 256
257static void 257static void
258_on_sub_obj_del(void *data, const Eo_Event *event) 258_on_sub_obj_del(void *data, const Efl_Event *event)
259{ 259{
260 ELM_WIDGET_DATA_GET_OR_RETURN(data, sd); 260 ELM_WIDGET_DATA_GET_OR_RETURN(data, sd);
261 261
@@ -715,7 +715,7 @@ _propagate_y_drag_lock(Evas_Object *obj,
715} 715}
716 716
717static void 717static void
718_propagate_event(void *data EINA_UNUSED, const Eo_Event *event) 718_propagate_event(void *data EINA_UNUSED, const Efl_Event *event)
719{ 719{
720 Eo *obj = event->object; 720 Eo *obj = event->object;
721 INTERNAL_ENTRY; 721 INTERNAL_ENTRY;
@@ -4432,14 +4432,14 @@ _track_obj_update(Evas_Object *track, Evas_Object *obj)
4432} 4432}
4433 4433
4434static void 4434static void
4435_track_obj_view_update(void *data, const Eo_Event *event) 4435_track_obj_view_update(void *data, const Efl_Event *event)
4436{ 4436{
4437 Elm_Widget_Item_Data *item = data; 4437 Elm_Widget_Item_Data *item = data;
4438 _track_obj_update(item->track_obj, event->object); 4438 _track_obj_update(item->track_obj, event->object);
4439} 4439}
4440 4440
4441static void 4441static void
4442_track_obj_view_del(void *data, const Eo_Event *event); 4442_track_obj_view_del(void *data, const Efl_Event *event);
4443 4443
4444EFL_CALLBACKS_ARRAY_DEFINE(tracker_callbacks, 4444EFL_CALLBACKS_ARRAY_DEFINE(tracker_callbacks,
4445 { EFL_GFX_EVENT_RESIZE, _track_obj_view_update }, 4445 { EFL_GFX_EVENT_RESIZE, _track_obj_view_update },
@@ -4449,7 +4449,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(tracker_callbacks,
4449 { EFL_EVENT_DEL, _track_obj_view_del }); 4449 { EFL_EVENT_DEL, _track_obj_view_del });
4450 4450
4451static void 4451static void
4452_track_obj_view_del(void *data, const Eo_Event *event EINA_UNUSED) 4452_track_obj_view_del(void *data, const Efl_Event *event EINA_UNUSED)
4453{ 4453{
4454 Elm_Widget_Item_Data *item = data; 4454 Elm_Widget_Item_Data *item = data;
4455 4455
@@ -4510,7 +4510,7 @@ _elm_widget_item_signal_callback_list_get(Elm_Widget_Item_Data *item, Eina_List
4510#define ERR_NOT_SUPPORTED(item, method) ERR("%s does not support %s API.", elm_widget_type_get(item->widget), method); 4510#define ERR_NOT_SUPPORTED(item, method) ERR("%s does not support %s API.", elm_widget_type_get(item->widget), method);
4511 4511
4512static void 4512static void
4513_efl_del_cb(void *data EINA_UNUSED, const Eo_Event *event) 4513_efl_del_cb(void *data EINA_UNUSED, const Efl_Event *event)
4514{ 4514{
4515 Elm_Widget_Item_Data *item = efl_data_scope_get(event->object, ELM_WIDGET_ITEM_CLASS); 4515 Elm_Widget_Item_Data *item = efl_data_scope_get(event->object, ELM_WIDGET_ITEM_CLASS);
4516 ELM_WIDGET_ITEM_CHECK_OR_RETURN(item); 4516 ELM_WIDGET_ITEM_CHECK_OR_RETURN(item);
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index 5523cd1122..549cb0e889 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -86,7 +86,7 @@ extern "C" {
86 * 86 *
87 * @li @ref Efl_Class_Base 87 * @li @ref Efl_Class_Base
88 * @li @ref Efl_Class 88 * @li @ref Efl_Class
89 * @li @ref Eo_Events 89 * @li @ref Efl_Events
90 * @li @ref Eo_Composite_Objects 90 * @li @ref Eo_Composite_Objects
91 * 91 *
92 * @section eo_main_intro_example Introductory Example 92 * @section eo_main_intro_example Introductory Example
@@ -252,7 +252,7 @@ typedef unsigned int Efl_Object_Op;
252#define EFL_NOOP ((Efl_Object_Op) 0) 252#define EFL_NOOP ((Efl_Object_Op) 0)
253 253
254/** 254/**
255 * @addtogroup Eo_Events Eo's Event Handling 255 * @addtogroup Efl_Events Eo's Event Handling
256 * @{ 256 * @{
257 */ 257 */
258 258
@@ -1041,7 +1041,7 @@ typedef void (*efl_key_data_free_func)(void *);
1041#define efl_wref_del_safe(wref) efl_weak_unref(wref) 1041#define efl_wref_del_safe(wref) efl_weak_unref(wref)
1042 1042
1043/** 1043/**
1044 * @addtogroup Eo_Events Eo's Event Handling 1044 * @addtogroup Efl_Events Eo's Event Handling
1045 * @{ 1045 * @{
1046 */ 1046 */
1047 1047
diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo
index 74355dd334..8c4586351d 100644
--- a/src/lib/eo/efl_object.eo
+++ b/src/lib/eo/efl_object.eo
@@ -8,7 +8,7 @@ struct Efl.Event.Description {
8 restart: bool; [[Eina_True if when the event is triggered again from a callback, it should start from where it was]] 8 restart: bool; [[Eina_True if when the event is triggered again from a callback, it should start from where it was]]
9} 9}
10 10
11struct Eo.Event { 11struct Efl.Event {
12 [[Parameter passed in event callbacks holding extra event parameters]] 12 [[Parameter passed in event callbacks holding extra event parameters]]
13 object: Efl.Object; [[The object the event was called on.]] 13 object: Efl.Object; [[The object the event was called on.]]
14 desc: ref(const(Efl.Event.Description)); [[The event description.]] 14 desc: ref(const(Efl.Event.Description)); [[The event description.]]
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index 8ba4d700bc..a5b74cb73f 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -91,7 +91,7 @@ _efl_object_extension_noneed(Efl_Object_Data *pd)
91 pd->ext = NULL; 91 pd->ext = NULL;
92} 92}
93 93
94static void _key_generic_cb_del(void *data, const Eo_Event *event); 94static void _key_generic_cb_del(void *data, const Efl_Event *event);
95 95
96static void 96static void
97_eo_generic_data_node_free(Eo_Generic_Data_Node *node) 97_eo_generic_data_node_free(Eo_Generic_Data_Node *node)
@@ -238,7 +238,7 @@ _key_generic_get(const Eo *obj, Efl_Object_Data *pd, const char *key, Eo_Generic
238} 238}
239 239
240static void 240static void
241_key_generic_cb_del(void *data, const Eo_Event *event EINA_UNUSED) 241_key_generic_cb_del(void *data, const Efl_Event *event EINA_UNUSED)
242{ 242{
243 Eo_Generic_Data_Node *node = data; 243 Eo_Generic_Data_Node *node = data;
244 Efl_Object_Data *pd = efl_data_scope_get(node->obj, EFL_OBJECT_CLASS); 244 Efl_Object_Data *pd = efl_data_scope_get(node->obj, EFL_OBJECT_CLASS);
@@ -1135,7 +1135,7 @@ _event_callback_call(Eo *obj_id, Efl_Object_Data *pd,
1135 Eo_Callback_Description *cb; 1135 Eo_Callback_Description *cb;
1136 Eo_Current_Callback_Description *lookup = NULL; 1136 Eo_Current_Callback_Description *lookup = NULL;
1137 Eo_Current_Callback_Description saved; 1137 Eo_Current_Callback_Description saved;
1138 Eo_Event ev; 1138 Efl_Event ev;
1139 1139
1140 ev.object = obj_id; 1140 ev.object = obj_id;
1141 ev.desc = desc; 1141 ev.desc = desc;
@@ -1266,7 +1266,7 @@ _efl_object_event_callback_stop(Eo *obj EINA_UNUSED, Efl_Object_Data *pd)
1266} 1266}
1267 1267
1268static void 1268static void
1269_efl_event_forwarder_callback(void *data, const Eo_Event *event) 1269_efl_event_forwarder_callback(void *data, const Efl_Event *event)
1270{ 1270{
1271 Eo *new_obj = (Eo *) data; 1271 Eo *new_obj = (Eo *) data;
1272 Eina_Bool ret = EINA_FALSE; 1272 Eina_Bool ret = EINA_FALSE;
diff --git a/src/lib/eolian/database_type.c b/src/lib/eolian/database_type.c
index 8bc8b02524..f55d772fd1 100644
--- a/src/lib/eolian/database_type.c
+++ b/src/lib/eolian/database_type.c
@@ -203,7 +203,7 @@ _atype_to_str(const Eolian_Typedecl *tp, Eina_Strbuf *buf)
203 { 203 {
204 eina_strbuf_append(buf, "void (*"); 204 eina_strbuf_append(buf, "void (*");
205 _append_name(tp, buf); 205 _append_name(tp, buf);
206 eina_strbuf_append(buf, ")(void *data, const Eo_Event *event)"); 206 eina_strbuf_append(buf, ")(void *data, const Efl_Event *event)");
207 return; 207 return;
208 } 208 }
209 209
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index b1cc71d12c..7fd6ff1d31 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -153,7 +153,7 @@ _evas_event_efl_event_info_type(Evas_Callback_Type type)
153} 153}
154 154
155static void 155static void
156_eo_evas_object_cb(void *data, const Eo_Event *event) 156_eo_evas_object_cb(void *data, const Efl_Event *event)
157{ 157{
158 Evas_Event_Flags *event_flags = NULL, evflags = EVAS_EVENT_FLAG_NONE; 158 Evas_Event_Flags *event_flags = NULL, evflags = EVAS_EVENT_FLAG_NONE;
159 Efl_Input_Event *efl_event_info = event->info; 159 Efl_Input_Event *efl_event_info = event->info;
@@ -195,7 +195,7 @@ _eo_evas_object_cb(void *data, const Eo_Event *event)
195} 195}
196 196
197static void 197static void
198_eo_evas_cb(void *data, const Eo_Event *event) 198_eo_evas_cb(void *data, const Efl_Event *event)
199{ 199{
200 _eo_evas_cb_info *info = data; 200 _eo_evas_cb_info *info = data;
201 if (info->func) info->func(info->data, event->object, event->info); 201 if (info->func) info->func(info->data, event->object, event->info);
@@ -585,7 +585,7 @@ evas_post_event_callback_remove_full(Evas *eo_e, Evas_Object_Event_Post_Cb func,
585} 585}
586 586
587static void 587static void
588_animator_repeater(void *data, const Eo_Event *event) 588_animator_repeater(void *data, const Efl_Event *event)
589{ 589{
590 Evas_Object_Protected_Data *obj = data; 590 Evas_Object_Protected_Data *obj = data;
591 591
@@ -594,7 +594,7 @@ _animator_repeater(void *data, const Eo_Event *event)
594} 594}
595 595
596static void 596static void
597_check_event_catcher_add(void *data, const Eo_Event *event) 597_check_event_catcher_add(void *data, const Efl_Event *event)
598{ 598{
599 const Efl_Callback_Array_Item *array = event->info; 599 const Efl_Callback_Array_Item *array = event->info;
600 Evas_Object_Protected_Data *obj = data; 600 Evas_Object_Protected_Data *obj = data;
@@ -619,7 +619,7 @@ _check_event_catcher_add(void *data, const Eo_Event *event)
619} 619}
620 620
621static void 621static void
622_check_event_catcher_del(void *data, const Eo_Event *event) 622_check_event_catcher_del(void *data, const Efl_Event *event)
623{ 623{
624 const Efl_Callback_Array_Item *array = event->info; 624 const Efl_Callback_Array_Item *array = event->info;
625 Evas_Object_Protected_Data *obj = data; 625 Evas_Object_Protected_Data *obj = data;
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c
index b6439fc34a..f7be7e5536 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.c
+++ b/src/lib/evas/canvas/evas_canvas3d_node.c
@@ -51,7 +51,7 @@ _generate_unic_color_key(Evas_Color *color, Evas_Color *bg_color, Evas_Canvas3D_
51} 51}
52 52
53static void 53static void
54_evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event) 54_evas_canvas3d_node_private_callback_collision(void *data, const Efl_Event *event)
55{ 55{
56 Eina_List *collision_list = NULL, *l = NULL; 56 Eina_List *collision_list = NULL, *l = NULL;
57 Evas_Canvas3D_Node *target_node = NULL, *n = NULL; 57 Evas_Canvas3D_Node *target_node = NULL, *n = NULL;
@@ -82,7 +82,7 @@ _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event
82 } 82 }
83} 83}
84static void 84static void
85_evas_canvas3d_node_private_callback_clicked(void *data EINA_UNUSED, const Eo_Event *event) 85_evas_canvas3d_node_private_callback_clicked(void *data EINA_UNUSED, const Efl_Event *event)
86{ 86{
87 Eina_Bool ret = EINA_FALSE; 87 Eina_Bool ret = EINA_FALSE;
88 const Efl_Event_Description *eo_desc = efl_object_legacy_only_event_description_get("clicked"); 88 const Efl_Event_Description *eo_desc = efl_object_legacy_only_event_description_get("clicked");
diff --git a/src/lib/evas/canvas/evas_canvas3d_node_callback.h b/src/lib/evas/canvas/evas_canvas3d_node_callback.h
index 7167217077..d310ade12a 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node_callback.h
+++ b/src/lib/evas/canvas/evas_canvas3d_node_callback.h
@@ -24,9 +24,9 @@ const Efl_Event_Description evas_canvas3d_node_private_event_desc[] =
24 24
25/*Private callbacks */ 25/*Private callbacks */
26static void 26static void
27_evas_canvas3d_node_private_callback_clicked(void *data, const Eo_Event *event); 27_evas_canvas3d_node_private_callback_clicked(void *data, const Efl_Event *event);
28static void 28static void
29_evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event); 29_evas_canvas3d_node_private_callback_collision(void *data, const Efl_Event *event);
30 30
31Efl_Event_Cb evas_canvas3d_node_private_callback_functions[] = 31Efl_Event_Cb evas_canvas3d_node_private_callback_functions[] =
32{ 32{
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index 500241545d..0ff74d9bce 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -213,7 +213,7 @@ _efl_canvas_object_clip_mask_unset(Evas_Object_Protected_Data *obj)
213extern const char *o_rect_type; 213extern const char *o_rect_type;
214extern const char *o_image_type; 214extern const char *o_image_type;
215 215
216static void _clipper_del_cb(void *data, const Eo_Event *event); 216static void _clipper_del_cb(void *data, const Efl_Event *event);
217 217
218EOLIAN void 218EOLIAN void
219_efl_canvas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_clip) 219_efl_canvas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_clip)
@@ -480,7 +480,7 @@ _efl_canvas_object_clip_unset(Eo *eo_obj, Evas_Object_Protected_Data *obj)
480} 480}
481 481
482static void 482static void
483_clipper_del_cb(void *data, const Eo_Event *event) 483_clipper_del_cb(void *data, const Efl_Event *event)
484{ 484{
485 Evas_Object *eo_obj = data; 485 Evas_Object *eo_obj = data;
486 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 486 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
diff --git a/src/lib/evas/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c
index 0b9a438d78..228009fa87 100644
--- a/src/lib/evas/canvas/evas_device.c
+++ b/src/lib/evas/canvas/evas_device.c
@@ -25,7 +25,7 @@
25 */ 25 */
26 26
27static void 27static void
28_del_cb(void *data, const Eo_Event *ev) 28_del_cb(void *data, const Efl_Event *ev)
29{ 29{
30 Evas_Public_Data *e = data; 30 Evas_Public_Data *e = data;
31 31
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index b390c609a4..1238d51df1 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -3350,7 +3350,7 @@ _evas_canvas_event_down_count_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e)
3350} 3350}
3351 3351
3352static void 3352static void
3353_evas_canvas_event_pointer_cb(void *data, const Eo_Event *event) 3353_evas_canvas_event_pointer_cb(void *data, const Efl_Event *event)
3354{ 3354{
3355 Efl_Input_Pointer_Data *ev = efl_data_scope_get(event->info, EFL_INPUT_POINTER_CLASS); 3355 Efl_Input_Pointer_Data *ev = efl_data_scope_get(event->info, EFL_INPUT_POINTER_CLASS);
3356 Evas_Public_Data *e = data; 3356 Evas_Public_Data *e = data;
@@ -3422,7 +3422,7 @@ _evas_canvas_event_pointer_cb(void *data, const Eo_Event *event)
3422} 3422}
3423 3423
3424static void 3424static void
3425_evas_canvas_event_key_cb(void *data, const Eo_Event *event) 3425_evas_canvas_event_key_cb(void *data, const Efl_Event *event)
3426{ 3426{
3427 Efl_Input_Key *evt = event->info; 3427 Efl_Input_Key *evt = event->info;
3428 Evas_Public_Data *e = data; 3428 Evas_Public_Data *e = data;
diff --git a/src/lib/evas/canvas/evas_filter_mixin.c b/src/lib/evas/canvas/evas_filter_mixin.c
index c918cb5f02..5d810e5e89 100644
--- a/src/lib/evas/canvas/evas_filter_mixin.c
+++ b/src/lib/evas/canvas/evas_filter_mixin.c
@@ -73,7 +73,7 @@ _filter_end_sync(Evas_Filter_Context *ctx, Evas_Object_Protected_Data *obj,
73} 73}
74 74
75static void 75static void
76_render_post_cb(void *data, const Eo_Event *event EINA_UNUSED) 76_render_post_cb(void *data, const Efl_Event *event EINA_UNUSED)
77{ 77{
78 Eo *eo_obj = data; 78 Eo *eo_obj = data;
79 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 79 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index bb69385342..051c5e5cb1 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -110,7 +110,7 @@ _evas_object_box_accessor_free(Evas_Object_Box_Accessor *it)
110} 110}
111 111
112static void 112static void
113_on_child_resize(void *data, const Eo_Event *event EINA_UNUSED) 113_on_child_resize(void *data, const Efl_Event *event EINA_UNUSED)
114{ 114{
115 Evas_Object *box = data; 115 Evas_Object *box = data;
116 EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(box, priv); 116 EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(box, priv);
@@ -118,7 +118,7 @@ _on_child_resize(void *data, const Eo_Event *event EINA_UNUSED)
118} 118}
119 119
120static void 120static void
121_on_child_del(void *data, const Eo_Event *event) 121_on_child_del(void *data, const Efl_Event *event)
122{ 122{
123 Evas_Object *box = data; 123 Evas_Object *box = data;
124 124
@@ -130,7 +130,7 @@ _on_child_del(void *data, const Eo_Event *event)
130} 130}
131 131
132static void 132static void
133_on_child_hints_changed(void *data, const Eo_Event *event EINA_UNUSED) 133_on_child_hints_changed(void *data, const Efl_Event *event EINA_UNUSED)
134{ 134{
135 Evas_Object *box = data; 135 Evas_Object *box = data;
136 EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(box, priv); 136 EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(box, priv);
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 1efa864c22..ccd4d2b9a8 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -64,7 +64,7 @@ struct _Evas_Object_Smart_Iterator
64}; 64};
65 65
66static void 66static void
67_eo_evas_smart_cb(void *data, const Eo_Event *event) 67_eo_evas_smart_cb(void *data, const Efl_Event *event)
68{ 68{
69 _eo_evas_smart_cb_info *info = data; 69 _eo_evas_smart_cb_info *info = data;
70 if (info->func) info->func(info->data, event->object, event->info); 70 if (info->func) info->func(info->data, event->object, event->info);
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index e7b3bb073d..d294ba5644 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -249,14 +249,14 @@ _evas_object_table_option_del(Evas_Object *o)
249} 249}
250 250
251static void 251static void
252_on_child_del(void *data, const Eo_Event *event) 252_on_child_del(void *data, const Efl_Event *event)
253{ 253{
254 Evas_Object *table = data; 254 Evas_Object *table = data;
255 evas_object_table_unpack(table, event->object); 255 evas_object_table_unpack(table, event->object);
256} 256}
257 257
258static void 258static void
259_on_child_hints_changed(void *data, const Eo_Event *event EINA_UNUSED) 259_on_child_hints_changed(void *data, const Efl_Event *event EINA_UNUSED)
260{ 260{
261 Evas_Object *table = data; 261 Evas_Object *table = data;
262 EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN(table, priv); 262 EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN(table, priv);
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 330e3249bd..6d5e28eed6 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -7612,7 +7612,7 @@ _obstacle_find(Efl_Canvas_Text_Data *obj, Eo *eo_obs)
7612} 7612}
7613 7613
7614void 7614void
7615_obstacle_del_cb(void *data, const Eo_Event *event) 7615_obstacle_del_cb(void *data, const Efl_Event *event)
7616{ 7616{
7617 Eo *eo_obj = data; 7617 Eo *eo_obj = data;
7618 Efl_Canvas_Text_Data *obj = efl_data_scope_get(eo_obj, MY_CLASS); 7618 Efl_Canvas_Text_Data *obj = efl_data_scope_get(eo_obj, MY_CLASS);
diff --git a/src/lib/evas/canvas/evas_object_vg.c b/src/lib/evas/canvas/evas_object_vg.c
index ccc247ee8c..5617f9f5ad 100644
--- a/src/lib/evas/canvas/evas_object_vg.c
+++ b/src/lib/evas/canvas/evas_object_vg.c
@@ -81,7 +81,7 @@ _evas_vg_root_node_get(Eo *obj EINA_UNUSED, Evas_VG_Data *pd)
81} 81}
82 82
83static void 83static void
84_cleanup_reference(void *data, const Eo_Event *event EINA_UNUSED) 84_cleanup_reference(void *data, const Efl_Event *event EINA_UNUSED)
85{ 85{
86 Evas_VG_Data *pd = data; 86 Evas_VG_Data *pd = data;
87 Eo *renderer; 87 Eo *renderer;
diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index d0db81eec5..5c6e3c7378 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -18,7 +18,7 @@ static const Efl_VG_Interpolation interpolation_identity = {
18}; 18};
19 19
20static void 20static void
21_efl_vg_property_changed(void *data, const Eo_Event *event) 21_efl_vg_property_changed(void *data, const Efl_Event *event)
22{ 22{
23 Efl_VG_Data *pd = data; 23 Efl_VG_Data *pd = data;
24 Eo *parent; 24 Eo *parent;
diff --git a/src/lib/evas/canvas/evas_vg_root_node.c b/src/lib/evas/canvas/evas_vg_root_node.c
index 8e2d1b0cad..a192d78d0c 100644
--- a/src/lib/evas/canvas/evas_vg_root_node.c
+++ b/src/lib/evas/canvas/evas_vg_root_node.c
@@ -33,7 +33,7 @@ _evas_vg_root_node_render_pre(Eo *obj EINA_UNUSED,
33} 33}
34 34
35static void 35static void
36_evas_vg_root_node_changed(void *data, const Eo_Event *event) 36_evas_vg_root_node_changed(void *data, const Efl_Event *event)
37{ 37{
38 Efl_VG_Root_Node_Data *pd = data; 38 Efl_VG_Root_Node_Data *pd = data;
39 Efl_VG_Data *bd = efl_data_scope_get(event->object, EFL_VG_CLASS); 39 Efl_VG_Data *bd = efl_data_scope_get(event->object, EFL_VG_CLASS);