From 6d0a2398adf3026477991cdf81f11e17a61a1c5a Mon Sep 17 00:00:00 2001 From: Jee-Yong Um Date: Mon, 2 Jan 2017 16:48:17 +0900 Subject: [PATCH] Elm.Widget: rename "event.*" methods to solve name conflict Summary: Elm.Widget.event_callback_add conflicts with Efl.Object.event_callback_add. To solve this problem, "widget_" prefix is added to methods starting with "event". Reviewers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D4521 --- src/lib/elementary/efl_ui_image.c | 2 +- src/lib/elementary/efl_ui_image.eo | 2 +- src/lib/elementary/efl_ui_nstate.c | 2 +- src/lib/elementary/efl_ui_nstate.eo | 2 +- src/lib/elementary/efl_ui_video.c | 2 +- src/lib/elementary/efl_ui_video.eo | 2 +- src/lib/elementary/efl_ui_win.c | 2 +- src/lib/elementary/efl_ui_win.eo | 2 +- src/lib/elementary/elc_combobox.c | 2 +- src/lib/elementary/elc_ctxpopup.c | 2 +- src/lib/elementary/elc_fileselector.c | 2 +- src/lib/elementary/elc_hoversel.c | 2 +- src/lib/elementary/elc_multibuttonentry.c | 2 +- src/lib/elementary/elc_naviframe.c | 2 +- src/lib/elementary/elc_player.c | 2 +- src/lib/elementary/elc_popup.c | 2 +- src/lib/elementary/elm_button.c | 2 +- src/lib/elementary/elm_button.eo | 2 +- src/lib/elementary/elm_calendar.c | 2 +- src/lib/elementary/elm_calendar.eo | 2 +- src/lib/elementary/elm_check.c | 2 +- src/lib/elementary/elm_check.eo | 2 +- src/lib/elementary/elm_code_widget.c | 2 +- src/lib/elementary/elm_code_widget.eo | 2 +- src/lib/elementary/elm_colorselector.c | 2 +- src/lib/elementary/elm_colorselector.eo | 2 +- src/lib/elementary/elm_combobox.eo | 2 +- src/lib/elementary/elm_ctxpopup.eo | 2 +- src/lib/elementary/elm_diskselector.c | 2 +- src/lib/elementary/elm_diskselector.eo | 2 +- src/lib/elementary/elm_fileselector.eo | 2 +- src/lib/elementary/elm_flipselector.c | 2 +- src/lib/elementary/elm_flipselector.eo | 2 +- src/lib/elementary/elm_gengrid.c | 2 +- src/lib/elementary/elm_gengrid.eo | 2 +- src/lib/elementary/elm_genlist.c | 2 +- src/lib/elementary/elm_genlist.eo | 2 +- src/lib/elementary/elm_hoversel.eo | 2 +- src/lib/elementary/elm_list.c | 2 +- src/lib/elementary/elm_list.eo | 2 +- src/lib/elementary/elm_map.c | 2 +- src/lib/elementary/elm_map.eo | 2 +- src/lib/elementary/elm_multibuttonentry.eo | 2 +- src/lib/elementary/elm_naviframe.eo | 2 +- src/lib/elementary/elm_panel.c | 2 +- src/lib/elementary/elm_panel.eo | 2 +- src/lib/elementary/elm_photocam.c | 2 +- src/lib/elementary/elm_photocam.eo | 2 +- src/lib/elementary/elm_player.eo | 2 +- src/lib/elementary/elm_popup.eo | 2 +- src/lib/elementary/elm_radio.c | 2 +- src/lib/elementary/elm_radio.eo | 2 +- src/lib/elementary/elm_scroller.c | 2 +- src/lib/elementary/elm_scroller.eo | 2 +- src/lib/elementary/elm_slider.c | 2 +- src/lib/elementary/elm_slider.eo | 2 +- src/lib/elementary/elm_slideshow.c | 2 +- src/lib/elementary/elm_slideshow.eo | 2 +- src/lib/elementary/elm_spinner.c | 2 +- src/lib/elementary/elm_spinner.eo | 2 +- src/lib/elementary/elm_toolbar.c | 2 +- src/lib/elementary/elm_toolbar.eo | 2 +- src/lib/elementary/elm_widget.c | 8 ++++---- src/lib/elementary/elm_widget.eo | 18 +++++++++++------- 64 files changed, 77 insertions(+), 73 deletions(-) diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index 264f6ce683..1d2c9062e7 100644 --- a/src/lib/elementary/efl_ui_image.c +++ b/src/lib/elementary/efl_ui_image.c @@ -692,7 +692,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_efl_ui_image_elm_widget_event(Eo *obj, Efl_Ui_Image_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_efl_ui_image_elm_widget_widget_event(Eo *obj, Efl_Ui_Image_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) { (void) src; Evas_Event_Key_Down *ev = event_info; diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo index b36cb4bd98..4bc05cbb71 100644 --- a/src/lib/elementary/efl_ui_image.eo +++ b/src/lib/elementary/efl_ui_image.eo @@ -144,7 +144,7 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable, Efl.Canvas.Group.group_member_add; Efl.Ui.Draggable.drag_target { get; set; } Elm.Widget.theme_apply; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Interface.Atspi_Image.extents { get; } Elm.Interface.Atspi_Widget_Action.elm_actions { get; } } diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c index 3b8c5ec942..85326c47ab 100644 --- a/src/lib/elementary/efl_ui_nstate.c +++ b/src/lib/elementary/efl_ui_nstate.c @@ -159,7 +159,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_efl_ui_nstate_elm_widget_event(Eo *obj, Efl_Ui_Nstate_Data *_pd EINA_UNUSED, Evas_Object *src EINA_UNUSED, Evas_Callback_Type type, void *event_info) +_efl_ui_nstate_elm_widget_widget_event(Eo *obj, Efl_Ui_Nstate_Data *_pd EINA_UNUSED, Evas_Object *src EINA_UNUSED, Evas_Callback_Type type, void *event_info) { Evas_Event_Key_Down *ev = event_info; diff --git a/src/lib/elementary/efl_ui_nstate.eo b/src/lib/elementary/efl_ui_nstate.eo index c830072d73..854580af45 100644 --- a/src/lib/elementary/efl_ui_nstate.eo +++ b/src/lib/elementary/efl_ui_nstate.eo @@ -33,7 +33,7 @@ class Efl.Ui.Nstate(Elm.Button) Efl.Canvas.Group.group_add; Efl.Canvas.Group.group_del; Elm.Widget.theme_apply; - Elm.Widget.event; + Elm.Widget.widget_event; } events { state,changed; [[Called when nstate widget changed]] diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c index 5808353798..35213104c0 100644 --- a/src/lib/elementary/efl_ui_video.c +++ b/src/lib/elementary/efl_ui_video.c @@ -108,7 +108,7 @@ _key_action_play(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_efl_ui_video_elm_widget_event(Eo *obj, Efl_Ui_Video_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_efl_ui_video_elm_widget_widget_event(Eo *obj, Efl_Ui_Video_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) { (void) src; Evas_Event_Key_Down *ev = event_info; diff --git a/src/lib/elementary/efl_ui_video.eo b/src/lib/elementary/efl_ui_video.eo index 29dd16a7e8..88f3ad2222 100644 --- a/src/lib/elementary/efl_ui_video.eo +++ b/src/lib/elementary/efl_ui_video.eo @@ -68,7 +68,7 @@ class Efl.Ui.Video (Elm.Layout, Efl.File, Efl.Canvas.Group.group_del; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Layout.sizing_eval; Elm.Interface.Atspi_Widget_Action.elm_actions { get; } } diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index bc7f6ebbef..4d2b945b10 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -1697,7 +1697,7 @@ _key_action_move(Evas_Object *obj, const char *params) } EOLIAN static Eina_Bool -_efl_ui_win_elm_widget_event(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED, Evas_Object *src EINA_UNUSED, Evas_Callback_Type type, void *event_info) +_efl_ui_win_elm_widget_widget_event(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED, Evas_Object *src EINA_UNUSED, Evas_Callback_Type type, void *event_info) { Evas_Event_Key_Down *ev = event_info; diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index 007aeb5fdc..3787aceac2 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo @@ -939,7 +939,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window, Elm.Widget.focus_next; Elm.Widget.theme_apply; Elm.Widget.on_focus; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Interface.Atspi_Accessible.parent { get; } Elm.Interface.Atspi_Accessible.state_set { get; } Elm.Interface.Atspi_Accessible.name { get; } diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c index b62a35ed2e..50089a50fd 100644 --- a/src/lib/elementary/elc_combobox.c +++ b/src/lib/elementary/elc_combobox.c @@ -472,7 +472,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_elm_combobox_elm_widget_event(Eo *obj, Elm_Combobox_Data *sd, +_elm_combobox_elm_widget_widget_event(Eo *obj, Elm_Combobox_Data *sd, Evas_Object *src EINA_UNUSED, Evas_Callback_Type type, void *event_info) { diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c index 506569b05c..f8f967070e 100644 --- a/src/lib/elementary/elc_ctxpopup.c +++ b/src/lib/elementary/elc_ctxpopup.c @@ -146,7 +146,7 @@ _key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_elm_ctxpopup_elm_widget_event(Eo *obj, Elm_Ctxpopup_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_ctxpopup_elm_widget_widget_event(Eo *obj, Elm_Ctxpopup_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) { Evas_Event_Key_Down *ev = event_info; (void)src; diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c index de2b6237da..183b6c499e 100644 --- a/src/lib/elementary/elc_fileselector.c +++ b/src/lib/elementary/elc_fileselector.c @@ -278,7 +278,7 @@ _key_action_backspace(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_elm_fileselector_elm_widget_event(Eo *obj, Elm_Fileselector_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_fileselector_elm_widget_widget_event(Eo *obj, Elm_Fileselector_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) { Evas_Event_Key_Down *ev = event_info; (void) src; diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c index 745e7ff107..a1bc58e10c 100644 --- a/src/lib/elementary/elc_hoversel.c +++ b/src/lib/elementary/elc_hoversel.c @@ -973,7 +973,7 @@ _key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_elm_hoversel_elm_widget_event(Eo *obj, Elm_Hoversel_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_hoversel_elm_widget_widget_event(Eo *obj, Elm_Hoversel_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) { (void) src; Eina_Bool int_ret = EINA_FALSE; diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c index 68cf10730e..857c50ac8a 100644 --- a/src/lib/elementary/elc_multibuttonentry.c +++ b/src/lib/elementary/elc_multibuttonentry.c @@ -958,7 +958,7 @@ _item_new(Elm_Multibuttonentry_Data *sd, //FIXME: having an empty event handling function and reacting on Evas //events on specific objects is crazy, someone should fix that. EOLIAN static Eina_Bool -_elm_multibuttonentry_elm_widget_event(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *ev) +_elm_multibuttonentry_elm_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *ev) { (void)src; (void)type; diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c index 0cf45b5976..9bdd86778c 100644 --- a/src/lib/elementary/elc_naviframe.c +++ b/src/lib/elementary/elc_naviframe.c @@ -1542,7 +1542,7 @@ _key_action_item_pop(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_elm_naviframe_elm_widget_event(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_naviframe_elm_widget_widget_event(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) { (void)src; Evas_Event_Key_Down *ev = event_info; diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c index 4877485d40..5e7670b9b4 100644 --- a/src/lib/elementary/elc_player.c +++ b/src/lib/elementary/elc_player.c @@ -145,7 +145,7 @@ _key_action_play(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_elm_player_elm_widget_event(Eo *obj, Elm_Player_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_player_elm_widget_widget_event(Eo *obj, Elm_Player_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) { Evas_Event_Key_Down *ev = event_info; (void) src; diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index 189dbc56ac..a60b9a8573 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c @@ -1470,7 +1470,7 @@ _key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_elm_popup_elm_widget_event(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_popup_elm_widget_widget_event(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) { (void)src; Evas_Event_Key_Down *ev = event_info; diff --git a/src/lib/elementary/elm_button.c b/src/lib/elementary/elm_button.c index 7faf26721b..2cebbdefa6 100644 --- a/src/lib/elementary/elm_button.c +++ b/src/lib/elementary/elm_button.c @@ -172,7 +172,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_elm_button_elm_widget_event(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_button_elm_widget_widget_event(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) { (void) src; Evas_Event_Key_Down *ev = event_info; diff --git a/src/lib/elementary/elm_button.eo b/src/lib/elementary/elm_button.eo index 6be47e0718..e9e2f8f750 100644 --- a/src/lib/elementary/elm_button.eo +++ b/src/lib/elementary/elm_button.eo @@ -81,7 +81,7 @@ class Elm.Button (Elm.Layout, Efl.Ui.Clickable, Elm.Widget.focus_direction_manager_is; Elm.Widget.theme_apply; Elm.Widget.sub_object_del; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Layout.text_aliases { get; } Elm.Layout.content_aliases { get; } Elm.Layout.sizing_eval; diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c index cc2384f52a..e25ebf2c28 100644 --- a/src/lib/elementary/elm_calendar.c +++ b/src/lib/elementary/elm_calendar.c @@ -1656,7 +1656,7 @@ _elm_calendar_elm_widget_on_focus(Eo *obj, Elm_Calendar_Data *sd, Elm_Object_Ite } EOLIAN static Eina_Bool -_elm_calendar_elm_widget_event(Eo *obj, Elm_Calendar_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_calendar_elm_widget_widget_event(Eo *obj, Elm_Calendar_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) { (void) src; Evas_Event_Key_Down *ev = event_info; diff --git a/src/lib/elementary/elm_calendar.eo b/src/lib/elementary/elm_calendar.eo index ad2227c328..8d200be214 100644 --- a/src/lib/elementary/elm_calendar.eo +++ b/src/lib/elementary/elm_calendar.eo @@ -420,7 +420,7 @@ class Elm.Calendar (Elm.Layout, Elm.Interface.Atspi_Widget_Action) Elm.Widget.access; Elm.Widget.focus_next; Elm.Widget.on_focus; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Layout.sizing_eval; Elm.Interface.Atspi_Widget_Action.elm_actions { get; } } diff --git a/src/lib/elementary/elm_check.c b/src/lib/elementary/elm_check.c index 0f5651649a..c6d9d9bb76 100644 --- a/src/lib/elementary/elm_check.c +++ b/src/lib/elementary/elm_check.c @@ -149,7 +149,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_elm_check_elm_widget_event(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_check_elm_widget_widget_event(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) { (void) src; Evas_Event_Key_Down *ev = event_info; diff --git a/src/lib/elementary/elm_check.eo b/src/lib/elementary/elm_check.eo index 4b79c24a75..a3a99e366d 100644 --- a/src/lib/elementary/elm_check.eo +++ b/src/lib/elementary/elm_check.eo @@ -28,7 +28,7 @@ class Elm.Check (Efl.Ui.Nstate, Elm.Interface.Atspi_Widget_Action) Elm.Widget.activate; Elm.Widget.theme_apply; Elm.Widget.sub_object_del; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Layout.text_aliases { get; } Efl.Ui.Nstate.count { set; } Efl.Ui.Nstate.value { set; } diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c index 6e6910c764..7ce76de4e6 100644 --- a/src/lib/elementary/elm_code_widget.c +++ b/src/lib/elementary/elm_code_widget.c @@ -1661,7 +1661,7 @@ _elm_code_widget_scroll_event_cb(void *data, Evas_Object *obj EINA_UNUSED, } EOLIAN static Eina_Bool -_elm_code_widget_elm_widget_event(Eo *obj EINA_UNUSED, Elm_Code_Widget_Data *pd EINA_UNUSED, +_elm_code_widget_elm_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Code_Widget_Data *pd EINA_UNUSED, Evas_Object *src EINA_UNUSED, Evas_Callback_Type type, void *event_info) { Evas_Event_Key_Down *ev = event_info; diff --git a/src/lib/elementary/elm_code_widget.eo b/src/lib/elementary/elm_code_widget.eo index 7539ca730d..a63f9197d7 100644 --- a/src/lib/elementary/elm_code_widget.eo +++ b/src/lib/elementary/elm_code_widget.eo @@ -270,7 +270,7 @@ class Elm.Code_Widget (Elm.Layout, Elm.Interface.Atspi.Text) Efl.Object.constructor; Efl.Object.finalize; Efl.Canvas.Group.group_add; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; } diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index bb7f4ffadf..71d1d35cc3 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -2127,7 +2127,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_elm_colorselector_elm_widget_event(Eo *obj, Elm_Colorselector_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_colorselector_elm_widget_widget_event(Eo *obj, Elm_Colorselector_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) { Evas_Event_Key_Down *ev = event_info; (void) src; diff --git a/src/lib/elementary/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo index bc58aae1d1..8b4923d4b5 100644 --- a/src/lib/elementary/elm_colorselector.eo +++ b/src/lib/elementary/elm_colorselector.eo @@ -116,7 +116,7 @@ class Elm.Colorselector (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Elm.Widget.focus_direction_manager_is; Elm.Widget.focus_highlight_geometry_get; Elm.Widget.access; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Layout.sizing_eval; Elm.Interface.Atspi_Widget_Action.elm_actions { get; } } diff --git a/src/lib/elementary/elm_combobox.eo b/src/lib/elementary/elm_combobox.eo index c8632f4e3d..591126e967 100644 --- a/src/lib/elementary/elm_combobox.eo +++ b/src/lib/elementary/elm_combobox.eo @@ -44,7 +44,7 @@ class Elm.Combobox (Elm.Button, Efl.Ui.Selectable, Elm.Widget.part_text { get; set; } Elm.Widget.theme_apply; Elm.Widget.translate; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Button.admits_autorepeat { get; } Elm.Genlist.filter { set; } Elm.Interface.Atspi_Widget_Action.elm_actions { get; } diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo index 349fc84f68..02271f43c6 100644 --- a/src/lib/elementary/elm_ctxpopup.eo +++ b/src/lib/elementary/elm_ctxpopup.eo @@ -164,7 +164,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Elm.Widget.disable; Elm.Widget.translate; Elm.Widget.theme_apply; - Elm.Widget.event; + Elm.Widget.widget_event; Efl.Ui.Menu.selected_item { get; } Efl.Ui.Menu.first_item { get; } Efl.Ui.Menu.last_item { get; } diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c index 7195c1b20b..9294863e1f 100644 --- a/src/lib/elementary/elm_diskselector.c +++ b/src/lib/elementary/elm_diskselector.c @@ -997,7 +997,7 @@ _key_action_move(Evas_Object *obj, const char *params) } EOLIAN static Eina_Bool -_elm_diskselector_elm_widget_event(Eo *obj, Elm_Diskselector_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_diskselector_elm_widget_widget_event(Eo *obj, Elm_Diskselector_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) { Evas_Event_Key_Down *ev = event_info; diff --git a/src/lib/elementary/elm_diskselector.eo b/src/lib/elementary/elm_diskselector.eo index 3ffd73f1ec..df0d36070d 100644 --- a/src/lib/elementary/elm_diskselector.eo +++ b/src/lib/elementary/elm_diskselector.eo @@ -210,7 +210,7 @@ class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable, Elm.Widget.on_focus; Elm.Widget.translate; Elm.Widget.sub_object_del; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Interface_Scrollable.policy; Elm.Interface.Atspi_Widget_Action.elm_actions { get; } } diff --git a/src/lib/elementary/elm_fileselector.eo b/src/lib/elementary/elm_fileselector.eo index cf387d0e10..cce2bcb830 100644 --- a/src/lib/elementary/elm_fileselector.eo +++ b/src/lib/elementary/elm_fileselector.eo @@ -41,7 +41,7 @@ class Elm.Fileselector (Elm.Layout, Elm.Interface.Fileselector, Elm.Widget.focus_next; Elm.Widget.focus_direction_manager_is; Elm.Widget.focus_direction; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Widget.theme_apply; Elm.Widget.focus_next_manager_is; Elm.Layout.text { set; } diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c index ba57fe8f24..bae941edf0 100644 --- a/src/lib/elementary/elm_flipselector.c +++ b/src/lib/elementary/elm_flipselector.c @@ -513,7 +513,7 @@ _elm_flipselector_efl_ui_spin_value_set(Eo *obj EINA_UNUSED, Elm_Flipselector_Da } EOLIAN static Eina_Bool -_elm_flipselector_elm_widget_event(Eo *obj EINA_UNUSED, Elm_Flipselector_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_flipselector_elm_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Flipselector_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) { Evas_Event_Key_Down *ev = event_info; (void) src; diff --git a/src/lib/elementary/elm_flipselector.eo b/src/lib/elementary/elm_flipselector.eo index 8cc5f47a56..6b297d0355 100644 --- a/src/lib/elementary/elm_flipselector.eo +++ b/src/lib/elementary/elm_flipselector.eo @@ -132,7 +132,7 @@ class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin, Elm.Widget.theme_apply; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Layout.sizing_eval; Efl.Ui.Spin.min_max; Efl.Ui.Spin.step; diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index 4329685320..5437788557 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -3801,7 +3801,7 @@ _key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_elm_gengrid_elm_widget_event(Eo *obj, Elm_Gengrid_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_gengrid_elm_widget_widget_event(Eo *obj, Elm_Gengrid_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) { Evas_Event_Key_Down *ev = event_info; (void) src; diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo index 830c452cd6..34e6546573 100644 --- a/src/lib/elementary/elm_gengrid.eo +++ b/src/lib/elementary/elm_gengrid.eo @@ -555,7 +555,7 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable, Elm.Widget.focus_direction; Elm.Widget.on_focus; Elm.Widget.on_focus_region; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Widget.focus_highlight_geometry_get; Elm.Widget.focused_item { get; } Elm.Widget.item_loop_enabled { get; set; } diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 1d52f62315..4688e5f1ed 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -3171,7 +3171,7 @@ _key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_elm_genlist_elm_widget_event(Eo *obj, Elm_Genlist_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_genlist_elm_widget_widget_event(Eo *obj, Elm_Genlist_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) { (void) src; Evas_Event_Key_Down *ev = event_info; diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo index 55c60bc6a0..8212a423fc 100644 --- a/src/lib/elementary/elm_genlist.eo +++ b/src/lib/elementary/elm_genlist.eo @@ -543,7 +543,7 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, Elm.Widget.on_focus; Elm.Widget.focus_direction_manager_is; Elm.Widget.sub_object_del; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Widget.focused_item { get; } Elm.Widget.item_loop_enabled { get; set; } Elm.Layout.sub_object_add_enable; diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo index 71c3302001..b82484dfc4 100644 --- a/src/lib/elementary/elm_hoversel.eo +++ b/src/lib/elementary/elm_hoversel.eo @@ -100,7 +100,7 @@ class Elm.Hoversel (Elm.Button, Efl.Ui.Selectable, Elm.Widget.widget_parent { set; } Elm.Widget.theme_apply; Elm.Widget.translate; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Button.admits_autorepeat { get; } Elm.Interface.Atspi_Widget_Action.elm_actions { get; } } diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c index 710c5cb07e..682de8cf3c 100644 --- a/src/lib/elementary/elm_list.c +++ b/src/lib/elementary/elm_list.c @@ -629,7 +629,7 @@ static Eina_Bool _key_action_escape(Evas_Object *obj, const char *params EINA_UN } EOLIAN static Eina_Bool -_elm_list_elm_widget_event(Eo *obj, Elm_List_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_list_elm_widget_widget_event(Eo *obj, Elm_List_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) { (void) src; Evas_Event_Key_Down *ev = event_info; diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo index 0b560e2a05..f5e2af3602 100644 --- a/src/lib/elementary/elm_list.eo +++ b/src/lib/elementary/elm_list.eo @@ -445,7 +445,7 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable, Elm.Widget.on_focus; Elm.Widget.translate; Elm.Widget.sub_object_del; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Widget.focused_item { get; } Elm.Widget.item_loop_enabled { get; set; } Elm.Layout.sizing_eval; diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c index 52bd910a49..344f6debe9 100644 --- a/src/lib/elementary/elm_map.c +++ b/src/lib/elementary/elm_map.c @@ -4069,7 +4069,7 @@ _key_action_zoom(Evas_Object *obj, const char *params) } EOLIAN static Eina_Bool -_elm_map_elm_widget_event(Eo *obj, Elm_Map_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_map_elm_widget_widget_event(Eo *obj, Elm_Map_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) { (void) src; Evas_Event_Key_Down *ev = event_info; diff --git a/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo index bbbdb7b1fc..3ddc5028ac 100644 --- a/src/lib/elementary/elm_map.eo +++ b/src/lib/elementary/elm_map.eo @@ -634,7 +634,7 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable, Efl.Canvas.Group.group_member_add; Elm.Widget.theme_apply; Elm.Widget.on_focus; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Interface.Atspi_Widget_Action.elm_actions { get; } } events { diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo index 8a00b3e9be..08f765a723 100644 --- a/src/lib/elementary/elm_multibuttonentry.eo +++ b/src/lib/elementary/elm_multibuttonentry.eo @@ -188,7 +188,7 @@ class Elm.Multibuttonentry (Elm.Layout) Elm.Widget.focus_next; Elm.Widget.on_focus; Elm.Widget.translate; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Layout.text { get; set; } Elm.Layout.sizing_eval; Elm.Interface.Atspi_Accessible.children { get; } diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo index b6dcaefd5a..d6477be6ae 100644 --- a/src/lib/elementary/elm_naviframe.eo +++ b/src/lib/elementary/elm_naviframe.eo @@ -153,7 +153,7 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action) Elm.Widget.focus_next; Elm.Widget.translate; Elm.Widget.theme_apply; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Layout.text { get; set; } Elm.Layout.signal_emit; Elm.Layout.sizing_eval; diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index ec73f94bad..1226b9cda5 100644 --- a/src/lib/elementary/elm_panel.c +++ b/src/lib/elementary/elm_panel.c @@ -933,7 +933,7 @@ _key_action_toggle(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_elm_panel_elm_widget_event(Eo *obj, Elm_Panel_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_panel_elm_widget_widget_event(Eo *obj, Elm_Panel_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) { Evas_Event_Key_Down *ev = event_info; if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE; diff --git a/src/lib/elementary/elm_panel.eo b/src/lib/elementary/elm_panel.eo index 816e140932..090aebd77d 100644 --- a/src/lib/elementary/elm_panel.eo +++ b/src/lib/elementary/elm_panel.eo @@ -80,7 +80,7 @@ class Elm.Panel (Elm.Layout, Elm.Interface_Scrollable, Elm.Widget.focus_next; Elm.Widget.disable; Elm.Widget.access; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Widget.on_focus_region; Elm.Layout.sizing_eval; Elm.Interface.Atspi_Widget_Action.elm_actions { get; } diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/elm_photocam.c index 636c28d8a3..d9b05f5abe 100644 --- a/src/lib/elementary/elm_photocam.c +++ b/src/lib/elementary/elm_photocam.c @@ -1024,7 +1024,7 @@ _key_action_zoom(Evas_Object *obj, const char *params) } EOLIAN static Eina_Bool -_elm_photocam_elm_widget_event(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_photocam_elm_widget_widget_event(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) { (void) src; Evas_Event_Key_Down *ev = event_info; diff --git a/src/lib/elementary/elm_photocam.eo b/src/lib/elementary/elm_photocam.eo index d3fca75d4b..e2197bac4d 100644 --- a/src/lib/elementary/elm_photocam.eo +++ b/src/lib/elementary/elm_photocam.eo @@ -197,7 +197,7 @@ class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable, Efl.Canvas.Group.group_member_add; Elm.Widget.theme_apply; Elm.Widget.on_focus; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Interface_Scrollable.region_bring_in; Elm.Interface.Atspi_Widget_Action.elm_actions { get; } Efl.File.file { get; set; } diff --git a/src/lib/elementary/elm_player.eo b/src/lib/elementary/elm_player.eo index 1fc44a6762..37e3f548af 100644 --- a/src/lib/elementary/elm_player.eo +++ b/src/lib/elementary/elm_player.eo @@ -10,7 +10,7 @@ class Elm.Player (Elm.Layout, Elm.Interface.Atspi_Widget_Action) Efl.Canvas.Group.group_add; Efl.Canvas.Group.group_del; Elm.Widget.theme_apply; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Layout.sizing_eval; Elm.Interface.Atspi_Widget_Action.elm_actions { get; } Efl.Part.part; diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo index 2ae54555b6..055b1a84ac 100644 --- a/src/lib/elementary/elm_popup.eo +++ b/src/lib/elementary/elm_popup.eo @@ -179,7 +179,7 @@ class Elm.Popup (Elm.Layout, Elm.Interface.Atspi_Widget_Action) Elm.Widget.widget_parent { set; } Elm.Widget.translate; Elm.Widget.sub_object_del; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Layout.text { get; set; } Elm.Layout.sizing_eval; Elm.Layout.signal_emit; diff --git a/src/lib/elementary/elm_radio.c b/src/lib/elementary/elm_radio.c index cc2430df7d..c0d4bae56e 100644 --- a/src/lib/elementary/elm_radio.c +++ b/src/lib/elementary/elm_radio.c @@ -132,7 +132,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_elm_radio_elm_widget_event(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_radio_elm_widget_widget_event(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) { (void) src; Evas_Event_Key_Down *ev = event_info; diff --git a/src/lib/elementary/elm_radio.eo b/src/lib/elementary/elm_radio.eo index 5a87c33985..b141b0f04c 100644 --- a/src/lib/elementary/elm_radio.eo +++ b/src/lib/elementary/elm_radio.eo @@ -83,7 +83,7 @@ class Elm.Radio (Elm.Check, Elm.Interface.Atspi_Widget_Action) Efl.Canvas.Group.group_del; Elm.Widget.theme_apply; Elm.Widget.activate; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Layout.text_aliases { get; } Elm.Interface.Atspi_Accessible.state_set { get; } Elm.Interface.Atspi_Widget_Action.elm_actions { get; } diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index d14d6b2f6e..8167b0281b 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -284,7 +284,7 @@ _key_action_move(Evas_Object *obj, const char *params) } EOLIAN static Eina_Bool -_elm_scroller_elm_widget_event(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_scroller_elm_widget_widget_event(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) { (void) src; Evas_Event_Key_Down *ev = event_info; diff --git a/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo index d45e0c7a92..25a2d7f8c7 100644 --- a/src/lib/elementary/elm_scroller.eo +++ b/src/lib/elementary/elm_scroller.eo @@ -72,7 +72,7 @@ class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable, Elm.Widget.focus_next; Elm.Widget.focus_direction; Elm.Widget.sub_object_del; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Layout.sizing_eval; Elm.Interface_Scrollable.page_size { set; } Elm.Interface_Scrollable.policy { set; } diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/elm_slider.c index 968338207c..c9ca136436 100644 --- a/src/lib/elementary/elm_slider.c +++ b/src/lib/elementary/elm_slider.c @@ -565,7 +565,7 @@ _wheel_indicator_timer_cb(void *data) } EOLIAN static Eina_Bool -_elm_slider_elm_widget_event(Eo *obj, Elm_Slider_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_slider_elm_widget_widget_event(Eo *obj, Elm_Slider_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) { (void) src; diff --git a/src/lib/elementary/elm_slider.eo b/src/lib/elementary/elm_slider.eo index c4bd69ffc1..1f785bdead 100644 --- a/src/lib/elementary/elm_slider.eo +++ b/src/lib/elementary/elm_slider.eo @@ -180,7 +180,7 @@ class Elm.Slider (Elm.Layout, Efl.Ui.Progress, Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; Elm.Widget.on_focus; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Layout.text_aliases { get; } Elm.Layout.content_aliases { get; } Elm.Layout.sizing_eval; diff --git a/src/lib/elementary/elm_slideshow.c b/src/lib/elementary/elm_slideshow.c index 45ee8d484e..e437f6df41 100644 --- a/src/lib/elementary/elm_slideshow.c +++ b/src/lib/elementary/elm_slideshow.c @@ -75,7 +75,7 @@ _key_action_pause(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_elm_slideshow_elm_widget_event(Eo *obj, Elm_Slideshow_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_slideshow_elm_widget_widget_event(Eo *obj, Elm_Slideshow_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) { Evas_Event_Key_Down *ev = event_info; (void) src; diff --git a/src/lib/elementary/elm_slideshow.eo b/src/lib/elementary/elm_slideshow.eo index fc2d05dbfb..0a27cfd7df 100644 --- a/src/lib/elementary/elm_slideshow.eo +++ b/src/lib/elementary/elm_slideshow.eo @@ -308,7 +308,7 @@ class Elm.Slideshow (Elm.Layout, Elm.Interface.Atspi_Widget_Action) Efl.Canvas.Group.group_del; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Layout.sizing_eval; Elm.Interface.Atspi_Widget_Action.elm_actions { get; } } diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c index 7c6efb0c17..63e5567ba7 100644 --- a/src/lib/elementary/elm_spinner.c +++ b/src/lib/elementary/elm_spinner.c @@ -706,7 +706,7 @@ _key_action_toggle(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_elm_spinner_elm_widget_event(Eo *obj, Elm_Spinner_Data *sd EINA_UNUSED, Evas_Object *src EINA_UNUSED, Evas_Callback_Type type, void *event_info) +_elm_spinner_elm_widget_widget_event(Eo *obj, Elm_Spinner_Data *sd EINA_UNUSED, Evas_Object *src EINA_UNUSED, Evas_Callback_Type type, void *event_info) { Evas_Event_Key_Down *ev = event_info; Evas_Event_Mouse_Wheel *mev = event_info; diff --git a/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo index c3f89c8124..8e59980a12 100644 --- a/src/lib/elementary/elm_spinner.eo +++ b/src/lib/elementary/elm_spinner.eo @@ -155,7 +155,7 @@ class Elm.Spinner (Elm.Layout, Efl.Ui.Spin, Elm.Widget.focus_next; Elm.Widget.focus_direction; Elm.Widget.on_focus; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Layout.sizing_eval; Efl.Ui.Spin.min_max; Efl.Ui.Spin.step; diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index 68a475997c..4505e24c8c 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -940,7 +940,7 @@ _key_action_move(Evas_Object *obj, const char *params) } EOLIAN static Eina_Bool -_elm_toolbar_elm_widget_event(Eo *obj, Elm_Toolbar_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_toolbar_elm_widget_widget_event(Eo *obj, Elm_Toolbar_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) { (void) src; (void) type; diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo index 560b408e50..4a5abdec74 100644 --- a/src/lib/elementary/elm_toolbar.eo +++ b/src/lib/elementary/elm_toolbar.eo @@ -328,7 +328,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation, Elm.Widget.theme_apply; Elm.Widget.on_focus; Elm.Widget.translate; - Elm.Widget.event; + Elm.Widget.widget_event; Elm.Widget.focus_highlight_geometry_get; Elm.Widget.focused_item { get; } Efl.Orientation.orientation; diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c index c59a8ef214..a391c9829e 100644 --- a/src/lib/elementary/elm_widget.c +++ b/src/lib/elementary/elm_widget.c @@ -1736,7 +1736,7 @@ _elm_widget_parent2_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Evas_Obj } EOLIAN static void -_elm_widget_event_callback_add(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Elm_Event_Cb func, const void *data) +_elm_widget_widget_event_callback_add(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Elm_Event_Cb func, const void *data) { EINA_SAFETY_ON_NULL_RETURN(func); @@ -1752,7 +1752,7 @@ _elm_widget_event_callback_add(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, E } EOLIAN static void* -_elm_widget_event_callback_del(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Elm_Event_Cb func, const void *data) +_elm_widget_widget_event_callback_del(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Elm_Event_Cb func, const void *data) { EINA_SAFETY_ON_NULL_RETURN_VAL(func, NULL); Eina_List *l; @@ -1769,7 +1769,7 @@ _elm_widget_event_callback_del(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, E } EOLIAN static Eina_Bool -_elm_widget_event_propagate(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Callback_Type type, void *event_info, Evas_Event_Flags *event_flags) +_elm_widget_widget_event_propagate(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Callback_Type type, void *event_info, Evas_Event_Flags *event_flags) { Evas_Object *parent = obj; Elm_Event_Cb_Data *ecd; @@ -5898,7 +5898,7 @@ _elm_widget_disable(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED) } EOLIAN static Eina_Bool -_elm_widget_event(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *source EINA_UNUSED, Evas_Callback_Type type EINA_UNUSED, void *event_info EINA_UNUSED) +_elm_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *source EINA_UNUSED, Evas_Callback_Type type EINA_UNUSED, void *event_info EINA_UNUSED) { return EINA_FALSE; } diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo index 8ff88b930b..1cd838edb7 100644 --- a/src/lib/elementary/elm_widget.eo +++ b/src/lib/elementary/elm_widget.eo @@ -512,8 +512,9 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter return: bool; [[$true on success, $false otherwise]] legacy: null; } - event { + widget_event { [['Virtual' function handling input events on the widget.]] + legacy: elm_widget_event; params { @in source: Efl.Canvas.Object; [[Source object]] @in type: Evas.Callback_Type; [[Callback type]] @@ -521,8 +522,9 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter } return: bool; [[$true on success, $false otherwise]] } - event_callback_add { - [[Add event callback]] + widget_event_callback_add { + [[Add event callback]] + legacy: elm_widget_event_callback_add; params { @in func: Elm_Event_Cb; [[Callback function]] @in data: const(void_ptr) @optional; [[Data pointer]] @@ -541,8 +543,9 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter @in cur: ptr(Elm.Cursor); [[Cursor to be deleted]] } } - event_callback_del { - [[Delete event callback handler]] + widget_event_callback_del { + [[Delete event callback handler]] + legacy: elm_widget_event_callback_del; return: void_ptr; [[Handle to deleted callback]] params { @in func: Elm_Event_Cb; [[Callback handler]] @@ -584,8 +587,9 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter } return: bool; [[$true on success, $false otherwise]] } - event_propagate { - [[Propagate event]] + widget_event_propagate { + [[Propagate event]] + legacy: elm_widget_event_propagate; return: bool; [[$true on success, $false otherwise]] params { @in type: Evas.Callback_Type; [[Event type]] -- 2.34.1