summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2015-05-19 13:34:07 +0100
committerTom Hacohen <tom@stosb.com>2015-05-20 13:03:28 +0100
commita96fb467a291a59e7b78ccb4126654a664f01ee4 (patch)
tree772e66d76e5832205525aaf0ceb778df50a1c48d
parentdbefa817f60190fac699c80453e5a1644875db0a (diff)
Adjust usage of eo_constructor() according to recent changes.
-rw-r--r--src/lib/elc_ctxpopup.c12
-rw-r--r--src/lib/elc_fileselector.c6
-rw-r--r--src/lib/elc_fileselector_button.c6
-rw-r--r--src/lib/elc_fileselector_entry.c6
-rw-r--r--src/lib/elc_hoversel.c12
-rw-r--r--src/lib/elc_multibuttonentry.c12
-rw-r--r--src/lib/elc_naviframe.c12
-rw-r--r--src/lib/elc_player.c6
-rw-r--r--src/lib/elc_popup.c12
-rw-r--r--src/lib/elm_access.c6
-rw-r--r--src/lib/elm_actionslider.c6
-rw-r--r--src/lib/elm_app_client_view.c4
-rw-r--r--src/lib/elm_app_server_view.c4
-rw-r--r--src/lib/elm_bg.c6
-rw-r--r--src/lib/elm_box.c6
-rw-r--r--src/lib/elm_bubble.c6
-rw-r--r--src/lib/elm_button.c6
-rw-r--r--src/lib/elm_calendar.c6
-rw-r--r--src/lib/elm_check.c6
-rw-r--r--src/lib/elm_clipper.c6
-rw-r--r--src/lib/elm_clock.c6
-rw-r--r--src/lib/elm_colorselector.c12
-rw-r--r--src/lib/elm_conform.c6
-rw-r--r--src/lib/elm_datetime.c6
-rw-r--r--src/lib/elm_dayselector.c12
-rw-r--r--src/lib/elm_diskselector.c12
-rw-r--r--src/lib/elm_entry.c6
-rw-r--r--src/lib/elm_flip.c6
-rw-r--r--src/lib/elm_flipselector.c12
-rw-r--r--src/lib/elm_frame.c6
-rw-r--r--src/lib/elm_gengrid.c12
-rw-r--r--src/lib/elm_genlist.c12
-rw-r--r--src/lib/elm_gesture_layer.c6
-rw-r--r--src/lib/elm_glview.c6
-rw-r--r--src/lib/elm_glview.eo1
-rw-r--r--src/lib/elm_grid.c6
-rw-r--r--src/lib/elm_hover.c6
-rw-r--r--src/lib/elm_icon.c6
-rw-r--r--src/lib/elm_image.c6
-rw-r--r--src/lib/elm_index.c12
-rw-r--r--src/lib/elm_interface_scrollable.c12
-rw-r--r--src/lib/elm_interface_scrollable.eo1
-rw-r--r--src/lib/elm_inwin.c8
-rw-r--r--src/lib/elm_label.c6
-rw-r--r--src/lib/elm_layout.c6
-rw-r--r--src/lib/elm_list.c12
-rw-r--r--src/lib/elm_map.c6
-rw-r--r--src/lib/elm_mapbuf.c6
-rw-r--r--src/lib/elm_menu.c12
-rw-r--r--src/lib/elm_notify.c6
-rw-r--r--src/lib/elm_panel.c6
-rw-r--r--src/lib/elm_panes.c6
-rw-r--r--src/lib/elm_photo.c6
-rw-r--r--src/lib/elm_photocam.c6
-rw-r--r--src/lib/elm_plug.c6
-rw-r--r--src/lib/elm_prefs.c6
-rw-r--r--src/lib/elm_progressbar.c6
-rw-r--r--src/lib/elm_radio.c6
-rw-r--r--src/lib/elm_route.c6
-rw-r--r--src/lib/elm_scroller.c6
-rw-r--r--src/lib/elm_segment_control.c12
-rw-r--r--src/lib/elm_separator.c6
-rw-r--r--src/lib/elm_slider.c6
-rw-r--r--src/lib/elm_slideshow.c12
-rw-r--r--src/lib/elm_spinner.c6
-rw-r--r--src/lib/elm_table.c6
-rw-r--r--src/lib/elm_thumb.c6
-rw-r--r--src/lib/elm_toolbar.c12
-rw-r--r--src/lib/elm_video.c6
-rw-r--r--src/lib/elm_web2.c6
-rw-r--r--src/lib/elm_widget.c14
-rw-r--r--src/lib/elm_win.c16
72 files changed, 354 insertions, 192 deletions
diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index f84cc0f4d..f5e674054 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -1180,14 +1180,16 @@ elm_ctxpopup_add(Evas_Object *parent)
1180 return obj; 1180 return obj;
1181} 1181}
1182 1182
1183EOLIAN static void 1183EOLIAN static Eo *
1184_elm_ctxpopup_eo_base_constructor(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED) 1184_elm_ctxpopup_eo_base_constructor(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED)
1185{ 1185{
1186 eo_do_super(obj, MY_CLASS, eo_constructor()); 1186 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
1187 eo_do(obj, 1187 eo_do(obj,
1188 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 1188 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
1189 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 1189 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
1190 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_POPUP_MENU)); 1190 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_POPUP_MENU));
1191
1192 return obj;
1191} 1193}
1192 1194
1193EOLIAN static void 1195EOLIAN static void
@@ -1259,11 +1261,13 @@ _item_wrap_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UN
1259 item->wcb.org_func_cb((void *)item->wcb.org_data, item->wcb.cobj, EO_OBJ(item)); 1261 item->wcb.org_func_cb((void *)item->wcb.org_data, item->wcb.cobj, EO_OBJ(item));
1260} 1262}
1261 1263
1262EOLIAN static void 1264EOLIAN static Eo *
1263_elm_ctxpopup_item_eo_base_constructor(Eo *obj, Elm_Ctxpopup_Item_Data *it) 1265_elm_ctxpopup_item_eo_base_constructor(Eo *obj, Elm_Ctxpopup_Item_Data *it)
1264{ 1266{
1265 eo_do_super(obj, ELM_CTXPOPUP_ITEM_CLASS, eo_constructor()); 1267 obj = eo_do_super_ret(obj, ELM_CTXPOPUP_ITEM_CLASS, obj, eo_constructor());
1266 it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS); 1268 it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
1269
1270 return obj;
1267} 1271}
1268 1272
1269EOLIAN static Elm_Object_Item* 1273EOLIAN static Elm_Object_Item*
diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index 1ea2c01b9..7cb27800a 100644
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -1613,15 +1613,17 @@ elm_fileselector_add(Evas_Object *parent)
1613 return obj; 1613 return obj;
1614} 1614}
1615 1615
1616EOLIAN static void 1616EOLIAN static Eo *
1617_elm_fileselector_eo_base_constructor(Eo *obj, Elm_Fileselector_Data *sd) 1617_elm_fileselector_eo_base_constructor(Eo *obj, Elm_Fileselector_Data *sd)
1618{ 1618{
1619 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
1619 sd->obj = obj; 1620 sd->obj = obj;
1620 eo_do_super(obj, MY_CLASS, eo_constructor());
1621 eo_do(obj, 1621 eo_do(obj,
1622 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 1622 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
1623 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 1623 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
1624 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILE_CHOOSER)); 1624 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILE_CHOOSER));
1625
1626 return obj;
1625} 1627}
1626 1628
1627EAPI void 1629EAPI void
diff --git a/src/lib/elc_fileselector_button.c b/src/lib/elc_fileselector_button.c
index daf193765..fb64c68de 100644
--- a/src/lib/elc_fileselector_button.c
+++ b/src/lib/elc_fileselector_button.c
@@ -213,16 +213,18 @@ elm_fileselector_button_add(Evas_Object *parent)
213 return obj; 213 return obj;
214} 214}
215 215
216EOLIAN static void 216EOLIAN static Eo *
217_elm_fileselector_button_eo_base_constructor(Eo *obj, Elm_Fileselector_Button_Data *sd) 217_elm_fileselector_button_eo_base_constructor(Eo *obj, Elm_Fileselector_Button_Data *sd)
218{ 218{
219 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
219 sd->obj = obj; 220 sd->obj = obj;
220 221
221 eo_do_super(obj, MY_CLASS, eo_constructor());
222 eo_do(obj, 222 eo_do(obj,
223 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 223 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
224 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 224 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
225 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PUSH_BUTTON)); 225 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PUSH_BUTTON));
226
227 return obj;
226} 228}
227 229
228EOLIAN static void 230EOLIAN static void
diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c
index 3983750aa..f091f9191 100644
--- a/src/lib/elc_fileselector_entry.c
+++ b/src/lib/elc_fileselector_entry.c
@@ -343,14 +343,16 @@ elm_fileselector_entry_add(Evas_Object *parent)
343 return obj; 343 return obj;
344} 344}
345 345
346EOLIAN static void 346EOLIAN static Eo *
347_elm_fileselector_entry_eo_base_constructor(Eo *obj, Elm_Fileselector_Entry_Data *sd EINA_UNUSED) 347_elm_fileselector_entry_eo_base_constructor(Eo *obj, Elm_Fileselector_Entry_Data *sd EINA_UNUSED)
348{ 348{
349 eo_do_super(obj, MY_CLASS, eo_constructor()); 349 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
350 eo_do(obj, 350 eo_do(obj,
351 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 351 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
352 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 352 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
353 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_GROUPING)); 353 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_GROUPING));
354
355 return obj;
354} 356}
355 357
356EINA_DEPRECATED EAPI void 358EINA_DEPRECATED EAPI void
diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c
index 869580497..379c4af03 100644
--- a/src/lib/elc_hoversel.c
+++ b/src/lib/elc_hoversel.c
@@ -356,14 +356,16 @@ elm_hoversel_add(Evas_Object *parent)
356 return obj; 356 return obj;
357} 357}
358 358
359EOLIAN static void 359EOLIAN static Eo *
360_elm_hoversel_eo_base_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED) 360_elm_hoversel_eo_base_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
361{ 361{
362 eo_do_super(obj, MY_CLASS, eo_constructor()); 362 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
363 eo_do(obj, 363 eo_do(obj,
364 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 364 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
365 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 365 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
366 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_GLASS_PANE)); 366 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_GLASS_PANE));
367
368 return obj;
367} 369}
368 370
369EOLIAN static void 371EOLIAN static void
@@ -458,11 +460,13 @@ _elm_hoversel_items_get(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd)
458 return sd->items; 460 return sd->items;
459} 461}
460 462
461EOLIAN static void 463EOLIAN static Eo *
462_elm_hoversel_item_eo_base_constructor(Eo *obj, Elm_Hoversel_Item_Data *it) 464_elm_hoversel_item_eo_base_constructor(Eo *obj, Elm_Hoversel_Item_Data *it)
463{ 465{
464 eo_do_super(obj, ELM_HOVERSEL_ITEM_CLASS, eo_constructor()); 466 obj = eo_do_super_ret(obj, ELM_HOVERSEL_ITEM_CLASS, obj, eo_constructor());
465 it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS); 467 it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
468
469 return obj;
466} 470}
467 471
468EOLIAN static Elm_Object_Item* 472EOLIAN static Elm_Object_Item*
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 33fdb9fa9..52aad4dbc 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -660,11 +660,13 @@ _access_multibuttonentry_item_register(Evas_Object *obj,
660 evas_object_propagate_events_set(VIEW(item), !is_access); 660 evas_object_propagate_events_set(VIEW(item), !is_access);
661} 661}
662 662
663EOLIAN static void 663EOLIAN static Eo *
664_elm_multibuttonentry_item_eo_base_constructor(Eo *eo_item, Elm_Multibuttonentry_Item_Data *item) 664_elm_multibuttonentry_item_eo_base_constructor(Eo *eo_item, Elm_Multibuttonentry_Item_Data *item)
665{ 665{
666 eo_do_super(eo_item, ELM_MULTIBUTTONENTRY_ITEM_CLASS, eo_constructor()); 666 eo_item = eo_do_super_ret(eo_item, ELM_MULTIBUTTONENTRY_ITEM_CLASS, eo_item, eo_constructor());
667 item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS); 667 item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
668
669 return eo_item;
668} 670}
669 671
670static Elm_Object_Item * 672static Elm_Object_Item *
@@ -1627,14 +1629,16 @@ elm_multibuttonentry_add(Evas_Object *parent)
1627 return obj; 1629 return obj;
1628} 1630}
1629 1631
1630EOLIAN static void 1632EOLIAN static Eo *
1631_elm_multibuttonentry_eo_base_constructor(Eo *obj, Elm_Multibuttonentry_Data *sd EINA_UNUSED) 1633_elm_multibuttonentry_eo_base_constructor(Eo *obj, Elm_Multibuttonentry_Data *sd EINA_UNUSED)
1632{ 1634{
1633 eo_do_super(obj, MY_CLASS, eo_constructor()); 1635 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
1634 eo_do(obj, 1636 eo_do(obj,
1635 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 1637 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
1636 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 1638 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
1637 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ENTRY)); 1639 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ENTRY));
1640
1641 return obj;
1638} 1642}
1639 1643
1640EOLIAN static Evas_Object* 1644EOLIAN static Evas_Object*
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 3fe928fa2..42e02351e 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -1164,11 +1164,13 @@ _access_prev_btn_info_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED)
1164 return strdup(E_("Back")); 1164 return strdup(E_("Back"));
1165} 1165}
1166 1166
1167EOLIAN static void 1167EOLIAN static Eo *
1168_elm_naviframe_item_eo_base_constructor(Eo *eo_item, Elm_Naviframe_Item_Data *it) 1168_elm_naviframe_item_eo_base_constructor(Eo *eo_item, Elm_Naviframe_Item_Data *it)
1169{ 1169{
1170 eo_do_super(eo_item, ELM_NAVIFRAME_ITEM_CLASS, eo_constructor()); 1170 eo_item = eo_do_super_ret(eo_item, ELM_NAVIFRAME_ITEM_CLASS, eo_item, eo_constructor());
1171 it->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS); 1171 it->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
1172
1173 return eo_item;
1172} 1174}
1173 1175
1174static Elm_Object_Item * 1176static Elm_Object_Item *
@@ -1550,14 +1552,16 @@ elm_naviframe_add(Evas_Object *parent)
1550 return obj; 1552 return obj;
1551} 1553}
1552 1554
1553EOLIAN static void 1555EOLIAN static Eo *
1554_elm_naviframe_eo_base_constructor(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED) 1556_elm_naviframe_eo_base_constructor(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED)
1555{ 1557{
1556 eo_do_super(obj, MY_CLASS, eo_constructor()); 1558 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
1557 eo_do(obj, 1559 eo_do(obj,
1558 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 1560 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
1559 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 1561 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
1560 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PAGE_TAB_LIST)); 1562 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PAGE_TAB_LIST));
1563
1564 return obj;
1561} 1565}
1562 1566
1563EOLIAN static Elm_Object_Item* 1567EOLIAN static Elm_Object_Item*
diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c
index a2f1a8e83..1818e1f29 100644
--- a/src/lib/elc_player.c
+++ b/src/lib/elc_player.c
@@ -704,14 +704,16 @@ elm_player_add(Evas_Object *parent)
704 return obj; 704 return obj;
705} 705}
706 706
707EOLIAN static void 707EOLIAN static Eo *
708_elm_player_eo_base_constructor(Eo *obj, Elm_Player_Data *sd EINA_UNUSED) 708_elm_player_eo_base_constructor(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
709{ 709{
710 eo_do_super(obj, MY_CLASS, eo_constructor()); 710 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
711 eo_do(obj, 711 eo_do(obj,
712 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 712 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
713 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 713 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
714 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ANIMATION)); 714 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ANIMATION));
715
716 return obj;
715} 717}
716 718
717EOLIAN static void 719EOLIAN static void
diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index d5d8bd025..a274591ae 100644
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -785,11 +785,13 @@ _item_unfocused_cb(void *data,
785 evas_object_smart_callback_call(WIDGET(it), SIG_ITEM_UNFOCUSED, EO_OBJ(it)); 785 evas_object_smart_callback_call(WIDGET(it), SIG_ITEM_UNFOCUSED, EO_OBJ(it));
786} 786}
787 787
788EOLIAN static void 788EOLIAN static Eo *
789_elm_popup_item_eo_base_constructor(Eo *eo_it, Elm_Popup_Item_Data *it) 789_elm_popup_item_eo_base_constructor(Eo *eo_it, Elm_Popup_Item_Data *it)
790{ 790{
791 eo_do_super(eo_it, ELM_POPUP_ITEM_CLASS, eo_constructor()); 791 eo_it = eo_do_super_ret(eo_it, ELM_POPUP_ITEM_CLASS, eo_it, eo_constructor());
792 it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS); 792 it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
793
794 return eo_it;
793} 795}
794 796
795static void 797static void
@@ -1503,14 +1505,16 @@ elm_popup_add(Evas_Object *parent)
1503 return obj; 1505 return obj;
1504} 1506}
1505 1507
1506EOLIAN static void 1508EOLIAN static Eo *
1507_elm_popup_eo_base_constructor(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED) 1509_elm_popup_eo_base_constructor(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED)
1508{ 1510{
1509 eo_do_super(obj, MY_CLASS, eo_constructor()); 1511 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
1510 eo_do(obj, 1512 eo_do(obj,
1511 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 1513 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
1512 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 1514 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
1513 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_POPUP_MENU)); 1515 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_POPUP_MENU));
1516
1517 return obj;
1514} 1518}
1515 1519
1516EOLIAN static void 1520EOLIAN static void
diff --git a/src/lib/elm_access.c b/src/lib/elm_access.c
index 3ca73c9db..f8df21fe7 100644
--- a/src/lib/elm_access.c
+++ b/src/lib/elm_access.c
@@ -1238,12 +1238,14 @@ _elm_access_add(Evas_Object *parent)
1238 return obj; 1238 return obj;
1239} 1239}
1240 1240
1241EOLIAN static void 1241EOLIAN static Eo *
1242_elm_access_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED) 1242_elm_access_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
1243{ 1243{
1244 eo_do_super(obj, MY_CLASS, eo_constructor()); 1244 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
1245 eo_do(obj, 1245 eo_do(obj,
1246 evas_obj_type_set(MY_CLASS_NAME_LEGACY)); 1246 evas_obj_type_set(MY_CLASS_NAME_LEGACY));
1247
1248 return obj;
1247} 1249}
1248 1250
1249EAPI Evas_Object * 1251EAPI Evas_Object *
diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c
index 98ca1fe64..8b8be7f67 100644
--- a/src/lib/elm_actionslider.c
+++ b/src/lib/elm_actionslider.c
@@ -521,14 +521,16 @@ elm_actionslider_add(Evas_Object *parent)
521 return obj; 521 return obj;
522} 522}
523 523
524EOLIAN static void 524EOLIAN static Eo *
525_elm_actionslider_eo_base_constructor(Eo *obj, Elm_Actionslider_Data *_pd EINA_UNUSED) 525_elm_actionslider_eo_base_constructor(Eo *obj, Elm_Actionslider_Data *_pd EINA_UNUSED)
526{ 526{
527 eo_do_super(obj, MY_CLASS, eo_constructor()); 527 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
528 eo_do(obj, 528 eo_do(obj,
529 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 529 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
530 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 530 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
531 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_SLIDER)); 531 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_SLIDER));
532
533 return obj;
532} 534}
533 535
534EOLIAN static void 536EOLIAN static void
diff --git a/src/lib/elm_app_client_view.c b/src/lib/elm_app_client_view.c
index 9f759bcff..2cc8c4f8b 100644
--- a/src/lib/elm_app_client_view.c
+++ b/src/lib/elm_app_client_view.c
@@ -308,11 +308,13 @@ _elm_app_client_view_eo_base_destructor(Eo *eo, Elm_App_Client_View_Data *data)
308 eo_do_super(eo, MY_CLASS, eo_destructor()); 308 eo_do_super(eo, MY_CLASS, eo_destructor());
309} 309}
310 310
311EOLIAN static void 311EOLIAN static Eo *
312_elm_app_client_view_eo_base_constructor(Eo *obj, Elm_App_Client_View_Data *_pd EINA_UNUSED) 312_elm_app_client_view_eo_base_constructor(Eo *obj, Elm_App_Client_View_Data *_pd EINA_UNUSED)
313{ 313{
314 eo_error_set(obj); 314 eo_error_set(obj);
315 ERR("Only custom constructor can be used with '%s' class", MY_CLASS_NAME); 315 ERR("Only custom constructor can be used with '%s' class", MY_CLASS_NAME);
316
317 return NULL;
316} 318}
317 319
318#include "elm_app_client_view.eo.c" 320#include "elm_app_client_view.eo.c"
diff --git a/src/lib/elm_app_server_view.c b/src/lib/elm_app_server_view.c
index a02de5f68..36694c477 100644
--- a/src/lib/elm_app_server_view.c
+++ b/src/lib/elm_app_server_view.c
@@ -370,11 +370,13 @@ _elm_app_server_view_eo_base_destructor(Eo *obj, Elm_App_Server_View_Data *data)
370 eo_do_super(obj, MY_CLASS, eo_destructor()); 370 eo_do_super(obj, MY_CLASS, eo_destructor());
371} 371}
372 372
373EOLIAN static void 373EOLIAN static Eo *
374_elm_app_server_view_eo_base_constructor(Eo *obj, Elm_App_Server_View_Data *_pd EINA_UNUSED) 374_elm_app_server_view_eo_base_constructor(Eo *obj, Elm_App_Server_View_Data *_pd EINA_UNUSED)
375{ 375{
376 eo_error_set(obj); 376 eo_error_set(obj);
377 ERR("Only custom constructor can be used with '%s' class", MY_CLASS_NAME); 377 ERR("Only custom constructor can be used with '%s' class", MY_CLASS_NAME);
378
379 return NULL;
378} 380}
379 381
380#include "elm_app_server_view.eo.c" 382#include "elm_app_server_view.eo.c"
diff --git a/src/lib/elm_bg.c b/src/lib/elm_bg.c
index 94e5f360c..90e0119bb 100644
--- a/src/lib/elm_bg.c
+++ b/src/lib/elm_bg.c
@@ -117,13 +117,15 @@ elm_bg_add(Evas_Object *parent)
117 return obj; 117 return obj;
118} 118}
119 119
120EOLIAN static void 120EOLIAN static Eo *
121_elm_bg_eo_base_constructor(Eo *obj, Elm_Bg_Data *_pd EINA_UNUSED) 121_elm_bg_eo_base_constructor(Eo *obj, Elm_Bg_Data *_pd EINA_UNUSED)
122{ 122{
123 eo_do_super(obj, MY_CLASS, eo_constructor()); 123 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
124 eo_do(obj, 124 eo_do(obj,
125 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 125 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
126 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE)); 126 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE));
127
128 return obj;
127} 129}
128 130
129EOLIAN static Eina_Bool 131EOLIAN static Eina_Bool
diff --git a/src/lib/elm_box.c b/src/lib/elm_box.c
index 41d536bfa..42a6f33e2 100644
--- a/src/lib/elm_box.c
+++ b/src/lib/elm_box.c
@@ -432,14 +432,16 @@ elm_box_add(Evas_Object *parent)
432 return obj; 432 return obj;
433} 433}
434 434
435EOLIAN static void 435EOLIAN static Eo *
436_elm_box_eo_base_constructor(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED) 436_elm_box_eo_base_constructor(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
437{ 437{
438 eo_do_super(obj, MY_CLASS, eo_constructor()); 438 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
439 eo_do(obj, 439 eo_do(obj,
440 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 440 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
441 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 441 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
442 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILLER)); 442 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILLER));
443
444 return obj;
443} 445}
444 446
445EOLIAN static void 447EOLIAN static void
diff --git a/src/lib/elm_bubble.c b/src/lib/elm_bubble.c
index 54e4d7d60..1c81c7be4 100644
--- a/src/lib/elm_bubble.c
+++ b/src/lib/elm_bubble.c
@@ -223,14 +223,16 @@ elm_bubble_add(Evas_Object *parent)
223 return obj; 223 return obj;
224} 224}
225 225
226EOLIAN static void 226EOLIAN static Eo *
227_elm_bubble_eo_base_constructor(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED) 227_elm_bubble_eo_base_constructor(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED)
228{ 228{
229 eo_do_super(obj, MY_CLASS, eo_constructor()); 229 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
230 eo_do(obj, 230 eo_do(obj,
231 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 231 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
232 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 232 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
233 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILLER)); 233 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILLER));
234
235 return obj;
234} 236}
235 237
236EOLIAN static void 238EOLIAN static void
diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 1bba57d14..7a2be46a7 100644
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -323,14 +323,16 @@ elm_button_add(Evas_Object *parent)
323 return obj; 323 return obj;
324} 324}
325 325
326EOLIAN static void 326EOLIAN static Eo *
327_elm_button_eo_base_constructor(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) 327_elm_button_eo_base_constructor(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
328{ 328{
329 eo_do_super(obj, MY_CLASS, eo_constructor()); 329 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
330 eo_do(obj, 330 eo_do(obj,
331 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 331 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
332 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 332 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
333 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PUSH_BUTTON)); 333 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PUSH_BUTTON));
334
335 return obj;
334} 336}
335 337
336EOLIAN static void 338EOLIAN static void
diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index 681079067..0fc78f338 100644
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -1177,16 +1177,18 @@ elm_calendar_add(Evas_Object *parent)
1177 return obj; 1177 return obj;
1178} 1178}
1179 1179
1180EOLIAN static void 1180EOLIAN static Eo *
1181_elm_calendar_eo_base_constructor(Eo *obj, Elm_Calendar_Data *sd) 1181_elm_calendar_eo_base_constructor(Eo *obj, Elm_Calendar_Data *sd)
1182{ 1182{
1183 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
1183 sd->obj = obj; 1184 sd->obj = obj;
1184 1185
1185 eo_do_super(obj, MY_CLASS, eo_constructor());
1186 eo_do(obj, 1186 eo_do(obj,
1187 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 1187 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
1188 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 1188 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
1189 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_CALENDAR)); 1189 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_CALENDAR));
1190
1191 return obj;
1190} 1192}
1191 1193
1192EOLIAN static void 1194EOLIAN static void
diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c
index 27f38d05a..be376a65e 100644
--- a/src/lib/elm_check.c
+++ b/src/lib/elm_check.c
@@ -365,14 +365,16 @@ elm_check_add(Evas_Object *parent)
365 return obj; 365 return obj;
366} 366}
367 367
368EOLIAN static void 368EOLIAN static Eo *
369_elm_check_eo_base_constructor(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED) 369_elm_check_eo_base_constructor(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED)
370{ 370{
371 eo_do_super(obj, MY_CLASS, eo_constructor()); 371 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
372 eo_do(obj, 372 eo_do(obj,
373 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 373 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
374 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 374 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
375 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_CHECK_BOX)); 375 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_CHECK_BOX));
376
377 return obj;
376} 378}
377 379
378EOLIAN static void 380EOLIAN static void
diff --git a/src/lib/elm_clipper.c b/src/lib/elm_clipper.c
index 16d7077fe..5b869e8d8 100644
--- a/src/lib/elm_clipper.c
+++ b/src/lib/elm_clipper.c
@@ -211,11 +211,13 @@ elm_clipper_add(Evas_Object *parent)
211 return obj; 211 return obj;
212} 212}
213 213
214EOLIAN static void 214EOLIAN static Eo *
215_elm_clipper_eo_base_constructor(Eo *obj, Elm_Clipper_Data *sd EINA_UNUSED) 215_elm_clipper_eo_base_constructor(Eo *obj, Elm_Clipper_Data *sd EINA_UNUSED)
216{ 216{
217 eo_do_super(obj, MY_CLASS, eo_constructor()); 217 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
218 eo_do(obj, evas_obj_type_set(MY_CLASS_NAME_LEGACY)); 218 eo_do(obj, evas_obj_type_set(MY_CLASS_NAME_LEGACY));
219
220 return obj;
219} 221}
220 222
221static void 223static void
diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c
index 82b7f319b..30765b9e3 100644
--- a/src/lib/elm_clock.c
+++ b/src/lib/elm_clock.c
@@ -794,14 +794,16 @@ elm_clock_add(Evas_Object *parent)
794 return obj; 794 return obj;
795} 795}
796 796
797EOLIAN static void 797EOLIAN static Eo *
798_elm_clock_eo_base_constructor(Eo *obj, Elm_Clock_Data *_pd EINA_UNUSED) 798_elm_clock_eo_base_constructor(Eo *obj, Elm_Clock_Data *_pd EINA_UNUSED)
799{ 799{
800 eo_do_super(obj, MY_CLASS, eo_constructor()); 800 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
801 eo_do(obj, 801 eo_do(obj,
802 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 802 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
803 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 803 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
804 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_TEXT)); 804 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_TEXT));
805
806 return obj;
805} 807}
806 808
807static void 809static void
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index 7ffbf68c0..3d99d63c1 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -1454,10 +1454,10 @@ _elm_color_item_elm_widget_item_signal_emit(Eo *eo_it EINA_UNUSED, Elm_Color_Ite
1454 elm_object_signal_emit(VIEW(it), emission, source); 1454 elm_object_signal_emit(VIEW(it), emission, source);
1455} 1455}
1456 1456
1457EOLIAN static void 1457EOLIAN static Eo *
1458_elm_color_item_eo_base_constructor(Eo *eo_item, Elm_Color_Item_Data *item) 1458_elm_color_item_eo_base_constructor(Eo *eo_item, Elm_Color_Item_Data *item)
1459{ 1459{
1460 eo_do_super(eo_item, ELM_COLOR_ITEM_CLASS, eo_constructor()); 1460 eo_item = eo_do_super_ret(eo_item, ELM_COLOR_ITEM_CLASS, eo_item, eo_constructor());
1461 item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS); 1461 item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
1462 1462
1463 Evas_Object *obj; 1463 Evas_Object *obj;
@@ -1493,6 +1493,8 @@ _elm_color_item_eo_base_constructor(Eo *eo_item, Elm_Color_Item_Data *item)
1493 // ACCESS 1493 // ACCESS
1494 if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) 1494 if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
1495 eo_do(eo_item, elm_wdg_item_access_register()); 1495 eo_do(eo_item, elm_wdg_item_access_register());
1496
1497 return eo_item;
1496} 1498}
1497 1499
1498EOLIAN static void 1500EOLIAN static void
@@ -1972,14 +1974,16 @@ elm_colorselector_add(Evas_Object *parent)
1972 return obj; 1974 return obj;
1973} 1975}
1974 1976
1975EOLIAN static void 1977EOLIAN static Eo *
1976_elm_colorselector_eo_base_constructor(Eo *obj, Elm_Colorselector_Data *_pd EINA_UNUSED) 1978_elm_colorselector_eo_base_constructor(Eo *obj, Elm_Colorselector_Data *_pd EINA_UNUSED)
1977{ 1979{
1978 eo_do_super(obj, MY_CLASS, eo_constructor()); 1980 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
1979 eo_do(obj, 1981 eo_do(obj,
1980 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 1982 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
1981 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 1983 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
1982 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_COLOR_CHOOSER)); 1984 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_COLOR_CHOOSER));
1985
1986 return obj;
1983} 1987}
1984 1988
1985EOLIAN static void 1989EOLIAN static void
diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index ce13f070e..af37a51d0 100644
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -944,12 +944,12 @@ elm_conformant_add(Evas_Object *parent)
944 return obj; 944 return obj;
945} 945}
946 946
947EOLIAN static void 947EOLIAN static Eo *
948_elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd) 948_elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd)
949{ 949{
950 Evas_Object *top; 950 Evas_Object *top;
951 951
952 eo_do_super(obj, MY_CLASS, eo_constructor()); 952 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
953 eo_do(obj, 953 eo_do(obj,
954 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 954 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
955 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 955 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
@@ -968,6 +968,8 @@ _elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd)
968 (top, "indicator,prop,changed", _on_indicator_mode_changed, obj); 968 (top, "indicator,prop,changed", _on_indicator_mode_changed, obj);
969 evas_object_smart_callback_add 969 evas_object_smart_callback_add
970 (top, "rotation,changed", _on_rotation_changed, obj); 970 (top, "rotation,changed", _on_rotation_changed, obj);
971
972 return obj;
971} 973}
972 974
973static void 975static void
diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c
index 74fb9f774..e12005b9d 100644
--- a/src/lib/elm_datetime.c
+++ b/src/lib/elm_datetime.c
@@ -888,14 +888,16 @@ elm_datetime_add(Evas_Object *parent)
888 return obj; 888 return obj;
889} 889}
890 890
891EOLIAN static void 891EOLIAN static Eo *
892_elm_datetime_eo_base_constructor(Eo *obj, Elm_Datetime_Data *_pd EINA_UNUSED) 892_elm_datetime_eo_base_constructor(Eo *obj, Elm_Datetime_Data *_pd EINA_UNUSED)
893{ 893{
894 eo_do_super(obj, MY_CLASS, eo_constructor()); 894 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
895 eo_do(obj, 895 eo_do(obj,
896 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 896 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
897 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 897 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
898 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_DATE_EDITOR)); 898 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_DATE_EDITOR));
899
900 return obj;
899} 901}
900 902
901EOLIAN static const char* 903EOLIAN static const char*
diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c
index 1d834f827..1dbbd75ec 100644
--- a/src/lib/elm_dayselector.c
+++ b/src/lib/elm_dayselector.c
@@ -287,11 +287,13 @@ _elm_dayselector_elm_container_content_set(Eo *obj, Elm_Dayselector_Data *sd, co
287 return EINA_TRUE; 287 return EINA_TRUE;
288} 288}
289 289
290EOLIAN static void 290EOLIAN static Eo *
291_elm_dayselector_item_eo_base_constructor(Eo *eo_item, Elm_Dayselector_Item_Data *item) 291_elm_dayselector_item_eo_base_constructor(Eo *eo_item, Elm_Dayselector_Item_Data *item)
292{ 292{
293 eo_do_super(eo_item, ELM_DAYSELECTOR_ITEM_CLASS, eo_constructor()); 293 eo_item = eo_do_super_ret(eo_item, ELM_DAYSELECTOR_ITEM_CLASS, eo_item, eo_constructor());
294 item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS); 294 item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
295
296 return eo_item;
295} 297}
296 298
297EOLIAN static Evas_Object* 299EOLIAN static Evas_Object*
@@ -452,14 +454,16 @@ elm_dayselector_add(Evas_Object *parent)
452 return obj; 454 return obj;
453} 455}
454 456
455EOLIAN static void 457EOLIAN static Eo *
456_elm_dayselector_eo_base_constructor(Eo *obj, Elm_Dayselector_Data *_pd EINA_UNUSED) 458_elm_dayselector_eo_base_constructor(Eo *obj, Elm_Dayselector_Data *_pd EINA_UNUSED)
457{ 459{
458 eo_do_super(obj, MY_CLASS, eo_constructor()); 460 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
459 eo_do(obj, 461 eo_do(obj,
460 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 462 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
461 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 463 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
462 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PANEL)); 464 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PANEL));
465
466 return obj;
463} 467}
464 468
465EOLIAN static void 469EOLIAN static void
diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c
index d8598ade5..8433a88b9 100644
--- a/src/lib/elm_diskselector.c
+++ b/src/lib/elm_diskselector.c
@@ -647,11 +647,13 @@ _access_on_highlight_cb(void *data)
647 eo_do(WIDGET(it), elm_interface_scrollable_region_bring_in(x, y, w, h)); 647 eo_do(WIDGET(it), elm_interface_scrollable_region_bring_in(x, y, w, h));
648} 648}
649 649
650EOLIAN static void 650EOLIAN static Eo *
651_elm_diskselector_item_eo_base_constructor(Eo *eo_it, Elm_Diskselector_Item_Data *it) 651_elm_diskselector_item_eo_base_constructor(Eo *eo_it, Elm_Diskselector_Item_Data *it)
652{ 652{
653 eo_do_super(eo_it, ELM_DISKSELECTOR_ITEM_CLASS, eo_constructor()); 653 eo_it = eo_do_super_ret(eo_it, ELM_DISKSELECTOR_ITEM_CLASS, eo_it, eo_constructor());
654 it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS); 654 it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
655
656 return eo_it;
655} 657}
656 658
657static Elm_Diskselector_Item_Data * 659static Elm_Diskselector_Item_Data *
@@ -1449,14 +1451,16 @@ elm_diskselector_add(Evas_Object *parent)
1449 return obj; 1451 return obj;
1450} 1452}
1451 1453
1452EOLIAN static void 1454EOLIAN static Eo *
1453_elm_diskselector_eo_base_constructor(Eo *obj, Elm_Diskselector_Data *_pd EINA_UNUSED) 1455_elm_diskselector_eo_base_constructor(Eo *obj, Elm_Diskselector_Data *_pd EINA_UNUSED)
1454{ 1456{
1455 eo_do_super(obj, MY_CLASS, eo_constructor()); 1457 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
1456 eo_do(obj, 1458 eo_do(obj,
1457 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 1459 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
1458 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 1460 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
1459 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST)); 1461 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST));
1462
1463 return obj;
1460} 1464}
1461 1465
1462EOLIAN static Eina_Bool 1466EOLIAN static Eina_Bool
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 23ce54590..5ab7fd1c7 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -3727,16 +3727,18 @@ _cb_deled(void *data EINA_UNUSED,
3727 3727
3728} 3728}
3729 3729
3730EOLIAN static void 3730EOLIAN static Eo *
3731_elm_entry_eo_base_constructor(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED) 3731_elm_entry_eo_base_constructor(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
3732{ 3732{
3733 eo_do_super(obj, MY_CLASS, eo_constructor()); 3733 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
3734 eo_do(obj, 3734 eo_do(obj,
3735 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 3735 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
3736 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 3736 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
3737 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ENTRY), 3737 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ENTRY),
3738 eo_event_callback_add(EO_EV_CALLBACK_ADD, _cb_added, NULL), 3738 eo_event_callback_add(EO_EV_CALLBACK_ADD, _cb_added, NULL),
3739 eo_event_callback_add(EO_EV_CALLBACK_DEL, _cb_deled, NULL)); 3739 eo_event_callback_add(EO_EV_CALLBACK_DEL, _cb_deled, NULL));
3740
3741 return obj;
3740} 3742}
3741 3743
3742EOLIAN static void 3744EOLIAN static void
diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c
index 99f7458c5..8776a5d22 100644
--- a/src/lib/elm_flip.c
+++ b/src/lib/elm_flip.c
@@ -1859,16 +1859,18 @@ elm_flip_add(Evas_Object *parent)
1859 return obj; 1859 return obj;
1860} 1860}
1861 1861
1862EOLIAN static void 1862EOLIAN static Eo *
1863_elm_flip_eo_base_constructor(Eo *obj, Elm_Flip_Data *sd) 1863_elm_flip_eo_base_constructor(Eo *obj, Elm_Flip_Data *sd)
1864{ 1864{
1865 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
1865 sd->obj = obj; 1866 sd->obj = obj;
1866 1867
1867 eo_do_super(obj, MY_CLASS, eo_constructor());
1868 eo_do(obj, 1868 eo_do(obj,
1869 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 1869 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
1870 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 1870 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
1871 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PAGE_TAB_LIST)); 1871 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PAGE_TAB_LIST));
1872
1873 return obj;
1872} 1874}
1873 1875
1874EOLIAN static Eina_Bool 1876EOLIAN static Eina_Bool
diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index a9e874739..a74acf7b9 100644
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -293,11 +293,13 @@ _elm_flipselector_item_eo_base_destructor(Eo *eo_item, Elm_Flipselector_Item_Dat
293 eo_do_super(eo_item, ELM_FLIPSELECTOR_ITEM_CLASS, eo_destructor()); 293 eo_do_super(eo_item, ELM_FLIPSELECTOR_ITEM_CLASS, eo_destructor());
294} 294}
295 295
296EOLIAN static void 296EOLIAN static Eo *
297_elm_flipselector_item_eo_base_constructor(Eo *obj, Elm_Flipselector_Item_Data *it) 297_elm_flipselector_item_eo_base_constructor(Eo *obj, Elm_Flipselector_Item_Data *it)
298{ 298{
299 eo_do_super(obj, ELM_FLIPSELECTOR_ITEM_CLASS, eo_constructor()); 299 obj = eo_do_super_ret(obj, ELM_FLIPSELECTOR_ITEM_CLASS, obj, eo_constructor());
300 it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS); 300 it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
301
302 return obj;
301} 303}
302 304
303static Elm_Object_Item * 305static Elm_Object_Item *
@@ -564,15 +566,17 @@ elm_flipselector_add(Evas_Object *parent)
564 return obj; 566 return obj;
565} 567}
566 568
567EOLIAN static void 569EOLIAN static Eo *
568_elm_flipselector_eo_base_constructor(Eo *obj, Elm_Flipselector_Data *sd) 570_elm_flipselector_eo_base_constructor(Eo *obj, Elm_Flipselector_Data *sd)
569{ 571{
572 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
570 sd->obj = obj; 573 sd->obj = obj;
571 eo_do_super(obj, MY_CLASS, eo_constructor());
572 eo_do(obj, 574 eo_do(obj,
573 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 575 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
574 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 576 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
575 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST)); 577 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST));
578
579 return obj;
576} 580}
577 581
578EOLIAN static void 582EOLIAN static void
diff --git a/src/lib/elm_frame.c b/src/lib/elm_frame.c
index 7720656cc..04f7402c1 100644
--- a/src/lib/elm_frame.c
+++ b/src/lib/elm_frame.c
@@ -199,14 +199,16 @@ elm_frame_add(Evas_Object *parent)
199 return obj; 199 return obj;
200} 200}
201 201
202EOLIAN static void 202EOLIAN static Eo *
203_elm_frame_eo_base_constructor(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED) 203_elm_frame_eo_base_constructor(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED)
204{ 204{
205 eo_do_super(obj, MY_CLASS, eo_constructor()); 205 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
206 eo_do(obj, 206 eo_do(obj,
207 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 207 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
208 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 208 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
209 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FRAME)); 209 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FRAME));
210
211 return obj;
210} 212}
211 213
212EOLIAN static void 214EOLIAN static void
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 696292cf5..af7cec941 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -3633,12 +3633,14 @@ _item_select(Elm_Gen_Item *it)
3633 evas_object_unref(obj); 3633 evas_object_unref(obj);
3634} 3634}
3635 3635
3636EOLIAN static void 3636EOLIAN static Eo *
3637_elm_gengrid_item_eo_base_constructor(Eo *eo_it, Elm_Gen_Item *it) 3637_elm_gengrid_item_eo_base_constructor(Eo *eo_it, Elm_Gen_Item *it)
3638{ 3638{
3639 eo_do_super(eo_it, ELM_GENGRID_ITEM_CLASS, eo_constructor()); 3639 eo_it = eo_do_super_ret(eo_it, ELM_GENGRID_ITEM_CLASS, eo_it, eo_constructor());
3640 it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS); 3640 it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
3641 eo_do(eo_it, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST_ITEM)); 3641 eo_do(eo_it, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST_ITEM));
3642
3643 return eo_it;
3642} 3644}
3643 3645
3644static Elm_Gen_Item * 3646static Elm_Gen_Item *
@@ -3819,16 +3821,18 @@ elm_gengrid_add(Evas_Object *parent)
3819 return obj; 3821 return obj;
3820} 3822}
3821 3823
3822EOLIAN static void 3824EOLIAN static Eo *
3823_elm_gengrid_eo_base_constructor(Eo *obj, Elm_Gengrid_Data *sd) 3825_elm_gengrid_eo_base_constructor(Eo *obj, Elm_Gengrid_Data *sd)
3824{ 3826{
3827 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
3825 sd->obj = obj; 3828 sd->obj = obj;
3826 3829
3827 eo_do_super(obj, MY_CLASS, eo_constructor());
3828 eo_do(obj, 3830 eo_do(obj,
3829 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 3831 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
3830 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 3832 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
3831 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_TREE_TABLE)); 3833 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_TREE_TABLE));
3834
3835 return obj;
3832} 3836}
3833 3837
3834EOLIAN static void 3838EOLIAN static void
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 6d824cca3..45a3dfdcf 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -5587,16 +5587,18 @@ elm_genlist_add(Evas_Object *parent)
5587 return obj; 5587 return obj;
5588} 5588}
5589 5589
5590EOLIAN static void 5590EOLIAN static Eo *
5591_elm_genlist_eo_base_constructor(Eo *obj, Elm_Genlist_Data *sd) 5591_elm_genlist_eo_base_constructor(Eo *obj, Elm_Genlist_Data *sd)
5592{ 5592{
5593 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
5593 sd->obj = obj; 5594 sd->obj = obj;
5594 5595
5595 eo_do_super(obj, MY_CLASS, eo_constructor());
5596 eo_do(obj, 5596 eo_do(obj,
5597 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 5597 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
5598 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 5598 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
5599 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST)); 5599 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST));
5600
5601 return obj;
5600} 5602}
5601 5603
5602static void 5604static void
@@ -5883,13 +5885,15 @@ _elm_genlist_item_elm_widget_item_focus_get(Eo *eo_it, Elm_Gen_Item *it)
5883 return EINA_FALSE; 5885 return EINA_FALSE;
5884} 5886}
5885 5887
5886EOLIAN static void 5888EOLIAN static Eo *
5887_elm_genlist_item_eo_base_constructor(Eo *eo_it, Elm_Gen_Item *it) 5889_elm_genlist_item_eo_base_constructor(Eo *eo_it, Elm_Gen_Item *it)
5888{ 5890{
5889 eo_do_super(eo_it, ELM_GENLIST_ITEM_CLASS, eo_constructor()); 5891 eo_it = eo_do_super_ret(eo_it, ELM_GENLIST_ITEM_CLASS, eo_it, eo_constructor());
5890 5892
5891 it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS); 5893 it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
5892 eo_do(eo_it, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST_ITEM)); 5894 eo_do(eo_it, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST_ITEM));
5895
5896 return eo_it;
5893} 5897}
5894 5898
5895static Elm_Gen_Item * 5899static Elm_Gen_Item *
diff --git a/src/lib/elm_gesture_layer.c b/src/lib/elm_gesture_layer.c
index c126bbfc9..48f528553 100644
--- a/src/lib/elm_gesture_layer.c
+++ b/src/lib/elm_gesture_layer.c
@@ -3816,11 +3816,13 @@ elm_gesture_layer_add(Evas_Object *parent)
3816 return obj; 3816 return obj;
3817} 3817}
3818 3818
3819EOLIAN static void 3819EOLIAN static Eo *
3820_elm_gesture_layer_eo_base_constructor(Eo *obj, Elm_Gesture_Layer_Data *_pd EINA_UNUSED) 3820_elm_gesture_layer_eo_base_constructor(Eo *obj, Elm_Gesture_Layer_Data *_pd EINA_UNUSED)
3821{ 3821{
3822 eo_do_super(obj, MY_CLASS, eo_constructor()); 3822 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
3823 eo_do(obj, evas_obj_type_set(MY_CLASS_NAME_LEGACY)); 3823 eo_do(obj, evas_obj_type_set(MY_CLASS_NAME_LEGACY));
3824
3825 return obj;
3824} 3826}
3825 3827
3826EOLIAN static Eina_Bool 3828EOLIAN static Eina_Bool
diff --git a/src/lib/elm_glview.c b/src/lib/elm_glview.c
index 0792cc99f..8799f0013 100644
--- a/src/lib/elm_glview.c
+++ b/src/lib/elm_glview.c
@@ -305,12 +305,6 @@ elm_glview_version_add(Evas_Object *parent, Evas_GL_Context_Version version)
305} 305}
306 306
307EOLIAN static void 307EOLIAN static void
308_elm_glview_eo_base_constructor(Eo *obj, Elm_Glview_Data *sd EINA_UNUSED)
309{
310 eo_do_super(obj, MY_CLASS, eo_constructor());
311}
312
313EOLIAN static void
314_elm_glview_version_constructor(Eo *obj, Elm_Glview_Data *sd, 308_elm_glview_version_constructor(Eo *obj, Elm_Glview_Data *sd,
315 Evas_GL_Context_Version version) 309 Evas_GL_Context_Version version)
316{ 310{
diff --git a/src/lib/elm_glview.eo b/src/lib/elm_glview.eo
index d2a319d25..6ce08a191 100644
--- a/src/lib/elm_glview.eo
+++ b/src/lib/elm_glview.eo
@@ -209,7 +209,6 @@ class Elm.Glview (Elm.Widget)
209 } 209 }
210 implements { 210 implements {
211 class.constructor; 211 class.constructor;
212 Eo.Base.constructor;
213 Evas.Object_Smart.add; 212 Evas.Object_Smart.add;
214 Evas.Object_Smart.del; 213 Evas.Object_Smart.del;
215 Evas.Object_Smart.resize; 214 Evas.Object_Smart.resize;
diff --git a/src/lib/elm_grid.c b/src/lib/elm_grid.c
index 7c703519e..ba712f63e 100644
--- a/src/lib/elm_grid.c
+++ b/src/lib/elm_grid.c
@@ -165,13 +165,15 @@ elm_grid_add(Evas_Object *parent)
165 return obj; 165 return obj;
166} 166}
167 167
168EOLIAN static void 168EOLIAN static Eo *
169_elm_grid_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED) 169_elm_grid_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
170{ 170{
171 eo_do_super(obj, MY_CLASS, eo_constructor()); 171 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
172 eo_do(obj, 172 eo_do(obj,
173 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 173 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
174 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILLER)); 174 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILLER));
175
176 return obj;
175} 177}
176 178
177EOLIAN static void 179EOLIAN static void
diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c
index 66b6f612e..e9431b28f 100644
--- a/src/lib/elm_hover.c
+++ b/src/lib/elm_hover.c
@@ -630,14 +630,16 @@ elm_hover_add(Evas_Object *parent)
630 return obj; 630 return obj;
631} 631}
632 632
633EOLIAN static void 633EOLIAN static Eo *
634_elm_hover_eo_base_constructor(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED) 634_elm_hover_eo_base_constructor(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
635{ 635{
636 eo_do_super(obj, MY_CLASS, eo_constructor()); 636 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
637 eo_do(obj, 637 eo_do(obj,
638 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 638 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
639 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 639 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
640 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_GLASS_PANE)); 640 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_GLASS_PANE));
641
642 return obj;
641} 643}
642 644
643EOLIAN static void 645EOLIAN static void
diff --git a/src/lib/elm_icon.c b/src/lib/elm_icon.c
index efbdc5d58..8ca0bde45 100644
--- a/src/lib/elm_icon.c
+++ b/src/lib/elm_icon.c
@@ -663,16 +663,18 @@ elm_icon_add(Evas_Object *parent)
663 return obj; 663 return obj;
664} 664}
665 665
666EOLIAN static void 666EOLIAN static Eo *
667_elm_icon_eo_base_constructor(Eo *obj, Elm_Icon_Data *sd) 667_elm_icon_eo_base_constructor(Eo *obj, Elm_Icon_Data *sd)
668{ 668{
669 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
669 sd->obj = obj; 670 sd->obj = obj;
670 671
671 eo_do_super(obj, MY_CLASS, eo_constructor());
672 eo_do(obj, 672 eo_do(obj,
673 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 673 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
674 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 674 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
675 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE)); 675 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE));
676
677 return obj;
676} 678}
677 679
678EAPI Eina_Bool 680EAPI Eina_Bool
diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c
index cd769a6a1..3926f40e0 100644
--- a/src/lib/elm_image.c
+++ b/src/lib/elm_image.c
@@ -938,14 +938,16 @@ elm_image_add(Evas_Object *parent)
938 return obj; 938 return obj;
939} 939}
940 940
941EOLIAN static void 941EOLIAN static Eo *
942_elm_image_eo_base_constructor(Eo *obj, Elm_Image_Data *_pd EINA_UNUSED) 942_elm_image_eo_base_constructor(Eo *obj, Elm_Image_Data *_pd EINA_UNUSED)
943{ 943{
944 eo_do_super(obj, MY_CLASS, eo_constructor()); 944 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
945 eo_do(obj, 945 eo_do(obj,
946 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 946 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
947 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 947 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
948 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE)); 948 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE));
949
950 return obj;
949} 951}
950 952
951EAPI Eina_Bool 953EAPI Eina_Bool
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index 139a90369..3ac9a4626 100644
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -435,11 +435,13 @@ _elm_index_item_eo_base_destructor(Eo *eo_item EINA_UNUSED, Elm_Index_Item_Data
435 eo_do_super(eo_item, ELM_INDEX_ITEM_CLASS, eo_destructor()); 435 eo_do_super(eo_item, ELM_INDEX_ITEM_CLASS, eo_destructor());
436} 436}
437 437
438EOLIAN static void 438EOLIAN static Eo *
439_elm_index_item_eo_base_constructor(Eo *obj, Elm_Index_Item_Data *it) 439_elm_index_item_eo_base_constructor(Eo *obj, Elm_Index_Item_Data *it)
440{ 440{
441 eo_do_super(obj, ELM_INDEX_ITEM_CLASS, eo_constructor()); 441 obj = eo_do_super_ret(obj, ELM_INDEX_ITEM_CLASS, obj, eo_constructor());
442 it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS); 442 it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
443
444 return obj;
443} 445}
444 446
445static Elm_Object_Item * 447static Elm_Object_Item *
@@ -1106,14 +1108,16 @@ elm_index_add(Evas_Object *parent)
1106 return obj; 1108 return obj;
1107} 1109}
1108 1110
1109EOLIAN static void 1111EOLIAN static Eo *
1110_elm_index_eo_base_constructor(Eo *obj, Elm_Index_Data *_pd EINA_UNUSED) 1112_elm_index_eo_base_constructor(Eo *obj, Elm_Index_Data *_pd EINA_UNUSED)
1111{ 1113{
1112 eo_do_super(obj, MY_CLASS, eo_constructor()); 1114 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
1113 eo_do(obj, 1115 eo_do(obj,
1114 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 1116 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
1115 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 1117 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
1116 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST)); 1118 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST));
1119
1120 return obj;
1117} 1121}
1118 1122
1119EOLIAN static void 1123EOLIAN static void
diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c
index acb302138..b63ae8303 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -212,13 +212,15 @@ _elm_pan_add(Evas *evas)
212 return obj; 212 return obj;
213} 213}
214 214
215EOLIAN static void 215EOLIAN static Eo *
216_elm_pan_eo_base_constructor(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED) 216_elm_pan_eo_base_constructor(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
217{ 217{
218 eo_do_super(obj, MY_PAN_CLASS, eo_constructor()); 218 obj = eo_do_super_ret(obj, MY_PAN_CLASS, obj, eo_constructor());
219 eo_do(obj, 219 eo_do(obj,
220 evas_obj_type_set(MY_PAN_CLASS_NAME_LEGACY), 220 evas_obj_type_set(MY_PAN_CLASS_NAME_LEGACY),
221 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks)); 221 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks));
222
223 return obj;
222} 224}
223 225
224static void 226static void
@@ -4432,12 +4434,6 @@ _elm_interface_scrollable_evas_object_smart_del(Eo *obj, Elm_Scrollable_Smart_In
4432} 4434}
4433 4435
4434EOLIAN static void 4436EOLIAN static void
4435_elm_interface_scrollable_eo_base_constructor(Eo *obj, Elm_Scrollable_Smart_Interface_Data *class_data EINA_UNUSED)
4436{
4437 eo_do_super(obj, MY_SCROLLABLE_INTERFACE, eo_constructor());
4438}
4439
4440EOLIAN static void
4441_elm_interface_scrollable_class_constructor(Eo_Class *klass) 4437_elm_interface_scrollable_class_constructor(Eo_Class *klass)
4442{ 4438{
4443 evas_smart_legacy_type_register(MY_SCROLLABLE_INTERFACE_NAME_LEGACY, klass); 4439 evas_smart_legacy_type_register(MY_SCROLLABLE_INTERFACE_NAME_LEGACY, klass);
diff --git a/src/lib/elm_interface_scrollable.eo b/src/lib/elm_interface_scrollable.eo
index 3570a836f..35d9631de 100644
--- a/src/lib/elm_interface_scrollable.eo
+++ b/src/lib/elm_interface_scrollable.eo
@@ -813,7 +813,6 @@ mixin Elm_Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object_Smart)
813 } 813 }
814 } 814 }
815 implements { 815 implements {
816 Eo.Base.constructor;
817 class.constructor; 816 class.constructor;
818 Evas.Object_Smart.add; 817 Evas.Object_Smart.add;
819 Evas.Object_Smart.del; 818 Evas.Object_Smart.del;
diff --git a/src/lib/elm_inwin.c b/src/lib/elm_inwin.c
index f6abc2cc9..760d988cc 100644
--- a/src/lib/elm_inwin.c
+++ b/src/lib/elm_inwin.c
@@ -101,7 +101,7 @@ elm_win_inwin_add(Evas_Object *parent)
101 return obj; 101 return obj;
102} 102}
103 103
104EOLIAN static void 104EOLIAN static Eo *
105_elm_inwin_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED) 105_elm_inwin_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
106{ 106{
107 Evas_Object *parent = NULL; 107 Evas_Object *parent = NULL;
@@ -111,13 +111,15 @@ _elm_inwin_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
111 if (parent && !eo_isa(parent, ELM_WIN_CLASS)) 111 if (parent && !eo_isa(parent, ELM_WIN_CLASS))
112 { 112 {
113 eo_error_set(obj); /* *has* to have a parent window */ 113 eo_error_set(obj); /* *has* to have a parent window */
114 return; 114 return NULL;
115 } 115 }
116 116
117 eo_do_super(obj, MY_CLASS, eo_constructor()); 117 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
118 eo_do(obj, 118 eo_do(obj,
119 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 119 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
120 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_GLASS_PANE)); 120 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_GLASS_PANE));
121
122 return obj;
121} 123}
122 124
123EOLIAN static void 125EOLIAN static void
diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index 9a2b7070b..4ef320a39 100644
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -408,14 +408,16 @@ elm_label_add(Evas_Object *parent)
408 return obj; 408 return obj;
409} 409}
410 410
411EOLIAN static void 411EOLIAN static Eo *
412_elm_label_eo_base_constructor(Eo *obj, Elm_Label_Data *_pd EINA_UNUSED) 412_elm_label_eo_base_constructor(Eo *obj, Elm_Label_Data *_pd EINA_UNUSED)
413{ 413{
414 eo_do_super(obj, MY_CLASS, eo_constructor()); 414 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
415 eo_do(obj, 415 eo_do(obj,
416 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 416 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
417 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 417 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
418 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LABEL)); 418 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LABEL));
419
420 return obj;
419} 421}
420 422
421EOLIAN static void 423EOLIAN static void
diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c
index 4cc30c3d3..991112b1f 100644
--- a/src/lib/elm_layout.c
+++ b/src/lib/elm_layout.c
@@ -1707,15 +1707,17 @@ elm_layout_add(Evas_Object *parent)
1707 return obj; 1707 return obj;
1708} 1708}
1709 1709
1710EOLIAN static void 1710EOLIAN static Eo *
1711_elm_layout_eo_base_constructor(Eo *obj, Elm_Layout_Smart_Data *sd) 1711_elm_layout_eo_base_constructor(Eo *obj, Elm_Layout_Smart_Data *sd)
1712{ 1712{
1713 sd->obj = obj; 1713 sd->obj = obj;
1714 eo_do_super(obj, MY_CLASS, eo_constructor()); 1714 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
1715 eo_do(obj, 1715 eo_do(obj,
1716 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 1716 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
1717 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 1717 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
1718 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILLER)); 1718 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILLER));
1719
1720 return obj;
1719} 1721}
1720 1722
1721EOLIAN static void _elm_layout_class_constructor(Eo_Class *klass) 1723EOLIAN static void _elm_layout_class_constructor(Eo_Class *klass)
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index d7db7da9c..54a86048d 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -2315,12 +2315,14 @@ _access_widget_item_register(Elm_List_Item_Data *it, Eina_Bool is_access)
2315 } 2315 }
2316} 2316}
2317 2317
2318EOLIAN static void 2318EOLIAN static Eo *
2319_elm_list_item_eo_base_constructor(Eo *eo_it, Elm_List_Item_Data *it) 2319_elm_list_item_eo_base_constructor(Eo *eo_it, Elm_List_Item_Data *it)
2320{ 2320{
2321 eo_do_super(eo_it, ELM_LIST_ITEM_CLASS, eo_constructor()); 2321 eo_it = eo_do_super_ret(eo_it, ELM_LIST_ITEM_CLASS, eo_it, eo_constructor());
2322 it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS); 2322 it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
2323 eo_do(eo_it, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST_ITEM)); 2323 eo_do(eo_it, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST_ITEM));
2324
2325 return eo_it;
2324} 2326}
2325 2327
2326static Elm_List_Item_Data * 2328static Elm_List_Item_Data *
@@ -2586,14 +2588,16 @@ elm_list_add(Evas_Object *parent)
2586 return obj; 2588 return obj;
2587} 2589}
2588 2590
2589EOLIAN static void 2591EOLIAN static Eo *
2590_elm_list_eo_base_constructor(Eo *obj, Elm_List_Data *sd EINA_UNUSED) 2592_elm_list_eo_base_constructor(Eo *obj, Elm_List_Data *sd EINA_UNUSED)
2591{ 2593{
2592 eo_do_super(obj, MY_CLASS, eo_constructor()); 2594 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
2593 eo_do(obj, 2595 eo_do(obj,
2594 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 2596 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
2595 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 2597 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
2596 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST)); 2598 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST));
2599
2600 return obj;
2597} 2601}
2598 2602
2599EOLIAN static void 2603EOLIAN static void
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 8e47a9289..90060ce86 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -4193,16 +4193,18 @@ elm_map_add(Evas_Object *parent)
4193 return obj; 4193 return obj;
4194} 4194}
4195 4195
4196EOLIAN static void 4196EOLIAN static Eo *
4197_elm_map_eo_base_constructor(Eo *obj, Elm_Map_Data *sd) 4197_elm_map_eo_base_constructor(Eo *obj, Elm_Map_Data *sd)
4198{ 4198{
4199 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
4199 sd->obj = obj; 4200 sd->obj = obj;
4200 4201
4201 eo_do_super(obj, MY_CLASS, eo_constructor());
4202 eo_do(obj, 4202 eo_do(obj,
4203 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 4203 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
4204 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 4204 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
4205 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE_MAP)); 4205 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE_MAP));
4206
4207 return obj;
4206} 4208}
4207 4209
4208EOLIAN static void 4210EOLIAN static void
diff --git a/src/lib/elm_mapbuf.c b/src/lib/elm_mapbuf.c
index cf2f7fcbb..12dfb7968 100644
--- a/src/lib/elm_mapbuf.c
+++ b/src/lib/elm_mapbuf.c
@@ -290,13 +290,15 @@ elm_mapbuf_add(Evas_Object *parent)
290 return obj; 290 return obj;
291} 291}
292 292
293EOLIAN static void 293EOLIAN static Eo *
294_elm_mapbuf_eo_base_constructor(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED) 294_elm_mapbuf_eo_base_constructor(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED)
295{ 295{
296 eo_do_super(obj, MY_CLASS, eo_constructor()); 296 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
297 eo_do(obj, 297 eo_do(obj,
298 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 298 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
299 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE_MAP)); 299 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE_MAP));
300
301 return obj;
300} 302}
301 303
302static void 304static void
diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index bdee1472b..2f16c54e6 100644
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -767,12 +767,12 @@ elm_menu_add(Evas_Object *parent)
767 return obj; 767 return obj;
768} 768}
769 769
770EOLIAN static void 770EOLIAN static Eo *
771_elm_menu_eo_base_constructor(Eo *obj, Elm_Menu_Data *sd) 771_elm_menu_eo_base_constructor(Eo *obj, Elm_Menu_Data *sd)
772{ 772{
773 Eo *parent = NULL; 773 Eo *parent = NULL;
774 774
775 eo_do_super(obj, MY_CLASS, eo_constructor()); 775 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
776 eo_do(obj, 776 eo_do(obj,
777 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 777 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
778 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 778 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
@@ -790,6 +790,8 @@ _elm_menu_eo_base_constructor(Eo *obj, Elm_Menu_Data *sd)
790 _block_menu, sd); 790 _block_menu, sd);
791 evas_object_smart_callback_add(obj, "elm,action,unblock_menu", 791 evas_object_smart_callback_add(obj, "elm,action,unblock_menu",
792 _unblock_menu, sd); 792 _unblock_menu, sd);
793
794 return obj;
793} 795}
794 796
795EOLIAN static void 797EOLIAN static void
@@ -982,11 +984,13 @@ _elm_menu_item_eo_base_destructor(Eo *eo_item, Elm_Menu_Item_Data *item)
982 eo_do_super(eo_item, ELM_MENU_ITEM_CLASS, eo_destructor()); 984 eo_do_super(eo_item, ELM_MENU_ITEM_CLASS, eo_destructor());
983} 985}
984 986
985EOLIAN static void 987EOLIAN static Eo *
986_elm_menu_item_eo_base_constructor(Eo *eo_item, Elm_Menu_Item_Data *item) 988_elm_menu_item_eo_base_constructor(Eo *eo_item, Elm_Menu_Item_Data *item)
987{ 989{
988 eo_do_super(eo_item, ELM_MENU_ITEM_CLASS, eo_constructor()); 990 eo_item = eo_do_super_ret(eo_item, ELM_MENU_ITEM_CLASS, eo_item, eo_constructor());
989 item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS); 991 item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
992
993 return eo_item;
990} 994}
991 995
992EOLIAN static Elm_Object_Item* 996EOLIAN static Elm_Object_Item*
diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index 4c44fb6b5..53305bdea 100644
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -480,13 +480,15 @@ elm_notify_add(Evas_Object *parent)
480 return obj; 480 return obj;
481} 481}
482 482
483EOLIAN static void 483EOLIAN static Eo *
484_elm_notify_eo_base_constructor(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED) 484_elm_notify_eo_base_constructor(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED)
485{ 485{
486 eo_do_super(obj, MY_CLASS, eo_constructor()); 486 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
487 eo_do(obj, 487 eo_do(obj,
488 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 488 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
489 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_NOTIFICATION)); 489 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_NOTIFICATION));
490
491 return obj;
490} 492}
491 493
492EAPI void 494EAPI void
diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index 4847f2efd..94d767a4f 100644
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -1168,14 +1168,16 @@ elm_panel_add(Evas_Object *parent)
1168 return obj; 1168 return obj;
1169} 1169}
1170 1170
1171EOLIAN static void 1171EOLIAN static Eo *
1172_elm_panel_eo_base_constructor(Eo *obj, Elm_Panel_Data *_pd EINA_UNUSED) 1172_elm_panel_eo_base_constructor(Eo *obj, Elm_Panel_Data *_pd EINA_UNUSED)
1173{ 1173{
1174 eo_do_super(obj, MY_CLASS, eo_constructor()); 1174 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
1175 eo_do(obj, 1175 eo_do(obj,
1176 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 1176 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
1177 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 1177 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
1178 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PANEL)); 1178 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PANEL));
1179
1180 return obj;
1179} 1181}
1180 1182
1181EOLIAN static void 1183EOLIAN static void
diff --git a/src/lib/elm_panes.c b/src/lib/elm_panes.c
index 0f8d2a422..716f233ba 100644
--- a/src/lib/elm_panes.c
+++ b/src/lib/elm_panes.c
@@ -323,14 +323,16 @@ elm_panes_add(Evas_Object *parent)
323 return obj; 323 return obj;
324} 324}
325 325
326EOLIAN static void 326EOLIAN static Eo *
327_elm_panes_eo_base_constructor(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED) 327_elm_panes_eo_base_constructor(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED)
328{ 328{
329 eo_do_super(obj, MY_CLASS, eo_constructor()); 329 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
330 eo_do(obj, 330 eo_do(obj,
331 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 331 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
332 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 332 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
333 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_SPLIT_PANE)); 333 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_SPLIT_PANE));
334
335 return obj;
334} 336}
335 337
336EINA_DEPRECATED EAPI void 338EINA_DEPRECATED EAPI void
diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c
index 478b5252c..2d1f2b8ae 100644
--- a/src/lib/elm_photo.c
+++ b/src/lib/elm_photo.c
@@ -309,14 +309,16 @@ elm_photo_add(Evas_Object *parent)
309 return obj; 309 return obj;
310} 310}
311 311
312EOLIAN static void 312EOLIAN static Eo *
313_elm_photo_eo_base_constructor(Eo *obj, Elm_Photo_Data *_pd EINA_UNUSED) 313_elm_photo_eo_base_constructor(Eo *obj, Elm_Photo_Data *_pd EINA_UNUSED)
314{ 314{
315 eo_do_super(obj, MY_CLASS, eo_constructor()); 315 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
316 eo_do(obj, 316 eo_do(obj,
317 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 317 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
318 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 318 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
319 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE)); 319 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE));
320
321 return obj;
320} 322}
321 323
322EOLIAN static Eina_Bool 324EOLIAN static Eina_Bool
diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index c4ae9b640..7d2723049 100644
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -1488,14 +1488,16 @@ elm_photocam_add(Evas_Object *parent)
1488 return obj; 1488 return obj;
1489} 1489}
1490 1490
1491EOLIAN static void 1491EOLIAN static Eo *
1492_elm_photocam_eo_base_constructor(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED) 1492_elm_photocam_eo_base_constructor(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED)
1493{ 1493{
1494 eo_do_super(obj, MY_CLASS, eo_constructor()); 1494 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
1495 eo_do(obj, 1495 eo_do(obj,
1496 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 1496 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
1497 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 1497 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
1498 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE)); 1498 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE));
1499
1500 return obj;
1499} 1501}
1500 1502
1501static void 1503static void
diff --git a/src/lib/elm_plug.c b/src/lib/elm_plug.c
index 68bcd8b04..d7f4448ef 100644
--- a/src/lib/elm_plug.c
+++ b/src/lib/elm_plug.c
@@ -140,14 +140,16 @@ elm_plug_add(Evas_Object *parent)
140 return obj; 140 return obj;
141} 141}
142 142
143EOLIAN static void 143EOLIAN static Eo *
144_elm_plug_eo_base_constructor(Eo *obj, void *sd EINA_UNUSED) 144_elm_plug_eo_base_constructor(Eo *obj, void *sd EINA_UNUSED)
145{ 145{
146 eo_do_super(obj, MY_CLASS, eo_constructor()); 146 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
147 eo_do(obj, 147 eo_do(obj,
148 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 148 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
149 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 149 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
150 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE)); 150 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE));
151
152 return obj;
151} 153}
152 154
153EOLIAN static Evas_Object* 155EOLIAN static Evas_Object*
diff --git a/src/lib/elm_prefs.c b/src/lib/elm_prefs.c
index 4cf5d15b6..b84a456ca 100644
--- a/src/lib/elm_prefs.c
+++ b/src/lib/elm_prefs.c
@@ -512,14 +512,16 @@ elm_prefs_add(Evas_Object *parent)
512 return obj; 512 return obj;
513} 513}
514 514
515EOLIAN static void 515EOLIAN static Eo *
516_elm_prefs_eo_base_constructor(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED) 516_elm_prefs_eo_base_constructor(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED)
517{ 517{
518 eo_do_super(obj, MY_CLASS, eo_constructor()); 518 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
519 eo_do(obj, 519 eo_do(obj,
520 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 520 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
521 evas_obj_smart_callbacks_descriptions_set(_elm_prefs_smart_callbacks), 521 evas_obj_smart_callbacks_descriptions_set(_elm_prefs_smart_callbacks),
522 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_REDUNDANT_OBJECT)); 522 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_REDUNDANT_OBJECT));
523
524 return obj;
523} 525}
524 526
525static Eina_Bool 527static Eina_Bool
diff --git a/src/lib/elm_progressbar.c b/src/lib/elm_progressbar.c
index 1988fda43..a034dcd5c 100644
--- a/src/lib/elm_progressbar.c
+++ b/src/lib/elm_progressbar.c
@@ -328,14 +328,16 @@ elm_progressbar_add(Evas_Object *parent)
328 return obj; 328 return obj;
329} 329}
330 330
331EOLIAN static void 331EOLIAN static Eo *
332_elm_progressbar_eo_base_constructor(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED) 332_elm_progressbar_eo_base_constructor(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED)
333{ 333{
334 eo_do_super(obj, MY_CLASS, eo_constructor()); 334 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
335 eo_do(obj, 335 eo_do(obj,
336 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 336 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
337 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 337 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
338 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PROGRESS_BAR)); 338 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PROGRESS_BAR));
339
340 return obj;
339} 341}
340 342
341EOLIAN static void 343EOLIAN static void
diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c
index 6efeb01e5..efa57cbde 100644
--- a/src/lib/elm_radio.c
+++ b/src/lib/elm_radio.c
@@ -326,14 +326,16 @@ elm_radio_add(Evas_Object *parent)
326 return obj; 326 return obj;
327} 327}
328 328
329EOLIAN static void 329EOLIAN static Eo *
330_elm_radio_eo_base_constructor(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED) 330_elm_radio_eo_base_constructor(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED)
331{ 331{
332 eo_do_super(obj, MY_CLASS, eo_constructor()); 332 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
333 eo_do(obj, 333 eo_do(obj,
334 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 334 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
335 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 335 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
336 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_RADIO_BUTTON)); 336 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_RADIO_BUTTON));
337
338 return obj;
337} 339}
338 340
339EOLIAN static void 341EOLIAN static void
diff --git a/src/lib/elm_route.c b/src/lib/elm_route.c
index 605eed84e..716c5724d 100644
--- a/src/lib/elm_route.c
+++ b/src/lib/elm_route.c
@@ -182,12 +182,14 @@ elm_route_add(Evas_Object *parent)
182 return obj; 182 return obj;
183} 183}
184 184
185EOLIAN static void 185EOLIAN static Eo *
186_elm_route_eo_base_constructor(Eo *obj, Elm_Route_Data *_pd EINA_UNUSED) 186_elm_route_eo_base_constructor(Eo *obj, Elm_Route_Data *_pd EINA_UNUSED)
187{ 187{
188 eo_do_super(obj, MY_CLASS, eo_constructor()); 188 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
189 eo_do(obj, 189 eo_do(obj,
190 evas_obj_type_set(MY_CLASS_NAME_LEGACY)); 190 evas_obj_type_set(MY_CLASS_NAME_LEGACY));
191
192 return obj;
191} 193}
192 194
193EOLIAN static void 195EOLIAN static void
diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index a2cd799ff..2e174c9c7 100644
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -870,14 +870,16 @@ elm_scroller_add(Evas_Object *parent)
870 return obj; 870 return obj;
871} 871}
872 872
873EOLIAN static void 873EOLIAN static Eo *
874_elm_scroller_eo_base_constructor(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED) 874_elm_scroller_eo_base_constructor(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED)
875{ 875{
876 eo_do_super(obj, MY_CLASS, eo_constructor()); 876 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
877 eo_do(obj, 877 eo_do(obj,
878 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 878 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
879 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 879 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
880 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_SCROLL_PANE)); 880 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_SCROLL_PANE));
881
882 return obj;
881} 883}
882 884
883/* deprecated */ 885/* deprecated */
diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c
index 3d0810d8e..4f5d4e2e4 100644
--- a/src/lib/elm_segment_control.c
+++ b/src/lib/elm_segment_control.c
@@ -582,10 +582,10 @@ _item_new(Evas_Object *obj,
582 return eo_item; 582 return eo_item;
583} 583}
584 584
585EOLIAN static void 585EOLIAN static Eo *
586_elm_segment_control_item_eo_base_constructor(Eo *obj, Elm_Segment_Control_Item_Data *it) 586_elm_segment_control_item_eo_base_constructor(Eo *obj, Elm_Segment_Control_Item_Data *it)
587{ 587{
588 eo_do_super(obj, ELM_SEGMENT_CONTROL_ITEM_CLASS, eo_constructor()); 588 obj = eo_do_super_ret(obj, ELM_SEGMENT_CONTROL_ITEM_CLASS, obj, eo_constructor());
589 it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS); 589 it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
590 590
591 Evas_Object *parent; 591 Evas_Object *parent;
@@ -600,6 +600,8 @@ _elm_segment_control_item_eo_base_constructor(Eo *obj, Elm_Segment_Control_Item_
600 elm_widget_theme_object_set 600 elm_widget_theme_object_set
601 (parent, VIEW(it), "segment_control", "item", elm_object_style_get(parent)); 601 (parent, VIEW(it), "segment_control", "item", elm_object_style_get(parent));
602 edje_object_mirrored_set(VIEW(it), elm_widget_mirrored_get(WIDGET(it))); 602 edje_object_mirrored_set(VIEW(it), elm_widget_mirrored_get(WIDGET(it)));
603
604 return obj;
603} 605}
604 606
605EOLIAN static void 607EOLIAN static void
@@ -695,16 +697,18 @@ elm_segment_control_add(Evas_Object *parent)
695 return obj; 697 return obj;
696} 698}
697 699
698EOLIAN static void 700EOLIAN static Eo *
699_elm_segment_control_eo_base_constructor(Eo *obj, Elm_Segment_Control_Data *sd) 701_elm_segment_control_eo_base_constructor(Eo *obj, Elm_Segment_Control_Data *sd)
700{ 702{
703 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
701 sd->obj = obj; 704 sd->obj = obj;
702 705
703 eo_do_super(obj, MY_CLASS, eo_constructor());
704 eo_do(obj, 706 eo_do(obj,
705 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 707 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
706 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 708 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
707 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST)); 709 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST));
710
711 return obj;
708} 712}
709 713
710EOLIAN static Elm_Object_Item* 714EOLIAN static Elm_Object_Item*
diff --git a/src/lib/elm_separator.c b/src/lib/elm_separator.c
index 55d9a9b2a..a1d98cb32 100644
--- a/src/lib/elm_separator.c
+++ b/src/lib/elm_separator.c
@@ -66,13 +66,15 @@ elm_separator_add(Evas_Object *parent)
66 return obj; 66 return obj;
67} 67}
68 68
69EOLIAN static void 69EOLIAN static Eo *
70_elm_separator_eo_base_constructor(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED) 70_elm_separator_eo_base_constructor(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED)
71{ 71{
72 eo_do_super(obj, MY_CLASS, eo_constructor()); 72 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
73 eo_do(obj, 73 eo_do(obj,
74 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 74 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
75 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_SEPARATOR)); 75 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_SEPARATOR));
76
77 return obj;
76} 78}
77 79
78EOLIAN static void 80EOLIAN static void
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 361b807b7..f9113c1be 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -925,14 +925,16 @@ elm_slider_add(Evas_Object *parent)
925 return obj; 925 return obj;
926} 926}
927 927
928EOLIAN static void 928EOLIAN static Eo *
929_elm_slider_eo_base_constructor(Eo *obj, Elm_Slider_Data *_pd EINA_UNUSED) 929_elm_slider_eo_base_constructor(Eo *obj, Elm_Slider_Data *_pd EINA_UNUSED)
930{ 930{
931 eo_do_super(obj, MY_CLASS, eo_constructor()); 931 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
932 eo_do(obj, 932 eo_do(obj,
933 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 933 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
934 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 934 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
935 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_SLIDER)); 935 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_SLIDER));
936
937 return obj;
936} 938}
937 939
938EOLIAN static void 940EOLIAN static void
diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index 08fd69901..7c836639e 100644
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -383,21 +383,25 @@ elm_slideshow_add(Evas_Object *parent)
383 return obj; 383 return obj;
384} 384}
385 385
386EOLIAN static void 386EOLIAN static Eo *
387_elm_slideshow_eo_base_constructor(Eo *obj, Elm_Slideshow_Data *_pd EINA_UNUSED) 387_elm_slideshow_eo_base_constructor(Eo *obj, Elm_Slideshow_Data *_pd EINA_UNUSED)
388{ 388{
389 eo_do_super(obj, MY_CLASS, eo_constructor()); 389 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
390 eo_do(obj, 390 eo_do(obj,
391 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 391 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
392 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 392 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
393 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_DOCUMENT_PRESENTATION)); 393 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_DOCUMENT_PRESENTATION));
394
395 return obj;
394} 396}
395 397
396EOLIAN static void 398EOLIAN static Eo *
397_elm_slideshow_item_eo_base_constructor(Eo *obj, Elm_Slideshow_Item_Data *it) 399_elm_slideshow_item_eo_base_constructor(Eo *obj, Elm_Slideshow_Item_Data *it)
398{ 400{
399 eo_do_super(obj, ELM_SLIDESHOW_ITEM_CLASS, eo_constructor()); 401 obj = eo_do_super_ret(obj, ELM_SLIDESHOW_ITEM_CLASS, obj, eo_constructor());
400 it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS); 402 it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
403
404 return obj;
401} 405}
402 406
403EOLIAN static Elm_Object_Item* 407EOLIAN static Elm_Object_Item*
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index 2262e7770..9624380a6 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -1193,14 +1193,16 @@ elm_spinner_add(Evas_Object *parent)
1193 return obj; 1193 return obj;
1194} 1194}
1195 1195
1196EOLIAN static void 1196EOLIAN static Eo *
1197_elm_spinner_eo_base_constructor(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED) 1197_elm_spinner_eo_base_constructor(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED)
1198{ 1198{
1199 eo_do_super(obj, MY_CLASS, eo_constructor()); 1199 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
1200 eo_do(obj, 1200 eo_do(obj,
1201 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 1201 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
1202 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 1202 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
1203 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_SPIN_BUTTON)); 1203 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_SPIN_BUTTON));
1204
1205 return obj;
1204} 1206}
1205 1207
1206EOLIAN static void 1208EOLIAN static void
diff --git a/src/lib/elm_table.c b/src/lib/elm_table.c
index 33e69abe6..6a31cc801 100644
--- a/src/lib/elm_table.c
+++ b/src/lib/elm_table.c
@@ -218,13 +218,15 @@ elm_table_add(Evas_Object *parent)
218 return obj; 218 return obj;
219} 219}
220 220
221EOLIAN static void 221EOLIAN static Eo *
222_elm_table_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED) 222_elm_table_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
223{ 223{
224 eo_do_super(obj, MY_CLASS, eo_constructor()); 224 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
225 eo_do(obj, 225 eo_do(obj,
226 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 226 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
227 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILLER)); 227 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILLER));
228
229 return obj;
228} 230}
229 231
230EOLIAN static void 232EOLIAN static void
diff --git a/src/lib/elm_thumb.c b/src/lib/elm_thumb.c
index d041b7d5d..cdcfeed93 100644
--- a/src/lib/elm_thumb.c
+++ b/src/lib/elm_thumb.c
@@ -590,16 +590,18 @@ elm_thumb_add(Evas_Object *parent)
590 return obj; 590 return obj;
591} 591}
592 592
593EOLIAN static void 593EOLIAN static Eo *
594_elm_thumb_eo_base_constructor(Eo *obj, Elm_Thumb_Data *sd) 594_elm_thumb_eo_base_constructor(Eo *obj, Elm_Thumb_Data *sd)
595{ 595{
596 eo_do_super(obj, MY_CLASS, eo_constructor()); 596 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
597 eo_do(obj, 597 eo_do(obj,
598 evas_obj_type_set("Elm_Thumb"), 598 evas_obj_type_set("Elm_Thumb"),
599 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 599 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
600 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE)); 600 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE));
601 601
602 sd->obj = obj; 602 sd->obj = obj;
603
604 return obj;
603} 605}
604 606
605EOLIAN static void 607EOLIAN static void
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 0087a0a43..609878d23 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -2300,12 +2300,14 @@ _access_widget_item_register(Elm_Toolbar_Item_Data *it)
2300 _elm_access_activate_callback_set(ai, _access_activate_cb, NULL); 2300 _elm_access_activate_callback_set(ai, _access_activate_cb, NULL);
2301} 2301}
2302 2302
2303EOLIAN static void 2303EOLIAN static Eo *
2304_elm_toolbar_item_eo_base_constructor(Eo *eo_it, Elm_Toolbar_Item_Data *it) 2304_elm_toolbar_item_eo_base_constructor(Eo *eo_it, Elm_Toolbar_Item_Data *it)
2305{ 2305{
2306 eo_do_super(eo_it, ELM_TOOLBAR_ITEM_CLASS, eo_constructor()); 2306 eo_it = eo_do_super_ret(eo_it, ELM_TOOLBAR_ITEM_CLASS, eo_it, eo_constructor());
2307 it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS); 2307 it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
2308 eo_do(eo_it, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_MENU_ITEM)); 2308 eo_do(eo_it, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_MENU_ITEM));
2309
2310 return eo_it;
2309} 2311}
2310 2312
2311static Elm_Toolbar_Item_Data * 2313static Elm_Toolbar_Item_Data *
@@ -2921,14 +2923,16 @@ elm_toolbar_add(Evas_Object *parent)
2921 return obj; 2923 return obj;
2922} 2924}
2923 2925
2924EOLIAN static void 2926EOLIAN static Eo *
2925_elm_toolbar_eo_base_constructor(Eo *obj, Elm_Toolbar_Data *_pd EINA_UNUSED) 2927_elm_toolbar_eo_base_constructor(Eo *obj, Elm_Toolbar_Data *_pd EINA_UNUSED)
2926{ 2928{
2927 eo_do_super(obj, MY_CLASS, eo_constructor()); 2929 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
2928 eo_do(obj, 2930 eo_do(obj,
2929 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 2931 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
2930 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 2932 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
2931 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_TOOL_BAR)); 2933 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_TOOL_BAR));
2934
2935 return obj;
2932} 2936}
2933 2937
2934EOLIAN static void 2938EOLIAN static void
diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c
index 56f8ad075..09bb4ce8a 100644
--- a/src/lib/elm_video.c
+++ b/src/lib/elm_video.c
@@ -274,14 +274,16 @@ elm_video_add(Evas_Object *parent)
274 return obj; 274 return obj;
275} 275}
276 276
277EOLIAN static void 277EOLIAN static Eo *
278_elm_video_eo_base_constructor(Eo *obj, Elm_Video_Data *_pd EINA_UNUSED) 278_elm_video_eo_base_constructor(Eo *obj, Elm_Video_Data *_pd EINA_UNUSED)
279{ 279{
280 eo_do_super(obj, MY_CLASS, eo_constructor()); 280 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
281 eo_do(obj, 281 eo_do(obj,
282 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 282 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
283 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 283 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
284 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ANIMATION)); 284 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ANIMATION));
285
286 return obj;
285} 287}
286 288
287EOLIAN static Eina_Bool 289EOLIAN static Eina_Bool
diff --git a/src/lib/elm_web2.c b/src/lib/elm_web2.c
index 4106693ff..40a00a6ba 100644
--- a/src/lib/elm_web2.c
+++ b/src/lib/elm_web2.c
@@ -722,15 +722,17 @@ elm_web_add(Evas_Object *parent)
722 return obj; 722 return obj;
723} 723}
724 724
725EOLIAN static void 725EOLIAN static Eo *
726_elm_web_eo_base_constructor(Eo *obj, Elm_Web_Data *sd) 726_elm_web_eo_base_constructor(Eo *obj, Elm_Web_Data *sd)
727{ 727{
728 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
728 sd->obj = obj; 729 sd->obj = obj;
729 eo_do_super(obj, MY_CLASS, eo_constructor());
730 eo_do(obj, 730 eo_do(obj,
731 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 731 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
732 evas_obj_smart_callbacks_descriptions_set(_elm_web_smart_callbacks), 732 evas_obj_smart_callbacks_descriptions_set(_elm_web_smart_callbacks),
733 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_HTML_CONTAINER)); 733 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_HTML_CONTAINER));
734
735 return obj;
734} 736}
735 737
736EOLIAN static Evas_Object* 738EOLIAN static Evas_Object*
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index b9a6a0ec0..3b1cda01f 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -4241,7 +4241,7 @@ _eo_del_cb(void *data EINA_UNUSED, Eo *eo_item, const Eo_Event_Description *desc
4241 * @see elm_widget_item_del() to release memory. 4241 * @see elm_widget_item_del() to release memory.
4242 * @ingroup Widget 4242 * @ingroup Widget
4243 */ 4243 */
4244EOLIAN static void 4244EOLIAN static Eo *
4245_elm_widget_item_eo_base_constructor(Eo *eo_item, Elm_Widget_Item_Data *item) 4245_elm_widget_item_eo_base_constructor(Eo *eo_item, Elm_Widget_Item_Data *item)
4246{ 4246{
4247 Evas_Object *widget; 4247 Evas_Object *widget;
@@ -4250,16 +4250,18 @@ _elm_widget_item_eo_base_constructor(Eo *eo_item, Elm_Widget_Item_Data *item)
4250 if (!_elm_widget_is(widget)) 4250 if (!_elm_widget_is(widget))
4251 { 4251 {
4252 eo_error_set(eo_item); 4252 eo_error_set(eo_item);
4253 return; 4253 return NULL;
4254 } 4254 }
4255 4255
4256 eo_do_super(eo_item, ELM_WIDGET_ITEM_CLASS, eo_constructor()); 4256 eo_item = eo_do_super_ret(eo_item, ELM_WIDGET_ITEM_CLASS, eo_item, eo_constructor());
4257 4257
4258 EINA_MAGIC_SET(item, ELM_WIDGET_ITEM_MAGIC); 4258 EINA_MAGIC_SET(item, ELM_WIDGET_ITEM_MAGIC);
4259 4259
4260 item->widget = widget; 4260 item->widget = widget;
4261 item->eo_obj = eo_item; 4261 item->eo_obj = eo_item;
4262 eo_do(eo_item, eo_event_callback_add(EO_BASE_EVENT_DEL, _eo_del_cb, NULL)); 4262 eo_do(eo_item, eo_event_callback_add(EO_BASE_EVENT_DEL, _eo_del_cb, NULL));
4263
4264 return eo_item;
4263} 4265}
4264 4266
4265EOLIAN static void 4267EOLIAN static void
@@ -5484,13 +5486,13 @@ elm_widget_tree_dot_dump(const Evas_Object *top,
5484#endif 5486#endif
5485} 5487}
5486 5488
5487EOLIAN static void 5489EOLIAN static Eo *
5488_elm_widget_eo_base_constructor(Eo *obj, Elm_Widget_Smart_Data *sd) 5490_elm_widget_eo_base_constructor(Eo *obj, Elm_Widget_Smart_Data *sd)
5489{ 5491{
5490 Eo *parent = NULL; 5492 Eo *parent = NULL;
5491 5493
5492 sd->on_create = EINA_TRUE; 5494 sd->on_create = EINA_TRUE;
5493 eo_do_super(obj, MY_CLASS, eo_constructor()); 5495 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
5494 eo_do(obj, 5496 eo_do(obj,
5495 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 5497 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
5496 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 5498 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
@@ -5499,6 +5501,8 @@ _elm_widget_eo_base_constructor(Eo *obj, Elm_Widget_Smart_Data *sd)
5499 sd->on_create = EINA_FALSE; 5501 sd->on_create = EINA_FALSE;
5500 5502
5501 sd->role = ELM_ATSPI_ROLE_UNKNOWN; 5503 sd->role = ELM_ATSPI_ROLE_UNKNOWN;
5504
5505 return obj;
5502} 5506}
5503 5507
5504EOLIAN static void 5508EOLIAN static void
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 2c8ace3a5..1bd208d33 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -3741,12 +3741,6 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
3741 eo_event_callback_add(EO_EV_CALLBACK_DEL, _cb_deled, sd)); 3741 eo_event_callback_add(EO_EV_CALLBACK_DEL, _cb_deled, sd));
3742} 3742}
3743 3743
3744EOLIAN static void
3745_elm_win_eo_base_constructor(Eo *obj EINA_UNUSED, Elm_Win_Data *_pd EINA_UNUSED)
3746{
3747 /* Do nothing. */
3748}
3749
3750EOLIAN static Eo * 3744EOLIAN static Eo *
3751_elm_win_eo_base_finalize(Eo *obj, Elm_Win_Data *_pd) 3745_elm_win_eo_base_finalize(Eo *obj, Elm_Win_Data *_pd)
3752{ 3746{
@@ -3755,6 +3749,16 @@ _elm_win_eo_base_finalize(Eo *obj, Elm_Win_Data *_pd)
3755 return obj; 3749 return obj;
3756} 3750}
3757 3751
3752EOLIAN static Eo *
3753_elm_win_eo_base_constructor(Eo *obj, Elm_Win_Data *_pd EINA_UNUSED)
3754{
3755 /* Do nothing. */
3756 /* XXX: We are calling the constructor chain from the finalizer. It's
3757 * really bad and hacky. Needs fixing. */
3758
3759 return obj;
3760}
3761
3758EOLIAN static void 3762EOLIAN static void
3759_elm_win_fake_canvas_set(Eo *obj EINA_UNUSED, Elm_Win_Data *pd, Ecore_Evas *oee) 3763_elm_win_fake_canvas_set(Eo *obj EINA_UNUSED, Elm_Win_Data *pd, Ecore_Evas *oee)
3760{ 3764{