summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/benchmarks/eo/eo_bench_callbacks.c2
-rw-r--r--src/bin/elementary/test.c4
-rw-r--r--src/bin/elementary/test_anim.c2
-rw-r--r--src/bin/elementary/test_application_server.c12
-rw-r--r--src/bin/elementary/test_code.c4
-rw-r--r--src/bin/elementary/test_entry.c4
-rw-r--r--src/bin/elementary/test_events.c16
-rw-r--r--src/bin/elementary/test_grid_static.c6
-rw-r--r--src/bin/elementary/test_task_switcher.c4
-rw-r--r--src/bin/elementary/test_ui_box.c24
-rw-r--r--src/bin/elementary/test_ui_grid.c20
-rw-r--r--src/bin/elementary/test_win_plug.c2
-rw-r--r--src/examples/ecore/ecore_audio_playback.c2
-rw-r--r--src/examples/ecore/ecore_audio_to_ogg.c2
-rw-r--r--src/examples/ecore/efl_io_copier_example.c28
-rw-r--r--src/examples/ecore/efl_io_copier_simple_example.c4
-rw-r--r--src/examples/ecore/efl_io_queue_example.c8
-rw-r--r--src/examples/ecore/efl_net_dialer_http_example.c14
-rw-r--r--src/examples/ecore/efl_net_server_example.c28
-rw-r--r--src/examples/eio/efl_io_manager_ls.c2
-rw-r--r--src/examples/eio/eio_sentry.c2
-rw-r--r--src/examples/elementary/filemvc.c4
-rw-r--r--src/examples/emotion/emotion_basic_example.c2
-rw-r--r--src/examples/emotion/emotion_border_example.c12
-rw-r--r--src/examples/emotion/emotion_generic_example.c12
-rw-r--r--src/examples/emotion/emotion_generic_subtitle_example.c2
-rw-r--r--src/examples/emotion/emotion_signals_example.c14
-rw-r--r--src/examples/evas/evas-3d-shadows.c4
-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
-rw-r--r--src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c8
-rw-r--r--src/modules/elementary/prefs/elm_button.c2
-rw-r--r--src/modules/elementary/prefs/elm_check.c2
-rw-r--r--src/modules/elementary/prefs/elm_datetime.c2
-rw-r--r--src/modules/elementary/prefs/elm_entry.c2
-rw-r--r--src/modules/elementary/prefs/elm_slider.c2
-rw-r--r--src/modules/elementary/prefs/elm_spinner.c2
-rw-r--r--src/modules/ethumb/emotion/emotion.c6
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_preload.c2
-rw-r--r--src/tests/ecore/ecore_test_args.c6
-rw-r--r--src/tests/ecore/ecore_test_ecore.c4
-rw-r--r--src/tests/ecore/ecore_test_ecore_audio.c6
-rw-r--r--src/tests/ecore/ecore_test_timer.c4
-rw-r--r--src/tests/eio/eio_model_test_monitor_add.c4
-rw-r--r--src/tests/eio/eio_test_manager.c4
-rw-r--r--src/tests/eio/eio_test_manager_xattr.c2
-rw-r--r--src/tests/eio/eio_test_sentry.c6
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model.c2
-rw-r--r--src/tests/elementary/elm_test_genlist.c2
-rw-r--r--src/tests/elementary/elm_test_image.c4
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c28
-rw-r--r--src/tests/eo/composite_objects/composite_objects_main.c2
-rw-r--r--src/tests/eo/signals/signals_main.c8
-rw-r--r--src/tests/eo/signals/signals_simple.c4
-rw-r--r--src/tests/eo/suite/eo_test_general.c12
-rw-r--r--src/tests/eolian/data/typedef_ref.c2
-rw-r--r--src/tests/eolian/data/typedef_ref_stub.c2
141 files changed, 529 insertions, 529 deletions
diff --git a/src/benchmarks/eo/eo_bench_callbacks.c b/src/benchmarks/eo/eo_bench_callbacks.c
index 1846a707c8..9cca977776 100644
--- a/src/benchmarks/eo/eo_bench_callbacks.c
+++ b/src/benchmarks/eo/eo_bench_callbacks.c
@@ -7,7 +7,7 @@
7#include "class_simple.h" 7#include "class_simple.h"
8 8
9static void 9static void
10_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 10_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
11{ 11{
12} 12}
13 13
diff --git a/src/bin/elementary/test.c b/src/bin/elementary/test.c
index a27cd20bce..a1d7a7064f 100644
--- a/src/bin/elementary/test.c
+++ b/src/bin/elementary/test.c
@@ -1053,7 +1053,7 @@ colorclass_list_cb(void)
1053 1053
1054static void 1054static void
1055_main_loop_death(void *data EINA_UNUSED, 1055_main_loop_death(void *data EINA_UNUSED,
1056 const Eo_Event *ev EINA_UNUSED) 1056 const Efl_Event *ev EINA_UNUSED)
1057{ 1057{
1058 struct elm_test *t; 1058 struct elm_test *t;
1059 1059
@@ -1068,7 +1068,7 @@ _main_loop_death(void *data EINA_UNUSED,
1068 * efl_main and not be static - must be a visible symbol with EAPI_MAIN infront */ 1068 * efl_main and not be static - must be a visible symbol with EAPI_MAIN infront */
1069EAPI_MAIN void 1069EAPI_MAIN void
1070efl_main(void *data EINA_UNUSED, 1070efl_main(void *data EINA_UNUSED,
1071 const Eo_Event *ev) 1071 const Efl_Event *ev)
1072{ 1072{
1073 Efl_Loop_Arguments *arge = ev->info; 1073 Efl_Loop_Arguments *arge = ev->info;
1074 Eina_Bool test_win_only = EINA_FALSE; 1074 Eina_Bool test_win_only = EINA_FALSE;
diff --git a/src/bin/elementary/test_anim.c b/src/bin/elementary/test_anim.c
index cc1b9abe7c..4bcf1581ab 100644
--- a/src/bin/elementary/test_anim.c
+++ b/src/bin/elementary/test_anim.c
@@ -11,7 +11,7 @@ static const char *names[] =
11}; 11};
12 12
13static void 13static void
14_anim_tick(void *data EINA_UNUSED, const Eo_Event *event) 14_anim_tick(void *data EINA_UNUSED, const Efl_Event *event)
15{ 15{
16 Evas_Object *bub, *sh; 16 Evas_Object *bub, *sh;
17 Evas_Coord x, y, w, h, vw, vh; 17 Evas_Coord x, y, w, h, vw, vh;
diff --git a/src/bin/elementary/test_application_server.c b/src/bin/elementary/test_application_server.c
index 941e5d9b32..25b9b9d8db 100644
--- a/src/bin/elementary/test_application_server.c
+++ b/src/bin/elementary/test_application_server.c
@@ -40,7 +40,7 @@ _window_create(App_View_Context *ctx)
40} 40}
41 41
42static void 42static void
43_close_cb(void *data, const Eo_Event *event) 43_close_cb(void *data, const Efl_Event *event)
44{ 44{
45 App_View_Context *ctx = data; 45 App_View_Context *ctx = data;
46 if (ctx->win) 46 if (ctx->win)
@@ -49,14 +49,14 @@ _close_cb(void *data, const Eo_Event *event)
49} 49}
50 50
51static void 51static void
52_pause_cb(void *data, const Eo_Event *event EINA_UNUSED) 52_pause_cb(void *data, const Efl_Event *event EINA_UNUSED)
53{ 53{
54 App_View_Context *ctx = data; 54 App_View_Context *ctx = data;
55 _text_update(ctx, "paused"); 55 _text_update(ctx, "paused");
56} 56}
57 57
58static void 58static void
59_resume_cb(void *data, const Eo_Event *event) 59_resume_cb(void *data, const Efl_Event *event)
60{ 60{
61 App_View_Context *ctx = data; 61 App_View_Context *ctx = data;
62 62
@@ -71,7 +71,7 @@ _resume_cb(void *data, const Eo_Event *event)
71} 71}
72 72
73static void 73static void
74_view_del_cb(void *data, const Eo_Event *event) 74_view_del_cb(void *data, const Efl_Event *event)
75{ 75{
76 App_View_Context *ctx = data; 76 App_View_Context *ctx = data;
77 77
@@ -117,7 +117,7 @@ _create_view_cb(Elm_App_Server *app_server, const Eina_Value *args EINA_UNUSED,
117} 117}
118 118
119static void 119static void
120_terminate_cb(void *data EINA_UNUSED, const Eo_Event *event) 120_terminate_cb(void *data EINA_UNUSED, const Efl_Event *event)
121{ 121{
122 const char *title = NULL; 122 const char *title = NULL;
123 123
@@ -163,7 +163,7 @@ test_application_server_common(const char *pkg)
163} 163}
164 164
165static void 165static void
166_server_del_cb(void *data, const Eo_Event *event EINA_UNUSED) 166_server_del_cb(void *data, const Efl_Event *event EINA_UNUSED)
167{ 167{
168 Elm_App_Server **server = data; 168 Elm_App_Server **server = data;
169 *server = NULL; 169 *server = NULL;
diff --git a/src/bin/elementary/test_code.c b/src/bin/elementary/test_code.c
index a8d24bbc73..fdebe92196 100644
--- a/src/bin/elementary/test_code.c
+++ b/src/bin/elementary/test_code.c
@@ -24,7 +24,7 @@ static void _append_line(Elm_Code_File *file, const char *line)
24} 24}
25 25
26static void 26static void
27_elm_code_test_line_clicked_cb(void *data EINA_UNUSED, const Eo_Event *event) 27_elm_code_test_line_clicked_cb(void *data EINA_UNUSED, const Efl_Event *event)
28{ 28{
29 Elm_Code_Line *line; 29 Elm_Code_Line *line;
30 30
@@ -34,7 +34,7 @@ _elm_code_test_line_clicked_cb(void *data EINA_UNUSED, const Eo_Event *event)
34} 34}
35 35
36static void 36static void
37_elm_code_test_line_done_cb(void *data EINA_UNUSED, const Eo_Event *event) 37_elm_code_test_line_done_cb(void *data EINA_UNUSED, const Efl_Event *event)
38{ 38{
39 Elm_Code_Line *line; 39 Elm_Code_Line *line;
40 40
diff --git a/src/bin/elementary/test_entry.c b/src/bin/elementary/test_entry.c
index f3983f5afe..7e4eb5bdda 100644
--- a/src/bin/elementary/test_entry.c
+++ b/src/bin/elementary/test_entry.c
@@ -369,7 +369,7 @@ _end_hide_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU
369} 369}
370 370
371static void 371static void
372_context_menu_show_cb(void *data EINA_UNUSED, const Eo_Event *event) 372_context_menu_show_cb(void *data EINA_UNUSED, const Efl_Event *event)
373{ 373{
374 elm_entry_context_menu_clear(event->object); 374 elm_entry_context_menu_clear(event->object);
375 elm_entry_context_menu_item_add(event->object, "MenuD1", NULL, ELM_ICON_NONE, _item_cb, NULL); 375 elm_entry_context_menu_item_add(event->object, "MenuD1", NULL, ELM_ICON_NONE, _item_cb, NULL);
@@ -695,7 +695,7 @@ test_entry_scrolled(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
695} 695}
696 696
697static void 697static void
698my_pop_dismissed(void *data EINA_UNUSED, const Eo_Event *ev) 698my_pop_dismissed(void *data EINA_UNUSED, const Efl_Event *ev)
699{ 699{
700 efl_del(ev->object); 700 efl_del(ev->object);
701} 701}
diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index 45ba43298d..afb794ea0a 100644
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -18,7 +18,7 @@ typedef struct {
18} testdata; 18} testdata;
19 19
20static void 20static void
21_pointer_down(void *data, const Eo_Event *ev) 21_pointer_down(void *data, const Efl_Event *ev)
22{ 22{
23 testdata *td = data; 23 testdata *td = data;
24 td->down = 1; 24 td->down = 1;
@@ -27,7 +27,7 @@ _pointer_down(void *data, const Eo_Event *ev)
27} 27}
28 28
29static void 29static void
30_pointer_move(void *data, const Eo_Event *ev) 30_pointer_move(void *data, const Efl_Event *ev)
31{ 31{
32 testdata *td = data; 32 testdata *td = data;
33 efl_del(td->evmove); 33 efl_del(td->evmove);
@@ -35,7 +35,7 @@ _pointer_move(void *data, const Eo_Event *ev)
35} 35}
36 36
37static void 37static void
38_pointer_up(void *data, const Eo_Event *ev) 38_pointer_up(void *data, const Efl_Event *ev)
39{ 39{
40 testdata *td = data; 40 testdata *td = data;
41 td->down = 0; 41 td->down = 0;
@@ -44,7 +44,7 @@ _pointer_up(void *data, const Eo_Event *ev)
44} 44}
45 45
46static void 46static void
47_key_down(void *data, const Eo_Event *ev) 47_key_down(void *data, const Efl_Event *ev)
48{ 48{
49 testdata *td = data; 49 testdata *td = data;
50 char str[1024]; 50 char str[1024];
@@ -92,7 +92,7 @@ _ecore_timeout_cb(void *data)
92#endif 92#endif
93 93
94static void 94static void
95_key_up(void *data, const Eo_Event *ev) 95_key_up(void *data, const Efl_Event *ev)
96{ 96{
97 testdata *td = data; 97 testdata *td = data;
98 98
@@ -113,7 +113,7 @@ _key_up(void *data, const Eo_Event *ev)
113} 113}
114 114
115static void 115static void
116_clicked_button1(void *data, const Eo_Event *ev EINA_UNUSED) 116_clicked_button1(void *data, const Efl_Event *ev EINA_UNUSED)
117{ 117{
118 testdata *td = data; 118 testdata *td = data;
119 Eo *txt = td->text; 119 Eo *txt = td->text;
@@ -127,7 +127,7 @@ _clicked_button1(void *data, const Eo_Event *ev EINA_UNUSED)
127} 127}
128 128
129static void 129static void
130_clicked_button2(void *data, const Eo_Event *ev EINA_UNUSED) 130_clicked_button2(void *data, const Efl_Event *ev EINA_UNUSED)
131{ 131{
132 testdata *td = data; 132 testdata *td = data;
133 Eo *bt = td->button; 133 Eo *bt = td->button;
@@ -160,7 +160,7 @@ _clicked_button2(void *data, const Eo_Event *ev EINA_UNUSED)
160} 160}
161 161
162static void 162static void
163_win_del(void *data, const Eo_Event *ev EINA_UNUSED) 163_win_del(void *data, const Efl_Event *ev EINA_UNUSED)
164{ 164{
165 testdata *td = data; 165 testdata *td = data;
166 free(td); 166 free(td);
diff --git a/src/bin/elementary/test_grid_static.c b/src/bin/elementary/test_grid_static.c
index bd620c8b95..0269a3de76 100644
--- a/src/bin/elementary/test_grid_static.c
+++ b/src/bin/elementary/test_grid_static.c
@@ -65,7 +65,7 @@ set_api_state(api_data *api)
65} 65}
66 66
67static void 67static void
68_api_bt_clicked(void *data, const Eo_Event *ev) 68_api_bt_clicked(void *data, const Efl_Event *ev)
69{ /* Will add here a SWITCH command containing code to modify test-object */ 69{ /* Will add here a SWITCH command containing code to modify test-object */
70 /* in accordance a->state value. */ 70 /* in accordance a->state value. */
71 api_data *a = data; 71 api_data *a = data;
@@ -80,7 +80,7 @@ _api_bt_clicked(void *data, const Eo_Event *ev)
80} 80}
81 81
82static void 82static void
83_ch_grid(void *data, const Eo_Event *ev) 83_ch_grid(void *data, const Efl_Event *ev)
84{ 84{
85 Eo *gd = data; 85 Eo *gd = data;
86 int x, y, w, h; 86 int x, y, w, h;
@@ -93,7 +93,7 @@ _ch_grid(void *data, const Eo_Event *ev)
93} 93}
94 94
95static void 95static void
96_win_del(void *data, const Eo_Event *ev EINA_UNUSED) 96_win_del(void *data, const Efl_Event *ev EINA_UNUSED)
97{ 97{
98 free(data); 98 free(data);
99} 99}
diff --git a/src/bin/elementary/test_task_switcher.c b/src/bin/elementary/test_task_switcher.c
index 8e57a585cc..5e35a7e48d 100644
--- a/src/bin/elementary/test_task_switcher.c
+++ b/src/bin/elementary/test_task_switcher.c
@@ -34,7 +34,7 @@ static void _btn_resume_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event
34} 34}
35 35
36static void 36static void
37_app_view_prop_changed_cb(void *data EINA_UNUSED, const Eo_Event *event) 37_app_view_prop_changed_cb(void *data EINA_UNUSED, const Efl_Event *event)
38{ 38{
39 Elm_App_View_State state = ELM_APP_VIEW_STATE_UNKNOWN; 39 Elm_App_View_State state = ELM_APP_VIEW_STATE_UNKNOWN;
40 40
@@ -269,7 +269,7 @@ _app_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU
269} 269}
270 270
271static void 271static void
272_view_list_update_cb(void *data EINA_UNUSED, const Eo_Event *event) 272_view_list_update_cb(void *data EINA_UNUSED, const Efl_Event *event)
273{ 273{
274 if (app_selected == event->object) 274 if (app_selected == event->object)
275 _app_clicked(event->object, NULL, NULL); 275 _app_clicked(event->object, NULL, NULL);
diff --git a/src/bin/elementary/test_ui_box.c b/src/bin/elementary/test_ui_box.c
index 4ce6950114..e12438a3e3 100644
--- a/src/bin/elementary/test_ui_box.c
+++ b/src/bin/elementary/test_ui_box.c
@@ -19,7 +19,7 @@ typedef enum {
19} Weight_Mode; 19} Weight_Mode;
20 20
21static void 21static void
22weights_cb(void *data, const Eo_Event *event) 22weights_cb(void *data, const Efl_Event *event)
23{ 23{
24 Weight_Mode mode = elm_radio_state_value_get(event->object); 24 Weight_Mode mode = elm_radio_state_value_get(event->object);
25 25
@@ -61,28 +61,28 @@ weights_cb(void *data, const Eo_Event *event)
61} 61}
62 62
63static void 63static void
64user_min_slider_cb(void *data EINA_UNUSED, const Eo_Event *event) 64user_min_slider_cb(void *data EINA_UNUSED, const Efl_Event *event)
65{ 65{
66 int val = elm_slider_value_get(event->object); 66 int val = elm_slider_value_get(event->object);
67 efl_gfx_size_hint_min_set(objects[3], val, val); 67 efl_gfx_size_hint_min_set(objects[3], val, val);
68} 68}
69 69
70static void 70static void
71padding_slider_cb(void *data, const Eo_Event *event) 71padding_slider_cb(void *data, const Efl_Event *event)
72{ 72{
73 int val = elm_slider_value_get(event->object); 73 int val = elm_slider_value_get(event->object);
74 efl_pack_padding_set(data, val, val, EINA_TRUE); 74 efl_pack_padding_set(data, val, val, EINA_TRUE);
75} 75}
76 76
77static void 77static void
78margin_slider_cb(void *data, const Eo_Event *event) 78margin_slider_cb(void *data, const Efl_Event *event)
79{ 79{
80 int val = elm_slider_value_get(event->object); 80 int val = elm_slider_value_get(event->object);
81 efl_gfx_size_hint_margin_set(data, val, val, val, val); 81 efl_gfx_size_hint_margin_set(data, val, val, val, val);
82} 82}
83 83
84static void 84static void
85alignh_slider_cb(void *data, const Eo_Event *event) 85alignh_slider_cb(void *data, const Efl_Event *event)
86{ 86{
87 double av, val; 87 double av, val;
88 val = elm_slider_value_get(event->object); 88 val = elm_slider_value_get(event->object);
@@ -91,7 +91,7 @@ alignh_slider_cb(void *data, const Eo_Event *event)
91} 91}
92 92
93static void 93static void
94alignv_slider_cb(void *data, const Eo_Event *event) 94alignv_slider_cb(void *data, const Efl_Event *event)
95{ 95{
96 double ah, val; 96 double ah, val;
97 val = elm_slider_value_get(event->object); 97 val = elm_slider_value_get(event->object);
@@ -103,21 +103,21 @@ static Efl_Ui_Box_Flow_Params s_flow_params = { 0, 0 };
103static Eina_Bool flow = EINA_FALSE; 103static Eina_Bool flow = EINA_FALSE;
104 104
105static void 105static void
106flow_check_cb(void *data, const Eo_Event *event) 106flow_check_cb(void *data, const Efl_Event *event)
107{ 107{
108 flow = elm_check_selected_get(event->object); 108 flow = elm_check_selected_get(event->object);
109 efl_pack_layout_engine_set(data, flow ? EFL_UI_BOX_FLOW_CLASS : NULL, &s_flow_params); 109 efl_pack_layout_engine_set(data, flow ? EFL_UI_BOX_FLOW_CLASS : NULL, &s_flow_params);
110} 110}
111 111
112static void 112static void
113horiz_check_cb(void *data, const Eo_Event *event) 113horiz_check_cb(void *data, const Efl_Event *event)
114{ 114{
115 Eina_Bool chk = elm_check_selected_get(event->object); 115 Eina_Bool chk = elm_check_selected_get(event->object);
116 efl_orientation_set(data, chk ? EFL_ORIENT_HORIZONTAL : EFL_ORIENT_VERTICAL); 116 efl_orientation_set(data, chk ? EFL_ORIENT_HORIZONTAL : EFL_ORIENT_VERTICAL);
117} 117}
118 118
119static void 119static void
120homo_check_cb(void *data, const Eo_Event *event) 120homo_check_cb(void *data, const Efl_Event *event)
121{ 121{
122 Eina_Bool chk = elm_check_selected_get(event->object); 122 Eina_Bool chk = elm_check_selected_get(event->object);
123 s_flow_params.homogenous = chk; 123 s_flow_params.homogenous = chk;
@@ -125,7 +125,7 @@ homo_check_cb(void *data, const Eo_Event *event)
125} 125}
126 126
127static void 127static void
128max_size_check_cb(void *data, const Eo_Event *event) 128max_size_check_cb(void *data, const Efl_Event *event)
129{ 129{
130 Eina_Bool chk = elm_check_selected_get(event->object); 130 Eina_Bool chk = elm_check_selected_get(event->object);
131 s_flow_params.max_size = chk; 131 s_flow_params.max_size = chk;
@@ -133,7 +133,7 @@ max_size_check_cb(void *data, const Eo_Event *event)
133} 133}
134 134
135static void 135static void
136left_check_cb(void *data, const Eo_Event *event) 136left_check_cb(void *data, const Efl_Event *event)
137{ 137{
138 Eina_Bool chk = elm_check_selected_get(event->object); 138 Eina_Bool chk = elm_check_selected_get(event->object);
139 if (chk) 139 if (chk)
@@ -175,7 +175,7 @@ _custom_layout_update(Eo *pack, const void *data EINA_UNUSED)
175} 175}
176 176
177static void 177static void
178custom_check_cb(void *data, const Eo_Event *event) 178custom_check_cb(void *data, const Efl_Event *event)
179{ 179{
180 EFL_OBJECT_OVERRIDE_OPS_DEFINE(custom_layout_ops, 180 EFL_OBJECT_OVERRIDE_OPS_DEFINE(custom_layout_ops,
181 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_pack_layout_update, _custom_layout_update)); 181 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_pack_layout_update, _custom_layout_update));
diff --git a/src/bin/elementary/test_ui_grid.c b/src/bin/elementary/test_ui_grid.c
index 5f643f31f7..cf92f42267 100644
--- a/src/bin/elementary/test_ui_grid.c
+++ b/src/bin/elementary/test_ui_grid.c
@@ -33,7 +33,7 @@ EFL_DEFINE_CLASS(_test_ui_grid_custom_engine_class_get, &custom_engine_class_des
33#define CUSTOM_ENGINE_CLASS _test_ui_grid_custom_engine_class_get() 33#define CUSTOM_ENGINE_CLASS _test_ui_grid_custom_engine_class_get()
34 34
35static void 35static void
36weights_cb(void *data, const Eo_Event *event) 36weights_cb(void *data, const Efl_Event *event)
37{ 37{
38 Weight_Mode mode = elm_radio_state_value_get(event->object); 38 Weight_Mode mode = elm_radio_state_value_get(event->object);
39 Eo *grid = data; 39 Eo *grid = data;
@@ -80,7 +80,7 @@ weights_cb(void *data, const Eo_Event *event)
80} 80}
81 81
82static void 82static void
83user_min_slider_cb(void *data EINA_UNUSED, const Eo_Event *event) 83user_min_slider_cb(void *data EINA_UNUSED, const Efl_Event *event)
84{ 84{
85 int val = elm_slider_value_get(event->object); 85 int val = elm_slider_value_get(event->object);
86 for (int i = 0; i < 6; i++) 86 for (int i = 0; i < 6; i++)
@@ -88,21 +88,21 @@ user_min_slider_cb(void *data EINA_UNUSED, const Eo_Event *event)
88} 88}
89 89
90static void 90static void
91padding_slider_cb(void *data, const Eo_Event *event) 91padding_slider_cb(void *data, const Efl_Event *event)
92{ 92{
93 int val = elm_slider_value_get(event->object); 93 int val = elm_slider_value_get(event->object);
94 efl_pack_padding_set(data, val, val, EINA_TRUE); 94 efl_pack_padding_set(data, val, val, EINA_TRUE);
95} 95}
96 96
97static void 97static void
98margin_slider_cb(void *data, const Eo_Event *event) 98margin_slider_cb(void *data, const Efl_Event *event)
99{ 99{
100 int val = elm_slider_value_get(event->object); 100 int val = elm_slider_value_get(event->object);
101 efl_gfx_size_hint_margin_set(data, val, val, val, val); 101 efl_gfx_size_hint_margin_set(data, val, val, val, val);
102} 102}
103 103
104static void 104static void
105btnmargins_slider_cb(void *data, const Eo_Event *event) 105btnmargins_slider_cb(void *data, const Efl_Event *event)
106{ 106{
107 int val = elm_slider_value_get(event->object); 107 int val = elm_slider_value_get(event->object);
108 for (int i = 1; i < 7; i++) 108 for (int i = 1; i < 7; i++)
@@ -110,7 +110,7 @@ btnmargins_slider_cb(void *data, const Eo_Event *event)
110} 110}
111 111
112static void 112static void
113layout_updated_cb(void *data, const Eo_Event *event) 113layout_updated_cb(void *data, const Efl_Event *event)
114{ 114{
115 Elm_Label *o = data; 115 Elm_Label *o = data;
116 char buf[64]; 116 char buf[64];
@@ -123,7 +123,7 @@ layout_updated_cb(void *data, const Eo_Event *event)
123} 123}
124 124
125static void 125static void
126child_evt_cb(void *data, const Eo_Event *event) 126child_evt_cb(void *data, const Efl_Event *event)
127{ 127{
128 Elm_Label *o = data; 128 Elm_Label *o = data;
129 Efl_Gfx *it = event->info; 129 Efl_Gfx *it = event->info;
@@ -491,13 +491,13 @@ btn_text(const char *str)
491} 491}
492 492
493static void 493static void
494remove_cb(void *data EINA_UNUSED, const Eo_Event *ev) 494remove_cb(void *data EINA_UNUSED, const Efl_Event *ev)
495{ 495{
496 efl_del(ev->object); 496 efl_del(ev->object);
497} 497}
498 498
499static void 499static void
500append_cb(void *data, const Eo_Event *ev EINA_UNUSED) 500append_cb(void *data, const Efl_Event *ev EINA_UNUSED)
501{ 501{
502 Eo *grid = data; 502 Eo *grid = data;
503 Eo *o = elm_button_add(grid); 503 Eo *o = elm_button_add(grid);
@@ -509,7 +509,7 @@ append_cb(void *data, const Eo_Event *ev EINA_UNUSED)
509} 509}
510 510
511static void 511static void
512clear_cb(void *data, const Eo_Event *ev EINA_UNUSED) 512clear_cb(void *data, const Efl_Event *ev EINA_UNUSED)
513{ 513{
514 Eo *grid = data; 514 Eo *grid = data;
515 efl_pack_clear(grid); 515 efl_pack_clear(grid);
diff --git a/src/bin/elementary/test_win_plug.c b/src/bin/elementary/test_win_plug.c
index 72cc6fd164..ad94dde91d 100644
--- a/src/bin/elementary/test_win_plug.c
+++ b/src/bin/elementary/test_win_plug.c
@@ -144,7 +144,7 @@ create_handles(Evas_Object *obj)
144} 144}
145 145
146static void 146static void
147_notify_end(void *data EINA_UNUSED, const Eo_Event *event) 147_notify_end(void *data EINA_UNUSED, const Efl_Event *event)
148{ 148{
149 efl_del(event->object); 149 efl_del(event->object);
150 efl_event_callback_stop(event->object); 150 efl_event_callback_stop(event->object);
diff --git a/src/examples/ecore/ecore_audio_playback.c b/src/examples/ecore/ecore_audio_playback.c
index 2bb8a21df1..5945393e8c 100644
--- a/src/examples/ecore/ecore_audio_playback.c
+++ b/src/examples/ecore/ecore_audio_playback.c
@@ -191,7 +191,7 @@ handle_input(void *data EINA_UNUSED, Ecore_Fd_Handler *handler)
191 return EINA_TRUE; 191 return EINA_TRUE;
192} 192}
193 193
194static void _play_finished(void *data EINA_UNUSED, const Eo_Event *event) 194static void _play_finished(void *data EINA_UNUSED, const Efl_Event *event)
195{ 195{
196 const char *name; 196 const char *name;
197 Eina_Bool ret; 197 Eina_Bool ret;
diff --git a/src/examples/ecore/ecore_audio_to_ogg.c b/src/examples/ecore/ecore_audio_to_ogg.c
index 932a25781c..fec1cc587e 100644
--- a/src/examples/ecore/ecore_audio_to_ogg.c
+++ b/src/examples/ecore/ecore_audio_to_ogg.c
@@ -15,7 +15,7 @@
15double volume = 1; 15double volume = 1;
16Eina_List *inputs = NULL; 16Eina_List *inputs = NULL;
17 17
18static void _play_finished(void *data EINA_UNUSED, const Eo_Event *event) 18static void _play_finished(void *data EINA_UNUSED, const Efl_Event *event)
19{ 19{
20 const char *name; 20 const char *name;
21 Eo *out; 21 Eo *out;
diff --git a/src/examples/ecore/efl_io_copier_example.c b/src/examples/ecore/efl_io_copier_example.c
index ffcd39db72..943c94eaef 100644
--- a/src/examples/ecore/efl_io_copier_example.c
+++ b/src/examples/ecore/efl_io_copier_example.c
@@ -10,14 +10,14 @@ static int retval = EXIT_SUCCESS;
10/* NOTE: input events are only used as debug, you can omit these */ 10/* NOTE: input events are only used as debug, you can omit these */
11 11
12static void 12static void
13_input_can_read_changed(void *data EINA_UNUSED, const Eo_Event *event) 13_input_can_read_changed(void *data EINA_UNUSED, const Efl_Event *event)
14{ 14{
15 fprintf(stderr, "INFO: input can_read=%d\n", 15 fprintf(stderr, "INFO: input can_read=%d\n",
16 efl_io_reader_can_read_get(event->object)); 16 efl_io_reader_can_read_get(event->object));
17} 17}
18 18
19static void 19static void
20_input_eos(void *data EINA_UNUSED, const Eo_Event *event) 20_input_eos(void *data EINA_UNUSED, const Efl_Event *event)
21{ 21{
22 fprintf(stderr, "INFO: input eos=%d\n", 22 fprintf(stderr, "INFO: input eos=%d\n",
23 efl_io_reader_eos_get(event->object)); 23 efl_io_reader_eos_get(event->object));
@@ -31,7 +31,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(input_cbs,
31/* NOTE: output events are only used as debug, you can omit these */ 31/* NOTE: output events are only used as debug, you can omit these */
32 32
33static void 33static void
34_output_can_write_changed(void *data EINA_UNUSED, const Eo_Event *event) 34_output_can_write_changed(void *data EINA_UNUSED, const Efl_Event *event)
35{ 35{
36 fprintf(stderr, "INFO: output can_write=%d\n", 36 fprintf(stderr, "INFO: output can_write=%d\n",
37 efl_io_writer_can_write_get(event->object)); 37 efl_io_writer_can_write_get(event->object));
@@ -41,7 +41,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(output_cbs,
41 { EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, _output_can_write_changed }); 41 { EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, _output_can_write_changed });
42 42
43static void 43static void
44_output_buffer_reallocated(void *data EINA_UNUSED, const Eo_Event *event) 44_output_buffer_reallocated(void *data EINA_UNUSED, const Efl_Event *event)
45{ 45{
46 Eina_Slice slice; 46 Eina_Slice slice;
47 47
@@ -60,7 +60,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(output_buffer_cbs,
60 60
61 61
62static void 62static void
63_dialer_resolved(void *data EINA_UNUSED, const Eo_Event *event) 63_dialer_resolved(void *data EINA_UNUSED, const Efl_Event *event)
64{ 64{
65 fprintf(stderr, "INFO: dialer resolved '%s' to '%s'\n", 65 fprintf(stderr, "INFO: dialer resolved '%s' to '%s'\n",
66 efl_net_dialer_address_dial_get(event->object), 66 efl_net_dialer_address_dial_get(event->object),
@@ -68,7 +68,7 @@ _dialer_resolved(void *data EINA_UNUSED, const Eo_Event *event)
68} 68}
69 69
70static void 70static void
71_dialer_error(void *data EINA_UNUSED, const Eo_Event *event) 71_dialer_error(void *data EINA_UNUSED, const Efl_Event *event)
72{ 72{
73 const Eina_Error *perr = event->info; 73 const Eina_Error *perr = event->info;
74 fprintf(stderr, "INFO: error: %d\n", *perr); 74 fprintf(stderr, "INFO: error: %d\n", *perr);
@@ -77,7 +77,7 @@ _dialer_error(void *data EINA_UNUSED, const Eo_Event *event)
77} 77}
78 78
79static void 79static void
80_dialer_connected(void *data EINA_UNUSED, const Eo_Event *event) 80_dialer_connected(void *data EINA_UNUSED, const Efl_Event *event)
81{ 81{
82 fprintf(stderr, "INFO: dialer connected to '%s' (%s)\n", 82 fprintf(stderr, "INFO: dialer connected to '%s' (%s)\n",
83 efl_net_dialer_address_dial_get(event->object), 83 efl_net_dialer_address_dial_get(event->object),
@@ -90,7 +90,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
90 { EFL_NET_DIALER_EVENT_CONNECTED, _dialer_connected }); 90 { EFL_NET_DIALER_EVENT_CONNECTED, _dialer_connected });
91 91
92static void 92static void
93_http_headers_done(void *data EINA_UNUSED, const Eo_Event *event) 93_http_headers_done(void *data EINA_UNUSED, const Efl_Event *event)
94{ 94{
95 Eina_Iterator *itr; 95 Eina_Iterator *itr;
96 Efl_Net_Http_Header *h; 96 Efl_Net_Http_Header *h;
@@ -130,7 +130,7 @@ _http_headers_done(void *data EINA_UNUSED, const Eo_Event *event)
130} 130}
131 131
132static void 132static void
133_http_closed(void *data EINA_UNUSED, const Eo_Event *event) 133_http_closed(void *data EINA_UNUSED, const Efl_Event *event)
134{ 134{
135 uint64_t dn, dt, un, ut; 135 uint64_t dn, dt, un, ut;
136 136
@@ -151,7 +151,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(http_cbs,
151 */ 151 */
152 152
153static void 153static void
154_copier_done(void *data EINA_UNUSED, const Eo_Event *event) 154_copier_done(void *data EINA_UNUSED, const Efl_Event *event)
155{ 155{
156 Eo *destination = efl_io_copier_destination_get(event->object); 156 Eo *destination = efl_io_copier_destination_get(event->object);
157 157
@@ -214,7 +214,7 @@ _copier_done(void *data EINA_UNUSED, const Eo_Event *event)
214} 214}
215 215
216static void 216static void
217_copier_error(void *data EINA_UNUSED, const Eo_Event *event) 217_copier_error(void *data EINA_UNUSED, const Efl_Event *event)
218{ 218{
219 const Eina_Error *perr = event->info; 219 const Eina_Error *perr = event->info;
220 fprintf(stderr, "INFO: error: %d\n", *perr); 220 fprintf(stderr, "INFO: error: %d\n", *perr);
@@ -223,7 +223,7 @@ _copier_error(void *data EINA_UNUSED, const Eo_Event *event)
223} 223}
224 224
225static void 225static void
226_copier_progress(void *data EINA_UNUSED, const Eo_Event *event) 226_copier_progress(void *data EINA_UNUSED, const Efl_Event *event)
227{ 227{
228 uint64_t r, w, t; 228 uint64_t r, w, t;
229 229
@@ -246,7 +246,7 @@ _copier_progress(void *data EINA_UNUSED, const Eo_Event *event)
246} 246}
247 247
248static void 248static void
249_copier_data(void *data EINA_UNUSED, const Eo_Event *event) 249_copier_data(void *data EINA_UNUSED, const Efl_Event *event)
250{ 250{
251 const Eina_Slice *slice = event->info; 251 const Eina_Slice *slice = event->info;
252 /* a piece of data was processed, it's ready-only and will only be 252 /* a piece of data was processed, it's ready-only and will only be
@@ -268,7 +268,7 @@ _copier_data(void *data EINA_UNUSED, const Eo_Event *event)
268} 268}
269 269
270static void 270static void
271_copier_line(void *data EINA_UNUSED, const Eo_Event *event) 271_copier_line(void *data EINA_UNUSED, const Efl_Event *event)
272{ 272{
273 const Eina_Slice *slice = event->info; 273 const Eina_Slice *slice = event->info;
274 274
diff --git a/src/examples/ecore/efl_io_copier_simple_example.c b/src/examples/ecore/efl_io_copier_simple_example.c
index 9b7687c22e..2db73e4b1e 100644
--- a/src/examples/ecore/efl_io_copier_simple_example.c
+++ b/src/examples/ecore/efl_io_copier_simple_example.c
@@ -5,14 +5,14 @@
5static int retval = EXIT_SUCCESS; 5static int retval = EXIT_SUCCESS;
6 6
7static void 7static void
8_copier_done(void *data, const Eo_Event *event) 8_copier_done(void *data, const Efl_Event *event)
9{ 9{
10 fprintf(stderr, "INFO: done\n"); 10 fprintf(stderr, "INFO: done\n");
11 ecore_main_loop_quit(); 11 ecore_main_loop_quit();
12} 12}
13 13
14static void 14static void
15_copier_error(void *data, const Eo_Event *event) 15_copier_error(void *data, const Efl_Event *event)
16{ 16{
17 const Eina_Error *perr = event->info; 17 const Eina_Error *perr = event->info;
18 fprintf(stderr, "INFO: error: #%d '%s'\n", *perr, eina_error_msg_get(*perr)); 18 fprintf(stderr, "INFO: error: #%d '%s'\n", *perr, eina_error_msg_get(*perr));
diff --git a/src/examples/ecore/efl_io_queue_example.c b/src/examples/ecore/efl_io_queue_example.c
index 710b5ac308..730b02c3bd 100644
--- a/src/examples/ecore/efl_io_queue_example.c
+++ b/src/examples/ecore/efl_io_queue_example.c
@@ -37,7 +37,7 @@ _command_next(void)
37} 37}
38 38
39static void 39static void
40_receiver_data(void *data EINA_UNUSED, const Eo_Event *event) 40_receiver_data(void *data EINA_UNUSED, const Efl_Event *event)
41{ 41{
42 Eina_Slice slice; 42 Eina_Slice slice;
43 43
@@ -73,7 +73,7 @@ _receiver_data(void *data EINA_UNUSED, const Eo_Event *event)
73} 73}
74 74
75static void 75static void
76_dialer_connected(void *data EINA_UNUSED, const Eo_Event *event) 76_dialer_connected(void *data EINA_UNUSED, const Efl_Event *event)
77{ 77{
78 fprintf(stderr, "INFO: connected to %s (%s)\n", 78 fprintf(stderr, "INFO: connected to %s (%s)\n",
79 efl_net_dialer_address_dial_get(event->object), 79 efl_net_dialer_address_dial_get(event->object),
@@ -83,7 +83,7 @@ _dialer_connected(void *data EINA_UNUSED, const Eo_Event *event)
83} 83}
84 84
85static void 85static void
86_copier_done(void *data EINA_UNUSED, const Eo_Event *event) 86_copier_done(void *data EINA_UNUSED, const Efl_Event *event)
87{ 87{
88 fprintf(stderr, "INFO: %s done\n", efl_name_get(event->object)); 88 fprintf(stderr, "INFO: %s done\n", efl_name_get(event->object));
89 89
@@ -93,7 +93,7 @@ _copier_done(void *data EINA_UNUSED, const Eo_Event *event)
93} 93}
94 94
95static void 95static void
96_copier_error(void *data EINA_UNUSED, const Eo_Event *event) 96_copier_error(void *data EINA_UNUSED, const Efl_Event *event)
97{ 97{
98 const Eina_Error *perr = event->info; 98 const Eina_Error *perr = event->info;
99 fprintf(stderr, "INFO: %s error: #%d '%s'\n", 99 fprintf(stderr, "INFO: %s error: #%d '%s'\n",
diff --git a/src/examples/ecore/efl_net_dialer_http_example.c b/src/examples/ecore/efl_net_dialer_http_example.c
index 0ccc36ba9d..9e7a4b5509 100644
--- a/src/examples/ecore/efl_net_dialer_http_example.c
+++ b/src/examples/ecore/efl_net_dialer_http_example.c
@@ -10,28 +10,28 @@ static int retval = EXIT_SUCCESS;
10static int waiting; 10static int waiting;
11 11
12static void 12static void
13_closed(void *data EINA_UNUSED, const Eo_Event *event) 13_closed(void *data EINA_UNUSED, const Efl_Event *event)
14{ 14{
15 fprintf(stderr, "INFO: closed %s\n", 15 fprintf(stderr, "INFO: closed %s\n",
16 efl_name_get(event->object)); 16 efl_name_get(event->object));
17} 17}
18 18
19static void 19static void
20_eos(void *data EINA_UNUSED, const Eo_Event *event) 20_eos(void *data EINA_UNUSED, const Efl_Event *event)
21{ 21{
22 fprintf(stderr, "INFO: eos %s\n", 22 fprintf(stderr, "INFO: eos %s\n",
23 efl_name_get(event->object)); 23 efl_name_get(event->object));
24} 24}
25 25
26static void 26static void
27_connected(void *data EINA_UNUSED, const Eo_Event *event) 27_connected(void *data EINA_UNUSED, const Efl_Event *event)
28{ 28{
29 fprintf(stderr, "INFO: connected %s\n", 29 fprintf(stderr, "INFO: connected %s\n",
30 efl_net_dialer_address_dial_get(event->object)); 30 efl_net_dialer_address_dial_get(event->object));
31} 31}
32 32
33static void 33static void
34_resolved(void *data EINA_UNUSED, const Eo_Event *event) 34_resolved(void *data EINA_UNUSED, const Efl_Event *event)
35{ 35{
36 fprintf(stderr, "INFO: resolved %s => %s\n", 36 fprintf(stderr, "INFO: resolved %s => %s\n",
37 efl_net_dialer_address_dial_get(event->object), 37 efl_net_dialer_address_dial_get(event->object),
@@ -39,7 +39,7 @@ _resolved(void *data EINA_UNUSED, const Eo_Event *event)
39} 39}
40 40
41static void 41static void
42_error(void *data EINA_UNUSED, const Eo_Event *event) 42_error(void *data EINA_UNUSED, const Efl_Event *event)
43{ 43{
44 const Eina_Error *perr = event->info; 44 const Eina_Error *perr = event->info;
45 fprintf(stderr, "INFO: error: %d '%s'\n", *perr, eina_error_msg_get(*perr)); 45 fprintf(stderr, "INFO: error: %d '%s'\n", *perr, eina_error_msg_get(*perr));
@@ -47,7 +47,7 @@ _error(void *data EINA_UNUSED, const Eo_Event *event)
47} 47}
48 48
49static void 49static void
50_http_headers_done(void *data EINA_UNUSED, const Eo_Event *event) 50_http_headers_done(void *data EINA_UNUSED, const Efl_Event *event)
51{ 51{
52 Eo *o = event->object; 52 Eo *o = event->object;
53 Efl_Net_Http_Version ver = efl_net_dialer_http_version_get(o); 53 Efl_Net_Http_Version ver = efl_net_dialer_http_version_get(o);
@@ -81,7 +81,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
81 { EFL_IO_READER_EVENT_EOS, _eos }); 81 { EFL_IO_READER_EVENT_EOS, _eos });
82 82
83static void 83static void
84_done(void *data EINA_UNUSED, const Eo_Event *event) 84_done(void *data EINA_UNUSED, const Efl_Event *event)
85{ 85{
86 waiting--; 86 waiting--;
87 fprintf(stderr, "INFO: done %s, waiting=%d\n", 87 fprintf(stderr, "INFO: done %s, waiting=%d\n",
diff --git a/src/examples/ecore/efl_net_server_example.c b/src/examples/ecore/efl_net_server_example.c
index 92e3cd8098..ac59e56511 100644
--- a/src/examples/ecore/efl_net_server_example.c
+++ b/src/examples/ecore/efl_net_server_example.c
@@ -11,7 +11,7 @@ static Eina_Bool echo = EINA_FALSE;
11/* NOTE: client i/o events are only used as debug, you can omit these */ 11/* NOTE: client i/o events are only used as debug, you can omit these */
12 12
13static void 13static void
14_client_can_read_changed(void *data EINA_UNUSED, const Eo_Event *event) 14_client_can_read_changed(void *data EINA_UNUSED, const Efl_Event *event)
15{ 15{
16 fprintf(stderr, "INFO: client %s can_read=%d\n", 16 fprintf(stderr, "INFO: client %s can_read=%d\n",
17 efl_net_socket_address_remote_get(event->object), 17 efl_net_socket_address_remote_get(event->object),
@@ -19,7 +19,7 @@ _client_can_read_changed(void *data EINA_UNUSED, const Eo_Event *event)
19} 19}
20 20
21static void 21static void
22_client_can_write_changed(void *data EINA_UNUSED, const Eo_Event *event) 22_client_can_write_changed(void *data EINA_UNUSED, const Efl_Event *event)
23{ 23{
24 fprintf(stderr, "INFO: client %s can_write=%d\n", 24 fprintf(stderr, "INFO: client %s can_write=%d\n",
25 efl_net_socket_address_remote_get(event->object), 25 efl_net_socket_address_remote_get(event->object),
@@ -27,14 +27,14 @@ _client_can_write_changed(void *data EINA_UNUSED, const Eo_Event *event)
27} 27}
28 28
29static void 29static void
30_client_eos(void *data EINA_UNUSED, const Eo_Event *event) 30_client_eos(void *data EINA_UNUSED, const Efl_Event *event)
31{ 31{
32 fprintf(stderr, "INFO: client %s eos.\n", 32 fprintf(stderr, "INFO: client %s eos.\n",
33 efl_net_socket_address_remote_get(event->object)); 33 efl_net_socket_address_remote_get(event->object));
34} 34}
35 35
36static void 36static void
37_client_closed(void *data EINA_UNUSED, const Eo_Event *event) 37_client_closed(void *data EINA_UNUSED, const Efl_Event *event)
38{ 38{
39 fprintf(stderr, "INFO: client %s closed.\n", 39 fprintf(stderr, "INFO: client %s closed.\n",
40 efl_net_socket_address_remote_get(event->object)); 40 efl_net_socket_address_remote_get(event->object));
@@ -54,7 +54,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(client_cbs,
54/* echo copier is about the same socket, you can close it right away */ 54/* echo copier is about the same socket, you can close it right away */
55 55
56static void 56static void
57_echo_copier_done(void *data EINA_UNUSED, const Eo_Event *event) 57_echo_copier_done(void *data EINA_UNUSED, const Efl_Event *event)
58{ 58{
59 Eo *copier = event->object; 59 Eo *copier = event->object;
60 fprintf(stderr, "INFO: echo copier done, close and del %p\n", copier); 60 fprintf(stderr, "INFO: echo copier done, close and del %p\n", copier);
@@ -63,7 +63,7 @@ _echo_copier_done(void *data EINA_UNUSED, const Eo_Event *event)
63} 63}
64 64
65static void 65static void
66_echo_copier_error(void *data EINA_UNUSED, const Eo_Event *event) 66_echo_copier_error(void *data EINA_UNUSED, const Efl_Event *event)
67{ 67{
68 Eo *copier = event->object; 68 Eo *copier = event->object;
69 const Eina_Error *perr = event->info; 69 const Eina_Error *perr = event->info;
@@ -128,7 +128,7 @@ _send_recv_done(Send_Recv_Data *d, Eo *copier)
128} 128}
129 129
130static void 130static void
131_send_copier_done(void *data, const Eo_Event *event) 131_send_copier_done(void *data, const Efl_Event *event)
132{ 132{
133 Eo *copier = event->object; 133 Eo *copier = event->object;
134 Eo *buffer = efl_io_copier_source_get(copier); 134 Eo *buffer = efl_io_copier_source_get(copier);
@@ -153,7 +153,7 @@ _send_copier_done(void *data, const Eo_Event *event)
153} 153}
154 154
155static void 155static void
156_send_copier_error(void *data, const Eo_Event *event) 156_send_copier_error(void *data, const Efl_Event *event)
157{ 157{
158 Eo *copier = event->object; 158 Eo *copier = event->object;
159 Eo *buffer = efl_io_copier_source_get(copier); 159 Eo *buffer = efl_io_copier_source_get(copier);
@@ -201,7 +201,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(send_copier_cbs,
201 { EFL_IO_COPIER_EVENT_ERROR, _send_copier_error}); 201 { EFL_IO_COPIER_EVENT_ERROR, _send_copier_error});
202 202
203static void 203static void
204_recv_copier_done(void *data, const Eo_Event *event) 204_recv_copier_done(void *data, const Efl_Event *event)
205{ 205{
206 Eo *copier = event->object; 206 Eo *copier = event->object;
207 Eo *client = efl_io_copier_source_get(copier); 207 Eo *client = efl_io_copier_source_get(copier);
@@ -234,7 +234,7 @@ _recv_copier_done(void *data, const Eo_Event *event)
234} 234}
235 235
236static void 236static void
237_recv_copier_error(void *data, const Eo_Event *event) 237_recv_copier_error(void *data, const Efl_Event *event)
238{ 238{
239 Eo *copier = event->object; 239 Eo *copier = event->object;
240 Eo *buffer = efl_io_copier_source_get(copier); 240 Eo *buffer = efl_io_copier_source_get(copier);
@@ -275,7 +275,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(recv_copier_cbs,
275 * the string with socket identification. 275 * the string with socket identification.
276 */ 276 */
277static void 277static void
278_server_client_add(void *data EINA_UNUSED, const Eo_Event *event) 278_server_client_add(void *data EINA_UNUSED, const Efl_Event *event)
279{ 279{
280 Efl_Net_Socket *client = event->info; 280 Efl_Net_Socket *client = event->info;
281 281
@@ -377,14 +377,14 @@ _server_client_add(void *data EINA_UNUSED, const Eo_Event *event)
377} 377}
378 378
379static void 379static void
380_server_client_rejected(void *data EINA_UNUSED, const Eo_Event *event) 380_server_client_rejected(void *data EINA_UNUSED, const Efl_Event *event)
381{ 381{
382 const char *client_address = event->info; 382 const char *client_address = event->info;
383 fprintf(stderr, "INFO: rejected client %s\n", client_address); 383 fprintf(stderr, "INFO: rejected client %s\n", client_address);
384} 384}
385 385
386static void 386static void
387_server_error(void *data EINA_UNUSED, const Eo_Event *event) 387_server_error(void *data EINA_UNUSED, const Efl_Event *event)
388{ 388{
389 const Eina_Error *perr = event->info; 389 const Eina_Error *perr = event->info;
390 fprintf(stderr, "INFO: error: %d\n", *perr); 390 fprintf(stderr, "INFO: error: %d\n", *perr);
@@ -393,7 +393,7 @@ _server_error(void *data EINA_UNUSED, const Eo_Event *event)
393} 393}
394 394
395static void 395static void
396_server_serving(void *data EINA_UNUSED, const Eo_Event *event) 396_server_serving(void *data EINA_UNUSED, const Efl_Event *event)
397{ 397{
398 fprintf(stderr, "INFO: serving at %s\n", 398 fprintf(stderr, "INFO: serving at %s\n",
399 efl_net_server_address_get(event->object)); 399 efl_net_server_address_get(event->object));
diff --git a/src/examples/eio/efl_io_manager_ls.c b/src/examples/eio/efl_io_manager_ls.c
index ea2dcca422..362b3c71ea 100644
--- a/src/examples/eio/efl_io_manager_ls.c
+++ b/src/examples/eio/efl_io_manager_ls.c
@@ -28,7 +28,7 @@ void error_cb(void *data, Eina_Error error)
28 efl_unref(job); 28 efl_unref(job);
29} 29}
30 30
31void filter_cb(void *data EINA_UNUSED, const Eo_Event *event) 31void filter_cb(void *data EINA_UNUSED, const Efl_Event *event)
32{ 32{
33 Eio_Filter_Name_Data *event_info = event->info; 33 Eio_Filter_Name_Data *event_info = event->info;
34 static Eina_Bool should_filter = EINA_FALSE; 34 static Eina_Bool should_filter = EINA_FALSE;
diff --git a/src/examples/eio/eio_sentry.c b/src/examples/eio/eio_sentry.c
index 4c57f7a802..f72782cbfd 100644
--- a/src/examples/eio/eio_sentry.c
+++ b/src/examples/eio/eio_sentry.c
@@ -11,7 +11,7 @@
11#include <Ecore.h> 11#include <Ecore.h>
12 12
13void 13void
14sentry_cb(void *data EINA_UNUSED, const Eo_Event *event) 14sentry_cb(void *data EINA_UNUSED, const Efl_Event *event)
15{ 15{
16 Eio_Sentry_Event *event_info = event->info; 16 Eio_Sentry_Event *event_info = event->info;
17 17
diff --git a/src/examples/elementary/filemvc.c b/src/examples/elementary/filemvc.c
index d28a593f8c..22fc5e39de 100644
--- a/src/examples/elementary/filemvc.c
+++ b/src/examples/elementary/filemvc.c
@@ -47,7 +47,7 @@ _filter_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, const Eina_Fil
47} 47}
48 48
49static void 49static void
50_list_selected_cb(void *data EINA_UNUSED, const Eo_Event *event) 50_list_selected_cb(void *data EINA_UNUSED, const Efl_Event *event)
51{ 51{
52 Efl_Model_Test_Filemvc_Data *priv = data; 52 Efl_Model_Test_Filemvc_Data *priv = data;
53 Eo *child = event->info; 53 Eo *child = event->info;
@@ -75,7 +75,7 @@ _promise_error(void *data, const Eina_Error err)
75} 75}
76 76
77static void 77static void
78_tree_selected_cb(void *data, const Eo_Event *event) 78_tree_selected_cb(void *data, const Efl_Event *event)
79{ 79{
80 Efl_Model_Test_Filemvc_Data *priv = data; 80 Efl_Model_Test_Filemvc_Data *priv = data;
81 Eo *child = event->info; 81 Eo *child = event->info;
diff --git a/src/examples/emotion/emotion_basic_example.c b/src/examples/emotion/emotion_basic_example.c
index 5ea23bfa50..c7a2417ade 100644
--- a/src/examples/emotion/emotion_basic_example.c
+++ b/src/examples/emotion/emotion_basic_example.c
@@ -15,7 +15,7 @@
15#define HEIGHT (240) 15#define HEIGHT (240)
16 16
17static void 17static void
18_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) 18_playback_started_cb(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
19{ 19{
20 printf("Emotion object started playback.\n"); 20 printf("Emotion object started playback.\n");
21} 21}
diff --git a/src/examples/emotion/emotion_border_example.c b/src/examples/emotion/emotion_border_example.c
index c113f6dc90..c3088b77a1 100644
--- a/src/examples/emotion/emotion_border_example.c
+++ b/src/examples/emotion/emotion_border_example.c
@@ -18,7 +18,7 @@ static Eina_List *filenames = NULL;
18static Eina_List *curfile = NULL; 18static Eina_List *curfile = NULL;
19 19
20static void 20static void
21_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) 21_playback_started_cb(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
22{ 22{
23 printf("Emotion object started playback.\n"); 23 printf("Emotion object started playback.\n");
24} 24}
@@ -106,25 +106,25 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *
106} 106}
107 107
108static void 108static void
109_frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) 109_frame_decode_cb(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
110{ 110{
111 // fprintf(stderr, "smartcb: frame_decode\n"); 111 // fprintf(stderr, "smartcb: frame_decode\n");
112} 112}
113 113
114static void 114static void
115_length_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) 115_length_change_cb(void *data EINA_UNUSED, const Efl_Event *ev)
116{ 116{
117 fprintf(stderr, "smartcb: length_change: %0.3f\n", emotion_object_play_length_get(ev->object)); 117 fprintf(stderr, "smartcb: length_change: %0.3f\n", emotion_object_play_length_get(ev->object));
118} 118}
119 119
120static void 120static void
121_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev) 121_position_update_cb(void *data EINA_UNUSED, const Efl_Event *ev)
122{ 122{
123 fprintf(stderr, "smartcb: position_update: %0.3f\n", emotion_object_position_get(ev->object)); 123 fprintf(stderr, "smartcb: position_update: %0.3f\n", emotion_object_position_get(ev->object));
124} 124}
125 125
126static void 126static void
127_progress_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) 127_progress_change_cb(void *data EINA_UNUSED, const Efl_Event *ev)
128{ 128{
129 fprintf(stderr, "smartcb: progress_change: %0.3f, %s\n", 129 fprintf(stderr, "smartcb: progress_change: %0.3f, %s\n",
130 emotion_object_progress_status_get(ev->object), 130 emotion_object_progress_status_get(ev->object),
@@ -132,7 +132,7 @@ _progress_change_cb(void *data EINA_UNUSED, const Eo_Event *ev)
132} 132}
133 133
134static void 134static void
135_frame_resize_cb(void *data EINA_UNUSED, const Eo_Event *ev) 135_frame_resize_cb(void *data EINA_UNUSED, const Efl_Event *ev)
136{ 136{
137 int w, h; 137 int w, h;
138 emotion_object_size_get(ev->object, &w, &h); 138 emotion_object_size_get(ev->object, &w, &h);
diff --git a/src/examples/emotion/emotion_generic_example.c b/src/examples/emotion/emotion_generic_example.c
index febd0e330f..ec52c65b02 100644
--- a/src/examples/emotion/emotion_generic_example.c
+++ b/src/examples/emotion/emotion_generic_example.c
@@ -19,13 +19,13 @@ static Eina_List *filenames = NULL;
19static Eina_List *curfile = NULL; 19static Eina_List *curfile = NULL;
20 20
21static void 21static void
22_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) 22_playback_started_cb(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
23{ 23{
24 printf("Emotion object started playback.\n"); 24 printf("Emotion object started playback.\n");
25} 25}
26 26
27static void 27static void
28_playback_stopped_cb(void *data EINA_UNUSED, const Eo_Event *ev) 28_playback_stopped_cb(void *data EINA_UNUSED, const Efl_Event *ev)
29{ 29{
30 printf("Emotion playback stopped.\n"); 30 printf("Emotion playback stopped.\n");
31 emotion_object_play_set(ev->object, EINA_FALSE); 31 emotion_object_play_set(ev->object, EINA_FALSE);
@@ -127,25 +127,25 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *
127} 127}
128 128
129static void 129static void
130_frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) 130_frame_decode_cb(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
131{ 131{
132 // fprintf(stderr, "smartcb: frame_decode\n"); 132 // fprintf(stderr, "smartcb: frame_decode\n");
133} 133}
134 134
135static void 135static void
136_length_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) 136_length_change_cb(void *data EINA_UNUSED, const Efl_Event *ev)
137{ 137{
138 fprintf(stderr, "smartcb: length_change: %0.3f\n", emotion_object_play_length_get(ev->object)); 138 fprintf(stderr, "smartcb: length_change: %0.3f\n", emotion_object_play_length_get(ev->object));
139} 139}
140 140
141static void 141static void
142_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev) 142_position_update_cb(void *data EINA_UNUSED, const Efl_Event *ev)
143{ 143{
144 fprintf(stderr, "smartcb: position_update: %0.3f\n", emotion_object_position_get(ev->object)); 144 fprintf(stderr, "smartcb: position_update: %0.3f\n", emotion_object_position_get(ev->object));
145} 145}
146 146
147static void 147static void
148_progress_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) 148_progress_change_cb(void *data EINA_UNUSED, const Efl_Event *ev)
149{ 149{
150 fprintf(stderr, "smartcb: progress_change: %0.3f, %s\n", 150 fprintf(stderr, "smartcb: progress_change: %0.3f, %s\n",
151 emotion_object_progress_status_get(ev->object), 151 emotion_object_progress_status_get(ev->object),
diff --git a/src/examples/emotion/emotion_generic_subtitle_example.c b/src/examples/emotion/emotion_generic_subtitle_example.c
index 275298ba54..b5124c6d81 100644
--- a/src/examples/emotion/emotion_generic_subtitle_example.c
+++ b/src/examples/emotion/emotion_generic_subtitle_example.c
@@ -14,7 +14,7 @@
14#define HEIGHT (240) 14#define HEIGHT (240)
15 15
16static void 16static void
17_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) 17_playback_started_cb(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
18{ 18{
19 printf("Emotion object started playback.\n"); 19 printf("Emotion object started playback.\n");
20} 20}
diff --git a/src/examples/emotion/emotion_signals_example.c b/src/examples/emotion/emotion_signals_example.c
index 325a03e08e..76d68007d4 100644
--- a/src/examples/emotion/emotion_signals_example.c
+++ b/src/examples/emotion/emotion_signals_example.c
@@ -34,28 +34,28 @@ _display_info(Evas_Object *o)
34} 34}
35 35
36static void 36static void
37_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev) 37_playback_started_cb(void *data EINA_UNUSED, const Efl_Event *ev)
38{ 38{
39 printf(">>> Emotion object started playback.\n"); 39 printf(">>> Emotion object started playback.\n");
40 _display_info(ev->object); 40 _display_info(ev->object);
41} 41}
42 42
43static void 43static void
44_playback_finished_cb(void *data EINA_UNUSED, const Eo_Event *ev) 44_playback_finished_cb(void *data EINA_UNUSED, const Efl_Event *ev)
45{ 45{
46 printf(">>> Emotion object finished playback.\n"); 46 printf(">>> Emotion object finished playback.\n");
47 _display_info(ev->object); 47 _display_info(ev->object);
48} 48}
49 49
50static void 50static void
51_open_done_cb(void *data EINA_UNUSED, const Eo_Event *ev) 51_open_done_cb(void *data EINA_UNUSED, const Efl_Event *ev)
52{ 52{
53 printf(">>> Emotion object open done.\n"); 53 printf(">>> Emotion object open done.\n");
54 _display_info(ev->object); 54 _display_info(ev->object);
55} 55}
56 56
57static void 57static void
58_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev) 58_position_update_cb(void *data EINA_UNUSED, const Efl_Event *ev)
59{ 59{
60 printf(">>> Emotion object first position update.\n"); 60 printf(">>> Emotion object first position update.\n");
61 efl_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb, NULL); 61 efl_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb, NULL);
@@ -63,7 +63,7 @@ _position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev)
63} 63}
64 64
65static void 65static void
66_frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev) 66_frame_decode_cb(void *data EINA_UNUSED, const Efl_Event *ev)
67{ 67{
68 printf(">>> Emotion object first frame decode.\n"); 68 printf(">>> Emotion object first frame decode.\n");
69 efl_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, NULL); 69 efl_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, NULL);
@@ -71,14 +71,14 @@ _frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev)
71} 71}
72 72
73static void 73static void
74_decode_stop_cb(void *data EINA_UNUSED, const Eo_Event *ev) 74_decode_stop_cb(void *data EINA_UNUSED, const Efl_Event *ev)
75{ 75{
76 printf(">>> Emotion object decode stop.\n"); 76 printf(">>> Emotion object decode stop.\n");
77 _display_info(ev->object); 77 _display_info(ev->object);
78} 78}
79 79
80static void 80static void
81_frame_resize_cb(void *data EINA_UNUSED, const Eo_Event *ev) 81_frame_resize_cb(void *data EINA_UNUSED, const Efl_Event *ev)
82{ 82{
83 printf(">>> Emotion object frame resize.\n"); 83 printf(">>> Emotion object frame resize.\n");
84 _display_info(ev->object); 84 _display_info(ev->object);
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index 0bbfeac7bd..7288bfd75c 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -90,7 +90,7 @@ typedef struct _Scene_Data
90} Scene_Data; 90} Scene_Data;
91 91
92void 92void
93_cb_clicked(void *data EINA_UNUSED, const Eo_Event *event) 93_cb_clicked(void *data EINA_UNUSED, const Efl_Event *event)
94{ 94{
95 Eina_List *meshes = NULL, *l; 95 Eina_List *meshes = NULL, *l;
96 Evas_Canvas3D_Mesh *m; 96 Evas_Canvas3D_Mesh *m;
@@ -116,7 +116,7 @@ _cb_clicked(void *data EINA_UNUSED, const Eo_Event *event)
116} 116}
117 117
118void 118void
119_cb_collision(void *data EINA_UNUSED, const Eo_Event *event) 119_cb_collision(void *data EINA_UNUSED, const Efl_Event *event)
120{ 120{
121 Eina_List *meshes = NULL, *l; 121 Eina_List *meshes = NULL, *l;
122 Evas_Canvas3D_Mesh *m; 122 Evas_Canvas3D_Mesh *m;
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