From 6a98b84cd7645d8e5a89810f5d9cb79389b5fb32 Mon Sep 17 00:00:00 2001 From: Xavi Artigas Date: Fri, 6 Apr 2018 18:15:31 +0200 Subject: [PATCH] Efl.Ui.Layout.Object (from Efl.Ui.Layout) Ref https://phab.enlightenment.org/T6847 Reviewed-by: Cedric Bail --- src/Makefile_Elementary.am | 4 +- src/bin/elementary/test_evas_mask.c | 2 +- src/bin/elementary/test_ui_popup.c | 14 +- .../elementary/efl_ui_view_list_example_1.c | 2 +- src/lib/elementary/efl_ui_bg_widget.eo | 2 +- src/lib/elementary/efl_ui_button.eo | 2 +- src/lib/elementary/efl_ui_calendar.eo | 2 +- src/lib/elementary/efl_ui_clock.eo | 2 +- src/lib/elementary/efl_ui_frame.eo | 2 +- src/lib/elementary/efl_ui_layout_factory.c | 2 +- src/lib/elementary/efl_ui_layout_legacy.eo | 2 +- ...efl_ui_layout.c => efl_ui_layout_object.c} | 226 +++++++++--------- ...l_ui_layout.eo => efl_ui_layout_object.eo} | 4 +- src/lib/elementary/efl_ui_layout_pack.c | 28 +-- src/lib/elementary/efl_ui_navigation_bar.eo | 2 +- src/lib/elementary/efl_ui_navigation_layout.c | 6 +- .../elementary/efl_ui_navigation_layout.eo | 4 +- .../efl_ui_navigation_layout_private.h | 2 +- src/lib/elementary/efl_ui_pager.eo | 2 +- src/lib/elementary/efl_ui_panes.eo | 2 +- src/lib/elementary/efl_ui_popup.eo | 2 +- src/lib/elementary/efl_ui_popup_alert.c | 2 +- src/lib/elementary/efl_ui_progressbar.eo | 2 +- src/lib/elementary/efl_ui_scroller.c | 2 +- src/lib/elementary/efl_ui_scroller.eo | 2 +- src/lib/elementary/efl_ui_slider.eo | 2 +- src/lib/elementary/efl_ui_spin.eo | 2 +- src/lib/elementary/efl_ui_stack.eo | 2 +- src/lib/elementary/efl_ui_text.c | 2 +- src/lib/elementary/efl_ui_text.eo | 2 +- src/lib/elementary/efl_ui_textpath.eo | 2 +- src/lib/elementary/efl_ui_video.eo | 2 +- src/lib/elementary/efl_ui_view_list.eo | 4 +- src/lib/elementary/efl_ui_view_list_types.eot | 2 +- src/lib/elementary/efl_ui_widget.c | 14 +- src/lib/elementary/elm_actionslider.eo | 2 +- src/lib/elementary/elm_bubble.eo | 2 +- src/lib/elementary/elm_calendar.eo | 2 +- src/lib/elementary/elm_clock.eo | 2 +- src/lib/elementary/elm_code_widget.eo | 2 +- src/lib/elementary/elm_colorselector.eo | 2 +- src/lib/elementary/elm_conformant.eo | 2 +- src/lib/elementary/elm_ctxpopup.eo | 2 +- src/lib/elementary/elm_dayselector.eo | 2 +- src/lib/elementary/elm_entry.c | 2 +- src/lib/elementary/elm_entry.eo | 2 +- src/lib/elementary/elm_fileselector.eo | 2 +- src/lib/elementary/elm_fileselector_entry.eo | 2 +- src/lib/elementary/elm_flipselector.eo | 2 +- src/lib/elementary/elm_gengrid.eo | 2 +- src/lib/elementary/elm_genlist.c | 2 +- src/lib/elementary/elm_genlist.eo | 2 +- src/lib/elementary/elm_hover.eo | 2 +- src/lib/elementary/elm_index.eo | 2 +- src/lib/elementary/elm_inwin.eo | 2 +- src/lib/elementary/elm_label.eo | 2 +- src/lib/elementary/elm_layout.h | 2 +- src/lib/elementary/elm_layout_legacy.h | 2 +- src/lib/elementary/elm_list.eo | 2 +- src/lib/elementary/elm_multibuttonentry.eo | 2 +- src/lib/elementary/elm_naviframe.eo | 2 +- src/lib/elementary/elm_panel.eo | 2 +- src/lib/elementary/elm_player.eo | 2 +- src/lib/elementary/elm_popup.eo | 2 +- src/lib/elementary/elm_scroller.eo | 2 +- src/lib/elementary/elm_segment_control.eo | 2 +- src/lib/elementary/elm_separator.eo | 2 +- src/lib/elementary/elm_slideshow.eo | 2 +- src/lib/elementary/elm_spinner.eo | 2 +- src/lib/elementary/elm_thumb.eo | 2 +- src/lib/elementary/elm_widget_layout.h | 6 +- src/tests/elementary/elm_test_layout.c | 4 +- 72 files changed, 218 insertions(+), 218 deletions(-) rename src/lib/elementary/{efl_ui_layout.c => efl_ui_layout_object.c} (87%) rename src/lib/elementary/{efl_ui_layout.eo => efl_ui_layout_object.eo} (94%) diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index 8dd4d2d860..e6a4059fde 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -14,7 +14,7 @@ elm_public_eolian_files = \ lib/elementary/efl_ui_stack.eo \ lib/elementary/efl_ui_image.eo \ lib/elementary/efl_ui_image_zoomable.eo \ - lib/elementary/efl_ui_layout.eo \ + lib/elementary/efl_ui_layout_object.eo \ lib/elementary/efl_ui_nstate.eo \ lib/elementary/efl_ui_navigation_bar.eo \ lib/elementary/efl_ui_navigation_bar_part.eo \ @@ -714,7 +714,7 @@ lib_elementary_libelementary_la_SOURCES = \ lib/elementary/elm_interface_scrollable.c \ lib/elementary/elm_inwin.c \ lib/elementary/elm_label.c \ - lib/elementary/efl_ui_layout.c \ + lib/elementary/efl_ui_layout_object.c \ lib/elementary/efl_ui_layout_pack.c \ lib/elementary/elm_list.c \ lib/elementary/elm_main.c \ diff --git a/src/bin/elementary/test_evas_mask.c b/src/bin/elementary/test_evas_mask.c index 6520a766e6..6a4bbcf975 100644 --- a/src/bin/elementary/test_evas_mask.c +++ b/src/bin/elementary/test_evas_mask.c @@ -122,7 +122,7 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event // FIXME: layout EO API snprintf(buf, sizeof(buf), "%s/objects/test_masking.edj", elm_app_data_dir_get()); - ly = efl_add(EFL_UI_LAYOUT_CLASS, win, + ly = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, win, efl_file_set(efl_added, buf, "masking")); efl_pack(box, ly); diff --git a/src/bin/elementary/test_ui_popup.c b/src/bin/elementary/test_ui_popup.c index 19dc5547ae..4667924a12 100644 --- a/src/bin/elementary/test_ui_popup.c +++ b/src/bin/elementary/test_ui_popup.c @@ -363,7 +363,7 @@ test_ui_popup_alert(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * efl_gfx_entity_size_set(efl_ui_popup, EINA_SIZE2D(160, 160)); - Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, efl_ui_popup); + Eo *layout = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, efl_ui_popup); snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get()); efl_file_set(layout, buf, "efl_ui_popup_scroll_content"); @@ -384,7 +384,7 @@ _alert_scroll_case1_cb(void *data, const Efl_Event *ev EINA_UNUSED) efl_text_set(efl_part(efl_ui_popup, "title"), "title"); - Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, efl_ui_popup); + Eo *layout = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, efl_ui_popup); snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get()); efl_file_set(layout, buf, "efl_ui_popup_scroll_content"); @@ -408,7 +408,7 @@ _alert_scroll_case2_cb(void *data, const Efl_Event *ev EINA_UNUSED) efl_text_set(efl_part(efl_ui_popup, "title"), "title"); - Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, efl_ui_popup); + Eo *layout = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, efl_ui_popup); snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get()); efl_file_set(layout, buf, "efl_ui_popup_scroll_content"); @@ -434,7 +434,7 @@ _alert_scroll_case3_cb(void *data, const Efl_Event *ev EINA_UNUSED) efl_text_set(efl_part(efl_ui_popup, "title"), "title"); - Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, efl_ui_popup); + Eo *layout = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, efl_ui_popup); snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get()); efl_file_set(layout, buf, "efl_ui_popup_scroll_content"); @@ -460,7 +460,7 @@ _alert_scroll_case4_cb(void *data, const Efl_Event *ev EINA_UNUSED) efl_text_set(efl_part(efl_ui_popup, "title"), "title"); - Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, efl_ui_popup); + Eo *layout = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, efl_ui_popup); snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get()); efl_file_set(layout, buf, "efl_ui_popup_scroll_content"); @@ -486,7 +486,7 @@ _alert_scroll_case5_cb(void *data, const Efl_Event *ev EINA_UNUSED) efl_text_set(efl_part(efl_ui_popup, "title"), "title"); - Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, efl_ui_popup); + Eo *layout = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, efl_ui_popup); snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get()); efl_file_set(layout, buf, "efl_ui_popup_scroll_content"); @@ -1006,7 +1006,7 @@ test_ui_popup_anchor(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 500)); - Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, win); + Eo *layout = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, win); snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get()); efl_file_set(layout, buf, "efl_ui_popup_anchor_layout"); efl_gfx_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/src/examples/elementary/efl_ui_view_list_example_1.c b/src/examples/elementary/efl_ui_view_list_example_1.c index 88818cf8b5..3994fa419f 100644 --- a/src/examples/elementary/efl_ui_view_list_example_1.c +++ b/src/examples/elementary/efl_ui_view_list_example_1.c @@ -27,7 +27,7 @@ _realized_cb(void *data, const Efl_Event *event) Efl_Ui_View_List_Item_Event *ie = event->info; if (!ie->layout) return; - Efl_Ui_Layout *layout = ie->layout; + Efl_Ui_Layout_Object *layout = ie->layout; elm_object_focus_allow_set(layout, EINA_TRUE); } diff --git a/src/lib/elementary/efl_ui_bg_widget.eo b/src/lib/elementary/efl_ui_bg_widget.eo index 6af5aa5ae5..f54775cbc9 100644 --- a/src/lib/elementary/efl_ui_bg_widget.eo +++ b/src/lib/elementary/efl_ui_bg_widget.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Bg_Widget (Efl.Ui.Layout, Efl.Ui.Bg, Efl.Gfx.Image_Load_Controller) +class Efl.Ui.Bg_Widget (Efl.Ui.Layout.Object, Efl.Ui.Bg, Efl.Gfx.Image_Load_Controller) { [[The bg (background) widget is used for setting (solid) background decorations diff --git a/src/lib/elementary/efl_ui_button.eo b/src/lib/elementary/efl_ui_button.eo index 2eb281a40b..27b3ba4181 100644 --- a/src/lib/elementary/efl_ui_button.eo +++ b/src/lib/elementary/efl_ui_button.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Button (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, +class Efl.Ui.Button (Efl.Ui.Layout.Object, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Text, Efl.Text_Markup, Efl.Content, Efl.Access.Widget.Action, Efl.Ui.Translatable) { diff --git a/src/lib/elementary/efl_ui_calendar.eo b/src/lib/elementary/efl_ui_calendar.eo index 09f0935a8b..c4193395a4 100644 --- a/src/lib/elementary/efl_ui_calendar.eo +++ b/src/lib/elementary/efl_ui_calendar.eo @@ -16,7 +16,7 @@ enum Efl.Ui.Calendar_Weekday last [[Sentinel value to indicate last enum field during iteration]] } -class Efl.Ui.Calendar (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Access.Widget.Action, Efl.Ui.Format) +class Efl.Ui.Calendar (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Efl.Access.Widget.Action, Efl.Ui.Format) { [[Calendar widget diff --git a/src/lib/elementary/efl_ui_clock.eo b/src/lib/elementary/efl_ui_clock.eo index af92741a59..d37db28e5c 100644 --- a/src/lib/elementary/efl_ui_clock.eo +++ b/src/lib/elementary/efl_ui_clock.eo @@ -16,7 +16,7 @@ enum Efl.Ui.Clock_Type ampm = 7, [[Indicates AM/PM field .]] } -class Efl.Ui.Clock (Efl.Ui.Layout) +class Efl.Ui.Clock (Efl.Ui.Layout.Object) { [[Efl UI clock class]] methods { diff --git a/src/lib/elementary/efl_ui_frame.eo b/src/lib/elementary/efl_ui_frame.eo index 038f257de5..dd2d25cd9a 100644 --- a/src/lib/elementary/efl_ui_frame.eo +++ b/src/lib/elementary/efl_ui_frame.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Frame (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Text, Efl.Text_Markup, +class Efl.Ui.Frame (Efl.Ui.Layout.Object, Efl.Ui.Clickable, Efl.Text, Efl.Text_Markup, Efl.Ui.Translatable, Efl.Content) { [[Frame widget diff --git a/src/lib/elementary/efl_ui_layout_factory.c b/src/lib/elementary/efl_ui_layout_factory.c index f79924318f..7abf61c694 100644 --- a/src/lib/elementary/efl_ui_layout_factory.c +++ b/src/lib/elementary/efl_ui_layout_factory.c @@ -78,7 +78,7 @@ _efl_ui_layout_factory_efl_ui_factory_create(Eo *obj EINA_UNUSED, Efl_Ui_Layout_ } else */ { - layout = efl_add(EFL_UI_LAYOUT_CLASS, parent, + layout = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, parent, efl_ui_view_model_set(efl_added, model), elm_layout_theme_set(efl_added, pd->klass, pd->group, pd->style)); diff --git a/src/lib/elementary/efl_ui_layout_legacy.eo b/src/lib/elementary/efl_ui_layout_legacy.eo index 453d78e85f..012d3e2168 100644 --- a/src/lib/elementary/efl_ui_layout_legacy.eo +++ b/src/lib/elementary/efl_ui_layout_legacy.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Layout_Legacy (Efl.Ui.Layout, Efl.Ui.Legacy) +class Efl.Ui.Layout_Legacy (Efl.Ui.Layout.Object, Efl.Ui.Legacy) { [[Elementary layout class]] data: null; diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout_object.c similarity index 87% rename from src/lib/elementary/efl_ui_layout.c rename to src/lib/elementary/efl_ui_layout_object.c index d2424833f9..5f5a590d71 100644 --- a/src/lib/elementary/efl_ui_layout.c +++ b/src/lib/elementary/efl_ui_layout_object.c @@ -13,14 +13,14 @@ #include "elm_part_helper.h" #include "elm_entry.eo.h" -#define MY_CLASS EFL_UI_LAYOUT_CLASS -#define MY_CLASS_PFX efl_ui_layout +#define MY_CLASS EFL_UI_LAYOUT_OBJECT_CLASS +#define MY_CLASS_PFX efl_ui_layout_object -#define MY_CLASS_NAME "Efl.Ui.Layout" +#define MY_CLASS_NAME "Efl.Ui.Layout.Object" -Eo *_efl_ui_layout_pack_proxy_get(Efl_Ui_Layout *obj, Edje_Part_Type type, const char *part); +Eo *_efl_ui_layout_pack_proxy_get(Efl_Ui_Layout_Object *obj, Edje_Part_Type type, const char *part); static void _efl_model_properties_changed_cb(void *, const Efl_Event *); -static Eina_Bool _efl_ui_layout_part_cursor_unset(Efl_Ui_Layout_Data *sd, const char *part_name); +static Eina_Bool _efl_ui_layout_part_cursor_unset(Efl_Ui_Layout_Object_Data *sd, const char *part_name); static const char SIG_THEME_CHANGED[] = "theme,changed"; const char SIG_LAYOUT_FOCUSED[] = "focused"; @@ -68,7 +68,7 @@ struct _Efl_Ui_Layout_Sub_Iterator { Eina_Iterator iterator; Eina_Iterator *real_iterator; - Efl_Ui_Layout *object; + Efl_Ui_Layout_Object *object; }; struct _Efl_Ui_Layout_Sub_Object_Data @@ -138,7 +138,7 @@ _part_cursor_free(Efl_Ui_Layout_Sub_Object_Cursor *pc) } static void -_sizing_eval(Evas_Object *obj, Efl_Ui_Layout_Data *sd) +_sizing_eval(Evas_Object *obj, Efl_Ui_Layout_Object_Data *sd) { Evas_Coord minh = -1, minw = -1; Evas_Coord rest_w = 0, rest_h = 0; @@ -178,7 +178,7 @@ _signals_emit(Eo *obj, } static inline void -_icon_signal_emit(Efl_Ui_Layout_Data *sd, +_icon_signal_emit(Efl_Ui_Layout_Object_Data *sd, Efl_Ui_Layout_Sub_Object_Data *sub_d, Eina_Bool visible) { @@ -213,7 +213,7 @@ _icon_signal_emit(Efl_Ui_Layout_Data *sd, } static inline void -_text_signal_emit(Efl_Ui_Layout_Data *sd, +_text_signal_emit(Efl_Ui_Layout_Object_Data *sd, Efl_Ui_Layout_Sub_Object_Data *sub_d, Eina_Bool visible) { @@ -250,7 +250,7 @@ _text_signal_emit(Efl_Ui_Layout_Data *sd, } static void -_parts_signals_emit(Efl_Ui_Layout_Data *sd) +_parts_signals_emit(Efl_Ui_Layout_Object_Data *sd) { const Eina_List *l; Efl_Ui_Layout_Sub_Object_Data *sub_d; @@ -271,7 +271,7 @@ _part_cursor_part_apply(const Efl_Ui_Layout_Sub_Object_Cursor *pc) } static void -_parts_cursors_apply(Efl_Ui_Layout_Data *sd) +_parts_cursors_apply(Efl_Ui_Layout_Object_Data *sd) { const Eina_List *l; const char *file, *group; @@ -331,7 +331,7 @@ _efl_ui_layout_highlight_in_theme(Evas_Object *obj) static Eina_Bool _visuals_refresh(Evas_Object *obj, - Efl_Ui_Layout_Data *sd) + Efl_Ui_Layout_Object_Data *sd) { Eina_Bool ret = EINA_FALSE; @@ -357,7 +357,7 @@ _visuals_refresh(Evas_Object *obj, } EOLIAN static Eina_Bool -_efl_ui_layout_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Eina_Bool disabled) +_efl_ui_layout_object_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, Eina_Bool disabled) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); @@ -374,7 +374,7 @@ _efl_ui_layout_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Layout_Data *_pd } static Efl_Ui_Theme_Apply -_efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data *sd) +_efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Object_Data *sd) { Efl_Ui_Theme_Apply ret = EFL_UI_THEME_APPLY_FAILED; @@ -391,7 +391,7 @@ _efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data *sd) } if (ret) - efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL); + efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_OBJECT_EVENT_THEME_CHANGED, NULL); if (!_visuals_refresh(obj, sd)) ret = EFL_UI_THEME_APPLY_FAILED; @@ -400,7 +400,7 @@ _efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data *sd) } EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_layout_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd) +_efl_ui_layout_object_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Object_Data *sd) { Efl_Ui_Theme_Apply theme_apply = EFL_UI_THEME_APPLY_FAILED; @@ -412,7 +412,7 @@ _efl_ui_layout_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd) } EOLIAN static Eina_Bool -_efl_ui_layout_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED) +_efl_ui_layout_object_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); @@ -438,7 +438,7 @@ _efl_ui_layout_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Layout_Data * } EOLIAN static Eina_Bool -_efl_ui_layout_efl_ui_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Evas_Object *sobj) +_efl_ui_layout_object_efl_ui_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, Evas_Object *sobj) { Eina_Bool int_ret = EINA_FALSE; @@ -455,7 +455,7 @@ _efl_ui_layout_efl_ui_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Layout_Data * } EOLIAN static Eina_Bool -_efl_ui_layout_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Layout_Data *sd, Evas_Object *sobj) +_efl_ui_layout_object_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Layout_Object_Data *sd, Evas_Object *sobj) { Eina_List *l; Efl_Ui_Layout_Sub_Object_Data *sub_d; @@ -559,7 +559,7 @@ _box_reference_del(void *data, static Evas_Object * _sub_box_remove(Evas_Object *obj, - Efl_Ui_Layout_Data *sd, + Efl_Ui_Layout_Object_Data *sd, Efl_Ui_Layout_Sub_Object_Data *sub_d) { Evas_Object *child = sub_d->obj; /* sub_d will die in @@ -602,7 +602,7 @@ _sub_box_is(const Efl_Ui_Layout_Sub_Object_Data *sub_d) static Evas_Object * _sub_table_remove(Evas_Object *obj, - Efl_Ui_Layout_Data *sd, + Efl_Ui_Layout_Object_Data *sd, Efl_Ui_Layout_Sub_Object_Data *sub_d) { Evas_Object *child; @@ -634,7 +634,7 @@ _on_size_evaluate_signal(void *data, } EOLIAN static void -_efl_ui_layout_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED) +_efl_ui_layout_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED) { Evas_Object *edje; @@ -655,7 +655,7 @@ _efl_ui_layout_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_ } EOLIAN static void -_efl_ui_layout_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Layout_Data *sd) +_efl_ui_layout_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Layout_Object_Data *sd) { Efl_Ui_Layout_Sub_Object_Data *sub_d; Efl_Ui_Layout_Sub_Object_Cursor *pc; @@ -726,7 +726,7 @@ _efl_ui_layout_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Layout_Data *sd) /* rewrite or extend this one on your derived class as to suit your * needs */ EOLIAN static void -_efl_ui_layout_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Layout_Data *sd) +_efl_ui_layout_object_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Layout_Object_Data *sd) { if (sd->needs_size_calc) { @@ -736,7 +736,7 @@ _efl_ui_layout_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Layout_Data *sd) } static Efl_Ui_Layout_Sub_Object_Cursor * -_parts_cursors_find(Efl_Ui_Layout_Data *sd, +_parts_cursors_find(Efl_Ui_Layout_Object_Data *sd, const char *part) { const Eina_List *l; @@ -755,7 +755,7 @@ _parts_cursors_find(Efl_Ui_Layout_Data *sd, * widget inheriting from elm_layout */ EOLIAN static Eina_Bool -_efl_ui_layout_efl_file_file_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *file, const char *group) +_efl_ui_layout_object_efl_file_file_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *file, const char *group) { Eina_Bool int_ret = EINA_FALSE; @@ -779,7 +779,7 @@ _efl_ui_layout_efl_file_file_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *fi } EOLIAN static void -_efl_ui_layout_efl_file_file_get(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, const char **file, const char **group) +_efl_ui_layout_object_efl_file_file_get(const Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED, const char **file, const char **group) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); edje_object_file_get(wd->resize_obj, file, group); @@ -787,7 +787,7 @@ _efl_ui_layout_efl_file_file_get(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUS EOLIAN static Eina_Bool -_efl_ui_layout_efl_file_mmap_set(Eo *obj, Efl_Ui_Layout_Data *sd, const Eina_File *file, const char *group) +_efl_ui_layout_object_efl_file_mmap_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const Eina_File *file, const char *group) { Eina_Bool int_ret = EINA_FALSE; @@ -811,14 +811,14 @@ _efl_ui_layout_efl_file_mmap_set(Eo *obj, Efl_Ui_Layout_Data *sd, const Eina_Fil } EOLIAN static void -_efl_ui_layout_efl_file_mmap_get(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, const Eina_File **file, const char **group) +_efl_ui_layout_object_efl_file_mmap_get(const Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED, const Eina_File **file, const char **group) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); efl_file_mmap_get(wd->resize_obj, file, group); } EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_layout_theme_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *klass, const char *group, const char *style) +_efl_ui_layout_object_theme_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *klass, const char *group, const char *style) { Eina_Bool changed = EINA_FALSE; @@ -840,7 +840,7 @@ _efl_ui_layout_theme_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *klass, con } EOLIAN static void -_efl_ui_layout_efl_layout_signal_signal_emit(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *emission, const char *source) +_efl_ui_layout_object_efl_layout_signal_signal_emit(Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, const char *emission, const char *source) { // Don't do anything else than call forward here ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -848,7 +848,7 @@ _efl_ui_layout_efl_layout_signal_signal_emit(Eo *obj, Efl_Ui_Layout_Data *_pd EI } EOLIAN static Eina_Bool -_efl_ui_layout_efl_layout_signal_signal_callback_add(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *emission, const char *source, Efl_Signal_Cb func, void *data) +_efl_ui_layout_object_efl_layout_signal_signal_callback_add(Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, const char *emission, const char *source, Efl_Signal_Cb func, void *data) { // Don't do anything else than call forward here ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); @@ -856,7 +856,7 @@ _efl_ui_layout_efl_layout_signal_signal_callback_add(Eo *obj, Efl_Ui_Layout_Data } EOLIAN static Eina_Bool -_efl_ui_layout_efl_layout_signal_signal_callback_del(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *emission, const char *source, Edje_Signal_Cb func, void *data) +_efl_ui_layout_object_efl_layout_signal_signal_callback_del(Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, const char *emission, const char *source, Edje_Signal_Cb func, void *data) { // Don't do anything else than call forward here ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); @@ -884,7 +884,7 @@ elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *conte } static Eina_Bool -_efl_ui_layout_content_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *content) +_efl_ui_layout_content_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *content) { Efl_Ui_Layout_Sub_Object_Data *sub_d; Eina_List *l; @@ -968,7 +968,7 @@ elm_layout_content_get(const Evas_Object *obj, const char *swallow) } static Evas_Object* -_efl_ui_layout_content_get(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part) +_efl_ui_layout_content_get(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part) { const Eina_List *l; Efl_Ui_Layout_Sub_Object_Data *sub_d; @@ -1002,7 +1002,7 @@ elm_layout_content_unset(Evas_Object *obj, const char *swallow) } static Evas_Object* -_efl_ui_layout_content_unset(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part) +_efl_ui_layout_content_unset(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part) { Efl_Ui_Layout_Sub_Object_Data *sub_d; Eina_List *l; @@ -1071,7 +1071,7 @@ elm_layout_content_swallow_list_get(const Evas_Object *obj) EFL_UI_LAYOUT_CHECK(obj) NULL; Eina_List *ret = NULL; Efl_Ui_Layout_Sub_Object_Data *sub_d = NULL; - Efl_Ui_Layout_Data *sd = efl_data_scope_get(obj, MY_CLASS); + Efl_Ui_Layout_Object_Data *sd = efl_data_scope_get(obj, MY_CLASS); Eina_List *l = NULL; EINA_LIST_FOREACH(sd->subs, l, sub_d) @@ -1095,7 +1095,7 @@ _sub_iterator_next(Efl_Ui_Layout_Sub_Iterator *it, void **data) return EINA_TRUE; } -static Efl_Ui_Layout * +static Efl_Ui_Layout_Object * _sub_iterator_get_container(Efl_Ui_Layout_Sub_Iterator *it) { return it->object; @@ -1109,7 +1109,7 @@ _sub_iterator_free(Efl_Ui_Layout_Sub_Iterator *it) } static Eina_Iterator * -_sub_iterator_create(Eo *eo_obj, Efl_Ui_Layout_Data *sd) +_sub_iterator_create(Eo *eo_obj, Efl_Ui_Layout_Object_Data *sd) { Efl_Ui_Layout_Sub_Iterator *it; @@ -1129,19 +1129,19 @@ _sub_iterator_create(Eo *eo_obj, Efl_Ui_Layout_Data *sd) } EOLIAN static Eina_Iterator * -_efl_ui_layout_efl_container_content_iterate(Eo *eo_obj EINA_UNUSED, Efl_Ui_Layout_Data *sd) +_efl_ui_layout_object_efl_container_content_iterate(Eo *eo_obj EINA_UNUSED, Efl_Ui_Layout_Object_Data *sd) { return _sub_iterator_create(eo_obj, sd); } EOLIAN static int -_efl_ui_layout_efl_container_content_count(Eo *eo_obj EINA_UNUSED, Efl_Ui_Layout_Data *sd) +_efl_ui_layout_object_efl_container_content_count(Eo *eo_obj EINA_UNUSED, Efl_Ui_Layout_Object_Data *sd) { return eina_list_count(sd->subs); } static Eina_Bool -_efl_ui_layout_text_generic_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, const char *text, Eina_Bool is_markup) +_efl_ui_layout_text_generic_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, const char *text, Eina_Bool is_markup) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); @@ -1224,13 +1224,13 @@ _efl_ui_layout_text_generic_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *par } static Eina_Bool -_efl_ui_layout_text_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, const char *text) +_efl_ui_layout_text_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, const char *text) { return _efl_ui_layout_text_generic_set(obj, sd, part, text, EINA_FALSE); } static const char* -_efl_ui_layout_text_get(Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, const char *part) +_efl_ui_layout_text_get(Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED, const char *part) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); @@ -1242,7 +1242,7 @@ _efl_ui_layout_text_get(Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, const char } static const char* -_efl_ui_layout_text_markup_get(Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, const char *part) +_efl_ui_layout_text_markup_get(Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED, const char *part) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); @@ -1250,13 +1250,13 @@ _efl_ui_layout_text_markup_get(Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, cons } static Eina_Bool -_efl_ui_layout_text_markup_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, const char *text) +_efl_ui_layout_text_markup_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, const char *text) { return _efl_ui_layout_text_generic_set(obj, sd, part, text, EINA_TRUE); } static void -_layout_box_subobj_init(Efl_Ui_Layout_Data *sd, Efl_Ui_Layout_Sub_Object_Data *sub_d, const char *part, Evas_Object *child) +_layout_box_subobj_init(Efl_Ui_Layout_Object_Data *sd, Efl_Ui_Layout_Sub_Object_Data *sub_d, const char *part, Evas_Object *child) { sub_d->part = eina_stringshare_add(part); sub_d->obj = child; @@ -1265,7 +1265,7 @@ _layout_box_subobj_init(Efl_Ui_Layout_Data *sd, Efl_Ui_Layout_Sub_Object_Data *s } Eina_Bool -_efl_ui_layout_box_append(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child) +_efl_ui_layout_box_append(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child) { Efl_Ui_Layout_Sub_Object_Data *sub_d; @@ -1302,7 +1302,7 @@ _efl_ui_layout_box_append(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Eva } Eina_Bool -_efl_ui_layout_box_prepend(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child) +_efl_ui_layout_box_prepend(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child) { Efl_Ui_Layout_Sub_Object_Data *sub_d; @@ -1339,7 +1339,7 @@ _efl_ui_layout_box_prepend(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Ev } Eina_Bool -_efl_ui_layout_box_insert_before(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child, const Evas_Object *reference) +_efl_ui_layout_box_insert_before(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child, const Evas_Object *reference) { Efl_Ui_Layout_Sub_Object_Data *sub_d; @@ -1381,7 +1381,7 @@ _efl_ui_layout_box_insert_before(Eo *obj, Efl_Ui_Layout_Data *sd, const char *pa } Eina_Bool -_efl_ui_layout_box_insert_at(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child, unsigned int pos) +_efl_ui_layout_box_insert_at(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child, unsigned int pos) { Efl_Ui_Layout_Sub_Object_Data *sub_d; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); @@ -1419,7 +1419,7 @@ _efl_ui_layout_box_insert_at(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, } Evas_Object * -_efl_ui_layout_box_remove(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child) +_efl_ui_layout_box_remove(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child) { EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL); @@ -1440,7 +1440,7 @@ _efl_ui_layout_box_remove(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Eva } Eina_Bool -_efl_ui_layout_box_remove_all(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Eina_Bool clear) +_efl_ui_layout_box_remove_all(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Eina_Bool clear) { EINA_SAFETY_ON_NULL_RETURN_VAL(part, EINA_FALSE); @@ -1470,7 +1470,7 @@ _efl_ui_layout_box_remove_all(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, } Eina_Bool -_efl_ui_layout_table_pack(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan) +_efl_ui_layout_table_pack(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan) { Efl_Ui_Layout_Sub_Object_Data *sub_d; @@ -1517,7 +1517,7 @@ _efl_ui_layout_table_pack(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Eva } Evas_Object * -_efl_ui_layout_table_unpack(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child) +_efl_ui_layout_table_unpack(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child) { EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL); @@ -1539,7 +1539,7 @@ _efl_ui_layout_table_unpack(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, E } Eina_Bool -_efl_ui_layout_table_clear(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Eina_Bool clear) +_efl_ui_layout_table_clear(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Eina_Bool clear) { EINA_SAFETY_ON_NULL_RETURN_VAL(part, EINA_FALSE); @@ -1577,7 +1577,7 @@ elm_layout_edje_get(const Eo *obj) } EOLIAN static const char * -_efl_ui_layout_efl_layout_group_group_data_get(const Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *key) +_efl_ui_layout_object_efl_layout_group_group_data_get(const Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, const char *key) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); @@ -1585,7 +1585,7 @@ _efl_ui_layout_efl_layout_group_group_data_get(const Eo *obj, Efl_Ui_Layout_Data } EOLIAN static Eina_Size2D -_efl_ui_layout_efl_layout_group_group_size_min_get(const Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED) +_efl_ui_layout_object_efl_layout_group_group_size_min_get(const Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_SIZE2D(0, 0)); @@ -1593,7 +1593,7 @@ _efl_ui_layout_efl_layout_group_group_size_min_get(const Eo *obj, Efl_Ui_Layout_ } EOLIAN static Eina_Size2D -_efl_ui_layout_efl_layout_group_group_size_max_get(const Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED) +_efl_ui_layout_object_efl_layout_group_group_size_max_get(const Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_SIZE2D(0, 0)); @@ -1601,7 +1601,7 @@ _efl_ui_layout_efl_layout_group_group_size_max_get(const Eo *obj, Efl_Ui_Layout_ } EOLIAN static Eina_Bool -_efl_ui_layout_efl_layout_group_part_exist_get(const Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *part) +_efl_ui_layout_object_efl_layout_group_part_exist_get(const Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, const char *part) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); @@ -1613,7 +1613,7 @@ _efl_ui_layout_efl_layout_group_part_exist_get(const Eo *obj, Efl_Ui_Layout_Data * Evas's rendering phase, it will be addressed, finally (see * _efl_ui_layout_smart_calculate()). */ static void -_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Layout_Data *sd) +_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Layout_Object_Data *sd) { if (sd->frozen) return; if (sd->needs_size_calc) return; @@ -1625,7 +1625,7 @@ _elm_layout_sizing_eval(Eo *obj, Efl_Ui_Layout_Data *sd) EAPI void elm_layout_sizing_restricted_eval(Eo *obj, Eina_Bool w, Eina_Bool h) { - Efl_Ui_Layout_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS); + Efl_Ui_Layout_Object_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS); if (!sd) return; sd->restricted_calc_w = !!w; @@ -1635,7 +1635,7 @@ elm_layout_sizing_restricted_eval(Eo *obj, Eina_Bool w, Eina_Bool h) } EOLIAN static int -_efl_ui_layout_efl_layout_calc_calc_freeze(Eo *obj, Efl_Ui_Layout_Data *sd) +_efl_ui_layout_object_efl_layout_calc_calc_freeze(Eo *obj, Efl_Ui_Layout_Object_Data *sd) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0); @@ -1647,7 +1647,7 @@ _efl_ui_layout_efl_layout_calc_calc_freeze(Eo *obj, Efl_Ui_Layout_Data *sd) } EOLIAN static int -_efl_ui_layout_efl_layout_calc_calc_thaw(Eo *obj, Efl_Ui_Layout_Data *sd) +_efl_ui_layout_object_efl_layout_calc_calc_thaw(Eo *obj, Efl_Ui_Layout_Object_Data *sd) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0); @@ -1661,7 +1661,7 @@ _efl_ui_layout_efl_layout_calc_calc_thaw(Eo *obj, Efl_Ui_Layout_Data *sd) } static Eina_Bool -_efl_ui_layout_part_cursor_set(Efl_Ui_Layout_Data *sd, const char *part_name, const char *cursor) +_efl_ui_layout_part_cursor_set(Efl_Ui_Layout_Object_Data *sd, const char *part_name, const char *cursor) { Evas_Object *part_obj; Efl_Ui_Layout_Sub_Object_Cursor *pc; @@ -1717,7 +1717,7 @@ _efl_ui_layout_part_cursor_set(Efl_Ui_Layout_Data *sd, const char *part_name, co } static const char * -_efl_ui_layout_part_cursor_get(Efl_Ui_Layout_Data *sd, const char *part_name) +_efl_ui_layout_part_cursor_get(Efl_Ui_Layout_Object_Data *sd, const char *part_name) { EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, NULL); @@ -1729,7 +1729,7 @@ _efl_ui_layout_part_cursor_get(Efl_Ui_Layout_Data *sd, const char *part_name) } static Eina_Bool -_efl_ui_layout_part_cursor_unset(Efl_Ui_Layout_Data *sd, const char *part_name) +_efl_ui_layout_part_cursor_unset(Efl_Ui_Layout_Object_Data *sd, const char *part_name) { EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE); @@ -1751,7 +1751,7 @@ _efl_ui_layout_part_cursor_unset(Efl_Ui_Layout_Data *sd, const char *part_name) } static Eina_Bool -_efl_ui_layout_part_cursor_style_set(Efl_Ui_Layout_Data *sd, const char *part_name, const char *style) +_efl_ui_layout_part_cursor_style_set(Efl_Ui_Layout_Object_Data *sd, const char *part_name, const char *style) { EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE); @@ -1766,7 +1766,7 @@ _efl_ui_layout_part_cursor_style_set(Efl_Ui_Layout_Data *sd, const char *part_na } static const char* -_efl_ui_layout_part_cursor_style_get(Efl_Ui_Layout_Data *sd, const char *part_name) +_efl_ui_layout_part_cursor_style_get(Efl_Ui_Layout_Object_Data *sd, const char *part_name) { EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, NULL); @@ -1778,7 +1778,7 @@ _efl_ui_layout_part_cursor_style_get(Efl_Ui_Layout_Data *sd, const char *part_na } static Eina_Bool -_efl_ui_layout_part_cursor_engine_only_set(Efl_Ui_Layout_Data *sd, const char *part_name, Eina_Bool engine_only) +_efl_ui_layout_part_cursor_engine_only_set(Efl_Ui_Layout_Object_Data *sd, const char *part_name, Eina_Bool engine_only) { EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE); @@ -1793,7 +1793,7 @@ _efl_ui_layout_part_cursor_engine_only_set(Efl_Ui_Layout_Data *sd, const char *p } static Eina_Bool -_efl_ui_layout_part_cursor_engine_only_get(Efl_Ui_Layout_Data *sd, const char *part_name) +_efl_ui_layout_part_cursor_engine_only_get(Efl_Ui_Layout_Object_Data *sd, const char *part_name) { EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE); @@ -1807,7 +1807,7 @@ _efl_ui_layout_part_cursor_engine_only_get(Efl_Ui_Layout_Data *sd, const char *p EAPI Eina_Bool elm_layout_edje_object_can_access_set(Eo *obj, Eina_Bool can_access) { - Efl_Ui_Layout_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS); + Efl_Ui_Layout_Object_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS); EINA_SAFETY_ON_NULL_RETURN_VAL(sd, EINA_FALSE); sd->can_access = !!can_access; return EINA_TRUE; @@ -1816,13 +1816,13 @@ elm_layout_edje_object_can_access_set(Eo *obj, Eina_Bool can_access) EAPI Eina_Bool elm_layout_edje_object_can_access_get(const Eo *obj) { - Efl_Ui_Layout_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS); + Efl_Ui_Layout_Object_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS); EINA_SAFETY_ON_NULL_RETURN_VAL(sd, EINA_FALSE); return sd->can_access; } EOLIAN static void -_efl_ui_layout_efl_object_dbg_info_get(Eo *eo_obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Efl_Dbg_Info *root) +_efl_ui_layout_efl_object_dbg_info_get(Eo *eo_obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, Efl_Dbg_Info *root) { efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root); ELM_WIDGET_DATA_GET_OR_RETURN(eo_obj, wd); @@ -1916,7 +1916,7 @@ _prop_future_then_cb(void* data, Efl_Event const*event) } static void -_efl_ui_layout_view_model_update(Efl_Ui_Layout_Data *pd) +_efl_ui_layout_view_model_update(Efl_Ui_Layout_Object_Data *pd) { Efl_Ui_Layout_Sub_Connect *sc; Eina_List *l; @@ -1934,7 +1934,7 @@ _efl_ui_layout_view_model_update(Efl_Ui_Layout_Data *pd) static void _efl_model_properties_changed_cb(void *data, const Efl_Event *event) { - Efl_Ui_Layout_Data *pd = data; + Efl_Ui_Layout_Object_Data *pd = data; Efl_Model_Property_Event *evt = event->info; Eina_Stringshare *ss_prop; Efl_Ui_Layout_Sub_Connect *sc; @@ -1962,7 +1962,7 @@ _efl_model_properties_changed_cb(void *data, const Efl_Event *event) } EOLIAN static void -_efl_ui_layout_efl_ui_view_model_set(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Data *pd, Efl_Model *model) +_efl_ui_layout_object_efl_ui_view_model_set(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Object_Data *pd, Efl_Model *model) { Efl_Ui_Layout_Sub_Connect *sc; Eina_List *l; @@ -2027,13 +2027,13 @@ _efl_ui_layout_efl_ui_view_model_set(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Data *pd } EOLIAN static Efl_Model * -_efl_ui_layout_efl_ui_view_model_get(const Eo *obj EINA_UNUSED, Efl_Ui_Layout_Data *pd) +_efl_ui_layout_object_efl_ui_view_model_get(const Eo *obj EINA_UNUSED, Efl_Ui_Layout_Object_Data *pd) { return pd->model; } EOLIAN static void -_efl_ui_layout_efl_ui_model_connect_connect(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Data *pd, const char *name, const char *property) +_efl_ui_layout_object_efl_ui_model_connect_connect(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Object_Data *pd, const char *name, const char *property) { EINA_SAFETY_ON_NULL_RETURN(name); EINA_SAFETY_ON_NULL_RETURN(property); @@ -2079,7 +2079,7 @@ _efl_ui_layout_efl_ui_model_connect_connect(Eo *obj EINA_UNUSED, Efl_Ui_Layout_D } EOLIAN static void -_efl_ui_layout_efl_ui_factory_model_connect(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Data *pd, +_efl_ui_layout_object_efl_ui_factory_model_connect(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Object_Data *pd, const char *name, Efl_Ui_Factory *factory) { EINA_SAFETY_ON_NULL_RETURN(name); @@ -2111,7 +2111,7 @@ _efl_ui_layout_efl_ui_factory_model_connect(Eo *obj EINA_UNUSED, Efl_Ui_Layout_D } EOLIAN static Eo * -_efl_ui_layout_efl_object_constructor(Eo *obj, Efl_Ui_Layout_Data *sd) +_efl_ui_layout_object_efl_object_constructor(Eo *obj, Efl_Ui_Layout_Object_Data *sd) { sd->obj = obj; obj = efl_constructor(efl_super(obj, MY_CLASS)); @@ -2122,7 +2122,7 @@ _efl_ui_layout_efl_object_constructor(Eo *obj, Efl_Ui_Layout_Data *sd) } EOLIAN static Efl_Object* -_efl_ui_layout_efl_object_finalize(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UNUSED) +_efl_ui_layout_object_efl_object_finalize(Eo *obj, Efl_Ui_Layout_Object_Data *pd EINA_UNUSED) { Eo *eo; @@ -2133,14 +2133,14 @@ _efl_ui_layout_efl_object_finalize(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UNUSED) } EOLIAN static void -_efl_ui_layout_efl_layout_signal_message_send(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UNUSED, int id, const Eina_Value msg) +_efl_ui_layout_object_efl_layout_signal_message_send(Eo *obj, Efl_Ui_Layout_Object_Data *pd EINA_UNUSED, int id, const Eina_Value msg) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); efl_layout_signal_message_send(wd->resize_obj, id, msg); } EOLIAN static void -_efl_ui_layout_efl_layout_signal_signal_process(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UNUSED, Eina_Bool recurse) +_efl_ui_layout_object_efl_layout_signal_signal_process(Eo *obj, Efl_Ui_Layout_Object_Data *pd EINA_UNUSED, Eina_Bool recurse) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); efl_layout_signal_process(wd->resize_obj, recurse); @@ -2149,7 +2149,7 @@ _efl_ui_layout_efl_layout_signal_signal_process(Eo *obj, Efl_Ui_Layout_Data *pd /* Efl.Part implementation */ EOLIAN static Eo * -_efl_ui_layout_efl_part_part(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, const char *part) +_efl_ui_layout_object_efl_part_part(const Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED, const char *part) { Efl_Canvas_Layout_Part_Type type = EFL_CANVAS_LAYOUT_PART_TYPE_NONE; @@ -2211,7 +2211,7 @@ _efl_ui_layout_efl_part_part(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, } static const char * -_efl_ui_layout_default_content_part_get(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED) +_efl_ui_layout_default_content_part_get(const Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED) { const char *part = NULL; if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_FALSE)) @@ -2220,7 +2220,7 @@ _efl_ui_layout_default_content_part_get(const Eo *obj, Efl_Ui_Layout_Data *sd EI } static const char * -_efl_ui_layout_default_text_part_get(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED) +_efl_ui_layout_default_text_part_get(const Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED) { const char *part = NULL; if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE)) @@ -2234,7 +2234,7 @@ EOLIAN static Eina_Bool _efl_ui_layout_part_efl_ui_cursor_cursor_set(Eo *obj, void *_pd EINA_UNUSED, const char *cursor) { Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); - Efl_Ui_Layout_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS); + Efl_Ui_Layout_Object_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS); return _efl_ui_layout_part_cursor_set(sd, pd->part, cursor); } @@ -2242,7 +2242,7 @@ EOLIAN static const char * _efl_ui_layout_part_efl_ui_cursor_cursor_get(const Eo *obj, void *_pd EINA_UNUSED) { Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); - Efl_Ui_Layout_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS); + Efl_Ui_Layout_Object_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS); return _efl_ui_layout_part_cursor_get(sd, pd->part); } @@ -2250,7 +2250,7 @@ EOLIAN static Eina_Bool _efl_ui_layout_part_efl_ui_cursor_cursor_style_set(Eo *obj, void *_pd EINA_UNUSED, const char *style) { Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); - Efl_Ui_Layout_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS); + Efl_Ui_Layout_Object_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS); return _efl_ui_layout_part_cursor_style_set(sd, pd->part, style); } @@ -2258,7 +2258,7 @@ EOLIAN static const char * _efl_ui_layout_part_efl_ui_cursor_cursor_style_get(const Eo *obj, void *_pd EINA_UNUSED) { Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); - Efl_Ui_Layout_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS); + Efl_Ui_Layout_Object_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS); return _efl_ui_layout_part_cursor_style_get(sd, pd->part); } @@ -2266,7 +2266,7 @@ EOLIAN static Eina_Bool _efl_ui_layout_part_efl_ui_cursor_cursor_theme_search_enabled_set(Eo *obj, void *_pd EINA_UNUSED, Eina_Bool allow) { Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); - Efl_Ui_Layout_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS); + Efl_Ui_Layout_Object_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS); return _efl_ui_layout_part_cursor_engine_only_set(sd, pd->part, !allow); } @@ -2274,20 +2274,20 @@ EOLIAN static Eina_Bool _efl_ui_layout_part_efl_ui_cursor_cursor_theme_search_enabled_get(const Eo *obj, void *_pd EINA_UNUSED) { Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); - Efl_Ui_Layout_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS); + Efl_Ui_Layout_Object_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS); return !_efl_ui_layout_part_cursor_engine_only_get(sd, pd->part); } /* Efl.Ui.Layout.Part_Content */ -ELM_PART_OVERRIDE_CONTENT_GET_FULL(efl_ui_layout_part_content, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data) -ELM_PART_OVERRIDE_CONTENT_SET_FULL(efl_ui_layout_part_content, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data) -ELM_PART_OVERRIDE_CONTENT_UNSET_FULL(efl_ui_layout_part_content, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data) +ELM_PART_OVERRIDE_CONTENT_GET_FULL(efl_ui_layout_part_content, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data) +ELM_PART_OVERRIDE_CONTENT_SET_FULL(efl_ui_layout_part_content, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data) +ELM_PART_OVERRIDE_CONTENT_UNSET_FULL(efl_ui_layout_part_content, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data) /* Efl.Ui.Layout.Part_Text */ -ELM_PART_OVERRIDE_TEXT_TEXT_GET_FULL(efl_ui_layout_part_text, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data) -ELM_PART_OVERRIDE_TEXT_TEXT_SET_FULL(efl_ui_layout_part_text, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data) -ELM_PART_OVERRIDE_TEXT_MARKUP_GET_FULL(efl_ui_layout_part_text, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data) -ELM_PART_OVERRIDE_TEXT_MARKUP_SET_FULL(efl_ui_layout_part_text, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data) +ELM_PART_OVERRIDE_TEXT_TEXT_GET_FULL(efl_ui_layout_part_text, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data) +ELM_PART_OVERRIDE_TEXT_TEXT_SET_FULL(efl_ui_layout_part_text, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data) +ELM_PART_OVERRIDE_TEXT_MARKUP_GET_FULL(efl_ui_layout_part_text, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data) +ELM_PART_OVERRIDE_TEXT_MARKUP_SET_FULL(efl_ui_layout_part_text, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data) EOLIAN static const char * _efl_ui_layout_part_text_efl_ui_translatable_translatable_text_get(const Eo *obj, void *_pd EINA_UNUSED, const char **domain) @@ -2304,13 +2304,13 @@ _efl_ui_layout_part_text_efl_ui_translatable_translatable_text_set(Eo *obj, void } /* Efl.Ui.Layout.Part_Legacy */ -ELM_PART_OVERRIDE_CONTENT_GET_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data) -ELM_PART_OVERRIDE_CONTENT_SET_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data) -ELM_PART_OVERRIDE_CONTENT_UNSET_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data) -ELM_PART_OVERRIDE_TEXT_TEXT_GET_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data) -ELM_PART_OVERRIDE_TEXT_TEXT_SET_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data) -ELM_PART_OVERRIDE_TEXT_MARKUP_GET_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data) -ELM_PART_OVERRIDE_TEXT_MARKUP_SET_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data) +ELM_PART_OVERRIDE_CONTENT_GET_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data) +ELM_PART_OVERRIDE_CONTENT_SET_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data) +ELM_PART_OVERRIDE_CONTENT_UNSET_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data) +ELM_PART_OVERRIDE_TEXT_TEXT_GET_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data) +ELM_PART_OVERRIDE_TEXT_TEXT_SET_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data) +ELM_PART_OVERRIDE_TEXT_MARKUP_GET_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data) +ELM_PART_OVERRIDE_TEXT_MARKUP_SET_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data) EOLIAN static const char * _efl_ui_layout_part_legacy_efl_ui_translatable_translatable_text_get(const Eo *obj, void *_pd EINA_UNUSED, const char **domain) @@ -2331,7 +2331,7 @@ _efl_ui_layout_part_legacy_efl_ui_translatable_translatable_text_set(Eo *obj, vo EOLIAN static Efl_Object * _efl_ui_layout_part_bg_efl_object_finalize(Eo *obj, void *_pd EINA_UNUSED) { - Efl_Ui_Layout_Data *sd; + Efl_Ui_Layout_Object_Data *sd; Elm_Part_Data *pd; Eo *bg; @@ -2369,7 +2369,7 @@ EFL_FUNC_BODY_CONST(elm_layout_content_aliases_get, const Elm_Layout_Part_Alias_ ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX) ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX) -#define EFL_UI_LAYOUT_EXTRA_OPS \ +#define EFL_UI_LAYOUT_OBJECT_EXTRA_OPS \ EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_layout), \ ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_layout), \ ELM_PART_TEXT_DEFAULT_OPS(efl_ui_layout), \ @@ -2378,7 +2378,7 @@ ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX) EFL_OBJECT_OP_FUNC(elm_layout_sizing_eval, _elm_layout_sizing_eval), \ EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_ui_layout_efl_object_dbg_info_get) -#include "efl_ui_layout.eo.c" +#include "efl_ui_layout_object.eo.c" #include "efl_ui_layout_legacy.eo.h" @@ -2600,7 +2600,7 @@ _elm_layout_signal_callback_add_legacy(Eo *obj, Eo *edje, Eina_List **p_edje_sig EAPI void elm_layout_signal_callback_add(Eo *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data) { - Efl_Ui_Layout_Data *sd; + Efl_Ui_Layout_Object_Data *sd; if (!emission || !source) return; @@ -2654,7 +2654,7 @@ _elm_layout_signal_callback_del_legacy(Eo *obj EINA_UNUSED, Eo *edje, Eina_List EAPI void * elm_layout_signal_callback_del(Eo *obj, const char *emission, const char *source, Edje_Signal_Cb func) { - Efl_Ui_Layout_Data *sd; + Efl_Ui_Layout_Object_Data *sd; if (!emission || !source) return NULL; @@ -2686,7 +2686,7 @@ elm_layout_theme_set(Evas_Object *obj, const char *klass, const char *group, con { Efl_Ui_Theme_Apply ta; - ta = efl_ui_layout_theme_set(obj, klass, group, style); + ta = efl_ui_layout_object_theme_set(obj, klass, group, style); return (ta != EFL_UI_THEME_APPLY_FAILED); } diff --git a/src/lib/elementary/efl_ui_layout.eo b/src/lib/elementary/efl_ui_layout_object.eo similarity index 94% rename from src/lib/elementary/efl_ui_layout.eo rename to src/lib/elementary/efl_ui_layout_object.eo index cc6ed24233..d12c5c9146 100644 --- a/src/lib/elementary/efl_ui_layout.eo +++ b/src/lib/elementary/efl_ui_layout_object.eo @@ -1,6 +1,6 @@ import efl_ui; -class Efl.Ui.Layout (Efl.Ui.Widget, Efl.Part, Efl.Container, Efl.File, +class Efl.Ui.Layout.Object (Efl.Ui.Widget, Efl.Part, Efl.Container, Efl.File, Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Ui.Factory, Efl.Layout.Calc, Efl.Layout.Signal, Efl.Layout.Group) @@ -16,7 +16,7 @@ class Efl.Ui.Layout (Efl.Ui.Widget, Efl.Part, Efl.Container, Efl.File, Widgets that inherit from this class will call this function automatically so it should not be called by applications, unless - you are dealing directly with a @Efl.Ui.Layout object. + you are dealing directly with a @Efl.Ui.Layout.Object object. ]] set { [[Sets the edje group from the elementary theme that will be used diff --git a/src/lib/elementary/efl_ui_layout_pack.c b/src/lib/elementary/efl_ui_layout_pack.c index 7f65d814c3..30fd9997cb 100644 --- a/src/lib/elementary/efl_ui_layout_pack.c +++ b/src/lib/elementary/efl_ui_layout_pack.c @@ -16,15 +16,15 @@ #include "../evas/canvas/evas_table.eo.h" /* layout internals for box & table */ -Eina_Bool _efl_ui_layout_box_append(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child); -Eina_Bool _efl_ui_layout_box_prepend(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child); -Eina_Bool _efl_ui_layout_box_insert_before(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child, const Evas_Object *reference); -Eina_Bool _efl_ui_layout_box_insert_at(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child, unsigned int pos); -Evas_Object *_efl_ui_layout_box_remove(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child); -Eina_Bool _efl_ui_layout_box_remove_all(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Eina_Bool clear); -Eina_Bool _efl_ui_layout_table_pack(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan); -Evas_Object *_efl_ui_layout_table_unpack(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child); -Eina_Bool _efl_ui_layout_table_clear(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Eina_Bool clear); +Eina_Bool _efl_ui_layout_box_append(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child); +Eina_Bool _efl_ui_layout_box_prepend(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child); +Eina_Bool _efl_ui_layout_box_insert_before(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child, const Evas_Object *reference); +Eina_Bool _efl_ui_layout_box_insert_at(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child, unsigned int pos); +Evas_Object *_efl_ui_layout_box_remove(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child); +Eina_Bool _efl_ui_layout_box_remove_all(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Eina_Bool clear); +Eina_Bool _efl_ui_layout_table_pack(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan); +Evas_Object *_efl_ui_layout_table_unpack(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child); +Eina_Bool _efl_ui_layout_table_clear(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Eina_Bool clear); #define BOX_CLASS EFL_UI_LAYOUT_PART_BOX_CLASS #define TABLE_CLASS EFL_UI_LAYOUT_PART_TABLE_CLASS @@ -34,14 +34,14 @@ typedef struct _Layout_Part_Data Efl_Ui_Layout_Table_Data; struct _Layout_Part_Data { - Efl_Ui_Layout *obj; // no ref - Efl_Ui_Layout_Data *sd; // data xref + Efl_Ui_Layout_Object *obj; // no ref + Efl_Ui_Layout_Object_Data *sd; // data xref Eina_Stringshare *part; unsigned char temp; }; Eo * -_efl_ui_layout_pack_proxy_get(Efl_Ui_Layout *obj, Edje_Part_Type type, const char *part) +_efl_ui_layout_pack_proxy_get(Efl_Ui_Layout_Object *obj, Edje_Part_Type type, const char *part) { if (type == EDJE_PART_TYPE_BOX) return efl_add(BOX_CLASS, obj, @@ -66,7 +66,7 @@ EOLIAN static void _efl_ui_layout_part_box_real_part_set(Eo *obj, Efl_Ui_Layout_Box_Data *pd, Eo *layout, const char *part) { pd->obj = layout; - pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_CLASS, obj); + pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_OBJECT_CLASS, obj); eina_stringshare_replace(&pd->part, part); pd->temp = 1; } @@ -208,7 +208,7 @@ EOLIAN static void _efl_ui_layout_part_table_real_part_set(Eo *obj, Efl_Ui_Layout_Table_Data *pd, Eo *layout, const char *part) { pd->obj = layout; - pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_CLASS, obj); + pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_OBJECT_CLASS, obj); eina_stringshare_replace(&pd->part, part); pd->temp = 1; } diff --git a/src/lib/elementary/efl_ui_navigation_bar.eo b/src/lib/elementary/efl_ui_navigation_bar.eo index 764eaa8f20..ee5bd77794 100644 --- a/src/lib/elementary/efl_ui_navigation_bar.eo +++ b/src/lib/elementary/efl_ui_navigation_bar.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Navigation_Bar (Efl.Ui.Layout, Efl.Content, Efl.Text, Efl.Ui.Translatable) +class Efl.Ui.Navigation_Bar (Efl.Ui.Layout.Object, Efl.Content, Efl.Text, Efl.Ui.Translatable) { [[Navigation_Bar widget. diff --git a/src/lib/elementary/efl_ui_navigation_layout.c b/src/lib/elementary/efl_ui_navigation_layout.c index 3d280dc528..f6ad467326 100644 --- a/src/lib/elementary/efl_ui_navigation_layout.c +++ b/src/lib/elementary/efl_ui_navigation_layout.c @@ -12,15 +12,15 @@ #define MY_CLASS_NAME "Efl.Ui.Navigation_Layout" EOLIAN static void -_efl_ui_navigation_layout_bar_set(Eo *obj, Efl_Ui_Navigation_Layout_Data *pd, Efl_Ui_Layout *bar) +_efl_ui_navigation_layout_bar_set(Eo *obj, Efl_Ui_Navigation_Layout_Data *pd, Efl_Ui_Layout_Object *bar) { - EINA_SAFETY_ON_FALSE_RETURN(efl_isa(bar, EFL_UI_LAYOUT_CLASS)); + EINA_SAFETY_ON_FALSE_RETURN(efl_isa(bar, EFL_UI_LAYOUT_OBJECT_CLASS)); efl_content_set(efl_part(obj, "bar"), bar); pd->bar = bar; } -EOLIAN static Efl_Ui_Layout * +EOLIAN static Efl_Ui_Layout_Object * _efl_ui_navigation_layout_bar_get(const Eo *obj EINA_UNUSED, Efl_Ui_Navigation_Layout_Data *pd) { return pd->bar; diff --git a/src/lib/elementary/efl_ui_navigation_layout.eo b/src/lib/elementary/efl_ui_navigation_layout.eo index 846fbf68af..fc26479b88 100644 --- a/src/lib/elementary/efl_ui_navigation_layout.eo +++ b/src/lib/elementary/efl_ui_navigation_layout.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Navigation_Layout (Efl.Ui.Layout, Efl.Content) +class Efl.Ui.Navigation_Layout (Efl.Ui.Layout.Object, Efl.Content) { [[Navigation_Layout widget. @@ -16,7 +16,7 @@ class Efl.Ui.Navigation_Layout (Efl.Ui.Layout, Efl.Content) get { } values { - value: Efl.Ui.Layout; + value: Efl.Ui.Layout.Object; [[The bar object located at the top area of the Navigation Layout. ]] } diff --git a/src/lib/elementary/efl_ui_navigation_layout_private.h b/src/lib/elementary/efl_ui_navigation_layout_private.h index 47d3e4464d..d80596110f 100644 --- a/src/lib/elementary/efl_ui_navigation_layout_private.h +++ b/src/lib/elementary/efl_ui_navigation_layout_private.h @@ -4,7 +4,7 @@ typedef struct _Efl_Ui_Navigation_Layout_Data Efl_Ui_Navigation_Layout_Data; struct _Efl_Ui_Navigation_Layout_Data { - Efl_Ui_Layout *bar; + Efl_Ui_Layout_Object *bar; }; #define EFL_UI_NAVIGATION_LAYOUT_DATA_GET_OR_RETURN(o, ptr, ...) \ diff --git a/src/lib/elementary/efl_ui_pager.eo b/src/lib/elementary/efl_ui_pager.eo index 4bd61b08c5..89cb495e58 100644 --- a/src/lib/elementary/efl_ui_pager.eo +++ b/src/lib/elementary/efl_ui_pager.eo @@ -5,7 +5,7 @@ enum Efl.Ui.Pager.Loop enabled } -class Efl.Ui.Pager (Efl.Ui.Layout, Efl.Pack_Linear) +class Efl.Ui.Pager (Efl.Ui.Layout.Object, Efl.Pack_Linear) { [[Pager widget diff --git a/src/lib/elementary/efl_ui_panes.eo b/src/lib/elementary/efl_ui_panes.eo index 41e8021cbd..b2cdbf5d74 100644 --- a/src/lib/elementary/efl_ui_panes.eo +++ b/src/lib/elementary/efl_ui_panes.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Panes (Efl.Ui.Layout, Efl.Ui.Direction, +class Efl.Ui.Panes (Efl.Ui.Layout.Object, Efl.Ui.Direction, Efl.Ui.Clickable) { [[Elementary panes class]] diff --git a/src/lib/elementary/efl_ui_popup.eo b/src/lib/elementary/efl_ui_popup.eo index 6d7eed5ca1..1038fab4b5 100644 --- a/src/lib/elementary/efl_ui_popup.eo +++ b/src/lib/elementary/efl_ui_popup.eo @@ -8,7 +8,7 @@ enum Efl.Ui.Popup.Align { bottom [[Popup aligned to bottom]] } -class Efl.Ui.Popup(Efl.Ui.Layout, Efl.Content) +class Efl.Ui.Popup(Efl.Ui.Layout.Object, Efl.Content) { [[EFL UI popup class]] methods { diff --git a/src/lib/elementary/efl_ui_popup_alert.c b/src/lib/elementary/efl_ui_popup_alert.c index 25ba2208fe..c5bf8359ab 100644 --- a/src/lib/elementary/efl_ui_popup_alert.c +++ b/src/lib/elementary/efl_ui_popup_alert.c @@ -140,7 +140,7 @@ _efl_ui_popup_alert_button_set(Eo *obj, Efl_Ui_Popup_Alert_Data *pd, Efl_Ui_Popu } else { - cur_content = efl_add(EFL_UI_LAYOUT_CLASS, obj, + cur_content = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, obj, efl_content_set(efl_part(obj, "buttons"), efl_added)); } diff --git a/src/lib/elementary/efl_ui_progressbar.eo b/src/lib/elementary/efl_ui_progressbar.eo index 45dd869d3f..a42116cfaf 100644 --- a/src/lib/elementary/efl_ui_progressbar.eo +++ b/src/lib/elementary/efl_ui_progressbar.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Progressbar (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Format, +class Efl.Ui.Progressbar (Efl.Ui.Layout.Object, Efl.Ui.Range, Efl.Ui.Format, Efl.Ui.Direction, Efl.Access.Value, Efl.Ui.Translatable, Efl.Text, Efl.Content, Efl.Text_Markup) { diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c index e8c624fcfa..e13da73c5d 100644 --- a/src/lib/elementary/efl_ui_scroller.c +++ b/src/lib/elementary/efl_ui_scroller.c @@ -401,7 +401,7 @@ _efl_ui_scroller_efl_object_finalize(Eo *obj, ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); - efl_ui_layout_theme_set(obj, "scroller", "base", efl_ui_widget_style_get(obj)); + efl_ui_layout_object_theme_set(obj, "scroller", "base", efl_ui_widget_style_get(obj)); sd->smanager = efl_add(EFL_UI_SCROLL_MANAGER_CLASS, obj); efl_ui_mirrored_set(sd->smanager, efl_ui_mirrored_get(obj)); diff --git a/src/lib/elementary/efl_ui_scroller.eo b/src/lib/elementary/efl_ui_scroller.eo index fd73d8cfc3..b0fff32564 100644 --- a/src/lib/elementary/efl_ui_scroller.eo +++ b/src/lib/elementary/efl_ui_scroller.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Scroller (Efl.Ui.Layout, +class Efl.Ui.Scroller (Efl.Ui.Layout.Object, Efl.Ui.Scrollable.Interactive, Efl.Ui.Scrollbar, Efl.Content, diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo index 6cb34475d4..aa9f8ed284 100644 --- a/src/lib/elementary/efl_ui_slider.eo +++ b/src/lib/elementary/efl_ui_slider.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction, +class Efl.Ui.Slider (Efl.Ui.Layout.Object, Efl.Ui.Range, Efl.Ui.Direction, Efl.Access.Value, Efl.Text, Efl.Text_Markup, Efl.Ui.Format, Efl.Ui.Translatable, Efl.Access.Widget.Action, Efl.Content) diff --git a/src/lib/elementary/efl_ui_spin.eo b/src/lib/elementary/efl_ui_spin.eo index d88e42d870..08934b4a6b 100644 --- a/src/lib/elementary/efl_ui_spin.eo +++ b/src/lib/elementary/efl_ui_spin.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Spin (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Format, +class Efl.Ui.Spin (Efl.Ui.Layout.Object, Efl.Ui.Range, Efl.Ui.Format, Efl.Access.Value, Efl.Access.Widget.Action) { [[A Spin. diff --git a/src/lib/elementary/efl_ui_stack.eo b/src/lib/elementary/efl_ui_stack.eo index 2635e15588..7adad847f7 100644 --- a/src/lib/elementary/efl_ui_stack.eo +++ b/src/lib/elementary/efl_ui_stack.eo @@ -18,7 +18,7 @@ struct Efl.Ui.Stack.Event_Deactivated { content: Efl.Canvas.Object; [[Deactivated content.]] } -class Efl.Ui.Stack (Efl.Ui.Layout) +class Efl.Ui.Stack (Efl.Ui.Layout.Object) { [[Stack widget. diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index 29a0120b24..12a30675cb 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -957,7 +957,7 @@ _efl_ui_text_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd) _efl_ui_text_guide_update(obj, !sd->has_text); efl_event_thaw(obj); - efl_event_callback_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL); + efl_event_callback_call(obj, EFL_UI_LAYOUT_OBJECT_EVENT_THEME_CHANGED, NULL); evas_object_unref(obj); diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo index 7e8de1a79d..18a2f7b3a6 100644 --- a/src/lib/elementary/efl_ui_text.eo +++ b/src/lib/elementary/efl_ui_text.eo @@ -1,7 +1,7 @@ /* FIXME - Text object must stop using elm_general! */ import elm_general; -class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, +class Efl.Ui.Text (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, Efl.Ui.Clickable, Efl.Access.Text, Efl.Access.Editable.Text, Efl.File, Efl.Ui.Selectable, Efl.Ui.Scrollable, Efl.Text_Interactive) { diff --git a/src/lib/elementary/efl_ui_textpath.eo b/src/lib/elementary/efl_ui_textpath.eo index 77af80cab9..6484f2cb5e 100644 --- a/src/lib/elementary/efl_ui_textpath.eo +++ b/src/lib/elementary/efl_ui_textpath.eo @@ -4,7 +4,7 @@ enum Efl.Ui.Textpath.Direction { ccw [[Counter-clockwise]] } -class Efl.Ui.Textpath (Efl.Ui.Layout, Efl.Object, Efl.Text, Efl.Gfx.Path) +class Efl.Ui.Textpath (Efl.Ui.Layout.Object, Efl.Object, Efl.Text, Efl.Gfx.Path) { [[Efl Ui Textpath class]] methods { diff --git a/src/lib/elementary/efl_ui_video.eo b/src/lib/elementary/efl_ui_video.eo index 32aa8efdd8..47b19c139e 100644 --- a/src/lib/elementary/efl_ui_video.eo +++ b/src/lib/elementary/efl_ui_video.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Video (Efl.Ui.Layout, Efl.File, +class Efl.Ui.Video (Efl.Ui.Layout.Object, Efl.File, Efl.Player, Efl.Access.Widget.Action) { [[Efl UI video class]] diff --git a/src/lib/elementary/efl_ui_view_list.eo b/src/lib/elementary/efl_ui_view_list.eo index 552b9c30e2..fff2d9fba9 100644 --- a/src/lib/elementary/efl_ui_view_list.eo +++ b/src/lib/elementary/efl_ui_view_list.eo @@ -2,11 +2,11 @@ import elm_general; struct Efl.Ui.View.List.Item_Event { - layout: Efl.Ui.Layout; + layout: Efl.Ui.Layout.Object; child: Efl.Model; index: int; } -class Efl.Ui.View.List (Efl.Ui.Layout, Efl.Ui.View, Efl.Ui.Scrollable.Interactive, Efl.Ui.Scrollbar, +class Efl.Ui.View.List (Efl.Ui.Layout.Object, Efl.Ui.View, Efl.Ui.Scrollable.Interactive, Efl.Ui.Scrollbar, Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Ui.Focus.Composition, Efl.Ui.Focus.Manager.Sub, Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.View.List.Model) { diff --git a/src/lib/elementary/efl_ui_view_list_types.eot b/src/lib/elementary/efl_ui_view_list_types.eot index fd0bbff5c7..6996903082 100644 --- a/src/lib/elementary/efl_ui_view_list_types.eot +++ b/src/lib/elementary/efl_ui_view_list_types.eot @@ -1,5 +1,5 @@ struct Efl.Ui.View.List.LayoutItem { - layout: Efl.Ui.Layout; + layout: Efl.Ui.Layout.Object; children: Efl.Model; index_offset: int; tree_node: void_ptr; diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c index e81f82ac05..5b1c5d58b4 100644 --- a/src/lib/elementary/efl_ui_widget.c +++ b/src/lib/elementary/efl_ui_widget.c @@ -230,7 +230,7 @@ _elm_widget_item_highlight_in_theme(Evas_Object *obj, Elm_Object_Item *eo_it) { Elm_Widget_Item_Data *it = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS); - if (efl_isa(it->view, EFL_UI_LAYOUT_CLASS)) + if (efl_isa(it->view, EFL_UI_LAYOUT_OBJECT_CLASS)) str = edje_object_data_get(elm_layout_edje_get(it->view), "focus_highlight"); else str = edje_object_data_get(it->view, "focus_highlight"); @@ -2760,7 +2760,7 @@ elm_widget_part_text_set(Eo *obj, const char *part, const char *label) /* legacy support: combobox was special (internal entry is text object). */ if (efl_isa(obj, ELM_COMBOBOX_CLASS)) _elm_combobox_part_text_set(obj, part, label); - else if (efl_isa(obj, EFL_UI_LAYOUT_CLASS)) + else if (efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS)) elm_layout_text_set(obj, part, label); } @@ -2770,7 +2770,7 @@ elm_widget_part_text_get(const Eo *obj, const char *part) /* legacy support: combobox was special (internal entry is text object). */ if (efl_isa(obj, ELM_COMBOBOX_CLASS)) return _elm_combobox_part_text_get(obj, part); - else if (efl_isa(obj, EFL_UI_LAYOUT_CLASS)) + else if (efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS)) return elm_layout_text_get(obj, part); return NULL; @@ -3414,7 +3414,7 @@ elm_widget_focus_highlight_focus_part_geometry_get(const Evas_Object *obj, if (!(target_hl_part = edje_object_data_get(edje_obj, "focus_part"))) return; } - else if (obj && efl_isa(obj, EFL_UI_LAYOUT_CLASS)) + else if (obj && efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS)) { edje_obj = elm_layout_edje_get(obj); if (!(target_hl_part = elm_layout_data_get(obj, "focus_part"))) @@ -5605,7 +5605,7 @@ EAPI void elm_widget_content_part_set(Evas_Object *obj, const char *part, Evas_Object *content) { ELM_WIDGET_CHECK(obj); - if (efl_isa(obj, EFL_UI_LAYOUT_CLASS)) + if (efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS)) { elm_layout_content_set(obj, part, content); return; @@ -5623,7 +5623,7 @@ EAPI Evas_Object * elm_widget_content_part_get(const Evas_Object *obj, const char *part) { ELM_WIDGET_CHECK(obj) NULL; - if (efl_isa(obj, EFL_UI_LAYOUT_CLASS)) + if (efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS)) return elm_layout_content_get(obj, part); if (!efl_isa(obj, EFL_PART_INTERFACE)) return NULL; if (!part) @@ -5638,7 +5638,7 @@ EAPI Evas_Object * elm_widget_content_part_unset(Evas_Object *obj, const char *part) { ELM_WIDGET_CHECK(obj) NULL; - if (efl_isa(obj, EFL_UI_LAYOUT_CLASS)) + if (efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS)) return elm_layout_content_unset(obj, part); if (!efl_isa(obj, EFL_PART_INTERFACE)) return NULL; if (!part) diff --git a/src/lib/elementary/elm_actionslider.eo b/src/lib/elementary/elm_actionslider.eo index 351cb282aa..1397f3707b 100644 --- a/src/lib/elementary/elm_actionslider.eo +++ b/src/lib/elementary/elm_actionslider.eo @@ -10,7 +10,7 @@ enum Elm.Actionslider.Pos all = (1 << 3) - 1 [[All positions for left/center/right.]] } -class Elm.Actionslider (Efl.Ui.Layout, Efl.Ui.Selectable, Efl.Ui.Legacy) +class Elm.Actionslider (Efl.Ui.Layout.Object, Efl.Ui.Selectable, Efl.Ui.Legacy) { [[An actionslider is a switcher for 2 or 3 labels diff --git a/src/lib/elementary/elm_bubble.eo b/src/lib/elementary/elm_bubble.eo index 2b326abc84..fd3e737189 100644 --- a/src/lib/elementary/elm_bubble.eo +++ b/src/lib/elementary/elm_bubble.eo @@ -12,7 +12,7 @@ enum Elm.Bubble.Pos bottom_right [[The arrow of the bubble points to the bottom right corner.]] } -class Elm.Bubble (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Legacy) +class Elm.Bubble (Efl.Ui.Layout.Object, Efl.Ui.Clickable, Efl.Ui.Legacy) { [[Speech bubble widget used in messaging applications]] diff --git a/src/lib/elementary/elm_calendar.eo b/src/lib/elementary/elm_calendar.eo index 47cc9470fb..1cbe6b3ca1 100644 --- a/src/lib/elementary/elm_calendar.eo +++ b/src/lib/elementary/elm_calendar.eo @@ -72,7 +72,7 @@ struct Elm.Calendar.Mark; [[Item handle for a calendar mark. with @Elm.Calendar.mark_del. ]] -class Elm.Calendar (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Access.Widget.Action, +class Elm.Calendar (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Efl.Access.Widget.Action, Efl.Ui.Legacy) { [[Calendar widget diff --git a/src/lib/elementary/elm_clock.eo b/src/lib/elementary/elm_clock.eo index 3bd3f0f0f0..e77dc49619 100644 --- a/src/lib/elementary/elm_clock.eo +++ b/src/lib/elementary/elm_clock.eo @@ -18,7 +18,7 @@ enum Elm.Clock.Edit_Mode all = (1 << 6) - 1 [[All digits should be editable.]] } -class Elm.Clock (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Ui.Legacy) +class Elm.Clock (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Efl.Ui.Legacy) { [[Digital clock widget diff --git a/src/lib/elementary/elm_code_widget.eo b/src/lib/elementary/elm_code_widget.eo index 0d51c1b28a..d3b9dd4279 100644 --- a/src/lib/elementary/elm_code_widget.eo +++ b/src/lib/elementary/elm_code_widget.eo @@ -6,7 +6,7 @@ import elm_general; struct @extern Elm_Code; [[Elementary code main data structure]] /* The main interface currently defined in code */ struct @extern Elm_Code_Line; [[Elementary code line data structure]] /* Parts of the interface currently defined in code */ -class Elm.Code_Widget (Efl.Ui.Layout, Efl.Access.Text) +class Elm.Code_Widget (Efl.Ui.Layout.Object, Efl.Access.Text) { [[Elementary code widget]] eo_prefix: elm_obj_code_widget; diff --git a/src/lib/elementary/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo index 89c6aafde0..5a87e1ce82 100644 --- a/src/lib/elementary/elm_colorselector.eo +++ b/src/lib/elementary/elm_colorselector.eo @@ -12,7 +12,7 @@ enum Elm.Colorselector.Mode all [[All possible color selector is displayed.]] } -class Elm.Colorselector (Efl.Ui.Layout, Efl.Ui.Focus.Composition, +class Elm.Colorselector (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Efl.Access.Widget.Action, Efl.Ui.Clickable, Efl.Ui.Legacy) { [[Elementary colorselector class]] diff --git a/src/lib/elementary/elm_conformant.eo b/src/lib/elementary/elm_conformant.eo index f63dbbdefe..0c28a57f84 100644 --- a/src/lib/elementary/elm_conformant.eo +++ b/src/lib/elementary/elm_conformant.eo @@ -1,4 +1,4 @@ -class Elm.Conformant (Efl.Ui.Layout, Efl.Ui.Legacy) +class Elm.Conformant (Efl.Ui.Layout.Object, Efl.Ui.Legacy) { [[Elementary conformant class]] legacy_prefix: elm_conformant; diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo index ce8999477b..1029f1f72e 100644 --- a/src/lib/elementary/elm_ctxpopup.eo +++ b/src/lib/elementary/elm_ctxpopup.eo @@ -8,7 +8,7 @@ enum Elm.Ctxpopup.Direction unknown [[Ctxpopup does not determine it's direction yet.]] } -class Elm.Ctxpopup (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Access.Widget.Action, Efl.Ui.Legacy) +class Elm.Ctxpopup (Efl.Ui.Layout.Object, Efl.Ui.Focus.Layer, Efl.Access.Widget.Action, Efl.Ui.Legacy) { [[Elementary context popup class]] legacy_prefix: elm_ctxpopup; diff --git a/src/lib/elementary/elm_dayselector.eo b/src/lib/elementary/elm_dayselector.eo index d95ca9fd54..5d124e2ece 100644 --- a/src/lib/elementary/elm_dayselector.eo +++ b/src/lib/elementary/elm_dayselector.eo @@ -17,7 +17,7 @@ enum Elm.Dayselector.Day max [[Sentinel value to indicate last enum field during iteration]] } -class Elm.Dayselector (Efl.Ui.Layout, Efl.Ui.Legacy) +class Elm.Dayselector (Efl.Ui.Layout.Object, Efl.Ui.Legacy) { [[Elementary dayselector class]] legacy_prefix: elm_dayselector; diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 2fe9cf96e3..82a5748ab8 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -999,7 +999,7 @@ _elm_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd) evas_event_thaw(evas_object_evas_get(obj)); evas_event_thaw_eval(evas_object_evas_get(obj)); - efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL); + efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_OBJECT_EVENT_THEME_CHANGED, NULL); evas_object_unref(obj); diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo index 9d84ee5390..a8d93a6dad 100644 --- a/src/lib/elementary/elm_entry.eo +++ b/src/lib/elementary/elm_entry.eo @@ -3,7 +3,7 @@ import elm_general; type Elm_Entry_Item_Provider_Cb: __undefined_type; [[Elementary entry item provider callback type]] type Elm_Entry_Filter_Cb: __undefined_type; [[Elementary entry filter callback type]] -class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, +class Elm.Entry (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, Efl.Ui.Clickable, Efl.Access.Text, Efl.Access.Editable.Text, Efl.File, Efl.Ui.Selectable, Efl.Ui.Scrollable, Efl.Access.Widget.Action, Efl.Ui.Legacy) diff --git a/src/lib/elementary/elm_fileselector.eo b/src/lib/elementary/elm_fileselector.eo index 0f4e00f340..166ee078c1 100644 --- a/src/lib/elementary/elm_fileselector.eo +++ b/src/lib/elementary/elm_fileselector.eo @@ -1,4 +1,4 @@ -class Elm.Fileselector (Efl.Ui.Layout, Elm.Interface.Fileselector, +class Elm.Fileselector (Efl.Ui.Layout.Object, Elm.Interface.Fileselector, Efl.Access.Widget.Action, Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy) { diff --git a/src/lib/elementary/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo index cb214a349b..45e8fc6dd0 100644 --- a/src/lib/elementary/elm_fileselector_entry.eo +++ b/src/lib/elementary/elm_fileselector_entry.eo @@ -1,4 +1,4 @@ -class Elm.Fileselector_Entry (Efl.Ui.Layout, Elm.Interface.Fileselector, +class Elm.Fileselector_Entry (Efl.Ui.Layout.Object, Elm.Interface.Fileselector, Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy) { [[Elementary fileselector entry class]] diff --git a/src/lib/elementary/elm_flipselector.eo b/src/lib/elementary/elm_flipselector.eo index f46b749762..cc17f67ff1 100644 --- a/src/lib/elementary/elm_flipselector.eo +++ b/src/lib/elementary/elm_flipselector.eo @@ -1,4 +1,4 @@ -class Elm.Flipselector (Efl.Ui.Layout, Efl.Ui.Range, +class Elm.Flipselector (Efl.Ui.Layout.Object, Efl.Ui.Range, Efl.Access.Widget.Action, Efl.Ui.Selectable, Efl.Ui.Legacy) { diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo index 259a72cc27..314f6485bf 100644 --- a/src/lib/elementary/elm_gengrid.eo +++ b/src/lib/elementary/elm_gengrid.eo @@ -9,7 +9,7 @@ enum Elm.Gengrid.Reorder_Type swap [[Swap reorder type]] } -class Elm.Gengrid (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scrollable, +class Elm.Gengrid (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Elm.Interface_Scrollable, Efl.Ui.Clickable, Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Ui.Legacy) { diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index c6947bf47a..e1d9d3430d 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -452,7 +452,7 @@ _item_content_realize(Elm_Gen_Item *it, ELM_WIDGET_DATA_GET_OR_RETURN(content, wd); // FIXME : Layout need sizing eval before group calculate - if (efl_class_get(content) == EFL_UI_LAYOUT_CLASS) + if (efl_class_get(content) == EFL_UI_LAYOUT_OBJECT_CLASS) elm_layout_sizing_eval(content); _widget_calculate_recursive(content); diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo index ed563dbe93..125791026c 100644 --- a/src/lib/elementary/elm_genlist.eo +++ b/src/lib/elementary/elm_genlist.eo @@ -1,6 +1,6 @@ import elm_general; -class Elm.Genlist (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scrollable, Efl.Ui.Clickable, +class Elm.Genlist (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Elm.Interface_Scrollable, Efl.Ui.Clickable, Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Ui.Selectable, Efl.Ui.Legacy) { diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo index f04df56542..c488dfe893 100644 --- a/src/lib/elementary/elm_hover.eo +++ b/src/lib/elementary/elm_hover.eo @@ -7,7 +7,7 @@ enum Elm.Hover.Axis both [[ELM_HOVER_AXIS_BOTH -- both.]] } -class Elm.Hover (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Ui.Clickable, +class Elm.Hover (Efl.Ui.Layout.Object, Efl.Ui.Focus.Layer, Efl.Ui.Clickable, Efl.Access.Widget.Action, Efl.Ui.Legacy) { [[Elementary hover class]] diff --git a/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo index 64a7b8c800..53957da09e 100644 --- a/src/lib/elementary/elm_index.eo +++ b/src/lib/elementary/elm_index.eo @@ -1,4 +1,4 @@ -class Elm.Index (Efl.Ui.Layout, Efl.Ui.Direction, +class Elm.Index (Efl.Ui.Layout.Object, Efl.Ui.Direction, Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy) { [[elementary index class]] diff --git a/src/lib/elementary/elm_inwin.eo b/src/lib/elementary/elm_inwin.eo index 0b6acf9bc1..82d7530cfa 100644 --- a/src/lib/elementary/elm_inwin.eo +++ b/src/lib/elementary/elm_inwin.eo @@ -1,4 +1,4 @@ -class Elm.Inwin (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Content, Efl.Ui.Legacy) +class Elm.Inwin (Efl.Ui.Layout.Object, Efl.Ui.Focus.Layer, Efl.Content, Efl.Ui.Legacy) { [[Elementary inwin class]] legacy_prefix: elm_inwin; diff --git a/src/lib/elementary/elm_label.eo b/src/lib/elementary/elm_label.eo index 73b1298b71..1770f39fb5 100644 --- a/src/lib/elementary/elm_label.eo +++ b/src/lib/elementary/elm_label.eo @@ -8,7 +8,7 @@ enum Elm.Label.Slide_Mode always [[Slide always.]] } -class Elm.Label (Efl.Ui.Layout, Efl.Ui.Legacy) +class Elm.Label (Efl.Ui.Layout.Object, Efl.Ui.Legacy) { [[Elementary label class]] legacy_prefix: elm_label; diff --git a/src/lib/elementary/elm_layout.h b/src/lib/elementary/elm_layout.h index a59fd7c650..d3205bc39b 100644 --- a/src/lib/elementary/elm_layout.h +++ b/src/lib/elementary/elm_layout.h @@ -168,7 +168,7 @@ #include #ifdef EFL_EO_API_SUPPORT -#include +#include #endif #ifndef EFL_NOLEGACY_API_SUPPORT #include diff --git a/src/lib/elementary/elm_layout_legacy.h b/src/lib/elementary/elm_layout_legacy.h index 58dab5bcc9..a22f16e824 100644 --- a/src/lib/elementary/elm_layout_legacy.h +++ b/src/lib/elementary/elm_layout_legacy.h @@ -712,4 +712,4 @@ EAPI const char *elm_layout_part_cursor_style_get(const Evas_Object *obj, const */ EAPI Eina_Bool elm_layout_part_cursor_unset(Evas_Object *obj, const char *part_name); -#include "efl_ui_layout.eo.legacy.h" +#include "efl_ui_layout_object.eo.legacy.h" diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo index 9a4d585136..c629ed4aa5 100644 --- a/src/lib/elementary/elm_list.eo +++ b/src/lib/elementary/elm_list.eo @@ -1,6 +1,6 @@ import elm_general; -class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable, +class Elm.List (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Access.Object, Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy) { diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo index eb414dba2a..36860f36a2 100644 --- a/src/lib/elementary/elm_multibuttonentry.eo +++ b/src/lib/elementary/elm_multibuttonentry.eo @@ -1,7 +1,7 @@ type Elm_Multibuttonentry_Item_Filter_Cb: __undefined_type; [[Elementary multibuttonentry item filter callback type]] type Elm_Multibuttonentry_Format_Cb: __undefined_type; [[Elementary multibuttonentry format callback type]] -class Elm.Multibuttonentry (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Legacy) +class Elm.Multibuttonentry (Efl.Ui.Layout.Object, Efl.Ui.Clickable, Efl.Ui.Legacy) { [[Elementary multibuttonentry class]] legacy_prefix: elm_multibuttonentry; diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo index d866aa2ee4..5ecd5fa107 100644 --- a/src/lib/elementary/elm_naviframe.eo +++ b/src/lib/elementary/elm_naviframe.eo @@ -1,4 +1,4 @@ -class Elm.Naviframe (Efl.Ui.Layout, Efl.Access.Widget.Action, Efl.Ui.Legacy) +class Elm.Naviframe (Efl.Ui.Layout.Object, Efl.Access.Widget.Action, Efl.Ui.Legacy) { [[Elementary naviframe class]] legacy_prefix: elm_naviframe; diff --git a/src/lib/elementary/elm_panel.eo b/src/lib/elementary/elm_panel.eo index 56bb185a84..3b600b12b9 100644 --- a/src/lib/elementary/elm_panel.eo +++ b/src/lib/elementary/elm_panel.eo @@ -8,7 +8,7 @@ enum Elm.Panel.Orient right [[Panel (dis)appears from the right]] } -class Elm.Panel (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Elm.Interface_Scrollable, +class Elm.Panel (Efl.Ui.Layout.Object, Efl.Ui.Focus.Layer, Elm.Interface_Scrollable, Efl.Access.Widget.Action, Efl.Ui.Legacy) { [[Elementary panel class]] diff --git a/src/lib/elementary/elm_player.eo b/src/lib/elementary/elm_player.eo index 49263c1348..01b78fa88a 100644 --- a/src/lib/elementary/elm_player.eo +++ b/src/lib/elementary/elm_player.eo @@ -1,4 +1,4 @@ -class Elm.Player (Efl.Ui.Layout, Efl.Access.Widget.Action, Efl.Ui.Legacy) +class Elm.Player (Efl.Ui.Layout.Object, Efl.Access.Widget.Action, Efl.Ui.Legacy) { [[Elementary player class]] legacy_prefix: elm_player; diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo index 992488cf36..137fd72ffc 100644 --- a/src/lib/elementary/elm_popup.eo +++ b/src/lib/elementary/elm_popup.eo @@ -23,7 +23,7 @@ enum Elm.Popup.Orient } -class Elm.Popup (Efl.Ui.Layout, Efl.Access.Widget.Action, Efl.Ui.Legacy) +class Elm.Popup (Efl.Ui.Layout.Object, Efl.Access.Widget.Action, Efl.Ui.Legacy) { [[Elementary popup class]] legacy_prefix: elm_popup; diff --git a/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo index d5f37db851..0ae7bdc912 100644 --- a/src/lib/elementary/elm_scroller.eo +++ b/src/lib/elementary/elm_scroller.eo @@ -1,4 +1,4 @@ -class Elm.Scroller (Efl.Ui.Layout, Elm.Interface_Scrollable, +class Elm.Scroller (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, Efl.Access.Widget.Action, Efl.Ui.Scrollable, Efl.Content, Efl.Ui.Legacy) { diff --git a/src/lib/elementary/elm_segment_control.eo b/src/lib/elementary/elm_segment_control.eo index bd42439393..a06ed47de4 100644 --- a/src/lib/elementary/elm_segment_control.eo +++ b/src/lib/elementary/elm_segment_control.eo @@ -1,4 +1,4 @@ -class Elm.Segment_Control (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Ui.Legacy) +class Elm.Segment_Control (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Efl.Ui.Legacy) { [[Elementary segment control class]] legacy_prefix: elm_segment_control; diff --git a/src/lib/elementary/elm_separator.eo b/src/lib/elementary/elm_separator.eo index c29585d6b8..136311d021 100644 --- a/src/lib/elementary/elm_separator.eo +++ b/src/lib/elementary/elm_separator.eo @@ -1,4 +1,4 @@ -class Elm.Separator (Efl.Ui.Layout, Efl.Ui.Legacy) +class Elm.Separator (Efl.Ui.Layout.Object, Efl.Ui.Legacy) { [[Elementary separator class]] legacy_prefix: elm_separator; diff --git a/src/lib/elementary/elm_slideshow.eo b/src/lib/elementary/elm_slideshow.eo index a41b309cd6..d4fe44c9fe 100644 --- a/src/lib/elementary/elm_slideshow.eo +++ b/src/lib/elementary/elm_slideshow.eo @@ -1,6 +1,6 @@ type Elm_Slideshow_Item_Class: __undefined_type; [[Elementary slideshow item class type]] -class Elm.Slideshow (Efl.Ui.Layout, Efl.Access.Widget.Action, Efl.Ui.Legacy) +class Elm.Slideshow (Efl.Ui.Layout.Object, Efl.Access.Widget.Action, Efl.Ui.Legacy) { [[Elementary slideshow class]] eo_prefix: elm_obj_slideshow; diff --git a/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo index 9dd3030eec..bb937b8cfc 100644 --- a/src/lib/elementary/elm_spinner.eo +++ b/src/lib/elementary/elm_spinner.eo @@ -1,4 +1,4 @@ -class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Focus.Composition, +class Elm.Spinner (Efl.Ui.Layout.Object, Efl.Ui.Range, Efl.Ui.Focus.Composition, Efl.Access.Value, Efl.Access.Widget.Action, Efl.Ui.Legacy) { [[Elementary spinner class]] diff --git a/src/lib/elementary/elm_thumb.eo b/src/lib/elementary/elm_thumb.eo index f8b724754a..9f7b0c508e 100644 --- a/src/lib/elementary/elm_thumb.eo +++ b/src/lib/elementary/elm_thumb.eo @@ -1,4 +1,4 @@ -class Elm.Thumb (Efl.Ui.Layout, Efl.File, Efl.Ui.Clickable, +class Elm.Thumb (Efl.Ui.Layout.Object, Efl.File, Efl.Ui.Clickable, Efl.Ui.Draggable, Efl.Ui.Legacy) { [[Elementary thumbnail class]] diff --git a/src/lib/elementary/elm_widget_layout.h b/src/lib/elementary/elm_widget_layout.h index 0e0c088b73..a0833b6fc3 100644 --- a/src/lib/elementary/elm_widget_layout.h +++ b/src/lib/elementary/elm_widget_layout.h @@ -65,17 +65,17 @@ typedef struct _Elm_Layout_Smart_Data Eina_Bool destructed_is : 1; /**< This flag indicates if Efl.Ui.Layout destructor was called. This is needed to avoid unnecessary calculation of subobject deletion during layout object's deletion. */ Eina_Bool file_set : 1; /**< This flag indicates if Efl.Ui.Layout source is set from a file*/ Eina_Bool view_updated : 1; /**< This flag indicates to Efl.Ui.Layout don't update model in text_set */ -} Efl_Ui_Layout_Data; +} Efl_Ui_Layout_Object_Data; /** * @} */ #define EFL_UI_LAYOUT_DATA_GET(o, sd) \ - Efl_Ui_Layout_Data * sd = efl_data_scope_get(o, EFL_UI_LAYOUT_CLASS) + Efl_Ui_Layout_Object_Data * sd = efl_data_scope_get(o, EFL_UI_LAYOUT_OBJECT_CLASS) #define EFL_UI_LAYOUT_CHECK(obj) \ - if (EINA_UNLIKELY(!efl_isa(obj, EFL_UI_LAYOUT_CLASS))) \ + if (EINA_UNLIKELY(!efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS))) \ return #endif diff --git a/src/tests/elementary/elm_test_layout.c b/src/tests/elementary/elm_test_layout.c index a62e2c79e2..476c0cb9a8 100644 --- a/src/tests/elementary/elm_test_layout.c +++ b/src/tests/elementary/elm_test_layout.c @@ -48,7 +48,7 @@ EFL_START_TEST(elm_layout_swallows) win = elm_win_add(NULL, "layout", ELM_WIN_BASIC); - ly = efl_add(EFL_UI_LAYOUT_CLASS, win); + ly = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, win); snprintf(buf, sizeof(buf), "%s/objects/test.edj", ELM_TEST_DATA_DIR); elm_layout_file_set(ly, buf, "layout"); evas_object_show(ly); @@ -81,7 +81,7 @@ EFL_START_TEST(elm_layout_model_connect) win = elm_win_add(NULL, "layout", ELM_WIN_BASIC); - ly = efl_add(EFL_UI_LAYOUT_CLASS, win); + ly = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, win); snprintf(buf, sizeof(buf), "%s/objects/test.edj", ELM_TEST_DATA_DIR); elm_layout_file_set(ly, buf, "layout"); evas_object_show(ly);