From 242127a96be0eb78791f48fae7c44f0f16248add Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Thu, 6 Jul 2017 16:47:41 +0900 Subject: [PATCH] evas,edje,elm: Mark all legacy objects as such --- src/lib/edje/edje_edit.c | 4 +--- src/lib/edje/edje_smart.c | 4 +--- src/lib/elementary/efl_ui_button.c | 3 +-- src/lib/elementary/efl_ui_check.c | 3 +-- src/lib/elementary/efl_ui_flip.c | 3 +-- src/lib/elementary/efl_ui_frame.c | 3 +-- src/lib/elementary/efl_ui_image.c | 2 +- src/lib/elementary/efl_ui_image_zoomable.c | 3 +-- src/lib/elementary/efl_ui_progressbar.c | 3 +-- src/lib/elementary/efl_ui_radio.c | 3 +-- src/lib/elementary/efl_ui_slider.c | 3 +-- src/lib/elementary/efl_ui_video.c | 3 +-- src/lib/elementary/elc_combobox.c | 3 +-- src/lib/elementary/elc_ctxpopup.c | 2 +- src/lib/elementary/elc_fileselector.c | 3 +-- src/lib/elementary/elc_fileselector_button.c | 3 +-- src/lib/elementary/elc_fileselector_entry.c | 2 +- src/lib/elementary/elc_hoversel.c | 3 +-- src/lib/elementary/elc_multibuttonentry.c | 3 +-- src/lib/elementary/elc_naviframe.c | 3 +-- src/lib/elementary/elc_player.c | 2 +- src/lib/elementary/elc_popup.c | 2 +- src/lib/elementary/elm_access.c | 3 +-- src/lib/elementary/elm_actionslider.c | 3 +-- src/lib/elementary/elm_bg.c | 3 +-- src/lib/elementary/elm_box.c | 3 +-- src/lib/elementary/elm_bubble.c | 3 +-- src/lib/elementary/elm_calendar.c | 3 +-- src/lib/elementary/elm_clock.c | 3 +-- src/lib/elementary/elm_code_widget.c | 5 ++--- src/lib/elementary/elm_colorselector.c | 6 +++--- src/lib/elementary/elm_conform.c | 3 +-- src/lib/elementary/elm_datetime.c | 3 +-- src/lib/elementary/elm_dayselector.c | 3 +-- src/lib/elementary/elm_diskselector.c | 3 +-- src/lib/elementary/elm_entry.c | 3 +-- src/lib/elementary/elm_flipselector.c | 3 +-- src/lib/elementary/elm_gengrid.c | 3 +-- src/lib/elementary/elm_genlist.c | 3 +-- src/lib/elementary/elm_gesture_layer.c | 3 +-- src/lib/elementary/elm_glview.c | 10 ++++++---- src/lib/elementary/elm_grid.c | 3 +-- src/lib/elementary/elm_hover.c | 3 +-- src/lib/elementary/elm_icon.c | 3 +-- src/lib/elementary/elm_index.c | 3 +-- src/lib/elementary/elm_interface_scrollable.c | 3 +-- src/lib/elementary/elm_inwin.c | 3 +-- src/lib/elementary/elm_label.c | 3 +-- src/lib/elementary/elm_layout.c | 3 +-- src/lib/elementary/elm_list.c | 3 +-- src/lib/elementary/elm_map.c | 3 +-- src/lib/elementary/elm_mapbuf.c | 3 +-- src/lib/elementary/elm_menu.c | 2 +- src/lib/elementary/elm_notify.c | 3 +-- src/lib/elementary/elm_panel.c | 2 +- src/lib/elementary/elm_panes.c | 3 +-- src/lib/elementary/elm_photo.c | 3 +-- src/lib/elementary/elm_plug.c | 3 +-- src/lib/elementary/elm_prefs.c | 3 +-- src/lib/elementary/elm_route.c | 3 +-- src/lib/elementary/elm_scroller.c | 3 +-- src/lib/elementary/elm_segment_control.c | 3 +-- src/lib/elementary/elm_separator.c | 3 +-- src/lib/elementary/elm_slideshow.c | 3 +-- src/lib/elementary/elm_spinner.c | 3 +-- src/lib/elementary/elm_table.c | 3 +-- src/lib/elementary/elm_thumb.c | 3 +-- src/lib/elementary/elm_toolbar.c | 3 +-- src/lib/elementary/elm_web2.c | 2 +- src/lib/emotion/emotion_smart.c | 4 +--- src/lib/evas/canvas/evas_canvas3d_camera.c | 3 +-- src/lib/evas/canvas/evas_canvas3d_light.c | 3 +-- src/lib/evas/canvas/evas_canvas3d_material.c | 3 +-- src/lib/evas/canvas/evas_canvas3d_mesh.c | 3 +-- src/lib/evas/canvas/evas_canvas3d_node.c | 3 +-- src/lib/evas/canvas/evas_canvas3d_primitive.c | 3 +-- src/lib/evas/canvas/evas_canvas3d_scene.c | 3 +-- src/lib/evas/canvas/evas_canvas3d_texture.c | 3 +-- src/lib/evas/canvas/evas_object_box.c | 3 +-- src/lib/evas/canvas/evas_object_grid.c | 3 +-- src/lib/evas/canvas/evas_object_line.c | 3 +-- src/lib/evas/canvas/evas_object_polygon.c | 2 +- src/lib/evas/canvas/evas_object_rectangle.c | 3 +-- src/lib/evas/canvas/evas_object_smart.c | 2 +- src/lib/evas/canvas/evas_object_table.c | 3 +-- src/lib/evas/canvas/evas_object_text.c | 3 +-- src/lib/evas/canvas/evas_object_textblock.c | 3 ++- src/lib/evas/canvas/evas_object_textgrid.c | 3 +-- src/lib/evas/canvas/evas_object_vg.c | 7 ++----- 89 files changed, 99 insertions(+), 177 deletions(-) diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index 3274495d9e..83f0cfa480 100644 --- a/src/lib/edje/edje_edit.c +++ b/src/lib/edje/edje_edit.c @@ -292,9 +292,7 @@ _edje_edit_efl_file_mmap_set(Eo *obj, Edje_Edit *eed, const Eina_File *mmap, con EAPI Evas_Object * edje_edit_object_add(Evas *evas) { - Evas_Object *e; - e = efl_add(MY_CLASS, evas); - return e; + return efl_add(MY_CLASS, evas, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c index bd72769ff7..8c6800fded 100644 --- a/src/lib/edje/edje_smart.c +++ b/src/lib/edje/edje_smart.c @@ -21,10 +21,8 @@ Eina_Inlist *_edje_edjes = NULL; EAPI Evas_Object * edje_object_add(Evas *evas) { - Evas_Object *e; EINA_SAFETY_ON_NULL_RETURN_VAL(evas, NULL); - e = efl_add(MY_CLASS, evas); - return e; + return efl_add(MY_CLASS, evas, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c index f8b68d51d6..d86ff460c8 100644 --- a/src/lib/elementary/efl_ui_button.c +++ b/src/lib/elementary/efl_ui_button.c @@ -327,8 +327,7 @@ EAPI Evas_Object * elm_button_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c index 26da496ee3..a23d4f7243 100644 --- a/src/lib/elementary/efl_ui_check.c +++ b/src/lib/elementary/efl_ui_check.c @@ -368,8 +368,7 @@ EAPI Evas_Object * elm_check_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c index 074771251d..e557299bec 100644 --- a/src/lib/elementary/efl_ui_flip.c +++ b/src/lib/elementary/efl_ui_flip.c @@ -1915,8 +1915,7 @@ EAPI Evas_Object * elm_flip_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c index a64673c66a..3b3373a1e8 100644 --- a/src/lib/elementary/efl_ui_frame.c +++ b/src/lib/elementary/efl_ui_frame.c @@ -194,8 +194,7 @@ EAPI Evas_Object * elm_frame_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index a9f07bb8bf..b09c22dfda 100644 --- a/src/lib/elementary/efl_ui_image.c +++ b/src/lib/elementary/efl_ui_image.c @@ -851,7 +851,7 @@ EAPI Evas_Object * elm_image_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); + Evas_Object *obj = efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); EFL_UI_IMAGE_DATA_GET(obj, priv); priv->legacy_align = EINA_TRUE; diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c index b8203e5669..21a27e779e 100644 --- a/src/lib/elementary/efl_ui_image_zoomable.c +++ b/src/lib/elementary/efl_ui_image_zoomable.c @@ -2736,8 +2736,7 @@ EAPI Evas_Object * elm_photocam_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } static inline void diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c index e088baf2e9..2278142c1d 100644 --- a/src/lib/elementary/efl_ui_progressbar.c +++ b/src/lib/elementary/efl_ui_progressbar.c @@ -351,8 +351,7 @@ EAPI Evas_Object * elm_progressbar_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c index 17d0ceaaa3..41731a188d 100644 --- a/src/lib/elementary/efl_ui_radio.c +++ b/src/lib/elementary/efl_ui_radio.c @@ -266,8 +266,7 @@ EAPI Evas_Object * elm_radio_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c index 0c8a905f09..9925b94927 100644 --- a/src/lib/elementary/efl_ui_slider.c +++ b/src/lib/elementary/efl_ui_slider.c @@ -1665,8 +1665,7 @@ EAPI Evas_Object * elm_slider_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EAPI void diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c index 375ef8b3bb..d816001d73 100644 --- a/src/lib/elementary/efl_ui_video.c +++ b/src/lib/elementary/efl_ui_video.c @@ -275,8 +275,7 @@ EAPI Evas_Object * elm_video_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c index df06061058..0704f0d39a 100644 --- a/src/lib/elementary/elc_combobox.c +++ b/src/lib/elementary/elc_combobox.c @@ -333,8 +333,7 @@ EAPI Evas_Object * elm_combobox_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c index c60deb6dcb..e51ed06873 100644 --- a/src/lib/elementary/elc_ctxpopup.c +++ b/src/lib/elementary/elc_ctxpopup.c @@ -1161,7 +1161,7 @@ EAPI Evas_Object * elm_ctxpopup_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); + Evas_Object *obj = efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); /* access: parent could be any object such as elm_list which does not know elc_ctxpopup as its child object in the focus_next(); */ diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c index 6a3a73b817..30cdf9003b 100644 --- a/src/lib/elementary/elc_fileselector.c +++ b/src/lib/elementary/elc_fileselector.c @@ -2055,8 +2055,7 @@ EAPI Evas_Object * elm_fileselector_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c index dc224a277e..24d7b8af6a 100644 --- a/src/lib/elementary/elc_fileselector_button.c +++ b/src/lib/elementary/elc_fileselector_button.c @@ -260,8 +260,7 @@ EAPI Evas_Object * elm_fileselector_button_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c index a44a676012..c95f1938f0 100644 --- a/src/lib/elementary/elc_fileselector_entry.c +++ b/src/lib/elementary/elc_fileselector_entry.c @@ -382,7 +382,7 @@ EAPI Evas_Object * elm_fileselector_entry_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - return efl_add(MY_CLASS, parent); + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c index 219d492c00..647ae143b0 100644 --- a/src/lib/elementary/elc_hoversel.c +++ b/src/lib/elementary/elc_hoversel.c @@ -686,8 +686,7 @@ EAPI Evas_Object * elm_hoversel_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c index ea4c23ff59..9b8fb8ddfa 100644 --- a/src/lib/elementary/elc_multibuttonentry.c +++ b/src/lib/elementary/elc_multibuttonentry.c @@ -1759,8 +1759,7 @@ EAPI Evas_Object * elm_multibuttonentry_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c index e9ee09f94d..e8316f18a3 100644 --- a/src/lib/elementary/elc_naviframe.c +++ b/src/lib/elementary/elc_naviframe.c @@ -1635,8 +1635,7 @@ EAPI Evas_Object * elm_naviframe_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c index bd893996b9..3fde611ff4 100644 --- a/src/lib/elementary/elc_player.c +++ b/src/lib/elementary/elc_player.c @@ -673,7 +673,7 @@ EAPI Evas_Object * elm_player_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - return efl_add(MY_CLASS, parent); + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index 2e7c0946af..ccb63c74a6 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c @@ -1634,7 +1634,7 @@ EAPI Evas_Object * elm_popup_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); + Evas_Object *obj = efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); wd->highlight_root = EINA_TRUE; diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c index c3c6534f3f..824ae090ca 100644 --- a/src/lib/elementary/elm_access.c +++ b/src/lib/elementary/elm_access.c @@ -1246,8 +1246,7 @@ static Evas_Object * _elm_access_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c index f13a7291eb..e5171b81ad 100644 --- a/src/lib/elementary/elm_actionslider.c +++ b/src/lib/elementary/elm_actionslider.c @@ -544,8 +544,7 @@ EAPI Evas_Object * elm_actionslider_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_bg.c b/src/lib/elementary/elm_bg.c index 1d1667423c..6af7e05848 100644 --- a/src/lib/elementary/elm_bg.c +++ b/src/lib/elementary/elm_bg.c @@ -114,8 +114,7 @@ EAPI Evas_Object * elm_bg_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c index 0a225f4bd9..ed1fd9bfb6 100644 --- a/src/lib/elementary/elm_box.c +++ b/src/lib/elementary/elm_box.c @@ -425,8 +425,7 @@ EAPI Evas_Object * elm_box_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c index e35ad7736d..ecec425f97 100644 --- a/src/lib/elementary/elm_bubble.c +++ b/src/lib/elementary/elm_bubble.c @@ -224,8 +224,7 @@ EAPI Evas_Object * elm_bubble_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c index 3c906da37e..7427084b00 100644 --- a/src/lib/elementary/elm_calendar.c +++ b/src/lib/elementary/elm_calendar.c @@ -1916,8 +1916,7 @@ EAPI Evas_Object * elm_calendar_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c index b0b62dcf8d..06bc876a09 100644 --- a/src/lib/elementary/elm_clock.c +++ b/src/lib/elementary/elm_clock.c @@ -790,8 +790,7 @@ EAPI Evas_Object * elm_clock_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c index b6793da4b0..c0b4da73ff 100644 --- a/src/lib/elementary/elm_code_widget.c +++ b/src/lib/elementary/elm_code_widget.c @@ -61,9 +61,8 @@ EAPI Evas_Object * elm_code_widget_add(Evas_Object *parent, Elm_Code *code) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = NULL; - obj = efl_add(MY_CLASS, parent, elm_obj_code_widget_code_set(efl_added, code)); - return obj; + return efl_add(MY_CLASS, parent, elm_obj_code_widget_code_set(efl_added, code), + efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index a11e08d3a6..5744118ed4 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -1872,7 +1872,8 @@ _create_colorpalette(Evas_Object *obj) sd->palette_box = efl_add(EFL_UI_BOX_FLOW_CLASS, obj, efl_orientation_set(efl_added, EFL_ORIENT_HORIZONTAL), efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), - efl_gfx_size_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL)); + efl_gfx_size_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), + efl_gfx_visible_set(efl_added, EINA_FALSE)); hpadstr = edje_object_data_get(wd->resize_obj, "horizontal_pad"); if (hpadstr) h_pad = atoi(hpadstr); @@ -2290,8 +2291,7 @@ EAPI Evas_Object * elm_colorselector_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c index 15b5006cb4..5539632efd 100644 --- a/src/lib/elementary/elm_conform.c +++ b/src/lib/elementary/elm_conform.c @@ -996,8 +996,7 @@ EAPI Evas_Object * elm_conformant_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_datetime.c b/src/lib/elementary/elm_datetime.c index ce40c6e956..572cc9c183 100644 --- a/src/lib/elementary/elm_datetime.c +++ b/src/lib/elementary/elm_datetime.c @@ -21,8 +21,7 @@ EAPI Evas_Object * elm_datetime_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(EFL_UI_CLOCK_CLASS, parent); - return obj; + return efl_add(EFL_UI_CLOCK_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EAPI void diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c index 735d386848..f604df28de 100644 --- a/src/lib/elementary/elm_dayselector.c +++ b/src/lib/elementary/elm_dayselector.c @@ -450,8 +450,7 @@ EAPI Evas_Object * elm_dayselector_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c index 24cd265c3b..59f0ad0d33 100644 --- a/src/lib/elementary/elm_diskselector.c +++ b/src/lib/elementary/elm_diskselector.c @@ -1463,8 +1463,7 @@ EAPI Evas_Object * elm_diskselector_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 24a2ee634f..5f8ba15882 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -4010,8 +4010,7 @@ EAPI Evas_Object * elm_entry_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } static void diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c index 0291977da9..e5711e0790 100644 --- a/src/lib/elementary/elm_flipselector.c +++ b/src/lib/elementary/elm_flipselector.c @@ -670,8 +670,7 @@ EAPI Evas_Object * elm_flipselector_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EAPI void diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index 53237a19a2..57acad4f89 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -4287,8 +4287,7 @@ EAPI Evas_Object * elm_gengrid_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 762350c3ee..d184984ab7 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -5798,8 +5798,7 @@ EAPI Evas_Object * elm_genlist_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_gesture_layer.c b/src/lib/elementary/elm_gesture_layer.c index 2dc5190410..38af0fdf3a 100644 --- a/src/lib/elementary/elm_gesture_layer.c +++ b/src/lib/elementary/elm_gesture_layer.c @@ -3816,8 +3816,7 @@ EAPI Evas_Object * elm_gesture_layer_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c index 8915bf8a48..51fc72c882 100644 --- a/src/lib/elementary/elm_glview.c +++ b/src/lib/elementary/elm_glview.c @@ -342,16 +342,18 @@ EAPI Evas_Object * elm_glview_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent, elm_obj_glview_version_constructor(efl_added, EVAS_GL_GLES_2_X)); - return obj; + return efl_add(MY_CLASS, parent, + elm_obj_glview_version_constructor(efl_added, EVAS_GL_GLES_2_X), + efl_canvas_object_legacy_ctor(efl_added)); } EAPI Evas_Object * elm_glview_version_add(Evas_Object *parent, Evas_GL_Context_Version version) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent, elm_obj_glview_version_constructor(efl_added, version)); - return obj; + return efl_add(MY_CLASS, parent, + elm_obj_glview_version_constructor(efl_added, version), + efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static void diff --git a/src/lib/elementary/elm_grid.c b/src/lib/elementary/elm_grid.c index 3b8ea16862..eaf0efee69 100644 --- a/src/lib/elementary/elm_grid.c +++ b/src/lib/elementary/elm_grid.c @@ -171,8 +171,7 @@ EAPI Evas_Object * elm_grid_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c index cf2b52d587..2af45db230 100644 --- a/src/lib/elementary/elm_hover.c +++ b/src/lib/elementary/elm_hover.c @@ -683,8 +683,7 @@ EAPI Evas_Object * elm_hover_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Efl_Ui_Focus_Manager* diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c index 935ad72a10..8ae6e6a0ba 100644 --- a/src/lib/elementary/elm_icon.c +++ b/src/lib/elementary/elm_icon.c @@ -604,8 +604,7 @@ EAPI Evas_Object * elm_icon_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c index da1ac7bdbe..1f013ed6d1 100644 --- a/src/lib/elementary/elm_index.c +++ b/src/lib/elementary/elm_index.c @@ -1244,8 +1244,7 @@ EAPI Evas_Object * elm_index_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EAPI void elm_index_horizontal_set(Evas_Object *obj, Eina_Bool horizontal) diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c index 961ad4e5a6..4753a7ba54 100644 --- a/src/lib/elementary/elm_interface_scrollable.c +++ b/src/lib/elementary/elm_interface_scrollable.c @@ -192,8 +192,7 @@ _elm_pan_content_size_get(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coo static Evas_Object * _elm_pan_add(Evas *evas) { - Evas_Object *obj = efl_add(MY_PAN_CLASS, evas); - return obj; + return efl_add(MY_PAN_CLASS, evas, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_inwin.c b/src/lib/elementary/elm_inwin.c index e48337c65e..174e471c91 100644 --- a/src/lib/elementary/elm_inwin.c +++ b/src/lib/elementary/elm_inwin.c @@ -104,8 +104,7 @@ EAPI Evas_Object * elm_win_inwin_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c index b36b726817..77f2a90566 100644 --- a/src/lib/elementary/elm_label.c +++ b/src/lib/elementary/elm_label.c @@ -417,8 +417,7 @@ EAPI Evas_Object * elm_label_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_layout.c b/src/lib/elementary/elm_layout.c index b281329be6..64de2e403e 100644 --- a/src/lib/elementary/elm_layout.c +++ b/src/lib/elementary/elm_layout.c @@ -2216,8 +2216,7 @@ EAPI Evas_Object * elm_layout_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c index cca92bd46a..4544984abf 100644 --- a/src/lib/elementary/elm_list.c +++ b/src/lib/elementary/elm_list.c @@ -2559,8 +2559,7 @@ EAPI Evas_Object * elm_list_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c index f27ffe73cc..f7f6306b1d 100644 --- a/src/lib/elementary/elm_map.c +++ b/src/lib/elementary/elm_map.c @@ -4299,8 +4299,7 @@ EAPI Evas_Object * elm_map_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c index fac6eeac07..ff70189f92 100644 --- a/src/lib/elementary/elm_mapbuf.c +++ b/src/lib/elementary/elm_mapbuf.c @@ -308,8 +308,7 @@ EAPI Evas_Object * elm_mapbuf_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c index a8f02117ed..4d4895acd5 100644 --- a/src/lib/elementary/elm_menu.c +++ b/src/lib/elementary/elm_menu.c @@ -798,7 +798,7 @@ EAPI Evas_Object * elm_menu_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - return efl_add(MY_CLASS, parent); + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Efl_Ui_Focus_Manager* diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c index faf2765e86..85040a7a10 100644 --- a/src/lib/elementary/elm_notify.c +++ b/src/lib/elementary/elm_notify.c @@ -506,8 +506,7 @@ EAPI Evas_Object * elm_notify_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index 57a711f8b9..bcbe0fdfa1 100644 --- a/src/lib/elementary/elm_panel.c +++ b/src/lib/elementary/elm_panel.c @@ -1020,7 +1020,7 @@ EAPI Evas_Object * elm_panel_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); + Evas_Object *obj = efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); wd->highlight_root = EINA_TRUE; diff --git a/src/lib/elementary/elm_panes.c b/src/lib/elementary/elm_panes.c index 9856dcfb7d..7879e1c0fa 100644 --- a/src/lib/elementary/elm_panes.c +++ b/src/lib/elementary/elm_panes.c @@ -312,8 +312,7 @@ EAPI Evas_Object * elm_panes_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c index 3ee5729695..112c9a55be 100644 --- a/src/lib/elementary/elm_photo.c +++ b/src/lib/elementary/elm_photo.c @@ -298,8 +298,7 @@ EAPI Evas_Object * elm_photo_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c index 1dc41016df..9d96bc4f0a 100644 --- a/src/lib/elementary/elm_plug.c +++ b/src/lib/elementary/elm_plug.c @@ -136,8 +136,7 @@ EAPI Evas_Object * elm_plug_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_prefs.c b/src/lib/elementary/elm_prefs.c index 5d87e4011e..59396d55f0 100644 --- a/src/lib/elementary/elm_prefs.c +++ b/src/lib/elementary/elm_prefs.c @@ -507,8 +507,7 @@ elm_prefs_add(Evas_Object *parent) return NULL; } - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_route.c b/src/lib/elementary/elm_route.c index 541291daea..27f7688b1b 100644 --- a/src/lib/elementary/elm_route.c +++ b/src/lib/elementary/elm_route.c @@ -178,8 +178,7 @@ EAPI Evas_Object * elm_route_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index faa063d343..5e59830e13 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -984,8 +984,7 @@ EAPI Evas_Object * elm_scroller_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c index 7dcb5c979e..f651277d53 100644 --- a/src/lib/elementary/elm_segment_control.c +++ b/src/lib/elementary/elm_segment_control.c @@ -699,8 +699,7 @@ EAPI Evas_Object * elm_segment_control_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_separator.c b/src/lib/elementary/elm_separator.c index 6a8bedea1b..288765c423 100644 --- a/src/lib/elementary/elm_separator.c +++ b/src/lib/elementary/elm_separator.c @@ -65,8 +65,7 @@ EAPI Evas_Object * elm_separator_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EAPI void diff --git a/src/lib/elementary/elm_slideshow.c b/src/lib/elementary/elm_slideshow.c index 0be68a1e39..ed8e68d502 100644 --- a/src/lib/elementary/elm_slideshow.c +++ b/src/lib/elementary/elm_slideshow.c @@ -383,8 +383,7 @@ EAPI Evas_Object * elm_slideshow_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c index 4eda6119cc..afd72a0175 100644 --- a/src/lib/elementary/elm_spinner.c +++ b/src/lib/elementary/elm_spinner.c @@ -1414,8 +1414,7 @@ EAPI Evas_Object * elm_spinner_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EAPI void diff --git a/src/lib/elementary/elm_table.c b/src/lib/elementary/elm_table.c index d0c8cb7b72..7b3d00ef2e 100644 --- a/src/lib/elementary/elm_table.c +++ b/src/lib/elementary/elm_table.c @@ -214,8 +214,7 @@ EAPI Evas_Object * elm_table_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c index be9627b6b6..9a0484f899 100644 --- a/src/lib/elementary/elm_thumb.c +++ b/src/lib/elementary/elm_thumb.c @@ -579,8 +579,7 @@ EAPI Evas_Object * elm_thumb_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index 9664ff9f6e..dd189506ee 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -3083,8 +3083,7 @@ EAPI Evas_Object * elm_toolbar_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent); - return obj; + return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eina_Bool diff --git a/src/lib/elementary/elm_web2.c b/src/lib/elementary/elm_web2.c index c3dda02310..8f6688d2dd 100644 --- a/src/lib/elementary/elm_web2.c +++ b/src/lib/elementary/elm_web2.c @@ -80,7 +80,7 @@ elm_web_add(Evas_Object *parent) { if (!parent || !ewm.class_get) return NULL; - return efl_add(ewm.class_get(), parent); + return efl_add(ewm.class_get(), parent, efl_canvas_object_legacy_ctor(efl_added)); } EAPI const Efl_Class * diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c index 8feb7c0f3a..9850c80090 100644 --- a/src/lib/emotion/emotion_smart.c +++ b/src/lib/emotion/emotion_smart.c @@ -248,9 +248,7 @@ _clipper_position_size_update(Evas_Object *obj, int x, int y, int w, int h, int EAPI Evas_Object * emotion_object_add(Evas *evas) { - Evas_Object *e; - e = efl_add(MY_CLASS, evas); - return e; + return efl_add(MY_CLASS, evas, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/evas/canvas/evas_canvas3d_camera.c b/src/lib/evas/canvas/evas_canvas3d_camera.c index 109838e122..97f0576431 100644 --- a/src/lib/evas/canvas/evas_canvas3d_camera.c +++ b/src/lib/evas/canvas/evas_canvas3d_camera.c @@ -101,8 +101,7 @@ evas_canvas3d_camera_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *eo_obj = efl_add(MY_CLASS, e); - return eo_obj; + return efl_add(MY_CLASS, e); } EOLIAN static void diff --git a/src/lib/evas/canvas/evas_canvas3d_light.c b/src/lib/evas/canvas/evas_canvas3d_light.c index f71c54df7e..3149e83dc0 100644 --- a/src/lib/evas/canvas/evas_canvas3d_light.c +++ b/src/lib/evas/canvas/evas_canvas3d_light.c @@ -72,8 +72,7 @@ evas_canvas3d_light_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *eo_obj = efl_add(MY_CLASS, e); - return eo_obj; + return efl_add(MY_CLASS, e); } EOLIAN static Eo * diff --git a/src/lib/evas/canvas/evas_canvas3d_material.c b/src/lib/evas/canvas/evas_canvas3d_material.c index 802fcde3cc..404efd3cac 100644 --- a/src/lib/evas/canvas/evas_canvas3d_material.c +++ b/src/lib/evas/canvas/evas_canvas3d_material.c @@ -84,8 +84,7 @@ evas_canvas3d_material_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *eo_obj = efl_add(MY_CLASS, e); - return eo_obj; + return efl_add(MY_CLASS, e); } EOLIAN static Eo * diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.c b/src/lib/evas/canvas/evas_canvas3d_mesh.c index 7ec6fb6566..df2c2d522c 100644 --- a/src/lib/evas/canvas/evas_canvas3d_mesh.c +++ b/src/lib/evas/canvas/evas_canvas3d_mesh.c @@ -256,8 +256,7 @@ evas_canvas3d_mesh_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *eo_obj = efl_add(MY_CLASS, e); - return eo_obj; + return efl_add(MY_CLASS, e); } EOLIAN static Eo * diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c index 30a01a6ecf..0760b231be 100644 --- a/src/lib/evas/canvas/evas_canvas3d_node.c +++ b/src/lib/evas/canvas/evas_canvas3d_node.c @@ -1025,8 +1025,7 @@ evas_canvas3d_node_add(Evas *e, Evas_Canvas3D_Node_Type type) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *eo_obj = efl_add(MY_CLASS, e, evas_canvas3d_node_constructor(efl_added, type)); - return eo_obj; + return efl_add(MY_CLASS, e, evas_canvas3d_node_constructor(efl_added, type)); } EOLIAN static void diff --git a/src/lib/evas/canvas/evas_canvas3d_primitive.c b/src/lib/evas/canvas/evas_canvas3d_primitive.c index 4bec90fad6..dce1bcfa06 100644 --- a/src/lib/evas/canvas/evas_canvas3d_primitive.c +++ b/src/lib/evas/canvas/evas_canvas3d_primitive.c @@ -20,8 +20,7 @@ evas_canvas3d_primitive_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *eo_obj = efl_add(MY_CLASS, e); - return eo_obj; + return efl_add(MY_CLASS, e); } EOLIAN static Eo * diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.c b/src/lib/evas/canvas/evas_canvas3d_scene.c index 2933fb346f..161d1de120 100644 --- a/src/lib/evas/canvas/evas_canvas3d_scene.c +++ b/src/lib/evas/canvas/evas_canvas3d_scene.c @@ -64,8 +64,7 @@ evas_canvas3d_scene_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *eo_obj = efl_add(MY_CLASS, e); - return eo_obj; + return efl_add(MY_CLASS, e); } EOLIAN static Eo * diff --git a/src/lib/evas/canvas/evas_canvas3d_texture.c b/src/lib/evas/canvas/evas_canvas3d_texture.c index 90e3a995e2..566ab41c32 100644 --- a/src/lib/evas/canvas/evas_canvas3d_texture.c +++ b/src/lib/evas/canvas/evas_canvas3d_texture.c @@ -313,8 +313,7 @@ evas_canvas3d_texture_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *eo_obj = efl_add(MY_CLASS, e); - return eo_obj; + return efl_add(MY_CLASS, e); } diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c index a5cc0511d3..f0d2b2a1b8 100644 --- a/src/lib/evas/canvas/evas_object_box.c +++ b/src/lib/evas/canvas/evas_object_box.c @@ -478,8 +478,7 @@ evas_object_box_add(Evas *evas) MAGIC_CHECK(evas, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *obj = efl_add(MY_CLASS, evas); - return obj; + return efl_add(MY_CLASS, evas, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c index 9d44aa6fe0..4be08ca22f 100644 --- a/src/lib/evas/canvas/evas_object_grid.c +++ b/src/lib/evas/canvas/evas_object_grid.c @@ -279,8 +279,7 @@ evas_object_grid_add(Evas *evas) MAGIC_CHECK(evas, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *obj = efl_add(MY_CLASS, evas); - return obj; + return efl_add(MY_CLASS, evas, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c index d61ef40fce..4d588e0816 100644 --- a/src/lib/evas/canvas/evas_object_line.c +++ b/src/lib/evas/canvas/evas_object_line.c @@ -98,8 +98,7 @@ evas_object_line_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *eo_obj = efl_add(EVAS_LINE_CLASS, e); - return eo_obj; + return efl_add(EVAS_LINE_CLASS, e, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static void diff --git a/src/lib/evas/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c index 74ad28cde6..e762f72601 100644 --- a/src/lib/evas/canvas/evas_object_polygon.c +++ b/src/lib/evas/canvas/evas_object_polygon.c @@ -85,7 +85,7 @@ static const Evas_Object_Func object_func = EAPI Evas_Object * evas_object_polygon_add(Evas *e) { - return efl_add(MY_CLASS, e); + return efl_add(MY_CLASS, e, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c index 0fe74f691e..365b0f5015 100644 --- a/src/lib/evas/canvas/evas_object_rectangle.c +++ b/src/lib/evas/canvas/evas_object_rectangle.c @@ -96,8 +96,7 @@ evas_object_rectangle_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *eo_obj = efl_add(EFL_CANVAS_RECTANGLE_CLASS, e); - return eo_obj; + return efl_add(EFL_CANVAS_RECTANGLE_CLASS, e, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c index c1421075cb..aa849d0a98 100644 --- a/src/lib/evas/canvas/evas_object_smart.c +++ b/src/lib/evas/canvas/evas_object_smart.c @@ -626,7 +626,7 @@ evas_object_smart_add(Evas *eo_e, Evas_Smart *s) MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - eo_obj = efl_add(EFL_CANVAS_GROUP_CLASS, eo_e); + eo_obj = efl_add(EFL_CANVAS_GROUP_CLASS, eo_e, efl_canvas_object_legacy_ctor(efl_added)); evas_object_smart_attach(eo_obj, s); return eo_obj; } diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c index fc3c64d4c5..d19aaa2866 100644 --- a/src/lib/evas/canvas/evas_object_table.c +++ b/src/lib/evas/canvas/evas_object_table.c @@ -982,8 +982,7 @@ evas_object_table_add(Evas *evas) MAGIC_CHECK(evas, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *obj = efl_add(MY_CLASS, evas); - return obj; + return efl_add(MY_CLASS, evas, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c index f56b45eb67..ec194cd720 100644 --- a/src/lib/evas/canvas/evas_object_text.c +++ b/src/lib/evas/canvas/evas_object_text.c @@ -382,8 +382,7 @@ evas_object_text_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *eo_obj = efl_add(EVAS_TEXT_CLASS, e); - return eo_obj; + return efl_add(EVAS_TEXT_CLASS, e, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 59a58514bc..c7254ab000 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -6655,7 +6655,8 @@ evas_object_textblock_add(Evas *e) return NULL; MAGIC_CHECK_END(); Evas_Object *eo_obj = efl_add(MY_CLASS, e, - efl_text_multiline_set(efl_added, EINA_TRUE)); + efl_text_multiline_set(efl_added, EINA_TRUE), + efl_canvas_object_legacy_ctor(efl_added)); o = efl_data_scope_get(eo_obj, MY_CLASS); o->legacy_newline = EINA_TRUE; return eo_obj; diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c index 7045f271e2..0955c4a53a 100644 --- a/src/lib/evas/canvas/evas_object_textgrid.c +++ b/src/lib/evas/canvas/evas_object_textgrid.c @@ -904,8 +904,7 @@ evas_object_textgrid_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *eo_obj = efl_add(EVAS_TEXTGRID_CLASS, e); - return eo_obj; + return efl_add(EVAS_TEXTGRID_CLASS, e, efl_canvas_object_legacy_ctor(efl_added)); } EOLIAN static Eo * diff --git a/src/lib/evas/canvas/evas_object_vg.c b/src/lib/evas/canvas/evas_object_vg.c index 3936b4f91e..1b1e2bbbc5 100644 --- a/src/lib/evas/canvas/evas_object_vg.c +++ b/src/lib/evas/canvas/evas_object_vg.c @@ -68,11 +68,8 @@ evas_object_vg_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *eo_obj = efl_add(MY_CLASS, e); - - // Ask backend to return the main Ector_Surface - - return eo_obj; + // TODO: Ask backend to return the main Ector_Surface + return efl_add(MY_CLASS, e, efl_canvas_object_legacy_ctor(efl_added)); } Efl_VG *