From d5e321466e550620e8a1c6df5d5e598787a6a7d9 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Tue, 30 Aug 2016 13:34:10 +0100 Subject: [PATCH] Efl object: Rename Eo_Event -> Efl_Event. This is the last step of the Eo renaming efforts. --- src/benchmarks/eo/eo_bench_callbacks.c | 2 +- src/bin/elementary/test.c | 4 +- src/bin/elementary/test_anim.c | 2 +- src/bin/elementary/test_application_server.c | 12 ++-- src/bin/elementary/test_code.c | 4 +- src/bin/elementary/test_entry.c | 4 +- src/bin/elementary/test_events.c | 16 ++--- src/bin/elementary/test_grid_static.c | 6 +- src/bin/elementary/test_task_switcher.c | 4 +- src/bin/elementary/test_ui_box.c | 24 ++++---- src/bin/elementary/test_ui_grid.c | 20 +++---- src/bin/elementary/test_win_plug.c | 2 +- src/examples/ecore/ecore_audio_playback.c | 2 +- src/examples/ecore/ecore_audio_to_ogg.c | 2 +- src/examples/ecore/efl_io_copier_example.c | 28 ++++----- .../ecore/efl_io_copier_simple_example.c | 4 +- src/examples/ecore/efl_io_queue_example.c | 8 +-- .../ecore/efl_net_dialer_http_example.c | 14 ++--- src/examples/ecore/efl_net_server_example.c | 28 ++++----- src/examples/eio/efl_io_manager_ls.c | 2 +- src/examples/eio/eio_sentry.c | 2 +- src/examples/elementary/filemvc.c | 4 +- src/examples/emotion/emotion_basic_example.c | 2 +- src/examples/emotion/emotion_border_example.c | 12 ++-- .../emotion/emotion_generic_example.c | 12 ++-- .../emotion_generic_subtitle_example.c | 2 +- .../emotion/emotion_signals_example.c | 14 ++--- src/examples/evas/evas-3d-shadows.c | 4 +- src/lib/ecore/ecore_idler.c | 4 +- src/lib/ecore/ecore_main.c | 12 ++-- src/lib/ecore/ecore_private.h | 4 +- src/lib/ecore/ecore_timer.c | 8 +-- src/lib/ecore/efl_io_copier.c | 12 ++-- src/lib/ecore/efl_io_stderr.c | 4 +- src/lib/ecore/efl_io_stdin.c | 4 +- src/lib/ecore/efl_io_stdout.c | 4 +- src/lib/ecore/efl_loop_fd.c | 4 +- .../ecore_audio/ecore_audio_obj_out_pulse.c | 4 +- src/lib/ecore_con/ecore_con_url.c | 6 +- src/lib/ecore_con/efl_net_dialer_http.c | 6 +- src/lib/ecore_con/efl_net_server_fd.c | 4 +- src/lib/ecore_con/efl_net_server_tcp.c | 2 +- src/lib/ecore_con/efl_net_socket_fd.c | 6 +- src/lib/ecore_evas/ecore_evas.c | 4 +- .../ector/cairo/ector_renderer_cairo_shape.c | 2 +- src/lib/ector/gl/ector_renderer_gl_shape.c | 2 +- .../software/ector_renderer_software_shape.c | 2 +- src/lib/edje/edje_callbacks.c | 20 +++---- src/lib/edje/edje_multisense.c | 4 +- src/lib/edje/edje_private.h | 2 +- src/lib/edje/edje_program.c | 2 +- src/lib/efl/interfaces/efl_vpath_manager.c | 2 +- src/lib/elementary/efl_ui_box.c | 4 +- src/lib/elementary/efl_ui_frame.c | 2 +- src/lib/elementary/efl_ui_grid.c | 4 +- .../efl_ui_internal_text_interactive.c | 2 +- src/lib/elementary/efl_ui_text.c | 20 +++---- src/lib/elementary/efl_ui_video.c | 24 ++++---- src/lib/elementary/efl_ui_win.c | 14 ++--- src/lib/elementary/elc_combobox.c | 10 ++-- src/lib/elementary/elc_fileselector.c | 52 ++++++++--------- src/lib/elementary/elc_fileselector_button.c | 4 +- src/lib/elementary/elc_fileselector_entry.c | 6 +- src/lib/elementary/elc_hoversel.c | 14 ++--- src/lib/elementary/elc_multibuttonentry.c | 16 ++--- src/lib/elementary/elc_naviframe.c | 6 +- src/lib/elementary/elc_player.c | 52 ++++++++--------- src/lib/elementary/elc_popup.c | 16 ++--- src/lib/elementary/elm_app_server.c | 2 +- src/lib/elementary/elm_atspi_bridge.c | 58 +++++++++---------- src/lib/elementary/elm_box.c | 8 +-- src/lib/elementary/elm_cnp.c | 2 +- src/lib/elementary/elm_code_widget.c | 8 +-- src/lib/elementary/elm_color_class.c | 6 +- src/lib/elementary/elm_colorselector.c | 12 ++-- src/lib/elementary/elm_conform.c | 10 ++-- src/lib/elementary/elm_dayselector.c | 2 +- src/lib/elementary/elm_entry.c | 8 +-- src/lib/elementary/elm_genlist.c | 2 +- src/lib/elementary/elm_glview.c | 4 +- src/lib/elementary/elm_helper.c | 2 +- src/lib/elementary/elm_helper.h | 2 +- .../elm_interface_atspi_accessible.c | 4 +- .../elementary/elm_interface_atspi_image.c | 2 +- src/lib/elementary/elm_interface_scrollable.c | 30 +++++----- src/lib/elementary/elm_main.c | 2 +- src/lib/elementary/elm_map.c | 4 +- src/lib/elementary/elm_menu.c | 6 +- src/lib/elementary/elm_panel.c | 2 +- src/lib/elementary/elm_photo.c | 2 +- src/lib/elementary/elm_photocam.c | 6 +- src/lib/elementary/elm_spinner.c | 20 +++---- src/lib/elementary/elm_store.c | 4 +- src/lib/elementary/elm_view_form.c | 2 +- src/lib/elementary/elm_view_list.c | 20 +++---- src/lib/elementary/elm_widget.c | 20 +++---- src/lib/eo/Eo.h | 6 +- src/lib/eo/efl_object.eo | 2 +- src/lib/eo/eo_base_class.c | 8 +-- src/lib/eolian/database_type.c | 2 +- src/lib/evas/canvas/evas_callbacks.c | 10 ++-- src/lib/evas/canvas/evas_canvas3d_node.c | 4 +- .../evas/canvas/evas_canvas3d_node_callback.h | 4 +- src/lib/evas/canvas/evas_clip.c | 4 +- src/lib/evas/canvas/evas_device.c | 2 +- src/lib/evas/canvas/evas_events.c | 4 +- src/lib/evas/canvas/evas_filter_mixin.c | 2 +- src/lib/evas/canvas/evas_object_box.c | 6 +- src/lib/evas/canvas/evas_object_smart.c | 2 +- src/lib/evas/canvas/evas_object_table.c | 4 +- src/lib/evas/canvas/evas_object_textblock.c | 2 +- src/lib/evas/canvas/evas_object_vg.c | 2 +- src/lib/evas/canvas/evas_vg_node.c | 2 +- src/lib/evas/canvas/evas_vg_root_node.c | 2 +- .../datetime_input_ctxpopup.c | 8 +-- src/modules/elementary/prefs/elm_button.c | 2 +- src/modules/elementary/prefs/elm_check.c | 2 +- src/modules/elementary/prefs/elm_datetime.c | 2 +- src/modules/elementary/prefs/elm_entry.c | 2 +- src/modules/elementary/prefs/elm_slider.c | 2 +- src/modules/elementary/prefs/elm_spinner.c | 2 +- src/modules/ethumb/emotion/emotion.c | 6 +- .../evas/engines/gl_common/evas_gl_preload.c | 2 +- src/tests/ecore/ecore_test_args.c | 6 +- src/tests/ecore/ecore_test_ecore.c | 4 +- src/tests/ecore/ecore_test_ecore_audio.c | 6 +- src/tests/ecore/ecore_test_timer.c | 4 +- src/tests/eio/eio_model_test_monitor_add.c | 4 +- src/tests/eio/eio_test_manager.c | 4 +- src/tests/eio/eio_test_manager_xattr.c | 2 +- src/tests/eio/eio_test_sentry.c | 6 +- src/tests/eldbus/eldbus_test_eldbus_model.c | 2 +- src/tests/elementary/elm_test_genlist.c | 2 +- src/tests/elementary/elm_test_image.c | 4 +- src/tests/emotion/emotion_test_main-eo.c | 28 ++++----- .../composite_objects_main.c | 2 +- src/tests/eo/signals/signals_main.c | 8 +-- src/tests/eo/signals/signals_simple.c | 4 +- src/tests/eo/suite/eo_test_general.c | 12 ++-- src/tests/eolian/data/typedef_ref.c | 2 +- src/tests/eolian/data/typedef_ref_stub.c | 2 +- 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 @@ #include "class_simple.h" static void -_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) +_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) { } 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) static void _main_loop_death(void *data EINA_UNUSED, - const Eo_Event *ev EINA_UNUSED) + const Efl_Event *ev EINA_UNUSED) { struct elm_test *t; @@ -1068,7 +1068,7 @@ _main_loop_death(void *data EINA_UNUSED, * efl_main and not be static - must be a visible symbol with EAPI_MAIN infront */ EAPI_MAIN void efl_main(void *data EINA_UNUSED, - const Eo_Event *ev) + const Efl_Event *ev) { Efl_Loop_Arguments *arge = ev->info; 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[] = }; static void -_anim_tick(void *data EINA_UNUSED, const Eo_Event *event) +_anim_tick(void *data EINA_UNUSED, const Efl_Event *event) { Evas_Object *bub, *sh; 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) } static void -_close_cb(void *data, const Eo_Event *event) +_close_cb(void *data, const Efl_Event *event) { App_View_Context *ctx = data; if (ctx->win) @@ -49,14 +49,14 @@ _close_cb(void *data, const Eo_Event *event) } static void -_pause_cb(void *data, const Eo_Event *event EINA_UNUSED) +_pause_cb(void *data, const Efl_Event *event EINA_UNUSED) { App_View_Context *ctx = data; _text_update(ctx, "paused"); } static void -_resume_cb(void *data, const Eo_Event *event) +_resume_cb(void *data, const Efl_Event *event) { App_View_Context *ctx = data; @@ -71,7 +71,7 @@ _resume_cb(void *data, const Eo_Event *event) } static void -_view_del_cb(void *data, const Eo_Event *event) +_view_del_cb(void *data, const Efl_Event *event) { App_View_Context *ctx = data; @@ -117,7 +117,7 @@ _create_view_cb(Elm_App_Server *app_server, const Eina_Value *args EINA_UNUSED, } static void -_terminate_cb(void *data EINA_UNUSED, const Eo_Event *event) +_terminate_cb(void *data EINA_UNUSED, const Efl_Event *event) { const char *title = NULL; @@ -163,7 +163,7 @@ test_application_server_common(const char *pkg) } static void -_server_del_cb(void *data, const Eo_Event *event EINA_UNUSED) +_server_del_cb(void *data, const Efl_Event *event EINA_UNUSED) { Elm_App_Server **server = data; *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) } static void -_elm_code_test_line_clicked_cb(void *data EINA_UNUSED, const Eo_Event *event) +_elm_code_test_line_clicked_cb(void *data EINA_UNUSED, const Efl_Event *event) { Elm_Code_Line *line; @@ -34,7 +34,7 @@ _elm_code_test_line_clicked_cb(void *data EINA_UNUSED, const Eo_Event *event) } static void -_elm_code_test_line_done_cb(void *data EINA_UNUSED, const Eo_Event *event) +_elm_code_test_line_done_cb(void *data EINA_UNUSED, const Efl_Event *event) { Elm_Code_Line *line; 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 } static void -_context_menu_show_cb(void *data EINA_UNUSED, const Eo_Event *event) +_context_menu_show_cb(void *data EINA_UNUSED, const Efl_Event *event) { elm_entry_context_menu_clear(event->object); 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 * } static void -my_pop_dismissed(void *data EINA_UNUSED, const Eo_Event *ev) +my_pop_dismissed(void *data EINA_UNUSED, const Efl_Event *ev) { efl_del(ev->object); } 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 { } testdata; static void -_pointer_down(void *data, const Eo_Event *ev) +_pointer_down(void *data, const Efl_Event *ev) { testdata *td = data; td->down = 1; @@ -27,7 +27,7 @@ _pointer_down(void *data, const Eo_Event *ev) } static void -_pointer_move(void *data, const Eo_Event *ev) +_pointer_move(void *data, const Efl_Event *ev) { testdata *td = data; efl_del(td->evmove); @@ -35,7 +35,7 @@ _pointer_move(void *data, const Eo_Event *ev) } static void -_pointer_up(void *data, const Eo_Event *ev) +_pointer_up(void *data, const Efl_Event *ev) { testdata *td = data; td->down = 0; @@ -44,7 +44,7 @@ _pointer_up(void *data, const Eo_Event *ev) } static void -_key_down(void *data, const Eo_Event *ev) +_key_down(void *data, const Efl_Event *ev) { testdata *td = data; char str[1024]; @@ -92,7 +92,7 @@ _ecore_timeout_cb(void *data) #endif static void -_key_up(void *data, const Eo_Event *ev) +_key_up(void *data, const Efl_Event *ev) { testdata *td = data; @@ -113,7 +113,7 @@ _key_up(void *data, const Eo_Event *ev) } static void -_clicked_button1(void *data, const Eo_Event *ev EINA_UNUSED) +_clicked_button1(void *data, const Efl_Event *ev EINA_UNUSED) { testdata *td = data; Eo *txt = td->text; @@ -127,7 +127,7 @@ _clicked_button1(void *data, const Eo_Event *ev EINA_UNUSED) } static void -_clicked_button2(void *data, const Eo_Event *ev EINA_UNUSED) +_clicked_button2(void *data, const Efl_Event *ev EINA_UNUSED) { testdata *td = data; Eo *bt = td->button; @@ -160,7 +160,7 @@ _clicked_button2(void *data, const Eo_Event *ev EINA_UNUSED) } static void -_win_del(void *data, const Eo_Event *ev EINA_UNUSED) +_win_del(void *data, const Efl_Event *ev EINA_UNUSED) { testdata *td = data; 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) } static void -_api_bt_clicked(void *data, const Eo_Event *ev) +_api_bt_clicked(void *data, const Efl_Event *ev) { /* Will add here a SWITCH command containing code to modify test-object */ /* in accordance a->state value. */ api_data *a = data; @@ -80,7 +80,7 @@ _api_bt_clicked(void *data, const Eo_Event *ev) } static void -_ch_grid(void *data, const Eo_Event *ev) +_ch_grid(void *data, const Efl_Event *ev) { Eo *gd = data; int x, y, w, h; @@ -93,7 +93,7 @@ _ch_grid(void *data, const Eo_Event *ev) } static void -_win_del(void *data, const Eo_Event *ev EINA_UNUSED) +_win_del(void *data, const Efl_Event *ev EINA_UNUSED) { free(data); } 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 } static void -_app_view_prop_changed_cb(void *data EINA_UNUSED, const Eo_Event *event) +_app_view_prop_changed_cb(void *data EINA_UNUSED, const Efl_Event *event) { Elm_App_View_State state = ELM_APP_VIEW_STATE_UNKNOWN; @@ -269,7 +269,7 @@ _app_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU } static void -_view_list_update_cb(void *data EINA_UNUSED, const Eo_Event *event) +_view_list_update_cb(void *data EINA_UNUSED, const Efl_Event *event) { if (app_selected == event->object) _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 { } Weight_Mode; static void -weights_cb(void *data, const Eo_Event *event) +weights_cb(void *data, const Efl_Event *event) { Weight_Mode mode = elm_radio_state_value_get(event->object); @@ -61,28 +61,28 @@ weights_cb(void *data, const Eo_Event *event) } static void -user_min_slider_cb(void *data EINA_UNUSED, const Eo_Event *event) +user_min_slider_cb(void *data EINA_UNUSED, const Efl_Event *event) { int val = elm_slider_value_get(event->object); efl_gfx_size_hint_min_set(objects[3], val, val); } static void -padding_slider_cb(void *data, const Eo_Event *event) +padding_slider_cb(void *data, const Efl_Event *event) { int val = elm_slider_value_get(event->object); efl_pack_padding_set(data, val, val, EINA_TRUE); } static void -margin_slider_cb(void *data, const Eo_Event *event) +margin_slider_cb(void *data, const Efl_Event *event) { int val = elm_slider_value_get(event->object); efl_gfx_size_hint_margin_set(data, val, val, val, val); } static void -alignh_slider_cb(void *data, const Eo_Event *event) +alignh_slider_cb(void *data, const Efl_Event *event) { double av, val; val = elm_slider_value_get(event->object); @@ -91,7 +91,7 @@ alignh_slider_cb(void *data, const Eo_Event *event) } static void -alignv_slider_cb(void *data, const Eo_Event *event) +alignv_slider_cb(void *data, const Efl_Event *event) { double ah, val; val = elm_slider_value_get(event->object); @@ -103,21 +103,21 @@ static Efl_Ui_Box_Flow_Params s_flow_params = { 0, 0 }; static Eina_Bool flow = EINA_FALSE; static void -flow_check_cb(void *data, const Eo_Event *event) +flow_check_cb(void *data, const Efl_Event *event) { flow = elm_check_selected_get(event->object); efl_pack_layout_engine_set(data, flow ? EFL_UI_BOX_FLOW_CLASS : NULL, &s_flow_params); } static void -horiz_check_cb(void *data, const Eo_Event *event) +horiz_check_cb(void *data, const Efl_Event *event) { Eina_Bool chk = elm_check_selected_get(event->object); efl_orientation_set(data, chk ? EFL_ORIENT_HORIZONTAL : EFL_ORIENT_VERTICAL); } static void -homo_check_cb(void *data, const Eo_Event *event) +homo_check_cb(void *data, const Efl_Event *event) { Eina_Bool chk = elm_check_selected_get(event->object); s_flow_params.homogenous = chk; @@ -125,7 +125,7 @@ homo_check_cb(void *data, const Eo_Event *event) } static void -max_size_check_cb(void *data, const Eo_Event *event) +max_size_check_cb(void *data, const Efl_Event *event) { Eina_Bool chk = elm_check_selected_get(event->object); s_flow_params.max_size = chk; @@ -133,7 +133,7 @@ max_size_check_cb(void *data, const Eo_Event *event) } static void -left_check_cb(void *data, const Eo_Event *event) +left_check_cb(void *data, const Efl_Event *event) { Eina_Bool chk = elm_check_selected_get(event->object); if (chk) @@ -175,7 +175,7 @@ _custom_layout_update(Eo *pack, const void *data EINA_UNUSED) } static void -custom_check_cb(void *data, const Eo_Event *event) +custom_check_cb(void *data, const Efl_Event *event) { EFL_OBJECT_OVERRIDE_OPS_DEFINE(custom_layout_ops, 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 #define CUSTOM_ENGINE_CLASS _test_ui_grid_custom_engine_class_get() static void -weights_cb(void *data, const Eo_Event *event) +weights_cb(void *data, const Efl_Event *event) { Weight_Mode mode = elm_radio_state_value_get(event->object); Eo *grid = data; @@ -80,7 +80,7 @@ weights_cb(void *data, const Eo_Event *event) } static void -user_min_slider_cb(void *data EINA_UNUSED, const Eo_Event *event) +user_min_slider_cb(void *data EINA_UNUSED, const Efl_Event *event) { int val = elm_slider_value_get(event->object); for (int i = 0; i < 6; i++) @@ -88,21 +88,21 @@ user_min_slider_cb(void *data EINA_UNUSED, const Eo_Event *event) } static void -padding_slider_cb(void *data, const Eo_Event *event) +padding_slider_cb(void *data, const Efl_Event *event) { int val = elm_slider_value_get(event->object); efl_pack_padding_set(data, val, val, EINA_TRUE); } static void -margin_slider_cb(void *data, const Eo_Event *event) +margin_slider_cb(void *data, const Efl_Event *event) { int val = elm_slider_value_get(event->object); efl_gfx_size_hint_margin_set(data, val, val, val, val); } static void -btnmargins_slider_cb(void *data, const Eo_Event *event) +btnmargins_slider_cb(void *data, const Efl_Event *event) { int val = elm_slider_value_get(event->object); for (int i = 1; i < 7; i++) @@ -110,7 +110,7 @@ btnmargins_slider_cb(void *data, const Eo_Event *event) } static void -layout_updated_cb(void *data, const Eo_Event *event) +layout_updated_cb(void *data, const Efl_Event *event) { Elm_Label *o = data; char buf[64]; @@ -123,7 +123,7 @@ layout_updated_cb(void *data, const Eo_Event *event) } static void -child_evt_cb(void *data, const Eo_Event *event) +child_evt_cb(void *data, const Efl_Event *event) { Elm_Label *o = data; Efl_Gfx *it = event->info; @@ -491,13 +491,13 @@ btn_text(const char *str) } static void -remove_cb(void *data EINA_UNUSED, const Eo_Event *ev) +remove_cb(void *data EINA_UNUSED, const Efl_Event *ev) { efl_del(ev->object); } static void -append_cb(void *data, const Eo_Event *ev EINA_UNUSED) +append_cb(void *data, const Efl_Event *ev EINA_UNUSED) { Eo *grid = data; Eo *o = elm_button_add(grid); @@ -509,7 +509,7 @@ append_cb(void *data, const Eo_Event *ev EINA_UNUSED) } static void -clear_cb(void *data, const Eo_Event *ev EINA_UNUSED) +clear_cb(void *data, const Efl_Event *ev EINA_UNUSED) { Eo *grid = data; 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) } static void -_notify_end(void *data EINA_UNUSED, const Eo_Event *event) +_notify_end(void *data EINA_UNUSED, const Efl_Event *event) { efl_del(event->object); 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) return EINA_TRUE; } -static void _play_finished(void *data EINA_UNUSED, const Eo_Event *event) +static void _play_finished(void *data EINA_UNUSED, const Efl_Event *event) { const char *name; 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 @@ double volume = 1; Eina_List *inputs = NULL; -static void _play_finished(void *data EINA_UNUSED, const Eo_Event *event) +static void _play_finished(void *data EINA_UNUSED, const Efl_Event *event) { const char *name; 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; /* NOTE: input events are only used as debug, you can omit these */ static void -_input_can_read_changed(void *data EINA_UNUSED, const Eo_Event *event) +_input_can_read_changed(void *data EINA_UNUSED, const Efl_Event *event) { fprintf(stderr, "INFO: input can_read=%d\n", efl_io_reader_can_read_get(event->object)); } static void -_input_eos(void *data EINA_UNUSED, const Eo_Event *event) +_input_eos(void *data EINA_UNUSED, const Efl_Event *event) { fprintf(stderr, "INFO: input eos=%d\n", efl_io_reader_eos_get(event->object)); @@ -31,7 +31,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(input_cbs, /* NOTE: output events are only used as debug, you can omit these */ static void -_output_can_write_changed(void *data EINA_UNUSED, const Eo_Event *event) +_output_can_write_changed(void *data EINA_UNUSED, const Efl_Event *event) { fprintf(stderr, "INFO: output can_write=%d\n", efl_io_writer_can_write_get(event->object)); @@ -41,7 +41,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(output_cbs, { EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, _output_can_write_changed }); static void -_output_buffer_reallocated(void *data EINA_UNUSED, const Eo_Event *event) +_output_buffer_reallocated(void *data EINA_UNUSED, const Efl_Event *event) { Eina_Slice slice; @@ -60,7 +60,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(output_buffer_cbs, static void -_dialer_resolved(void *data EINA_UNUSED, const Eo_Event *event) +_dialer_resolved(void *data EINA_UNUSED, const Efl_Event *event) { fprintf(stderr, "INFO: dialer resolved '%s' to '%s'\n", efl_net_dialer_address_dial_get(event->object), @@ -68,7 +68,7 @@ _dialer_resolved(void *data EINA_UNUSED, const Eo_Event *event) } static void -_dialer_error(void *data EINA_UNUSED, const Eo_Event *event) +_dialer_error(void *data EINA_UNUSED, const Efl_Event *event) { const Eina_Error *perr = event->info; fprintf(stderr, "INFO: error: %d\n", *perr); @@ -77,7 +77,7 @@ _dialer_error(void *data EINA_UNUSED, const Eo_Event *event) } static void -_dialer_connected(void *data EINA_UNUSED, const Eo_Event *event) +_dialer_connected(void *data EINA_UNUSED, const Efl_Event *event) { fprintf(stderr, "INFO: dialer connected to '%s' (%s)\n", efl_net_dialer_address_dial_get(event->object), @@ -90,7 +90,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs, { EFL_NET_DIALER_EVENT_CONNECTED, _dialer_connected }); static void -_http_headers_done(void *data EINA_UNUSED, const Eo_Event *event) +_http_headers_done(void *data EINA_UNUSED, const Efl_Event *event) { Eina_Iterator *itr; Efl_Net_Http_Header *h; @@ -130,7 +130,7 @@ _http_headers_done(void *data EINA_UNUSED, const Eo_Event *event) } static void -_http_closed(void *data EINA_UNUSED, const Eo_Event *event) +_http_closed(void *data EINA_UNUSED, const Efl_Event *event) { uint64_t dn, dt, un, ut; @@ -151,7 +151,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(http_cbs, */ static void -_copier_done(void *data EINA_UNUSED, const Eo_Event *event) +_copier_done(void *data EINA_UNUSED, const Efl_Event *event) { Eo *destination = efl_io_copier_destination_get(event->object); @@ -214,7 +214,7 @@ _copier_done(void *data EINA_UNUSED, const Eo_Event *event) } static void -_copier_error(void *data EINA_UNUSED, const Eo_Event *event) +_copier_error(void *data EINA_UNUSED, const Efl_Event *event) { const Eina_Error *perr = event->info; fprintf(stderr, "INFO: error: %d\n", *perr); @@ -223,7 +223,7 @@ _copier_error(void *data EINA_UNUSED, const Eo_Event *event) } static void -_copier_progress(void *data EINA_UNUSED, const Eo_Event *event) +_copier_progress(void *data EINA_UNUSED, const Efl_Event *event) { uint64_t r, w, t; @@ -246,7 +246,7 @@ _copier_progress(void *data EINA_UNUSED, const Eo_Event *event) } static void -_copier_data(void *data EINA_UNUSED, const Eo_Event *event) +_copier_data(void *data EINA_UNUSED, const Efl_Event *event) { const Eina_Slice *slice = event->info; /* 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) } static void -_copier_line(void *data EINA_UNUSED, const Eo_Event *event) +_copier_line(void *data EINA_UNUSED, const Efl_Event *event) { const Eina_Slice *slice = event->info; 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 @@ static int retval = EXIT_SUCCESS; static void -_copier_done(void *data, const Eo_Event *event) +_copier_done(void *data, const Efl_Event *event) { fprintf(stderr, "INFO: done\n"); ecore_main_loop_quit(); } static void -_copier_error(void *data, const Eo_Event *event) +_copier_error(void *data, const Efl_Event *event) { const Eina_Error *perr = event->info; 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) } static void -_receiver_data(void *data EINA_UNUSED, const Eo_Event *event) +_receiver_data(void *data EINA_UNUSED, const Efl_Event *event) { Eina_Slice slice; @@ -73,7 +73,7 @@ _receiver_data(void *data EINA_UNUSED, const Eo_Event *event) } static void -_dialer_connected(void *data EINA_UNUSED, const Eo_Event *event) +_dialer_connected(void *data EINA_UNUSED, const Efl_Event *event) { fprintf(stderr, "INFO: connected to %s (%s)\n", efl_net_dialer_address_dial_get(event->object), @@ -83,7 +83,7 @@ _dialer_connected(void *data EINA_UNUSED, const Eo_Event *event) } static void -_copier_done(void *data EINA_UNUSED, const Eo_Event *event) +_copier_done(void *data EINA_UNUSED, const Efl_Event *event) { fprintf(stderr, "INFO: %s done\n", efl_name_get(event->object)); @@ -93,7 +93,7 @@ _copier_done(void *data EINA_UNUSED, const Eo_Event *event) } static void -_copier_error(void *data EINA_UNUSED, const Eo_Event *event) +_copier_error(void *data EINA_UNUSED, const Efl_Event *event) { const Eina_Error *perr = event->info; 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; static int waiting; static void -_closed(void *data EINA_UNUSED, const Eo_Event *event) +_closed(void *data EINA_UNUSED, const Efl_Event *event) { fprintf(stderr, "INFO: closed %s\n", efl_name_get(event->object)); } static void -_eos(void *data EINA_UNUSED, const Eo_Event *event) +_eos(void *data EINA_UNUSED, const Efl_Event *event) { fprintf(stderr, "INFO: eos %s\n", efl_name_get(event->object)); } static void -_connected(void *data EINA_UNUSED, const Eo_Event *event) +_connected(void *data EINA_UNUSED, const Efl_Event *event) { fprintf(stderr, "INFO: connected %s\n", efl_net_dialer_address_dial_get(event->object)); } static void -_resolved(void *data EINA_UNUSED, const Eo_Event *event) +_resolved(void *data EINA_UNUSED, const Efl_Event *event) { fprintf(stderr, "INFO: resolved %s => %s\n", efl_net_dialer_address_dial_get(event->object), @@ -39,7 +39,7 @@ _resolved(void *data EINA_UNUSED, const Eo_Event *event) } static void -_error(void *data EINA_UNUSED, const Eo_Event *event) +_error(void *data EINA_UNUSED, const Efl_Event *event) { const Eina_Error *perr = event->info; 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) } static void -_http_headers_done(void *data EINA_UNUSED, const Eo_Event *event) +_http_headers_done(void *data EINA_UNUSED, const Efl_Event *event) { Eo *o = event->object; Efl_Net_Http_Version ver = efl_net_dialer_http_version_get(o); @@ -81,7 +81,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs, { EFL_IO_READER_EVENT_EOS, _eos }); static void -_done(void *data EINA_UNUSED, const Eo_Event *event) +_done(void *data EINA_UNUSED, const Efl_Event *event) { waiting--; 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; /* NOTE: client i/o events are only used as debug, you can omit these */ static void -_client_can_read_changed(void *data EINA_UNUSED, const Eo_Event *event) +_client_can_read_changed(void *data EINA_UNUSED, const Efl_Event *event) { fprintf(stderr, "INFO: client %s can_read=%d\n", efl_net_socket_address_remote_get(event->object), @@ -19,7 +19,7 @@ _client_can_read_changed(void *data EINA_UNUSED, const Eo_Event *event) } static void -_client_can_write_changed(void *data EINA_UNUSED, const Eo_Event *event) +_client_can_write_changed(void *data EINA_UNUSED, const Efl_Event *event) { fprintf(stderr, "INFO: client %s can_write=%d\n", efl_net_socket_address_remote_get(event->object), @@ -27,14 +27,14 @@ _client_can_write_changed(void *data EINA_UNUSED, const Eo_Event *event) } static void -_client_eos(void *data EINA_UNUSED, const Eo_Event *event) +_client_eos(void *data EINA_UNUSED, const Efl_Event *event) { fprintf(stderr, "INFO: client %s eos.\n", efl_net_socket_address_remote_get(event->object)); } static void -_client_closed(void *data EINA_UNUSED, const Eo_Event *event) +_client_closed(void *data EINA_UNUSED, const Efl_Event *event) { fprintf(stderr, "INFO: client %s closed.\n", efl_net_socket_address_remote_get(event->object)); @@ -54,7 +54,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(client_cbs, /* echo copier is about the same socket, you can close it right away */ static void -_echo_copier_done(void *data EINA_UNUSED, const Eo_Event *event) +_echo_copier_done(void *data EINA_UNUSED, const Efl_Event *event) { Eo *copier = event->object; 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) } static void -_echo_copier_error(void *data EINA_UNUSED, const Eo_Event *event) +_echo_copier_error(void *data EINA_UNUSED, const Efl_Event *event) { Eo *copier = event->object; const Eina_Error *perr = event->info; @@ -128,7 +128,7 @@ _send_recv_done(Send_Recv_Data *d, Eo *copier) } static void -_send_copier_done(void *data, const Eo_Event *event) +_send_copier_done(void *data, const Efl_Event *event) { Eo *copier = event->object; Eo *buffer = efl_io_copier_source_get(copier); @@ -153,7 +153,7 @@ _send_copier_done(void *data, const Eo_Event *event) } static void -_send_copier_error(void *data, const Eo_Event *event) +_send_copier_error(void *data, const Efl_Event *event) { Eo *copier = event->object; Eo *buffer = efl_io_copier_source_get(copier); @@ -201,7 +201,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(send_copier_cbs, { EFL_IO_COPIER_EVENT_ERROR, _send_copier_error}); static void -_recv_copier_done(void *data, const Eo_Event *event) +_recv_copier_done(void *data, const Efl_Event *event) { Eo *copier = event->object; Eo *client = efl_io_copier_source_get(copier); @@ -234,7 +234,7 @@ _recv_copier_done(void *data, const Eo_Event *event) } static void -_recv_copier_error(void *data, const Eo_Event *event) +_recv_copier_error(void *data, const Efl_Event *event) { Eo *copier = event->object; Eo *buffer = efl_io_copier_source_get(copier); @@ -275,7 +275,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(recv_copier_cbs, * the string with socket identification. */ static void -_server_client_add(void *data EINA_UNUSED, const Eo_Event *event) +_server_client_add(void *data EINA_UNUSED, const Efl_Event *event) { Efl_Net_Socket *client = event->info; @@ -377,14 +377,14 @@ _server_client_add(void *data EINA_UNUSED, const Eo_Event *event) } static void -_server_client_rejected(void *data EINA_UNUSED, const Eo_Event *event) +_server_client_rejected(void *data EINA_UNUSED, const Efl_Event *event) { const char *client_address = event->info; fprintf(stderr, "INFO: rejected client %s\n", client_address); } static void -_server_error(void *data EINA_UNUSED, const Eo_Event *event) +_server_error(void *data EINA_UNUSED, const Efl_Event *event) { const Eina_Error *perr = event->info; fprintf(stderr, "INFO: error: %d\n", *perr); @@ -393,7 +393,7 @@ _server_error(void *data EINA_UNUSED, const Eo_Event *event) } static void -_server_serving(void *data EINA_UNUSED, const Eo_Event *event) +_server_serving(void *data EINA_UNUSED, const Efl_Event *event) { fprintf(stderr, "INFO: serving at %s\n", 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) efl_unref(job); } -void filter_cb(void *data EINA_UNUSED, const Eo_Event *event) +void filter_cb(void *data EINA_UNUSED, const Efl_Event *event) { Eio_Filter_Name_Data *event_info = event->info; 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 @@ #include void -sentry_cb(void *data EINA_UNUSED, const Eo_Event *event) +sentry_cb(void *data EINA_UNUSED, const Efl_Event *event) { Eio_Sentry_Event *event_info = event->info; 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 } static void -_list_selected_cb(void *data EINA_UNUSED, const Eo_Event *event) +_list_selected_cb(void *data EINA_UNUSED, const Efl_Event *event) { Efl_Model_Test_Filemvc_Data *priv = data; Eo *child = event->info; @@ -75,7 +75,7 @@ _promise_error(void *data, const Eina_Error err) } static void -_tree_selected_cb(void *data, const Eo_Event *event) +_tree_selected_cb(void *data, const Efl_Event *event) { Efl_Model_Test_Filemvc_Data *priv = data; 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 @@ #define HEIGHT (240) static void -_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) +_playback_started_cb(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) { printf("Emotion object started playback.\n"); } 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; static Eina_List *curfile = NULL; static void -_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) +_playback_started_cb(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) { printf("Emotion object started playback.\n"); } @@ -106,25 +106,25 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void * } static void -_frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) +_frame_decode_cb(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) { // fprintf(stderr, "smartcb: frame_decode\n"); } static void -_length_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) +_length_change_cb(void *data EINA_UNUSED, const Efl_Event *ev) { fprintf(stderr, "smartcb: length_change: %0.3f\n", emotion_object_play_length_get(ev->object)); } static void -_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev) +_position_update_cb(void *data EINA_UNUSED, const Efl_Event *ev) { fprintf(stderr, "smartcb: position_update: %0.3f\n", emotion_object_position_get(ev->object)); } static void -_progress_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) +_progress_change_cb(void *data EINA_UNUSED, const Efl_Event *ev) { fprintf(stderr, "smartcb: progress_change: %0.3f, %s\n", emotion_object_progress_status_get(ev->object), @@ -132,7 +132,7 @@ _progress_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) } static void -_frame_resize_cb(void *data EINA_UNUSED, const Eo_Event *ev) +_frame_resize_cb(void *data EINA_UNUSED, const Efl_Event *ev) { int w, h; 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; static Eina_List *curfile = NULL; static void -_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) +_playback_started_cb(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) { printf("Emotion object started playback.\n"); } static void -_playback_stopped_cb(void *data EINA_UNUSED, const Eo_Event *ev) +_playback_stopped_cb(void *data EINA_UNUSED, const Efl_Event *ev) { printf("Emotion playback stopped.\n"); 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 * } static void -_frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) +_frame_decode_cb(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) { // fprintf(stderr, "smartcb: frame_decode\n"); } static void -_length_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) +_length_change_cb(void *data EINA_UNUSED, const Efl_Event *ev) { fprintf(stderr, "smartcb: length_change: %0.3f\n", emotion_object_play_length_get(ev->object)); } static void -_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev) +_position_update_cb(void *data EINA_UNUSED, const Efl_Event *ev) { fprintf(stderr, "smartcb: position_update: %0.3f\n", emotion_object_position_get(ev->object)); } static void -_progress_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) +_progress_change_cb(void *data EINA_UNUSED, const Efl_Event *ev) { fprintf(stderr, "smartcb: progress_change: %0.3f, %s\n", 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 @@ #define HEIGHT (240) static void -_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) +_playback_started_cb(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) { printf("Emotion object started playback.\n"); } 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) } static void -_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev) +_playback_started_cb(void *data EINA_UNUSED, const Efl_Event *ev) { printf(">>> Emotion object started playback.\n"); _display_info(ev->object); } static void -_playback_finished_cb(void *data EINA_UNUSED, const Eo_Event *ev) +_playback_finished_cb(void *data EINA_UNUSED, const Efl_Event *ev) { printf(">>> Emotion object finished playback.\n"); _display_info(ev->object); } static void -_open_done_cb(void *data EINA_UNUSED, const Eo_Event *ev) +_open_done_cb(void *data EINA_UNUSED, const Efl_Event *ev) { printf(">>> Emotion object open done.\n"); _display_info(ev->object); } static void -_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev) +_position_update_cb(void *data EINA_UNUSED, const Efl_Event *ev) { printf(">>> Emotion object first position update.\n"); 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) } static void -_frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev) +_frame_decode_cb(void *data EINA_UNUSED, const Efl_Event *ev) { printf(">>> Emotion object first frame decode.\n"); 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) } static void -_decode_stop_cb(void *data EINA_UNUSED, const Eo_Event *ev) +_decode_stop_cb(void *data EINA_UNUSED, const Efl_Event *ev) { printf(">>> Emotion object decode stop.\n"); _display_info(ev->object); } static void -_frame_resize_cb(void *data EINA_UNUSED, const Eo_Event *ev) +_frame_resize_cb(void *data EINA_UNUSED, const Efl_Event *ev) { printf(">>> Emotion object frame resize.\n"); _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 } Scene_Data; void -_cb_clicked(void *data EINA_UNUSED, const Eo_Event *event) +_cb_clicked(void *data EINA_UNUSED, const Efl_Event *event) { Eina_List *meshes = NULL, *l; Evas_Canvas3D_Mesh *m; @@ -116,7 +116,7 @@ _cb_clicked(void *data EINA_UNUSED, const Eo_Event *event) } void -_cb_collision(void *data EINA_UNUSED, const Eo_Event *event) +_cb_collision(void *data EINA_UNUSED, const Efl_Event *event) { Eina_List *meshes = NULL, *l; 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 }; void -_ecore_factorized_idle_event_del(void *data, const Eo_Event *event EINA_UNUSED) +_ecore_factorized_idle_event_del(void *data, const Efl_Event *event EINA_UNUSED) { _ecore_factorized_idle_del(data); } void -_ecore_factorized_idle_process(void *data, const Eo_Event *event EINA_UNUSED) +_ecore_factorized_idle_process(void *data, const Efl_Event *event EINA_UNUSED) { Ecore_Factorized_Idle *idler = data; 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 } static void -_check_event_catcher_add(void *data, const Eo_Event *event) +_check_event_catcher_add(void *data, const Efl_Event *event) { const Efl_Callback_Array_Item *array = event->info; Efl_Loop_Data *pd = data; @@ -2788,7 +2788,7 @@ _check_event_catcher_add(void *data, const Eo_Event *event) } static void -_check_event_catcher_del(void *data, const Eo_Event *event) +_check_event_catcher_del(void *data, const Efl_Event *event) { const Efl_Callback_Array_Item *array = event->info; Efl_Loop_Data *pd = data; @@ -2902,8 +2902,8 @@ ecore_loop_arguments_send(int argc, const char **argv) eina_promise_then(job, _efl_loop_arguments_send, _efl_loop_arguments_cancel, arga); } -static void _efl_loop_timeout_force_cancel_cb(void *data, const Eo_Event *event EINA_UNUSED); -static void _efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED); +static void _efl_loop_timeout_force_cancel_cb(void *data, const Efl_Event *event EINA_UNUSED); +static void _efl_loop_timeout_cb(void *data, const Efl_Event *event EINA_UNUSED); EFL_CALLBACKS_ARRAY_DEFINE(timeout, { EFL_LOOP_TIMER_EVENT_TICK, _efl_loop_timeout_cb }, @@ -2913,13 +2913,13 @@ EFL_CALLBACKS_ARRAY_DEFINE(timeout, static void _efl_loop_internal_cancel(Efl_Internal_Promise *p); static void -_efl_loop_timeout_force_cancel_cb(void *data, const Eo_Event *event EINA_UNUSED) +_efl_loop_timeout_force_cancel_cb(void *data, const Efl_Event *event EINA_UNUSED) { _efl_loop_internal_cancel(data); } static void -_efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED) +_efl_loop_timeout_cb(void *data, const Efl_Event *event EINA_UNUSED) { Efl_Internal_Promise *t = data; 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* Ecore_Task_Cb func, const void *data); void *_ecore_factorized_idle_del(Ecore_Idler *idler); -void _ecore_factorized_idle_process(void *data, const Eo_Event *event); -void _ecore_factorized_idle_event_del(void *data, const Eo_Event *event); +void _ecore_factorized_idle_process(void *data, const Efl_Event *event); +void _ecore_factorized_idle_event_del(void *data, const Efl_Event *event); void _ecore_idler_all_call(Eo *loop); int _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) } static void -_check_timer_event_catcher_add(void *data, const Eo_Event *event) +_check_timer_event_catcher_add(void *data, const Efl_Event *event) { const Efl_Callback_Array_Item *array = event->info; Efl_Loop_Timer_Data *timer = data; @@ -95,7 +95,7 @@ _check_timer_event_catcher_add(void *data, const Eo_Event *event) } static void -_check_timer_event_catcher_del(void *data, const Eo_Event *event) +_check_timer_event_catcher_del(void *data, const Efl_Event *event) { const Efl_Callback_Array_Item *array = event->info; Efl_Loop_Timer_Data *timer = data; @@ -152,7 +152,7 @@ struct _Ecore_Timer_Legacy }; static void -_ecore_timer_legacy_del(void *data, const Eo_Event *event EINA_UNUSED) +_ecore_timer_legacy_del(void *data, const Efl_Event *event EINA_UNUSED) { Ecore_Timer_Legacy *legacy = data; @@ -160,7 +160,7 @@ _ecore_timer_legacy_del(void *data, const Eo_Event *event EINA_UNUSED) } static void -_ecore_timer_legacy_tick(void *data, const Eo_Event *event) +_ecore_timer_legacy_tick(void *data, const Efl_Event *event) { Ecore_Timer_Legacy *legacy = data; 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) } static void -_efl_io_copier_source_can_read_changed(void *data, const Eo_Event *event EINA_UNUSED) +_efl_io_copier_source_can_read_changed(void *data, const Efl_Event *event EINA_UNUSED) { Eo *o = data; 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 } static void -_efl_io_copier_source_eos(void *data, const Eo_Event *event EINA_UNUSED) +_efl_io_copier_source_eos(void *data, const Efl_Event *event EINA_UNUSED) { Eo *o = data; 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) } static void -_efl_io_copier_source_resized(void *data, const Eo_Event *event EINA_UNUSED) +_efl_io_copier_source_resized(void *data, const Efl_Event *event EINA_UNUSED) { Eo *o = data; 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) } static void -_efl_io_copier_source_closed(void *data, const Eo_Event *event EINA_UNUSED) +_efl_io_copier_source_closed(void *data, const Efl_Event *event EINA_UNUSED) { Eo *o = data; 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) } static void -_efl_io_copier_destination_can_write_changed(void *data, const Eo_Event *event EINA_UNUSED) +_efl_io_copier_destination_can_write_changed(void *data, const Efl_Event *event EINA_UNUSED) { Eo *o = data; 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 } static void -_efl_io_copier_destination_closed(void *data, const Eo_Event *event EINA_UNUSED) +_efl_io_copier_destination_closed(void *data, const Efl_Event *event EINA_UNUSED) { Eo *o = data; 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 @@ #define MY_CLASS EFL_IO_STDERR_CLASS static void -_efl_io_stderr_event_write(void *data EINA_UNUSED, const Eo_Event *event) +_efl_io_stderr_event_write(void *data EINA_UNUSED, const Efl_Event *event) { efl_io_writer_can_write_set(event->object, EINA_TRUE); } static void -_efl_io_stderr_event_error(void *data EINA_UNUSED, const Eo_Event *event) +_efl_io_stderr_event_error(void *data EINA_UNUSED, const Efl_Event *event) { efl_io_writer_can_write_set(event->object, EINA_FALSE); } 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 @@ #define MY_CLASS EFL_IO_STDIN_CLASS static void -_efl_io_stdin_event_read(void *data EINA_UNUSED, const Eo_Event *event) +_efl_io_stdin_event_read(void *data EINA_UNUSED, const Efl_Event *event) { efl_io_reader_can_read_set(event->object, EINA_TRUE); efl_io_reader_eos_set(event->object, EINA_FALSE); } static void -_efl_io_stdin_event_error(void *data EINA_UNUSED, const Eo_Event *event) +_efl_io_stdin_event_error(void *data EINA_UNUSED, const Efl_Event *event) { efl_io_reader_can_read_set(event->object, EINA_FALSE); 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 @@ #define MY_CLASS EFL_IO_STDOUT_CLASS static void -_efl_io_stdout_event_write(void *data EINA_UNUSED, const Eo_Event *event) +_efl_io_stdout_event_write(void *data EINA_UNUSED, const Efl_Event *event) { efl_io_writer_can_write_set(event->object, EINA_TRUE); } static void -_efl_io_stdout_event_error(void *data EINA_UNUSED, const Eo_Event *event) +_efl_io_stdout_event_error(void *data EINA_UNUSED, const Efl_Event *event) { efl_io_writer_can_write_set(event->object, EINA_FALSE); } 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) } static void -_check_fd_event_catcher_add(void *data, const Eo_Event *event) +_check_fd_event_catcher_add(void *data, const Efl_Event *event) { const Efl_Callback_Array_Item *array = event->info; Efl_Loop_Fd_Data *fd = data; @@ -120,7 +120,7 @@ _check_fd_event_catcher_add(void *data, const Eo_Event *event) } static void -_check_fd_event_catcher_del(void *data, const Eo_Event *event) +_check_fd_event_catcher_del(void *data, const Efl_Event *event) { const Efl_Callback_Array_Item *array = event->info; 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) } } -static void _update_samplerate_cb(void *data EINA_UNUSED, const Eo_Event *event) +static void _update_samplerate_cb(void *data EINA_UNUSED, const Efl_Event *event) { pa_stream *stream = NULL; int samplerate = 0; @@ -146,7 +146,7 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in) return ret; } -static void _delayed_attach_cb(void *data, const Eo_Event *event) +static void _delayed_attach_cb(void *data, const Efl_Event *event) { Eo *in = data; 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) extern Ecore_Con_Socks *_ecore_con_proxy_global; static void -_efl_network_url_event_complete_cb(void *data EINA_UNUSED, const Eo_Event *event) +_efl_network_url_event_complete_cb(void *data EINA_UNUSED, const Efl_Event *event) { Ecore_Con_Event_Url_Complete *e, *f = event->info; @@ -182,7 +182,7 @@ _efl_network_url_event_complete_cb(void *data EINA_UNUSED, const Eo_Event *event } static void -_efl_network_url_event_data_cb(void *data EINA_UNUSED, const Eo_Event *event) +_efl_network_url_event_data_cb(void *data EINA_UNUSED, const Efl_Event *event) { Ecore_Con_Event_Url_Data *e; 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) } static void -_efl_network_url_event_progress_cb(void *data EINA_UNUSED, const Eo_Event *event) +_efl_network_url_event_progress_cb(void *data EINA_UNUSED, const Efl_Event *event) { Ecore_Con_Event_Url_Progress *e, *f = event->info; 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) } static void -_efl_net_dialer_http_curlm_timer_do(void *data, const Eo_Event *ev EINA_UNUSED) +_efl_net_dialer_http_curlm_timer_do(void *data, const Efl_Event *ev EINA_UNUSED) { Efl_Net_Dialer_Http_Curlm *cm = data; CURLMcode r; @@ -312,7 +312,7 @@ _efl_net_dialer_http_curlm_timer_schedule(CURLM *multi EINA_UNUSED, long timeout // it seems the Eo_Loop_Fd isn't working properly when we change connections... // as it's still built on top of Ecore_Fd_Handler, then use it directly. static void -_efl_net_dialer_http_curlm_event_fd_read(void *data, const Eo_Event *event) +_efl_net_dialer_http_curlm_event_fd_read(void *data, const Efl_Event *event) { Efl_Net_Dialer_Http_Curlm *cm = data; 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) } static void -_efl_net_dialer_http_curlm_event_fd_write(void *data, const Eo_Event *event) +_efl_net_dialer_http_curlm_event_fd_write(void *data, const Efl_Event *event) { Efl_Net_Dialer_Http_Curlm *cm = data; 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 } static void -_efl_net_server_fd_event_read(void *data EINA_UNUSED, const Eo_Event *event) +_efl_net_server_fd_event_read(void *data EINA_UNUSED, const Efl_Event *event) { Eo *o = event->object; unsigned int count, limit; @@ -101,7 +101,7 @@ _efl_net_server_fd_event_read(void *data EINA_UNUSED, const Eo_Event *event) } static void -_efl_net_server_fd_event_error(void *data EINA_UNUSED, const Eo_Event *event) +_efl_net_server_fd_event_error(void *data EINA_UNUSED, const Efl_Event *event) { Eo *o = event->object; 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 static Efl_Callback_Array_Item *_efl_net_server_tcp_client_cbs(void); static void -_efl_net_server_tcp_client_event_closed(void *data, const Eo_Event *event) +_efl_net_server_tcp_client_event_closed(void *data, const Efl_Event *event) { Eo *server = data; 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 } Efl_Net_Socket_Fd_Data; static void -_efl_net_socket_fd_event_read(void *data EINA_UNUSED, const Eo_Event *event) +_efl_net_socket_fd_event_read(void *data EINA_UNUSED, const Efl_Event *event) { efl_io_reader_can_read_set(event->object, EINA_TRUE); efl_io_reader_eos_set(event->object, EINA_FALSE); } static void -_efl_net_socket_fd_event_write(void *data EINA_UNUSED, const Eo_Event *event) +_efl_net_socket_fd_event_write(void *data EINA_UNUSED, const Efl_Event *event) { efl_io_writer_can_write_set(event->object, EINA_TRUE); } static void -_efl_net_socket_fd_event_error(void *data EINA_UNUSED, const Eo_Event *event) +_efl_net_socket_fd_event_error(void *data EINA_UNUSED, const Efl_Event *event) { efl_io_writer_can_write_set(event->object, EINA_FALSE); 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) } static void -_check_animator_event_catcher_add(void *data, const Eo_Event *event) +_check_animator_event_catcher_add(void *data, const Efl_Event *event) { const Efl_Callback_Array_Item *array = event->info; Ecore_Evas *ee = data; @@ -3196,7 +3196,7 @@ _check_animator_event_catcher_add(void *data, const Eo_Event *event) } static void -_check_animator_event_catcher_del(void *data, const Eo_Event *event) +_check_animator_event_catcher_del(void *data, const Efl_Event *event) { const Efl_Callback_Array_Item *array = event->info; 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 }; static void -_ector_renderer_cairo_shape_path_changed(void *data, const Eo_Event *event EINA_UNUSED) +_ector_renderer_cairo_shape_path_changed(void *data, const Efl_Event *event EINA_UNUSED) { Ector_Renderer_Cairo_Shape_Data *pd = data; 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 }; static void -_ector_renderer_gl_shape_path_changed(void *data, const Eo_Event *event EINA_UNUSED) +_ector_renderer_gl_shape_path_changed(void *data, const Efl_Event *event EINA_UNUSED) { Ector_Renderer_GL_Shape_Data *pd = data; 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, static void -_ector_renderer_software_shape_path_changed(void *data, const Eo_Event *event EINA_UNUSED) +_ector_renderer_software_shape_path_changed(void *data, const Efl_Event *event EINA_UNUSED) { Ector_Renderer_Software_Shape_Data *pd = data; 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 @@ #include "interfaces/efl_common_internal.h" static void -_edje_hold_signal_cb(void *data, const Eo_Event *event) +_edje_hold_signal_cb(void *data, const Efl_Event *event) { Efl_Input_Hold *ev; Edje *ed; @@ -21,7 +21,7 @@ _edje_hold_signal_cb(void *data, const Eo_Event *event) } static void -_edje_focus_in_signal_cb(void *data, const Eo_Event *event) +_edje_focus_in_signal_cb(void *data, const Efl_Event *event) { Edje *ed; Edje_Real_Part *rp; @@ -35,7 +35,7 @@ _edje_focus_in_signal_cb(void *data, const Eo_Event *event) } static void -_edje_focus_out_signal_cb(void *data, const Eo_Event *event) +_edje_focus_out_signal_cb(void *data, const Efl_Event *event) { Edje *ed; Edje_Real_Part *rp; @@ -49,7 +49,7 @@ _edje_focus_out_signal_cb(void *data, const Eo_Event *event) } static void -_edje_mouse_in_signal_cb(void *data, const Eo_Event *event) +_edje_mouse_in_signal_cb(void *data, const Efl_Event *event) { Efl_Input_Pointer_Data *ev; Edje *ed; @@ -68,7 +68,7 @@ _edje_mouse_in_signal_cb(void *data, const Eo_Event *event) } static void -_edje_mouse_out_signal_cb(void *data, const Eo_Event *event) +_edje_mouse_out_signal_cb(void *data, const Efl_Event *event) { Efl_Input_Pointer_Data *ev; Edje *ed; @@ -87,7 +87,7 @@ _edje_mouse_out_signal_cb(void *data, const Eo_Event *event) } static void -_edje_mouse_down_signal_cb(void *data, const Eo_Event *event) +_edje_mouse_down_signal_cb(void *data, const Efl_Event *event) { Efl_Input_Pointer_Data *ev; Edje *ed; @@ -156,7 +156,7 @@ _edje_mouse_down_signal_cb(void *data, const Eo_Event *event) } static void -_edje_mouse_up_signal_cb(void *data, const Eo_Event *event) +_edje_mouse_up_signal_cb(void *data, const Efl_Event *event) { Efl_Input_Pointer_Data *ev; Edje *ed; @@ -229,7 +229,7 @@ _edje_mouse_up_signal_cb(void *data, const Eo_Event *event) } static void -_edje_mouse_move_signal_cb(void *data, const Eo_Event *event) +_edje_mouse_move_signal_cb(void *data, const Efl_Event *event) { Efl_Input_Pointer_Data *ev; Edje *ed; @@ -336,7 +336,7 @@ _edje_mouse_move_signal_cb(void *data, const Eo_Event *event) } static void -_edje_mouse_wheel_signal_cb(void *data, const Eo_Event *event) +_edje_mouse_wheel_signal_cb(void *data, const Efl_Event *event) { Efl_Input_Pointer_Data *ev; Edje *ed; @@ -361,7 +361,7 @@ _edje_mouse_wheel_signal_cb(void *data, const Eo_Event *event) } void -_edje_timer_cb(void *data, const Eo_Event *event EINA_UNUSED) +_edje_timer_cb(void *data, const Efl_Event *event EINA_UNUSED) { double t; 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; static Eina_Bool outfail = EINA_FALSE; static void -_play_finished(void *data EINA_UNUSED, const Eo_Event *event) +_play_finished(void *data EINA_UNUSED, const Efl_Event *event) { efl_del(event->object); } static void -_out_fail(void *data EINA_UNUSED, const Eo_Event *event) +_out_fail(void *data EINA_UNUSED, const Efl_Event *event) { outfail = EINA_TRUE; 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); int _edje_part_dragable_calc(Edje *ed, Edje_Real_Part *ep, FLOAT_T *x, FLOAT_T *y); void _edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y); -void _edje_timer_cb(void *data, const Eo_Event *event); +void _edje_timer_cb(void *data, const Efl_Event *event); Eina_Bool _edje_pending_timer_cb(void *data); void _edje_callbacks_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp); void _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; static Eina_Bool _edje_animator_cb(void *data) { - const Eo_Event event = { NULL, NULL, NULL }; + const Efl_Event event = { NULL, NULL, NULL }; _edje_timer_cb(data, &event); return EINA_TRUE; } 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) } static void -_cb_vpath_del(void *data, const Eo_Event *event) +_cb_vpath_del(void *data, const Efl_Event *event) { efl_vpath_manager_unregister(EFL_VPATH_MANAGER_CLASS, event->object); 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) } static void -_child_added_cb_proxy(void *data, const Eo_Event *event) +_child_added_cb_proxy(void *data, const Efl_Event *event) { Evas_Object *box = data; Evas_Object_Box_Option *opt = event->info; @@ -33,7 +33,7 @@ _child_added_cb_proxy(void *data, const Eo_Event *event) } static void -_child_removed_cb_proxy(void *data, const Eo_Event *event) +_child_removed_cb_proxy(void *data, const Efl_Event *event) { Evas_Object *box = data; 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 } static void -_recalc(void *data, const Eo_Event *event EINA_UNUSED) +_recalc(void *data, const Efl_Event *event EINA_UNUSED) { elm_layout_sizing_eval(data); } 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 @@ typedef struct _Custom_Table_Data Custom_Table_Data; -static void _subobj_del_cb(void *data, const Eo_Event *event); +static void _subobj_del_cb(void *data, const Efl_Event *event); static void _item_remove(Efl_Ui_Grid *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj); struct _Custom_Table_Data @@ -338,7 +338,7 @@ _efl_ui_grid_efl_pack_pack_padding_get(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED } static void -_subobj_del_cb(void *data, const Eo_Event *event) +_subobj_del_cb(void *data, const Efl_Event *event) { Efl_Ui_Grid *obj = data; 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 } static void -_sel_cursor_changed(void *data, const Eo_Event *event EINA_UNUSED) +_sel_cursor_changed(void *data, const Efl_Event *event EINA_UNUSED) { Efl_Canvas_Text_Cursor *obj = data; 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 static void _magnifier_move(void *data); static void _update_decorations(Eo *obj); static void _create_text_cursors(Efl_Ui_Text_Data *sd); -static void _efl_ui_text_changed_cb(void *data EINA_UNUSED, const Eo_Event *event); -static void _efl_ui_text_selection_changed_cb(void *data EINA_UNUSED, const Eo_Event *event); -static void _efl_ui_text_cursor_changed_cb(void *data EINA_UNUSED, const Eo_Event *event); +static void _efl_ui_text_changed_cb(void *data EINA_UNUSED, const Efl_Event *event); +static void _efl_ui_text_selection_changed_cb(void *data EINA_UNUSED, const Efl_Event *event); +static void _efl_ui_text_cursor_changed_cb(void *data EINA_UNUSED, const Efl_Event *event); static void _efl_ui_text_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED); static void _efl_ui_text_select_none(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd); static 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) } static void -_hover_dismissed_cb(void *data, const Eo_Event *event EINA_UNUSED) +_hover_dismissed_cb(void *data, const Efl_Event *event EINA_UNUSED) { EFL_UI_TEXT_DATA_GET(data, sd); @@ -2260,7 +2260,7 @@ _anchor_hover_del_cb(void *data, } static void -_anchor_hover_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) +_anchor_hover_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED) { EFL_UI_TEXT_DATA_GET(data, sd); _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 } static void -_cb_added(void *data EINA_UNUSED, const Eo_Event *ev) +_cb_added(void *data EINA_UNUSED, const Efl_Event *ev) { const Efl_Callback_Array_Item *event = ev->info; @@ -3564,7 +3564,7 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *ev) } static void -_cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev) +_cb_deleted(void *data EINA_UNUSED, const Efl_Event *ev) { const Efl_Callback_Array_Item *event = ev->info; @@ -5398,14 +5398,14 @@ _decoration_defer_all(Eo *obj) } static void -_efl_ui_text_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) +_efl_ui_text_changed_cb(void *data, const Efl_Event *event EINA_UNUSED) { _decoration_defer_all(data); _entry_changed_handle(data, EFL_UI_TEXT_EVENT_CHANGED); } static void -_efl_ui_text_cursor_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) +_efl_ui_text_cursor_changed_cb(void *data, const Efl_Event *event EINA_UNUSED) { EFL_UI_TEXT_DATA_GET(data, sd); sd->cur_changed = EINA_TRUE; @@ -5415,7 +5415,7 @@ _efl_ui_text_cursor_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) } static void -_efl_ui_text_selection_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) +_efl_ui_text_selection_changed_cb(void *data, const Efl_Event *event EINA_UNUSED) { Eo *obj = data; 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[] = { static void -_on_open_done(void *data, const Eo_Event *event); +_on_open_done(void *data, const Efl_Event *event); static void -_on_playback_started(void *data, const Eo_Event *event); +_on_playback_started(void *data, const Efl_Event *event); static void -_on_playback_finished(void *data, const Eo_Event *event); +_on_playback_finished(void *data, const Efl_Event *event); static void -_on_aspect_ratio_updated(void *data, const Eo_Event *event); +_on_aspect_ratio_updated(void *data, const Efl_Event *event); static void -_on_title_changed(void *data, const Eo_Event *event); +_on_title_changed(void *data, const Efl_Event *event); static void -_on_audio_level_changed(void *data, const Eo_Event *event); +_on_audio_level_changed(void *data, const Efl_Event *event); static Eina_Bool _key_action_move(Evas_Object *obj, const char *params); static Eina_Bool _key_action_play(Evas_Object *obj, const char *params); @@ -158,13 +158,13 @@ _on_size_hints_changed(void *data EINA_UNUSED, } static void -_on_open_done(void *data, const Eo_Event *event EINA_UNUSED) +_on_open_done(void *data, const Efl_Event *event EINA_UNUSED) { elm_layout_signal_emit(data, "elm,video,open", "elm"); } static void -_on_playback_started(void *data, const Eo_Event *event EINA_UNUSED) +_on_playback_started(void *data, const Efl_Event *event EINA_UNUSED) { elm_layout_signal_emit(data, "elm,video,play", "elm"); @@ -173,7 +173,7 @@ _on_playback_started(void *data, const Eo_Event *event EINA_UNUSED) } static void -_on_playback_finished(void *data, const Eo_Event *event EINA_UNUSED) +_on_playback_finished(void *data, const Efl_Event *event EINA_UNUSED) { EFL_UI_VIDEO_DATA_GET(data, sd); emotion_object_play_set(sd->emotion, EINA_FALSE); @@ -181,13 +181,13 @@ _on_playback_finished(void *data, const Eo_Event *event EINA_UNUSED) } static void -_on_aspect_ratio_updated(void *data, const Eo_Event *event EINA_UNUSED) +_on_aspect_ratio_updated(void *data, const Efl_Event *event EINA_UNUSED) { elm_layout_sizing_eval(data); } static void -_on_title_changed(void *data, const Eo_Event *event EINA_UNUSED) +_on_title_changed(void *data, const Efl_Event *event EINA_UNUSED) { const char *title; @@ -199,7 +199,7 @@ _on_title_changed(void *data, const Eo_Event *event EINA_UNUSED) } static void -_on_audio_level_changed(void *data, const Eo_Event *event EINA_UNUSED) +_on_audio_level_changed(void *data, const Efl_Event *event EINA_UNUSED) { (void)data; } 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 /* forward events sent to evas to the window */ static void -_evas_event_key_cb(void *data, const Eo_Event *ev) +_evas_event_key_cb(void *data, const Efl_Event *ev) { Eo *win = data; Eo *evt = ev->info; @@ -1682,7 +1682,7 @@ _evas_event_key_cb(void *data, const Eo_Event *ev) } static void -_evas_event_pointer_cb(void *data, const Eo_Event *ev) +_evas_event_pointer_cb(void *data, const Efl_Event *ev) { Eo *win = data; Eo *evt = ev->info; @@ -1697,7 +1697,7 @@ _evas_event_pointer_cb(void *data, const Eo_Event *ev) /* feed events from the window to evas - for fake inputs */ static void -_evas_event_key_feed_fake_cb(void *data, const Eo_Event *ev) +_evas_event_key_feed_fake_cb(void *data, const Efl_Event *ev) { Eo *evas = data; Efl_Input_Event *evt = ev->info; @@ -1717,7 +1717,7 @@ _evas_event_key_feed_fake_cb(void *data, const Eo_Event *ev) } static void -_evas_event_pointer_feed_fake_cb(void *data, const Eo_Event *ev) +_evas_event_pointer_feed_fake_cb(void *data, const Efl_Event *ev) { Eo *evas = data; Efl_Input_Event *evt = ev->info; @@ -1832,7 +1832,7 @@ _elm_win_evas_device_changed(void *data, } static void -_win_event_add_cb(void *data, const Eo_Event *ev) +_win_event_add_cb(void *data, const Efl_Event *ev) { const Efl_Callback_Array_Item *array = ev->info; Efl_Ui_Win_Data *sd = data; @@ -1941,7 +1941,7 @@ _win_event_add_cb(void *data, const Eo_Event *ev) } static void -_win_event_del_cb(void *data, const Eo_Event *ev) +_win_event_del_cb(void *data, const Efl_Event *ev) { const Efl_Callback_Array_Item *array = ev->info; Efl_Ui_Win_Data *sd = data; @@ -5797,7 +5797,7 @@ _elm_win_focus_auto_hide(Evas_Object *obj) } static void -_on_atspi_bus_connected(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) +_on_atspi_bus_connected(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) { Evas_Object *win; 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) } static void -_on_hover_clicked(void *data, const Eo_Event *event) +_on_hover_clicked(void *data, const Efl_Event *event) { const char *dismissstr; @@ -213,7 +213,7 @@ _on_item_pressed(void *data , Evas_Object *obj EINA_UNUSED, void *event) } static void -_gl_filter_finished_cb(void *data, const Eo_Event *event) +_gl_filter_finished_cb(void *data, const Efl_Event *event) { char buf[1024]; ELM_COMBOBOX_DATA_GET(data, sd); @@ -245,20 +245,20 @@ _gl_filter_finished_cb(void *data, const Eo_Event *event) } static void -_on_aborted(void *data, const Eo_Event *event EINA_UNUSED) +_on_aborted(void *data, const Efl_Event *event EINA_UNUSED) { ELM_COMBOBOX_DATA_GET(data, sd); if (sd->expanded) elm_combobox_hover_end(data); } static void -_on_changed(void *data, const Eo_Event *event EINA_UNUSED) +_on_changed(void *data, const Efl_Event *event EINA_UNUSED) { efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CHANGED, NULL); } static void -_on_clicked(void *data, const Eo_Event *event EINA_UNUSED) +_on_clicked(void *data, const Efl_Event *event EINA_UNUSED) { elm_combobox_hover_begin(data); } 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[] = { {NULL, NULL} }; -static void _ok(void *data, const Eo_Event *event); -static void _canc(void *data, const Eo_Event *event); -static void _on_dir_up(void *data, const Eo_Event *event); +static void _ok(void *data, const Efl_Event *event); +static void _canc(void *data, const Efl_Event *event); +static void _on_dir_up(void *data, const Efl_Event *event); static void _populate(Evas_Object *obj, Efl_Model *model, Elm_Object_Item *parent_it, Efl_Model *selected); static Elm_Fileselector_Item_Data *_selected_item_data_get(Elm_Fileselector_Data *sd); -static void _resource_created(void *, const Eo_Event *); -static void _resource_deleted(void *, const Eo_Event *); +static void _resource_created(void *, const Efl_Event *); +static void _resource_deleted(void *, const Efl_Event *); static void _listing_request_cleanup(Listing_Request *); EFL_CALLBACKS_ARRAY_DEFINE(monitoring_callbacks, @@ -243,7 +243,7 @@ _elm_fileselector_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd) static Eina_Bool _key_action_select(Evas_Object *obj, const char *params EINA_UNUSED) { - Eo_Event event = {}; + Efl_Event event = {}; _ok(obj, &event); return EINA_TRUE; } @@ -251,7 +251,7 @@ _key_action_select(Evas_Object *obj, const char *params EINA_UNUSED) static Eina_Bool _key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED) { - Eo_Event event = {}; + Efl_Event event = {}; _canc(obj, &event); return EINA_TRUE; } @@ -1008,7 +1008,7 @@ _populate(Evas_Object *obj, } static void -_on_list_expanded(void *data, const Eo_Event *event) +_on_list_expanded(void *data, const Efl_Event *event) { Elm_Object_Item *it = event->info; 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) } static void -_on_list_contracted(void *data EINA_UNUSED, const Eo_Event *event) +_on_list_contracted(void *data EINA_UNUSED, const Efl_Event *event) { Elm_Object_Item *it = event->info; @@ -1025,7 +1025,7 @@ _on_list_contracted(void *data EINA_UNUSED, const Eo_Event *event) } static void -_on_list_expand_req(void *data EINA_UNUSED, const Eo_Event *event) +_on_list_expand_req(void *data EINA_UNUSED, const Efl_Event *event) { Elm_Object_Item *it = event->info; @@ -1033,7 +1033,7 @@ _on_list_expand_req(void *data EINA_UNUSED, const Eo_Event *event) } static void -_on_list_contract_req(void *data EINA_UNUSED, const Eo_Event *event) +_on_list_contract_req(void *data EINA_UNUSED, const Efl_Event *event) { Elm_Object_Item *it = event->info; @@ -1088,7 +1088,7 @@ _schedule_populate(Evas_Object *fs, } static void -_on_item_activated(void *data, const Eo_Event *event) +_on_item_activated(void *data, const Efl_Event *event) { //This event_info could be a list or gengrid item Elm_Object_Item *it = event->info; @@ -1140,7 +1140,7 @@ _clear_selections(Elm_Fileselector_Data *sd, Elm_Object_Item *last_selected) } static void -_on_item_selected(void *data, const Eo_Event *event) +_on_item_selected(void *data, const Efl_Event *event) { //This event_info could be a list or gengrid item Elm_Object_Item *it = event->info; @@ -1231,7 +1231,7 @@ _on_item_selected(void *data, const Eo_Event *event) } static void -_on_item_unselected(void *data, const Eo_Event *event) +_on_item_unselected(void *data, const Efl_Event *event) { Eina_List *li, *l; const Elm_Fileselector_Item_Data *it_data; @@ -1273,7 +1273,7 @@ _on_item_unselected(void *data, const Eo_Event *event) } static void -_on_dir_up(void *data, const Eo_Event *event EINA_UNUSED) +_on_dir_up(void *data, const Efl_Event *event EINA_UNUSED) { Evas_Object *fs = data; Efl_Model *parent = NULL; @@ -1287,7 +1287,7 @@ _on_dir_up(void *data, const Eo_Event *event EINA_UNUSED) } static void -_home(void *data, const Eo_Event *event EINA_UNUSED) +_home(void *data, const Efl_Event *event EINA_UNUSED) { Evas_Object *fs = data; ELM_FILESELECTOR_DATA_GET(fs, sd); @@ -1318,7 +1318,7 @@ _current_filter_changed(void *data, } static void -_ok(void *data, const Eo_Event *event EINA_UNUSED) +_ok(void *data, const Efl_Event *event EINA_UNUSED) { const char *name; const char *selection = NULL; @@ -1367,7 +1367,7 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED) } static void -_canc(void *data, const Eo_Event *event EINA_UNUSED) +_canc(void *data, const Efl_Event *event EINA_UNUSED) { Evas_Object *fs = data; @@ -1470,7 +1470,7 @@ _on_text_activated_set_path_then_error(void *data, Eina_Error err EINA_UNUSED) } static void -_on_text_activated(void *data, const Eo_Event *event) +_on_text_activated(void *data, const Efl_Event *event) { Evas_Object *fs = data; const char *path; @@ -1515,7 +1515,7 @@ _anchors_undo(void *data) } static void -_on_text_focused(void *data, const Eo_Event *event EINA_UNUSED) +_on_text_focused(void *data, const Efl_Event *event EINA_UNUSED) { ELM_FILESELECTOR_DATA_GET(data, sd); @@ -1524,14 +1524,14 @@ _on_text_focused(void *data, const Eo_Event *event EINA_UNUSED) } static void -_on_text_unfocused(void *data, const Eo_Event *event EINA_UNUSED) +_on_text_unfocused(void *data, const Efl_Event *event EINA_UNUSED) { ELM_FILESELECTOR_DATA_GET(data, sd); _anchors_do(data, sd->path); } static void -_anchor_clicked(void *data, const Eo_Event *event) +_anchor_clicked(void *data, const Efl_Event *event) { Elm_Entry_Anchor_Info *info = event->info; Evas_Object *fs = data; @@ -1560,7 +1560,7 @@ _anchor_clicked(void *data, const Eo_Event *event) } static void -_files_key_down(void *data, const Eo_Event *event) +_files_key_down(void *data, const Efl_Event *event) { Efl_Input_Key *ev = event->info; Evas_Object *par, *searchbar; @@ -1736,7 +1736,7 @@ cancel: } static void -_resource_created(void *data, const Eo_Event *event) +_resource_created(void *data, const Efl_Event *event) { Elm_Fileselector *fs = data; Efl_Model_Children_Event* evt = event->info; @@ -1775,7 +1775,7 @@ _resource_created(void *data, const Eo_Event *event) } static void -_resource_deleted(void *data, const Eo_Event *event) +_resource_deleted(void *data, const Efl_Event *event) { Evas_Object *obj = data; Efl_Model_Children_Event* evt = event->info; @@ -1858,7 +1858,7 @@ _resource_deleted(void *data, const Eo_Event *event) } static void -_preedit_cb(void *data, const Eo_Event *event) +_preedit_cb(void *data, const Efl_Event *event) { ELM_FILESELECTOR_DATA_GET(data, sd); 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) } static void -_selection_done(void *data, const Eo_Event *event) +_selection_done(void *data, const Efl_Event *event) { Elm_Fileselector_Button_Data *sd = data; Efl_Model *model = event->info; @@ -197,7 +197,7 @@ _activate(Elm_Fileselector_Button_Data *sd) } static void -_button_clicked(void *data, const Eo_Event *event EINA_UNUSED) +_button_clicked(void *data, const Efl_Event *event EINA_UNUSED) { _activate(data); } 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[] = #define SIG_FWD(name, event) \ static void \ - _##name##_fwd(void *data, const Eo_Event *ev EINA_UNUSED) \ + _##name##_fwd(void *data, const Efl_Event *ev EINA_UNUSED) \ { \ efl_event_callback_legacy_call(data, event, ev->info); \ } @@ -97,7 +97,7 @@ _file_chosen_path_then_error(void *data, Eina_Error err) } static void -_FILE_CHOSEN_fwd(void *data, const Eo_Event *event) +_FILE_CHOSEN_fwd(void *data, const Efl_Event *event) { Efl_Model *model = event->info; Eina_Promise *promise = NULL; @@ -115,7 +115,7 @@ _FILE_CHOSEN_fwd(void *data, const Eo_Event *event) } static void -_ACTIVATED_fwd(void *data, const Eo_Event *event) +_ACTIVATED_fwd(void *data, const Efl_Event *event) { const char *file; 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) } static void -_on_hover_clicked(void *data, const Eo_Event *event) +_on_hover_clicked(void *data, const Efl_Event *event) { const char *dismissstr; @@ -152,7 +152,7 @@ _auto_update(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void } static void -_on_item_clicked(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) +_on_item_clicked(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) { Elm_Hoversel_Item_Data *item = data; Evas_Object *obj2 = WIDGET(item); @@ -169,7 +169,7 @@ _on_item_clicked(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) } static void -_item_focused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) +_item_focused_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) { Elm_Hoversel_Item_Data *it = data; @@ -177,7 +177,7 @@ _item_focused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) } static void -_item_unfocused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) +_item_unfocused_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) { Elm_Hoversel_Item_Data *it = data; @@ -434,13 +434,13 @@ _activate(Evas_Object *obj) } static void -_on_clicked(void *data, const Eo_Event *event EINA_UNUSED) +_on_clicked(void *data, const Efl_Event *event EINA_UNUSED) { _activate(data); } static void -_on_parent_del(void *data, const Eo_Event *ev EINA_UNUSED) +_on_parent_del(void *data, const Efl_Event *ev EINA_UNUSED) { elm_hoversel_hover_parent_set(data, NULL); } @@ -540,7 +540,7 @@ _on_move_resize(void * data, } static void -_on_parent_resize(void *data, const Eo_Event *ev EINA_UNUSED) +_on_parent_resize(void *data, const Efl_Event *ev EINA_UNUSED) { Evas_Object *obj = (Evas_Object *)data; 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[] = { {NULL, NULL} }; -static void _entry_changed_cb(void *data, const Eo_Event *event); -static void _entry_focus_in_cb(void *data, const Eo_Event *event); -static void _entry_focus_out_cb(void *data, const Eo_Event *event); -static void _entry_clicked_cb(void *data, const Eo_Event *event); +static void _entry_changed_cb(void *data, const Efl_Event *event); +static void _entry_focus_in_cb(void *data, const Efl_Event *event); +static void _entry_focus_out_cb(void *data, const Efl_Event *event); +static void _entry_clicked_cb(void *data, const Efl_Event *event); EFL_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb, { ELM_ENTRY_EVENT_CHANGED, _entry_changed_cb }, @@ -1036,7 +1036,7 @@ _entry_resize_cb(void *data, } static void -_entry_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) +_entry_changed_cb(void *data, const Efl_Event *event EINA_UNUSED) { ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd); const char *str; @@ -1046,7 +1046,7 @@ _entry_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) } static void -_entry_focus_in_cb(void *data, const Eo_Event *event EINA_UNUSED) +_entry_focus_in_cb(void *data, const Efl_Event *event EINA_UNUSED) { Elm_Multibuttonentry_Item_Data *item = NULL; ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd); @@ -1060,7 +1060,7 @@ _entry_focus_in_cb(void *data, const Eo_Event *event EINA_UNUSED) } static void -_entry_focus_out_cb(void *data, const Eo_Event *event EINA_UNUSED) +_entry_focus_out_cb(void *data, const Efl_Event *event EINA_UNUSED) { ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd); const char *str; @@ -1071,7 +1071,7 @@ _entry_focus_out_cb(void *data, const Eo_Event *event EINA_UNUSED) } static void -_entry_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) +_entry_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED) { ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd); 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[] = { {NULL, NULL} }; -static void _on_item_back_btn_clicked(void *data, const Eo_Event *event); +static void _on_item_back_btn_clicked(void *data, const Efl_Event *event); static Eina_Bool _key_action_top_item_get(Evas_Object *obj, const char *params); @@ -954,7 +954,7 @@ _elm_naviframe_elm_layout_sizing_eval(Eo *obj, Elm_Naviframe_Data *sd) } static void -_on_item_back_btn_clicked(void *data, const Eo_Event *event) +_on_item_back_btn_clicked(void *data, const Efl_Event *event) { /* Since edje has the event queue, clicked event could be happened multiple times on some heavy environment. This callback del will @@ -1414,7 +1414,7 @@ _send_signal(Elm_Naviframe_Item_Data *it, const char *sig) } static void -_deferred(void *data, const Eo_Event *event EINA_UNUSED) +_deferred(void *data, const Efl_Event *event EINA_UNUSED) { Elm_Naviframe_Data *nfd = data; 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[] = { { NULL, NULL } }; -static void _update_frame(void *data, const Eo_Event *event); -static void _update_slider(void *data, const Eo_Event *event); -static void _play_started(void *data, const Eo_Event *event); -static void _play_finished(void *data, const Eo_Event *event); -static void _update_position(void *data, const Eo_Event *event); -static void _drag_start(void *data, const Eo_Event *event); -static void _drag_stop(void *data, const Eo_Event *event); +static void _update_frame(void *data, const Efl_Event *event); +static void _update_slider(void *data, const Efl_Event *event); +static void _play_started(void *data, const Efl_Event *event); +static void _play_finished(void *data, const Efl_Event *event); +static void _update_position(void *data, const Efl_Event *event); +static void _drag_start(void *data, const Efl_Event *event); +static void _drag_stop(void *data, const Efl_Event *event); static Eina_Bool _key_action_move(Evas_Object *obj, const char *params); static 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) } static void -_update_slider(void *data, const Eo_Event *event EINA_UNUSED) +_update_slider(void *data, const Efl_Event *event EINA_UNUSED) { double pos, length; Eina_Bool seekable; @@ -259,7 +259,7 @@ _update_slider(void *data, const Eo_Event *event EINA_UNUSED) } static void -_update_frame(void *data, const Eo_Event *event) +_update_frame(void *data, const Efl_Event *event) { ELM_PLAYER_DATA_GET(data, sd); if (!sd) return; @@ -267,7 +267,7 @@ _update_frame(void *data, const Eo_Event *event) } static void -_update_position(void *data, const Eo_Event *event EINA_UNUSED) +_update_position(void *data, const Efl_Event *event EINA_UNUSED) { double pos; ELM_PLAYER_DATA_GET(data, sd); @@ -278,21 +278,21 @@ _update_position(void *data, const Eo_Event *event EINA_UNUSED) } static void -_drag_start(void *data, const Eo_Event *event EINA_UNUSED) +_drag_start(void *data, const Efl_Event *event EINA_UNUSED) { ELM_PLAYER_DATA_GET(data, sd); sd->dragging = EINA_TRUE; } static void -_drag_stop(void *data, const Eo_Event *event EINA_UNUSED) +_drag_stop(void *data, const Efl_Event *event EINA_UNUSED) { ELM_PLAYER_DATA_GET(data, sd); sd->dragging = EINA_FALSE; } static void -_update_volume(void *data, const Eo_Event *event EINA_UNUSED) +_update_volume(void *data, const Efl_Event *event EINA_UNUSED) { double vol; ELM_PLAYER_DATA_GET(data, sd); @@ -303,7 +303,7 @@ _update_volume(void *data, const Eo_Event *event EINA_UNUSED) } static void -_forward(void *data, const Eo_Event *event EINA_UNUSED) +_forward(void *data, const Efl_Event *event EINA_UNUSED) { double pos, length; ELM_PLAYER_DATA_GET(data, sd); @@ -319,21 +319,21 @@ _forward(void *data, const Eo_Event *event EINA_UNUSED) } static void -_info(void *data, const Eo_Event *event EINA_UNUSED) +_info(void *data, const Efl_Event *event EINA_UNUSED) { elm_layout_signal_emit(data, "elm,button,info", "elm"); efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_INFO_CLICKED, NULL); } static void -_next(void *data, const Eo_Event *event EINA_UNUSED) +_next(void *data, const Efl_Event *event EINA_UNUSED) { elm_layout_signal_emit(data, "elm,button,next", "elm"); efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_NEXT_CLICKED, NULL); } static void -_pause(void *data, const Eo_Event *event EINA_UNUSED) +_pause(void *data, const Efl_Event *event EINA_UNUSED) { ELM_PLAYER_DATA_GET(data, sd); @@ -343,7 +343,7 @@ _pause(void *data, const Eo_Event *event EINA_UNUSED) } static void -_play(void *data, const Eo_Event *event EINA_UNUSED) +_play(void *data, const Efl_Event *event EINA_UNUSED) { ELM_PLAYER_DATA_GET(data, sd); @@ -353,14 +353,14 @@ _play(void *data, const Eo_Event *event EINA_UNUSED) } static void -_prev(void *data, const Eo_Event *event EINA_UNUSED) +_prev(void *data, const Efl_Event *event EINA_UNUSED) { efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_PREV_CLICKED, NULL); elm_layout_signal_emit(data, "elm,button,prev", "elm"); } static void -_rewind(void *data, const Eo_Event *event EINA_UNUSED) +_rewind(void *data, const Efl_Event *event EINA_UNUSED) { double pos; ELM_PLAYER_DATA_GET(data, sd); @@ -375,14 +375,14 @@ _rewind(void *data, const Eo_Event *event EINA_UNUSED) } static void -_stop(void *data, const Eo_Event *event EINA_UNUSED) +_stop(void *data, const Efl_Event *event EINA_UNUSED) { elm_layout_signal_emit(data, "elm,button,stop", "elm"); efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_QUALITY_CLICKED, NULL); } static void -_eject(void *data, const Eo_Event *event EINA_UNUSED) +_eject(void *data, const Efl_Event *event EINA_UNUSED) { ELM_PLAYER_DATA_GET(data, sd); @@ -409,7 +409,7 @@ _mute_toggle(Evas_Object *obj) } static void -_volume(void *data, const Eo_Event *event EINA_UNUSED) +_volume(void *data, const Efl_Event *event EINA_UNUSED) { elm_layout_signal_emit(data, "elm,button,volume", "elm"); _mute_toggle(data); @@ -417,7 +417,7 @@ _volume(void *data, const Eo_Event *event EINA_UNUSED) } static void -_mute(void *data, const Eo_Event *event EINA_UNUSED) +_mute(void *data, const Efl_Event *event EINA_UNUSED) { elm_layout_signal_emit(data, "elm,button,mute", "elm"); _mute_toggle(data); @@ -425,13 +425,13 @@ _mute(void *data, const Eo_Event *event EINA_UNUSED) } static void -_play_started(void *data, const Eo_Event *event EINA_UNUSED) +_play_started(void *data, const Efl_Event *event EINA_UNUSED) { elm_layout_signal_emit(data, "elm,player,play", "elm"); } static void -_play_finished(void *data, const Eo_Event *event EINA_UNUSED) +_play_finished(void *data, const Efl_Event *event EINA_UNUSED) { elm_layout_signal_emit(data, "elm,player,pause", "elm"); } 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[] = { static Eina_Bool _key_action_move(Evas_Object *obj, const char *params); static Eina_Bool _key_action_escape(Evas_Object *obj, const char *params); static void _parent_geom_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED); -static void _block_clicked_cb(void *data, const Eo_Event *event); -static void _timeout_cb(void *data, const Eo_Event *event); +static void _block_clicked_cb(void *data, const Efl_Event *event); +static void _timeout_cb(void *data, const Efl_Event *event); -static void _hide_effect_finished_cb(void *data, const Eo_Event *event); +static void _hide_effect_finished_cb(void *data, const Efl_Event *event); static const Elm_Action key_actions[] = { {"move", _key_action_move}, @@ -102,20 +102,20 @@ _visuals_set(Evas_Object *obj) } static void -_block_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) +_block_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED) { efl_event_callback_legacy_call(data, ELM_POPUP_EVENT_BLOCK_CLICKED, NULL); } static void -_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED) +_timeout_cb(void *data, const Efl_Event *event EINA_UNUSED) { evas_object_hide(data); efl_event_callback_legacy_call(data, ELM_POPUP_EVENT_TIMEOUT, NULL); } static void -_hide_effect_finished_cb(void *data, const Eo_Event *event EINA_UNUSED) +_hide_effect_finished_cb(void *data, const Efl_Event *event EINA_UNUSED) { efl_event_callback_legacy_call(data, ELM_POPUP_EVENT_DISMISSED, NULL); } @@ -879,7 +879,7 @@ _elm_popup_item_elm_widget_item_signal_emit(Eo *eo_it EINA_UNUSED, Elm_Popup_Ite } static void -_item_focused_cb(void *data, const Eo_Event *event EINA_UNUSED) +_item_focused_cb(void *data, const Efl_Event *event EINA_UNUSED) { Elm_Popup_Item_Data *it = data; @@ -887,7 +887,7 @@ _item_focused_cb(void *data, const Eo_Event *event EINA_UNUSED) } static void -_item_unfocused_cb(void *data, const Eo_Event *event EINA_UNUSED) +_item_unfocused_cb(void *data, const Efl_Event *event EINA_UNUSED) { Elm_Popup_Item_Data *it = data; 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 } Elm_App_Server_Data; static void -_view_del_cb(void *data, const Eo_Event *event) +_view_del_cb(void *data, const Efl_Event *event) { Elm_App_Server_Data *cdata = data; 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; static int _init_count = 0; // Object Event handlers -static void _state_changed_signal_send(void *data, const Eo_Event *event); -static void _bounds_changed_signal_send(void *data, const Eo_Event *event); -static void _property_changed_signal_send(void *data, const Eo_Event *event); -static void _children_changed_signal_send(void *data, const Eo_Event *event); -static void _window_signal_send(void *data, const Eo_Event *event); -static void _visible_data_changed_signal_send(void *data, const Eo_Event *event); -static void _active_descendant_changed_signal_send(void *data, const Eo_Event *event); -static void _selection_signal_send(void *data, const Eo_Event *event); -static void _text_text_inserted_send(void *data, const Eo_Event *event); -static void _text_text_removed_send(void *data, const Eo_Event *event); -static void _text_caret_moved_send(void *data, const Eo_Event *event); -static void _text_selection_changed_send(void *data, const Eo_Event *event); +static void _state_changed_signal_send(void *data, const Efl_Event *event); +static void _bounds_changed_signal_send(void *data, const Efl_Event *event); +static void _property_changed_signal_send(void *data, const Efl_Event *event); +static void _children_changed_signal_send(void *data, const Efl_Event *event); +static void _window_signal_send(void *data, const Efl_Event *event); +static void _visible_data_changed_signal_send(void *data, const Efl_Event *event); +static void _active_descendant_changed_signal_send(void *data, const Efl_Event *event); +static void _selection_signal_send(void *data, const Efl_Event *event); +static void _text_text_inserted_send(void *data, const Efl_Event *event); +static void _text_text_removed_send(void *data, const Efl_Event *event); +static void _text_caret_moved_send(void *data, const Efl_Event *event); +static void _text_selection_changed_send(void *data, const Efl_Event *event); // bridge private methods static void _bridge_object_register(Eo *bridge, Eo *obj); @@ -140,8 +140,8 @@ static void _bridge_iter_object_reference_append(Eo *bridge, Eldbus_Message_Iter static void _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj); static Eina_Bool _elm_atspi_bridge_key_filter(void *data, void *loop, int type, void *event); static void _object_desktop_reference_append(Eldbus_Message_Iter *iter); -static void _on_object_add(void *data, const Eo_Event *event); -static void _on_object_del(void *data, const Eo_Event *event); +static void _on_object_add(void *data, const Efl_Event *event); +static void _on_object_del(void *data, const Efl_Event *event); typedef struct { const Efl_Event_Description *desc; @@ -3815,7 +3815,7 @@ _handle_listener_change(void *data, const Eldbus_Message *msg EINA_UNUSED) } static void -_state_changed_signal_send(void *data, const Eo_Event *event) +_state_changed_signal_send(void *data, const Efl_Event *event) { Elm_Atspi_Event_State_Changed_Data *state_data = event->info; const char *type_desc; @@ -3841,7 +3841,7 @@ _state_changed_signal_send(void *data, const Eo_Event *event) } static void -_bounds_changed_signal_send(void *data, const Eo_Event *event) +_bounds_changed_signal_send(void *data, const Efl_Event *event) { Elm_Atspi_Event_Geometry_Changed_Data *geo_data = event->info; @@ -3851,7 +3851,7 @@ _bounds_changed_signal_send(void *data, const Eo_Event *event) } static void -_property_changed_signal_send(void *data, const Eo_Event *event) +_property_changed_signal_send(void *data, const Efl_Event *event) { const char *property = event->info; char *atspi_desc; @@ -3902,7 +3902,7 @@ _property_changed_signal_send(void *data, const Eo_Event *event) } static void -_visible_data_changed_signal_send(void *data, const Eo_Event *event) +_visible_data_changed_signal_send(void *data, const Efl_Event *event) { ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); @@ -3918,7 +3918,7 @@ _visible_data_changed_signal_send(void *data, const Eo_Event *event) } static void -_active_descendant_changed_signal_send(void *data, const Eo_Event *event) +_active_descendant_changed_signal_send(void *data, const Efl_Event *event) { Eo *child = event->info; int idx; @@ -3939,7 +3939,7 @@ _active_descendant_changed_signal_send(void *data, const Eo_Event *event) } static void -_children_changed_signal_send(void *data, const Eo_Event *event) +_children_changed_signal_send(void *data, const Efl_Event *event) { const char *atspi_desc = NULL; Elm_Atspi_Event_Children_Changed_Data *ev_data = event->info; @@ -3980,7 +3980,7 @@ _children_changed_signal_send(void *data, const Eo_Event *event) } static void -_window_signal_send(void *data, const Eo_Event *event) +_window_signal_send(void *data, const Efl_Event *event) { enum _Atspi_Window_Signals type; @@ -4024,7 +4024,7 @@ _window_signal_send(void *data, const Eo_Event *event) } static void -_selection_signal_send(void *data, const Eo_Event *event) +_selection_signal_send(void *data, const Efl_Event *event) { ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); @@ -4122,7 +4122,7 @@ static void _bridge_signal_send(Eo *bridge, Eo *obj, const char *infc, const Eld } static void -_text_caret_moved_send(void *data, const Eo_Event *event) +_text_caret_moved_send(void *data, const Efl_Event *event) { int cursor_pos = 0; @@ -4138,7 +4138,7 @@ _text_caret_moved_send(void *data, const Eo_Event *event) } static void -_text_text_inserted_send(void *data, const Eo_Event *event) +_text_text_inserted_send(void *data, const Efl_Event *event) { Elm_Atspi_Text_Change_Info *info = event->info; @@ -4152,7 +4152,7 @@ _text_text_inserted_send(void *data, const Eo_Event *event) } static void -_text_text_removed_send(void *data, const Eo_Event *event) +_text_text_removed_send(void *data, const Efl_Event *event) { Elm_Atspi_Text_Change_Info *info = event->info; @@ -4166,7 +4166,7 @@ _text_text_removed_send(void *data, const Eo_Event *event) } static void -_text_selection_changed_send(void *data, const Eo_Event *event) +_text_selection_changed_send(void *data, const Efl_Event *event) { ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); @@ -4200,7 +4200,7 @@ _bridge_object_unregister(Eo *bridge, Eo *obj) } static void -_on_object_add(void *data, const Eo_Event *event) +_on_object_add(void *data, const Efl_Event *event) { Eldbus_Message *sig; Eldbus_Message_Iter *iter; @@ -4215,7 +4215,7 @@ _on_object_add(void *data, const Eo_Event *event) } static void -_on_object_del(void *data, const Eo_Event *event) +_on_object_del(void *data, const Efl_Event *event) { Eldbus_Message *sig; @@ -4351,7 +4351,7 @@ _interfaces_register(Eo *bridge) } static void -_bridge_accessible_event_dispatch(void *data, const Eo_Event *event) +_bridge_accessible_event_dispatch(void *data, const Efl_Event *event) { ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c index 700078ee8e..83501a7235 100644 --- a/src/lib/elementary/elm_box.c +++ b/src/lib/elementary/elm_box.c @@ -30,7 +30,7 @@ _elm_box_list_data_get(const Eina_List *list) } static void -_child_added_cb_proxy(void *data, const Eo_Event *event) +_child_added_cb_proxy(void *data, const Efl_Event *event) { Evas_Object *box = data; Evas_Object_Box_Option *opt = event->info; @@ -38,7 +38,7 @@ _child_added_cb_proxy(void *data, const Eo_Event *event) } static void -_child_removed_cb_proxy(void *data, const Eo_Event *event) +_child_removed_cb_proxy(void *data, const Efl_Event *event) { Evas_Object *box = data; Evas_Object *child = event->info; @@ -177,7 +177,7 @@ _transition_animation(void *data) } static void -_transition_layout_child_added(void *data, const Eo_Event *event) +_transition_layout_child_added(void *data, const Efl_Event *event) { Transition_Animation_Data *tad; Evas_Object_Box_Option *opt = event->info; @@ -192,7 +192,7 @@ _transition_layout_child_added(void *data, const Eo_Event *event) } static void -_transition_layout_child_removed(void *data, const Eo_Event *event) +_transition_layout_child_removed(void *data, const Efl_Event *event) { Eina_List *l; Transition_Animation_Data *tad; diff --git a/src/lib/elementary/elm_cnp.c b/src/lib/elementary/elm_cnp.c index 41d1dc418e..be0b642efe 100644 --- a/src/lib/elementary/elm_cnp.c +++ b/src/lib/elementary/elm_cnp.c @@ -1773,7 +1773,7 @@ _x11_dnd_status(void *data EINA_UNUSED, int etype EINA_UNUSED, void *ev) } static void -_x11_win_rotation_changed_cb(void *data, const Eo_Event *event) +_x11_win_rotation_changed_cb(void *data, const Efl_Event *event) { Evas_Object *win = data; int rot = elm_win_rotation_get(event->object); diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c index 99cf1411cc..246f5eea3a 100644 --- a/src/lib/elementary/elm_code_widget.c +++ b/src/lib/elementary/elm_code_widget.c @@ -449,7 +449,7 @@ _elm_code_widget_fill(Elm_Code_Widget *widget) } static void -_elm_code_widget_line_cb(void *data, const Eo_Event *event) +_elm_code_widget_line_cb(void *data, const Efl_Event *event) { Elm_Code_Line *line; Elm_Code_Widget *widget; @@ -461,7 +461,7 @@ _elm_code_widget_line_cb(void *data, const Eo_Event *event) } static void -_elm_code_widget_file_cb(void *data, const Eo_Event *event EINA_UNUSED) +_elm_code_widget_file_cb(void *data, const Efl_Event *event EINA_UNUSED) { Elm_Code_Widget *widget; @@ -471,7 +471,7 @@ _elm_code_widget_file_cb(void *data, const Eo_Event *event EINA_UNUSED) } static void -_elm_code_widget_selection_cb(void *data, const Eo_Event *event EINA_UNUSED) +_elm_code_widget_selection_cb(void *data, const Efl_Event *event EINA_UNUSED) { Elm_Code_Widget *widget; @@ -481,7 +481,7 @@ _elm_code_widget_selection_cb(void *data, const Eo_Event *event EINA_UNUSED) } static void -_elm_code_widget_selection_clear_cb(void *data, const Eo_Event *event EINA_UNUSED) +_elm_code_widget_selection_clear_cb(void *data, const Efl_Event *event EINA_UNUSED) { Elm_Code_Widget *widget; diff --git a/src/lib/elementary/elm_color_class.c b/src/lib/elementary/elm_color_class.c index 5dde9a59ff..f88b8efbc5 100644 --- a/src/lib/elementary/elm_color_class.c +++ b/src/lib/elementary/elm_color_class.c @@ -128,7 +128,7 @@ _colorclass_select(void *data, Evas_Object *obj EINA_UNUSED, const char *sig, co } static void -_colorclass_changed(void *data, const Eo_Event *event EINA_UNUSED) +_colorclass_changed(void *data, const Efl_Event *event EINA_UNUSED) { Colorclass_UI *cc = data; @@ -151,7 +151,7 @@ _colorclass_changed(void *data, const Eo_Event *event EINA_UNUSED) } static void -_colorclass_reset(void *data, const Eo_Event *event EINA_UNUSED) +_colorclass_reset(void *data, const Efl_Event *event EINA_UNUSED) { Colorclass_UI *cc = data; Colorclass color; @@ -193,7 +193,7 @@ _colorclass_reset(void *data, const Eo_Event *event EINA_UNUSED) } static void -_colorclass_activate(void *data, const Eo_Event *event) +_colorclass_activate(void *data, const Efl_Event *event) { Colorclass_UI *cc = data; Elm_Object_Item *it = event->info; diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index a2b67cd3b3..189d341f87 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -649,7 +649,7 @@ _unselect_selected_item(Elm_Colorselector_Data *sd) } static void -_spinner_changed_cb(void *data, const Eo_Event *event) +_spinner_changed_cb(void *data, const Efl_Event *event) { Elm_Colorselector_Data *sd = data; Evas_Object *parent; @@ -708,7 +708,7 @@ _x11_elm_widget_xwin_get(const Evas_Object *obj) } static void -_start_grab_pick_cb(void *data, const Eo_Event *event) +_start_grab_pick_cb(void *data, const Efl_Event *event) { Evas_Object *o = data; @@ -1028,7 +1028,7 @@ _colorbar_move_cb(void *data, } static void -_button_clicked_cb(void *data, const Eo_Event *event) +_button_clicked_cb(void *data, const Efl_Event *event) { Color_Bar_Data *cb_data = data; double x, y, step; @@ -1072,7 +1072,7 @@ _button_clicked_cb(void *data, const Eo_Event *event) } static void -_button_repeat_cb(void *data, const Eo_Event *event EINA_UNUSED) +_button_repeat_cb(void *data, const Efl_Event *event EINA_UNUSED) { Color_Bar_Data *cb_data = data; double x, y, step; @@ -2018,7 +2018,7 @@ _key_action_move(Evas_Object *obj, const char *params) } else if (sd->focused == ELM_COLORSELECTOR_COMPONENTS) { - Eo_Event event = {}; + Efl_Event event = {}; event.object = sd->cb_data[sd->sel_color_type]->lbt; _button_clicked_cb(sd->cb_data[sd->sel_color_type], &event); } @@ -2032,7 +2032,7 @@ _key_action_move(Evas_Object *obj, const char *params) } else if (sd->focused == ELM_COLORSELECTOR_COMPONENTS) { - Eo_Event event = {}; + Efl_Event event = {}; event.object = sd->cb_data[sd->sel_color_type]->rbt; _button_clicked_cb(sd->cb_data[sd->sel_color_type], &event); } diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c index c27e589522..facac03e16 100644 --- a/src/lib/elementary/elm_conform.c +++ b/src/lib/elementary/elm_conform.c @@ -353,7 +353,7 @@ _land_indicator_connect_cb(void *data) } static void -_land_indicator_disconnected(void *data, const Eo_Event *event EINA_UNUSED) +_land_indicator_disconnected(void *data, const Efl_Event *event EINA_UNUSED) { Evas_Object *conform = data; @@ -364,7 +364,7 @@ _land_indicator_disconnected(void *data, const Eo_Event *event EINA_UNUSED) } static void -_port_indicator_disconnected(void *data, const Eo_Event *event EINA_UNUSED) +_port_indicator_disconnected(void *data, const Efl_Event *event EINA_UNUSED) { Evas_Object *conform = data; @@ -509,7 +509,7 @@ _indicator_opacity_set(Evas_Object *conformant, Elm_Win_Indicator_Opacity_Mode i } static void -_on_indicator_mode_changed(void *data, const Eo_Event *event) +_on_indicator_mode_changed(void *data, const Efl_Event *event) { Evas_Object *conformant = data; Evas_Object *win = event->object; @@ -528,7 +528,7 @@ _on_indicator_mode_changed(void *data, const Eo_Event *event) } static void -_on_rotation_changed(void *data, const Eo_Event *event EINA_UNUSED) +_on_rotation_changed(void *data, const Efl_Event *event EINA_UNUSED) { int rot = 0; Evas_Object *win = event->object; @@ -1000,7 +1000,7 @@ _elm_conformant_efl_object_constructor(Eo *obj, Elm_Conformant_Data *sd) evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); - Eo_Event event = {}; + Efl_Event event = {}; event.object = sd->win; sd->win = elm_widget_top_get(obj); _on_indicator_mode_changed(obj, &event); diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c index 60e8583a05..6a8a30bc00 100644 --- a/src/lib/elementary/elm_dayselector.c +++ b/src/lib/elementary/elm_dayselector.c @@ -195,7 +195,7 @@ _item_signal_emit_cb(void *data, } static void -_item_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) +_item_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED) { Elm_Dayselector_Item_Data *it = data; diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 84a799916b..d7bbdf423d 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -1386,7 +1386,7 @@ _hover_del_job(void *data) } static void -_hover_dismissed_cb(void *data, const Eo_Event *event EINA_UNUSED) +_hover_dismissed_cb(void *data, const Efl_Event *event EINA_UNUSED) { ELM_ENTRY_DATA_GET(data, sd); @@ -2493,7 +2493,7 @@ _anchor_hover_del_cb(void *data, } static void -_anchor_hover_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) +_anchor_hover_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED) { elm_entry_anchor_hover_end(data); } @@ -3980,7 +3980,7 @@ elm_entry_add(Evas_Object *parent) } static void -_cb_added(void *data EINA_UNUSED, const Eo_Event *ev) +_cb_added(void *data EINA_UNUSED, const Efl_Event *ev) { const Efl_Callback_Array_Item *event = ev->info; @@ -3990,7 +3990,7 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *ev) } static void -_cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev) +_cb_deleted(void *data EINA_UNUSED, const Efl_Event *ev) { const Efl_Callback_Array_Item *event = ev->info; diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 267ca9c3fb..7c0cc151cd 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -2016,7 +2016,7 @@ _item_realize(Elm_Gen_Item *it, } static void -_tree_effect_animator_cb(void *data, const Eo_Event *event EINA_UNUSED) +_tree_effect_animator_cb(void *data, const Efl_Event *event EINA_UNUSED) { int in = 0; const Eina_List *l; diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c index af88b15e03..0bf9029384 100644 --- a/src/lib/elementary/elm_glview.c +++ b/src/lib/elementary/elm_glview.c @@ -110,7 +110,7 @@ _elm_glview_efl_canvas_group_group_resize(Eo *obj, Elm_Glview_Data *sd, Evas_Coo } static void -_render_cb(void *obj, const Eo_Event *event EINA_UNUSED) +_render_cb(void *obj, const Efl_Event *event EINA_UNUSED) { ELM_GLVIEW_DATA_GET(obj, sd); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ); @@ -318,7 +318,7 @@ _elm_glview_efl_canvas_group_group_del(Eo *obj, Elm_Glview_Data *sd) } static void -_cb_added(void *data EINA_UNUSED, const Eo_Event *ev) +_cb_added(void *data EINA_UNUSED, const Efl_Event *ev) { const Efl_Callback_Array_Item *event = ev->info; diff --git a/src/lib/elementary/elm_helper.c b/src/lib/elementary/elm_helper.c index ebeea80121..7b4c327d71 100644 --- a/src/lib/elementary/elm_helper.c +++ b/src/lib/elementary/elm_helper.c @@ -39,7 +39,7 @@ elm_validator_regexp_status_get(Elm_Validator_Regexp *validator) } EAPI void -elm_validator_regexp_helper(void *data, const Eo_Event *event) +elm_validator_regexp_helper(void *data, const Efl_Event *event) { Elm_Validate_Content *vc = event->info; Elm_Validator_Regexp *validator = (Elm_Validator_Regexp *)data; diff --git a/src/lib/elementary/elm_helper.h b/src/lib/elementary/elm_helper.h index e2e01f9836..df117369a5 100644 --- a/src/lib/elementary/elm_helper.h +++ b/src/lib/elementary/elm_helper.h @@ -100,7 +100,7 @@ elm_validator_regexp_status_get(Elm_Validator_Regexp *validator) EINA_ARG_NONNUL * @since 1.14 */ EAPI void -elm_validator_regexp_helper(void *data, const Eo_Event *event); +elm_validator_regexp_helper(void *data, const Efl_Event *event); #endif /** diff --git a/src/lib/elementary/elm_interface_atspi_accessible.c b/src/lib/elementary/elm_interface_atspi_accessible.c index 5bbfb48727..9f576aa7d7 100644 --- a/src/lib/elementary/elm_interface_atspi_accessible.c +++ b/src/lib/elementary/elm_interface_atspi_accessible.c @@ -343,7 +343,7 @@ _elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_ return; } - Eo_Event ev; + Efl_Event ev; ev.object = accessible; ev.desc = event; ev.info = event_info; @@ -415,7 +415,7 @@ elm_atspi_relation_clone(const Elm_Atspi_Relation *relation) } static void -_on_rel_obj_del(void *data, const Eo_Event *event) +_on_rel_obj_del(void *data, const Efl_Event *event) { Elm_Atspi_Relation_Set *set = data; Elm_Atspi_Relation *rel; diff --git a/src/lib/elementary/elm_interface_atspi_image.c b/src/lib/elementary/elm_interface_atspi_image.c index 2e2be438b9..510a6545c2 100644 --- a/src/lib/elementary/elm_interface_atspi_image.c +++ b/src/lib/elementary/elm_interface_atspi_image.c @@ -9,7 +9,7 @@ #include "elm_priv.h" static void -_free_desc_cb(void *data, const Eo_Event *event EINA_UNUSED) +_free_desc_cb(void *data, const Efl_Event *event EINA_UNUSED) { eina_stringshare_del(data); } diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c index 67f955d6d4..819ba2bbf1 100644 --- a/src/lib/elementary/elm_interface_scrollable.c +++ b/src/lib/elementary/elm_interface_scrollable.c @@ -59,13 +59,13 @@ _elm_scroll_wanted_coordinates_update(Elm_Scrollable_Smart_Interface_Data *sid, Evas_Coord x, Evas_Coord y); -static void _elm_scroll_hold_animator(void *data, const Eo_Event *event); -static void _elm_scroll_on_hold_animator(void *data, const Eo_Event *event); -static void _elm_scroll_scroll_to_y_animator(void *data, const Eo_Event *event); -static void _elm_scroll_scroll_to_x_animator(void *data, const Eo_Event *event); -static void _elm_scroll_bounce_y_animator(void *data, const Eo_Event *event); -static void _elm_scroll_bounce_x_animator(void *data, const Eo_Event *event); -static void _elm_scroll_momentum_animator(void *data, const Eo_Event *event); +static void _elm_scroll_hold_animator(void *data, const Efl_Event *event); +static void _elm_scroll_on_hold_animator(void *data, const Efl_Event *event); +static void _elm_scroll_scroll_to_y_animator(void *data, const Efl_Event *event); +static void _elm_scroll_scroll_to_x_animator(void *data, const Efl_Event *event); +static void _elm_scroll_bounce_y_animator(void *data, const Efl_Event *event); +static void _elm_scroll_bounce_x_animator(void *data, const Efl_Event *event); +static void _elm_scroll_momentum_animator(void *data, const Efl_Event *event); static double _round(double value, int pos) @@ -1302,7 +1302,7 @@ _elm_scroll_momentum_end(Elm_Scrollable_Smart_Interface_Data *sid) } static void -_elm_scroll_bounce_x_animator(void *data, const Eo_Event *event EINA_UNUSED) +_elm_scroll_bounce_x_animator(void *data, const Efl_Event *event EINA_UNUSED) { ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(data, sid); Evas_Coord x, y, dx, w, odx, ed, md; @@ -1356,7 +1356,7 @@ _elm_scroll_bounce_x_animator(void *data, const Eo_Event *event EINA_UNUSED) } static void -_elm_scroll_bounce_y_animator(void *data, const Eo_Event *event EINA_UNUSED) +_elm_scroll_bounce_y_animator(void *data, const Efl_Event *event EINA_UNUSED) { ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(data, sid); Evas_Coord x, y, dy, h, ody, ed, md; @@ -2087,7 +2087,7 @@ _paging_is_enabled(Elm_Scrollable_Smart_Interface_Data *sid) } static void -_elm_scroll_momentum_animator(void *data, const Eo_Event *event EINA_UNUSED) +_elm_scroll_momentum_animator(void *data, const Efl_Event *event EINA_UNUSED) { double t, at, dt, p, r; Elm_Scrollable_Smart_Interface_Data *sid = data; @@ -2264,7 +2264,7 @@ _elm_scroll_page_y_get(Elm_Scrollable_Smart_Interface_Data *sid, } static void -_elm_scroll_scroll_to_x_animator(void *data, const Eo_Event *event EINA_UNUSED) +_elm_scroll_scroll_to_x_animator(void *data, const Efl_Event *event EINA_UNUSED) { Elm_Scrollable_Smart_Interface_Data *sid = data; Evas_Coord px, py; @@ -2301,7 +2301,7 @@ _elm_scroll_scroll_to_x_animator(void *data, const Eo_Event *event EINA_UNUSED) } static void -_elm_scroll_scroll_to_y_animator(void *data, const Eo_Event *event EINA_UNUSED) +_elm_scroll_scroll_to_y_animator(void *data, const Efl_Event *event EINA_UNUSED) { Elm_Scrollable_Smart_Interface_Data *sid = data; Evas_Coord px, py; @@ -3097,7 +3097,7 @@ _elm_scroll_hold_enterer(void *data) } static void -_elm_scroll_hold_animator(void *data, const Eo_Event *event EINA_UNUSED) +_elm_scroll_hold_animator(void *data, const Efl_Event *event EINA_UNUSED) { Elm_Scrollable_Smart_Interface_Data *sid = data; @@ -3107,7 +3107,7 @@ _elm_scroll_hold_animator(void *data, const Eo_Event *event EINA_UNUSED) } static void -_elm_scroll_on_hold_animator(void *data, const Eo_Event *event EINA_UNUSED) +_elm_scroll_on_hold_animator(void *data, const Efl_Event *event EINA_UNUSED) { double t, td; double vx, vy; @@ -3812,7 +3812,7 @@ _elm_scroll_pan_resized_cb(void *data, /* even external pan objects get this */ static void -_elm_scroll_pan_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) +_elm_scroll_pan_changed_cb(void *data, const Efl_Event *event EINA_UNUSED) { Evas_Coord w = 0, h = 0; Elm_Scrollable_Smart_Interface_Data *sid = data; diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c index fd3169e479..e21241fb1e 100644 --- a/src/lib/elementary/elm_main.c +++ b/src/lib/elementary/elm_main.c @@ -853,7 +853,7 @@ static void *qr_handle = NULL; static int (*qr_main)(int argc, char **argv) = NULL; static void (*qre_main)(void *data, - const Eo_Event *ev) = NULL; + const Efl_Event *ev) = NULL; EAPI Eina_Bool elm_quicklaunch_prepare(int argc, diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c index 30ef651725..b731242185 100644 --- a/src/lib/elementary/elm_map.c +++ b/src/lib/elementary/elm_map.c @@ -1146,7 +1146,7 @@ _zoom_do(Elm_Map_Data *sd, } static void -_zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) +_zoom_anim_cb(void *data, const Efl_Event *event EINA_UNUSED) { ELM_MAP_DATA_GET(data, sd); @@ -1165,7 +1165,7 @@ _zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) } static void -_zoom_bring_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) +_zoom_bring_anim_cb(void *data, const Efl_Event *event EINA_UNUSED) { ELM_MAP_DATA_GET(data, sd); diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c index c2cd644b5a..8ec5507a9b 100644 --- a/src/lib/elementary/elm_menu.c +++ b/src/lib/elementary/elm_menu.c @@ -424,7 +424,7 @@ _menu_hide(void *data, } static void -_hover_dismissed_cb(void *data, const Eo_Event *event) +_hover_dismissed_cb(void *data, const Efl_Event *event) { _menu_hide(data, event->object, event->info); efl_event_callback_legacy_call @@ -519,7 +519,7 @@ _menu_item_inactivate_cb(void *data, } static void -_block_menu(void *_sd, const Eo_Event *event EINA_UNUSED) +_block_menu(void *_sd, const Efl_Event *event EINA_UNUSED) { const Eina_List *l; Elm_Object_Item *eo_current; @@ -535,7 +535,7 @@ _block_menu(void *_sd, const Eo_Event *event EINA_UNUSED) } static void -_unblock_menu(void *_sd, const Eo_Event *event EINA_UNUSED) +_unblock_menu(void *_sd, const Efl_Event *event EINA_UNUSED) { const Eina_List *l; Elm_Object_Item *eo_current; diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index db43b9a84f..0568892cb0 100644 --- a/src/lib/elementary/elm_panel.c +++ b/src/lib/elementary/elm_panel.c @@ -1098,7 +1098,7 @@ _elm_panel_efl_canvas_group_group_move(Eo *obj, Elm_Panel_Data *sd, Evas_Coord x // FIXME: This is definitively not an animator, but a pre calc function // Not sure if I can hook on smart calc or on RENDER_PRE, will be left for later static void -_elm_panel_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) +_elm_panel_anim_cb(void *data, const Efl_Event *event EINA_UNUSED) { Evas_Object *obj = data; ELM_PANEL_DATA_GET(obj, sd); diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c index 3431aca04c..0a2022e57c 100644 --- a/src/lib/elementary/elm_photo.c +++ b/src/lib/elementary/elm_photo.c @@ -235,7 +235,7 @@ _elm_photo_internal_image_follow(Evas_Object *obj) } static void -_on_thumb_done(void *data, const Eo_Event *event EINA_UNUSED) +_on_thumb_done(void *data, const Efl_Event *event EINA_UNUSED) { _elm_photo_internal_image_follow(data); } diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/elm_photocam.c index 831bcb15a4..5876646e66 100644 --- a/src/lib/elementary/elm_photocam.c +++ b/src/lib/elementary/elm_photocam.c @@ -767,7 +767,7 @@ _zoom_do(Evas_Object *obj, } static void -_zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) +_zoom_anim_cb(void *data, const Efl_Event *event EINA_UNUSED) { double t; Evas_Object *obj = data; @@ -1034,7 +1034,7 @@ _elm_photocam_elm_widget_event(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED, Evas } static void -_bounce_eval(void *data, const Eo_Event *event EINA_UNUSED) +_bounce_eval(void *data, const Efl_Event *event EINA_UNUSED) { Evas_Object *obj = data; ELM_PHOTOCAM_DATA_GET(obj, sd); @@ -1950,7 +1950,7 @@ done: if (an) { // FIXME: If one day we do support partial animator in photocam, this would require change - Eo_Event event = {}; + Efl_Event event = {}; event.object = evas_object_evas_get(obj); _zoom_anim_cb(obj, &event); // FIXME: Unhandled. diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c index c64addb210..547c045b0c 100644 --- a/src/lib/elementary/elm_spinner.c +++ b/src/lib/elementary/elm_spinner.c @@ -42,13 +42,13 @@ static Eina_Bool _key_action_spin(Evas_Object *obj, const char *params); static Eina_Bool _key_action_toggle(Evas_Object *obj, const char *params); static void -_inc_dec_button_clicked_cb(void *data, const Eo_Event *event); +_inc_dec_button_clicked_cb(void *data, const Efl_Event *event); static void -_inc_dec_button_pressed_cb(void *data, const Eo_Event *event); +_inc_dec_button_pressed_cb(void *data, const Efl_Event *event); static void -_inc_dec_button_unpressed_cb(void *data, const Eo_Event *event); +_inc_dec_button_unpressed_cb(void *data, const Efl_Event *event); static void -_inc_dec_button_mouse_move_cb(void *data, const Eo_Event *event); +_inc_dec_button_mouse_move_cb(void *data, const Efl_Event *event); static const Elm_Action key_actions[] = { {"spin", _key_action_spin}, @@ -413,7 +413,7 @@ _entry_value_apply(Evas_Object *obj) } static void -_entry_activated_cb(void *data, const Eo_Event *event EINA_UNUSED) +_entry_activated_cb(void *data, const Efl_Event *event EINA_UNUSED) { _entry_value_apply(data); } @@ -831,7 +831,7 @@ _button_inc_dec_stop_cb(void *data, } static void -_inc_dec_button_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) +_inc_dec_button_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED) { ELM_SPINNER_DATA_GET(data, sd); @@ -845,7 +845,7 @@ _inc_dec_button_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) } static void -_inc_dec_button_pressed_cb(void *data, const Eo_Event *event) +_inc_dec_button_pressed_cb(void *data, const Efl_Event *event) { ELM_SPINNER_DATA_GET(data, sd); @@ -862,7 +862,7 @@ _inc_dec_button_pressed_cb(void *data, const Eo_Event *event) } static void -_inc_dec_button_unpressed_cb(void *data, const Eo_Event *event EINA_UNUSED) +_inc_dec_button_unpressed_cb(void *data, const Efl_Event *event EINA_UNUSED) { ELM_SPINNER_DATA_GET(data, sd); @@ -876,13 +876,13 @@ _inc_dec_button_unpressed_cb(void *data, const Eo_Event *event EINA_UNUSED) } static void -_text_button_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) +_text_button_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED) { _toggle_entry(data); } static void -_inc_dec_button_mouse_move_cb(void *data, const Eo_Event *event) +_inc_dec_button_mouse_move_cb(void *data, const Efl_Event *event) { Efl_Input_Pointer *ev = event->info; ELM_SPINNER_DATA_GET(data, sd); diff --git a/src/lib/elementary/elm_store.c b/src/lib/elementary/elm_store.c index 84aefebc1b..ec27b8905e 100644 --- a/src/lib/elementary/elm_store.c +++ b/src/lib/elementary/elm_store.c @@ -224,7 +224,7 @@ _store_item_eval(void *data) } static void -_store_genlist_item_realized(void *data, const Eo_Event *event) +_store_genlist_item_realized(void *data, const Efl_Event *event) { Elm_Store *st = data; Elm_Object_Item *gli = event->info; @@ -237,7 +237,7 @@ _store_genlist_item_realized(void *data, const Eo_Event *event) } static void -_store_genlist_item_unrealized(void *data, const Eo_Event *event) +_store_genlist_item_unrealized(void *data, const Efl_Event *event) { Elm_Store *st = data; Elm_Object_Item *gli = event->info; diff --git a/src/lib/elementary/elm_view_form.c b/src/lib/elementary/elm_view_form.c index d6dd99312d..06d3d63041 100644 --- a/src/lib/elementary/elm_view_form.c +++ b/src/lib/elementary/elm_view_form.c @@ -92,7 +92,7 @@ _efl_model_promise_error_cb(void* data, Eina_Error error EINA_UNUSED) } static void -_efl_model_properties_change_cb(void *data, const Eo_Event *event) +_efl_model_properties_change_cb(void *data, const Efl_Event *event) { const Efl_Model_Property_Event *evt = event->info; Eina_Promise *promise; diff --git a/src/lib/elementary/elm_view_list.c b/src/lib/elementary/elm_view_list.c index aed293d7f3..31407c3692 100644 --- a/src/lib/elementary/elm_view_list.c +++ b/src/lib/elementary/elm_view_list.c @@ -48,12 +48,12 @@ struct _View_List_ValueItem }; static void _efl_model_load_children(View_List_ItemData *); -static void _efl_model_children_count_change_cb(void *, const Eo_Event *event); -static void _efl_model_properties_change_cb(void *, const Eo_Event *event); +static void _efl_model_children_count_change_cb(void *, const Efl_Event *event); +static void _efl_model_properties_change_cb(void *, const Efl_Event *event); -static void _expand_request_cb(void *data EINA_UNUSED, const Eo_Event *event); -static void _contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event); -static void _contracted_cb(void *data EINA_UNUSED, const Eo_Event *event); +static void _expand_request_cb(void *data EINA_UNUSED, const Efl_Event *event); +static void _contract_request_cb(void *data EINA_UNUSED, const Efl_Event *event); +static void _contracted_cb(void *data EINA_UNUSED, const Efl_Event *event); /* --- Genlist Callbacks --- */ EFL_CALLBACKS_ARRAY_DEFINE(model_callbacks, @@ -243,7 +243,7 @@ _item_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part) } static void -_expand_request_cb(void *data EINA_UNUSED, const Eo_Event *event) +_expand_request_cb(void *data EINA_UNUSED, const Efl_Event *event) { Elm_Object_Item *item = event->info; View_List_ItemData *idata = elm_object_item_data_get(item); @@ -256,7 +256,7 @@ _expand_request_cb(void *data EINA_UNUSED, const Eo_Event *event) } static void -_contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event) +_contract_request_cb(void *data EINA_UNUSED, const Efl_Event *event) { Elm_Object_Item *item = event->info; View_List_ItemData *idata = elm_object_item_data_get(item); @@ -266,7 +266,7 @@ _contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event) } static void -_contracted_cb(void *data EINA_UNUSED, const Eo_Event *event) +_contracted_cb(void *data EINA_UNUSED, const Efl_Event *event) { Elm_Object_Item *glit = event->info; elm_genlist_item_subitems_clear(glit); @@ -287,7 +287,7 @@ _genlist_deleted(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_ /* --- Efl_Model Callbacks --- */ static void -_efl_model_properties_change_cb(void *data, const Eo_Event *event) +_efl_model_properties_change_cb(void *data, const Efl_Event *event) { View_List_ItemData *idata = data; Efl_Model_Property_Event *evt = event->info; @@ -339,7 +339,7 @@ _efl_model_load_children(View_List_ItemData *pdata) } static void -_efl_model_children_count_change_cb(void *data, const Eo_Event *event EINA_UNUSED) +_efl_model_children_count_change_cb(void *data, const Efl_Event *event EINA_UNUSED) { View_List_ItemData *idata = data; EINA_SAFETY_ON_NULL_RETURN(idata); diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c index 136d67f9db..618c735651 100644 --- a/src/lib/elementary/elm_widget.c +++ b/src/lib/elementary/elm_widget.c @@ -102,11 +102,11 @@ _elm_scrollable_is(const Evas_Object *obj) static void elm_widget_disabled_internal(Eo *obj, Eina_Bool disabled); static void -_on_sub_obj_del(void *data, const Eo_Event *event); +_on_sub_obj_del(void *data, const Efl_Event *event); static void -_on_sub_obj_hide(void *data, const Eo_Event *event); +_on_sub_obj_hide(void *data, const Efl_Event *event); static void -_propagate_event(void *data, const Eo_Event *event); +_propagate_event(void *data, const Efl_Event *event); EFL_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks, { EFL_EVENT_DEL, _on_sub_obj_del }, @@ -249,13 +249,13 @@ _parents_unfocus(Evas_Object *obj) } static void -_on_sub_obj_hide(void *data EINA_UNUSED, const Eo_Event *event) +_on_sub_obj_hide(void *data EINA_UNUSED, const Efl_Event *event) { elm_widget_focus_hide_handle(event->object); } static void -_on_sub_obj_del(void *data, const Eo_Event *event) +_on_sub_obj_del(void *data, const Efl_Event *event) { ELM_WIDGET_DATA_GET_OR_RETURN(data, sd); @@ -715,7 +715,7 @@ _propagate_y_drag_lock(Evas_Object *obj, } static void -_propagate_event(void *data EINA_UNUSED, const Eo_Event *event) +_propagate_event(void *data EINA_UNUSED, const Efl_Event *event) { Eo *obj = event->object; INTERNAL_ENTRY; @@ -4432,14 +4432,14 @@ _track_obj_update(Evas_Object *track, Evas_Object *obj) } static void -_track_obj_view_update(void *data, const Eo_Event *event) +_track_obj_view_update(void *data, const Efl_Event *event) { Elm_Widget_Item_Data *item = data; _track_obj_update(item->track_obj, event->object); } static void -_track_obj_view_del(void *data, const Eo_Event *event); +_track_obj_view_del(void *data, const Efl_Event *event); EFL_CALLBACKS_ARRAY_DEFINE(tracker_callbacks, { EFL_GFX_EVENT_RESIZE, _track_obj_view_update }, @@ -4449,7 +4449,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(tracker_callbacks, { EFL_EVENT_DEL, _track_obj_view_del }); static void -_track_obj_view_del(void *data, const Eo_Event *event EINA_UNUSED) +_track_obj_view_del(void *data, const Efl_Event *event EINA_UNUSED) { Elm_Widget_Item_Data *item = data; @@ -4510,7 +4510,7 @@ _elm_widget_item_signal_callback_list_get(Elm_Widget_Item_Data *item, Eina_List #define ERR_NOT_SUPPORTED(item, method) ERR("%s does not support %s API.", elm_widget_type_get(item->widget), method); static void -_efl_del_cb(void *data EINA_UNUSED, const Eo_Event *event) +_efl_del_cb(void *data EINA_UNUSED, const Efl_Event *event) { Elm_Widget_Item_Data *item = efl_data_scope_get(event->object, ELM_WIDGET_ITEM_CLASS); ELM_WIDGET_ITEM_CHECK_OR_RETURN(item); diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index 5523cd1122..549cb0e889 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -86,7 +86,7 @@ extern "C" { * * @li @ref Efl_Class_Base * @li @ref Efl_Class - * @li @ref Eo_Events + * @li @ref Efl_Events * @li @ref Eo_Composite_Objects * * @section eo_main_intro_example Introductory Example @@ -252,7 +252,7 @@ typedef unsigned int Efl_Object_Op; #define EFL_NOOP ((Efl_Object_Op) 0) /** - * @addtogroup Eo_Events Eo's Event Handling + * @addtogroup Efl_Events Eo's Event Handling * @{ */ @@ -1041,7 +1041,7 @@ typedef void (*efl_key_data_free_func)(void *); #define efl_wref_del_safe(wref) efl_weak_unref(wref) /** - * @addtogroup Eo_Events Eo's Event Handling + * @addtogroup Efl_Events Eo's Event Handling * @{ */ diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo index 74355dd334..8c4586351d 100644 --- a/src/lib/eo/efl_object.eo +++ b/src/lib/eo/efl_object.eo @@ -8,7 +8,7 @@ struct Efl.Event.Description { restart: bool; [[Eina_True if when the event is triggered again from a callback, it should start from where it was]] } -struct Eo.Event { +struct Efl.Event { [[Parameter passed in event callbacks holding extra event parameters]] object: Efl.Object; [[The object the event was called on.]] desc: ref(const(Efl.Event.Description)); [[The event description.]] diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c index 8ba4d700bc..a5b74cb73f 100644 --- a/src/lib/eo/eo_base_class.c +++ b/src/lib/eo/eo_base_class.c @@ -91,7 +91,7 @@ _efl_object_extension_noneed(Efl_Object_Data *pd) pd->ext = NULL; } -static void _key_generic_cb_del(void *data, const Eo_Event *event); +static void _key_generic_cb_del(void *data, const Efl_Event *event); static void _eo_generic_data_node_free(Eo_Generic_Data_Node *node) @@ -238,7 +238,7 @@ _key_generic_get(const Eo *obj, Efl_Object_Data *pd, const char *key, Eo_Generic } static void -_key_generic_cb_del(void *data, const Eo_Event *event EINA_UNUSED) +_key_generic_cb_del(void *data, const Efl_Event *event EINA_UNUSED) { Eo_Generic_Data_Node *node = data; Efl_Object_Data *pd = efl_data_scope_get(node->obj, EFL_OBJECT_CLASS); @@ -1135,7 +1135,7 @@ _event_callback_call(Eo *obj_id, Efl_Object_Data *pd, Eo_Callback_Description *cb; Eo_Current_Callback_Description *lookup = NULL; Eo_Current_Callback_Description saved; - Eo_Event ev; + Efl_Event ev; ev.object = obj_id; ev.desc = desc; @@ -1266,7 +1266,7 @@ _efl_object_event_callback_stop(Eo *obj EINA_UNUSED, Efl_Object_Data *pd) } static void -_efl_event_forwarder_callback(void *data, const Eo_Event *event) +_efl_event_forwarder_callback(void *data, const Efl_Event *event) { Eo *new_obj = (Eo *) data; Eina_Bool ret = EINA_FALSE; diff --git a/src/lib/eolian/database_type.c b/src/lib/eolian/database_type.c index 8bc8b02524..f55d772fd1 100644 --- a/src/lib/eolian/database_type.c +++ b/src/lib/eolian/database_type.c @@ -203,7 +203,7 @@ _atype_to_str(const Eolian_Typedecl *tp, Eina_Strbuf *buf) { eina_strbuf_append(buf, "void (*"); _append_name(tp, buf); - eina_strbuf_append(buf, ")(void *data, const Eo_Event *event)"); + eina_strbuf_append(buf, ")(void *data, const Efl_Event *event)"); return; } diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c index b1cc71d12c..7fd6ff1d31 100644 --- a/src/lib/evas/canvas/evas_callbacks.c +++ b/src/lib/evas/canvas/evas_callbacks.c @@ -153,7 +153,7 @@ _evas_event_efl_event_info_type(Evas_Callback_Type type) } static void -_eo_evas_object_cb(void *data, const Eo_Event *event) +_eo_evas_object_cb(void *data, const Efl_Event *event) { Evas_Event_Flags *event_flags = NULL, evflags = EVAS_EVENT_FLAG_NONE; Efl_Input_Event *efl_event_info = event->info; @@ -195,7 +195,7 @@ _eo_evas_object_cb(void *data, const Eo_Event *event) } static void -_eo_evas_cb(void *data, const Eo_Event *event) +_eo_evas_cb(void *data, const Efl_Event *event) { _eo_evas_cb_info *info = data; if (info->func) info->func(info->data, event->object, event->info); @@ -585,7 +585,7 @@ evas_post_event_callback_remove_full(Evas *eo_e, Evas_Object_Event_Post_Cb func, } static void -_animator_repeater(void *data, const Eo_Event *event) +_animator_repeater(void *data, const Efl_Event *event) { Evas_Object_Protected_Data *obj = data; @@ -594,7 +594,7 @@ _animator_repeater(void *data, const Eo_Event *event) } static void -_check_event_catcher_add(void *data, const Eo_Event *event) +_check_event_catcher_add(void *data, const Efl_Event *event) { const Efl_Callback_Array_Item *array = event->info; Evas_Object_Protected_Data *obj = data; @@ -619,7 +619,7 @@ _check_event_catcher_add(void *data, const Eo_Event *event) } static void -_check_event_catcher_del(void *data, const Eo_Event *event) +_check_event_catcher_del(void *data, const Efl_Event *event) { const Efl_Callback_Array_Item *array = event->info; Evas_Object_Protected_Data *obj = data; diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c index b6439fc34a..f7be7e5536 100644 --- a/src/lib/evas/canvas/evas_canvas3d_node.c +++ b/src/lib/evas/canvas/evas_canvas3d_node.c @@ -51,7 +51,7 @@ _generate_unic_color_key(Evas_Color *color, Evas_Color *bg_color, Evas_Canvas3D_ } static void -_evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event) +_evas_canvas3d_node_private_callback_collision(void *data, const Efl_Event *event) { Eina_List *collision_list = NULL, *l = NULL; Evas_Canvas3D_Node *target_node = NULL, *n = NULL; @@ -82,7 +82,7 @@ _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event } } static void -_evas_canvas3d_node_private_callback_clicked(void *data EINA_UNUSED, const Eo_Event *event) +_evas_canvas3d_node_private_callback_clicked(void *data EINA_UNUSED, const Efl_Event *event) { Eina_Bool ret = EINA_FALSE; const Efl_Event_Description *eo_desc = efl_object_legacy_only_event_description_get("clicked"); diff --git a/src/lib/evas/canvas/evas_canvas3d_node_callback.h b/src/lib/evas/canvas/evas_canvas3d_node_callback.h index 7167217077..d310ade12a 100644 --- a/src/lib/evas/canvas/evas_canvas3d_node_callback.h +++ b/src/lib/evas/canvas/evas_canvas3d_node_callback.h @@ -24,9 +24,9 @@ const Efl_Event_Description evas_canvas3d_node_private_event_desc[] = /*Private callbacks */ static void -_evas_canvas3d_node_private_callback_clicked(void *data, const Eo_Event *event); +_evas_canvas3d_node_private_callback_clicked(void *data, const Efl_Event *event); static void -_evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event); +_evas_canvas3d_node_private_callback_collision(void *data, const Efl_Event *event); Efl_Event_Cb evas_canvas3d_node_private_callback_functions[] = { diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c index 500241545d..0ff74d9bce 100644 --- a/src/lib/evas/canvas/evas_clip.c +++ b/src/lib/evas/canvas/evas_clip.c @@ -213,7 +213,7 @@ _efl_canvas_object_clip_mask_unset(Evas_Object_Protected_Data *obj) extern const char *o_rect_type; extern const char *o_image_type; -static void _clipper_del_cb(void *data, const Eo_Event *event); +static void _clipper_del_cb(void *data, const Efl_Event *event); EOLIAN void _efl_canvas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_clip) @@ -480,7 +480,7 @@ _efl_canvas_object_clip_unset(Eo *eo_obj, Evas_Object_Protected_Data *obj) } static void -_clipper_del_cb(void *data, const Eo_Event *event) +_clipper_del_cb(void *data, const Efl_Event *event) { Evas_Object *eo_obj = data; Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); diff --git a/src/lib/evas/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c index 0b9a438d78..228009fa87 100644 --- a/src/lib/evas/canvas/evas_device.c +++ b/src/lib/evas/canvas/evas_device.c @@ -25,7 +25,7 @@ */ static void -_del_cb(void *data, const Eo_Event *ev) +_del_cb(void *data, const Efl_Event *ev) { Evas_Public_Data *e = data; diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c index b390c609a4..1238d51df1 100644 --- a/src/lib/evas/canvas/evas_events.c +++ b/src/lib/evas/canvas/evas_events.c @@ -3350,7 +3350,7 @@ _evas_canvas_event_down_count_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) } static void -_evas_canvas_event_pointer_cb(void *data, const Eo_Event *event) +_evas_canvas_event_pointer_cb(void *data, const Efl_Event *event) { Efl_Input_Pointer_Data *ev = efl_data_scope_get(event->info, EFL_INPUT_POINTER_CLASS); Evas_Public_Data *e = data; @@ -3422,7 +3422,7 @@ _evas_canvas_event_pointer_cb(void *data, const Eo_Event *event) } static void -_evas_canvas_event_key_cb(void *data, const Eo_Event *event) +_evas_canvas_event_key_cb(void *data, const Efl_Event *event) { Efl_Input_Key *evt = event->info; Evas_Public_Data *e = data; diff --git a/src/lib/evas/canvas/evas_filter_mixin.c b/src/lib/evas/canvas/evas_filter_mixin.c index c918cb5f02..5d810e5e89 100644 --- a/src/lib/evas/canvas/evas_filter_mixin.c +++ b/src/lib/evas/canvas/evas_filter_mixin.c @@ -73,7 +73,7 @@ _filter_end_sync(Evas_Filter_Context *ctx, Evas_Object_Protected_Data *obj, } static void -_render_post_cb(void *data, const Eo_Event *event EINA_UNUSED) +_render_post_cb(void *data, const Efl_Event *event EINA_UNUSED) { Eo *eo_obj = data; Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c index bb69385342..051c5e5cb1 100644 --- a/src/lib/evas/canvas/evas_object_box.c +++ b/src/lib/evas/canvas/evas_object_box.c @@ -110,7 +110,7 @@ _evas_object_box_accessor_free(Evas_Object_Box_Accessor *it) } static void -_on_child_resize(void *data, const Eo_Event *event EINA_UNUSED) +_on_child_resize(void *data, const Efl_Event *event EINA_UNUSED) { Evas_Object *box = data; EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(box, priv); @@ -118,7 +118,7 @@ _on_child_resize(void *data, const Eo_Event *event EINA_UNUSED) } static void -_on_child_del(void *data, const Eo_Event *event) +_on_child_del(void *data, const Efl_Event *event) { Evas_Object *box = data; @@ -130,7 +130,7 @@ _on_child_del(void *data, const Eo_Event *event) } static void -_on_child_hints_changed(void *data, const Eo_Event *event EINA_UNUSED) +_on_child_hints_changed(void *data, const Efl_Event *event EINA_UNUSED) { Evas_Object *box = data; EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(box, priv); diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c index 1efa864c22..ccd4d2b9a8 100644 --- a/src/lib/evas/canvas/evas_object_smart.c +++ b/src/lib/evas/canvas/evas_object_smart.c @@ -64,7 +64,7 @@ struct _Evas_Object_Smart_Iterator }; static void -_eo_evas_smart_cb(void *data, const Eo_Event *event) +_eo_evas_smart_cb(void *data, const Efl_Event *event) { _eo_evas_smart_cb_info *info = data; if (info->func) info->func(info->data, event->object, event->info); diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c index e7b3bb073d..d294ba5644 100644 --- a/src/lib/evas/canvas/evas_object_table.c +++ b/src/lib/evas/canvas/evas_object_table.c @@ -249,14 +249,14 @@ _evas_object_table_option_del(Evas_Object *o) } static void -_on_child_del(void *data, const Eo_Event *event) +_on_child_del(void *data, const Efl_Event *event) { Evas_Object *table = data; evas_object_table_unpack(table, event->object); } static void -_on_child_hints_changed(void *data, const Eo_Event *event EINA_UNUSED) +_on_child_hints_changed(void *data, const Efl_Event *event EINA_UNUSED) { Evas_Object *table = data; EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN(table, priv); diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 330e3249bd..6d5e28eed6 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -7612,7 +7612,7 @@ _obstacle_find(Efl_Canvas_Text_Data *obj, Eo *eo_obs) } void -_obstacle_del_cb(void *data, const Eo_Event *event) +_obstacle_del_cb(void *data, const Efl_Event *event) { Eo *eo_obj = data; Efl_Canvas_Text_Data *obj = efl_data_scope_get(eo_obj, MY_CLASS); diff --git a/src/lib/evas/canvas/evas_object_vg.c b/src/lib/evas/canvas/evas_object_vg.c index ccc247ee8c..5617f9f5ad 100644 --- a/src/lib/evas/canvas/evas_object_vg.c +++ b/src/lib/evas/canvas/evas_object_vg.c @@ -81,7 +81,7 @@ _evas_vg_root_node_get(Eo *obj EINA_UNUSED, Evas_VG_Data *pd) } static void -_cleanup_reference(void *data, const Eo_Event *event EINA_UNUSED) +_cleanup_reference(void *data, const Efl_Event *event EINA_UNUSED) { Evas_VG_Data *pd = data; Eo *renderer; diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c index d0db81eec5..5c6e3c7378 100644 --- a/src/lib/evas/canvas/evas_vg_node.c +++ b/src/lib/evas/canvas/evas_vg_node.c @@ -18,7 +18,7 @@ static const Efl_VG_Interpolation interpolation_identity = { }; static void -_efl_vg_property_changed(void *data, const Eo_Event *event) +_efl_vg_property_changed(void *data, const Efl_Event *event) { Efl_VG_Data *pd = data; Eo *parent; diff --git a/src/lib/evas/canvas/evas_vg_root_node.c b/src/lib/evas/canvas/evas_vg_root_node.c index 8e2d1b0cad..a192d78d0c 100644 --- a/src/lib/evas/canvas/evas_vg_root_node.c +++ b/src/lib/evas/canvas/evas_vg_root_node.c @@ -33,7 +33,7 @@ _evas_vg_root_node_render_pre(Eo *obj EINA_UNUSED, } static void -_evas_vg_root_node_changed(void *data, const Eo_Event *event) +_evas_vg_root_node_changed(void *data, const Efl_Event *event) { Efl_VG_Root_Node_Data *pd = data; Efl_VG_Data *bd = efl_data_scope_get(event->object, EFL_VG_CLASS); diff --git a/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c b/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c index b315f3520a..7a15df41cf 100644 --- a/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c +++ b/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c @@ -34,7 +34,7 @@ _diskselector_item_free_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event } static void -_ctxpopup_dismissed_cb(void *data, const Eo_Event *event) +_ctxpopup_dismissed_cb(void *data, const Efl_Event *event) { Ctxpopup_Module_Data *ctx_mod; ctx_mod = (Ctxpopup_Module_Data *)data; @@ -85,7 +85,7 @@ _field_value_get(struct tm *tim, Elm_Datetime_Field_Type field_type) } static void -_diskselector_cb(void *data EINA_UNUSED, const Eo_Event *event) +_diskselector_cb(void *data EINA_UNUSED, const Efl_Event *event) { DiskItem_Data *disk_data; struct tm curr_time; @@ -109,7 +109,7 @@ _diskselector_cb(void *data EINA_UNUSED, const Eo_Event *event) } static void -_ampm_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) +_ampm_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED) { Ctxpopup_Module_Data *ctx_mod; struct tm curr_time; @@ -128,7 +128,7 @@ _ampm_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) } static void -_field_clicked_cb(void *data, const Eo_Event *event) +_field_clicked_cb(void *data, const Efl_Event *event) { Ctxpopup_Module_Data *ctx_mod; Evas_Object *diskselector; diff --git a/src/modules/elementary/prefs/elm_button.c b/src/modules/elementary/prefs/elm_button.c index 52835d1213..2bce32b532 100644 --- a/src/modules/elementary/prefs/elm_button.c +++ b/src/modules/elementary/prefs/elm_button.c @@ -9,7 +9,7 @@ static Elm_Prefs_Item_Type supported_types[] = }; static void -_item_changed_cb(void *data, const Eo_Event *event) +_item_changed_cb(void *data, const Efl_Event *event) { Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; diff --git a/src/modules/elementary/prefs/elm_check.c b/src/modules/elementary/prefs/elm_check.c index a9f5b85591..c191d7dc03 100644 --- a/src/modules/elementary/prefs/elm_check.c +++ b/src/modules/elementary/prefs/elm_check.c @@ -7,7 +7,7 @@ static Elm_Prefs_Item_Type supported_types[] = }; static void -_item_changed_cb(void *data, const Eo_Event *event) +_item_changed_cb(void *data, const Efl_Event *event) { Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; diff --git a/src/modules/elementary/prefs/elm_datetime.c b/src/modules/elementary/prefs/elm_datetime.c index 929cd9004b..f99b096e6b 100644 --- a/src/modules/elementary/prefs/elm_datetime.c +++ b/src/modules/elementary/prefs/elm_datetime.c @@ -7,7 +7,7 @@ static Elm_Prefs_Item_Type supported_types[] = }; static void -_item_changed_cb(void *data, const Eo_Event *event) +_item_changed_cb(void *data, const Efl_Event *event) { Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; diff --git a/src/modules/elementary/prefs/elm_entry.c b/src/modules/elementary/prefs/elm_entry.c index c5f7657e12..a146ecbb9c 100644 --- a/src/modules/elementary/prefs/elm_entry.c +++ b/src/modules/elementary/prefs/elm_entry.c @@ -96,7 +96,7 @@ mismatch: } static void -_item_changed_cb(void *data, const Eo_Event *event) +_item_changed_cb(void *data, const Efl_Event *event) { Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; diff --git a/src/modules/elementary/prefs/elm_slider.c b/src/modules/elementary/prefs/elm_slider.c index 36f89e1537..9b88ef0732 100644 --- a/src/modules/elementary/prefs/elm_slider.c +++ b/src/modules/elementary/prefs/elm_slider.c @@ -8,7 +8,7 @@ static Elm_Prefs_Item_Type supported_types[] = }; static void -_item_changed_cb(void *data, const Eo_Event *event) +_item_changed_cb(void *data, const Efl_Event *event) { Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; diff --git a/src/modules/elementary/prefs/elm_spinner.c b/src/modules/elementary/prefs/elm_spinner.c index 896ea0c82d..c88769ea0f 100644 --- a/src/modules/elementary/prefs/elm_spinner.c +++ b/src/modules/elementary/prefs/elm_spinner.c @@ -8,7 +8,7 @@ static Elm_Prefs_Item_Type supported_types[] = }; static void -_item_changed_cb(void *data, const Eo_Event *event) +_item_changed_cb(void *data, const Efl_Event *event) { Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; diff --git a/src/modules/ethumb/emotion/emotion.c b/src/modules/ethumb/emotion/emotion.c index 0c6f4956aa..de2dd62413 100644 --- a/src/modules/ethumb/emotion/emotion.c +++ b/src/modules/ethumb/emotion/emotion.c @@ -81,7 +81,7 @@ _resize_movie(struct _emotion_plugin *_plugin) } static void -_frame_decode_cb(void *data, const Eo_Event *event EINA_UNUSED) +_frame_decode_cb(void *data, const Efl_Event *event EINA_UNUSED) { struct _emotion_plugin *_plugin = data; @@ -94,13 +94,13 @@ _frame_decode_cb(void *data, const Eo_Event *event EINA_UNUSED) } static void -_frame_resized_cb(void *data, const Eo_Event *event EINA_UNUSED) +_frame_resized_cb(void *data, const Efl_Event *event EINA_UNUSED) { _resize_movie(data); } static void -_video_stopped_cb(void *data, const Eo_Event *event EINA_UNUSED) +_video_stopped_cb(void *data, const Efl_Event *event EINA_UNUSED) { struct _emotion_plugin *_plugin = data; diff --git a/src/modules/evas/engines/gl_common/evas_gl_preload.c b/src/modules/evas/engines/gl_common/evas_gl_preload.c index 1a7c4cd471..29cd070f5f 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_preload.c +++ b/src/modules/evas/engines/gl_common/evas_gl_preload.c @@ -300,7 +300,7 @@ evas_gl_preload_render_relax(evas_gl_make_current_cb make_current, void *engine_ } static void -_evas_gl_preload_target_die(void *data, const Eo_Event *event) +_evas_gl_preload_target_die(void *data, const Efl_Event *event) { Evas_GL_Texture *tex = data; diff --git a/src/tests/ecore/ecore_test_args.c b/src/tests/ecore/ecore_test_args.c index cffdbcff05..88e0241967 100644 --- a/src/tests/ecore/ecore_test_args.c +++ b/src/tests/ecore/ecore_test_args.c @@ -11,7 +11,7 @@ static const char *args[] = { }; static void -_cb_args1(void *data EINA_UNUSED, const Eo_Event *event) +_cb_args1(void *data EINA_UNUSED, const Efl_Event *event) { Efl_Loop_Arguments *arge = event->info; unsigned int i; @@ -36,7 +36,7 @@ START_TEST(ecore_test_args1) END_TEST static void -_cb_args2(void *data EINA_UNUSED, const Eo_Event *event) +_cb_args2(void *data EINA_UNUSED, const Efl_Event *event) { Efl_Loop_Arguments *arge = event->info; @@ -61,7 +61,7 @@ START_TEST(ecore_test_args2) END_TEST static void -_cb_args3(void *data EINA_UNUSED, const Eo_Event *event) +_cb_args3(void *data EINA_UNUSED, const Efl_Event *event) { Efl_Loop_Arguments *arge = event->info; diff --git a/src/tests/ecore/ecore_test_ecore.c b/src/tests/ecore/ecore_test_ecore.c index 98484e22a4..e91984bcc3 100644 --- a/src/tests/ecore/ecore_test_ecore.c +++ b/src/tests/ecore/ecore_test_ecore.c @@ -268,7 +268,7 @@ START_TEST(ecore_test_ecore_main_loop_fd_handler) END_TEST static void -_eo_read_cb(void *data, const Eo_Event *info EINA_UNUSED) +_eo_read_cb(void *data, const Efl_Event *info EINA_UNUSED) { Eina_Bool *did = data; @@ -309,7 +309,7 @@ START_TEST(ecore_test_efl_loop_fd) END_TEST static void -_efl_del_cb(void *data, const Eo_Event *ev EINA_UNUSED) +_efl_del_cb(void *data, const Efl_Event *ev EINA_UNUSED) { Eina_Bool *dead = data; diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c index 254db11b38..1a88adff3d 100644 --- a/src/tests/ecore/ecore_test_ecore_audio.c +++ b/src/tests/ecore/ecore_test_ecore_audio.c @@ -11,19 +11,19 @@ #include "ecore_suite.h" -static void _finished_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) +static void _finished_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) { ecore_main_loop_quit(); } -static void _looped_cb(void *data EINA_UNUSED, const Eo_Event *event) +static void _looped_cb(void *data EINA_UNUSED, const Efl_Event *event) { ecore_audio_obj_in_looped_set(event->object, EINA_FALSE); } #ifdef HAVE_PULSE #if 0 -static void _failed_cb(void *data, const Eo_Event *event EINA_UNUSED) +static void _failed_cb(void *data, const Efl_Event *event EINA_UNUSED) { Eina_Bool *pulse_context_failed = data; diff --git a/src/tests/ecore/ecore_test_timer.c b/src/tests/ecore/ecore_test_timer.c index 7550bdffd0..ed326585a8 100644 --- a/src/tests/ecore/ecore_test_timer.c +++ b/src/tests/ecore/ecore_test_timer.c @@ -253,7 +253,7 @@ _test_time_cb(void *data) } static void -_test_death_cb(void *data, const Eo_Event *ev EINA_UNUSED) +_test_death_cb(void *data, const Efl_Event *ev EINA_UNUSED) { Eina_Bool *die = data; @@ -261,7 +261,7 @@ _test_death_cb(void *data, const Eo_Event *ev EINA_UNUSED) } static void -_test_run_cb(void *data, const Eo_Event *ev EINA_UNUSED) +_test_run_cb(void *data, const Efl_Event *ev EINA_UNUSED) { _test_time_cb(data); } diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c index d0ff492643..0623ee960b 100644 --- a/src/tests/eio/eio_model_test_monitor_add.c +++ b/src/tests/eio/eio_model_test_monitor_add.c @@ -22,7 +22,7 @@ struct _pair }; static void -_children_removed_cb(void *data EINA_UNUSED, const Eo_Event* event) +_children_removed_cb(void *data EINA_UNUSED, const Efl_Event* event) { fprintf(stderr, __FILE__ ":%d %s\n", __LINE__, __func__); if(children_deleted) @@ -42,7 +42,7 @@ _children_removed_cb(void *data EINA_UNUSED, const Eo_Event* event) } static void -_children_added_cb(void *data EINA_UNUSED, const Eo_Event* event) +_children_added_cb(void *data EINA_UNUSED, const Efl_Event* event) { fprintf(stderr, __FILE__ ":%d %s\n", __LINE__, __func__); Efl_Model_Children_Event* evt = event->info; diff --git a/src/tests/eio/eio_test_manager.c b/src/tests/eio/eio_test_manager.c index c1ac397c8a..cdf0644663 100644 --- a/src/tests/eio/eio_test_manager.c +++ b/src/tests/eio/eio_test_manager.c @@ -18,7 +18,7 @@ static int test_count = 0; static int DONE_CALLED = 0xdeadbeef; static void -_filter_direct_cb(void *data EINA_UNUSED, const Eo_Event *event) +_filter_direct_cb(void *data EINA_UNUSED, const Efl_Event *event) { Eio_Filter_Direct_Data *event_info = event->info; char *last_slash = strrchr(event_info->info->path, '/'); @@ -40,7 +40,7 @@ _main_direct_cb(void *data, const Eina_File_Direct_Info *info) } static void -_filter_cb(void *data EINA_UNUSED, const Eo_Event *event) +_filter_cb(void *data EINA_UNUSED, const Efl_Event *event) { Eio_Filter_Name_Data *event_info = event->info; char *last_slash = strrchr(event_info->file, '/'); diff --git a/src/tests/eio/eio_test_manager_xattr.c b/src/tests/eio/eio_test_manager_xattr.c index 3733589a3d..acee0b4707 100644 --- a/src/tests/eio/eio_test_manager_xattr.c +++ b/src/tests/eio/eio_test_manager_xattr.c @@ -36,7 +36,7 @@ static const char *attr_data[] = int total_attributes = sizeof(attribute)/sizeof(attribute[0]); static void -_filter_cb(void *data EINA_UNUSED, const Eo_Event *event) +_filter_cb(void *data EINA_UNUSED, const Efl_Event *event) { Eio_Filter_Name_Data *event_info = event->info; diff --git a/src/tests/eio/eio_test_sentry.c b/src/tests/eio/eio_test_sentry.c index 902d6532bb..fb07e842f1 100644 --- a/src/tests/eio/eio_test_sentry.c +++ b/src/tests/eio/eio_test_sentry.c @@ -104,7 +104,7 @@ static Eina_Bool _modify_attrib_file(void *data) /////// helper functions -static void _check_event_path(void *data, const Eo_Event *event) +static void _check_event_path(void *data, const Efl_Event *event) { Eio_Sentry_Event *event_info = event->info; ck_assert_str_eq((const char*)data, event_info->trigger); @@ -217,7 +217,7 @@ START_TEST(eio_test_sentry_add_add_remove_remove) } END_TEST -static void _target_notified_cb(void *data, const Eo_Event *event) +static void _target_notified_cb(void *data, const Efl_Event *event) { _check_event_path(data, event); _cancel_timeout(); @@ -609,7 +609,7 @@ START_TEST(eio_test_sentry_two_monitors_one_removed_one_event) } END_TEST -static void _unexpected_event_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) +static void _unexpected_event_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) { ck_abort_msg("unexpected event"); } diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c index 524d53df27..15e8cffad4 100644 --- a/src/tests/eldbus/eldbus_test_eldbus_model.c +++ b/src/tests/eldbus/eldbus_test_eldbus_model.c @@ -65,7 +65,7 @@ _error_then_cb(void* data EINA_UNUSED, Eina_Error error) } static void -_efl_event_quit_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) +_efl_event_quit_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) { ecore_main_loop_quit(); efl_event_callback_stop(event->object); diff --git a/src/tests/elementary/elm_test_genlist.c b/src/tests/elementary/elm_test_genlist.c index 3bd1790bb7..dd43419dff 100644 --- a/src/tests/elementary/elm_test_genlist.c +++ b/src/tests/elementary/elm_test_genlist.c @@ -81,7 +81,7 @@ START_TEST(elm_atspi_children_get2) END_TEST static void -_children_changed_cb(void *data EINA_UNUSED, const Eo_Event *event) +_children_changed_cb(void *data EINA_UNUSED, const Efl_Event *event) { if (event->desc != ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED) return; diff --git a/src/tests/elementary/elm_test_image.c b/src/tests/elementary/elm_test_image.c index bfbed5f6ec..3ae76f7a73 100644 --- a/src/tests/elementary/elm_test_image.c +++ b/src/tests/elementary/elm_test_image.c @@ -35,7 +35,7 @@ START_TEST (elm_atspi_role_get) END_TEST static void -_async_error_cb(void *data, const Eo_Event *event) +_async_error_cb(void *data, const Efl_Event *event) { Test_Data *td = data; char path[PATH_MAX]; @@ -44,7 +44,7 @@ _async_error_cb(void *data, const Eo_Event *event) } static void -_async_opened_cb(void *data, const Eo_Event *event) +_async_opened_cb(void *data, const Efl_Event *event) { Test_Data *td = data; const char *ff, *kk, *r1, *r2; diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c index 07ad64aec7..bf3d1a9ce7 100644 --- a/src/tests/emotion/emotion_test_main-eo.c +++ b/src/tests/emotion/emotion_test_main-eo.c @@ -56,7 +56,7 @@ struct _Frame_Data Evas_Coord x, y; }; -static void bg_key_down(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED); +static void bg_key_down(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED); static Evas_Object *o_bg = NULL; @@ -132,7 +132,7 @@ broadcast_event(Emotion_Event ev) } static void -bg_key_down(void *data EINA_UNUSED, const Eo_Event *event) +bg_key_down(void *data EINA_UNUSED, const Efl_Event *event) { Efl_Input_Key *ev = event->info; Eina_List *l; @@ -291,7 +291,7 @@ bg_key_down(void *data EINA_UNUSED, const Eo_Event *event) } static void -_oe_free_cb(void *data, const Eo_Event *event EINA_UNUSED) +_oe_free_cb(void *data, const Efl_Event *event EINA_UNUSED) { free(data); } @@ -324,7 +324,7 @@ video_obj_time_changed(Evas_Object *obj, Evas_Object *edje) } static void -video_obj_frame_decode_cb(void *data, const Eo_Event *event) +video_obj_frame_decode_cb(void *data, const Efl_Event *event) { video_obj_time_changed(event->object, data); @@ -339,7 +339,7 @@ video_obj_frame_decode_cb(void *data, const Eo_Event *event) } static void -video_obj_frame_resize_cb(void *data, const Eo_Event *event) +video_obj_frame_resize_cb(void *data, const Efl_Event *event) { Evas_Object *oe; int iw, ih; @@ -360,21 +360,21 @@ video_obj_frame_resize_cb(void *data, const Eo_Event *event) } static void -video_obj_length_change_cb(void *data, const Eo_Event *event) +video_obj_length_change_cb(void *data, const Efl_Event *event) { printf("len change!\n"); video_obj_time_changed(event->object, data); } static void -video_obj_position_update_cb(void *data, const Eo_Event *event) +video_obj_position_update_cb(void *data, const Efl_Event *event) { printf("pos up!\n"); video_obj_time_changed(event->object, data); } static void -video_obj_stopped_cb(void *data EINA_UNUSED, const Eo_Event *event) +video_obj_stopped_cb(void *data EINA_UNUSED, const Efl_Event *event) { printf("video stopped!!!\n"); if (loop) @@ -385,7 +385,7 @@ video_obj_stopped_cb(void *data EINA_UNUSED, const Eo_Event *event) } static void -video_obj_channels_cb(void *data EINA_UNUSED, const Eo_Event *event) +video_obj_channels_cb(void *data EINA_UNUSED, const Efl_Event *event) { printf("channels changed: [AUD %i][VID %i][SPU %i]\n", emotion_object_audio_channel_count(event->object), @@ -394,13 +394,13 @@ video_obj_channels_cb(void *data EINA_UNUSED, const Eo_Event *event) } static void - video_obj_title_cb(void *data EINA_UNUSED, const Eo_Event *event) + video_obj_title_cb(void *data EINA_UNUSED, const Efl_Event *event) { printf("video title to: \"%s\"\n", emotion_object_title_get(event->object)); } static void -video_obj_progress_cb(void *data EINA_UNUSED, const Eo_Event *event) +video_obj_progress_cb(void *data EINA_UNUSED, const Efl_Event *event) { printf("progress: \"%s\" %3.3f\n", emotion_object_progress_info_get(event->object), @@ -408,7 +408,7 @@ video_obj_progress_cb(void *data EINA_UNUSED, const Eo_Event *event) } static void -video_obj_ref_cb(void *data EINA_UNUSED, const Eo_Event *event) +video_obj_ref_cb(void *data EINA_UNUSED, const Efl_Event *event) { printf("video ref to: \"%s\" %i\n", emotion_object_ref_file_get(event->object), @@ -416,14 +416,14 @@ video_obj_ref_cb(void *data EINA_UNUSED, const Eo_Event *event) } static void -video_obj_button_num_cb(void *data EINA_UNUSED, const Eo_Event *event) +video_obj_button_num_cb(void *data EINA_UNUSED, const Efl_Event *event) { printf("video spu buttons to: %i\n", emotion_object_spu_button_count_get(event->object)); } static void -video_obj_button_cb(void *data EINA_UNUSED, const Eo_Event *event) +video_obj_button_cb(void *data EINA_UNUSED, const Efl_Event *event) { printf("video selected spu button: %i\n", emotion_object_spu_button_get(event->object)); diff --git a/src/tests/eo/composite_objects/composite_objects_main.c b/src/tests/eo/composite_objects/composite_objects_main.c index c37c851cd2..438492e51c 100644 --- a/src/tests/eo/composite_objects/composite_objects_main.c +++ b/src/tests/eo/composite_objects/composite_objects_main.c @@ -11,7 +11,7 @@ static int cb_called = EINA_FALSE; static void -_a_changed_cb(void *data, const Eo_Event *event) +_a_changed_cb(void *data, const Efl_Event *event) { int new_a = *((int *) event->info); printf("%s event_info:'%d' data:'%s'\n", __func__, new_a, (const char *) data); diff --git a/src/tests/eo/signals/signals_main.c b/src/tests/eo/signals/signals_main.c index 498f3c138d..51fca1f39e 100644 --- a/src/tests/eo/signals/signals_main.c +++ b/src/tests/eo/signals/signals_main.c @@ -10,12 +10,12 @@ static int cb_count = 0; static void -_null_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) +_null_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) { } static void -_a_changed_cb(void *data, const Eo_Event *event) +_a_changed_cb(void *data, const Efl_Event *event) { int new_a = *((int *) event->info); printf("%s event_info:'%d' data:'%d'\n", __func__, new_a, (int) (intptr_t) data); @@ -34,7 +34,7 @@ static Eina_Bool inside = EINA_FALSE; static int called = 0; static void -_restart_1_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) +_restart_1_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) { fprintf(stderr, "restart 1 inside: %i\n", inside); fail_if(!inside); @@ -43,7 +43,7 @@ _restart_1_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) } static void -_restart_2_cb(void *data, const Eo_Event *event) +_restart_2_cb(void *data, const Efl_Event *event) { fprintf(stderr, "restart 2 inside: %i\n", inside); fail_if(inside); diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c index 5404f4da76..74b569be63 100644 --- a/src/tests/eo/signals/signals_simple.c +++ b/src/tests/eo/signals/signals_simple.c @@ -29,7 +29,7 @@ _a_set(Eo *obj, void *class_data, int a) } void -_cb_added(void *data EINA_UNUSED, const Eo_Event *event) +_cb_added(void *data EINA_UNUSED, const Efl_Event *event) { Simple_Public_Data *pd = efl_data_scope_get(event->object, MY_CLASS); const Efl_Callback_Array_Item *callback_array = event->info; @@ -43,7 +43,7 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *event) } void -_cb_deled(void *data EINA_UNUSED, const Eo_Event *event) +_cb_deled(void *data EINA_UNUSED, const Efl_Event *event) { Simple_Public_Data *pd = efl_data_scope_get(event->object, MY_CLASS); const Efl_Callback_Array_Item *callback_array = event->info; diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c index d6ab99ea55..36c3b5a6f9 100644 --- a/src/tests/eo/suite/eo_test_general.c +++ b/src/tests/eo/suite/eo_test_general.c @@ -120,7 +120,7 @@ static int _eo_signals_cb_current = 0; static int _eo_signals_cb_flag = 0; static void -_eo_signals_a_changed_cb(void *_data, const Eo_Event *event EINA_UNUSED) +_eo_signals_a_changed_cb(void *_data, const Efl_Event *event EINA_UNUSED) { int data = (intptr_t) _data; _eo_signals_cb_current++; @@ -129,14 +129,14 @@ _eo_signals_a_changed_cb(void *_data, const Eo_Event *event EINA_UNUSED) } static void -_eo_signals_a_changed_cb2(void *_data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) +_eo_signals_a_changed_cb2(void *_data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) { _eo_signals_cb_flag |= 0x2; efl_event_callback_stop(event->object); } static void -_eo_signals_a_changed_within_cb(void *_data EINA_UNUSED, const Eo_Event *event) +_eo_signals_a_changed_within_cb(void *_data EINA_UNUSED, const Efl_Event *event) { int a = 3; efl_event_callback_legacy_call(event->object, EV_A_CHANGED, &a); @@ -144,20 +144,20 @@ _eo_signals_a_changed_within_cb(void *_data EINA_UNUSED, const Eo_Event *event) } static void -_eo_signals_a_changed_never(void *_data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) +_eo_signals_a_changed_never(void *_data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) { /* This one should never be called. */ fail_if(1); } static void -_eo_signals_efl_del_cb(void *_data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) +_eo_signals_efl_del_cb(void *_data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) { _eo_signals_cb_flag |= 0x4; } void -_eo_signals_cb_added_deled(void *data, const Eo_Event *event) +_eo_signals_cb_added_deled(void *data, const Efl_Event *event) { const Efl_Callback_Array_Item *callback_array = event->info; const Efl_Callback_Array_Item *(*callback_data)(void) = data; diff --git a/src/tests/eolian/data/typedef_ref.c b/src/tests/eolian/data/typedef_ref.c index 11d549fe9f..fa9a655eb7 100644 --- a/src/tests/eolian/data/typedef_ref.c +++ b/src/tests/eolian/data/typedef_ref.c @@ -19,7 +19,7 @@ typedef Evas_Coord Evas_Coord2; typedef Evas_Coord2 Evas_Coord3; -typedef void (*Event)(void *data, const Eo_Event *event); +typedef void (*Event)(void *data, const Efl_Event *event); typedef enum { diff --git a/src/tests/eolian/data/typedef_ref_stub.c b/src/tests/eolian/data/typedef_ref_stub.c index 033d5dac53..2e52edc8e5 100644 --- a/src/tests/eolian/data/typedef_ref_stub.c +++ b/src/tests/eolian/data/typedef_ref_stub.c @@ -11,7 +11,7 @@ typedef Evas_Coord Evas_Coord2; typedef Evas_Coord2 Evas_Coord3; -typedef void (*Event)(void *data, const Eo_Event *event); +typedef void (*Event)(void *data, const Efl_Event *event); #endif