jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9a052a740d8ddc18a6f79ab5d45ce8148557e0c5
commit 9a052a740d8ddc18a6f79ab5d45ce8148557e0c5 Author: Jean-Philippe Andre <[email protected]> Date: Fri Jun 17 14:12:02 2016 +0900 Evas: Move smart_callbacks_descriptions to legacy --- src/lib/elementary/efl_ui_box.c | 2 +- src/lib/elementary/efl_ui_flip.c | 2 +- src/lib/elementary/efl_ui_image.c | 2 +- src/lib/elementary/efl_ui_nstate.c | 2 +- src/lib/elementary/efl_ui_text.c | 2 +- src/lib/elementary/efl_ui_win.c | 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_fileselector_button.c | 2 +- src/lib/elementary/elc_fileselector_entry.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_actionslider.c | 2 +- src/lib/elementary/elm_box.c | 2 +- src/lib/elementary/elm_bubble.c | 2 +- src/lib/elementary/elm_button.c | 2 +- src/lib/elementary/elm_calendar.c | 2 +- src/lib/elementary/elm_check.c | 2 +- src/lib/elementary/elm_clock.c | 2 +- src/lib/elementary/elm_colorselector.c | 2 +- src/lib/elementary/elm_conform.c | 2 +- src/lib/elementary/elm_datetime.c | 2 +- src/lib/elementary/elm_dayselector.c | 2 +- src/lib/elementary/elm_diskselector.c | 2 +- src/lib/elementary/elm_entry.c | 2 +- src/lib/elementary/elm_flipselector.c | 2 +- src/lib/elementary/elm_frame.c | 2 +- src/lib/elementary/elm_gengrid.c | 2 +- src/lib/elementary/elm_genlist.c | 2 +- src/lib/elementary/elm_glview.c | 2 +- src/lib/elementary/elm_hover.c | 2 +- src/lib/elementary/elm_icon.c | 2 +- src/lib/elementary/elm_index.c | 2 +- src/lib/elementary/elm_interface_scrollable.c | 2 +- src/lib/elementary/elm_label.c | 2 +- src/lib/elementary/elm_layout.c | 2 +- src/lib/elementary/elm_list.c | 2 +- src/lib/elementary/elm_map.c | 2 +- src/lib/elementary/elm_menu.c | 2 +- src/lib/elementary/elm_panel.c | 2 +- src/lib/elementary/elm_panes.c | 2 +- src/lib/elementary/elm_photo.c | 2 +- src/lib/elementary/elm_photocam.c | 2 +- src/lib/elementary/elm_plug.c | 2 +- src/lib/elementary/elm_prefs.c | 2 +- src/lib/elementary/elm_progressbar.c | 2 +- src/lib/elementary/elm_radio.c | 2 +- src/lib/elementary/elm_scroller.c | 2 +- src/lib/elementary/elm_segment_control.c | 2 +- src/lib/elementary/elm_slider.c | 2 +- src/lib/elementary/elm_slideshow.c | 2 +- src/lib/elementary/elm_spinner.c | 2 +- src/lib/elementary/elm_thumb.c | 2 +- src/lib/elementary/elm_toolbar.c | 2 +- src/lib/elementary/elm_video.c | 2 +- src/lib/elementary/elm_web2.c | 2 +- src/lib/elementary/elm_widget.c | 2 +- src/lib/evas/Evas_Common.h | 7 --- src/lib/evas/Evas_Legacy.h | 89 +++++++++++++++++++++++++++ src/lib/evas/canvas/evas_object_box.c | 2 +- src/lib/evas/canvas/evas_object_smart.c | 17 ++--- src/lib/evas/canvas/evas_object_smart.eo | 83 ------------------------- 66 files changed, 161 insertions(+), 159 deletions(-) diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c index eb14bff..4229871 100644 --- a/src/lib/elementary/efl_ui_box.c +++ b/src/lib/elementary/efl_ui_box.c @@ -259,7 +259,7 @@ _efl_ui_box_eo_base_constructor(Eo *obj, Efl_Ui_Box_Data *pd) elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_SKIPPED); obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); pd->orient = EFL_ORIENT_RIGHT; diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c index 3b7f8c4..b8f86ba 100644 --- a/src/lib/elementary/efl_ui_flip.c +++ b/src/lib/elementary/efl_ui_flip.c @@ -1875,7 +1875,7 @@ _efl_ui_flip_eo_base_constructor(Eo *obj, Efl_Ui_Flip_Data *sd) sd->obj = obj; evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PAGE_TAB_LIST); return obj; diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index 6168ec9..1b946e6 100644 --- a/src/lib/elementary/efl_ui_image.c +++ b/src/lib/elementary/efl_ui_image.c @@ -879,7 +879,7 @@ _efl_ui_image_eo_base_constructor(Eo *obj, Efl_Ui_Image_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); return obj; diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c index 530def3..b760f64 100644 --- a/src/lib/elementary/efl_ui_nstate.c +++ b/src/lib/elementary/efl_ui_nstate.c @@ -36,7 +36,7 @@ _efl_ui_nstate_eo_base_constructor(Eo *obj, Efl_Ui_Nstate_Data *pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); //TODO: Add ATSPI call here return obj; diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index dd6d764..417d0cd 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -4088,7 +4088,7 @@ _efl_ui_text_eo_base_constructor(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY); eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL); eo_event_callback_add(obj, EO_EVENT_CALLBACK_DEL, _cb_deleted, NULL); diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index f68bb88..d1b469b 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -4288,7 +4288,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); if (getenv("ELM_FIRST_FRAME")) evas_event_callback_add(ecore_evas_get(tmp_sd.ee), EVAS_CALLBACK_RENDER_POST, diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c index 7fdf783..5cb144a 100644 --- a/src/lib/elementary/elc_combobox.c +++ b/src/lib/elementary/elc_combobox.c @@ -428,7 +428,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd) sd->first_filter = EINA_TRUE; evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GLASS_PANE); //hover-parent diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c index a13557a..26aa9a4 100644 --- a/src/lib/elementary/elc_ctxpopup.c +++ b/src/lib/elementary/elc_ctxpopup.c @@ -1178,7 +1178,7 @@ _elm_ctxpopup_eo_base_constructor(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_POPUP_MENU); return obj; diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c index 16b1c0b..6a3b33b 100644 --- a/src/lib/elementary/elc_fileselector.c +++ b/src/lib/elementary/elc_fileselector.c @@ -2028,7 +2028,7 @@ _elm_fileselector_eo_base_constructor(Eo *obj, Elm_Fileselector_Data *sd) obj = eo_constructor(eo_super(obj, MY_CLASS)); sd->obj = obj; evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILE_CHOOSER); return obj; diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c index f3d82b8..cea3268 100644 --- a/src/lib/elementary/elc_fileselector_button.c +++ b/src/lib/elementary/elc_fileselector_button.c @@ -280,7 +280,7 @@ _elm_fileselector_button_eo_base_constructor(Eo *obj, Elm_Fileselector_Button_Da sd->obj = obj; evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON); return obj; diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c index 63a9da7..1198e74 100644 --- a/src/lib/elementary/elc_fileselector_entry.c +++ b/src/lib/elementary/elc_fileselector_entry.c @@ -396,7 +396,7 @@ _elm_fileselector_entry_eo_base_constructor(Eo *obj, Elm_Fileselector_Entry_Data { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GROUPING); return obj; diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c index 4dcc578..60ade3f 100644 --- a/src/lib/elementary/elc_hoversel.c +++ b/src/lib/elementary/elc_hoversel.c @@ -630,7 +630,7 @@ _elm_hoversel_eo_base_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON); return obj; diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c index 5210a09..3e54270 100644 --- a/src/lib/elementary/elc_multibuttonentry.c +++ b/src/lib/elementary/elc_multibuttonentry.c @@ -1715,7 +1715,7 @@ _elm_multibuttonentry_eo_base_constructor(Eo *obj, Elm_Multibuttonentry_Data *sd { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY); return obj; diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c index 0022fb6..13baf83 100644 --- a/src/lib/elementary/elc_naviframe.c +++ b/src/lib/elementary/elc_naviframe.c @@ -1597,7 +1597,7 @@ _elm_naviframe_eo_base_constructor(Eo *obj, Elm_Naviframe_Data *sd) obj = eo_constructor(eo_super(obj, MY_CLASS)); sd->obj = obj; evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PAGE_TAB_LIST); return obj; diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c index cf0adbf..e7659d3 100644 --- a/src/lib/elementary/elc_player.c +++ b/src/lib/elementary/elc_player.c @@ -726,7 +726,7 @@ _elm_player_eo_base_constructor(Eo *obj, Elm_Player_Data *sd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION); return obj; diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index c119710..4ff0709 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c @@ -1628,7 +1628,7 @@ _elm_popup_eo_base_constructor(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_NOTIFICATION); return obj; diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c index 6d0c3ce..c38bcef 100644 --- a/src/lib/elementary/elm_actionslider.c +++ b/src/lib/elementary/elm_actionslider.c @@ -541,7 +541,7 @@ _elm_actionslider_eo_base_constructor(Eo *obj, Elm_Actionslider_Data *_pd EINA_U { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SLIDER); return obj; diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c index 6dd73c1..a2579b2 100644 --- a/src/lib/elementary/elm_box.c +++ b/src/lib/elementary/elm_box.c @@ -447,7 +447,7 @@ _elm_box_eo_base_constructor(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED) elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_SKIPPED); obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); return obj; diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c index 659e9c6..be75efa 100644 --- a/src/lib/elementary/elm_bubble.c +++ b/src/lib/elementary/elm_bubble.c @@ -229,7 +229,7 @@ _elm_bubble_eo_base_constructor(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); return obj; diff --git a/src/lib/elementary/elm_button.c b/src/lib/elementary/elm_button.c index 39f863e..cc5ee5f 100644 --- a/src/lib/elementary/elm_button.c +++ b/src/lib/elementary/elm_button.c @@ -336,7 +336,7 @@ _elm_button_eo_base_constructor(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON); return obj; diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c index af20e6f..ef4937c 100644 --- a/src/lib/elementary/elm_calendar.c +++ b/src/lib/elementary/elm_calendar.c @@ -1594,7 +1594,7 @@ _elm_calendar_eo_base_constructor(Eo *obj, Elm_Calendar_Data *sd) sd->obj = obj; evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_CALENDAR); return obj; diff --git a/src/lib/elementary/elm_check.c b/src/lib/elementary/elm_check.c index 2cc5bdf..c03dba9 100644 --- a/src/lib/elementary/elm_check.c +++ b/src/lib/elementary/elm_check.c @@ -368,7 +368,7 @@ _elm_check_eo_base_constructor(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_CHECK_BOX); return obj; diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c index a5f8a0b..53e74dc 100644 --- a/src/lib/elementary/elm_clock.c +++ b/src/lib/elementary/elm_clock.c @@ -799,7 +799,7 @@ _elm_clock_eo_base_constructor(Eo *obj, Elm_Clock_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TEXT); return obj; diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index 61190c5..83cf498 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -2225,7 +2225,7 @@ _elm_colorselector_eo_base_constructor(Eo *obj, Elm_Colorselector_Data *_pd EINA { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_COLOR_CHOOSER); return obj; diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c index 2bdec87..1a2fc5b 100644 --- a/src/lib/elementary/elm_conform.c +++ b/src/lib/elementary/elm_conform.c @@ -1000,7 +1000,7 @@ _elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); Eo_Event event = {}; diff --git a/src/lib/elementary/elm_datetime.c b/src/lib/elementary/elm_datetime.c index 88fe79d..f35db88 100644 --- a/src/lib/elementary/elm_datetime.c +++ b/src/lib/elementary/elm_datetime.c @@ -893,7 +893,7 @@ _elm_datetime_eo_base_constructor(Eo *obj, Elm_Datetime_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_DATE_EDITOR); return obj; diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c index bc03214..4704050 100644 --- a/src/lib/elementary/elm_dayselector.c +++ b/src/lib/elementary/elm_dayselector.c @@ -464,7 +464,7 @@ _elm_dayselector_eo_base_constructor(Eo *obj, Elm_Dayselector_Data *_pd EINA_UNU { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PANEL); return obj; diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c index e9944d1..b69169c 100644 --- a/src/lib/elementary/elm_diskselector.c +++ b/src/lib/elementary/elm_diskselector.c @@ -1464,7 +1464,7 @@ _elm_diskselector_eo_base_constructor(Eo *obj, Elm_Diskselector_Data *_pd EINA_U { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST); return obj; diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 081f4c8..37483f5 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -3955,7 +3955,7 @@ _elm_entry_eo_base_constructor(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY); eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL); eo_event_callback_add(obj, EO_EVENT_CALLBACK_DEL, _cb_deleted, NULL); diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c index 0eb3288..494725a 100644 --- a/src/lib/elementary/elm_flipselector.c +++ b/src/lib/elementary/elm_flipselector.c @@ -671,7 +671,7 @@ _elm_flipselector_eo_base_constructor(Eo *obj, Elm_Flipselector_Data *sd) obj = eo_constructor(eo_super(obj, MY_CLASS)); sd->obj = obj; evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST); return obj; diff --git a/src/lib/elementary/elm_frame.c b/src/lib/elementary/elm_frame.c index 80dfbce..5631700 100644 --- a/src/lib/elementary/elm_frame.c +++ b/src/lib/elementary/elm_frame.c @@ -205,7 +205,7 @@ _elm_frame_eo_base_constructor(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FRAME); return obj; diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index f21129b..a368181 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -4358,7 +4358,7 @@ _elm_gengrid_eo_base_constructor(Eo *obj, Elm_Gengrid_Data *sd) sd->obj = obj; evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TREE_TABLE); return obj; diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index fb3020c..e8bd69a 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -5711,7 +5711,7 @@ _elm_genlist_eo_base_constructor(Eo *obj, Elm_Genlist_Data *sd) sd->obj = obj; evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST); return obj; diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c index a2cfb40..15bb8ac 100644 --- a/src/lib/elementary/elm_glview.c +++ b/src/lib/elementary/elm_glview.c @@ -362,7 +362,7 @@ _elm_glview_version_constructor(Eo *obj, Elm_Glview_Data *sd, _elm_glview_constructor(obj, sd); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION); eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL); } diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c index 9b9d610..dec8cba 100644 --- a/src/lib/elementary/elm_hover.c +++ b/src/lib/elementary/elm_hover.c @@ -672,7 +672,7 @@ _elm_hover_eo_base_constructor(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_POPUP_MENU); return obj; diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c index 23ad9a5..18e9286 100644 --- a/src/lib/elementary/elm_icon.c +++ b/src/lib/elementary/elm_icon.c @@ -618,7 +618,7 @@ _elm_icon_eo_base_constructor(Eo *obj, Elm_Icon_Data *sd) sd->obj = obj; evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); return obj; diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c index 1715358..137e978 100644 --- a/src/lib/elementary/elm_index.c +++ b/src/lib/elementary/elm_index.c @@ -1260,7 +1260,7 @@ _elm_index_eo_base_constructor(Eo *obj, Elm_Index_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SCROLL_BAR); return obj; diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c index a94784c..8eaf355 100644 --- a/src/lib/elementary/elm_interface_scrollable.c +++ b/src/lib/elementary/elm_interface_scrollable.c @@ -235,7 +235,7 @@ _elm_pan_eo_base_constructor(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_PAN_CLASS)); evas_obj_type_set(obj, MY_PAN_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); return obj; } diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c index e1a35c5..81e806c 100644 --- a/src/lib/elementary/elm_label.c +++ b/src/lib/elementary/elm_label.c @@ -415,7 +415,7 @@ _elm_label_eo_base_constructor(Eo *obj, Elm_Label_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LABEL); return obj; diff --git a/src/lib/elementary/elm_layout.c b/src/lib/elementary/elm_layout.c index 043bb3e..e0c6ec9 100644 --- a/src/lib/elementary/elm_layout.c +++ b/src/lib/elementary/elm_layout.c @@ -1900,7 +1900,7 @@ _elm_layout_eo_base_constructor(Eo *obj, Elm_Layout_Smart_Data *sd) sd->obj = obj; obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); return obj; diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c index a629e9f..7925a72 100644 --- a/src/lib/elementary/elm_list.c +++ b/src/lib/elementary/elm_list.c @@ -2554,7 +2554,7 @@ _elm_list_eo_base_constructor(Eo *obj, Elm_List_Data *sd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST); return obj; diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c index 70619e0..c0a44a9 100644 --- a/src/lib/elementary/elm_map.c +++ b/src/lib/elementary/elm_map.c @@ -4240,7 +4240,7 @@ _elm_map_eo_base_constructor(Eo *obj, Elm_Map_Data *sd) sd->obj = obj; evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE_MAP); return obj; diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c index b05196d..726a50c 100644 --- a/src/lib/elementary/elm_menu.c +++ b/src/lib/elementary/elm_menu.c @@ -793,7 +793,7 @@ _elm_menu_eo_base_constructor(Eo *obj, Elm_Menu_Data *sd) obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); parent = eo_parent_get(obj); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_MENU); diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index 88219bb..4544f5f 100644 --- a/src/lib/elementary/elm_panel.c +++ b/src/lib/elementary/elm_panel.c @@ -1175,7 +1175,7 @@ _elm_panel_eo_base_constructor(Eo *obj, Elm_Panel_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PANEL); return obj; diff --git a/src/lib/elementary/elm_panes.c b/src/lib/elementary/elm_panes.c index ecfa856..227eb8f 100644 --- a/src/lib/elementary/elm_panes.c +++ b/src/lib/elementary/elm_panes.c @@ -332,7 +332,7 @@ _elm_panes_eo_base_constructor(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SPLIT_PANE); return obj; diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c index 97da3c4..d18f621 100644 --- a/src/lib/elementary/elm_photo.c +++ b/src/lib/elementary/elm_photo.c @@ -307,7 +307,7 @@ _elm_photo_eo_base_constructor(Eo *obj, Elm_Photo_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); return obj; diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/elm_photocam.c index 430bbe8..1e8a32a 100644 --- a/src/lib/elementary/elm_photocam.c +++ b/src/lib/elementary/elm_photocam.c @@ -1515,7 +1515,7 @@ _elm_photocam_eo_base_constructor(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); return obj; diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c index 24205d4..02addde 100644 --- a/src/lib/elementary/elm_plug.c +++ b/src/lib/elementary/elm_plug.c @@ -145,7 +145,7 @@ _elm_plug_eo_base_constructor(Eo *obj, void *sd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); return obj; diff --git a/src/lib/elementary/elm_prefs.c b/src/lib/elementary/elm_prefs.c index 91a7286..1088e90 100644 --- a/src/lib/elementary/elm_prefs.c +++ b/src/lib/elementary/elm_prefs.c @@ -517,7 +517,7 @@ _elm_prefs_eo_base_constructor(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _elm_prefs_smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _elm_prefs_smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_REDUNDANT_OBJECT); return obj; diff --git a/src/lib/elementary/elm_progressbar.c b/src/lib/elementary/elm_progressbar.c index 42e9668..a2bb18e 100644 --- a/src/lib/elementary/elm_progressbar.c +++ b/src/lib/elementary/elm_progressbar.c @@ -360,7 +360,7 @@ _elm_progressbar_eo_base_constructor(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNU { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PROGRESS_BAR); return obj; diff --git a/src/lib/elementary/elm_radio.c b/src/lib/elementary/elm_radio.c index 3441030..5d04bd2 100644 --- a/src/lib/elementary/elm_radio.c +++ b/src/lib/elementary/elm_radio.c @@ -277,7 +277,7 @@ _elm_radio_eo_base_constructor(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_RADIO_BUTTON); return obj; diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index 9c4611c..27a0c1c 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -952,7 +952,7 @@ _elm_scroller_eo_base_constructor(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SCROLL_PANE); return obj; diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c index 056882d..c3b179b 100644 --- a/src/lib/elementary/elm_segment_control.c +++ b/src/lib/elementary/elm_segment_control.c @@ -707,7 +707,7 @@ _elm_segment_control_eo_base_constructor(Eo *obj, Elm_Segment_Control_Data *sd E obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST); return obj; diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/elm_slider.c index f5b470e..8b40aab 100644 --- a/src/lib/elementary/elm_slider.c +++ b/src/lib/elementary/elm_slider.c @@ -1287,7 +1287,7 @@ _elm_slider_eo_base_constructor(Eo *obj, Elm_Slider_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SLIDER); return obj; diff --git a/src/lib/elementary/elm_slideshow.c b/src/lib/elementary/elm_slideshow.c index c3d5879..02197ca 100644 --- a/src/lib/elementary/elm_slideshow.c +++ b/src/lib/elementary/elm_slideshow.c @@ -390,7 +390,7 @@ _elm_slideshow_eo_base_constructor(Eo *obj, Elm_Slideshow_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_DOCUMENT_PRESENTATION); return obj; diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c index c865fb8..e6212c2 100644 --- a/src/lib/elementary/elm_spinner.c +++ b/src/lib/elementary/elm_spinner.c @@ -1464,7 +1464,7 @@ _elm_spinner_eo_base_constructor(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SPIN_BUTTON); return obj; diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c index 1b26bbe..fc1f17f 100644 --- a/src/lib/elementary/elm_thumb.c +++ b/src/lib/elementary/elm_thumb.c @@ -584,7 +584,7 @@ _elm_thumb_eo_base_constructor(Eo *obj, Elm_Thumb_Data *sd) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, "Elm_Thumb"); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); sd->obj = obj; diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index 3c34ec7..3e6f199 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -3095,7 +3095,7 @@ _elm_toolbar_eo_base_constructor(Eo *obj, Elm_Toolbar_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TOOL_BAR); return obj; diff --git a/src/lib/elementary/elm_video.c b/src/lib/elementary/elm_video.c index 47df805..a0dbd10 100644 --- a/src/lib/elementary/elm_video.c +++ b/src/lib/elementary/elm_video.c @@ -295,7 +295,7 @@ _elm_video_eo_base_constructor(Eo *obj, Elm_Video_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION); return obj; diff --git a/src/lib/elementary/elm_web2.c b/src/lib/elementary/elm_web2.c index 17ca829..008893a 100644 --- a/src/lib/elementary/elm_web2.c +++ b/src/lib/elementary/elm_web2.c @@ -97,7 +97,7 @@ _elm_web_eo_base_constructor(Eo *obj, Elm_Web_Data *sd) obj = eo_constructor(eo_super(obj, MY_CLASS)); sd->obj = obj; evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _elm_web_smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _elm_web_smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_HTML_CONTAINER); return obj; diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c index b91c60d..1ab15c1 100644 --- a/src/lib/elementary/elm_widget.c +++ b/src/lib/elementary/elm_widget.c @@ -5822,7 +5822,7 @@ _elm_widget_eo_base_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED) sd->on_create = EINA_TRUE; obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); parent = eo_parent_get(obj); elm_obj_widget_parent_set(obj, parent); sd->on_create = EINA_FALSE; diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h index 679db46..296f49f 100644 --- a/src/lib/evas/Evas_Common.h +++ b/src/lib/evas/Evas_Common.h @@ -3577,13 +3577,6 @@ EAPI Eina_Bool evas_smart_class_inherit_full(Evas_Smart_ EAPI int evas_smart_usage_get(const Evas_Smart *s); /** - * @brief Get the @ref Evas_Smart from which @c obj smart object was created. - * - * @return the @ref Evas_Smart handle or @c null, on errors. - */ -EAPI Evas_Smart *evas_object_smart_smart_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT; - -/** * @def evas_smart_class_inherit * Easy to use version of evas_smart_class_inherit_full(). * diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h index 7ec87b8..eb827ab 100644 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h @@ -5086,6 +5086,95 @@ EAPI Eina_Bool evas_object_smart_type_check(const Evas_Object *obj, const char * */ EAPI Eina_Bool evas_object_smart_type_check_ptr(const Evas_Object *obj, const char *type) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(2); +/** + * @brief Set an smart object instance's smart callbacks descriptions. + * + * These descriptions are hints to be used by introspection and are not + * enforced in any way. + * + * It will not be checked if instance callbacks descriptions have the same name + * as respective possibly registered in the smart object class. Both are kept + * in different arrays and users of + * evas_object_smart_callbacks_descriptions_get() should handle this case as + * they wish. + * + * @note Because @c descriptions must be @c null terminated, and because a + * @c null name makes little sense, too, Evas_Smart_Cb_Description.name must + * not be @c null. + * + * @note While instance callbacks descriptions are possible, they are not + * recommended. Use class callbacks descriptions instead as they make you smart + * object user's life simpler and will use less memory, as descriptions and + * arrays will be shared among all instances. + * + * @param[in] descriptions @c null terminated array with + * @ref Evas_Smart_Cb_Description descriptions. Array elements won't be + * modified at run time, but references to them and their contents will be + * made, so this array should be kept alive during the whole object's lifetime. + * + * @return @c true on success, @c false on failure. + * + * @ingroup Evas_Object_Smart + */ +EAPI Eina_Bool evas_object_smart_callbacks_descriptions_set(Evas_Object *obj, const Evas_Smart_Cb_Description *descriptions); + +/** + * @brief Retrieve an smart object's know smart callback descriptions (both + * instance and class ones). + * + * This call searches for registered callback descriptions for both instance + * and class of the given smart object. These arrays will be sorted by + * Evas_Smart_Cb_Description.name and also @c null terminated, so both + * class_count and instance_count can be ignored, if the caller wishes so. The + * terminator @c null is not counted in these values. + * + * @note If just class descriptions are of interest, try + * evas_smart_callbacks_descriptions_get() instead. + * + * @note Use @c null pointers on the descriptions/counters you're not + * interested in: they'll be ignored by the function. + * + * @ref evas_smart_callbacks_descriptions_get(). + * + * @param[out] class_descriptions Where to store class callbacks descriptions + * array, if any is known. If no descriptions are known, @c null is returned. + * @param[out] class_count Returns how many class callbacks descriptions are + * known. + * @param[out] instance_descriptions Where to store instance callbacks + * descriptions array, if any is known. If no descriptions are known, @c null + * is returned. + * @param[out] instance_count Returns how many instance callbacks descriptions + * are known. + * + * @ingroup Evas_Object_Smart + */ +EAPI void evas_object_smart_callbacks_descriptions_get(const Evas_Object *obj, const Evas_Smart_Cb_Description ***class_descriptions, unsigned int *class_count, const Evas_Smart_Cb_Description ***instance_descriptions, unsigned int *instance_count); + +/** + * @brief Find callback description for callback called name or @c null if not + * found. + * + * If parameter is @c null, no search will be done on instance descriptions. + * + * @param[in] name name of desired callback, must not be @c null. The search + * have a special case for name being the same pointer as registered with + * Evas_Smart_Cb_Description, one can use it to avoid excessive use of + * strcmp(). + * @param[out] class_description pointer to return class description or @c null + * if not found. If parameter is @c null, no search will be done on class + * descriptions. + * @param[out] instance_description pointer to return instance description. + * + * @ingroup Evas_Object_Smart + */ +EAPI void evas_object_smart_callback_description_find(const Evas_Object *obj, const char *name, const Evas_Smart_Cb_Description **class_description, const Evas_Smart_Cb_Description **instance_description) EINA_ARG_NONNULL(2); + +/** + * @brief Get the @ref Evas_Smart from which @c obj smart object was created. + * + * @return the @ref Evas_Smart handle or @c null, on errors. + */ +EAPI Evas_Smart *evas_object_smart_smart_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT; /** * This gets the internal counter that counts the number of smart calculations diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c index 0e71434..875975f 100644 --- a/src/lib/evas/canvas/evas_object_box.c +++ b/src/lib/evas/canvas/evas_object_box.c @@ -465,7 +465,7 @@ EOLIAN static Eo * _evas_box_eo_base_constructor(Eo *obj, Evas_Object_Box_Data *class_data EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_smart_callbacks_descriptions_set(obj, _signals); + evas_object_smart_callbacks_descriptions_set(obj, _signals); evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); return obj; diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c index 02c7e9a..0a204d1 100644 --- a/src/lib/evas/canvas/evas_object_smart.c +++ b/src/lib/evas/canvas/evas_object_smart.c @@ -838,9 +838,10 @@ evas_object_smart_callback_call(Evas_Object *eo_obj, const char *event, void *ev eo_event_callback_call(eo_obj, eo_desc, event_info); } -EOLIAN static Eina_Bool -_evas_object_smart_callbacks_descriptions_set(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o, const Evas_Smart_Cb_Description *descriptions) +EAPI Eina_Bool +evas_object_smart_callbacks_descriptions_set(Eo *eo_obj, const Evas_Smart_Cb_Description *descriptions) { + EVAS_OBJECT_SMART_GET_OR_RETURN(eo_obj, EINA_FALSE); const Evas_Smart_Cb_Description *d; unsigned int i, count = 0; @@ -864,9 +865,10 @@ _evas_object_smart_callbacks_descriptions_set(Eo *eo_obj EINA_UNUSED, Evas_Smart return EINA_TRUE; } -EOLIAN static void -_evas_object_smart_callbacks_descriptions_get(const Eo *eo_obj, Evas_Smart_Data *o, const Evas_Smart_Cb_Description ***class_descriptions, unsigned int *class_count, const Evas_Smart_Cb_Description ***instance_descriptions, unsigned int *instance_count) +EAPI void +evas_object_smart_callbacks_descriptions_get(const Eo *eo_obj, const Evas_Smart_Cb_Description ***class_descriptions, unsigned int *class_count, const Evas_Smart_Cb_Description ***instance_descriptions, unsigned int *instance_count) { + EVAS_OBJECT_SMART_GET_OR_RETURN(eo_obj); if (class_descriptions) *class_descriptions = NULL; if (class_count) *class_count = 0; @@ -882,9 +884,10 @@ _evas_object_smart_callbacks_descriptions_get(const Eo *eo_obj, Evas_Smart_Data *instance_count = o->callbacks_descriptions.size; } -EOLIAN static void -_evas_object_smart_callback_description_find(const Eo *eo_obj, Evas_Smart_Data *o, const char *name, const Evas_Smart_Cb_Description **class_description, const Evas_Smart_Cb_Description **instance_description) +EAPI void +evas_object_smart_callback_description_find(const Eo *eo_obj, const char *name, const Evas_Smart_Cb_Description **class_description, const Evas_Smart_Cb_Description **instance_description) { + EVAS_OBJECT_SMART_GET_OR_RETURN(eo_obj); if (!name) { @@ -1268,7 +1271,7 @@ evas_object_smart_cleanup(Evas_Object *eo_obj) } evas_smart_cb_descriptions_resize(&o->callbacks_descriptions, 0); - evas_obj_smart_data_set(eo_obj, NULL); + evas_object_smart_data_set(eo_obj, NULL); } obj->smart.parent = NULL; diff --git a/src/lib/evas/canvas/evas_object_smart.eo b/src/lib/evas/canvas/evas_object_smart.eo index 956deb2..19e94bb 100644 --- a/src/lib/evas/canvas/evas_object_smart.eo +++ b/src/lib/evas/canvas/evas_object_smart.eo @@ -1,7 +1,3 @@ -/* XXX: Putting the next two as externs because this interface will hopefully - be removed for efl 2.0, so no need to bother. */ -struct @extern Evas.Smart.Cb_Description; - class Evas.Object.Smart (Evas.Object) { legacy_prefix: evas_object_smart; @@ -112,68 +108,6 @@ class Evas.Object.Smart (Evas.Object) set { legacy: null; } values { hide: bool; } } - callbacks_descriptions_set { - [[Set an smart object instance's smart callbacks descriptions. - - These descriptions are hints to be used by introspection and are - not enforced in any way. - - It will not be checked if instance callbacks descriptions have the - same name as respective possibly registered in the smart object - class. Both are kept in different arrays and users of - evas_object_smart_callbacks_descriptions_get() should handle this - case as they wish. - - Note: Becase $descriptions must be $null terminated, and - because a $null name makes little sense, too, - Evas_Smart_Cb_Description.name must not be $null. - - Note: While instance callbacks descriptions are possible, they are - not recommended. Use class callbacks descriptions - instead as they make you smart object user's life simpler and - will use less memory, as descriptions and arrays will be - shared among all instances.]] - - return: bool; [[$true on success, $false on failure.]] - params { - @in descriptions: const(Evas.Smart.Cb_Description)*; [[$null terminated array with - @Evas.Smart.Cb_Description descriptions. Array elements won't be - modified at run time, but references to them and their contents - will be made, so this array should be kept alive during the whole - object's lifetime.]] - } - } - callbacks_descriptions_get @const { - [[Retrieve an smart object's know smart callback descriptions (both - instance and class ones). - - This call searches for registered callback descriptions for both - instance and class of the given smart object. These arrays will be - sorted by Evas_Smart_Cb_Description.name and also $null - terminated, so both class_count and instance_count can be - ignored, if the caller wishes so. The terminator $null is not - counted in these values. - - Note: If just class descriptions are of interest, try - evas_smart_callbacks_descriptions_get() instead. - - Note: Use $null pointers on the descriptions/counters you're not - interested in: they'll be ignored by the function. - - \@ref evas_smart_callbacks_descriptions_get().]] - params { - @out class_descriptions: const(Evas.Smart.Cb_Description)**; [[Where to store class callbacks - descriptions array, if any is known. If no descriptions are - known, $null is returned.]] - @out class_count: uint; [[Returns how many class callbacks descriptions - are known.]] - @out instance_descriptions: const(Evas.Smart.Cb_Description)**; [[Where to store instance callbacks - descriptions array, if any is known. If no descriptions are - known, $null is returned.]] - @out instance_count: uint; [[Returns how many instance callbacks - descriptions are known.]] - } - } iterator_new @const { [[Retrieves an iterator of the member objects of a given Evas smart object. @@ -183,23 +117,6 @@ class Evas.Object.Smart (Evas.Object) return: free(own(iterator<Evas.Object>), eina_iterator_free) @warn_unused; [[Returns the iterator of the member objects of $obj.]] } - callback_description_find @const { - [[Find callback description for callback called name - or $null if not found. - - If parameter is $null, no search - will be done on instance descriptions.]] - params { - @in name: string @nonull; [[name of desired callback, must not be $null. The - search have a special case for name being the same - pointer as registered with Evas_Smart_Cb_Description, one - can use it to avoid excessive use of strcmp().]] - @out class_description: const(Evas.Smart.Cb_Description)*; [[pointer to return class description or - $null if not found. If parameter is $null, no search will - be done on class descriptions.]] - @out instance_description: const(Evas.Smart.Cb_Description)*; [[pointer to return instance description.]] - } - } hide { [[No description supplied by the EAPI.]] legacy: null; --
