From efa41c7d752141a3b4f0539339f91cbd7f42cfc7 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Tue, 3 Jun 2014 11:35:28 +0100 Subject: [PATCH] Elm: Update code to use the new class names generated by eolian. --- legacy/elementary/src/bin/test_systray.c | 2 +- legacy/elementary/src/lib/elc_ctxpopup.c | 10 ++--- legacy/elementary/src/lib/elc_ctxpopup.eo | 4 +- legacy/elementary/src/lib/elc_fileselector.c | 6 +-- legacy/elementary/src/lib/elc_fileselector.eo | 4 +- .../src/lib/elc_fileselector_button.c | 6 +-- .../src/lib/elc_fileselector_button.eo | 4 +- .../src/lib/elc_fileselector_entry.c | 6 +-- .../src/lib/elc_fileselector_entry.eo | 4 +- legacy/elementary/src/lib/elc_hoversel.c | 10 ++--- legacy/elementary/src/lib/elc_hoversel.eo | 8 ++-- .../elementary/src/lib/elc_multibuttonentry.c | 6 +-- .../src/lib/elc_multibuttonentry.eo | 4 +- legacy/elementary/src/lib/elc_naviframe.c | 8 ++-- legacy/elementary/src/lib/elc_naviframe.eo | 6 +-- legacy/elementary/src/lib/elc_player.c | 6 +-- legacy/elementary/src/lib/elc_player.eo | 4 +- legacy/elementary/src/lib/elc_popup.c | 6 +-- legacy/elementary/src/lib/elc_popup.eo | 4 +- legacy/elementary/src/lib/elm_access.c | 4 +- legacy/elementary/src/lib/elm_access.eo | 2 +- legacy/elementary/src/lib/elm_actionslider.c | 4 +- legacy/elementary/src/lib/elm_actionslider.eo | 2 +- legacy/elementary/src/lib/elm_bg.c | 4 +- legacy/elementary/src/lib/elm_bg.eo | 2 +- legacy/elementary/src/lib/elm_box.c | 6 +-- legacy/elementary/src/lib/elm_box.eo | 4 +- legacy/elementary/src/lib/elm_bubble.c | 4 +- legacy/elementary/src/lib/elm_bubble.eo | 2 +- legacy/elementary/src/lib/elm_button.c | 4 +- legacy/elementary/src/lib/elm_button.eo | 2 +- legacy/elementary/src/lib/elm_calendar.c | 8 ++-- legacy/elementary/src/lib/elm_calendar.eo | 6 +-- legacy/elementary/src/lib/elm_check.c | 4 +- legacy/elementary/src/lib/elm_check.eo | 2 +- legacy/elementary/src/lib/elm_clock.c | 6 +-- legacy/elementary/src/lib/elm_clock.eo | 4 +- legacy/elementary/src/lib/elm_cnp.c | 6 +-- legacy/elementary/src/lib/elm_colorselector.c | 8 ++-- .../elementary/src/lib/elm_colorselector.eo | 4 +- legacy/elementary/src/lib/elm_conform.c | 6 +-- legacy/elementary/src/lib/elm_conformant.eo | 4 +- legacy/elementary/src/lib/elm_container.c | 2 +- legacy/elementary/src/lib/elm_datetime.c | 6 +-- legacy/elementary/src/lib/elm_datetime.eo | 4 +- legacy/elementary/src/lib/elm_dayselector.c | 6 +-- legacy/elementary/src/lib/elm_dayselector.eo | 4 +- legacy/elementary/src/lib/elm_diskselector.c | 12 +++--- legacy/elementary/src/lib/elm_diskselector.eo | 10 ++--- legacy/elementary/src/lib/elm_entry.c | 20 +++++----- legacy/elementary/src/lib/elm_entry.eo | 14 +++---- legacy/elementary/src/lib/elm_flip.c | 6 +-- legacy/elementary/src/lib/elm_flip.eo | 4 +- legacy/elementary/src/lib/elm_flipselector.c | 6 +-- legacy/elementary/src/lib/elm_flipselector.eo | 4 +- legacy/elementary/src/lib/elm_frame.c | 6 +-- legacy/elementary/src/lib/elm_frame.eo | 4 +- legacy/elementary/src/lib/elm_gengrid.c | 20 +++++----- legacy/elementary/src/lib/elm_gengrid.eo | 10 ++--- legacy/elementary/src/lib/elm_gengrid_pan.eo | 6 +-- legacy/elementary/src/lib/elm_genlist.c | 22 +++++----- legacy/elementary/src/lib/elm_genlist.eo | 10 ++--- legacy/elementary/src/lib/elm_genlist_pan.eo | 8 ++-- legacy/elementary/src/lib/elm_gesture_layer.c | 6 +-- .../elementary/src/lib/elm_gesture_layer.eo | 4 +- legacy/elementary/src/lib/elm_glview.c | 8 ++-- legacy/elementary/src/lib/elm_glview.eo | 6 +-- legacy/elementary/src/lib/elm_grid.c | 6 +-- legacy/elementary/src/lib/elm_grid.eo | 4 +- legacy/elementary/src/lib/elm_hover.c | 18 ++++----- legacy/elementary/src/lib/elm_hover.eo | 12 +++--- legacy/elementary/src/lib/elm_icon.c | 16 ++++---- legacy/elementary/src/lib/elm_icon.eo | 4 +- legacy/elementary/src/lib/elm_image.c | 22 +++++----- legacy/elementary/src/lib/elm_image.eo | 20 +++++----- legacy/elementary/src/lib/elm_index.c | 6 +-- legacy/elementary/src/lib/elm_index.eo | 4 +- .../src/lib/elm_interface_atspi_widget.c | 4 +- .../lib/elm_interface_atspi_widget_action.c | 2 +- .../src/lib/elm_interface_scrollable.c | 18 ++++----- .../src/lib/elm_interface_scrollable.eo | 6 +-- legacy/elementary/src/lib/elm_inwin.c | 6 +-- legacy/elementary/src/lib/elm_inwin.eo | 2 +- legacy/elementary/src/lib/elm_label.c | 4 +- legacy/elementary/src/lib/elm_label.eo | 2 +- legacy/elementary/src/lib/elm_layout.c | 10 ++--- legacy/elementary/src/lib/elm_layout.eo | 6 +-- legacy/elementary/src/lib/elm_list.c | 12 +++--- legacy/elementary/src/lib/elm_list.eo | 10 ++--- legacy/elementary/src/lib/elm_map.c | 20 +++++----- legacy/elementary/src/lib/elm_map.eo | 10 ++--- legacy/elementary/src/lib/elm_map_pan.eo | 6 +-- legacy/elementary/src/lib/elm_mapbuf.c | 14 +++---- legacy/elementary/src/lib/elm_mapbuf.eo | 12 +++--- legacy/elementary/src/lib/elm_menu.c | 14 +++---- legacy/elementary/src/lib/elm_menu.eo | 6 +-- legacy/elementary/src/lib/elm_notify.c | 16 ++++---- legacy/elementary/src/lib/elm_notify.eo | 12 +++--- legacy/elementary/src/lib/elm_pan.eo | 12 +++--- legacy/elementary/src/lib/elm_panel.c | 8 ++-- legacy/elementary/src/lib/elm_panel.eo | 4 +- legacy/elementary/src/lib/elm_panes.c | 4 +- legacy/elementary/src/lib/elm_panes.eo | 2 +- legacy/elementary/src/lib/elm_photo.c | 6 +-- legacy/elementary/src/lib/elm_photo.eo | 4 +- legacy/elementary/src/lib/elm_photocam.c | 20 +++++----- legacy/elementary/src/lib/elm_photocam.eo | 10 ++--- legacy/elementary/src/lib/elm_photocam_pan.eo | 6 +-- legacy/elementary/src/lib/elm_plug.c | 4 +- legacy/elementary/src/lib/elm_plug.eo | 2 +- legacy/elementary/src/lib/elm_prefs.c | 6 +-- legacy/elementary/src/lib/elm_prefs.eo | 4 +- legacy/elementary/src/lib/elm_progressbar.c | 6 +-- legacy/elementary/src/lib/elm_progressbar.eo | 4 +- legacy/elementary/src/lib/elm_radio.c | 6 +-- legacy/elementary/src/lib/elm_radio.eo | 4 +- legacy/elementary/src/lib/elm_route.c | 6 +-- legacy/elementary/src/lib/elm_route.eo | 4 +- legacy/elementary/src/lib/elm_scroller.c | 10 ++--- legacy/elementary/src/lib/elm_scroller.eo | 8 ++-- .../elementary/src/lib/elm_segment_control.c | 6 +-- .../elementary/src/lib/elm_segment_control.eo | 4 +- legacy/elementary/src/lib/elm_separator.c | 4 +- legacy/elementary/src/lib/elm_separator.eo | 2 +- legacy/elementary/src/lib/elm_slider.c | 8 ++-- legacy/elementary/src/lib/elm_slider.eo | 6 +-- legacy/elementary/src/lib/elm_slideshow.c | 6 +-- legacy/elementary/src/lib/elm_slideshow.eo | 4 +- legacy/elementary/src/lib/elm_spinner.c | 6 +-- legacy/elementary/src/lib/elm_spinner.eo | 4 +- legacy/elementary/src/lib/elm_table.c | 6 +-- legacy/elementary/src/lib/elm_table.eo | 4 +- legacy/elementary/src/lib/elm_thumb.c | 12 +++--- legacy/elementary/src/lib/elm_thumb.eo | 8 ++-- legacy/elementary/src/lib/elm_toolbar.c | 12 +++--- legacy/elementary/src/lib/elm_toolbar.eo | 10 ++--- legacy/elementary/src/lib/elm_video.c | 6 +-- legacy/elementary/src/lib/elm_video.eo | 4 +- legacy/elementary/src/lib/elm_video.h | 2 +- legacy/elementary/src/lib/elm_web.c | 6 +-- legacy/elementary/src/lib/elm_web.eo | 4 +- legacy/elementary/src/lib/elm_web2.c | 6 +-- legacy/elementary/src/lib/elm_widget.c | 40 +++++++++---------- legacy/elementary/src/lib/elm_widget.eo | 26 ++++++------ legacy/elementary/src/lib/elm_widget.h | 4 +- .../src/lib/elm_widget_actionslider.h | 4 +- legacy/elementary/src/lib/elm_widget_bg.h | 4 +- legacy/elementary/src/lib/elm_widget_box.h | 4 +- legacy/elementary/src/lib/elm_widget_bubble.h | 4 +- legacy/elementary/src/lib/elm_widget_button.h | 4 +- .../elementary/src/lib/elm_widget_calendar.h | 4 +- legacy/elementary/src/lib/elm_widget_check.h | 4 +- legacy/elementary/src/lib/elm_widget_clock.h | 4 +- .../src/lib/elm_widget_colorselector.h | 4 +- .../elementary/src/lib/elm_widget_conform.h | 4 +- .../elementary/src/lib/elm_widget_ctxpopup.h | 4 +- .../elementary/src/lib/elm_widget_datetime.h | 4 +- .../src/lib/elm_widget_dayselector.h | 4 +- .../src/lib/elm_widget_diskselector.h | 6 +-- legacy/elementary/src/lib/elm_widget_entry.h | 4 +- .../src/lib/elm_widget_fileselector.h | 4 +- .../src/lib/elm_widget_fileselector_button.h | 4 +- .../src/lib/elm_widget_fileselector_entry.h | 4 +- legacy/elementary/src/lib/elm_widget_flip.h | 4 +- .../src/lib/elm_widget_flipselector.h | 4 +- legacy/elementary/src/lib/elm_widget_frame.h | 4 +- .../elementary/src/lib/elm_widget_gengrid.h | 8 ++-- .../elementary/src/lib/elm_widget_genlist.h | 8 ++-- legacy/elementary/src/lib/elm_widget_glview.h | 4 +- legacy/elementary/src/lib/elm_widget_grid.h | 2 +- legacy/elementary/src/lib/elm_widget_hover.h | 4 +- .../elementary/src/lib/elm_widget_hoversel.h | 4 +- legacy/elementary/src/lib/elm_widget_icon.h | 4 +- legacy/elementary/src/lib/elm_widget_image.h | 4 +- legacy/elementary/src/lib/elm_widget_index.h | 4 +- legacy/elementary/src/lib/elm_widget_inwin.h | 4 +- legacy/elementary/src/lib/elm_widget_label.h | 4 +- legacy/elementary/src/lib/elm_widget_layout.h | 4 +- legacy/elementary/src/lib/elm_widget_list.h | 4 +- legacy/elementary/src/lib/elm_widget_map.h | 6 +-- legacy/elementary/src/lib/elm_widget_mapbuf.h | 4 +- legacy/elementary/src/lib/elm_widget_menu.h | 4 +- .../src/lib/elm_widget_multibuttonentry.h | 6 +-- .../elementary/src/lib/elm_widget_naviframe.h | 4 +- legacy/elementary/src/lib/elm_widget_notify.h | 4 +- legacy/elementary/src/lib/elm_widget_panel.h | 4 +- legacy/elementary/src/lib/elm_widget_panes.h | 4 +- legacy/elementary/src/lib/elm_widget_photo.h | 4 +- .../elementary/src/lib/elm_widget_photocam.h | 6 +-- legacy/elementary/src/lib/elm_widget_player.h | 4 +- legacy/elementary/src/lib/elm_widget_plug.h | 4 +- legacy/elementary/src/lib/elm_widget_popup.h | 4 +- legacy/elementary/src/lib/elm_widget_prefs.h | 4 +- .../src/lib/elm_widget_progressbar.h | 4 +- legacy/elementary/src/lib/elm_widget_radio.h | 4 +- legacy/elementary/src/lib/elm_widget_route.h | 4 +- .../elementary/src/lib/elm_widget_scroller.h | 4 +- .../src/lib/elm_widget_segment_control.h | 4 +- .../elementary/src/lib/elm_widget_separator.h | 4 +- legacy/elementary/src/lib/elm_widget_slider.h | 4 +- .../elementary/src/lib/elm_widget_slideshow.h | 4 +- .../elementary/src/lib/elm_widget_spinner.h | 4 +- legacy/elementary/src/lib/elm_widget_table.h | 2 +- legacy/elementary/src/lib/elm_widget_thumb.h | 4 +- .../elementary/src/lib/elm_widget_toolbar.h | 6 +-- legacy/elementary/src/lib/elm_widget_video.h | 4 +- legacy/elementary/src/lib/elm_widget_web.h | 4 +- legacy/elementary/src/lib/elm_win.c | 14 +++---- legacy/elementary/src/lib/elm_win.eo | 12 +++--- legacy/elementary/src/lib/els_cursor.c | 2 +- 210 files changed, 674 insertions(+), 674 deletions(-) diff --git a/legacy/elementary/src/bin/test_systray.c b/legacy/elementary/src/bin/test_systray.c index ceb58cdea2..4efe8d6858 100644 --- a/legacy/elementary/src/bin/test_systray.c +++ b/legacy/elementary/src/bin/test_systray.c @@ -82,7 +82,7 @@ test_systray(void *data EINA_UNUSED, elm_menu_item_add(it, it2, NULL, "item 2", _menu_clicked, "item 2"); // Status Notifier Item Handler - item = eo_add(ELM_OBJ_SYSTRAY_CLASS, win); + item = eo_add(ELM_SYSTRAY_CLASS, win); eo_do(item, elm_obj_systray_icon_name_set("elementary")); eo_do(item, elm_obj_systray_att_icon_name_set("elementary")); eo_do(item, elm_obj_systray_menu_set(it)); diff --git a/legacy/elementary/src/lib/elc_ctxpopup.c b/legacy/elementary/src/lib/elc_ctxpopup.c index 7bacbd7582..aadfee7c6f 100644 --- a/legacy/elementary/src/lib/elc_ctxpopup.c +++ b/legacy/elementary/src/lib/elc_ctxpopup.c @@ -7,7 +7,7 @@ #include "elm_priv.h" #include "elm_widget_ctxpopup.h" -#define MY_CLASS ELM_OBJ_CTXPOPUP_CLASS +#define MY_CLASS ELM_CTXPOPUP_CLASS #define MY_CLASS_NAME "Elm_Ctxpopup" #define MY_CLASS_NAME_LEGACY "elm_ctxpopup" @@ -216,7 +216,7 @@ _base_geometry_calc(Evas_Object *obj, evas_object_geometry_get (sd->parent, &hover_area.x, &hover_area.y, &hover_area.w, &hover_area.h); - if (sd->parent && eo_isa(sd->parent, ELM_OBJ_WIN_CLASS)) + if (sd->parent && eo_isa(sd->parent, ELM_WIN_CLASS)) hover_area.x = hover_area.y = 0; evas_object_geometry_get(obj, &pos.x, &pos.y, NULL, NULL); @@ -1073,7 +1073,7 @@ _elm_ctxpopup_elm_widget_disable(Eo *obj, Elm_Ctxpopup_Data *sd) } EOLIAN static void -_elm_ctxpopup_evas_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv) +_elm_ctxpopup_evas_object_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -1126,7 +1126,7 @@ _elm_ctxpopup_evas_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv) } EOLIAN static void -_elm_ctxpopup_evas_smart_del(Eo *obj, Elm_Ctxpopup_Data *sd) +_elm_ctxpopup_evas_object_smart_del(Eo *obj, Elm_Ctxpopup_Data *sd) { Elm_Ctxpopup_Item *it; @@ -1195,7 +1195,7 @@ _elm_ctxpopup_hover_parent_set(Eo *obj, Elm_Ctxpopup_Data *sd, Evas_Object *pare //Update Background evas_object_geometry_get(parent, &x, &y, &w, &h); - if (parent && eo_isa(parent, ELM_OBJ_WIN_CLASS)) + if (parent && eo_isa(parent, ELM_WIN_CLASS)) x = y = 0; evas_object_move(sd->bg, x, y); evas_object_resize(sd->bg, w, h); diff --git a/legacy/elementary/src/lib/elc_ctxpopup.eo b/legacy/elementary/src/lib/elc_ctxpopup.eo index 29fdffcae5..f1a8fd0300 100644 --- a/legacy/elementary/src/lib/elc_ctxpopup.eo +++ b/legacy/elementary/src/lib/elc_ctxpopup.eo @@ -167,8 +167,8 @@ class Elm_Ctxpopup (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::del; - Evas_Smart::add; + Evas_Object_Smart::del; + Evas_Object_Smart::add; Elm_Widget::parent::set; Elm_Widget::focus_direction; Elm_Widget::sub_object_add; diff --git a/legacy/elementary/src/lib/elc_fileselector.c b/legacy/elementary/src/lib/elc_fileselector.c index 584e7b9ea5..5a03505d49 100644 --- a/legacy/elementary/src/lib/elc_fileselector.c +++ b/legacy/elementary/src/lib/elc_fileselector.c @@ -14,7 +14,7 @@ #include "elm_interface_fileselector.h" #include "elm_widget_fileselector.h" -#define MY_CLASS ELM_OBJ_FILESELECTOR_CLASS +#define MY_CLASS ELM_FILESELECTOR_CLASS #define MY_CLASS_NAME "Elm_Fileselector" #define MY_CLASS_NAME_LEGACY "elm_fileselector" @@ -1336,7 +1336,7 @@ _resource_deleted(void *data, int type EINA_UNUSED, void *ev) } EOLIAN static void -_elm_fileselector_evas_smart_add(Eo *obj, Elm_Fileselector_Data *priv) +_elm_fileselector_evas_object_smart_add(Eo *obj, Elm_Fileselector_Data *priv) { Evas_Object *ic, *bt, *en, *pb; @@ -1445,7 +1445,7 @@ _elm_fileselector_evas_smart_add(Eo *obj, Elm_Fileselector_Data *priv) } EOLIAN static void -_elm_fileselector_evas_smart_del(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd) +_elm_fileselector_evas_object_smart_del(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd) { Elm_Fileselector_Filter *filter; char *path; diff --git a/legacy/elementary/src/lib/elc_fileselector.eo b/legacy/elementary/src/lib/elc_fileselector.eo index 656089ea8d..922ab5d800 100644 --- a/legacy/elementary/src/lib/elc_fileselector.eo +++ b/legacy/elementary/src/lib/elc_fileselector.eo @@ -37,8 +37,8 @@ class Elm_Fileselector (Elm_Layout, Elm_Interface_Fileselector) class::constructor; class::destructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::focus_next; Elm_Widget::focus_direction_manager_is; Elm_Widget::focus_direction; diff --git a/legacy/elementary/src/lib/elc_fileselector_button.c b/legacy/elementary/src/lib/elc_fileselector_button.c index 8d0d2f6c54..a8c999eee7 100644 --- a/legacy/elementary/src/lib/elc_fileselector_button.c +++ b/legacy/elementary/src/lib/elc_fileselector_button.c @@ -7,7 +7,7 @@ #include "elm_interface_fileselector.h" #include "elm_widget_fileselector_button.h" -#define MY_CLASS ELM_OBJ_FILESELECTOR_BUTTON_CLASS +#define MY_CLASS ELM_FILESELECTOR_BUTTON_CLASS #define MY_CLASS_NAME "Elm_Fileselector_Button" #define MY_CLASS_NAME_LEGACY "elm_fileselector_button" @@ -164,7 +164,7 @@ _button_clicked(void *data, } EOLIAN static void -_elm_fileselector_button_evas_smart_add(Eo *obj, Elm_Fileselector_Button_Data *priv) +_elm_fileselector_button_evas_object_smart_add(Eo *obj, Elm_Fileselector_Button_Data *priv) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); @@ -187,7 +187,7 @@ _elm_fileselector_button_evas_smart_add(Eo *obj, Elm_Fileselector_Button_Data *p } EOLIAN static void -_elm_fileselector_button_evas_smart_del(Eo *obj, Elm_Fileselector_Button_Data *sd) +_elm_fileselector_button_evas_object_smart_del(Eo *obj, Elm_Fileselector_Button_Data *sd) { eina_stringshare_del(sd->window_title); eina_stringshare_del(sd->fsd.path); diff --git a/legacy/elementary/src/lib/elc_fileselector_button.eo b/legacy/elementary/src/lib/elc_fileselector_button.eo index f2945758e4..5830bb0c8b 100644 --- a/legacy/elementary/src/lib/elc_fileselector_button.eo +++ b/legacy/elementary/src/lib/elc_fileselector_button.eo @@ -98,8 +98,8 @@ class Elm_Fileselector_Button (Elm_Button, Elm_Interface_Fileselector) } implements { Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::theme_apply; Elm_Button::admits_autorepeat::get; Elm_Interface_Fileselector::selected_paths::get; diff --git a/legacy/elementary/src/lib/elc_fileselector_entry.c b/legacy/elementary/src/lib/elc_fileselector_entry.c index 869bcd311e..d084cd6989 100644 --- a/legacy/elementary/src/lib/elc_fileselector_entry.c +++ b/legacy/elementary/src/lib/elc_fileselector_entry.c @@ -8,7 +8,7 @@ #include "elm_interface_fileselector.h" #include "elm_widget_fileselector_entry.h" -#define MY_CLASS ELM_OBJ_FILESELECTOR_ENTRY_CLASS +#define MY_CLASS ELM_FILESELECTOR_ENTRY_CLASS #define MY_CLASS_NAME "Elm_Fileselector_Entry" #define MY_CLASS_NAME_LEGACY "elm_fileselector_entry" @@ -269,7 +269,7 @@ _elm_fileselector_entry_elm_container_content_unset(Eo *obj, Elm_Fileselector_En } EOLIAN static void -_elm_fileselector_entry_evas_smart_add(Eo *obj, Elm_Fileselector_Entry_Data *priv) +_elm_fileselector_entry_evas_object_smart_add(Eo *obj, Elm_Fileselector_Entry_Data *priv) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); @@ -326,7 +326,7 @@ _elm_fileselector_entry_evas_smart_add(Eo *obj, Elm_Fileselector_Entry_Data *pri } EOLIAN static void -_elm_fileselector_entry_evas_smart_del(Eo *obj, Elm_Fileselector_Entry_Data *sd) +_elm_fileselector_entry_evas_object_smart_del(Eo *obj, Elm_Fileselector_Entry_Data *sd) { free(sd->path); diff --git a/legacy/elementary/src/lib/elc_fileselector_entry.eo b/legacy/elementary/src/lib/elc_fileselector_entry.eo index 2297454c2f..211d13ce45 100644 --- a/legacy/elementary/src/lib/elc_fileselector_entry.eo +++ b/legacy/elementary/src/lib/elc_fileselector_entry.eo @@ -99,8 +99,8 @@ class Elm_Fileselector_Entry (Elm_Layout, Elm_Interface_Fileselector) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::del; - Evas_Smart::add; + Evas_Object_Smart::del; + Evas_Object_Smart::add; Elm_Widget::theme_apply; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_next; diff --git a/legacy/elementary/src/lib/elc_hoversel.c b/legacy/elementary/src/lib/elc_hoversel.c index 7cb91f8577..db73d3b4a0 100644 --- a/legacy/elementary/src/lib/elc_hoversel.c +++ b/legacy/elementary/src/lib/elc_hoversel.c @@ -6,7 +6,7 @@ #include "elm_priv.h" #include "elm_widget_hoversel.h" -#define MY_CLASS ELM_OBJ_HOVERSEL_CLASS +#define MY_CLASS ELM_HOVERSEL_CLASS #define MY_CLASS_NAME "Elm_Hoversel" #define MY_CLASS_NAME_LEGACY "elm_hoversel" @@ -277,7 +277,7 @@ _item_del_pre_hook(Elm_Object_Item *it) } EOLIAN static void -_elm_hoversel_evas_smart_add(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED) +_elm_hoversel_evas_object_smart_add(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); @@ -291,7 +291,7 @@ _elm_hoversel_evas_smart_add(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED) } EOLIAN static void -_elm_hoversel_evas_smart_del(Eo *obj, Elm_Hoversel_Data *sd) +_elm_hoversel_evas_object_smart_del(Eo *obj, Elm_Hoversel_Data *sd) { Elm_Hoversel_Item *item; @@ -308,14 +308,14 @@ _elm_hoversel_evas_smart_del(Eo *obj, Elm_Hoversel_Data *sd) } EOLIAN static void -_elm_hoversel_evas_smart_show(Eo *obj, Elm_Hoversel_Data *sd) +_elm_hoversel_evas_object_smart_show(Eo *obj, Elm_Hoversel_Data *sd) { eo_do_super(obj, MY_CLASS, evas_obj_smart_show()); evas_object_show(sd->hover); } EOLIAN static void -_elm_hoversel_evas_smart_hide(Eo *obj, Elm_Hoversel_Data *sd) +_elm_hoversel_evas_object_smart_hide(Eo *obj, Elm_Hoversel_Data *sd) { eo_do_super(obj, MY_CLASS, evas_obj_smart_hide()); evas_object_hide(sd->hover); diff --git a/legacy/elementary/src/lib/elc_hoversel.eo b/legacy/elementary/src/lib/elc_hoversel.eo index 51b60bde9c..1eef4aa632 100644 --- a/legacy/elementary/src/lib/elc_hoversel.eo +++ b/legacy/elementary/src/lib/elc_hoversel.eo @@ -140,10 +140,10 @@ class Elm_Hoversel (Elm_Button, Evas_Selectable_Interface) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::hide; - Evas_Smart::show; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::hide; + Evas_Object_Smart::show; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::parent::set; Elm_Widget::theme_apply; Elm_Widget::translate; diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.c b/legacy/elementary/src/lib/elc_multibuttonentry.c index 15b08bf146..8a139e5009 100644 --- a/legacy/elementary/src/lib/elc_multibuttonentry.c +++ b/legacy/elementary/src/lib/elc_multibuttonentry.c @@ -6,7 +6,7 @@ #include "elm_priv.h" #include "elm_widget_multibuttonentry.h" -#define MY_CLASS ELM_OBJ_MULTIBUTTONENTRY_CLASS +#define MY_CLASS ELM_MULTIBUTTONENTRY_CLASS #define MY_CLASS_NAME "Elm_Multibuttonentry" #define MY_CLASS_NAME_LEGACY "elm_multibuttonentry" @@ -1461,7 +1461,7 @@ _access_info_cb(void *data EINA_UNUSED, Evas_Object *obj) } EOLIAN static void -_elm_multibuttonentry_evas_smart_add(Eo *obj, Elm_Multibuttonentry_Data *priv) +_elm_multibuttonentry_evas_object_smart_add(Eo *obj, Elm_Multibuttonentry_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -1491,7 +1491,7 @@ _elm_multibuttonentry_evas_smart_add(Eo *obj, Elm_Multibuttonentry_Data *priv) } EOLIAN static void -_elm_multibuttonentry_evas_smart_del(Eo *obj, Elm_Multibuttonentry_Data *sd) +_elm_multibuttonentry_evas_object_smart_del(Eo *obj, Elm_Multibuttonentry_Data *sd) { Elm_Multibuttonentry_Item *item; diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.eo b/legacy/elementary/src/lib/elc_multibuttonentry.eo index ee09831758..fb7c02bdd5 100644 --- a/legacy/elementary/src/lib/elc_multibuttonentry.eo +++ b/legacy/elementary/src/lib/elc_multibuttonentry.eo @@ -255,8 +255,8 @@ class Elm_Multibuttonentry (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::theme_apply; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_direction_manager_is; diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/legacy/elementary/src/lib/elc_naviframe.c index 93971450b9..14d58a2b6e 100644 --- a/legacy/elementary/src/lib/elc_naviframe.c +++ b/legacy/elementary/src/lib/elc_naviframe.c @@ -7,7 +7,7 @@ #include "elm_widget_naviframe.h" #include "elm_widget_container.h" -#define MY_CLASS ELM_OBJ_NAVIFRAME_CLASS +#define MY_CLASS ELM_NAVIFRAME_CLASS #define MY_CLASS_NAME "Elm_Naviframe" #define MY_CLASS_NAME_LEGACY "elm_naviframe" @@ -1304,7 +1304,7 @@ _elm_naviframe_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elm_Naviframe_Dat } EOLIAN static void -_elm_naviframe_evas_smart_add(Eo *obj, Elm_Naviframe_Data *priv) +_elm_naviframe_evas_object_smart_add(Eo *obj, Elm_Naviframe_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -1344,7 +1344,7 @@ _pop_transition_cb(void *data) } EOLIAN static void -_elm_naviframe_evas_smart_del(Eo *obj, Elm_Naviframe_Data *sd) +_elm_naviframe_evas_object_smart_del(Eo *obj, Elm_Naviframe_Data *sd) { Elm_Naviframe_Item *it; @@ -1370,7 +1370,7 @@ _elm_naviframe_evas_smart_del(Eo *obj, Elm_Naviframe_Data *sd) //Show only the top item view EOLIAN static void -_elm_naviframe_evas_smart_show(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED) +_elm_naviframe_evas_object_smart_show(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED) { Elm_Naviframe_Item *top; diff --git a/legacy/elementary/src/lib/elc_naviframe.eo b/legacy/elementary/src/lib/elc_naviframe.eo index ce7f4084ba..464251961d 100644 --- a/legacy/elementary/src/lib/elc_naviframe.eo +++ b/legacy/elementary/src/lib/elc_naviframe.eo @@ -256,9 +256,9 @@ class Elm_Naviframe (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::del; - Evas_Smart::show; - Evas_Smart::add; + Evas_Object_Smart::del; + Evas_Object_Smart::show; + Evas_Object_Smart::add; Elm_Widget::focus_direction; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_direction_manager_is; diff --git a/legacy/elementary/src/lib/elc_player.c b/legacy/elementary/src/lib/elc_player.c index cce4599756..13d0c86bc5 100644 --- a/legacy/elementary/src/lib/elc_player.c +++ b/legacy/elementary/src/lib/elc_player.c @@ -9,7 +9,7 @@ #include "elm_widget_layout.h" #include "elm_widget_player.h" -#define MY_CLASS ELM_OBJ_PLAYER_CLASS +#define MY_CLASS ELM_PLAYER_CLASS #define MY_CLASS_NAME "Elm_Player" #define MY_CLASS_NAME_LEGACY "elm_player" @@ -620,7 +620,7 @@ end: } EOLIAN static void -_elm_player_evas_smart_add(Eo *obj, Elm_Player_Data *priv) +_elm_player_evas_object_smart_add(Eo *obj, Elm_Player_Data *priv) { char buf[256]; @@ -688,7 +688,7 @@ _elm_player_evas_smart_add(Eo *obj, Elm_Player_Data *priv) } EOLIAN static void -_elm_player_evas_smart_del(Eo *obj, Elm_Player_Data *sd EINA_UNUSED) +_elm_player_evas_object_smart_del(Eo *obj, Elm_Player_Data *sd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); } diff --git a/legacy/elementary/src/lib/elc_player.eo b/legacy/elementary/src/lib/elc_player.eo index f8579360e9..e1468f5988 100644 --- a/legacy/elementary/src/lib/elc_player.eo +++ b/legacy/elementary/src/lib/elc_player.eo @@ -4,8 +4,8 @@ class Elm_Player (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::theme_apply; Elm_Widget::event; Elm_Container::content_set; diff --git a/legacy/elementary/src/lib/elc_popup.c b/legacy/elementary/src/lib/elc_popup.c index 1129e8a84a..2012f50eee 100644 --- a/legacy/elementary/src/lib/elc_popup.c +++ b/legacy/elementary/src/lib/elc_popup.c @@ -6,7 +6,7 @@ #include "elm_priv.h" #include "elm_widget_popup.h" -#define MY_CLASS ELM_OBJ_POPUP_CLASS +#define MY_CLASS ELM_POPUP_CLASS #define MY_CLASS_NAME "Elm_Popup" #define MY_CLASS_NAME_LEGACY "elm_popup" @@ -215,7 +215,7 @@ _items_remove(Elm_Popup_Data *sd) } EOLIAN static void -_elm_popup_evas_smart_del(Eo *obj, Elm_Popup_Data *sd) +_elm_popup_evas_object_smart_del(Eo *obj, Elm_Popup_Data *sd) { unsigned int i; @@ -1478,7 +1478,7 @@ _elm_popup_elm_widget_event(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, Evas_Objec } EOLIAN static void -_elm_popup_evas_smart_add(Eo *obj, Elm_Popup_Data *priv) +_elm_popup_evas_object_smart_add(Eo *obj, Elm_Popup_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); char style[1024]; diff --git a/legacy/elementary/src/lib/elc_popup.eo b/legacy/elementary/src/lib/elc_popup.eo index 1c7f116bfc..94c1397d8a 100644 --- a/legacy/elementary/src/lib/elc_popup.eo +++ b/legacy/elementary/src/lib/elc_popup.eo @@ -159,8 +159,8 @@ class Elm_Popup (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::del; - Evas_Smart::add; + Evas_Object_Smart::del; + Evas_Object_Smart::add; Elm_Widget::focus_direction; Elm_Widget::focus_next_manager_is; Elm_Widget::theme_apply; diff --git a/legacy/elementary/src/lib/elm_access.c b/legacy/elementary/src/lib/elm_access.c index fdb748a670..f5875917e8 100644 --- a/legacy/elementary/src/lib/elm_access.c +++ b/legacy/elementary/src/lib/elm_access.c @@ -5,7 +5,7 @@ #include #include "elm_priv.h" -#define MY_CLASS ELM_OBJ_ACCESS_CLASS +#define MY_CLASS ELM_ACCESS_CLASS #define MY_CLASS_NAME "Elm_Access" #define MY_CLASS_NAME_LEGACY "elm_access" @@ -35,7 +35,7 @@ static Evas_Object * _elm_access_add(Evas_Object *parent); static void _access_object_unregister(Evas_Object *obj); EOLIAN static void -_elm_access_evas_smart_add(Eo *obj, void *_pd EINA_UNUSED) +_elm_access_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); diff --git a/legacy/elementary/src/lib/elm_access.eo b/legacy/elementary/src/lib/elm_access.eo index 0a9ab8100b..6bc29c5dee 100644 --- a/legacy/elementary/src/lib/elm_access.eo +++ b/legacy/elementary/src/lib/elm_access.eo @@ -5,7 +5,7 @@ eo_prefix: elm_obj_access; implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; + Evas_Object_Smart::add; Elm_Widget::activate; Elm_Widget::on_focus; } diff --git a/legacy/elementary/src/lib/elm_actionslider.c b/legacy/elementary/src/lib/elm_actionslider.c index 30a353e6ba..d922cf4a29 100644 --- a/legacy/elementary/src/lib/elm_actionslider.c +++ b/legacy/elementary/src/lib/elm_actionslider.c @@ -8,7 +8,7 @@ #include "elm_widget_actionslider.h" #include "elm_widget_layout.h" -#define MY_CLASS ELM_OBJ_ACTIONSLIDER_CLASS +#define MY_CLASS ELM_ACTIONSLIDER_CLASS #define MY_CLASS_NAME "Elm_Actionslider" #define MY_CLASS_NAME_LEGACY "elm_actionslider" @@ -453,7 +453,7 @@ _elm_actionslider_elm_layout_text_get(Eo *obj, Elm_Actionslider_Data *_pd EINA_U } EOLIAN static void -_elm_actionslider_evas_smart_add(Eo *obj, Elm_Actionslider_Data *priv) +_elm_actionslider_evas_object_smart_add(Eo *obj, Elm_Actionslider_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); diff --git a/legacy/elementary/src/lib/elm_actionslider.eo b/legacy/elementary/src/lib/elm_actionslider.eo index 9c66a0dc94..74981b1e8c 100644 --- a/legacy/elementary/src/lib/elm_actionslider.eo +++ b/legacy/elementary/src/lib/elm_actionslider.eo @@ -78,7 +78,7 @@ class Elm_Actionslider (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; + Evas_Object_Smart::add; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_direction_manager_is; Elm_Widget::theme_apply; diff --git a/legacy/elementary/src/lib/elm_bg.c b/legacy/elementary/src/lib/elm_bg.c index 3a24d9db28..cc184a77fe 100644 --- a/legacy/elementary/src/lib/elm_bg.c +++ b/legacy/elementary/src/lib/elm_bg.c @@ -7,7 +7,7 @@ #include "elm_widget_bg.h" #include "elm_widget_layout.h" -#define MY_CLASS ELM_OBJ_BG_CLASS +#define MY_CLASS ELM_BG_CLASS #define MY_CLASS_NAME "Elm_Bg" #define MY_CLASS_NAME_LEGACY "elm_bg" @@ -99,7 +99,7 @@ _on_resize(void *data, } EOLIAN static void -_elm_bg_evas_smart_add(Eo *obj, Elm_Bg_Data *priv) +_elm_bg_evas_object_smart_add(Eo *obj, Elm_Bg_Data *priv) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); diff --git a/legacy/elementary/src/lib/elm_bg.eo b/legacy/elementary/src/lib/elm_bg.eo index 67beaa5f44..0eaa9218ce 100644 --- a/legacy/elementary/src/lib/elm_bg.eo +++ b/legacy/elementary/src/lib/elm_bg.eo @@ -141,7 +141,7 @@ class Elm_Bg (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; + Evas_Object_Smart::add; Elm_Layout::content_aliases::get; Elm_Layout::sizing_eval; } diff --git a/legacy/elementary/src/lib/elm_box.c b/legacy/elementary/src/lib/elm_box.c index af614c3f03..1f29f161d8 100644 --- a/legacy/elementary/src/lib/elm_box.c +++ b/legacy/elementary/src/lib/elm_box.c @@ -7,7 +7,7 @@ #include "els_box.h" #include "elm_widget_box.h" -#define MY_CLASS ELM_OBJ_BOX_CLASS +#define MY_CLASS ELM_BOX_CLASS #define MY_CLASS_NAME "Elm_Box" #define MY_CLASS_NAME_LEGACY "elm_box" @@ -368,7 +368,7 @@ _transition_layout_animation_exec(Evas_Object *obj, } EOLIAN static void -_elm_box_evas_smart_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED) +_elm_box_evas_object_smart_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); elm_widget_resize_object_set(obj, @@ -395,7 +395,7 @@ _elm_box_evas_smart_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED) } EOLIAN static void -_elm_box_evas_smart_del(Eo *obj, Elm_Box_Data *sd) +_elm_box_evas_object_smart_del(Eo *obj, Elm_Box_Data *sd) { Eina_List *l; Evas_Object *child; diff --git a/legacy/elementary/src/lib/elm_box.eo b/legacy/elementary/src/lib/elm_box.eo index b56d768733..c8c7fcf821 100644 --- a/legacy/elementary/src/lib/elm_box.eo +++ b/legacy/elementary/src/lib/elm_box.eo @@ -308,8 +308,8 @@ class Elm_Box (Elm_Widget) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::focus_direction; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_direction_manager_is; diff --git a/legacy/elementary/src/lib/elm_bubble.c b/legacy/elementary/src/lib/elm_bubble.c index 8b5808ea97..69b917c1a1 100644 --- a/legacy/elementary/src/lib/elm_bubble.c +++ b/legacy/elementary/src/lib/elm_bubble.c @@ -7,7 +7,7 @@ #include "elm_widget_bubble.h" #include "elm_widget_layout.h" -#define MY_CLASS ELM_OBJ_BUBBLE_CLASS +#define MY_CLASS ELM_BUBBLE_CLASS #define MY_CLASS_NAME "Elm_Bubble" #define MY_CLASS_NAME_LEGACY "elm_bubble" @@ -171,7 +171,7 @@ _access_info_cb(void *data EINA_UNUSED, Evas_Object *obj) } EOLIAN static void -_elm_bubble_evas_smart_add(Eo *obj, Elm_Bubble_Data *priv) +_elm_bubble_evas_object_smart_add(Eo *obj, Elm_Bubble_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); diff --git a/legacy/elementary/src/lib/elm_bubble.eo b/legacy/elementary/src/lib/elm_bubble.eo index e0bedd9650..494c385df2 100644 --- a/legacy/elementary/src/lib/elm_bubble.eo +++ b/legacy/elementary/src/lib/elm_bubble.eo @@ -32,7 +32,7 @@ class Elm_Bubble (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; + Evas_Object_Smart::add; Elm_Widget::focus_direction; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_next; diff --git a/legacy/elementary/src/lib/elm_button.c b/legacy/elementary/src/lib/elm_button.c index 5bb8a87a6e..34c0084fbb 100644 --- a/legacy/elementary/src/lib/elm_button.c +++ b/legacy/elementary/src/lib/elm_button.c @@ -7,7 +7,7 @@ #include "elm_widget_button.h" #include "elm_widget_layout.h" -#define MY_CLASS ELM_OBJ_BUTTON_CLASS +#define MY_CLASS ELM_BUTTON_CLASS // ATSPI Accessibility #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED @@ -275,7 +275,7 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj) } EOLIAN static void -_elm_button_evas_smart_add(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) +_elm_button_evas_object_smart_add(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); diff --git a/legacy/elementary/src/lib/elm_button.eo b/legacy/elementary/src/lib/elm_button.eo index 61106e827d..2c76dbe6c0 100644 --- a/legacy/elementary/src/lib/elm_button.eo +++ b/legacy/elementary/src/lib/elm_button.eo @@ -99,7 +99,7 @@ class Elm_Button (Elm_Layout, Evas_Clickable_Interface, implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; + Evas_Object_Smart::add; Elm_Widget::activate; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_direction_manager_is; diff --git a/legacy/elementary/src/lib/elm_calendar.c b/legacy/elementary/src/lib/elm_calendar.c index 50fade466c..680c9e7dfb 100644 --- a/legacy/elementary/src/lib/elm_calendar.c +++ b/legacy/elementary/src/lib/elm_calendar.c @@ -6,7 +6,7 @@ #include "elm_priv.h" #include "elm_widget_calendar.h" -#define MY_CLASS ELM_OBJ_CALENDAR_CLASS +#define MY_CLASS ELM_CALENDAR_CLASS #define MY_CLASS_NAME "Elm_Calendar" #define MY_CLASS_NAME_LEGACY "elm_calendar" @@ -924,7 +924,7 @@ _elm_calendar_elm_widget_event(Eo *obj, Elm_Calendar_Data *sd EINA_UNUSED, Evas_ } EOLIAN static void -_elm_calendar_evas_smart_calculate(Eo *obj, Elm_Calendar_Data *_pd EINA_UNUSED) +_elm_calendar_evas_object_smart_calculate(Eo *obj, Elm_Calendar_Data *_pd EINA_UNUSED) { elm_layout_freeze(obj); @@ -951,7 +951,7 @@ _style_changed(void *data, } EOLIAN static void -_elm_calendar_evas_smart_add(Eo *obj, Elm_Calendar_Data *priv) +_elm_calendar_evas_object_smart_add(Eo *obj, Elm_Calendar_Data *priv) { time_t weekday = 259200; /* Just the first sunday since epoch */ time_t current_time; @@ -1037,7 +1037,7 @@ _elm_calendar_evas_smart_add(Eo *obj, Elm_Calendar_Data *priv) } EOLIAN static void -_elm_calendar_evas_smart_del(Eo *obj, Elm_Calendar_Data *sd) +_elm_calendar_evas_object_smart_del(Eo *obj, Elm_Calendar_Data *sd) { int i; Elm_Calendar_Mark *mark; diff --git a/legacy/elementary/src/lib/elm_calendar.eo b/legacy/elementary/src/lib/elm_calendar.eo index e8e56e632d..98d5a3a3c8 100644 --- a/legacy/elementary/src/lib/elm_calendar.eo +++ b/legacy/elementary/src/lib/elm_calendar.eo @@ -396,9 +396,9 @@ class Elm_Calendar (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::calculate; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::calculate; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::theme_apply; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_direction_manager_is; diff --git a/legacy/elementary/src/lib/elm_check.c b/legacy/elementary/src/lib/elm_check.c index b79af428b4..e6fe526ea7 100644 --- a/legacy/elementary/src/lib/elm_check.c +++ b/legacy/elementary/src/lib/elm_check.c @@ -7,7 +7,7 @@ #include "elm_widget_check.h" #include "elm_widget_layout.h" -#define MY_CLASS ELM_OBJ_CHECK_CLASS +#define MY_CLASS ELM_CHECK_CLASS #define MY_CLASS_NAME "Elm_Check" #define MY_CLASS_NAME_LEGACY "elm_check" @@ -282,7 +282,7 @@ _on_check_toggle(void *data, } EOLIAN static void -_elm_check_evas_smart_add(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED) +_elm_check_evas_object_smart_add(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); diff --git a/legacy/elementary/src/lib/elm_check.eo b/legacy/elementary/src/lib/elm_check.eo index 0105bf9432..f066d0b138 100644 --- a/legacy/elementary/src/lib/elm_check.eo +++ b/legacy/elementary/src/lib/elm_check.eo @@ -47,7 +47,7 @@ class Elm_Check (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; + Evas_Object_Smart::add; Elm_Widget::activate; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_direction_manager_is; diff --git a/legacy/elementary/src/lib/elm_clock.c b/legacy/elementary/src/lib/elm_clock.c index ce100a21d4..62f3073176 100644 --- a/legacy/elementary/src/lib/elm_clock.c +++ b/legacy/elementary/src/lib/elm_clock.c @@ -6,7 +6,7 @@ #include "elm_priv.h" #include "elm_widget_clock.h" -#define MY_CLASS ELM_OBJ_CLOCK_CLASS +#define MY_CLASS ELM_CLOCK_CLASS #define MY_CLASS_NAME "Elm_Clock" #define MY_CLASS_NAME_LEGACY "elm_clock" @@ -650,7 +650,7 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj) } EOLIAN static void -_elm_clock_evas_smart_add(Eo *obj, Elm_Clock_Data *priv) +_elm_clock_evas_object_smart_add(Eo *obj, Elm_Clock_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -688,7 +688,7 @@ _elm_clock_evas_smart_add(Eo *obj, Elm_Clock_Data *priv) } EOLIAN static void -_elm_clock_evas_smart_del(Eo *obj, Elm_Clock_Data *sd) +_elm_clock_evas_object_smart_del(Eo *obj, Elm_Clock_Data *sd) { ecore_timer_del(sd->ticker); diff --git a/legacy/elementary/src/lib/elm_clock.eo b/legacy/elementary/src/lib/elm_clock.eo index e6d0334320..4e93484075 100644 --- a/legacy/elementary/src/lib/elm_clock.eo +++ b/legacy/elementary/src/lib/elm_clock.eo @@ -243,8 +243,8 @@ class Elm_Clock (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_direction_manager_is; Elm_Widget::access; diff --git a/legacy/elementary/src/lib/elm_cnp.c b/legacy/elementary/src/lib/elm_cnp.c index 7c02611a62..c82cb1fd3b 100644 --- a/legacy/elementary/src/lib/elm_cnp.c +++ b/legacy/elementary/src/lib/elm_cnp.c @@ -1837,7 +1837,7 @@ _x11_elm_widget_xwin_get(const Evas_Object *obj) par = elm_widget_parent_widget_get(obj); if (par) top = elm_widget_top_get(par); } - if (top && (eo_isa(top, ELM_OBJ_WIN_CLASS))) + if (top && (eo_isa(top, ELM_WIN_CLASS))) xwin = elm_win_xwindow_get(top); } if (!xwin) @@ -2245,7 +2245,7 @@ _x11_elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data, if (elm_widget_is(obj)) { Evas_Object *win = elm_widget_top_get(obj); - if (win && eo_isa(win, ELM_OBJ_WIN_CLASS)) + if (win && eo_isa(win, ELM_WIN_CLASS)) elm_win_rotation_set(dragwin, elm_win_rotation_get(win)); } @@ -3460,7 +3460,7 @@ _wl_elm_widget_window_get(Evas_Object *obj) { top = elm_widget_top_get(obj); if (!top) top = elm_widget_top_get(elm_widget_parent_widget_get(obj)); - if (top && (eo_isa(top, ELM_OBJ_WIN_CLASS))) + if (top && (eo_isa(top, ELM_WIN_CLASS))) win = elm_win_wl_window_get(top); } if (!win) diff --git a/legacy/elementary/src/lib/elm_colorselector.c b/legacy/elementary/src/lib/elm_colorselector.c index ed4e675200..8323d6fc88 100644 --- a/legacy/elementary/src/lib/elm_colorselector.c +++ b/legacy/elementary/src/lib/elm_colorselector.c @@ -6,7 +6,7 @@ #include "elm_priv.h" #include "elm_widget_colorselector.h" -#define MY_CLASS ELM_OBJ_COLORSELECTOR_CLASS +#define MY_CLASS ELM_COLORSELECTOR_CLASS #define MY_CLASS_NAME "Elm_Colorselector" #define MY_CLASS_NAME_LEGACY "elm_colorselector" @@ -1144,7 +1144,7 @@ _sub_obj_size_hints_set(Evas_Object *sobj, Evas_Coord minw = -1, minh = -1; elm_coords_finger_size_adjust(timesw, &minw, timesh, &minh); - if (sobj && eo_isa(sobj, EDJE_OBJ_CLASS)) + if (sobj && eo_isa(sobj, EDJE_CLASS)) edje_object_size_min_restricted_calc(sobj, &minw, &minh, minw, minh); evas_object_size_hint_min_set(sobj, minw, minh); evas_object_size_hint_max_set(sobj, -1, -1); @@ -1488,7 +1488,7 @@ _palette_colors_load(Evas_Object *obj) } EOLIAN static void -_elm_colorselector_evas_smart_add(Eo *obj, Elm_Colorselector_Data *priv) +_elm_colorselector_evas_object_smart_add(Eo *obj, Elm_Colorselector_Data *priv) { const char *hpadstr, *vpadstr; unsigned int h_pad = DEFAULT_HOR_PAD; @@ -1579,7 +1579,7 @@ _elm_colorselector_evas_smart_add(Eo *obj, Elm_Colorselector_Data *priv) } EOLIAN static void -_elm_colorselector_evas_smart_del(Eo *obj, Elm_Colorselector_Data *sd) +_elm_colorselector_evas_object_smart_del(Eo *obj, Elm_Colorselector_Data *sd) { int i = 0; void *tmp[4]; diff --git a/legacy/elementary/src/lib/elm_colorselector.eo b/legacy/elementary/src/lib/elm_colorselector.eo index bbe97c5008..d38138ab1b 100644 --- a/legacy/elementary/src/lib/elm_colorselector.eo +++ b/legacy/elementary/src/lib/elm_colorselector.eo @@ -126,8 +126,8 @@ class Elm_Colorselector (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::theme_apply; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_next; diff --git a/legacy/elementary/src/lib/elm_conform.c b/legacy/elementary/src/lib/elm_conform.c index f207ba5f25..3f97252229 100644 --- a/legacy/elementary/src/lib/elm_conform.c +++ b/legacy/elementary/src/lib/elm_conform.c @@ -7,7 +7,7 @@ #include "elm_widget_conform.h" #include "elm_widget_layout.h" -#define MY_CLASS ELM_OBJ_CONFORMANT_CLASS +#define MY_CLASS ELM_CONFORMANT_CLASS #define MY_CLASS_NAME "Elm_Conformant" #define MY_CLASS_NAME_LEGACY "elm_conformant" @@ -889,7 +889,7 @@ _on_prop_change(void *data, #endif EOLIAN static void -_elm_conformant_evas_smart_add(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED) +_elm_conformant_evas_object_smart_add(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); @@ -910,7 +910,7 @@ _elm_conformant_evas_smart_add(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED) } EOLIAN static void -_elm_conformant_evas_smart_del(Eo *obj, Elm_Conformant_Data *sd) +_elm_conformant_evas_object_smart_del(Eo *obj, Elm_Conformant_Data *sd) { Evas_Object *top; diff --git a/legacy/elementary/src/lib/elm_conformant.eo b/legacy/elementary/src/lib/elm_conformant.eo index e3a9e2b13e..930cb03bc9 100644 --- a/legacy/elementary/src/lib/elm_conformant.eo +++ b/legacy/elementary/src/lib/elm_conformant.eo @@ -4,8 +4,8 @@ class Elm_Conformant (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::parent::set; Elm_Widget::theme_apply; Elm_Layout::content_aliases::get; diff --git a/legacy/elementary/src/lib/elm_container.c b/legacy/elementary/src/lib/elm_container.c index 04f3bbc9f4..ef51efa296 100644 --- a/legacy/elementary/src/lib/elm_container.c +++ b/legacy/elementary/src/lib/elm_container.c @@ -6,7 +6,7 @@ #include "elm_priv.h" #include "elm_widget_container.h" -#define MY_CLASS ELM_OBJ_CONTAINER_CLASS +#define MY_CLASS ELM_CONTAINER_CLASS #define MY_CLASS_NAME "Elm_Container" diff --git a/legacy/elementary/src/lib/elm_datetime.c b/legacy/elementary/src/lib/elm_datetime.c index dcaf60df30..7d74121435 100644 --- a/legacy/elementary/src/lib/elm_datetime.c +++ b/legacy/elementary/src/lib/elm_datetime.c @@ -6,7 +6,7 @@ #include "elm_priv.h" #include "elm_widget_datetime.h" -#define MY_CLASS ELM_OBJ_DATETIME_CLASS +#define MY_CLASS ELM_DATETIME_CLASS #define MY_CLASS_NAME "Elm_Datetime" #define MY_CLASS_NAME_LEGACY "elm_datetime" @@ -774,7 +774,7 @@ _access_info_cb(void *data, Evas_Object *obj EINA_UNUSED) } EOLIAN static void -_elm_datetime_evas_smart_add(Eo *obj, Elm_Datetime_Data *priv) +_elm_datetime_evas_object_smart_add(Eo *obj, Elm_Datetime_Data *priv) { Datetime_Field *field; int idx; @@ -840,7 +840,7 @@ _elm_datetime_evas_smart_add(Eo *obj, Elm_Datetime_Data *priv) } EOLIAN static void -_elm_datetime_evas_smart_del(Eo *obj, Elm_Datetime_Data *sd) +_elm_datetime_evas_object_smart_del(Eo *obj, Elm_Datetime_Data *sd) { Datetime_Field *tmp; unsigned int idx; diff --git a/legacy/elementary/src/lib/elm_datetime.eo b/legacy/elementary/src/lib/elm_datetime.eo index 8edb4e4174..393111e20b 100644 --- a/legacy/elementary/src/lib/elm_datetime.eo +++ b/legacy/elementary/src/lib/elm_datetime.eo @@ -321,8 +321,8 @@ class Elm_Datetime (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::theme_apply; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_next; diff --git a/legacy/elementary/src/lib/elm_dayselector.c b/legacy/elementary/src/lib/elm_dayselector.c index 9c9192b8c6..7698a64785 100644 --- a/legacy/elementary/src/lib/elm_dayselector.c +++ b/legacy/elementary/src/lib/elm_dayselector.c @@ -7,7 +7,7 @@ #include "elm_widget_dayselector.h" #include "elm_widget_container.h" -#define MY_CLASS ELM_OBJ_DAYSELECTOR_CLASS +#define MY_CLASS ELM_DAYSELECTOR_CLASS #define MY_CLASS_NAME "Elm_Dayselector" #define MY_CLASS_NAME_LEGACY "elm_dayselector" @@ -399,7 +399,7 @@ _items_create(Evas_Object *obj) } EOLIAN static void -_elm_dayselector_evas_smart_add(Eo *obj, Elm_Dayselector_Data *priv) +_elm_dayselector_evas_object_smart_add(Eo *obj, Elm_Dayselector_Data *priv) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); @@ -420,7 +420,7 @@ _elm_dayselector_evas_smart_add(Eo *obj, Elm_Dayselector_Data *priv) } EOLIAN static void -_elm_dayselector_evas_smart_del(Eo *obj, Elm_Dayselector_Data *sd) +_elm_dayselector_evas_object_smart_del(Eo *obj, Elm_Dayselector_Data *sd) { Elm_Dayselector_Item *it; diff --git a/legacy/elementary/src/lib/elm_dayselector.eo b/legacy/elementary/src/lib/elm_dayselector.eo index 2400c3b3c9..2c03764035 100644 --- a/legacy/elementary/src/lib/elm_dayselector.eo +++ b/legacy/elementary/src/lib/elm_dayselector.eo @@ -164,8 +164,8 @@ class Elm_Dayselector (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::theme_apply; Elm_Widget::focus_direction_manager_is; Elm_Widget::translate; diff --git a/legacy/elementary/src/lib/elm_diskselector.c b/legacy/elementary/src/lib/elm_diskselector.c index b91fa82643..cd26ac4358 100644 --- a/legacy/elementary/src/lib/elm_diskselector.c +++ b/legacy/elementary/src/lib/elm_diskselector.c @@ -9,7 +9,7 @@ #define DISPLAY_ITEM_NUM_MIN 3 -#define MY_CLASS ELM_OBJ_DISKSELECTOR_CLASS +#define MY_CLASS ELM_DISKSELECTOR_CLASS #define MY_CLASS_NAME "Elm_Diskselector" #define MY_CLASS_NAME_LEGACY "elm_diskselector" @@ -1238,7 +1238,7 @@ _round_items_add(Elm_Diskselector_Data *sd) } EOLIAN static void -_elm_diskselector_evas_smart_add(Eo *obj, Elm_Diskselector_Data *priv) +_elm_diskselector_evas_object_smart_add(Eo *obj, Elm_Diskselector_Data *priv) { Evas *evas; Evas_Object *blank, *edje; @@ -1315,7 +1315,7 @@ _elm_diskselector_evas_smart_add(Eo *obj, Elm_Diskselector_Data *priv) } EOLIAN static void -_elm_diskselector_evas_smart_del(Eo *obj, Elm_Diskselector_Data *sd) +_elm_diskselector_evas_object_smart_del(Eo *obj, Elm_Diskselector_Data *sd) { Elm_Diskselector_Item *it; Eina_List *l; @@ -1391,7 +1391,7 @@ _elm_diskselector_evas_smart_del(Eo *obj, Elm_Diskselector_Data *sd) } EOLIAN static void -_elm_diskselector_evas_smart_move(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_diskselector_evas_object_smart_move(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord x, Evas_Coord y) { eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); @@ -1399,7 +1399,7 @@ _elm_diskselector_evas_smart_move(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord } EOLIAN static void -_elm_diskselector_evas_smart_resize(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_diskselector_evas_object_smart_resize(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord w, Evas_Coord h) { eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); @@ -1407,7 +1407,7 @@ _elm_diskselector_evas_smart_resize(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coo } EOLIAN static void -_elm_diskselector_evas_smart_member_add(Eo *obj, Elm_Diskselector_Data *sd, Evas_Object *member) +_elm_diskselector_evas_object_smart_member_add(Eo *obj, Elm_Diskselector_Data *sd, Evas_Object *member) { eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member)); diff --git a/legacy/elementary/src/lib/elm_diskselector.eo b/legacy/elementary/src/lib/elm_diskselector.eo index 1706f24dfb..6a651394c8 100644 --- a/legacy/elementary/src/lib/elm_diskselector.eo +++ b/legacy/elementary/src/lib/elm_diskselector.eo @@ -235,11 +235,11 @@ class Elm_Diskselector (Elm_Widget, Elm_Interface_Scrollable) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::member_add; - Evas_Smart::move; - Evas_Smart::add; - Evas_Smart::del; - Evas_Smart::resize; + Evas_Object_Smart::member_add; + Evas_Object_Smart::move; + Evas_Object_Smart::add; + Evas_Object_Smart::del; + Evas_Object_Smart::resize; Elm_Widget::focus_next_manager_is; Elm_Widget::access; Elm_Widget::focus_next; diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c index 67dfa0bfd4..8390b3573a 100644 --- a/legacy/elementary/src/lib/elm_entry.c +++ b/legacy/elementary/src/lib/elm_entry.c @@ -7,7 +7,7 @@ #include "elm_priv.h" #include "elm_widget_entry.h" -#define MY_CLASS ELM_OBJ_ENTRY_CLASS +#define MY_CLASS ELM_ENTRY_CLASS #define MY_CLASS_NAME "Elm_Entry" #define MY_CLASS_NAME_LEGACY "elm_entry" @@ -1052,7 +1052,7 @@ _elm_entry_elm_widget_on_focus(Eo *obj, Elm_Entry_Data *sd) Eina_Bool top_is_win = EINA_FALSE; top = elm_widget_top_get(obj); - if (top && eo_isa(top, ELM_OBJ_WIN_CLASS)) + if (top && eo_isa(top, ELM_WIN_CLASS)) top_is_win = EINA_TRUE; if (!sd->editable) return EINA_FALSE; @@ -1731,7 +1731,7 @@ _mouse_up_cb(void *data, top = elm_widget_top_get(data); if (top) { - if (eo_isa(top, ELM_OBJ_WIN_CLASS)) + if (eo_isa(top, ELM_WIN_CLASS)) top_is_win = EINA_TRUE; if (top_is_win && sd->input_panel_enable && sd->input_panel_show_on_demand && @@ -3272,7 +3272,7 @@ _end_handler_mouse_move_cb(void *data, } EOLIAN static void -_elm_entry_evas_smart_add(Eo *obj, Elm_Entry_Data *priv) +_elm_entry_evas_object_smart_add(Eo *obj, Elm_Entry_Data *priv) { #ifdef HAVE_ELEMENTARY_X Evas_Object *top; @@ -3473,7 +3473,7 @@ _create_selection_handlers(Evas_Object *obj, Elm_Entry_Data *sd) } EOLIAN static void -_elm_entry_evas_smart_del(Eo *obj, Elm_Entry_Data *sd) +_elm_entry_evas_object_smart_del(Eo *obj, Elm_Entry_Data *sd) { Elm_Entry_Context_Menu_Item *it; Elm_Entry_Item_Provider *ip; @@ -3550,7 +3550,7 @@ _elm_entry_evas_smart_del(Eo *obj, Elm_Entry_Data *sd) } EOLIAN static void -_elm_entry_evas_smart_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_entry_evas_object_smart_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord x, Evas_Coord y) { eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); @@ -3563,7 +3563,7 @@ _elm_entry_evas_smart_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord x, Evas_Coord } EOLIAN static void -_elm_entry_evas_smart_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_entry_evas_object_smart_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, Evas_Coord h) { eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); @@ -3572,7 +3572,7 @@ _elm_entry_evas_smart_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, Evas_Coo } EOLIAN static void -_elm_entry_evas_smart_show(Eo *obj, Elm_Entry_Data *sd) +_elm_entry_evas_object_smart_show(Eo *obj, Elm_Entry_Data *sd) { eo_do_super(obj, MY_CLASS, evas_obj_smart_show()); @@ -3581,7 +3581,7 @@ _elm_entry_evas_smart_show(Eo *obj, Elm_Entry_Data *sd) } EOLIAN static void -_elm_entry_evas_smart_hide(Eo *obj, Elm_Entry_Data *sd) +_elm_entry_evas_object_smart_hide(Eo *obj, Elm_Entry_Data *sd) { eo_do_super(obj, MY_CLASS, evas_obj_smart_hide()); @@ -3590,7 +3590,7 @@ _elm_entry_evas_smart_hide(Eo *obj, Elm_Entry_Data *sd) } EOLIAN static void -_elm_entry_evas_smart_member_add(Eo *obj, Elm_Entry_Data *sd, Evas_Object *member) +_elm_entry_evas_object_smart_member_add(Eo *obj, Elm_Entry_Data *sd, Evas_Object *member) { eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member)); diff --git a/legacy/elementary/src/lib/elm_entry.eo b/legacy/elementary/src/lib/elm_entry.eo index d445022d04..c2f65a69b5 100644 --- a/legacy/elementary/src/lib/elm_entry.eo +++ b/legacy/elementary/src/lib/elm_entry.eo @@ -1158,13 +1158,13 @@ class Elm_Entry (Elm_Layout, Elm_Interface_Scrollable, Evas_Clickable_Interface) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::move; - Evas_Smart::member_add; - Evas_Smart::add; - Evas_Smart::resize; - Evas_Smart::del; - Evas_Smart::show; - Evas_Smart::hide; + Evas_Object_Smart::move; + Evas_Object_Smart::member_add; + Evas_Object_Smart::add; + Evas_Object_Smart::resize; + Evas_Object_Smart::del; + Evas_Object_Smart::show; + Evas_Object_Smart::hide; Elm_Widget::activate; Elm_Widget::focus_direction_manager_is; Elm_Widget::theme_apply; diff --git a/legacy/elementary/src/lib/elm_flip.c b/legacy/elementary/src/lib/elm_flip.c index d6443c5343..019132cfa9 100644 --- a/legacy/elementary/src/lib/elm_flip.c +++ b/legacy/elementary/src/lib/elm_flip.c @@ -7,7 +7,7 @@ #include "elm_widget_flip.h" #include "elm_widget_container.h" -#define MY_CLASS ELM_OBJ_FLIP_CLASS +#define MY_CLASS ELM_FLIP_CLASS #define MY_CLASS_NAME "Elm_Flip" #define MY_CLASS_NAME_LEGACY "elm_flip" @@ -1798,7 +1798,7 @@ _elm_flip_elm_container_content_unset(Eo *obj EINA_UNUSED, Elm_Flip_Data *_pd EI } EOLIAN static void -_elm_flip_evas_smart_add(Eo *obj, Elm_Flip_Data *priv) +_elm_flip_evas_object_smart_add(Eo *obj, Elm_Flip_Data *priv) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); @@ -1841,7 +1841,7 @@ _elm_flip_evas_smart_add(Eo *obj, Elm_Flip_Data *priv) } EOLIAN static void -_elm_flip_evas_smart_del(Eo *obj, Elm_Flip_Data *sd) +_elm_flip_evas_object_smart_del(Eo *obj, Elm_Flip_Data *sd) { ecore_animator_del(sd->animator); _state_slices_clear(sd); diff --git a/legacy/elementary/src/lib/elm_flip.eo b/legacy/elementary/src/lib/elm_flip.eo index e53c084d66..7dd1627692 100644 --- a/legacy/elementary/src/lib/elm_flip.eo +++ b/legacy/elementary/src/lib/elm_flip.eo @@ -243,8 +243,8 @@ class Elm_Flip (Elm_Container) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::focus_direction; Elm_Widget::sub_object_add; Elm_Widget::theme_apply; diff --git a/legacy/elementary/src/lib/elm_flipselector.c b/legacy/elementary/src/lib/elm_flipselector.c index 9c5cd5d202..5427e5d8cb 100644 --- a/legacy/elementary/src/lib/elm_flipselector.c +++ b/legacy/elementary/src/lib/elm_flipselector.c @@ -6,7 +6,7 @@ #include "elm_priv.h" #include "elm_widget_flipselector.h" -#define MY_CLASS ELM_OBJ_FLIPSELECTOR_CLASS +#define MY_CLASS ELM_FLIPSELECTOR_CLASS #define MY_CLASS_NAME "Elm_Flipselector" #define MY_CLASS_NAME_LEGACY "elm_flipselector" @@ -549,7 +549,7 @@ _signal_val_change_stop(void *data, } EOLIAN static void -_elm_flipselector_evas_smart_add(Eo *obj, Elm_Flipselector_Data *priv) +_elm_flipselector_evas_object_smart_add(Eo *obj, Elm_Flipselector_Data *priv) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); @@ -575,7 +575,7 @@ _elm_flipselector_evas_smart_add(Eo *obj, Elm_Flipselector_Data *priv) } EOLIAN static void -_elm_flipselector_evas_smart_del(Eo *obj, Elm_Flipselector_Data *sd) +_elm_flipselector_evas_object_smart_del(Eo *obj, Elm_Flipselector_Data *sd) { sd->deleting = EINA_TRUE; diff --git a/legacy/elementary/src/lib/elm_flipselector.eo b/legacy/elementary/src/lib/elm_flipselector.eo index f06e4f2f44..3983ebf7aa 100644 --- a/legacy/elementary/src/lib/elm_flipselector.eo +++ b/legacy/elementary/src/lib/elm_flipselector.eo @@ -195,8 +195,8 @@ class Elm_Flipselector (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::theme_apply; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_direction_manager_is; diff --git a/legacy/elementary/src/lib/elm_frame.c b/legacy/elementary/src/lib/elm_frame.c index 056d6b17d1..01b4bd91eb 100644 --- a/legacy/elementary/src/lib/elm_frame.c +++ b/legacy/elementary/src/lib/elm_frame.c @@ -7,7 +7,7 @@ #include "elm_widget_frame.h" #include "elm_widget_layout.h" -#define MY_CLASS ELM_OBJ_FRAME_CLASS +#define MY_CLASS ELM_FRAME_CLASS #define MY_CLASS_NAME "Elm_Frame" #define MY_CLASS_NAME_LEGACY "elm_frame" @@ -142,7 +142,7 @@ _on_frame_clicked(void *data, /* using deferred sizing evaluation, just like the parent */ EOLIAN static void -_elm_frame_evas_smart_calculate(Eo *obj, Elm_Frame_Data *sd) +_elm_frame_evas_object_smart_calculate(Eo *obj, Elm_Frame_Data *sd) { ELM_LAYOUT_DATA_GET(obj, ld); @@ -155,7 +155,7 @@ _elm_frame_evas_smart_calculate(Eo *obj, Elm_Frame_Data *sd) } EOLIAN static void -_elm_frame_evas_smart_add(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED) +_elm_frame_evas_object_smart_add(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); diff --git a/legacy/elementary/src/lib/elm_frame.eo b/legacy/elementary/src/lib/elm_frame.eo index 444db1a78e..259badbd08 100644 --- a/legacy/elementary/src/lib/elm_frame.eo +++ b/legacy/elementary/src/lib/elm_frame.eo @@ -65,8 +65,8 @@ class Elm_Frame (Elm_Layout, Evas_Clickable_Interface) implements { Eo_Base::constructor; class::constructor; - Evas_Smart::calculate; - Evas_Smart::add; + Evas_Object_Smart::calculate; + Evas_Object_Smart::add; Elm_Widget::focus_direction; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_next; diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c index 37f8cd2122..73406ef345 100644 --- a/legacy/elementary/src/lib/elm_gengrid.c +++ b/legacy/elementary/src/lib/elm_gengrid.c @@ -8,12 +8,12 @@ #include "elm_widget_gengrid.h" #include "elm_interface_scrollable.h" -#define MY_PAN_CLASS ELM_OBJ_GENGRID_PAN_CLASS +#define MY_PAN_CLASS ELM_GENGRID_PAN_CLASS #define MY_PAN_CLASS_NAME "Elm_Gengrid_Pan" #define MY_PAN_CLASS_NAME_LEGACY "elm_gengrid_pan" -#define MY_CLASS ELM_OBJ_GENGRID_CLASS +#define MY_CLASS ELM_GENGRID_CLASS #define MY_CLASS_NAME "Elm_Gengrid" #define MY_CLASS_NAME_LEGACY "elm_gengrid" @@ -269,14 +269,14 @@ _elm_gengrid_pan_eo_base_destructor(Eo *obj, Elm_Gengrid_Pan_Data *psd) } EOLIAN static void -_elm_gengrid_pan_evas_smart_move(Eo *obj EINA_UNUSED, Elm_Gengrid_Pan_Data *psd, Evas_Coord _gen_param2 EINA_UNUSED, Evas_Coord _gen_param3 EINA_UNUSED) +_elm_gengrid_pan_evas_object_smart_move(Eo *obj EINA_UNUSED, Elm_Gengrid_Pan_Data *psd, Evas_Coord _gen_param2 EINA_UNUSED, Evas_Coord _gen_param3 EINA_UNUSED) { ecore_job_del(psd->wsd->calc_job); psd->wsd->calc_job = ecore_job_add(_calc_job, psd->wobj); } EOLIAN static void -_elm_gengrid_pan_evas_smart_resize(Eo *obj, Elm_Gengrid_Pan_Data *psd, Evas_Coord w, Evas_Coord h) +_elm_gengrid_pan_evas_object_smart_resize(Eo *obj, Elm_Gengrid_Pan_Data *psd, Evas_Coord w, Evas_Coord h) { Evas_Coord ow, oh; @@ -1346,7 +1346,7 @@ _group_item_place(Elm_Gengrid_Pan_Data *psd) } EOLIAN static void -_elm_gengrid_pan_evas_smart_calculate(Eo *obj EINA_UNUSED, Elm_Gengrid_Pan_Data *psd) +_elm_gengrid_pan_evas_object_smart_calculate(Eo *obj EINA_UNUSED, Elm_Gengrid_Pan_Data *psd) { Evas_Coord cx = 0, cy = 0; Elm_Gen_Item *it; @@ -3119,7 +3119,7 @@ _elm_gengrid_elm_layout_sizing_eval(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *_pd E } EOLIAN static void -_elm_gengrid_evas_smart_add(Eo *obj, Elm_Gengrid_Data *priv) +_elm_gengrid_evas_object_smart_add(Eo *obj, Elm_Gengrid_Data *priv) { Eina_Bool bounce = _elm_config->thumbscroll_bounce_enable; Elm_Gengrid_Pan_Data *pan_data; @@ -3185,7 +3185,7 @@ _elm_gengrid_evas_smart_add(Eo *obj, Elm_Gengrid_Data *priv) } EOLIAN static void -_elm_gengrid_evas_smart_del(Eo *obj, Elm_Gengrid_Data *sd) +_elm_gengrid_evas_object_smart_del(Eo *obj, Elm_Gengrid_Data *sd) { elm_gengrid_clear(obj); eo_unref(sd->pan_obj); @@ -3198,7 +3198,7 @@ _elm_gengrid_evas_smart_del(Eo *obj, Elm_Gengrid_Data *sd) } EOLIAN static void -_elm_gengrid_evas_smart_move(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_gengrid_evas_object_smart_move(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord x, Evas_Coord y) { eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); @@ -3206,7 +3206,7 @@ _elm_gengrid_evas_smart_move(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord x, Evas_C } EOLIAN static void -_elm_gengrid_evas_smart_resize(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_gengrid_evas_object_smart_resize(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord w, Evas_Coord h) { eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); @@ -3214,7 +3214,7 @@ _elm_gengrid_evas_smart_resize(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord w, Evas } EOLIAN static void -_elm_gengrid_evas_smart_member_add(Eo *obj, Elm_Gengrid_Data *sd, Evas_Object *member) +_elm_gengrid_evas_object_smart_member_add(Eo *obj, Elm_Gengrid_Data *sd, Evas_Object *member) { eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member)); diff --git a/legacy/elementary/src/lib/elm_gengrid.eo b/legacy/elementary/src/lib/elm_gengrid.eo index 65ceb6b225..0b7f95f5ae 100644 --- a/legacy/elementary/src/lib/elm_gengrid.eo +++ b/legacy/elementary/src/lib/elm_gengrid.eo @@ -664,11 +664,11 @@ class Elm_Gengrid (Elm_Layout, Elm_Interface_Scrollable, Evas_Clickable_Interfac implements { class::constructor; Eo_Base::constructor; - Evas_Smart::move; - Evas_Smart::add; - Evas_Smart::del; - Evas_Smart::member_add; - Evas_Smart::resize; + Evas_Object_Smart::move; + Evas_Object_Smart::add; + Evas_Object_Smart::del; + Evas_Object_Smart::member_add; + Evas_Object_Smart::resize; Elm_Widget::theme_apply; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_direction_manager_is; diff --git a/legacy/elementary/src/lib/elm_gengrid_pan.eo b/legacy/elementary/src/lib/elm_gengrid_pan.eo index 5fe6fccd35..e1c5e67138 100644 --- a/legacy/elementary/src/lib/elm_gengrid_pan.eo +++ b/legacy/elementary/src/lib/elm_gengrid_pan.eo @@ -4,9 +4,9 @@ class Elm_Gengrid_Pan (Elm_Pan) implements { class::constructor; Eo_Base::destructor; - Evas_Smart::calculate; - Evas_Smart::move; - Evas_Smart::resize; + Evas_Object_Smart::calculate; + Evas_Object_Smart::move; + Evas_Object_Smart::resize; Elm_Pan::content_size::get; Elm_Pan::pos; Elm_Pan::pos_min::get; diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c index 0e26793f84..406098a1b5 100644 --- a/legacy/elementary/src/lib/elm_genlist.c +++ b/legacy/elementary/src/lib/elm_genlist.c @@ -11,12 +11,12 @@ #include "elm_widget_genlist.h" #include "elm_interface_scrollable.h" -#define MY_PAN_CLASS ELM_OBJ_GENLIST_PAN_CLASS +#define MY_PAN_CLASS ELM_GENLIST_PAN_CLASS #define MY_PAN_CLASS_NAME "Elm_Genlist_Pan" #define MY_PAN_CLASS_NAME_LEGACY "elm_genlist_pan" -#define MY_CLASS ELM_OBJ_GENLIST_CLASS +#define MY_CLASS ELM_GENLIST_CLASS #define MY_CLASS_NAME "Elm_Genlist" #define MY_CLASS_NAME_LEGACY "elm_genlist" @@ -192,7 +192,7 @@ _elm_genlist_pan_elm_pan_content_size_get(Eo *obj EINA_UNUSED, Elm_Genlist_Pan_D } EOLIAN static void -_elm_genlist_pan_evas_smart_del(Eo *obj, Elm_Genlist_Pan_Data *psd) +_elm_genlist_pan_evas_object_smart_del(Eo *obj, Elm_Genlist_Pan_Data *psd) { ecore_job_del(psd->resize_job); @@ -200,7 +200,7 @@ _elm_genlist_pan_evas_smart_del(Eo *obj, Elm_Genlist_Pan_Data *psd) } EOLIAN static void -_elm_genlist_pan_evas_smart_move(Eo *obj, Elm_Genlist_Pan_Data *psd, Evas_Coord _gen_param2 EINA_UNUSED, Evas_Coord _gen_param3 EINA_UNUSED) +_elm_genlist_pan_evas_object_smart_move(Eo *obj, Elm_Genlist_Pan_Data *psd, Evas_Coord _gen_param2 EINA_UNUSED, Evas_Coord _gen_param3 EINA_UNUSED) { psd->wsd->pan_changed = EINA_TRUE; evas_object_smart_changed(obj); @@ -217,7 +217,7 @@ _elm_genlist_pan_smart_resize_job(void *data) } EOLIAN static void -_elm_genlist_pan_evas_smart_resize(Eo *obj, Elm_Genlist_Pan_Data *psd, Evas_Coord w, Evas_Coord h) +_elm_genlist_pan_evas_object_smart_resize(Eo *obj, Elm_Genlist_Pan_Data *psd, Evas_Coord w, Evas_Coord h) { Evas_Coord ow, oh; @@ -2176,7 +2176,7 @@ _item_block_realize(Item_Block *itb) } EOLIAN static void -_elm_genlist_pan_evas_smart_calculate(Eo *obj EINA_UNUSED, Elm_Genlist_Pan_Data *psd) +_elm_genlist_pan_evas_object_smart_calculate(Eo *obj EINA_UNUSED, Elm_Genlist_Pan_Data *psd) { Evas_Coord ox, oy, ow, oh, cvx, cvy, cvw, cvh; Evas_Coord vx = 0, vy = 0, vw = 0, vh = 0; @@ -5211,7 +5211,7 @@ _elm_genlist_looping_down_cb(void *data, EOLIAN static void -_elm_genlist_evas_smart_add(Eo *obj, Elm_Genlist_Data *priv) +_elm_genlist_evas_object_smart_add(Eo *obj, Elm_Genlist_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); Elm_Genlist_Pan_Data *pan_data; @@ -5293,7 +5293,7 @@ _elm_genlist_evas_smart_add(Eo *obj, Elm_Genlist_Data *priv) } EOLIAN static void -_elm_genlist_evas_smart_del(Eo *obj, Elm_Genlist_Data *sd) +_elm_genlist_evas_object_smart_del(Eo *obj, Elm_Genlist_Data *sd) { int i; @@ -5320,7 +5320,7 @@ _elm_genlist_evas_smart_del(Eo *obj, Elm_Genlist_Data *sd) } EOLIAN static void -_elm_genlist_evas_smart_move(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_genlist_evas_object_smart_move(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord x, Evas_Coord y) { eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); @@ -5328,7 +5328,7 @@ _elm_genlist_evas_smart_move(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord x, Evas_C } EOLIAN static void -_elm_genlist_evas_smart_resize(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_genlist_evas_object_smart_resize(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord w, Evas_Coord h) { eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); @@ -5338,7 +5338,7 @@ _elm_genlist_evas_smart_resize(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord w, Evas } EOLIAN static void -_elm_genlist_evas_smart_member_add(Eo *obj, Elm_Genlist_Data *sd, Evas_Object *member) +_elm_genlist_evas_object_smart_member_add(Eo *obj, Elm_Genlist_Data *sd, Evas_Object *member) { eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member)); diff --git a/legacy/elementary/src/lib/elm_genlist.eo b/legacy/elementary/src/lib/elm_genlist.eo index 5f04a22f44..db380149fb 100644 --- a/legacy/elementary/src/lib/elm_genlist.eo +++ b/legacy/elementary/src/lib/elm_genlist.eo @@ -730,11 +730,11 @@ class Elm_Genlist (Elm_Layout, Elm_Interface_Scrollable, Evas_Clickable_Interfac implements { class::constructor; Eo_Base::constructor; - Evas_Smart::member_add; - Evas_Smart::move; - Evas_Smart::add; - Evas_Smart::del; - Evas_Smart::resize; + Evas_Object_Smart::member_add; + Evas_Object_Smart::move; + Evas_Object_Smart::add; + Evas_Object_Smart::del; + Evas_Object_Smart::resize; Elm_Widget::theme_apply; Elm_Widget::focus_next_manager_is; Elm_Widget::sub_object_add; diff --git a/legacy/elementary/src/lib/elm_genlist_pan.eo b/legacy/elementary/src/lib/elm_genlist_pan.eo index 8764ce3241..e363cf47e5 100644 --- a/legacy/elementary/src/lib/elm_genlist_pan.eo +++ b/legacy/elementary/src/lib/elm_genlist_pan.eo @@ -4,10 +4,10 @@ class Elm_Genlist_Pan (Elm_Pan) implements { class::constructor; Eo_Base::destructor; - Evas_Smart::calculate; - Evas_Smart::move; - Evas_Smart::del; - Evas_Smart::resize; + Evas_Object_Smart::calculate; + Evas_Object_Smart::move; + Evas_Object_Smart::del; + Evas_Object_Smart::resize; Elm_Pan::content_size::get; Elm_Pan::pos; Elm_Pan::pos_min::get; diff --git a/legacy/elementary/src/lib/elm_gesture_layer.c b/legacy/elementary/src/lib/elm_gesture_layer.c index 67830d40e1..6d901fa2ed 100644 --- a/legacy/elementary/src/lib/elm_gesture_layer.c +++ b/legacy/elementary/src/lib/elm_gesture_layer.c @@ -5,7 +5,7 @@ #include #include "elm_priv.h" -#define MY_CLASS ELM_OBJ_GESTURE_LAYER_CLASS +#define MY_CLASS ELM_GESTURE_LAYER_CLASS #define MY_CLASS_NAME "Elm_Gesture_Layer" #define MY_CLASS_NAME_LEGACY "elm_gesture_layer" @@ -3729,7 +3729,7 @@ _elm_gesture_layer_elm_widget_disable(Eo *obj, Elm_Gesture_Layer_Data *_pd EINA_ } EOLIAN static void -_elm_gesture_layer_evas_smart_add(Eo *obj, Elm_Gesture_Layer_Data *priv) +_elm_gesture_layer_evas_object_smart_add(Eo *obj, Elm_Gesture_Layer_Data *priv) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); @@ -3762,7 +3762,7 @@ _elm_gesture_layer_evas_smart_add(Eo *obj, Elm_Gesture_Layer_Data *priv) static void _cbs_clean(Elm_Gesture_Layer_Data *sd, Elm_Gesture_Type idx, Elm_Gesture_State cb_type); EOLIAN static void -_elm_gesture_layer_evas_smart_del(Eo *obj, Elm_Gesture_Layer_Data *sd) +_elm_gesture_layer_evas_object_smart_del(Eo *obj, Elm_Gesture_Layer_Data *sd) { Pointer_Event *data; int i; diff --git a/legacy/elementary/src/lib/elm_gesture_layer.eo b/legacy/elementary/src/lib/elm_gesture_layer.eo index d61724ccb7..deaab1c244 100644 --- a/legacy/elementary/src/lib/elm_gesture_layer.eo +++ b/legacy/elementary/src/lib/elm_gesture_layer.eo @@ -154,8 +154,8 @@ class Elm_Gesture_Layer (Elm_Widget) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::disable; } diff --git a/legacy/elementary/src/lib/elm_glview.c b/legacy/elementary/src/lib/elm_glview.c index 26d6f8433f..9f58fc4931 100644 --- a/legacy/elementary/src/lib/elm_glview.c +++ b/legacy/elementary/src/lib/elm_glview.c @@ -7,7 +7,7 @@ #include "elm_priv.h" #include "elm_widget_glview.h" -#define MY_CLASS ELM_OBJ_GLVIEW_CLASS +#define MY_CLASS ELM_GLVIEW_CLASS #define MY_CLASS_NAME "Elm_Glview" #define MY_CLASS_NAME_LEGACY "elm_glview" @@ -73,7 +73,7 @@ _glview_update_surface(Evas_Object *obj) } EOLIAN static void -_elm_glview_evas_smart_resize(Eo *obj, Elm_Glview_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_glview_evas_object_smart_resize(Eo *obj, Elm_Glview_Data *sd, Evas_Coord w, Evas_Coord h) { eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); @@ -179,7 +179,7 @@ _set_render_policy_callback(Evas_Object *obj) } EOLIAN static void -_elm_glview_evas_smart_add(Eo *obj, Elm_Glview_Data *priv) +_elm_glview_evas_object_smart_add(Eo *obj, Elm_Glview_Data *priv) { Evas_Object *img; @@ -235,7 +235,7 @@ _elm_glview_evas_smart_add(Eo *obj, Elm_Glview_Data *priv) } EOLIAN static void -_elm_glview_evas_smart_del(Eo *obj, Elm_Glview_Data *sd) +_elm_glview_evas_object_smart_del(Eo *obj, Elm_Glview_Data *sd) { // Call delete func if it's registered if (sd->del_func) diff --git a/legacy/elementary/src/lib/elm_glview.eo b/legacy/elementary/src/lib/elm_glview.eo index 9b3c6de4ce..bf25f7040d 100644 --- a/legacy/elementary/src/lib/elm_glview.eo +++ b/legacy/elementary/src/lib/elm_glview.eo @@ -166,9 +166,9 @@ class Elm_Glview (Elm_Widget) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; - Evas_Smart::resize; + Evas_Object_Smart::add; + Evas_Object_Smart::del; + Evas_Object_Smart::resize; Elm_Widget::on_focus; } events { diff --git a/legacy/elementary/src/lib/elm_grid.c b/legacy/elementary/src/lib/elm_grid.c index b462f94bb4..fa771b6226 100644 --- a/legacy/elementary/src/lib/elm_grid.c +++ b/legacy/elementary/src/lib/elm_grid.c @@ -7,7 +7,7 @@ #include "elm_priv.h" #include "elm_widget_grid.h" -#define MY_CLASS ELM_OBJ_GRID_CLASS +#define MY_CLASS ELM_GRID_CLASS #define MY_CLASS_NAME "Elm_Grid" #define MY_CLASS_NAME_LEGACY "elm_grid" @@ -114,7 +114,7 @@ _elm_grid_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) } EOLIAN static void -_elm_grid_evas_smart_add(Eo *obj, void *_pd EINA_UNUSED) +_elm_grid_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); Evas_Object *grid; @@ -133,7 +133,7 @@ _elm_grid_evas_smart_add(Eo *obj, void *_pd EINA_UNUSED) } EOLIAN static void -_elm_grid_evas_smart_del(Eo *obj, void *_pd EINA_UNUSED) +_elm_grid_evas_object_smart_del(Eo *obj, void *_pd EINA_UNUSED) { Eina_List *l; Evas_Object *child; diff --git a/legacy/elementary/src/lib/elm_grid.eo b/legacy/elementary/src/lib/elm_grid.eo index 07e879f9f9..f618c7ad20 100644 --- a/legacy/elementary/src/lib/elm_grid.eo +++ b/legacy/elementary/src/lib/elm_grid.eo @@ -75,8 +75,8 @@ class Elm_Grid (Elm_Widget) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::focus_direction; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_next; diff --git a/legacy/elementary/src/lib/elm_hover.c b/legacy/elementary/src/lib/elm_hover.c index 29b4d78df9..6fb4c2019c 100644 --- a/legacy/elementary/src/lib/elm_hover.c +++ b/legacy/elementary/src/lib/elm_hover.c @@ -7,7 +7,7 @@ #include "elm_priv.h" #include "elm_widget_hover.h" -#define MY_CLASS ELM_OBJ_HOVER_CLASS +#define MY_CLASS ELM_HOVER_CLASS #define MY_CLASS_NAME "Elm_Hover" #define MY_CLASS_NAME_LEGACY "elm_hover" @@ -131,7 +131,7 @@ _elm_hover_left_space_calc(Elm_Hover_Data *sd, if (sd->parent) { evas_object_geometry_get(sd->parent, &x, &y, &w, &h); - if (eo_isa(sd->parent, ELM_OBJ_WIN_CLASS)) + if (eo_isa(sd->parent, ELM_WIN_CLASS)) { x = 0; y = 0; @@ -313,7 +313,7 @@ _elm_hover_elm_layout_sizing_eval(Eo *obj, Elm_Hover_Data *sd) if (sd->parent) { evas_object_geometry_get(sd->parent, &x, &y, &w, &h); - if (eo_isa(sd->parent, ELM_OBJ_WIN_CLASS)) + if (eo_isa(sd->parent, ELM_WIN_CLASS)) { x = 0; y = 0; @@ -520,7 +520,7 @@ _hov_dismiss_cb(void *data, } EOLIAN static void -_elm_hover_evas_smart_add(Eo *obj, Elm_Hover_Data *priv) +_elm_hover_evas_object_smart_add(Eo *obj, Elm_Hover_Data *priv) { unsigned int i; @@ -551,7 +551,7 @@ _elm_hover_evas_smart_add(Eo *obj, Elm_Hover_Data *priv) } EOLIAN static void -_elm_hover_evas_smart_del(Eo *obj, Elm_Hover_Data *sd) +_elm_hover_evas_object_smart_del(Eo *obj, Elm_Hover_Data *sd) { sd->on_del = EINA_TRUE; @@ -571,7 +571,7 @@ _elm_hover_evas_smart_del(Eo *obj, Elm_Hover_Data *sd) } EOLIAN static void -_elm_hover_evas_smart_move(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord x, Evas_Coord y) +_elm_hover_evas_object_smart_move(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord x, Evas_Coord y) { eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); @@ -579,7 +579,7 @@ _elm_hover_evas_smart_move(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord } EOLIAN static void -_elm_hover_evas_smart_resize(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h) +_elm_hover_evas_object_smart_resize(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h) { eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); @@ -587,7 +587,7 @@ _elm_hover_evas_smart_resize(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coor } EOLIAN static void -_elm_hover_evas_smart_show(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED) +_elm_hover_evas_object_smart_show(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, evas_obj_smart_show()); @@ -595,7 +595,7 @@ _elm_hover_evas_smart_show(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED) } EOLIAN static void -_elm_hover_evas_smart_hide(Eo *obj, Elm_Hover_Data *sd) +_elm_hover_evas_object_smart_hide(Eo *obj, Elm_Hover_Data *sd) { eo_do_super(obj, MY_CLASS, evas_obj_smart_hide()); diff --git a/legacy/elementary/src/lib/elm_hover.eo b/legacy/elementary/src/lib/elm_hover.eo index 031ad5e6bb..35514e90eb 100644 --- a/legacy/elementary/src/lib/elm_hover.eo +++ b/legacy/elementary/src/lib/elm_hover.eo @@ -71,12 +71,12 @@ class Elm_Hover (Elm_Layout, Evas_Clickable_Interface) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::del; - Evas_Smart::hide; - Evas_Smart::show; - Evas_Smart::move; - Evas_Smart::add; - Evas_Smart::resize; + Evas_Object_Smart::del; + Evas_Object_Smart::hide; + Evas_Object_Smart::show; + Evas_Object_Smart::move; + Evas_Object_Smart::add; + Evas_Object_Smart::resize; Elm_Widget::theme_apply; Elm_Widget::sub_object_add; Elm_Widget::parent; diff --git a/legacy/elementary/src/lib/elm_icon.c b/legacy/elementary/src/lib/elm_icon.c index 792b97be7f..31fc38cbd3 100644 --- a/legacy/elementary/src/lib/elm_icon.c +++ b/legacy/elementary/src/lib/elm_icon.c @@ -11,7 +11,7 @@ #define NON_EXISTING (void *)-1 static const char *icon_theme = NULL; -#define MY_CLASS ELM_OBJ_ICON_CLASS +#define MY_CLASS ELM_ICON_CLASS #define MY_CLASS_NAME "Elm_Icon" #define MY_CLASS_NAME_LEGACY "elm_icon" @@ -349,7 +349,7 @@ static void _edje_signals_free(Elm_Icon_Data *sd) { Edje_Signal_Data *esd; - Elm_Image_Data *id = eo_data_scope_get(sd->obj, ELM_OBJ_IMAGE_CLASS); + Elm_Image_Data *id = eo_data_scope_get(sd->obj, ELM_IMAGE_CLASS); EINA_LIST_FREE(sd->edje_signals, esd) { @@ -367,7 +367,7 @@ _elm_icon_elm_image_file_set(Eo *obj, Elm_Icon_Data *sd, const char *file, const { Evas_Object *pclip; - Elm_Image_Data *id = eo_data_scope_get(obj, ELM_OBJ_IMAGE_CLASS); + Elm_Image_Data *id = eo_data_scope_get(obj, ELM_IMAGE_CLASS); EINA_SAFETY_ON_NULL_RETURN_VAL(file, EINA_FALSE); @@ -565,7 +565,7 @@ _elm_icon_thumb_resize_cb(void *data, } EOLIAN static void -_elm_icon_evas_smart_add(Eo *obj, Elm_Icon_Data *priv) +_elm_icon_evas_object_smart_add(Eo *obj, Elm_Icon_Data *priv) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); @@ -576,7 +576,7 @@ _elm_icon_evas_smart_add(Eo *obj, Elm_Icon_Data *priv) } EOLIAN static void -_elm_icon_evas_smart_del(Eo *obj, Elm_Icon_Data *sd) +_elm_icon_evas_object_smart_del(Eo *obj, Elm_Icon_Data *sd) { eina_stringshare_del(sd->stdicon); @@ -604,7 +604,7 @@ _elm_icon_signal_emit(Evas_Object *obj, const char *source) { - Elm_Image_Data *id = eo_data_scope_get(obj, ELM_OBJ_IMAGE_CLASS); + Elm_Image_Data *id = eo_data_scope_get(obj, ELM_IMAGE_CLASS); if (!id->edje) return; @@ -622,7 +622,7 @@ _elm_icon_signal_callback_add(Evas_Object *obj, Edje_Signal_Data *esd; ELM_ICON_DATA_GET(obj, sd); - Elm_Image_Data *id = eo_data_scope_get(obj, ELM_OBJ_IMAGE_CLASS); + Elm_Image_Data *id = eo_data_scope_get(obj, ELM_IMAGE_CLASS); if (!id->edje) return; @@ -653,7 +653,7 @@ _elm_icon_signal_callback_del(Evas_Object *obj, Eina_List *l; ELM_ICON_DATA_GET(obj, sd); - Elm_Image_Data *id = eo_data_scope_get(obj, ELM_OBJ_IMAGE_CLASS); + Elm_Image_Data *id = eo_data_scope_get(obj, ELM_IMAGE_CLASS); if (!id->edje) return NULL; diff --git a/legacy/elementary/src/lib/elm_icon.eo b/legacy/elementary/src/lib/elm_icon.eo index 04bd65b26d..d40f426f0b 100644 --- a/legacy/elementary/src/lib/elm_icon.eo +++ b/legacy/elementary/src/lib/elm_icon.eo @@ -97,8 +97,8 @@ class Elm_Icon (Elm_Image) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::theme_apply; Elm_Image::memfile::set; Elm_Image::sizing_eval; diff --git a/legacy/elementary/src/lib/elm_image.c b/legacy/elementary/src/lib/elm_image.c index 7125fe3dfa..3a075cf944 100644 --- a/legacy/elementary/src/lib/elm_image.c +++ b/legacy/elementary/src/lib/elm_image.c @@ -12,7 +12,7 @@ #define FMT_SIZE_T "%zu" -#define MY_CLASS ELM_OBJ_IMAGE_CLASS +#define MY_CLASS ELM_IMAGE_CLASS #define MY_CLASS_NAME "Elm_Image" #define MY_CLASS_NAME_LEGACY "elm_image" @@ -418,7 +418,7 @@ _elm_image_drag_n_drop_cb(void *elm_obj, } EOLIAN static void -_elm_image_evas_smart_add(Eo *obj, Elm_Image_Data *priv) +_elm_image_evas_object_smart_add(Eo *obj, Elm_Image_Data *priv) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); @@ -452,7 +452,7 @@ _elm_image_evas_smart_add(Eo *obj, Elm_Image_Data *priv) } EOLIAN static void -_elm_image_evas_smart_del(Eo *obj, Elm_Image_Data *sd) +_elm_image_evas_object_smart_del(Eo *obj, Elm_Image_Data *sd) { ecore_timer_del(sd->anim_timer); evas_object_del(sd->img); @@ -465,7 +465,7 @@ _elm_image_evas_smart_del(Eo *obj, Elm_Image_Data *sd) } EOLIAN static void -_elm_image_evas_smart_move(Eo *obj, Elm_Image_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_image_evas_object_smart_move(Eo *obj, Elm_Image_Data *sd, Evas_Coord x, Evas_Coord y) { eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); @@ -478,7 +478,7 @@ _elm_image_evas_smart_move(Eo *obj, Elm_Image_Data *sd, Evas_Coord x, Evas_Coord } EOLIAN static void -_elm_image_evas_smart_resize(Eo *obj, Elm_Image_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_image_evas_object_smart_resize(Eo *obj, Elm_Image_Data *sd, Evas_Coord w, Evas_Coord h) { eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); @@ -492,7 +492,7 @@ _elm_image_evas_smart_resize(Eo *obj, Elm_Image_Data *sd, Evas_Coord w, Evas_Coo } EOLIAN static void -_elm_image_evas_smart_show(Eo *obj, Elm_Image_Data *sd) +_elm_image_evas_object_smart_show(Eo *obj, Elm_Image_Data *sd) { sd->show = EINA_TRUE; if (sd->preloading) return; @@ -505,7 +505,7 @@ _elm_image_evas_smart_show(Eo *obj, Elm_Image_Data *sd) } EOLIAN static void -_elm_image_evas_smart_hide(Eo *obj, Elm_Image_Data *sd) +_elm_image_evas_object_smart_hide(Eo *obj, Elm_Image_Data *sd) { eo_do_super(obj, MY_CLASS, evas_obj_smart_hide()); @@ -516,7 +516,7 @@ _elm_image_evas_smart_hide(Eo *obj, Elm_Image_Data *sd) } EOLIAN static void -_elm_image_evas_smart_member_add(Eo *obj, Elm_Image_Data *sd, Evas_Object *member) +_elm_image_evas_object_smart_member_add(Eo *obj, Elm_Image_Data *sd, Evas_Object *member) { eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member)); @@ -525,7 +525,7 @@ _elm_image_evas_smart_member_add(Eo *obj, Elm_Image_Data *sd, Evas_Object *membe } EOLIAN static void -_elm_image_evas_smart_color_set(Eo *obj, Elm_Image_Data *sd, int r, int g, int b, int a) +_elm_image_evas_object_smart_color_set(Eo *obj, Elm_Image_Data *sd, int r, int g, int b, int a) { eo_do_super(obj, MY_CLASS, evas_obj_smart_color_set(r, g, b, a)); @@ -535,7 +535,7 @@ _elm_image_evas_smart_color_set(Eo *obj, Elm_Image_Data *sd, int r, int g, int b } EOLIAN static void -_elm_image_evas_smart_clip_set(Eo *obj, Elm_Image_Data *sd, Evas_Object *clip) +_elm_image_evas_object_smart_clip_set(Eo *obj, Elm_Image_Data *sd, Evas_Object *clip) { eo_do_super(obj, MY_CLASS, evas_obj_smart_clip_set(clip)); @@ -544,7 +544,7 @@ _elm_image_evas_smart_clip_set(Eo *obj, Elm_Image_Data *sd, Evas_Object *clip) } EOLIAN static void -_elm_image_evas_smart_clip_unset(Eo *obj, Elm_Image_Data *sd) +_elm_image_evas_object_smart_clip_unset(Eo *obj, Elm_Image_Data *sd) { eo_do_super(obj, MY_CLASS, evas_obj_smart_clip_unset()); diff --git a/legacy/elementary/src/lib/elm_image.eo b/legacy/elementary/src/lib/elm_image.eo index 5e4a49820a..d234d8ad04 100644 --- a/legacy/elementary/src/lib/elm_image.eo +++ b/legacy/elementary/src/lib/elm_image.eo @@ -535,16 +535,16 @@ class Elm_Image (Elm_Widget, Evas_Clickable_Interface, Elm_Interface_Atspi_Image implements { class::constructor; Eo_Base::constructor; - Evas_Smart::hide; - Evas_Smart::clip::set; - Evas_Smart::clip_unset; - Evas_Smart::show; - Evas_Smart::color::set; - Evas_Smart::move; - Evas_Smart::add; - Evas_Smart::del; - Evas_Smart::member_add; - Evas_Smart::resize; + Evas_Object_Smart::hide; + Evas_Object_Smart::clip::set; + Evas_Object_Smart::clip_unset; + Evas_Object_Smart::show; + Evas_Object_Smart::color::set; + Evas_Object_Smart::move; + Evas_Object_Smart::add; + Evas_Object_Smart::del; + Evas_Object_Smart::member_add; + Evas_Object_Smart::resize; Elm_Widget::theme_apply; Elm_Widget::event; Elm_Interface_Atspi_Image::extents::get; diff --git a/legacy/elementary/src/lib/elm_index.c b/legacy/elementary/src/lib/elm_index.c index b6c39fa330..0f32959a09 100644 --- a/legacy/elementary/src/lib/elm_index.c +++ b/legacy/elementary/src/lib/elm_index.c @@ -9,7 +9,7 @@ #include "elm_widget_layout.h" #include "elm_widget_index.h" -#define MY_CLASS ELM_OBJ_INDEX_CLASS +#define MY_CLASS ELM_INDEX_CLASS #define MY_CLASS_NAME "Elm_Index" #define MY_CLASS_NAME_LEGACY "elm_index" @@ -871,7 +871,7 @@ _index_resize_cb(void *data EINA_UNUSED, } EOLIAN static void -_elm_index_evas_smart_add(Eo *obj, Elm_Index_Data *priv) +_elm_index_evas_object_smart_add(Eo *obj, Elm_Index_Data *priv) { Evas_Object *o; Evas_Coord minw = 0, minh = 0; @@ -949,7 +949,7 @@ _elm_index_evas_smart_add(Eo *obj, Elm_Index_Data *priv) } EOLIAN static void -_elm_index_evas_smart_del(Eo *obj, Elm_Index_Data *sd) +_elm_index_evas_object_smart_del(Eo *obj, Elm_Index_Data *sd) { Elm_Index_Omit *o; diff --git a/legacy/elementary/src/lib/elm_index.eo b/legacy/elementary/src/lib/elm_index.eo index fa25c1bbb7..34f71225d2 100644 --- a/legacy/elementary/src/lib/elm_index.eo +++ b/legacy/elementary/src/lib/elm_index.eo @@ -349,8 +349,8 @@ class Elm_Index (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::theme_apply; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_direction_manager_is; diff --git a/legacy/elementary/src/lib/elm_interface_atspi_widget.c b/legacy/elementary/src/lib/elm_interface_atspi_widget.c index a8a814383a..1679b26c37 100644 --- a/legacy/elementary/src/lib/elm_interface_atspi_widget.c +++ b/legacy/elementary/src/lib/elm_interface_atspi_widget.c @@ -38,7 +38,7 @@ _elm_interface_atspi_widget_eo_base_constructor(Eo *obj EINA_UNUSED, Elm_Interfa pd->role = ELM_ATSPI_ROLE_UNKNOWN; // Elm_Widget_Access_Object can only be constructed on top of Elm_Widget - assert(eo_isa(obj, ELM_OBJ_WIDGET_CLASS)); + assert(eo_isa(obj, ELM_WIDGET_CLASS)); evas_object_smart_callback_add(obj, "focused", _on_focus_change, (void*)1); evas_object_smart_callback_add(obj, "unfocused", _on_focus_change, NULL); @@ -109,7 +109,7 @@ _elm_interface_atspi_widget_elm_interface_atspi_accessible_children_get(Eo *obj Elm_Widget_Smart_Data *wd; Evas_Object *widget; - wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + wd = eo_data_scope_get(obj, ELM_WIDGET_CLASS); if (!wd) return NULL; EINA_LIST_FOREACH(wd->subobjs, l, widget) diff --git a/legacy/elementary/src/lib/elm_interface_atspi_widget_action.c b/legacy/elementary/src/lib/elm_interface_atspi_widget_action.c index 15caf02525..af2a052747 100644 --- a/legacy/elementary/src/lib/elm_interface_atspi_widget_action.c +++ b/legacy/elementary/src/lib/elm_interface_atspi_widget_action.c @@ -49,7 +49,7 @@ _elm_interface_atspi_widget_action_elm_interface_atspi_action_keybinding_get(Eo Elm_Config_Binding_Key *binding; int tmp = 0; - if (!eo_isa(obj, ELM_OBJ_WIDGET_CLASS)) + if (!eo_isa(obj, ELM_WIDGET_CLASS)) return NULL; eo_do(obj, actions = elm_interface_atspi_widget_action_elm_actions_get()); diff --git a/legacy/elementary/src/lib/elm_interface_scrollable.c b/legacy/elementary/src/lib/elm_interface_scrollable.c index d620023225..c080d6e003 100644 --- a/legacy/elementary/src/lib/elm_interface_scrollable.c +++ b/legacy/elementary/src/lib/elm_interface_scrollable.c @@ -7,7 +7,7 @@ #include "elm_priv.h" #include "elm_interface_scrollable.h" -#define MY_PAN_CLASS ELM_OBJ_PAN_CLASS +#define MY_PAN_CLASS ELM_PAN_CLASS #define MY_PAN_CLASS_NAME "Elm_Pan" #define MY_PAN_CLASS_NAME_LEGACY "elm_pan" @@ -86,7 +86,7 @@ _elm_pan_update(Elm_Pan_Smart_Data *psd) } EOLIAN static void -_elm_pan_evas_smart_add(Eo *obj, Elm_Pan_Smart_Data *priv) +_elm_pan_evas_object_smart_add(Eo *obj, Elm_Pan_Smart_Data *priv) { eo_do_super(obj, MY_PAN_CLASS, evas_obj_smart_add()); @@ -94,7 +94,7 @@ _elm_pan_evas_smart_add(Eo *obj, Elm_Pan_Smart_Data *priv) } EOLIAN static void -_elm_pan_evas_smart_del(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED) +_elm_pan_evas_object_smart_del(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED) { _elm_pan_content_set(obj, NULL); @@ -102,7 +102,7 @@ _elm_pan_evas_smart_del(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED) } EOLIAN static void -_elm_pan_evas_smart_move(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord x, Evas_Coord y) +_elm_pan_evas_object_smart_move(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord x, Evas_Coord y) { psd->x = x; psd->y = y; @@ -111,7 +111,7 @@ _elm_pan_evas_smart_move(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coor } EOLIAN static void -_elm_pan_evas_smart_resize(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord w, Evas_Coord h) +_elm_pan_evas_object_smart_resize(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord w, Evas_Coord h) { psd->w = w; psd->h = h; @@ -121,7 +121,7 @@ _elm_pan_evas_smart_resize(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Co } EOLIAN static void -_elm_pan_evas_smart_show(Eo *obj, Elm_Pan_Smart_Data *psd) +_elm_pan_evas_object_smart_show(Eo *obj, Elm_Pan_Smart_Data *psd) { eo_do_super(obj, MY_PAN_CLASS, evas_obj_smart_show()); @@ -130,7 +130,7 @@ _elm_pan_evas_smart_show(Eo *obj, Elm_Pan_Smart_Data *psd) } EOLIAN static void -_elm_pan_evas_smart_hide(Eo *obj, Elm_Pan_Smart_Data *psd) +_elm_pan_evas_object_smart_hide(Eo *obj, Elm_Pan_Smart_Data *psd) { eo_do_super(obj, MY_PAN_CLASS, evas_obj_smart_hide()); @@ -4291,7 +4291,7 @@ _elm_interface_scrollable_movement_block_get(Eo *obj EINA_UNUSED, Elm_Scrollable } EOLIAN static void -_elm_interface_scrollable_evas_smart_add(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid) +_elm_interface_scrollable_evas_object_smart_add(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid) { memset(sid, 0, sizeof(*sid)); @@ -4326,7 +4326,7 @@ _elm_interface_scrollable_evas_smart_add(Eo *obj, Elm_Scrollable_Smart_Interface } EOLIAN static void -_elm_interface_scrollable_evas_smart_del(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid) +_elm_interface_scrollable_evas_object_smart_del(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid) { eo_do_super(obj, MY_SCROLLABLE_INTERFACE, evas_obj_smart_del()); diff --git a/legacy/elementary/src/lib/elm_interface_scrollable.eo b/legacy/elementary/src/lib/elm_interface_scrollable.eo index 15af4c3b3f..7339d7337b 100644 --- a/legacy/elementary/src/lib/elm_interface_scrollable.eo +++ b/legacy/elementary/src/lib/elm_interface_scrollable.eo @@ -1,4 +1,4 @@ -mixin Elm_Interface_Scrollable(Evas_Scrollable_Interface, Evas_Smart) +mixin Elm_Interface_Scrollable(Evas_Scrollable_Interface, Evas_Object_Smart) { legacy_prefix: null; eo_prefix: elm_interface_scrollable; @@ -514,8 +514,8 @@ mixin Elm_Interface_Scrollable(Evas_Scrollable_Interface, Evas_Smart) implements { Eo_Base::constructor; class::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; } events { changed; diff --git a/legacy/elementary/src/lib/elm_inwin.c b/legacy/elementary/src/lib/elm_inwin.c index 422f926e7f..2e6cecd0ea 100644 --- a/legacy/elementary/src/lib/elm_inwin.c +++ b/legacy/elementary/src/lib/elm_inwin.c @@ -8,7 +8,7 @@ #include "elm_widget_inwin.h" #include "elm_widget_layout.h" -#define MY_CLASS ELM_OBJ_WIN_INWIN_CLASS +#define MY_CLASS ELM_INWIN_CLASS #define MY_CLASS_NAME "Elm_Inwin" #define MY_CLASS_NAME_LEGACY "elm_inwin" @@ -63,7 +63,7 @@ _elm_inwin_elm_widget_focus_next(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Elm } EOLIAN static void -_elm_inwin_evas_smart_add(Eo *obj, void *_pd EINA_UNUSED) +_elm_inwin_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); @@ -107,7 +107,7 @@ _elm_inwin_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED) eo_do(obj, parent = eo_parent_get()); - if (parent && !eo_isa(parent, ELM_OBJ_WIN_CLASS)) + if (parent && !eo_isa(parent, ELM_WIN_CLASS)) { eo_error_set(obj); /* *has* to have a parent window */ return; diff --git a/legacy/elementary/src/lib/elm_inwin.eo b/legacy/elementary/src/lib/elm_inwin.eo index 276b2517a1..82e78df1c4 100644 --- a/legacy/elementary/src/lib/elm_inwin.eo +++ b/legacy/elementary/src/lib/elm_inwin.eo @@ -23,7 +23,7 @@ class Elm_Inwin (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; + Evas_Object_Smart::add; Elm_Widget::parent::set; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_next; diff --git a/legacy/elementary/src/lib/elm_label.c b/legacy/elementary/src/lib/elm_label.c index 2dd7046f6d..7f06430ee9 100644 --- a/legacy/elementary/src/lib/elm_label.c +++ b/legacy/elementary/src/lib/elm_label.c @@ -8,7 +8,7 @@ #include "elm_widget_layout.h" #include "elm_widget_label.h" -#define MY_CLASS ELM_OBJ_LABEL_CLASS +#define MY_CLASS ELM_LABEL_CLASS #define MY_CLASS_NAME "Elm_Label" #define MY_CLASS_NAME_LEGACY "elm_label" @@ -353,7 +353,7 @@ _on_slide_end(void *data, Evas_Object *obj EINA_UNUSED, } EOLIAN static void -_elm_label_evas_smart_add(Eo *obj, Elm_Label_Data *priv) +_elm_label_evas_object_smart_add(Eo *obj, Elm_Label_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); diff --git a/legacy/elementary/src/lib/elm_label.eo b/legacy/elementary/src/lib/elm_label.eo index ee7de19f92..524bb3367c 100644 --- a/legacy/elementary/src/lib/elm_label.eo +++ b/legacy/elementary/src/lib/elm_label.eo @@ -190,7 +190,7 @@ class Elm_Label (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; + Evas_Object_Smart::add; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_direction_manager_is; Elm_Widget::theme_apply; diff --git a/legacy/elementary/src/lib/elm_layout.c b/legacy/elementary/src/lib/elm_layout.c index d6fa3fc65e..9f439338e7 100644 --- a/legacy/elementary/src/lib/elm_layout.c +++ b/legacy/elementary/src/lib/elm_layout.c @@ -7,7 +7,7 @@ #include "elm_priv.h" #include "elm_widget_layout.h" -#define MY_CLASS ELM_OBJ_LAYOUT_CLASS +#define MY_CLASS ELM_LAYOUT_CLASS #define MY_CLASS_NAME "Elm_Layout" #define MY_CLASS_NAME_LEGACY "elm_layout" @@ -729,7 +729,7 @@ _on_size_evaluate_signal(void *data, } EOLIAN static void -_elm_layout_evas_smart_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED) +_elm_layout_evas_object_smart_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED) { Evas_Object *edje; @@ -750,7 +750,7 @@ _elm_layout_evas_smart_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED) } EOLIAN static void -_elm_layout_evas_smart_del(Eo *obj, Elm_Layout_Smart_Data *sd) +_elm_layout_evas_object_smart_del(Eo *obj, Elm_Layout_Smart_Data *sd) { Elm_Layout_Sub_Object_Data *sub_d; Elm_Layout_Sub_Object_Cursor *pc; @@ -808,7 +808,7 @@ _elm_layout_evas_smart_del(Eo *obj, Elm_Layout_Smart_Data *sd) /* rewrite or extend this one on your derived class as to suit your * needs */ EOLIAN static void -_elm_layout_evas_smart_calculate(Eo *obj, Elm_Layout_Smart_Data *sd) +_elm_layout_evas_object_smart_calculate(Eo *obj, Elm_Layout_Smart_Data *sd) { if (sd->needs_size_calc) { @@ -1672,7 +1672,7 @@ _elm_layout_eo_base_dbg_info_get(Eo *eo_obj, Elm_Layout_Smart_Data *_pd EINA_UNU eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root)); ELM_WIDGET_DATA_GET_OR_RETURN(eo_obj, wd); - if (wd->resize_obj && eo_isa(wd->resize_obj, EDJE_OBJ_CLASS)) + if (wd->resize_obj && eo_isa(wd->resize_obj, EDJE_CLASS)) { Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); const char *file, *edje_group; diff --git a/legacy/elementary/src/lib/elm_layout.eo b/legacy/elementary/src/lib/elm_layout.eo index 0cb8d878ee..54ff1acce4 100644 --- a/legacy/elementary/src/lib/elm_layout.eo +++ b/legacy/elementary/src/lib/elm_layout.eo @@ -652,9 +652,9 @@ class Elm_Layout (Elm_Container) class::constructor; Eo_Base::constructor; Eo_Base::dbg_info_get; - Evas_Smart::del; - Evas_Smart::add; - Evas_Smart::calculate; + Evas_Object_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::calculate; Elm_Widget::focus_direction; Elm_Widget::sub_object_add; Elm_Widget::theme_apply; diff --git a/legacy/elementary/src/lib/elm_list.c b/legacy/elementary/src/lib/elm_list.c index 4eaa8e16e3..eb48c4da83 100644 --- a/legacy/elementary/src/lib/elm_list.c +++ b/legacy/elementary/src/lib/elm_list.c @@ -8,7 +8,7 @@ #include "elm_widget_list.h" #include "elm_interface_scrollable.h" -#define MY_CLASS ELM_OBJ_LIST_CLASS +#define MY_CLASS ELM_LIST_CLASS #define MY_CLASS_NAME "Elm_List" #define MY_CLASS_NAME_LEGACY "elm_list" @@ -2202,7 +2202,7 @@ _elm_list_elm_widget_focus_next(Eo *obj, Elm_List_Data *sd, Elm_Focus_Direction } EOLIAN static void -_elm_list_evas_smart_add(Eo *obj, Elm_List_Data *priv) +_elm_list_evas_object_smart_add(Eo *obj, Elm_List_Data *priv) { Evas_Coord minw, minh; @@ -2268,7 +2268,7 @@ _elm_list_evas_smart_add(Eo *obj, Elm_List_Data *priv) } EOLIAN static void -_elm_list_evas_smart_del(Eo *obj, Elm_List_Data *sd) +_elm_list_evas_object_smart_del(Eo *obj, Elm_List_Data *sd) { const Eina_List *l; Elm_List_Item *it; @@ -2315,7 +2315,7 @@ _elm_list_evas_smart_del(Eo *obj, Elm_List_Data *sd) } EOLIAN static void -_elm_list_evas_smart_move(Eo *obj, Elm_List_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_list_evas_object_smart_move(Eo *obj, Elm_List_Data *sd, Evas_Coord x, Evas_Coord y) { eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); @@ -2323,7 +2323,7 @@ _elm_list_evas_smart_move(Eo *obj, Elm_List_Data *sd, Evas_Coord x, Evas_Coord y } EOLIAN static void -_elm_list_evas_smart_resize(Eo *obj, Elm_List_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_list_evas_object_smart_resize(Eo *obj, Elm_List_Data *sd, Evas_Coord w, Evas_Coord h) { eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); @@ -2331,7 +2331,7 @@ _elm_list_evas_smart_resize(Eo *obj, Elm_List_Data *sd, Evas_Coord w, Evas_Coord } EOLIAN static void -_elm_list_evas_smart_member_add(Eo *obj, Elm_List_Data *sd, Evas_Object *member) +_elm_list_evas_object_smart_member_add(Eo *obj, Elm_List_Data *sd, Evas_Object *member) { eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member)); diff --git a/legacy/elementary/src/lib/elm_list.eo b/legacy/elementary/src/lib/elm_list.eo index 1cef44557c..95650032fd 100644 --- a/legacy/elementary/src/lib/elm_list.eo +++ b/legacy/elementary/src/lib/elm_list.eo @@ -588,11 +588,11 @@ class Elm_List (Elm_Layout, Elm_Interface_Scrollable) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::member_add; - Evas_Smart::move; - Evas_Smart::add; - Evas_Smart::del; - Evas_Smart::resize; + Evas_Object_Smart::member_add; + Evas_Object_Smart::move; + Evas_Object_Smart::add; + Evas_Object_Smart::del; + Evas_Object_Smart::resize; Elm_Widget::theme_apply; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_direction_manager_is; diff --git a/legacy/elementary/src/lib/elm_map.c b/legacy/elementary/src/lib/elm_map.c index d660874095..69c5cae11a 100644 --- a/legacy/elementary/src/lib/elm_map.c +++ b/legacy/elementary/src/lib/elm_map.c @@ -8,12 +8,12 @@ #include "elm_widget_map.h" #include "elm_interface_scrollable.h" -#define MY_PAN_CLASS ELM_OBJ_MAP_PAN_CLASS +#define MY_PAN_CLASS ELM_MAP_PAN_CLASS #define MY_PAN_CLASS_NAME "Elm_Map_Pan" #define MY_PAN_CLASS_NAME_LEGACY "elm_map_pan" -#define MY_CLASS ELM_OBJ_MAP_CLASS +#define MY_CLASS ELM_MAP_CLASS #define MY_CLASS_NAME "Elm_Map" #define MY_CLASS_NAME_LEGACY "elm_map" @@ -3814,7 +3814,7 @@ _elm_map_pan_elm_pan_content_size_get(Eo *obj EINA_UNUSED, Elm_Map_Pan_Data *psd } EOLIAN static void -_elm_map_pan_evas_smart_resize(Eo *obj, Elm_Map_Pan_Data *psd, Evas_Coord w EINA_UNUSED, Evas_Coord h EINA_UNUSED) +_elm_map_pan_evas_object_smart_resize(Eo *obj, Elm_Map_Pan_Data *psd, Evas_Coord w EINA_UNUSED, Evas_Coord h EINA_UNUSED) { _sizing_eval(psd->wsd->obj); elm_map_zoom_mode_set(psd->wobj, psd->wsd->mode); @@ -3822,7 +3822,7 @@ _elm_map_pan_evas_smart_resize(Eo *obj, Elm_Map_Pan_Data *psd, Evas_Coord w EINA } EOLIAN static void -_elm_map_pan_evas_smart_calculate(Eo *obj, Elm_Map_Pan_Data *psd) +_elm_map_pan_evas_object_smart_calculate(Eo *obj, Elm_Map_Pan_Data *psd) { Evas_Coord w, h; @@ -3836,7 +3836,7 @@ _elm_map_pan_evas_smart_calculate(Eo *obj, Elm_Map_Pan_Data *psd) } EOLIAN static void -_elm_map_pan_evas_smart_move(Eo *obj, Elm_Map_Pan_Data *_pd EINA_UNUSED, Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED) +_elm_map_pan_evas_object_smart_move(Eo *obj, Elm_Map_Pan_Data *_pd EINA_UNUSED, Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED) { evas_object_smart_changed(obj); } @@ -3986,7 +3986,7 @@ _elm_map_elm_widget_event(Eo *obj, Elm_Map_Data *sd EINA_UNUSED, Evas_Object *sr } EOLIAN static void -_elm_map_evas_smart_add(Eo *obj, Elm_Map_Data *priv) +_elm_map_evas_object_smart_add(Eo *obj, Elm_Map_Data *priv) { Evas_Coord minw, minh; Elm_Map_Pan_Data *pan_data; @@ -4095,7 +4095,7 @@ _elm_map_evas_smart_add(Eo *obj, Elm_Map_Data *priv) } EOLIAN static void -_elm_map_evas_smart_del(Eo *obj, Elm_Map_Data *sd) +_elm_map_evas_object_smart_del(Eo *obj, Elm_Map_Data *sd) { Elm_Map_Route *r; Elm_Map_Name *na; @@ -4156,7 +4156,7 @@ _elm_map_evas_smart_del(Eo *obj, Elm_Map_Data *sd) } EOLIAN static void -_elm_map_evas_smart_move(Eo *obj, Elm_Map_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_map_evas_object_smart_move(Eo *obj, Elm_Map_Data *sd, Evas_Coord x, Evas_Coord y) { eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); @@ -4164,7 +4164,7 @@ _elm_map_evas_smart_move(Eo *obj, Elm_Map_Data *sd, Evas_Coord x, Evas_Coord y) } EOLIAN static void -_elm_map_evas_smart_resize(Eo *obj, Elm_Map_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_map_evas_object_smart_resize(Eo *obj, Elm_Map_Data *sd, Evas_Coord w, Evas_Coord h) { eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); @@ -4172,7 +4172,7 @@ _elm_map_evas_smart_resize(Eo *obj, Elm_Map_Data *sd, Evas_Coord w, Evas_Coord h } EOLIAN static void -_elm_map_evas_smart_member_add(Eo *obj, Elm_Map_Data *sd, Evas_Object *member) +_elm_map_evas_object_smart_member_add(Eo *obj, Elm_Map_Data *sd, Evas_Object *member) { eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member)); diff --git a/legacy/elementary/src/lib/elm_map.eo b/legacy/elementary/src/lib/elm_map.eo index 847a2518c0..f71e8c0aaf 100644 --- a/legacy/elementary/src/lib/elm_map.eo +++ b/legacy/elementary/src/lib/elm_map.eo @@ -766,11 +766,11 @@ class Elm_Map (Elm_Widget, Elm_Interface_Scrollable) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::move; - Evas_Smart::add; - Evas_Smart::del; - Evas_Smart::member_add; - Evas_Smart::resize; + Evas_Object_Smart::move; + Evas_Object_Smart::add; + Evas_Object_Smart::del; + Evas_Object_Smart::member_add; + Evas_Object_Smart::resize; Elm_Widget::theme_apply; Elm_Widget::on_focus; Elm_Widget::event; diff --git a/legacy/elementary/src/lib/elm_map_pan.eo b/legacy/elementary/src/lib/elm_map_pan.eo index e24b884ce8..316bb29193 100644 --- a/legacy/elementary/src/lib/elm_map_pan.eo +++ b/legacy/elementary/src/lib/elm_map_pan.eo @@ -4,9 +4,9 @@ class Elm_Map_Pan (Elm_Pan) implements { class::constructor; Eo_Base::destructor; - Evas_Smart::calculate; - Evas_Smart::move; - Evas_Smart::resize; + Evas_Object_Smart::calculate; + Evas_Object_Smart::move; + Evas_Object_Smart::resize; Elm_Pan::content_size::get; Elm_Pan::pos; Elm_Pan::pos_min::get; diff --git a/legacy/elementary/src/lib/elm_mapbuf.c b/legacy/elementary/src/lib/elm_mapbuf.c index a2324a8611..c75b57192a 100644 --- a/legacy/elementary/src/lib/elm_mapbuf.c +++ b/legacy/elementary/src/lib/elm_mapbuf.c @@ -8,7 +8,7 @@ #include "elm_widget_mapbuf.h" #include "elm_widget_container.h" -#define MY_CLASS ELM_OBJ_MAPBUF_CLASS +#define MY_CLASS ELM_MAPBUF_CLASS #define MY_CLASS_NAME "Elm_Mapbuf" #define MY_CLASS_NAME_LEGACY "elm_mapbuf" @@ -150,7 +150,7 @@ _mapbuf_auto_smooth(Evas_Object *obj EINA_UNUSED, Elm_Mapbuf_Data *sd) } EOLIAN static void -_elm_mapbuf_evas_smart_move(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_mapbuf_evas_object_smart_move(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord x, Evas_Coord y) { eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); @@ -160,7 +160,7 @@ _elm_mapbuf_evas_smart_move(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord x, Evas_Coo } EOLIAN static void -_elm_mapbuf_evas_smart_resize(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_mapbuf_evas_object_smart_resize(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord w, Evas_Coord h) { eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); @@ -170,7 +170,7 @@ _elm_mapbuf_evas_smart_resize(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord w, Evas_C } EOLIAN static void -_elm_mapbuf_evas_smart_show(Eo *obj, Elm_Mapbuf_Data *sd) +_elm_mapbuf_evas_object_smart_show(Eo *obj, Elm_Mapbuf_Data *sd) { eo_do_super(obj, MY_CLASS, evas_obj_smart_show()); @@ -179,7 +179,7 @@ _elm_mapbuf_evas_smart_show(Eo *obj, Elm_Mapbuf_Data *sd) } EOLIAN static void -_elm_mapbuf_evas_smart_hide(Eo *obj, Elm_Mapbuf_Data *sd) +_elm_mapbuf_evas_object_smart_hide(Eo *obj, Elm_Mapbuf_Data *sd) { eo_do_super(obj, MY_CLASS, evas_obj_smart_hide()); @@ -240,7 +240,7 @@ _elm_mapbuf_elm_container_content_unset(Eo *obj, Elm_Mapbuf_Data *sd, const char } EOLIAN static void -_elm_mapbuf_evas_smart_del(Eo *obj, Elm_Mapbuf_Data *priv) +_elm_mapbuf_evas_object_smart_del(Eo *obj, Elm_Mapbuf_Data *priv) { ELM_SAFE_FREE(priv->idler, ecore_idler_del); ELM_SAFE_FREE(priv->map, evas_map_free); @@ -249,7 +249,7 @@ _elm_mapbuf_evas_smart_del(Eo *obj, Elm_Mapbuf_Data *priv) } EOLIAN static void -_elm_mapbuf_evas_smart_add(Eo *obj, Elm_Mapbuf_Data *priv) +_elm_mapbuf_evas_object_smart_add(Eo *obj, Elm_Mapbuf_Data *priv) { Evas_Object *rect = evas_object_rectangle_add(evas_object_evas_get(obj)); int i; diff --git a/legacy/elementary/src/lib/elm_mapbuf.eo b/legacy/elementary/src/lib/elm_mapbuf.eo index 37ba8b1bf8..920cd1d4f0 100644 --- a/legacy/elementary/src/lib/elm_mapbuf.eo +++ b/legacy/elementary/src/lib/elm_mapbuf.eo @@ -178,12 +178,12 @@ class Elm_Mapbuf (Elm_Container) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::hide; - Evas_Smart::show; - Evas_Smart::move; - Evas_Smart::add; - Evas_Smart::del; - Evas_Smart::resize; + Evas_Object_Smart::hide; + Evas_Object_Smart::show; + Evas_Object_Smart::move; + Evas_Object_Smart::add; + Evas_Object_Smart::del; + Evas_Object_Smart::resize; Elm_Widget::theme_apply; Elm_Widget::sub_object_del; Elm_Container::content_get; diff --git a/legacy/elementary/src/lib/elm_menu.c b/legacy/elementary/src/lib/elm_menu.c index 8dff130189..aa4c02582b 100644 --- a/legacy/elementary/src/lib/elm_menu.c +++ b/legacy/elementary/src/lib/elm_menu.c @@ -7,7 +7,7 @@ #include "elm_priv.h" #include "elm_widget_menu.h" -#define MY_CLASS ELM_OBJ_MENU_CLASS +#define MY_CLASS ELM_MENU_CLASS #define MY_CLASS_NAME "Elm_Menu" #define MY_CLASS_NAME_LEGACY "elm_menu" @@ -103,7 +103,7 @@ _submenu_sizing_eval(Elm_Menu_Item *parent_it) evas_object_geometry_get(VIEW(parent_it), &x2, &y2, &w2, &h2); evas_object_geometry_get(parent_it->submenu.bx, &bx, &by, &bw, &bh); evas_object_geometry_get(sd->parent, &px, &py, &pw, &ph); - if (eo_isa(sd->parent, ELM_OBJ_WIN_CLASS)) + if (eo_isa(sd->parent, ELM_WIN_CLASS)) { px = 0; py = 0; @@ -165,7 +165,7 @@ _sizing_eval(Evas_Object *obj) evas_object_geometry_get(sd->location, NULL, NULL, &w_p, &h_p); evas_object_geometry_get(sd->parent, &x2, &y2, &w2, &h2); - if (eo_isa(sd->parent, ELM_OBJ_WIN_CLASS)) + if (eo_isa(sd->parent, ELM_WIN_CLASS)) { x2 = 0; y2 = 0; @@ -189,7 +189,7 @@ _sizing_eval(Evas_Object *obj) evas_object_size_hint_max_set(sd->location, bw, h_p); elm_hover_target_set(sd->hv, sd->location); - hover = eo_data_scope_get(sd->hv, ELM_OBJ_WIDGET_CLASS); + hover = eo_data_scope_get(sd->hv, ELM_WIDGET_CLASS); edje_object_part_geometry_get(hover->resize_obj, "bottom", NULL, NULL, &bw, &bh); evas_object_size_hint_min_set(obj, bw, bh); @@ -522,7 +522,7 @@ _unblock_menu(void *_sd, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU } EOLIAN static void -_elm_menu_evas_smart_show(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd) +_elm_menu_evas_object_smart_show(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd) { evas_object_show(sd->hv); } @@ -634,7 +634,7 @@ _item_submenu_obj_create(Elm_Menu_Item *item) } EOLIAN static void -_elm_menu_evas_smart_add(Eo *obj, Elm_Menu_Data *priv) +_elm_menu_evas_object_smart_add(Eo *obj, Elm_Menu_Data *priv) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); @@ -660,7 +660,7 @@ _elm_menu_evas_smart_add(Eo *obj, Elm_Menu_Data *priv) } EOLIAN static void -_elm_menu_evas_smart_del(Eo *obj, Elm_Menu_Data *sd) +_elm_menu_evas_object_smart_del(Eo *obj, Elm_Menu_Data *sd) { Elm_Menu_Item *item; diff --git a/legacy/elementary/src/lib/elm_menu.eo b/legacy/elementary/src/lib/elm_menu.eo index 4dba00703c..a13bd077f7 100644 --- a/legacy/elementary/src/lib/elm_menu.eo +++ b/legacy/elementary/src/lib/elm_menu.eo @@ -115,9 +115,9 @@ class Elm_Menu (Elm_Widget, Evas_Clickable_Interface) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::show; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::show; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::parent; Elm_Widget::theme_apply; Elm_Widget::translate; diff --git a/legacy/elementary/src/lib/elm_notify.c b/legacy/elementary/src/lib/elm_notify.c index 7eab484b22..0a78b0e4f7 100644 --- a/legacy/elementary/src/lib/elm_notify.c +++ b/legacy/elementary/src/lib/elm_notify.c @@ -8,7 +8,7 @@ #include "elm_widget_notify.h" #include "elm_widget_container.h" -#define MY_CLASS ELM_OBJ_NOTIFY_CLASS +#define MY_CLASS ELM_NOTIFY_CLASS #define MY_CLASS_NAME "Elm_Notify" #define MY_CLASS_NAME_LEGACY "elm_notify" @@ -112,7 +112,7 @@ _sizing_eval(Evas_Object *obj) if (!sd->parent) return; evas_object_geometry_get(sd->parent, &x, &y, &w, &h); - if (eo_isa(sd->parent, ELM_OBJ_WIN_CLASS)) + if (eo_isa(sd->parent, ELM_WIN_CLASS)) { x = 0; y = 0; @@ -214,7 +214,7 @@ _restack_cb(void *data EINA_UNUSED, } EOLIAN static void -_elm_notify_evas_smart_resize(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED, Evas_Coord w, Evas_Coord h) +_elm_notify_evas_object_smart_resize(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED, Evas_Coord w, Evas_Coord h) { eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); @@ -222,7 +222,7 @@ _elm_notify_evas_smart_resize(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED, Evas_Coo } EOLIAN static void -_elm_notify_evas_smart_move(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED, Evas_Coord x, Evas_Coord y) +_elm_notify_evas_object_smart_move(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED, Evas_Coord x, Evas_Coord y) { eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); @@ -268,7 +268,7 @@ _timer_init(Evas_Object *obj, } EOLIAN static void -_elm_notify_evas_smart_show(Eo *obj, Elm_Notify_Data *sd) +_elm_notify_evas_object_smart_show(Eo *obj, Elm_Notify_Data *sd) { sd->had_hidden = EINA_FALSE; sd->in_timeout = EINA_FALSE; @@ -281,7 +281,7 @@ _elm_notify_evas_smart_show(Eo *obj, Elm_Notify_Data *sd) } EOLIAN static void -_elm_notify_evas_smart_hide(Eo *obj, Elm_Notify_Data *sd) +_elm_notify_evas_object_smart_hide(Eo *obj, Elm_Notify_Data *sd) { const char *hide_signal; @@ -419,7 +419,7 @@ _hide_finished_cb(void *data, } EOLIAN static void -_elm_notify_evas_smart_add(Eo *obj, Elm_Notify_Data *priv) +_elm_notify_evas_object_smart_add(Eo *obj, Elm_Notify_Data *priv) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); @@ -440,7 +440,7 @@ _elm_notify_evas_smart_add(Eo *obj, Elm_Notify_Data *priv) } EOLIAN static void -_elm_notify_evas_smart_del(Eo *obj, Elm_Notify_Data *sd) +_elm_notify_evas_object_smart_del(Eo *obj, Elm_Notify_Data *sd) { edje_object_signal_callback_del_full (sd->notify, "elm,action,hide,finished", "elm", _hide_finished_cb, obj); diff --git a/legacy/elementary/src/lib/elm_notify.eo b/legacy/elementary/src/lib/elm_notify.eo index 20826802a1..671e168de9 100644 --- a/legacy/elementary/src/lib/elm_notify.eo +++ b/legacy/elementary/src/lib/elm_notify.eo @@ -86,12 +86,12 @@ class Elm_Notify (Elm_Container) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::hide; - Evas_Smart::show; - Evas_Smart::move; - Evas_Smart::add; - Evas_Smart::del; - Evas_Smart::resize; + Evas_Object_Smart::hide; + Evas_Object_Smart::show; + Evas_Object_Smart::move; + Evas_Object_Smart::add; + Evas_Object_Smart::del; + Evas_Object_Smart::resize; Elm_Widget::focus_direction; Elm_Widget::parent; Elm_Widget::theme_apply; diff --git a/legacy/elementary/src/lib/elm_pan.eo b/legacy/elementary/src/lib/elm_pan.eo index f530d78e7d..6194b2db7d 100644 --- a/legacy/elementary/src/lib/elm_pan.eo +++ b/legacy/elementary/src/lib/elm_pan.eo @@ -58,12 +58,12 @@ class Elm_Pan (Evas_Smart_Clipped) implements { Eo_Base::constructor; class::constructor; - Evas_Smart::hide; - Evas_Smart::show; - Evas_Smart::move; - Evas_Smart::add; - Evas_Smart::del; - Evas_Smart::resize; + Evas_Object_Smart::hide; + Evas_Object_Smart::show; + Evas_Object_Smart::move; + Evas_Object_Smart::add; + Evas_Object_Smart::del; + Evas_Object_Smart::resize; } events { changed; diff --git a/legacy/elementary/src/lib/elm_panel.c b/legacy/elementary/src/lib/elm_panel.c index b0cc7d4707..5b86ad7a08 100644 --- a/legacy/elementary/src/lib/elm_panel.c +++ b/legacy/elementary/src/lib/elm_panel.c @@ -9,7 +9,7 @@ #include "els_box.h" -#define MY_CLASS ELM_OBJ_PANEL_CLASS +#define MY_CLASS ELM_PANEL_CLASS #define MY_CLASS_NAME "Elm_Panel" #define MY_CLASS_NAME_LEGACY "elm_panel" @@ -33,7 +33,7 @@ _mirrored_set(Evas_Object *obj, { ELM_PANEL_DATA_GET(obj, sd); - if ((sd->content) && (eo_isa(sd->content, ELM_OBJ_WIDGET_CLASS))) + if ((sd->content) && (eo_isa(sd->content, ELM_WIDGET_CLASS))) elm_widget_mirrored_set(sd->content, rtl); elm_panel_orient_set(obj, elm_panel_orient_get(obj)); } @@ -318,7 +318,7 @@ _elm_panel_elm_container_content_unset(Eo *obj, Elm_Panel_Data *sd, const char * } EOLIAN static void -_elm_panel_evas_smart_add(Eo *obj, Elm_Panel_Data *priv) +_elm_panel_evas_object_smart_add(Eo *obj, Elm_Panel_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -365,7 +365,7 @@ _elm_panel_evas_smart_add(Eo *obj, Elm_Panel_Data *priv) } EOLIAN static void -_elm_panel_evas_smart_del(Eo *obj, Elm_Panel_Data *sd) +_elm_panel_evas_object_smart_del(Eo *obj, Elm_Panel_Data *sd) { Evas_Object *child; Eina_List *l; diff --git a/legacy/elementary/src/lib/elm_panel.eo b/legacy/elementary/src/lib/elm_panel.eo index a588726856..3199c0ecaa 100644 --- a/legacy/elementary/src/lib/elm_panel.eo +++ b/legacy/elementary/src/lib/elm_panel.eo @@ -58,8 +58,8 @@ class Elm_Panel (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::theme_apply; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_next; diff --git a/legacy/elementary/src/lib/elm_panes.c b/legacy/elementary/src/lib/elm_panes.c index 9c20e1cc06..d3658f2462 100644 --- a/legacy/elementary/src/lib/elm_panes.c +++ b/legacy/elementary/src/lib/elm_panes.c @@ -8,7 +8,7 @@ #include "elm_widget_layout.h" #include "elm_widget_panes.h" -#define MY_CLASS ELM_OBJ_PANES_CLASS +#define MY_CLASS ELM_PANES_CLASS #define MY_CLASS_NAME "Elm_Panes" #define MY_CLASS_NAME_LEGACY "elm_panes" @@ -175,7 +175,7 @@ _on_unpressed(void *data, } EOLIAN static void -_elm_panes_evas_smart_add(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED) +_elm_panes_evas_object_smart_add(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); ELM_PANES_DATA_GET(obj, sd); diff --git a/legacy/elementary/src/lib/elm_panes.eo b/legacy/elementary/src/lib/elm_panes.eo index 3fdefd4bca..0bdbd084be 100644 --- a/legacy/elementary/src/lib/elm_panes.eo +++ b/legacy/elementary/src/lib/elm_panes.eo @@ -144,7 +144,7 @@ class Elm_Panes (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; + Evas_Object_Smart::add; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_next; Elm_Widget::theme_apply; diff --git a/legacy/elementary/src/lib/elm_photo.c b/legacy/elementary/src/lib/elm_photo.c index 2618da3fb5..7aa012a72e 100644 --- a/legacy/elementary/src/lib/elm_photo.c +++ b/legacy/elementary/src/lib/elm_photo.c @@ -7,7 +7,7 @@ #include "elm_priv.h" #include "elm_widget_photo.h" -#define MY_CLASS ELM_OBJ_PHOTO_CLASS +#define MY_CLASS ELM_PHOTO_CLASS #define MY_CLASS_NAME "Elm_Photo" #define MY_CLASS_NAME_LEGACY "elm_photo" @@ -249,7 +249,7 @@ _on_thumb_done(void *data, } EOLIAN static void -_elm_photo_evas_smart_add(Eo *obj, Elm_Photo_Data *priv) +_elm_photo_evas_object_smart_add(Eo *obj, Elm_Photo_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -293,7 +293,7 @@ _elm_photo_evas_smart_add(Eo *obj, Elm_Photo_Data *priv) } EOLIAN static void -_elm_photo_evas_smart_del(Eo *obj, Elm_Photo_Data *sd) +_elm_photo_evas_object_smart_del(Eo *obj, Elm_Photo_Data *sd) { ecore_timer_del(sd->long_press_timer); diff --git a/legacy/elementary/src/lib/elm_photo.eo b/legacy/elementary/src/lib/elm_photo.eo index 54284480a5..8cf130f0ca 100644 --- a/legacy/elementary/src/lib/elm_photo.eo +++ b/legacy/elementary/src/lib/elm_photo.eo @@ -108,8 +108,8 @@ class Elm_Photo (Elm_Widget, Evas_Clickable_Interface, Evas_Draggable_Interface) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::theme_apply; } events { diff --git a/legacy/elementary/src/lib/elm_photocam.c b/legacy/elementary/src/lib/elm_photocam.c index d98c380691..e71787d0b1 100644 --- a/legacy/elementary/src/lib/elm_photocam.c +++ b/legacy/elementary/src/lib/elm_photocam.c @@ -8,12 +8,12 @@ #include "elm_widget_photocam.h" #include "elm_interface_scrollable.h" -#define MY_PAN_CLASS ELM_OBJ_PHOTOCAM_PAN_CLASS +#define MY_PAN_CLASS ELM_PHOTOCAM_PAN_CLASS #define MY_PAN_CLASS_NAME "Elm_Photocam_Pan" #define MY_PAN_CLASS_NAME_LEGACY "elm_photocam_pan" -#define MY_CLASS ELM_OBJ_PHOTOCAM_CLASS +#define MY_CLASS ELM_PHOTOCAM_CLASS #define MY_CLASS_NAME "Elm_Photocam" #define MY_CLASS_NAME_LEGACY "elm_photocam" @@ -135,14 +135,14 @@ _calc_job_cb(void *data) } EOLIAN static void -_elm_photocam_pan_evas_smart_move(Eo *obj EINA_UNUSED, Elm_Photocam_Pan_Data *psd, Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED) +_elm_photocam_pan_evas_object_smart_move(Eo *obj EINA_UNUSED, Elm_Photocam_Pan_Data *psd, Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED) { ecore_job_del(psd->wsd->calc_job); psd->wsd->calc_job = ecore_job_add(_calc_job_cb, psd->wobj); } EOLIAN static void -_elm_photocam_pan_evas_smart_resize(Eo *obj, Elm_Photocam_Pan_Data *psd, Evas_Coord w, Evas_Coord h) +_elm_photocam_pan_evas_object_smart_resize(Eo *obj, Elm_Photocam_Pan_Data *psd, Evas_Coord w, Evas_Coord h) { Evas_Coord ow, oh; @@ -335,7 +335,7 @@ _grid_place(Evas_Object *obj, } EOLIAN static void -_elm_photocam_pan_evas_smart_calculate(Eo *obj, Elm_Photocam_Pan_Data *psd) +_elm_photocam_pan_evas_object_smart_calculate(Eo *obj, Elm_Photocam_Pan_Data *psd) { Elm_Phocam_Grid *g; Eina_List *l; @@ -1273,7 +1273,7 @@ _g_layer_zoom_end_cb(void *data, } EOLIAN static void -_elm_photocam_evas_smart_add(Eo *obj, Elm_Photocam_Data *priv) +_elm_photocam_evas_object_smart_add(Eo *obj, Elm_Photocam_Data *priv) { Eina_Bool bounce = _elm_config->thumbscroll_bounce_enable; Elm_Photocam_Pan_Data *pan_data; @@ -1350,7 +1350,7 @@ _elm_photocam_evas_smart_add(Eo *obj, Elm_Photocam_Data *priv) } EOLIAN static void -_elm_photocam_evas_smart_del(Eo *obj, Elm_Photocam_Data *sd) +_elm_photocam_evas_object_smart_del(Eo *obj, Elm_Photocam_Data *sd) { Elm_Phocam_Grid *g; @@ -1376,7 +1376,7 @@ _elm_photocam_evas_smart_del(Eo *obj, Elm_Photocam_Data *sd) } EOLIAN static void -_elm_photocam_evas_smart_move(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_photocam_evas_object_smart_move(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord x, Evas_Coord y) { eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); @@ -1384,7 +1384,7 @@ _elm_photocam_evas_smart_move(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord x, Evas } EOLIAN static void -_elm_photocam_evas_smart_resize(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_photocam_evas_object_smart_resize(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord w, Evas_Coord h) { eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); @@ -1392,7 +1392,7 @@ _elm_photocam_evas_smart_resize(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord w, Ev } EOLIAN static void -_elm_photocam_evas_smart_member_add(Eo *obj, Elm_Photocam_Data *sd, Evas_Object *member) +_elm_photocam_evas_object_smart_member_add(Eo *obj, Elm_Photocam_Data *sd, Evas_Object *member) { eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member)); diff --git a/legacy/elementary/src/lib/elm_photocam.eo b/legacy/elementary/src/lib/elm_photocam.eo index 92264d6f01..abfad9c12b 100644 --- a/legacy/elementary/src/lib/elm_photocam.eo +++ b/legacy/elementary/src/lib/elm_photocam.eo @@ -225,11 +225,11 @@ class Elm_Photocam (Elm_Widget, Elm_Interface_Scrollable) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::move; - Evas_Smart::add; - Evas_Smart::del; - Evas_Smart::member_add; - Evas_Smart::resize; + Evas_Object_Smart::move; + Evas_Object_Smart::add; + Evas_Object_Smart::del; + Evas_Object_Smart::member_add; + Evas_Object_Smart::resize; Elm_Widget::theme_apply; Elm_Widget::on_focus; Elm_Widget::event; diff --git a/legacy/elementary/src/lib/elm_photocam_pan.eo b/legacy/elementary/src/lib/elm_photocam_pan.eo index cba6938a60..3feb15bbca 100644 --- a/legacy/elementary/src/lib/elm_photocam_pan.eo +++ b/legacy/elementary/src/lib/elm_photocam_pan.eo @@ -4,9 +4,9 @@ class Elm_Photocam_Pan (Elm_Pan) implements { class::constructor; Eo_Base::destructor; - Evas_Smart::calculate; - Evas_Smart::move; - Evas_Smart::resize; + Evas_Object_Smart::calculate; + Evas_Object_Smart::move; + Evas_Object_Smart::resize; Elm_Pan::content_size::get; Elm_Pan::pos; Elm_Pan::pos_min::get; diff --git a/legacy/elementary/src/lib/elm_plug.c b/legacy/elementary/src/lib/elm_plug.c index 4ffe1b0c81..dbaccd258f 100644 --- a/legacy/elementary/src/lib/elm_plug.c +++ b/legacy/elementary/src/lib/elm_plug.c @@ -7,7 +7,7 @@ #include "elm_priv.h" #include "elm_widget_plug.h" -#define MY_CLASS ELM_OBJ_PLUG_CLASS +#define MY_CLASS ELM_PLUG_CLASS #define MY_CLASS_NAME "Elm_Plug" #define MY_CLASS_NAME_LEGACY "elm_plug" @@ -105,7 +105,7 @@ _on_mouse_up(void *data, } EOLIAN static void -_elm_plug_evas_smart_add(Eo *obj, void *sd EINA_UNUSED) +_elm_plug_evas_object_smart_add(Eo *obj, void *sd EINA_UNUSED) { Evas_Object *p_obj; Ecore_Evas *ee; diff --git a/legacy/elementary/src/lib/elm_plug.eo b/legacy/elementary/src/lib/elm_plug.eo index 49ddf14084..d2c80a9daa 100644 --- a/legacy/elementary/src/lib/elm_plug.eo +++ b/legacy/elementary/src/lib/elm_plug.eo @@ -42,7 +42,7 @@ class Elm_Plug (Elm_Widget) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; + Evas_Object_Smart::add; Elm_Widget::theme_apply; Elm_Widget::on_focus; } diff --git a/legacy/elementary/src/lib/elm_prefs.c b/legacy/elementary/src/lib/elm_prefs.c index dca9665a8d..219b1cb7a6 100644 --- a/legacy/elementary/src/lib/elm_prefs.c +++ b/legacy/elementary/src/lib/elm_prefs.c @@ -10,7 +10,7 @@ #include "Eo.h" -#define MY_CLASS ELM_OBJ_PREFS_CLASS +#define MY_CLASS ELM_PREFS_CLASS #define MY_CLASS_NAME "Elm_Prefs" #define MY_CLASS_NAME_LEGACY "elm_prefs" @@ -44,7 +44,7 @@ static Eina_Bool _prefs_item_widget_value_from_self(Elm_Prefs_Item_Node *, Eina_Bool); EOLIAN static void -_elm_prefs_evas_smart_add(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED) +_elm_prefs_evas_object_smart_add(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); @@ -445,7 +445,7 @@ _elm_prefs_data_cbs_del(Eo *obj) } EOLIAN static void -_elm_prefs_evas_smart_del(Eo *obj, Elm_Prefs_Data *sd) +_elm_prefs_evas_object_smart_del(Eo *obj, Elm_Prefs_Data *sd) { sd->delete_me = EINA_TRUE; diff --git a/legacy/elementary/src/lib/elm_prefs.eo b/legacy/elementary/src/lib/elm_prefs.eo index 6be7d85e11..84c660c878 100644 --- a/legacy/elementary/src/lib/elm_prefs.eo +++ b/legacy/elementary/src/lib/elm_prefs.eo @@ -372,8 +372,8 @@ class Elm_Prefs (Elm_Widget) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::del; - Evas_Smart::add; + Evas_Object_Smart::del; + Evas_Object_Smart::add; Elm_Widget::focus_next; } events { diff --git a/legacy/elementary/src/lib/elm_progressbar.c b/legacy/elementary/src/lib/elm_progressbar.c index 91c890d941..5c363fa5f7 100644 --- a/legacy/elementary/src/lib/elm_progressbar.c +++ b/legacy/elementary/src/lib/elm_progressbar.c @@ -8,7 +8,7 @@ #include "elm_widget_progressbar.h" #include "elm_widget_layout.h" -#define MY_CLASS ELM_OBJ_PROGRESSBAR_CLASS +#define MY_CLASS ELM_PROGRESSBAR_CLASS #define MY_CLASS_NAME "Elm_Progressbar" #define MY_CLASS_NAME_LEGACY "elm_progressbar" @@ -250,7 +250,7 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj) } EOLIAN static void -_elm_progressbar_evas_smart_add(Eo *obj, Elm_Progressbar_Data *priv) +_elm_progressbar_evas_object_smart_add(Eo *obj, Elm_Progressbar_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -289,7 +289,7 @@ _elm_progressbar_evas_smart_add(Eo *obj, Elm_Progressbar_Data *priv) } EOLIAN static void -_elm_progressbar_evas_smart_del(Eo *obj, Elm_Progressbar_Data *sd) +_elm_progressbar_evas_object_smart_del(Eo *obj, Elm_Progressbar_Data *sd) { Elm_Progress_Status *progress_obj; diff --git a/legacy/elementary/src/lib/elm_progressbar.eo b/legacy/elementary/src/lib/elm_progressbar.eo index 5aa9e0ef11..430591173b 100644 --- a/legacy/elementary/src/lib/elm_progressbar.eo +++ b/legacy/elementary/src/lib/elm_progressbar.eo @@ -278,8 +278,8 @@ class Elm_Progressbar (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::theme_apply; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_direction_manager_is; diff --git a/legacy/elementary/src/lib/elm_radio.c b/legacy/elementary/src/lib/elm_radio.c index 54204893ce..651ef103f7 100644 --- a/legacy/elementary/src/lib/elm_radio.c +++ b/legacy/elementary/src/lib/elm_radio.c @@ -8,7 +8,7 @@ #include "elm_widget_radio.h" #include "elm_widget_layout.h" -#define MY_CLASS ELM_OBJ_RADIO_CLASS +#define MY_CLASS ELM_RADIO_CLASS #define MY_CLASS_NAME "Elm_Radio" #define MY_CLASS_NAME_LEGACY "elm_radio" @@ -257,7 +257,7 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj) } EOLIAN static void -_elm_radio_evas_smart_add(Eo *obj, Elm_Radio_Data *priv) +_elm_radio_evas_object_smart_add(Eo *obj, Elm_Radio_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -287,7 +287,7 @@ _elm_radio_evas_smart_add(Eo *obj, Elm_Radio_Data *priv) } EOLIAN static void -_elm_radio_evas_smart_del(Eo *obj, Elm_Radio_Data *sd) +_elm_radio_evas_object_smart_del(Eo *obj, Elm_Radio_Data *sd) { sd->group->radios = eina_list_remove(sd->group->radios, obj); if (!sd->group->radios) free(sd->group); diff --git a/legacy/elementary/src/lib/elm_radio.eo b/legacy/elementary/src/lib/elm_radio.eo index c2b7e4d57e..7bec41f823 100644 --- a/legacy/elementary/src/lib/elm_radio.eo +++ b/legacy/elementary/src/lib/elm_radio.eo @@ -99,8 +99,8 @@ class Elm_Radio (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::theme_apply; Elm_Widget::activate; Elm_Widget::focus_next_manager_is; diff --git a/legacy/elementary/src/lib/elm_route.c b/legacy/elementary/src/lib/elm_route.c index fc518493c9..649e25cae5 100644 --- a/legacy/elementary/src/lib/elm_route.c +++ b/legacy/elementary/src/lib/elm_route.c @@ -7,7 +7,7 @@ #include "elm_priv.h" #include "elm_widget_route.h" -#define MY_CLASS ELM_OBJ_ROUTE_CLASS +#define MY_CLASS ELM_ROUTE_CLASS #define MY_CLASS_NAME "Elm_Route" #define MY_CLASS_NAME_LEGACY "elm_route" @@ -134,7 +134,7 @@ _update_lon_lat_min_max(Evas_Object *obj, #endif EOLIAN static void -_elm_route_evas_smart_add(Eo *obj, Elm_Route_Data *priv) +_elm_route_evas_object_smart_add(Eo *obj, Elm_Route_Data *priv) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); @@ -159,7 +159,7 @@ _elm_route_evas_smart_add(Eo *obj, Elm_Route_Data *priv) } EOLIAN static void -_elm_route_evas_smart_del(Eo *obj, Elm_Route_Data *_pd EINA_UNUSED) +_elm_route_evas_object_smart_del(Eo *obj, Elm_Route_Data *_pd EINA_UNUSED) { _clear_route(obj); diff --git a/legacy/elementary/src/lib/elm_route.eo b/legacy/elementary/src/lib/elm_route.eo index 3f491faf28..0f0355f0fc 100644 --- a/legacy/elementary/src/lib/elm_route.eo +++ b/legacy/elementary/src/lib/elm_route.eo @@ -44,8 +44,8 @@ class Elm_Route (Elm_Widget) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::theme_apply; } diff --git a/legacy/elementary/src/lib/elm_scroller.c b/legacy/elementary/src/lib/elm_scroller.c index 17eece2fac..2ae30ddd6b 100644 --- a/legacy/elementary/src/lib/elm_scroller.c +++ b/legacy/elementary/src/lib/elm_scroller.c @@ -9,7 +9,7 @@ #include "elm_widget_layout.h" #include "elm_widget_scroller.h" -#define MY_CLASS ELM_OBJ_SCROLLER_CLASS +#define MY_CLASS ELM_SCROLLER_CLASS #define MY_CLASS_NAME "Elm_Scroller" #define MY_CLASS_NAME_LEGACY "elm_scroller" @@ -676,7 +676,7 @@ _elm_scroller_content_viewport_resize_cb(Evas_Object *obj, } EOLIAN static void -_elm_scroller_evas_smart_add(Eo *obj, Elm_Scroller_Data *priv) +_elm_scroller_evas_object_smart_add(Eo *obj, Elm_Scroller_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); Evas_Coord minw, minh; @@ -734,7 +734,7 @@ _elm_scroller_evas_smart_add(Eo *obj, Elm_Scroller_Data *priv) } EOLIAN static void -_elm_scroller_evas_smart_move(Eo *obj, Elm_Scroller_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_scroller_evas_object_smart_move(Eo *obj, Elm_Scroller_Data *sd, Evas_Coord x, Evas_Coord y) { eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); @@ -742,7 +742,7 @@ _elm_scroller_evas_smart_move(Eo *obj, Elm_Scroller_Data *sd, Evas_Coord x, Evas } EOLIAN static void -_elm_scroller_evas_smart_resize(Eo *obj, Elm_Scroller_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_scroller_evas_object_smart_resize(Eo *obj, Elm_Scroller_Data *sd, Evas_Coord w, Evas_Coord h) { eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); @@ -750,7 +750,7 @@ _elm_scroller_evas_smart_resize(Eo *obj, Elm_Scroller_Data *sd, Evas_Coord w, Ev } EOLIAN static void -_elm_scroller_evas_smart_member_add(Eo *obj, Elm_Scroller_Data *sd, Evas_Object *member) +_elm_scroller_evas_object_smart_member_add(Eo *obj, Elm_Scroller_Data *sd, Evas_Object *member) { eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member)); diff --git a/legacy/elementary/src/lib/elm_scroller.eo b/legacy/elementary/src/lib/elm_scroller.eo index 829cb9e95c..566e20435b 100644 --- a/legacy/elementary/src/lib/elm_scroller.eo +++ b/legacy/elementary/src/lib/elm_scroller.eo @@ -78,10 +78,10 @@ class Elm_Scroller (Elm_Layout, Elm_Interface_Scrollable) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::move; - Evas_Smart::add; - Evas_Smart::member_add; - Evas_Smart::resize; + Evas_Object_Smart::move; + Evas_Object_Smart::add; + Evas_Object_Smart::member_add; + Evas_Object_Smart::resize; Elm_Widget::theme_apply; Elm_Widget::activate; Elm_Widget::focus_next_manager_is; diff --git a/legacy/elementary/src/lib/elm_segment_control.c b/legacy/elementary/src/lib/elm_segment_control.c index fb7e8f1830..db129dc0f4 100644 --- a/legacy/elementary/src/lib/elm_segment_control.c +++ b/legacy/elementary/src/lib/elm_segment_control.c @@ -7,7 +7,7 @@ #include "elm_priv.h" #include "elm_widget_segment_control.h" -#define MY_CLASS ELM_OBJ_SEGMENT_CONTROL_CLASS +#define MY_CLASS ELM_SEGMENT_CONTROL_CLASS #define MY_CLASS_NAME "Elm_Segment_Control" #define MY_CLASS_NAME_LEGACY "elm_segment_control" @@ -588,7 +588,7 @@ _item_new(Evas_Object *obj, } EOLIAN static void -_elm_segment_control_evas_smart_add(Eo *obj, Elm_Segment_Control_Data *_pd EINA_UNUSED) +_elm_segment_control_evas_object_smart_add(Eo *obj, Elm_Segment_Control_Data *_pd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); @@ -606,7 +606,7 @@ _elm_segment_control_evas_smart_add(Eo *obj, Elm_Segment_Control_Data *_pd EINA_ } EOLIAN static void -_elm_segment_control_evas_smart_del(Eo *obj, Elm_Segment_Control_Data *sd) +_elm_segment_control_evas_object_smart_del(Eo *obj, Elm_Segment_Control_Data *sd) { Elm_Segment_Item *it; diff --git a/legacy/elementary/src/lib/elm_segment_control.eo b/legacy/elementary/src/lib/elm_segment_control.eo index 150cf44900..9d9b31ca1e 100644 --- a/legacy/elementary/src/lib/elm_segment_control.eo +++ b/legacy/elementary/src/lib/elm_segment_control.eo @@ -195,8 +195,8 @@ class Elm_Segment_Control (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::theme_apply; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_next; diff --git a/legacy/elementary/src/lib/elm_separator.c b/legacy/elementary/src/lib/elm_separator.c index a2754677d7..5a48d49955 100644 --- a/legacy/elementary/src/lib/elm_separator.c +++ b/legacy/elementary/src/lib/elm_separator.c @@ -8,7 +8,7 @@ #include "elm_widget_separator.h" #include "elm_widget_layout.h" -#define MY_CLASS ELM_OBJ_SEPARATOR_CLASS +#define MY_CLASS ELM_SEPARATOR_CLASS #define MY_CLASS_NAME "Elm_Separator" #define MY_CLASS_NAME_LEGACY "elm_separator" @@ -43,7 +43,7 @@ _elm_separator_elm_layout_sizing_eval(Eo *obj, Elm_Separator_Data *sd EINA_UNUSE } EOLIAN static void -_elm_separator_evas_smart_add(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED) +_elm_separator_evas_object_smart_add(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); diff --git a/legacy/elementary/src/lib/elm_separator.eo b/legacy/elementary/src/lib/elm_separator.eo index de9970be55..1033c881e6 100644 --- a/legacy/elementary/src/lib/elm_separator.eo +++ b/legacy/elementary/src/lib/elm_separator.eo @@ -27,7 +27,7 @@ class Elm_Separator (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; + Evas_Object_Smart::add; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_direction_manager_is; Elm_Widget::theme_apply; diff --git a/legacy/elementary/src/lib/elm_slider.c b/legacy/elementary/src/lib/elm_slider.c index 40316c5388..ba321d0921 100644 --- a/legacy/elementary/src/lib/elm_slider.c +++ b/legacy/elementary/src/lib/elm_slider.c @@ -11,7 +11,7 @@ #define ELM_INTERFACE_ATSPI_VALUE_PROTECTED #include "elm_interface_atspi_value.eo.h" -#define MY_CLASS ELM_OBJ_SLIDER_CLASS +#define MY_CLASS ELM_SLIDER_CLASS #define MY_CLASS_NAME "Elm_Slider" #define MY_CLASS_NAME_LEGACY "elm_slider" @@ -767,7 +767,7 @@ _min_max_set(Evas_Object *obj) } EOLIAN static void -_elm_slider_evas_smart_calculate(Eo *obj, Elm_Slider_Data *sd) +_elm_slider_evas_object_smart_calculate(Eo *obj, Elm_Slider_Data *sd) { elm_layout_freeze(obj); @@ -823,7 +823,7 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj) } EOLIAN static void -_elm_slider_evas_smart_add(Eo *obj, Elm_Slider_Data *priv) +_elm_slider_evas_object_smart_add(Eo *obj, Elm_Slider_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -880,7 +880,7 @@ _elm_slider_evas_smart_add(Eo *obj, Elm_Slider_Data *priv) } EOLIAN static void -_elm_slider_evas_smart_del(Eo *obj, Elm_Slider_Data *sd) +_elm_slider_evas_object_smart_del(Eo *obj, Elm_Slider_Data *sd) { eina_stringshare_del(sd->indicator); eina_stringshare_del(sd->units); diff --git a/legacy/elementary/src/lib/elm_slider.eo b/legacy/elementary/src/lib/elm_slider.eo index 5eb0455f1f..ac034fe388 100644 --- a/legacy/elementary/src/lib/elm_slider.eo +++ b/legacy/elementary/src/lib/elm_slider.eo @@ -363,9 +363,9 @@ class Elm_Slider (Elm_Layout, Elm_Interface_Atspi_Value) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::calculate; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::calculate; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::theme_apply; Elm_Widget::activate; Elm_Widget::focus_next_manager_is; diff --git a/legacy/elementary/src/lib/elm_slideshow.c b/legacy/elementary/src/lib/elm_slideshow.c index 7fefb3cf64..02ce16ddb0 100644 --- a/legacy/elementary/src/lib/elm_slideshow.c +++ b/legacy/elementary/src/lib/elm_slideshow.c @@ -7,7 +7,7 @@ #include "elm_priv.h" #include "elm_widget_slideshow.h" -#define MY_CLASS ELM_OBJ_SLIDESHOW_CLASS +#define MY_CLASS ELM_SLIDESHOW_CLASS #define MY_CLASS_NAME "Elm_Slideshow" #define MY_CLASS_NAME_LEGACY "elm_slideshow" @@ -311,7 +311,7 @@ _item_del_pre_hook(Elm_Object_Item *it) } EOLIAN static void -_elm_slideshow_evas_smart_add(Eo *obj, Elm_Slideshow_Data *priv) +_elm_slideshow_evas_object_smart_add(Eo *obj, Elm_Slideshow_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -355,7 +355,7 @@ _elm_slideshow_evas_smart_add(Eo *obj, Elm_Slideshow_Data *priv) } EOLIAN static void -_elm_slideshow_evas_smart_del(Eo *obj, Elm_Slideshow_Data *sd) +_elm_slideshow_evas_object_smart_del(Eo *obj, Elm_Slideshow_Data *sd) { const char *layout; diff --git a/legacy/elementary/src/lib/elm_slideshow.eo b/legacy/elementary/src/lib/elm_slideshow.eo index 37c57d13a9..f57366dabf 100644 --- a/legacy/elementary/src/lib/elm_slideshow.eo +++ b/legacy/elementary/src/lib/elm_slideshow.eo @@ -420,8 +420,8 @@ class Elm_Slideshow (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_direction_manager_is; Elm_Widget::event; diff --git a/legacy/elementary/src/lib/elm_spinner.c b/legacy/elementary/src/lib/elm_spinner.c index 7d868c94a5..16daa81efd 100644 --- a/legacy/elementary/src/lib/elm_spinner.c +++ b/legacy/elementary/src/lib/elm_spinner.c @@ -10,7 +10,7 @@ #include "Eo.h" -#define MY_CLASS ELM_OBJ_SPINNER_CLASS +#define MY_CLASS ELM_SPINNER_CLASS #define MY_CLASS_NAME "Elm_Spinner" #define MY_CLASS_NAME_LEGACY "elm_spinner" @@ -681,7 +681,7 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool is_access) } EOLIAN static void -_elm_spinner_evas_smart_add(Eo *obj, Elm_Spinner_Data *priv) +_elm_spinner_evas_object_smart_add(Eo *obj, Elm_Spinner_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -728,7 +728,7 @@ _elm_spinner_evas_smart_add(Eo *obj, Elm_Spinner_Data *priv) } EOLIAN static void -_elm_spinner_evas_smart_del(Eo *obj, Elm_Spinner_Data *sd) +_elm_spinner_evas_object_smart_del(Eo *obj, Elm_Spinner_Data *sd) { Elm_Spinner_Special_Value *sv; diff --git a/legacy/elementary/src/lib/elm_spinner.eo b/legacy/elementary/src/lib/elm_spinner.eo index b05e8fb972..c1f6740438 100644 --- a/legacy/elementary/src/lib/elm_spinner.eo +++ b/legacy/elementary/src/lib/elm_spinner.eo @@ -364,8 +364,8 @@ class Elm_Spinner (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::theme_apply; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_direction_manager_is; diff --git a/legacy/elementary/src/lib/elm_table.c b/legacy/elementary/src/lib/elm_table.c index 79ef3aac09..e24f9e45b4 100644 --- a/legacy/elementary/src/lib/elm_table.c +++ b/legacy/elementary/src/lib/elm_table.c @@ -7,7 +7,7 @@ #include "elm_priv.h" #include "elm_widget_table.h" -#define MY_CLASS ELM_OBJ_TABLE_CLASS +#define MY_CLASS ELM_TABLE_CLASS #define MY_CLASS_NAME "Elm_Table" #define MY_CLASS_NAME_LEGACY "elm_table" @@ -162,7 +162,7 @@ _elm_table_elm_widget_sub_object_del(Eo *obj, void *_pd EINA_UNUSED, Evas_Object } EOLIAN static void -_elm_table_evas_smart_add(Eo *obj, void *_pd EINA_UNUSED) +_elm_table_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED) { Evas_Object *table; @@ -183,7 +183,7 @@ _elm_table_evas_smart_add(Eo *obj, void *_pd EINA_UNUSED) } EOLIAN static void -_elm_table_evas_smart_del(Eo *obj, void *_pd EINA_UNUSED) +_elm_table_evas_object_smart_del(Eo *obj, void *_pd EINA_UNUSED) { Eina_List *l; Evas_Object *child; diff --git a/legacy/elementary/src/lib/elm_table.eo b/legacy/elementary/src/lib/elm_table.eo index 710959c1f6..1d5216c28b 100644 --- a/legacy/elementary/src/lib/elm_table.eo +++ b/legacy/elementary/src/lib/elm_table.eo @@ -145,8 +145,8 @@ class Elm_Table (Elm_Widget) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::focus_direction; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_next; diff --git a/legacy/elementary/src/lib/elm_thumb.c b/legacy/elementary/src/lib/elm_thumb.c index d58becdcd3..1765a738f5 100644 --- a/legacy/elementary/src/lib/elm_thumb.c +++ b/legacy/elementary/src/lib/elm_thumb.c @@ -10,7 +10,7 @@ #define MY_CLASS_NAME "Elm_Thumb" #define MY_CLASS_NAME_LEGACY "elm_thumb" -#define MY_CLASS ELM_OBJ_THUMB_CLASS +#define MY_CLASS ELM_THUMB_CLASS static const char SIG_CLICKED[] = "clicked"; static const char SIG_CLICKED_DOUBLE[] = "clicked,double"; @@ -288,7 +288,7 @@ _thumb_finish(Elm_Thumb_Data *sd, ELM_SAFE_FREE(sd->thumb.thumb_key, eina_stringshare_del); ELM_SAFE_FREE(sd->view, evas_object_del); - wd = eo_data_scope_get(sd->obj, ELM_OBJ_WIDGET_CLASS); + wd = eo_data_scope_get(sd->obj, ELM_WIDGET_CLASS); edje_object_signal_emit (wd->resize_obj, EDJE_SIGNAL_LOAD_ERROR, "elm"); evas_object_smart_callback_call @@ -458,7 +458,7 @@ _thumb_show(Elm_Thumb_Data *sd) } EOLIAN static void -_elm_thumb_evas_smart_show(Eo *obj, Elm_Thumb_Data *sd) +_elm_thumb_evas_object_smart_show(Eo *obj, Elm_Thumb_Data *sd) { eo_do_super(obj, MY_CLASS, evas_obj_smart_show()); @@ -466,7 +466,7 @@ _elm_thumb_evas_smart_show(Eo *obj, Elm_Thumb_Data *sd) } EOLIAN static void -_elm_thumb_evas_smart_hide(Eo *obj, Elm_Thumb_Data *sd) +_elm_thumb_evas_object_smart_hide(Eo *obj, Elm_Thumb_Data *sd) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -531,7 +531,7 @@ elm_need_ethumb(void) } EOLIAN static void -_elm_thumb_evas_smart_add(Eo *obj, Elm_Thumb_Data *_pd EINA_UNUSED) +_elm_thumb_evas_object_smart_add(Eo *obj, Elm_Thumb_Data *_pd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -550,7 +550,7 @@ _elm_thumb_evas_smart_add(Eo *obj, Elm_Thumb_Data *_pd EINA_UNUSED) } EOLIAN static void -_elm_thumb_evas_smart_del(Eo *obj, Elm_Thumb_Data *sd) +_elm_thumb_evas_object_smart_del(Eo *obj, Elm_Thumb_Data *sd) { if (sd->thumb.request) { diff --git a/legacy/elementary/src/lib/elm_thumb.eo b/legacy/elementary/src/lib/elm_thumb.eo index af44dde120..0d0adbe13a 100644 --- a/legacy/elementary/src/lib/elm_thumb.eo +++ b/legacy/elementary/src/lib/elm_thumb.eo @@ -331,10 +331,10 @@ class Elm_Thumb (Elm_Layout, Evas_Clickable_Interface) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::hide; - Evas_Smart::add; - Evas_Smart::del; - Evas_Smart::show; + Evas_Object_Smart::hide; + Evas_Object_Smart::add; + Evas_Object_Smart::del; + Evas_Object_Smart::show; } events { clicked; diff --git a/legacy/elementary/src/lib/elm_toolbar.c b/legacy/elementary/src/lib/elm_toolbar.c index b9d5a092cd..9d51be77ad 100644 --- a/legacy/elementary/src/lib/elm_toolbar.c +++ b/legacy/elementary/src/lib/elm_toolbar.c @@ -8,7 +8,7 @@ #include "elm_widget_toolbar.h" #include "els_box.h" -#define MY_CLASS ELM_OBJ_TOOLBAR_CLASS +#define MY_CLASS ELM_TOOLBAR_CLASS #define MY_CLASS_NAME "Elm_Toolbar" #define MY_CLASS_NAME_LEGACY "elm_toolbar" @@ -2698,7 +2698,7 @@ _elm_toolbar_action_down_cb(void *data, } EOLIAN static void -_elm_toolbar_evas_smart_add(Eo *obj, Elm_Toolbar_Data *priv) +_elm_toolbar_evas_object_smart_add(Eo *obj, Elm_Toolbar_Data *priv) { Evas_Object *edje; @@ -2800,7 +2800,7 @@ _elm_toolbar_evas_smart_add(Eo *obj, Elm_Toolbar_Data *priv) } EOLIAN static void -_elm_toolbar_evas_smart_del(Eo *obj, Elm_Toolbar_Data *sd) +_elm_toolbar_evas_object_smart_del(Eo *obj, Elm_Toolbar_Data *sd) { Elm_Toolbar_Item *it, *next; @@ -2823,7 +2823,7 @@ _elm_toolbar_evas_smart_del(Eo *obj, Elm_Toolbar_Data *sd) } EOLIAN static void -_elm_toolbar_evas_smart_move(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_toolbar_evas_object_smart_move(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord x, Evas_Coord y) { eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); @@ -2831,7 +2831,7 @@ _elm_toolbar_evas_smart_move(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord x, Evas_C } EOLIAN static void -_elm_toolbar_evas_smart_resize(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_toolbar_evas_object_smart_resize(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord w, Evas_Coord h) { eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); @@ -2839,7 +2839,7 @@ _elm_toolbar_evas_smart_resize(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord w, Evas } EOLIAN static void -_elm_toolbar_evas_smart_member_add(Eo *obj, Elm_Toolbar_Data *sd, Evas_Object *member) +_elm_toolbar_evas_object_smart_member_add(Eo *obj, Elm_Toolbar_Data *sd, Evas_Object *member) { eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member)); diff --git a/legacy/elementary/src/lib/elm_toolbar.eo b/legacy/elementary/src/lib/elm_toolbar.eo index 4e4efa09ce..4741ea5243 100644 --- a/legacy/elementary/src/lib/elm_toolbar.eo +++ b/legacy/elementary/src/lib/elm_toolbar.eo @@ -501,11 +501,11 @@ class Elm_Toolbar (Elm_Widget, Elm_Interface_Scrollable) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::move; - Evas_Smart::add; - Evas_Smart::del; - Evas_Smart::member_add; - Evas_Smart::resize; + Evas_Object_Smart::move; + Evas_Object_Smart::add; + Evas_Object_Smart::del; + Evas_Object_Smart::member_add; + Evas_Object_Smart::resize; Elm_Widget::focus_next_manager_is; Elm_Widget::access; Elm_Widget::focus_next; diff --git a/legacy/elementary/src/lib/elm_video.c b/legacy/elementary/src/lib/elm_video.c index f0b9454e78..a6da4f54ba 100644 --- a/legacy/elementary/src/lib/elm_video.c +++ b/legacy/elementary/src/lib/elm_video.c @@ -13,7 +13,7 @@ /* TODO: add buffering support to Emotion and display buffering * progress in the theme when needed */ -#define MY_CLASS ELM_OBJ_VIDEO_CLASS +#define MY_CLASS ELM_VIDEO_CLASS #define MY_CLASS_NAME "Elm_Video" #define MY_CLASS_NAME_LEGACY "elm_video" @@ -219,7 +219,7 @@ _elm_video_check(Evas_Object *video) } EOLIAN static void -_elm_video_evas_smart_add(Eo *obj, Elm_Video_Data *priv) +_elm_video_evas_object_smart_add(Eo *obj, Elm_Video_Data *priv) { _elm_emotion_init(); @@ -255,7 +255,7 @@ _elm_video_evas_smart_add(Eo *obj, Elm_Video_Data *priv) } EOLIAN static void -_elm_video_evas_smart_del(Eo *obj, Elm_Video_Data *sd) +_elm_video_evas_object_smart_del(Eo *obj, Elm_Video_Data *sd) { ecore_timer_del(sd->timer); if (sd->remember) emotion_object_last_position_save(sd->emotion); diff --git a/legacy/elementary/src/lib/elm_video.eo b/legacy/elementary/src/lib/elm_video.eo index 4d3862684f..09470226ba 100644 --- a/legacy/elementary/src/lib/elm_video.eo +++ b/legacy/elementary/src/lib/elm_video.eo @@ -204,8 +204,8 @@ class Elm_Video (Elm_Layout) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_direction_manager_is; Elm_Widget::event; diff --git a/legacy/elementary/src/lib/elm_video.h b/legacy/elementary/src/lib/elm_video.h index 1562090f98..31a8dbd4c6 100644 --- a/legacy/elementary/src/lib/elm_video.h +++ b/legacy/elementary/src/lib/elm_video.h @@ -51,7 +51,7 @@ */ /** - * ELM_OBJ_PLAYER_CLASS + * ELM_PLAYER_CLASS */ #ifdef EFL_EO_API_SUPPORT diff --git a/legacy/elementary/src/lib/elm_web.c b/legacy/elementary/src/lib/elm_web.c index c46bef8c90..9a07a16ffd 100644 --- a/legacy/elementary/src/lib/elm_web.c +++ b/legacy/elementary/src/lib/elm_web.c @@ -14,7 +14,7 @@ #if !defined(HAVE_ELEMENTARY_WEB) || !defined(USE_WEBKIT2) -#define MY_CLASS ELM_OBJ_WEB_CLASS +#define MY_CLASS ELM_WEB_CLASS #define MY_CLASS_NAME "Elm_Web" #define MY_CLASS_NAME_LEGACY "elm_web" @@ -1145,7 +1145,7 @@ elm_need_web(void) } EOLIAN static void -_elm_web_evas_smart_add(Eo *obj, Elm_Web_Data *priv) +_elm_web_evas_object_smart_add(Eo *obj, Elm_Web_Data *priv) { Evas_Object *resize_obj; @@ -1202,7 +1202,7 @@ _elm_web_evas_smart_add(Eo *obj, Elm_Web_Data *priv) } EOLIAN static void -_elm_web_evas_smart_del(Eo *obj, Elm_Web_Data *sd) +_elm_web_evas_object_smart_del(Eo *obj, Elm_Web_Data *sd) { #ifdef HAVE_ELEMENTARY_WEB ecore_timer_del(sd->zoom.timer); diff --git a/legacy/elementary/src/lib/elm_web.eo b/legacy/elementary/src/lib/elm_web.eo index 6aeeb9e82a..597b5749da 100644 --- a/legacy/elementary/src/lib/elm_web.eo +++ b/legacy/elementary/src/lib/elm_web.eo @@ -668,8 +668,8 @@ class Elm_Web (Elm_Widget) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; Elm_Widget::theme_apply; Elm_Widget::on_focus; Elm_Widget::event; diff --git a/legacy/elementary/src/lib/elm_web2.c b/legacy/elementary/src/lib/elm_web2.c index 55493819f4..cc0bd98f76 100644 --- a/legacy/elementary/src/lib/elm_web2.c +++ b/legacy/elementary/src/lib/elm_web2.c @@ -10,7 +10,7 @@ #if defined(HAVE_ELEMENTARY_WEB) && defined(USE_WEBKIT2) #include -#define MY_CLASS ELM_OBJ_WEB_CLASS +#define MY_CLASS ELM_WEB_CLASS #define MY_CLASS_NAME "Elm_Web" #define MY_CLASS_NAME_LEGACY "elm_web" @@ -636,7 +636,7 @@ _elm_web_tab_propagate_set(Eo *obj EINA_UNUSED, Elm_Web_Data *sd, Eina_Bool prop } EOLIAN static void -_elm_web_evas_smart_add(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) +_elm_web_evas_object_smart_add(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) { #ifdef HAVE_ELEMENTARY_WEB Evas_Object *resize_obj; @@ -656,7 +656,7 @@ _elm_web_evas_smart_add(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) } EOLIAN static void -_elm_web_evas_smart_del(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) +_elm_web_evas_object_smart_del(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); } diff --git a/legacy/elementary/src/lib/elm_widget.c b/legacy/elementary/src/lib/elm_widget.c index ce2b920f56..5f1e7edb7e 100644 --- a/legacy/elementary/src/lib/elm_widget.c +++ b/legacy/elementary/src/lib/elm_widget.c @@ -9,7 +9,7 @@ #include "elm_interface_scrollable.h" #include "elm_interface_atspi_widget.eo.h" -#define MY_CLASS ELM_OBJ_WIDGET_CLASS +#define MY_CLASS ELM_WIDGET_CLASS #define MY_CLASS_NAME "Elm_Widget" #define MY_CLASS_NAME_LEGACY "elm_widget" @@ -25,7 +25,7 @@ if (!sd) return #define ELM_WIDGET_FOCUS_GET(obj) \ - (eo_isa(obj, ELM_OBJ_WIDGET_CLASS) && \ + (eo_isa(obj, ELM_WIDGET_CLASS) && \ ((_elm_access_auto_highlight_get()) ? (elm_widget_highlight_get(obj)) : \ (elm_widget_focus_get(obj)))) @@ -101,7 +101,7 @@ _elm_widget_focus_highlight_start(const Evas_Object *obj) { Evas_Object *top = elm_widget_top_get(obj); - if (top && eo_isa(top, ELM_OBJ_WIN_CLASS)) + if (top && eo_isa(top, ELM_WIN_CLASS)) _elm_win_focus_highlight_start(top); } @@ -110,7 +110,7 @@ elm_widget_focus_highlight_enabled_get(const Evas_Object *obj) { const Evas_Object *win = elm_widget_top_get(obj); - if (win && eo_isa(win, ELM_OBJ_WIN_CLASS)) + if (win && eo_isa(win, ELM_WIN_CLASS)) return elm_win_focus_highlight_enabled_get(win); return EINA_FALSE; } @@ -270,7 +270,7 @@ _obj_mouse_in(void *data EINA_UNUSED, } EOLIAN static void -_elm_widget_evas_smart_add(Eo *obj, Elm_Widget_Smart_Data *priv) +_elm_widget_evas_object_smart_add(Eo *obj, Elm_Widget_Smart_Data *priv) { priv->obj = obj; @@ -324,7 +324,7 @@ _if_focused_revert(Evas_Object *obj, } EOLIAN static void -_elm_widget_evas_smart_del(Eo *obj, Elm_Widget_Smart_Data *sd) +_elm_widget_evas_object_smart_del(Eo *obj, Elm_Widget_Smart_Data *sd) { Evas_Object *sobj; Elm_Translate_String_Data *ts; @@ -392,7 +392,7 @@ _smart_reconfigure(Elm_Widget_Smart_Data *sd) } EOLIAN static void -_elm_widget_evas_smart_move(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_widget_evas_object_smart_move(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Evas_Coord x, Evas_Coord y) { sd->x = x; sd->y = y; @@ -401,7 +401,7 @@ _elm_widget_evas_smart_move(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Evas } EOLIAN static void -_elm_widget_evas_smart_resize(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_widget_evas_object_smart_resize(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Evas_Coord w, Evas_Coord h) { sd->w = w; sd->h = h; @@ -410,7 +410,7 @@ _elm_widget_evas_smart_resize(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Ev } EOLIAN static void -_elm_widget_evas_smart_show(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) +_elm_widget_evas_object_smart_show(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { Eina_Iterator *it; Evas_Object *o; @@ -425,7 +425,7 @@ _elm_widget_evas_smart_show(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) } EOLIAN static void -_elm_widget_evas_smart_hide(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) +_elm_widget_evas_object_smart_hide(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { Eina_Iterator *it; Evas_Object *o; @@ -440,7 +440,7 @@ _elm_widget_evas_smart_hide(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) } EOLIAN static void -_elm_widget_evas_smart_color_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, int r, int g, int b, int a) +_elm_widget_evas_object_smart_color_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, int r, int g, int b, int a) { Eina_Iterator *it; Evas_Object *o; @@ -455,7 +455,7 @@ _elm_widget_evas_smart_color_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED } EOLIAN static void -_elm_widget_evas_smart_clip_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *clip) +_elm_widget_evas_object_smart_clip_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *clip) { Eina_Iterator *it; Evas_Object *o; @@ -470,7 +470,7 @@ _elm_widget_evas_smart_clip_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, } EOLIAN static void -_elm_widget_evas_smart_clip_unset(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) +_elm_widget_evas_object_smart_clip_unset(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { Eina_Iterator *it; Evas_Object *o; @@ -485,13 +485,13 @@ _elm_widget_evas_smart_clip_unset(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSE } EOLIAN static void -_elm_widget_evas_smart_calculate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED) +_elm_widget_evas_object_smart_calculate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { /* a NO-OP, on the base */ } EOLIAN static void -_elm_widget_evas_smart_member_add(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child) +_elm_widget_evas_object_smart_member_add(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child) { int r, g, b, a; eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(child)); @@ -510,7 +510,7 @@ _elm_widget_evas_smart_member_add(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSE } EOLIAN static void -_elm_widget_evas_smart_member_del(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child) +_elm_widget_evas_object_smart_member_del(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child) { if (!evas_object_data_get(child, "_elm_leaveme")) evas_object_clip_unset(child); @@ -1392,7 +1392,7 @@ _elm_widget_highlight_in_theme_update(Eo *obj) { Evas_Object *top = elm_widget_top_get(obj); - if (top && eo_isa(top, ELM_OBJ_WIN_CLASS)) + if (top && eo_isa(top, ELM_WIN_CLASS)) { _elm_win_focus_highlight_in_theme_update( top, elm_widget_highlight_in_theme_get(obj)); @@ -1452,7 +1452,7 @@ _elm_widget_top_get(Eo *obj, Elm_Widget_Smart_Data *sd) if (sd->parent_obj) { Evas_Object *ret = NULL; - if (!eo_isa(sd->parent_obj, ELM_OBJ_WIDGET_CLASS)) return NULL; + if (!eo_isa(sd->parent_obj, ELM_WIDGET_CLASS)) return NULL; eo_do((Eo *) sd->parent_obj, ret = elm_obj_widget_top_get()); return ret; } @@ -3764,13 +3764,13 @@ elm_widget_focus_highlight_focus_part_geometry_get(const Evas_Object *obj, const char *target_hl_part = NULL; const Evas_Object *edje_obj = NULL; - if (obj && eo_isa(obj, EDJE_OBJ_CLASS)) + if (obj && eo_isa(obj, EDJE_CLASS)) { edje_obj = obj; if (!(target_hl_part = edje_object_data_get(edje_obj, "focus_part"))) return; } - else if (obj && eo_isa(obj, ELM_OBJ_LAYOUT_CLASS)) + else if (obj && eo_isa(obj, ELM_LAYOUT_CLASS)) { edje_obj = elm_layout_edje_get(obj); if (!(target_hl_part = elm_layout_data_get(obj, "focus_part"))) diff --git a/legacy/elementary/src/lib/elm_widget.eo b/legacy/elementary/src/lib/elm_widget.eo index 9efcf21513..9c9d62612a 100644 --- a/legacy/elementary/src/lib/elm_widget.eo +++ b/legacy/elementary/src/lib/elm_widget.eo @@ -1,4 +1,4 @@ -abstract Elm_Widget (Evas_Smart, Elm_Interface_Atspi_Widget) +abstract Elm_Widget (Evas_Object_Smart, Elm_Interface_Atspi_Widget) { eo_prefix: elm_obj_widget; data: Elm_Widget_Smart_Data; @@ -809,18 +809,18 @@ abstract Elm_Widget (Evas_Smart, Elm_Interface_Atspi_Widget) class::constructor; Eo_Base::constructor; Eo_Base::dbg_info_get; - Evas_Smart::hide; - Evas_Smart::calculate; - Evas_Smart::clip_unset; - Evas_Smart::show; - Evas_Smart::color::set; - Evas_Smart::move; - Evas_Smart::member_del; - Evas_Smart::add; - Evas_Smart::del; - Evas_Smart::clip::set; - Evas_Smart::member_add; - Evas_Smart::resize; + Evas_Object_Smart::hide; + Evas_Object_Smart::calculate; + Evas_Object_Smart::clip_unset; + Evas_Object_Smart::show; + Evas_Object_Smart::color::set; + Evas_Object_Smart::move; + Evas_Object_Smart::member_del; + Evas_Object_Smart::add; + Evas_Object_Smart::del; + Evas_Object_Smart::clip::set; + Evas_Object_Smart::member_add; + Evas_Object_Smart::resize; virtual::focus_direction; virtual::focus_next; virtual::parent_widget::get; diff --git a/legacy/elementary/src/lib/elm_widget.h b/legacy/elementary/src/lib/elm_widget.h index 808b6eda67..1fe5ab4bfe 100644 --- a/legacy/elementary/src/lib/elm_widget.h +++ b/legacy/elementary/src/lib/elm_widget.h @@ -835,7 +835,7 @@ EAPI void elm_widget_tree_dot_dump(const Evas_Object *top, FILE *out #define ELM_WIDGET_DATA_GET_OR_RETURN(o, ptr, ...) \ Elm_Widget_Smart_Data *ptr; \ - ptr = eo_data_scope_get(o, ELM_OBJ_WIDGET_CLASS); \ + ptr = eo_data_scope_get(o, ELM_WIDGET_CLASS); \ if (EINA_UNLIKELY(!ptr)) \ { \ CRI("no widget data for object %p (%s)", \ @@ -844,7 +844,7 @@ EAPI void elm_widget_tree_dot_dump(const Evas_Object *top, FILE *out } #define ELM_WIDGET_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_WIDGET_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_WIDGET_CLASS))) \ return /** diff --git a/legacy/elementary/src/lib/elm_widget_actionslider.h b/legacy/elementary/src/lib/elm_widget_actionslider.h index 333f2ef6b9..d68f0820e9 100644 --- a/legacy/elementary/src/lib/elm_widget_actionslider.h +++ b/legacy/elementary/src/lib/elm_widget_actionslider.h @@ -33,7 +33,7 @@ struct _Elm_Actionslider_Data */ #define ELM_ACTIONSLIDER_DATA_GET(o, sd) \ - Elm_Actionslider_Data * sd = eo_data_scope_get(o, ELM_OBJ_ACTIONSLIDER_CLASS) + Elm_Actionslider_Data * sd = eo_data_scope_get(o, ELM_ACTIONSLIDER_CLASS) #define ELM_ACTIONSLIDER_DATA_GET_OR_RETURN(o, ptr) \ ELM_ACTIONSLIDER_DATA_GET(o, ptr); \ @@ -54,7 +54,7 @@ struct _Elm_Actionslider_Data } #define ELM_ACTIONSLIDER_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_ACTIONSLIDER_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_ACTIONSLIDER_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_bg.h b/legacy/elementary/src/lib/elm_widget_bg.h index e878a3faa6..65ded66dea 100644 --- a/legacy/elementary/src/lib/elm_widget_bg.h +++ b/legacy/elementary/src/lib/elm_widget_bg.h @@ -42,7 +42,7 @@ struct _Elm_Bg_Data */ #define ELM_BG_DATA_GET(o, sd) \ - Elm_Bg_Data * sd = eo_data_scope_get(o, ELM_OBJ_BG_CLASS) + Elm_Bg_Data * sd = eo_data_scope_get(o, ELM_BG_CLASS) #define ELM_BG_DATA_GET_OR_RETURN(o, ptr) \ ELM_BG_DATA_GET(o, ptr); \ @@ -63,7 +63,7 @@ struct _Elm_Bg_Data } #define ELM_BG_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_BG_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_BG_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_box.h b/legacy/elementary/src/lib/elm_widget_box.h index df5385639b..29b6ed2497 100644 --- a/legacy/elementary/src/lib/elm_widget_box.h +++ b/legacy/elementary/src/lib/elm_widget_box.h @@ -64,7 +64,7 @@ struct _Transition_Animation_Data */ #define ELM_BOX_DATA_GET(o, sd) \ - Elm_Box_Data * sd = eo_data_scope_get(o, ELM_OBJ_BOX_CLASS) + Elm_Box_Data * sd = eo_data_scope_get(o, ELM_BOX_CLASS) #define ELM_BOX_DATA_GET_OR_RETURN(o, ptr) \ ELM_BOX_DATA_GET(o, ptr); \ @@ -85,7 +85,7 @@ struct _Transition_Animation_Data } #define ELM_BOX_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_BOX_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_BOX_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_bubble.h b/legacy/elementary/src/lib/elm_widget_bubble.h index 35e65486da..a001efaa55 100644 --- a/legacy/elementary/src/lib/elm_widget_bubble.h +++ b/legacy/elementary/src/lib/elm_widget_bubble.h @@ -29,7 +29,7 @@ struct _Elm_Bubble_Data */ #define ELM_BUBBLE_DATA_GET(o, sd) \ - Elm_Bubble_Data * sd = eo_data_scope_get(o, ELM_OBJ_BUBBLE_CLASS) + Elm_Bubble_Data * sd = eo_data_scope_get(o, ELM_BUBBLE_CLASS) #define ELM_BUBBLE_DATA_GET_OR_RETURN(o, ptr) \ ELM_BUBBLE_DATA_GET(o, ptr); \ @@ -50,7 +50,7 @@ struct _Elm_Bubble_Data } #define ELM_BUBBLE_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_BUBBLE_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_BUBBLE_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_button.h b/legacy/elementary/src/lib/elm_widget_button.h index 0c5cb3ade8..35536c0319 100644 --- a/legacy/elementary/src/lib/elm_widget_button.h +++ b/legacy/elementary/src/lib/elm_widget_button.h @@ -35,7 +35,7 @@ typedef struct _Elm_Button_Data */ #define ELM_BUTTON_DATA_GET(o, sd) \ - Elm_Button_Data * sd = eo_data_scope_get(o, ELM_OBJ_BUTTON_CLASS) + Elm_Button_Data * sd = eo_data_scope_get(o, ELM_BUTTON_CLASS) #define ELM_BUTTON_DATA_GET_OR_RETURN(o, ptr) \ ELM_BUTTON_DATA_GET(o, ptr); \ @@ -56,7 +56,7 @@ typedef struct _Elm_Button_Data } #define ELM_BUTTON_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_BUTTON_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_BUTTON_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_calendar.h b/legacy/elementary/src/lib/elm_widget_calendar.h index 0797021a75..1b442e0f87 100644 --- a/legacy/elementary/src/lib/elm_widget_calendar.h +++ b/legacy/elementary/src/lib/elm_widget_calendar.h @@ -68,10 +68,10 @@ struct _Elm_Calendar_Mark */ #define ELM_CALENDAR_DATA_GET(o, sd) \ - Elm_Calendar_Data * sd = eo_data_scope_get(o, ELM_OBJ_CALENDAR_CLASS) + Elm_Calendar_Data * sd = eo_data_scope_get(o, ELM_CALENDAR_CLASS) #define ELM_CALENDAR_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_CALENDAR_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_CALENDAR_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_check.h b/legacy/elementary/src/lib/elm_widget_check.h index 5b0d47237a..f78c98dc3f 100644 --- a/legacy/elementary/src/lib/elm_widget_check.h +++ b/legacy/elementary/src/lib/elm_widget_check.h @@ -29,7 +29,7 @@ struct _Elm_Check_Data */ #define ELM_CHECK_DATA_GET(o, sd) \ - Elm_Check_Data * sd = eo_data_scope_get(o, ELM_OBJ_CHECK_CLASS) + Elm_Check_Data * sd = eo_data_scope_get(o, ELM_CHECK_CLASS) #define ELM_CHECK_DATA_GET_OR_RETURN(o, ptr) \ ELM_CHECK_DATA_GET(o, ptr); \ @@ -50,7 +50,7 @@ struct _Elm_Check_Data } #define ELM_CHECK_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_CHECK_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_CHECK_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_clock.h b/legacy/elementary/src/lib/elm_widget_clock.h index 685d541823..d4346ead6c 100644 --- a/legacy/elementary/src/lib/elm_widget_clock.h +++ b/legacy/elementary/src/lib/elm_widget_clock.h @@ -52,7 +52,7 @@ struct _Elm_Clock_Data */ #define ELM_CLOCK_DATA_GET(o, sd) \ - Elm_Clock_Data * sd = eo_data_scope_get(o, ELM_OBJ_CLOCK_CLASS) + Elm_Clock_Data * sd = eo_data_scope_get(o, ELM_CLOCK_CLASS) #define ELM_CLOCK_DATA_GET_OR_RETURN(o, ptr) \ ELM_CLOCK_DATA_GET(o, ptr); \ @@ -73,7 +73,7 @@ struct _Elm_Clock_Data } #define ELM_CLOCK_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_CLOCK_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_CLOCK_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_colorselector.h b/legacy/elementary/src/lib/elm_widget_colorselector.h index 2170882ac4..1c74162f6a 100644 --- a/legacy/elementary/src/lib/elm_widget_colorselector.h +++ b/legacy/elementary/src/lib/elm_widget_colorselector.h @@ -95,7 +95,7 @@ struct _Elm_Color_Item */ #define ELM_COLORSELECTOR_DATA_GET(o, sd) \ - Elm_Colorselector_Data * sd = eo_data_scope_get(o, ELM_OBJ_COLORSELECTOR_CLASS) + Elm_Colorselector_Data * sd = eo_data_scope_get(o, ELM_COLORSELECTOR_CLASS) #define ELM_COLORSELECTOR_DATA_GET_OR_RETURN(o, ptr) \ ELM_COLORSELECTOR_DATA_GET(o, ptr); \ @@ -116,7 +116,7 @@ struct _Elm_Color_Item } #define ELM_COLORSELECTOR_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_COLORSELECTOR_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_COLORSELECTOR_CLASS))) \ return #define ELM_COLORSELECTOR_ITEM_CHECK(it) \ diff --git a/legacy/elementary/src/lib/elm_widget_conform.h b/legacy/elementary/src/lib/elm_widget_conform.h index 2ed7a27e17..d1a09de013 100644 --- a/legacy/elementary/src/lib/elm_widget_conform.h +++ b/legacy/elementary/src/lib/elm_widget_conform.h @@ -62,7 +62,7 @@ enum _Conformant_Part_Type */ #define ELM_CONFORMANT_DATA_GET(o, sd) \ - Elm_Conformant_Data * sd = eo_data_scope_get(o, ELM_OBJ_CONFORMANT_CLASS) + Elm_Conformant_Data * sd = eo_data_scope_get(o, ELM_CONFORMANT_CLASS) #define ELM_CONFORMANT_DATA_GET_OR_RETURN(o, ptr) \ ELM_CONFORMANT_DATA_GET(o, ptr); \ @@ -83,7 +83,7 @@ enum _Conformant_Part_Type } #define ELM_CONFORMANT_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_CONFORMANT_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_CONFORMANT_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_ctxpopup.h b/legacy/elementary/src/lib/elm_widget_ctxpopup.h index 123e04043a..3f4eabc895 100644 --- a/legacy/elementary/src/lib/elm_widget_ctxpopup.h +++ b/legacy/elementary/src/lib/elm_widget_ctxpopup.h @@ -61,7 +61,7 @@ struct _Elm_Ctxpopup_Data */ #define ELM_CTXPOPUP_DATA_GET(o, sd) \ - Elm_Ctxpopup_Data * sd = eo_data_scope_get(o, ELM_OBJ_CTXPOPUP_CLASS) + Elm_Ctxpopup_Data * sd = eo_data_scope_get(o, ELM_CTXPOPUP_CLASS) #define ELM_CTXPOPUP_DATA_GET_OR_RETURN(o, ptr) \ ELM_CTXPOPUP_DATA_GET(o, ptr); \ @@ -82,7 +82,7 @@ struct _Elm_Ctxpopup_Data } #define ELM_CTXPOPUP_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_CTXPOPUP_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_CTXPOPUP_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_datetime.h b/legacy/elementary/src/lib/elm_widget_datetime.h index 5ee03a7ccf..07829c2388 100644 --- a/legacy/elementary/src/lib/elm_widget_datetime.h +++ b/legacy/elementary/src/lib/elm_widget_datetime.h @@ -82,7 +82,7 @@ struct _Format_Map */ #define ELM_DATETIME_DATA_GET(o, sd) \ - Elm_Datetime_Data * sd = eo_data_scope_get(o, ELM_OBJ_DATETIME_CLASS) + Elm_Datetime_Data * sd = eo_data_scope_get(o, ELM_DATETIME_CLASS) #define ELM_DATETIME_DATA_GET_OR_RETURN(o, ptr) \ ELM_DATETIME_DATA_GET(o, ptr); \ @@ -103,7 +103,7 @@ struct _Format_Map } #define ELM_DATETIME_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_DATETIME_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_DATETIME_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_dayselector.h b/legacy/elementary/src/lib/elm_widget_dayselector.h index f0fc6da6ba..792e9dc244 100644 --- a/legacy/elementary/src/lib/elm_widget_dayselector.h +++ b/legacy/elementary/src/lib/elm_widget_dayselector.h @@ -40,7 +40,7 @@ struct _Elm_Dayselector_Item */ #define ELM_DAYSELECTOR_DATA_GET(o, sd) \ - Elm_Dayselector_Data * sd = eo_data_scope_get(o, ELM_OBJ_DAYSELECTOR_CLASS) + Elm_Dayselector_Data * sd = eo_data_scope_get(o, ELM_DAYSELECTOR_CLASS) #define ELM_DAYSELECTOR_DATA_GET_OR_RETURN(o, ptr) \ ELM_DAYSELECTOR_DATA_GET(o, ptr); \ @@ -61,7 +61,7 @@ struct _Elm_Dayselector_Item } #define ELM_DAYSELECTOR_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_DAYSELECTOR_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_DAYSELECTOR_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_diskselector.h b/legacy/elementary/src/lib/elm_widget_diskselector.h index 24214c87c3..7f56be5cfc 100644 --- a/legacy/elementary/src/lib/elm_widget_diskselector.h +++ b/legacy/elementary/src/lib/elm_widget_diskselector.h @@ -65,7 +65,7 @@ struct _Elm_Diskselector_Item */ #define ELM_DISKSELECTOR_DATA_GET(o, sd) \ - Elm_Diskselector_Data * sd = eo_data_scope_get(o, ELM_OBJ_DISKSELECTOR_CLASS) + Elm_Diskselector_Data * sd = eo_data_scope_get(o, ELM_DISKSELECTOR_CLASS) #define ELM_DISKSELECTOR_DATA_GET_OR_RETURN(o, ptr) \ ELM_DISKSELECTOR_DATA_GET(o, ptr); \ @@ -86,7 +86,7 @@ struct _Elm_Diskselector_Item } #define ELM_DISKSELECTOR_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_DISKSELECTOR_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_DISKSELECTOR_CLASS))) \ return #define ELM_DISKSELECTOR_ITEM_CHECK(it) \ @@ -99,7 +99,7 @@ struct _Elm_Diskselector_Item #define ELM_DISKSELECTOR_ITEM_CHECK_OR_GOTO(it, label) \ ELM_WIDGET_ITEM_CHECK_OR_GOTO((Elm_Widget_Item *)it, label); \ - if (!it->base.widget || !eo_isa((it->base.widget), ELM_OBJ_DISKSELECTOR_CLASS)) \ + if (!it->base.widget || !eo_isa((it->base.widget), ELM_DISKSELECTOR_CLASS)) \ goto label; #endif diff --git a/legacy/elementary/src/lib/elm_widget_entry.h b/legacy/elementary/src/lib/elm_widget_entry.h index 065092e74f..030ec73b7f 100644 --- a/legacy/elementary/src/lib/elm_widget_entry.h +++ b/legacy/elementary/src/lib/elm_widget_entry.h @@ -147,7 +147,7 @@ typedef enum _Length_Unit */ #define ELM_ENTRY_DATA_GET(o, sd) \ - Elm_Entry_Data * sd = eo_data_scope_get(o, ELM_OBJ_ENTRY_CLASS) + Elm_Entry_Data * sd = eo_data_scope_get(o, ELM_ENTRY_CLASS) #define ELM_ENTRY_DATA_GET_OR_RETURN(o, ptr) \ ELM_ENTRY_DATA_GET(o, ptr); \ @@ -168,7 +168,7 @@ typedef enum _Length_Unit } #define ELM_ENTRY_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_ENTRY_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_ENTRY_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_fileselector.h b/legacy/elementary/src/lib/elm_widget_fileselector.h index 51cff5049a..6e085e4ed0 100644 --- a/legacy/elementary/src/lib/elm_widget_fileselector.h +++ b/legacy/elementary/src/lib/elm_widget_fileselector.h @@ -129,7 +129,7 @@ struct _Elm_Fileselector_Filter */ #define ELM_FILESELECTOR_DATA_GET(o, sd) \ - Elm_Fileselector_Data * sd = eo_data_scope_get(o, ELM_OBJ_FILESELECTOR_CLASS) + Elm_Fileselector_Data * sd = eo_data_scope_get(o, ELM_FILESELECTOR_CLASS) #define ELM_FILESELECTOR_DATA_GET_OR_RETURN(o, ptr) \ ELM_FILESELECTOR_DATA_GET(o, ptr); \ @@ -150,7 +150,7 @@ struct _Elm_Fileselector_Filter } #define ELM_FILESELECTOR_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_FILESELECTOR_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_FILESELECTOR_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_fileselector_button.h b/legacy/elementary/src/lib/elm_widget_fileselector_button.h index 5a26f79853..aa04569009 100644 --- a/legacy/elementary/src/lib/elm_widget_fileselector_button.h +++ b/legacy/elementary/src/lib/elm_widget_fileselector_button.h @@ -51,7 +51,7 @@ struct _Elm_Fileselector_Button_Data */ #define ELM_FILESELECTOR_BUTTON_DATA_GET(o, sd) \ - Elm_Fileselector_Button_Data * sd = eo_data_scope_get(o, ELM_OBJ_FILESELECTOR_BUTTON_CLASS) + Elm_Fileselector_Button_Data * sd = eo_data_scope_get(o, ELM_FILESELECTOR_BUTTON_CLASS) #define ELM_FILESELECTOR_BUTTON_DATA_GET_OR_RETURN(o, ptr) \ ELM_FILESELECTOR_BUTTON_DATA_GET(o, ptr); \ @@ -72,7 +72,7 @@ struct _Elm_Fileselector_Button_Data } #define ELM_FILESELECTOR_BUTTON_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_FILESELECTOR_BUTTON_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_FILESELECTOR_BUTTON_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_fileselector_entry.h b/legacy/elementary/src/lib/elm_widget_fileselector_entry.h index 4b5c007ace..1c156453aa 100644 --- a/legacy/elementary/src/lib/elm_widget_fileselector_entry.h +++ b/legacy/elementary/src/lib/elm_widget_fileselector_entry.h @@ -35,7 +35,7 @@ struct _Elm_Fileselector_Entry_Data #define ELM_FILESELECTOR_ENTRY_DATA_GET(o, sd) \ - Elm_Fileselector_Entry_Data * sd = eo_data_scope_get(o, ELM_OBJ_FILESELECTOR_ENTRY_CLASS) + Elm_Fileselector_Entry_Data * sd = eo_data_scope_get(o, ELM_FILESELECTOR_ENTRY_CLASS) #define ELM_FILESELECTOR_ENTRY_DATA_GET_OR_RETURN(o, ptr) \ ELM_FILESELECTOR_ENTRY_DATA_GET(o, ptr); \ @@ -56,7 +56,7 @@ struct _Elm_Fileselector_Entry_Data } #define ELM_FILESELECTOR_ENTRY_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_FILESELECTOR_ENTRY_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_FILESELECTOR_ENTRY_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_flip.h b/legacy/elementary/src/lib/elm_widget_flip.h index 4ac529a0a3..daa35b0f8a 100644 --- a/legacy/elementary/src/lib/elm_widget_flip.h +++ b/legacy/elementary/src/lib/elm_widget_flip.h @@ -76,7 +76,7 @@ struct _Vertex3 */ #define ELM_FLIP_DATA_GET(o, sd) \ - Elm_Flip_Data * sd = eo_data_scope_get(o, ELM_OBJ_FLIP_CLASS) + Elm_Flip_Data * sd = eo_data_scope_get(o, ELM_FLIP_CLASS) #define ELM_FLIP_DATA_GET_OR_RETURN(o, ptr) \ ELM_FLIP_DATA_GET(o, ptr); \ @@ -97,7 +97,7 @@ struct _Vertex3 } #define ELM_FLIP_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_FLIP_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_FLIP_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_flipselector.h b/legacy/elementary/src/lib/elm_widget_flipselector.h index 79696043d0..ce1469f480 100644 --- a/legacy/elementary/src/lib/elm_widget_flipselector.h +++ b/legacy/elementary/src/lib/elm_widget_flipselector.h @@ -46,7 +46,7 @@ struct _Elm_Flipselector_Item }; #define ELM_FLIPSELECTOR_DATA_GET(o, sd) \ - Elm_Flipselector_Data * sd = eo_data_scope_get(o, ELM_OBJ_FLIPSELECTOR_CLASS) + Elm_Flipselector_Data * sd = eo_data_scope_get(o, ELM_FLIPSELECTOR_CLASS) #define ELM_FLIPSELECTOR_DATA_GET_OR_RETURN(o, ptr) \ ELM_FLIPSELECTOR_DATA_GET(o, ptr); \ @@ -67,7 +67,7 @@ struct _Elm_Flipselector_Item } #define ELM_FLIPSELECTOR_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_FLIPSELECTOR_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_FLIPSELECTOR_CLASS))) \ return #define ELM_FLIPSELECTOR_ITEM_CHECK(it) \ diff --git a/legacy/elementary/src/lib/elm_widget_frame.h b/legacy/elementary/src/lib/elm_widget_frame.h index c6a06fab07..0740444095 100644 --- a/legacy/elementary/src/lib/elm_widget_frame.h +++ b/legacy/elementary/src/lib/elm_widget_frame.h @@ -30,7 +30,7 @@ struct _Elm_Frame_Data */ #define ELM_FRAME_DATA_GET(o, sd) \ - Elm_Frame_Data * sd = eo_data_scope_get(o, ELM_OBJ_FRAME_CLASS) + Elm_Frame_Data * sd = eo_data_scope_get(o, ELM_FRAME_CLASS) #define ELM_FRAME_DATA_GET_OR_RETURN(o, ptr) \ ELM_FRAME_DATA_GET(o, ptr); \ @@ -51,7 +51,7 @@ struct _Elm_Frame_Data } #define ELM_FRAME_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_FRAME_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_FRAME_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_gengrid.h b/legacy/elementary/src/lib/elm_widget_gengrid.h index df67408106..46bc7f14df 100644 --- a/legacy/elementary/src/lib/elm_widget_gengrid.h +++ b/legacy/elementary/src/lib/elm_widget_gengrid.h @@ -150,10 +150,10 @@ struct _Elm_Gengrid_Pan_Data */ #define ELM_GENGRID_DATA_GET(o, sd) \ - Elm_Gengrid_Data * sd = eo_data_scope_get(o, ELM_OBJ_GENGRID_CLASS) + Elm_Gengrid_Data * sd = eo_data_scope_get(o, ELM_GENGRID_CLASS) #define ELM_GENGRID_PAN_DATA_GET(o, sd) \ - Elm_Gengrid_Pan_Data * sd = eo_data_scope_get(o, ELM_OBJ_GENGRID_PAN_CLASS) + Elm_Gengrid_Pan_Data * sd = eo_data_scope_get(o, ELM_GENGRID_PAN_CLASS) #define ELM_GENGRID_DATA_GET_OR_RETURN(o, ptr) \ ELM_GENGRID_DATA_GET(o, ptr); \ @@ -174,7 +174,7 @@ struct _Elm_Gengrid_Pan_Data } #define ELM_GENGRID_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_GENGRID_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_GENGRID_CLASS))) \ return #define ELM_GENGRID_ITEM_CHECK(it) \ @@ -188,6 +188,6 @@ struct _Elm_Gengrid_Pan_Data #define ELM_GENGRID_ITEM_CHECK_OR_GOTO(it, label) \ ELM_WIDGET_ITEM_CHECK_OR_GOTO((Elm_Widget_Item *)it, label); \ if (!it->base.widget || !eo_isa \ - ((it->base.widget), ELM_OBJ_GENGRID_CLASS)) goto label; + ((it->base.widget), ELM_GENGRID_CLASS)) goto label; #endif diff --git a/legacy/elementary/src/lib/elm_widget_genlist.h b/legacy/elementary/src/lib/elm_widget_genlist.h index af187b28af..f210627e65 100644 --- a/legacy/elementary/src/lib/elm_widget_genlist.h +++ b/legacy/elementary/src/lib/elm_widget_genlist.h @@ -287,13 +287,13 @@ struct _Elm_Genlist_Pan_Data #define GL_IT(_it) (_it->item) #define ELM_GENLIST_DATA_GET(o, sd) \ - Elm_Genlist_Data * sd = eo_data_scope_get(o, ELM_OBJ_GENLIST_CLASS) + Elm_Genlist_Data * sd = eo_data_scope_get(o, ELM_GENLIST_CLASS) #define ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd) \ Elm_Genlist_Data * sd = GL_IT(it)->wsd #define ELM_GENLIST_PAN_DATA_GET(o, sd) \ - Elm_Genlist_Pan_Data * sd = eo_data_scope_get(o, ELM_OBJ_GENLIST_PAN_CLASS) + Elm_Genlist_Pan_Data * sd = eo_data_scope_get(o, ELM_GENLIST_PAN_CLASS) #define ELM_GENLIST_DATA_GET_OR_RETURN(o, ptr) \ ELM_GENLIST_DATA_GET(o, ptr); \ @@ -314,7 +314,7 @@ struct _Elm_Genlist_Pan_Data } #define ELM_GENLIST_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_GENLIST_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_GENLIST_CLASS))) \ return #define ELM_GENLIST_ITEM_CHECK(it) \ @@ -328,6 +328,6 @@ struct _Elm_Genlist_Pan_Data #define ELM_GENLIST_ITEM_CHECK_OR_GOTO(it, label) \ ELM_WIDGET_ITEM_CHECK_OR_GOTO((Elm_Widget_Item *)it, label); \ if (!it->base.widget || !eo_isa \ - ((it->base.widget), ELM_OBJ_GENLIST_CLASS)) goto label; + ((it->base.widget), ELM_GENLIST_CLASS)) goto label; #endif diff --git a/legacy/elementary/src/lib/elm_widget_glview.h b/legacy/elementary/src/lib/elm_widget_glview.h index ffac9bc034..fec4c82b85 100644 --- a/legacy/elementary/src/lib/elm_widget_glview.h +++ b/legacy/elementary/src/lib/elm_widget_glview.h @@ -47,7 +47,7 @@ struct _Elm_Glview_Data */ #define ELM_GLVIEW_DATA_GET(o, sd) \ - Elm_Glview_Data * sd = eo_data_scope_get(o, ELM_OBJ_GLVIEW_CLASS) + Elm_Glview_Data * sd = eo_data_scope_get(o, ELM_GLVIEW_CLASS) #define ELM_GLVIEW_DATA_GET_OR_RETURN(o, ptr) \ ELM_GLVIEW_DATA_GET(o, ptr); \ @@ -68,7 +68,7 @@ struct _Elm_Glview_Data } #define ELM_GLVIEW_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_GLVIEW_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_GLVIEW_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_grid.h b/legacy/elementary/src/lib/elm_widget_grid.h index 5a5b18a5f3..9f18a1c9ac 100644 --- a/legacy/elementary/src/lib/elm_widget_grid.h +++ b/legacy/elementary/src/lib/elm_widget_grid.h @@ -19,7 +19,7 @@ */ #define ELM_GRID_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_GRID_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_GRID_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_hover.h b/legacy/elementary/src/lib/elm_widget_hover.h index 3aa35b07d2..c5afa74fec 100644 --- a/legacy/elementary/src/lib/elm_widget_hover.h +++ b/legacy/elementary/src/lib/elm_widget_hover.h @@ -47,7 +47,7 @@ struct _Elm_Hover_Data */ #define ELM_HOVER_DATA_GET(o, sd) \ - Elm_Hover_Data * sd = eo_data_scope_get(o, ELM_OBJ_HOVER_CLASS) + Elm_Hover_Data * sd = eo_data_scope_get(o, ELM_HOVER_CLASS) #define ELM_HOVER_DATA_GET_OR_RETURN(o, ptr) \ ELM_HOVER_DATA_GET(o, ptr); \ @@ -68,7 +68,7 @@ struct _Elm_Hover_Data } #define ELM_HOVER_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_HOVER_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_HOVER_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_hoversel.h b/legacy/elementary/src/lib/elm_widget_hoversel.h index 7f6b14ebfb..0a22961a97 100644 --- a/legacy/elementary/src/lib/elm_widget_hoversel.h +++ b/legacy/elementary/src/lib/elm_widget_hoversel.h @@ -50,7 +50,7 @@ struct _Elm_Hoversel_Item */ #define ELM_HOVERSEL_DATA_GET(o, sd) \ - Elm_Hoversel_Data * sd = eo_data_scope_get(o, ELM_OBJ_HOVERSEL_CLASS) + Elm_Hoversel_Data * sd = eo_data_scope_get(o, ELM_HOVERSEL_CLASS) #define ELM_HOVERSEL_DATA_GET_OR_RETURN(o, ptr) \ ELM_HOVERSEL_DATA_GET(o, ptr); \ @@ -71,7 +71,7 @@ struct _Elm_Hoversel_Item } #define ELM_HOVERSEL_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_HOVERSEL_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_HOVERSEL_CLASS))) \ return #define ELM_HOVERSEL_ITEM_CHECK(it) \ diff --git a/legacy/elementary/src/lib/elm_widget_icon.h b/legacy/elementary/src/lib/elm_widget_icon.h index c602a25c03..4471a2550d 100644 --- a/legacy/elementary/src/lib/elm_widget_icon.h +++ b/legacy/elementary/src/lib/elm_widget_icon.h @@ -56,7 +56,7 @@ struct _Elm_Icon_Data */ #define ELM_ICON_DATA_GET(o, sd) \ - Elm_Icon_Data * sd = eo_data_scope_get(o, ELM_OBJ_ICON_CLASS) + Elm_Icon_Data * sd = eo_data_scope_get(o, ELM_ICON_CLASS) #define ELM_ICON_DATA_GET_OR_RETURN(o, ptr) \ ELM_ICON_DATA_GET(o, ptr); \ @@ -77,7 +77,7 @@ struct _Elm_Icon_Data } #define ELM_ICON_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_ICON_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_ICON_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_image.h b/legacy/elementary/src/lib/elm_widget_image.h index e1d31581aa..91ccb9d77a 100644 --- a/legacy/elementary/src/lib/elm_widget_image.h +++ b/legacy/elementary/src/lib/elm_widget_image.h @@ -67,7 +67,7 @@ struct _Elm_Image_Data */ #define ELM_IMAGE_DATA_GET(o, sd) \ - Elm_Image_Data * sd = eo_data_scope_get(o, ELM_OBJ_IMAGE_CLASS) + Elm_Image_Data * sd = eo_data_scope_get(o, ELM_IMAGE_CLASS) #define ELM_IMAGE_DATA_GET_OR_RETURN(o, ptr) \ ELM_IMAGE_DATA_GET(o, ptr); \ @@ -88,7 +88,7 @@ struct _Elm_Image_Data } #define ELM_IMAGE_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_IMAGE_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_IMAGE_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_index.h b/legacy/elementary/src/lib/elm_widget_index.h index c975f2f77b..2f3a92eb19 100644 --- a/legacy/elementary/src/lib/elm_widget_index.h +++ b/legacy/elementary/src/lib/elm_widget_index.h @@ -68,7 +68,7 @@ struct _Elm_Index_Omit * @} */ #define ELM_INDEX_DATA_GET(o, sd) \ - Elm_Index_Data * sd = eo_data_scope_get(o, ELM_OBJ_INDEX_CLASS) + Elm_Index_Data * sd = eo_data_scope_get(o, ELM_INDEX_CLASS) #define ELM_INDEX_DATA_GET_OR_RETURN(o, ptr) \ ELM_INDEX_DATA_GET(o, ptr); \ @@ -89,7 +89,7 @@ struct _Elm_Index_Omit } #define ELM_INDEX_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_INDEX_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_INDEX_CLASS))) \ return #define ELM_INDEX_ITEM_CHECK(it) \ diff --git a/legacy/elementary/src/lib/elm_widget_inwin.h b/legacy/elementary/src/lib/elm_widget_inwin.h index 1aa32613ee..846126676c 100644 --- a/legacy/elementary/src/lib/elm_widget_inwin.h +++ b/legacy/elementary/src/lib/elm_widget_inwin.h @@ -27,7 +27,7 @@ struct _Elm_Inwin_Smart_Data */ #define ELM_INWIN_DATA_GET(o, sd) \ - Elm_Inwin_Smart_Data * sd = eo_data_scope_get(o, ELM_OBJ_WIN_INWIN_CLASS) + Elm_Inwin_Smart_Data * sd = eo_data_scope_get(o, ELM_INWIN_CLASS) #define ELM_INWIN_DATA_GET_OR_RETURN(o, ptr) \ ELM_INWIN_DATA_GET(o, ptr); \ @@ -48,7 +48,7 @@ struct _Elm_Inwin_Smart_Data } #define ELM_INWIN_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_WIN_INWIN_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_INWIN_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_label.h b/legacy/elementary/src/lib/elm_widget_label.h index b4bb908359..cd55bfabb8 100644 --- a/legacy/elementary/src/lib/elm_widget_label.h +++ b/legacy/elementary/src/lib/elm_widget_label.h @@ -25,7 +25,7 @@ struct _Elm_Label_Data }; #define ELM_LABEL_DATA_GET(o, sd) \ - Elm_Label_Data * sd = eo_data_scope_get(o, ELM_OBJ_LABEL_CLASS) + Elm_Label_Data * sd = eo_data_scope_get(o, ELM_LABEL_CLASS) #define ELM_LABEL_DATA_GET_OR_RETURN(o, ptr) \ ELM_LABEL_DATA_GET(o, ptr); \ @@ -46,7 +46,7 @@ struct _Elm_Label_Data } #define ELM_LABEL_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_LABEL_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_LABEL_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_layout.h b/legacy/elementary/src/lib/elm_widget_layout.h index f005dd9d39..1d19559f9a 100644 --- a/legacy/elementary/src/lib/elm_widget_layout.h +++ b/legacy/elementary/src/lib/elm_widget_layout.h @@ -85,10 +85,10 @@ typedef struct _Elm_Layout_Smart_Data */ #define ELM_LAYOUT_DATA_GET(o, sd) \ - Elm_Layout_Smart_Data * sd = eo_data_scope_get(o, ELM_OBJ_LAYOUT_CLASS) + Elm_Layout_Smart_Data * sd = eo_data_scope_get(o, ELM_LAYOUT_CLASS) #define ELM_LAYOUT_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa(obj, ELM_OBJ_LAYOUT_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa(obj, ELM_LAYOUT_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_list.h b/legacy/elementary/src/lib/elm_widget_list.h index 47c8e28ee3..d6d1869daf 100644 --- a/legacy/elementary/src/lib/elm_widget_list.h +++ b/legacy/elementary/src/lib/elm_widget_list.h @@ -86,7 +86,7 @@ struct _Elm_List_Item */ #define ELM_LIST_DATA_GET(o, sd) \ - Elm_List_Data * sd = eo_data_scope_get(o, ELM_OBJ_LIST_CLASS) + Elm_List_Data * sd = eo_data_scope_get(o, ELM_LIST_CLASS) #define ELM_LIST_DATA_GET_OR_RETURN(o, ptr) \ ELM_LIST_DATA_GET(o, ptr); \ @@ -107,7 +107,7 @@ struct _Elm_List_Item } #define ELM_LIST_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_LIST_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_LIST_CLASS))) \ return #define ELM_LIST_ITEM_CHECK(it) \ diff --git a/legacy/elementary/src/lib/elm_widget_map.h b/legacy/elementary/src/lib/elm_widget_map.h index 46e59358c6..0632f47f12 100644 --- a/legacy/elementary/src/lib/elm_widget_map.h +++ b/legacy/elementary/src/lib/elm_widget_map.h @@ -492,10 +492,10 @@ struct _Elm_Map_Pan_Data */ #define ELM_MAP_DATA_GET(o, sd) \ - Elm_Map_Data * sd = eo_data_scope_get(o, ELM_OBJ_MAP_CLASS) + Elm_Map_Data * sd = eo_data_scope_get(o, ELM_MAP_CLASS) #define ELM_MAP_PAN_DATA_GET(o, sd) \ - Elm_Map_Pan_Data * sd = eo_data_scope_get(o, ELM_OBJ_MAP_PAN_CLASS) + Elm_Map_Pan_Data * sd = eo_data_scope_get(o, ELM_MAP_PAN_CLASS) #define ELM_MAP_DATA_GET_OR_RETURN(o, ptr) \ ELM_MAP_DATA_GET(o, ptr); \ @@ -516,7 +516,7 @@ struct _Elm_Map_Pan_Data } #define ELM_MAP_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_MAP_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_MAP_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_mapbuf.h b/legacy/elementary/src/lib/elm_widget_mapbuf.h index 429ff2b47c..d0f5cea0f1 100644 --- a/legacy/elementary/src/lib/elm_widget_mapbuf.h +++ b/legacy/elementary/src/lib/elm_widget_mapbuf.h @@ -41,7 +41,7 @@ struct _Elm_Mapbuf_Data */ #define ELM_MAPBUF_DATA_GET(o, sd) \ - Elm_Mapbuf_Data * sd = eo_data_scope_get(o, ELM_OBJ_MAPBUF_CLASS) + Elm_Mapbuf_Data * sd = eo_data_scope_get(o, ELM_MAPBUF_CLASS) #define ELM_MAPBUF_DATA_GET_OR_RETURN(o, ptr) \ ELM_MAPBUF_DATA_GET(o, ptr); \ @@ -62,7 +62,7 @@ struct _Elm_Mapbuf_Data } #define ELM_MAPBUF_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_MAPBUF_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_MAPBUF_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_menu.h b/legacy/elementary/src/lib/elm_widget_menu.h index 0cede00d37..21027ed7e8 100644 --- a/legacy/elementary/src/lib/elm_widget_menu.h +++ b/legacy/elementary/src/lib/elm_widget_menu.h @@ -62,7 +62,7 @@ struct _Elm_Menu_Item */ #define ELM_MENU_DATA_GET(o, sd) \ - Elm_Menu_Data * sd = eo_data_scope_get(o, ELM_OBJ_MENU_CLASS) + Elm_Menu_Data * sd = eo_data_scope_get(o, ELM_MENU_CLASS) #define ELM_MENU_DATA_GET_OR_RETURN(o, ptr) \ ELM_MENU_DATA_GET(o, ptr); \ @@ -83,7 +83,7 @@ struct _Elm_Menu_Item } #define ELM_MENU_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_MENU_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_MENU_CLASS))) \ return #define ELM_MENU_ITEM_CHECK(it) \ diff --git a/legacy/elementary/src/lib/elm_widget_multibuttonentry.h b/legacy/elementary/src/lib/elm_widget_multibuttonentry.h index f5eb2e0526..c0191372a9 100644 --- a/legacy/elementary/src/lib/elm_widget_multibuttonentry.h +++ b/legacy/elementary/src/lib/elm_widget_multibuttonentry.h @@ -106,7 +106,7 @@ struct _Elm_Multibuttonentry_Data */ #define ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(o, ptr) \ - Elm_Multibuttonentry_Data *ptr = eo_data_scope_get(o, ELM_OBJ_MULTIBUTTONENTRY_CLASS); \ + Elm_Multibuttonentry_Data *ptr = eo_data_scope_get(o, ELM_MULTIBUTTONENTRY_CLASS); \ if (EINA_UNLIKELY(!ptr)) \ { \ CRI("No widget data for object %p (%s)", \ @@ -115,7 +115,7 @@ struct _Elm_Multibuttonentry_Data } #define ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ - Elm_Multibuttonentry_Data * ptr = eo_data_scope_get(o, ELM_OBJ_MULTIBUTTONENTRY_CLASS); \ + Elm_Multibuttonentry_Data * ptr = eo_data_scope_get(o, ELM_MULTIBUTTONENTRY_CLASS); \ if (EINA_UNLIKELY(!ptr)) \ { \ CRI("No widget data for object %p (%s)", \ @@ -124,7 +124,7 @@ struct _Elm_Multibuttonentry_Data } #define ELM_MULTIBUTTONENTRY_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_MULTIBUTTONENTRY_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_MULTIBUTTONENTRY_CLASS))) \ return #define ELM_MULTIBUTTONENTRY_ITEM_CHECK(it) \ diff --git a/legacy/elementary/src/lib/elm_widget_naviframe.h b/legacy/elementary/src/lib/elm_widget_naviframe.h index 0a64c55366..e262791082 100644 --- a/legacy/elementary/src/lib/elm_widget_naviframe.h +++ b/legacy/elementary/src/lib/elm_widget_naviframe.h @@ -82,7 +82,7 @@ struct _Elm_Naviframe_Text_Item_Pair */ #define ELM_NAVIFRAME_DATA_GET(o, sd) \ - Elm_Naviframe_Data * sd = eo_data_scope_get(o, ELM_OBJ_NAVIFRAME_CLASS) + Elm_Naviframe_Data * sd = eo_data_scope_get(o, ELM_NAVIFRAME_CLASS) #define ELM_NAVIFRAME_DATA_GET_OR_RETURN(o, ptr) \ ELM_NAVIFRAME_DATA_GET(o, ptr); \ @@ -103,7 +103,7 @@ struct _Elm_Naviframe_Text_Item_Pair } #define ELM_NAVIFRAME_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_NAVIFRAME_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_NAVIFRAME_CLASS))) \ return #define ELM_NAVIFRAME_ITEM_CHECK(it) \ diff --git a/legacy/elementary/src/lib/elm_widget_notify.h b/legacy/elementary/src/lib/elm_widget_notify.h index f45cc7f196..a96de32df0 100644 --- a/legacy/elementary/src/lib/elm_widget_notify.h +++ b/legacy/elementary/src/lib/elm_widget_notify.h @@ -37,7 +37,7 @@ struct _Elm_Notify_Data */ #define ELM_NOTIFY_DATA_GET(o, sd) \ - Elm_Notify_Data * sd = eo_data_scope_get(o, ELM_OBJ_NOTIFY_CLASS) + Elm_Notify_Data * sd = eo_data_scope_get(o, ELM_NOTIFY_CLASS) #define ELM_NOTIFY_DATA_GET_OR_RETURN(o, ptr) \ ELM_NOTIFY_DATA_GET(o, ptr); \ @@ -58,7 +58,7 @@ struct _Elm_Notify_Data } #define ELM_NOTIFY_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_NOTIFY_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_NOTIFY_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_panel.h b/legacy/elementary/src/lib/elm_widget_panel.h index 20b901b028..6982774d07 100644 --- a/legacy/elementary/src/lib/elm_widget_panel.h +++ b/legacy/elementary/src/lib/elm_widget_panel.h @@ -34,7 +34,7 @@ struct _Elm_Panel_Data */ #define ELM_PANEL_DATA_GET(o, sd) \ - Elm_Panel_Data * sd = eo_data_scope_get(o, ELM_OBJ_PANEL_CLASS) + Elm_Panel_Data * sd = eo_data_scope_get(o, ELM_PANEL_CLASS) #define ELM_PANEL_DATA_GET_OR_RETURN(o, ptr) \ ELM_PANEL_DATA_GET(o, ptr); \ @@ -55,7 +55,7 @@ struct _Elm_Panel_Data } #define ELM_PANEL_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_PANEL_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_PANEL_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_panes.h b/legacy/elementary/src/lib/elm_widget_panes.h index e16847fd8e..480b73e680 100644 --- a/legacy/elementary/src/lib/elm_widget_panes.h +++ b/legacy/elementary/src/lib/elm_widget_panes.h @@ -38,7 +38,7 @@ struct _Elm_Panes_Data */ #define ELM_PANES_DATA_GET(o, sd) \ - Elm_Panes_Data * sd = eo_data_scope_get(o, ELM_OBJ_PANES_CLASS) + Elm_Panes_Data * sd = eo_data_scope_get(o, ELM_PANES_CLASS) #define ELM_PANES_DATA_GET_OR_RETURN(o, ptr) \ ELM_PANES_DATA_GET(o, ptr); \ @@ -59,7 +59,7 @@ struct _Elm_Panes_Data } #define ELM_PANES_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_PANES_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_PANES_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_photo.h b/legacy/elementary/src/lib/elm_widget_photo.h index 18dbf2b218..11425735c4 100644 --- a/legacy/elementary/src/lib/elm_widget_photo.h +++ b/legacy/elementary/src/lib/elm_widget_photo.h @@ -43,7 +43,7 @@ struct _Elm_Photo_Data */ #define ELM_PHOTO_DATA_GET(o, sd) \ - Elm_Photo_Data * sd = eo_data_scope_get(o, ELM_OBJ_PHOTO_CLASS) + Elm_Photo_Data * sd = eo_data_scope_get(o, ELM_PHOTO_CLASS) #define ELM_PHOTO_DATA_GET_OR_RETURN(o, ptr) \ ELM_PHOTO_DATA_GET(o, ptr); \ @@ -64,7 +64,7 @@ struct _Elm_Photo_Data } #define ELM_PHOTO_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_PHOTO_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_PHOTO_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_photocam.h b/legacy/elementary/src/lib/elm_widget_photocam.h index 1d9e5483f5..341d74fd5a 100644 --- a/legacy/elementary/src/lib/elm_widget_photocam.h +++ b/legacy/elementary/src/lib/elm_widget_photocam.h @@ -136,10 +136,10 @@ struct _Elm_Photocam_Pan_Data */ #define ELM_PHOTOCAM_DATA_GET(o, sd) \ - Elm_Photocam_Data * sd = eo_data_scope_get(o, ELM_OBJ_PHOTOCAM_CLASS) + Elm_Photocam_Data * sd = eo_data_scope_get(o, ELM_PHOTOCAM_CLASS) #define ELM_PHOTOCAM_PAN_DATA_GET(o, sd) \ - Elm_Photocam_Pan_Data * sd = eo_data_scope_get(o, ELM_OBJ_PHOTOCAM_PAN_CLASS) + Elm_Photocam_Pan_Data * sd = eo_data_scope_get(o, ELM_PHOTOCAM_PAN_CLASS) #define ELM_PHOTOCAM_DATA_GET_OR_RETURN(o, ptr) \ ELM_PHOTOCAM_DATA_GET(o, ptr); \ @@ -160,7 +160,7 @@ struct _Elm_Photocam_Pan_Data } #define ELM_PHOTOCAM_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_PHOTOCAM_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_PHOTOCAM_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_player.h b/legacy/elementary/src/lib/elm_widget_player.h index 1cc71ce7c0..669bd92785 100644 --- a/legacy/elementary/src/lib/elm_widget_player.h +++ b/legacy/elementary/src/lib/elm_widget_player.h @@ -46,7 +46,7 @@ struct _Elm_Player_Data */ #define ELM_PLAYER_DATA_GET(o, sd) \ - Elm_Player_Data * sd = eo_data_scope_get(o, ELM_OBJ_PLAYER_CLASS) + Elm_Player_Data * sd = eo_data_scope_get(o, ELM_PLAYER_CLASS) #define ELM_PLAYER_DATA_GET_OR_RETURN(o, ptr) \ ELM_PLAYER_DATA_GET(o, ptr); \ @@ -67,7 +67,7 @@ struct _Elm_Player_Data } #define ELM_PLAYER_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_PLAYER_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_PLAYER_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_plug.h b/legacy/elementary/src/lib/elm_widget_plug.h index 1100d8bf4e..8fa5a62de4 100644 --- a/legacy/elementary/src/lib/elm_widget_plug.h +++ b/legacy/elementary/src/lib/elm_widget_plug.h @@ -18,7 +18,7 @@ */ #define ELM_PLUG_DATA_GET(o, sd) \ - Elm_Plug_Smart_Data * sd = eo_data_scope_get(o, ELM_OBJ_PLUG_CLASS) + Elm_Plug_Smart_Data * sd = eo_data_scope_get(o, ELM_PLUG_CLASS) #define ELM_PLUG_DATA_GET_OR_RETURN(o, ptr) \ ELM_PLUG_DATA_GET(o, ptr); \ @@ -39,7 +39,7 @@ } #define ELM_PLUG_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_PLUG_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_PLUG_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_popup.h b/legacy/elementary/src/lib/elm_widget_popup.h index b9171a5904..ebc51e040d 100644 --- a/legacy/elementary/src/lib/elm_widget_popup.h +++ b/legacy/elementary/src/lib/elm_widget_popup.h @@ -70,7 +70,7 @@ struct _Action_Area_Data */ #define ELM_POPUP_DATA_GET(o, sd) \ - Elm_Popup_Data * sd = eo_data_scope_get(o, ELM_OBJ_POPUP_CLASS) + Elm_Popup_Data * sd = eo_data_scope_get(o, ELM_POPUP_CLASS) #define ELM_POPUP_DATA_GET_OR_RETURN(o, ptr) \ ELM_POPUP_DATA_GET(o, ptr); \ @@ -91,7 +91,7 @@ struct _Action_Area_Data } #define ELM_POPUP_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_POPUP_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_POPUP_CLASS))) \ return #define ELM_POPUP_ITEM_CHECK(it) \ diff --git a/legacy/elementary/src/lib/elm_widget_prefs.h b/legacy/elementary/src/lib/elm_widget_prefs.h index cd5f682d55..5f43df297b 100644 --- a/legacy/elementary/src/lib/elm_widget_prefs.h +++ b/legacy/elementary/src/lib/elm_widget_prefs.h @@ -91,7 +91,7 @@ extern const Eina_Hash *elm_prefs_item_type_widgets_map; extern const Elm_Prefs_Item_Iface *elm_prefs_item_default_widget; #define ELM_PREFS_DATA_GET(o, sd) \ - Elm_Prefs_Data * sd = eo_data_scope_get(o, ELM_OBJ_PREFS_CLASS) + Elm_Prefs_Data * sd = eo_data_scope_get(o, ELM_PREFS_CLASS) #define ELM_PREFS_ENTRY(o, sd) \ if (EINA_UNLIKELY(!sd->data_file || !sd->page)) \ @@ -120,7 +120,7 @@ extern const Elm_Prefs_Item_Iface *elm_prefs_item_default_widget; } #define ELM_PREFS_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_PREFS_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_PREFS_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_progressbar.h b/legacy/elementary/src/lib/elm_widget_progressbar.h index 8feada683e..8ab3072736 100644 --- a/legacy/elementary/src/lib/elm_widget_progressbar.h +++ b/legacy/elementary/src/lib/elm_widget_progressbar.h @@ -49,7 +49,7 @@ struct _Elm_Progress_Status */ #define ELM_PROGRESSBAR_DATA_GET(o, sd) \ - Elm_Progressbar_Data * sd = eo_data_scope_get(o, ELM_OBJ_PROGRESSBAR_CLASS) + Elm_Progressbar_Data * sd = eo_data_scope_get(o, ELM_PROGRESSBAR_CLASS) #define ELM_PROGRESSBAR_DATA_GET_OR_RETURN(o, ptr) \ ELM_PROGRESSBAR_DATA_GET(o, ptr); \ @@ -70,7 +70,7 @@ struct _Elm_Progress_Status } #define ELM_PROGRESSBAR_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_PROGRESSBAR_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_PROGRESSBAR_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_radio.h b/legacy/elementary/src/lib/elm_widget_radio.h index 4d1c4e9f16..511ff9638f 100644 --- a/legacy/elementary/src/lib/elm_widget_radio.h +++ b/legacy/elementary/src/lib/elm_widget_radio.h @@ -40,7 +40,7 @@ struct _Elm_Radio_Data */ #define ELM_RADIO_DATA_GET(o, sd) \ - Elm_Radio_Data * sd = eo_data_scope_get(o, ELM_OBJ_RADIO_CLASS) + Elm_Radio_Data * sd = eo_data_scope_get(o, ELM_RADIO_CLASS) #define ELM_RADIO_DATA_GET_OR_RETURN(o, ptr) \ ELM_RADIO_DATA_GET(o, ptr); \ @@ -61,7 +61,7 @@ struct _Elm_Radio_Data } #define ELM_RADIO_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_RADIO_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_RADIO_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_route.h b/legacy/elementary/src/lib/elm_widget_route.h index c35f7e8f51..0c50a86bc0 100644 --- a/legacy/elementary/src/lib/elm_widget_route.h +++ b/legacy/elementary/src/lib/elm_widget_route.h @@ -51,7 +51,7 @@ struct Segment */ #define ELM_ROUTE_DATA_GET(o, sd) \ - Elm_Route_Data * sd = eo_data_scope_get(o, ELM_OBJ_ROUTE_CLASS) + Elm_Route_Data * sd = eo_data_scope_get(o, ELM_ROUTE_CLASS) #define ELM_ROUTE_DATA_GET_OR_RETURN(o, ptr) \ ELM_ROUTE_DATA_GET(o, ptr); \ @@ -72,7 +72,7 @@ struct Segment } #define ELM_ROUTE_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_ROUTE_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_ROUTE_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_scroller.h b/legacy/elementary/src/lib/elm_widget_scroller.h index 4ed7f43156..8ce1641cbc 100644 --- a/legacy/elementary/src/lib/elm_widget_scroller.h +++ b/legacy/elementary/src/lib/elm_widget_scroller.h @@ -34,7 +34,7 @@ struct _Elm_Scroller_Data */ #define ELM_SCROLLER_DATA_GET(o, sd) \ - Elm_Scroller_Data * sd = eo_data_scope_get(o, ELM_OBJ_SCROLLER_CLASS) + Elm_Scroller_Data * sd = eo_data_scope_get(o, ELM_SCROLLER_CLASS) #define ELM_SCROLLER_DATA_GET_OR_RETURN(o, ptr) \ ELM_SCROLLER_DATA_GET(o, ptr); \ @@ -55,7 +55,7 @@ struct _Elm_Scroller_Data } #define ELM_SCROLLER_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_SCROLLER_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_SCROLLER_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_segment_control.h b/legacy/elementary/src/lib/elm_widget_segment_control.h index 666fe54564..6e07b32ea5 100644 --- a/legacy/elementary/src/lib/elm_widget_segment_control.h +++ b/legacy/elementary/src/lib/elm_widget_segment_control.h @@ -43,7 +43,7 @@ struct _Elm_Segment_Item */ #define ELM_SEGMENT_CONTROL_DATA_GET(o, sd) \ - Elm_Segment_Control_Data * sd = eo_data_scope_get(o, ELM_OBJ_SEGMENT_CONTROL_CLASS) + Elm_Segment_Control_Data * sd = eo_data_scope_get(o, ELM_SEGMENT_CONTROL_CLASS) #define ELM_SEGMENT_CONTROL_DATA_GET_OR_RETURN(o, ptr) \ ELM_SEGMENT_CONTROL_DATA_GET(o, ptr); \ @@ -64,7 +64,7 @@ struct _Elm_Segment_Item } #define ELM_SEGMENT_CONTROL_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_SEGMENT_CONTROL_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_SEGMENT_CONTROL_CLASS))) \ return #define ELM_SEGMENT_CONTROL_ITEM_CHECK(it) \ diff --git a/legacy/elementary/src/lib/elm_widget_separator.h b/legacy/elementary/src/lib/elm_widget_separator.h index 5c1448fdda..b0005426f3 100644 --- a/legacy/elementary/src/lib/elm_widget_separator.h +++ b/legacy/elementary/src/lib/elm_widget_separator.h @@ -28,7 +28,7 @@ struct _Elm_Separator_Data */ #define ELM_SEPARATOR_DATA_GET(o, sd) \ - Elm_Separator_Data * sd = eo_data_scope_get(o, ELM_OBJ_SEPARATOR_CLASS) + Elm_Separator_Data * sd = eo_data_scope_get(o, ELM_SEPARATOR_CLASS) #define ELM_SEPARATOR_DATA_GET_OR_RETURN(o, ptr) \ ELM_SEPARATOR_DATA_GET(o, ptr); \ @@ -49,7 +49,7 @@ struct _Elm_Separator_Data } #define ELM_SEPARATOR_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_SEPARATOR_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_SEPARATOR_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_slider.h b/legacy/elementary/src/lib/elm_widget_slider.h index 23dfb4aa5c..8054d39387 100644 --- a/legacy/elementary/src/lib/elm_widget_slider.h +++ b/legacy/elementary/src/lib/elm_widget_slider.h @@ -53,7 +53,7 @@ struct _Elm_Slider_Data */ #define ELM_SLIDER_DATA_GET(o, sd) \ - Elm_Slider_Data * sd = eo_data_scope_get(o, ELM_OBJ_SLIDER_CLASS) + Elm_Slider_Data * sd = eo_data_scope_get(o, ELM_SLIDER_CLASS) #define ELM_SLIDER_DATA_GET_OR_RETURN(o, ptr) \ ELM_SLIDER_DATA_GET(o, ptr); \ @@ -74,7 +74,7 @@ struct _Elm_Slider_Data } #define ELM_SLIDER_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_SLIDER_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_SLIDER_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_slideshow.h b/legacy/elementary/src/lib/elm_widget_slideshow.h index e42db21ab6..9bec68f1a0 100644 --- a/legacy/elementary/src/lib/elm_widget_slideshow.h +++ b/legacy/elementary/src/lib/elm_widget_slideshow.h @@ -59,7 +59,7 @@ struct _Elm_Slideshow_Data */ #define ELM_SLIDESHOW_DATA_GET(o, sd) \ - Elm_Slideshow_Data * sd = eo_data_scope_get(o, ELM_OBJ_SLIDESHOW_CLASS) + Elm_Slideshow_Data * sd = eo_data_scope_get(o, ELM_SLIDESHOW_CLASS) #define ELM_SLIDESHOW_DATA_GET_OR_RETURN(o, ptr) \ ELM_SLIDESHOW_DATA_GET(o, ptr); \ @@ -80,7 +80,7 @@ struct _Elm_Slideshow_Data } #define ELM_SLIDESHOW_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_SLIDESHOW_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_SLIDESHOW_CLASS))) \ return #define ELM_SLIDESHOW_ITEM_CHECK(it) \ diff --git a/legacy/elementary/src/lib/elm_widget_spinner.h b/legacy/elementary/src/lib/elm_widget_spinner.h index b317fe7a0d..20574d3c81 100644 --- a/legacy/elementary/src/lib/elm_widget_spinner.h +++ b/legacy/elementary/src/lib/elm_widget_spinner.h @@ -55,7 +55,7 @@ struct _Elm_Spinner_Special_Value */ #define ELM_SPINNER_DATA_GET(o, sd) \ - Elm_Spinner_Data * sd = eo_data_scope_get(o, ELM_OBJ_SPINNER_CLASS) + Elm_Spinner_Data * sd = eo_data_scope_get(o, ELM_SPINNER_CLASS) #define ELM_SPINNER_DATA_GET_OR_RETURN(o, ptr) \ ELM_SPINNER_DATA_GET(o, ptr); \ @@ -76,7 +76,7 @@ struct _Elm_Spinner_Special_Value } #define ELM_SPINNER_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_SPINNER_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_SPINNER_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_table.h b/legacy/elementary/src/lib/elm_widget_table.h index b7b23176f6..fde0a59e7c 100644 --- a/legacy/elementary/src/lib/elm_widget_table.h +++ b/legacy/elementary/src/lib/elm_widget_table.h @@ -19,7 +19,7 @@ */ #define ELM_TABLE_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_TABLE_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_TABLE_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_thumb.h b/legacy/elementary/src/lib/elm_widget_thumb.h index 97fa4e6834..ac0d66319f 100644 --- a/legacy/elementary/src/lib/elm_widget_thumb.h +++ b/legacy/elementary/src/lib/elm_widget_thumb.h @@ -66,7 +66,7 @@ struct _Elm_Thumb_Data */ #define ELM_THUMB_DATA_GET(o, sd) \ - Elm_Thumb_Data * sd = eo_data_scope_get(o, ELM_OBJ_THUMB_CLASS) + Elm_Thumb_Data * sd = eo_data_scope_get(o, ELM_THUMB_CLASS) #define ELM_THUMB_DATA_GET_OR_RETURN(o, ptr) \ ELM_THUMB_DATA_GET(o, ptr); \ @@ -87,7 +87,7 @@ struct _Elm_Thumb_Data } #define ELM_THUMB_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_THUMB_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_THUMB_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_toolbar.h b/legacy/elementary/src/lib/elm_widget_toolbar.h index 1c99e6c2cc..fe2c4a321a 100644 --- a/legacy/elementary/src/lib/elm_widget_toolbar.h +++ b/legacy/elementary/src/lib/elm_widget_toolbar.h @@ -98,7 +98,7 @@ struct _Elm_Toolbar_Item_State */ #define ELM_TOOLBAR_DATA_GET(o, sd) \ - Elm_Toolbar_Data * sd = eo_data_scope_get(o, ELM_OBJ_TOOLBAR_CLASS) + Elm_Toolbar_Data * sd = eo_data_scope_get(o, ELM_TOOLBAR_CLASS) #define ELM_TOOLBAR_DATA_GET_OR_RETURN(o, ptr) \ ELM_TOOLBAR_DATA_GET(o, ptr); \ @@ -119,7 +119,7 @@ struct _Elm_Toolbar_Item_State } #define ELM_TOOLBAR_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_TOOLBAR_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_TOOLBAR_CLASS))) \ return #define ELM_TOOLBAR_ITEM_CHECK(it) \ @@ -132,6 +132,6 @@ struct _Elm_Toolbar_Item_State #define ELM_TOOLBAR_ITEM_CHECK_OR_GOTO(it, label) \ ELM_WIDGET_ITEM_CHECK_OR_GOTO((Elm_Widget_Item *)it, label); \ - if (!it->base.widget || !eo_isa ((it->base.widget), ELM_OBJ_TOOLBAR_CLASS)) goto label; + if (!it->base.widget || !eo_isa ((it->base.widget), ELM_TOOLBAR_CLASS)) goto label; #endif diff --git a/legacy/elementary/src/lib/elm_widget_video.h b/legacy/elementary/src/lib/elm_widget_video.h index 66deb876a9..aedeebcf1d 100644 --- a/legacy/elementary/src/lib/elm_widget_video.h +++ b/legacy/elementary/src/lib/elm_widget_video.h @@ -32,7 +32,7 @@ struct _Elm_Video_Data */ #define ELM_VIDEO_DATA_GET(o, sd) \ - Elm_Video_Data * sd = eo_data_scope_get(o, ELM_OBJ_VIDEO_CLASS) + Elm_Video_Data * sd = eo_data_scope_get(o, ELM_VIDEO_CLASS) #define ELM_VIDEO_DATA_GET_OR_RETURN(o, ptr) \ ELM_VIDEO_DATA_GET(o, ptr); \ @@ -53,7 +53,7 @@ struct _Elm_Video_Data } #define ELM_VIDEO_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_VIDEO_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_VIDEO_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_widget_web.h b/legacy/elementary/src/lib/elm_widget_web.h index 3fa0bc6e41..1273c0ad9e 100644 --- a/legacy/elementary/src/lib/elm_widget_web.h +++ b/legacy/elementary/src/lib/elm_widget_web.h @@ -123,7 +123,7 @@ struct _View_Smart_Data */ #define ELM_WEB_DATA_GET(o, sd) \ - Elm_Web_Data * sd = eo_data_scope_get(o, ELM_OBJ_WEB_CLASS) + Elm_Web_Data * sd = eo_data_scope_get(o, ELM_WEB_CLASS) #define ELM_WEB_DATA_GET_OR_RETURN(o, ptr) \ ELM_WEB_DATA_GET(o, ptr); \ @@ -144,7 +144,7 @@ struct _View_Smart_Data } #define ELM_WEB_CHECK(obj) \ - if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_WEB_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((obj), ELM_WEB_CLASS))) \ return #endif diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c index f2f5d142f8..3c3a6b7c6c 100644 --- a/legacy/elementary/src/lib/elm_win.c +++ b/legacy/elementary/src/lib/elm_win.c @@ -15,7 +15,7 @@ #include "elm_interface_atspi_window.eo.h" #include "elm_interface_atspi_widget.eo.h" -#define MY_CLASS ELM_OBJ_WIN_CLASS +#define MY_CLASS ELM_WIN_CLASS #define MY_CLASS_NAME "Elm_Win" #define MY_CLASS_NAME_LEGACY "elm_win" @@ -1301,7 +1301,7 @@ _deferred_ecore_evas_free(void *data) } EOLIAN static void -_elm_win_evas_smart_show(Eo *obj, Elm_Win_Data *sd) +_elm_win_evas_object_smart_show(Eo *obj, Elm_Win_Data *sd) { if (sd->modal_count) return; const Eina_List *l; @@ -1322,7 +1322,7 @@ _elm_win_evas_smart_show(Eo *obj, Elm_Win_Data *sd) } EOLIAN static void -_elm_win_evas_smart_hide(Eo *obj, Elm_Win_Data *sd) +_elm_win_evas_object_smart_hide(Eo *obj, Elm_Win_Data *sd) { if (sd->modal_count) return; const Eina_List *l; @@ -1582,7 +1582,7 @@ _elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj) } EOLIAN static void -_elm_win_evas_smart_del(Eo *obj, Elm_Win_Data *sd) +_elm_win_evas_object_smart_del(Eo *obj, Elm_Win_Data *sd) { const Eina_List *l; Evas_Object *current; @@ -1711,7 +1711,7 @@ _elm_win_obj_intercept_show(void *data, } EOLIAN static void -_elm_win_evas_smart_move(Eo *obj, Elm_Win_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_win_evas_object_smart_move(Eo *obj, Elm_Win_Data *sd, Evas_Coord x, Evas_Coord y) { if (sd->img_obj) { @@ -1751,7 +1751,7 @@ _elm_win_evas_smart_move(Eo *obj, Elm_Win_Data *sd, Evas_Coord x, Evas_Coord y) } EOLIAN static void -_elm_win_evas_smart_resize(Eo *obj, Elm_Win_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_win_evas_object_smart_resize(Eo *obj, Elm_Win_Data *sd, Evas_Coord w, Evas_Coord h) { eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); @@ -2779,7 +2779,7 @@ _elm_win_on_icon_del(void *data, } EOLIAN static void -_elm_win_evas_smart_add(Eo *obj, Elm_Win_Data *_pd EINA_UNUSED) +_elm_win_evas_object_smart_add(Eo *obj, Elm_Win_Data *_pd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); diff --git a/legacy/elementary/src/lib/elm_win.eo b/legacy/elementary/src/lib/elm_win.eo index cf8ae74d49..a9e621d594 100644 --- a/legacy/elementary/src/lib/elm_win.eo +++ b/legacy/elementary/src/lib/elm_win.eo @@ -1302,12 +1302,12 @@ class Elm_Win (Elm_Widget, Elm_Interface_Atspi_Window) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::hide; - Evas_Smart::show; - Evas_Smart::move; - Evas_Smart::add; - Evas_Smart::del; - Evas_Smart::resize; + Evas_Object_Smart::hide; + Evas_Object_Smart::show; + Evas_Object_Smart::move; + Evas_Object_Smart::add; + Evas_Object_Smart::del; + Evas_Object_Smart::resize; Elm_Widget::focus_direction; Elm_Widget::focus_next_manager_is; Elm_Widget::focus_direction_manager_is; diff --git a/legacy/elementary/src/lib/els_cursor.c b/legacy/elementary/src/lib/els_cursor.c index 1119454578..d424324538 100644 --- a/legacy/elementary/src/lib/els_cursor.c +++ b/legacy/elementary/src/lib/els_cursor.c @@ -370,7 +370,7 @@ _elm_cursor_cur_set(Elm_Cursor *cur) Evas_Object *top; top = elm_widget_top_get(cur->owner); - if ((top) && (eo_isa(top, ELM_OBJ_WIN_CLASS))) + if ((top) && (eo_isa(top, ELM_WIN_CLASS))) { #ifdef HAVE_ELEMENTARY_X cur->x.win = elm_win_xwindow_get(top);