diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am index c1fb5236f4..0148da56fc 100644 --- a/src/Makefile_Edje.am +++ b/src/Makefile_Edje.am @@ -6,12 +6,12 @@ edje_eolian_files = \ lib/edje/efl_canvas_layout_signal.eo \ lib/edje/efl_canvas_layout_group.eo \ lib/edje/edje_object.eo \ - lib/edje/efl_canvas_layout_internal.eo \ - lib/edje/efl_canvas_layout_internal_box.eo \ - lib/edje/efl_canvas_layout_internal_table.eo \ - lib/edje/efl_canvas_layout_internal_swallow.eo \ + lib/edje/efl_canvas_layout_part.eo \ + lib/edje/efl_canvas_layout_part_box.eo \ + lib/edje/efl_canvas_layout_part_table.eo \ + lib/edje/efl_canvas_layout_part_swallow.eo \ lib/edje/efl_canvas_layout_external.eo \ - lib/edje/efl_canvas_layout_internal_text.eo \ + lib/edje/efl_canvas_layout_part_text.eo \ lib/edje/edje_edit.eo edje_eolian_type_files = \ diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index 08596b8ba3..d192a136c5 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -17,7 +17,7 @@ elm_public_eolian_files = \ lib/elementary/elm_entry.eo \ lib/elementary/elm_fileselector.eo \ lib/elementary/efl_ui_flip.eo \ - lib/elementary/efl_ui_flip_internal_part.eo \ + lib/elementary/efl_ui_flip_part.eo \ lib/elementary/efl_ui_frame.eo \ lib/elementary/elm_gengrid.eo \ lib/elementary/elm_gengrid_pan.eo \ @@ -62,7 +62,7 @@ elm_public_eolian_files = \ lib/elementary/elm_route.eo \ lib/elementary/elm_scroller.eo \ lib/elementary/efl_ui_slider.eo \ - lib/elementary/efl_ui_slider_interval.eo \ + lib/elementary/efl_ui_slider_interval.eo \ lib/elementary/elm_spinner.eo \ lib/elementary/elm_sys_notify_interface.eo \ lib/elementary/elm_sys_notify.eo \ @@ -95,31 +95,31 @@ elm_public_eolian_files = \ lib/elementary/efl_ui_box_stack.eo \ lib/elementary/efl_ui_grid.eo \ lib/elementary/efl_ui_grid_static.eo \ - lib/elementary/efl_ui_layout_internal_part.eo \ - lib/elementary/efl_ui_layout_internal_box.eo \ - lib/elementary/efl_ui_layout_internal_table.eo \ - lib/elementary/efl_ui_button_internal_part.eo \ - lib/elementary/elm_ctxpopup_internal_part.eo \ - lib/elementary/efl_ui_panes_internal_part.eo \ - lib/elementary/elm_dayselector_internal_part.eo \ - lib/elementary/elm_entry_internal_part.eo \ - lib/elementary/elm_fileselector_entry_internal_part.eo \ - lib/elementary/elm_flip_internal_part.eo \ - lib/elementary/elm_hover_internal_part.eo \ - lib/elementary/elm_mapbuf_internal_part.eo \ - lib/elementary/elm_naviframe_internal_part.eo \ - lib/elementary/elm_notify_internal_part.eo \ - lib/elementary/elm_panel_internal_part.eo \ - lib/elementary/elm_player_internal_part.eo \ - lib/elementary/efl_ui_progressbar_internal_part.eo \ - lib/elementary/elm_popup_internal_part.eo \ - lib/elementary/elm_scroller_internal_part.eo \ - lib/elementary/efl_ui_slider_internal_part.eo \ - lib/elementary/elm_label_internal_part.eo \ - lib/elementary/elm_actionslider_internal_part.eo \ - lib/elementary/elm_bubble_internal_part.eo \ - lib/elementary/elm_fileselector_internal_part.eo \ - lib/elementary/elm_multibuttonentry_internal_part.eo \ + lib/elementary/efl_ui_layout_part.eo \ + lib/elementary/efl_ui_layout_part_box.eo \ + lib/elementary/efl_ui_layout_part_table.eo \ + lib/elementary/efl_ui_button_part.eo \ + lib/elementary/elm_ctxpopup_part.eo \ + lib/elementary/efl_ui_panes_part.eo \ + lib/elementary/elm_dayselector_part.eo \ + lib/elementary/elm_entry_part.eo \ + lib/elementary/elm_fileselector_entry_part.eo \ + lib/elementary/elm_flip_part.eo \ + lib/elementary/elm_hover_part.eo \ + lib/elementary/elm_mapbuf_part.eo \ + lib/elementary/elm_naviframe_part.eo \ + lib/elementary/elm_notify_part.eo \ + lib/elementary/elm_panel_part.eo \ + lib/elementary/elm_player_part.eo \ + lib/elementary/efl_ui_progressbar_part.eo \ + lib/elementary/elm_popup_part.eo \ + lib/elementary/elm_scroller_part.eo \ + lib/elementary/efl_ui_slider_part.eo \ + lib/elementary/elm_label_part.eo \ + lib/elementary/elm_actionslider_part.eo \ + lib/elementary/elm_bubble_part.eo \ + lib/elementary/elm_fileselector_part.eo \ + lib/elementary/elm_multibuttonentry_part.eo \ lib/elementary/elm_code_widget.eo \ lib/elementary/efl_ui_text_interactive.eo \ lib/elementary/efl_ui_text.eo \ @@ -129,19 +129,19 @@ elm_public_eolian_files = \ lib/elementary/efl_ui_cursor.eo \ lib/elementary/efl_ui_image_factory.eo \ lib/elementary/efl_ui_focus_manager.eo \ - lib/elementary/efl_ui_focus_manager_calc.eo \ + lib/elementary/efl_ui_focus_manager_calc.eo \ lib/elementary/efl_ui_focus_manager_sub.eo \ lib/elementary/efl_ui_focus_manager_root_focus.eo \ lib/elementary/efl_ui_focus_object.eo \ lib/elementary/efl_ui_focus_user.eo \ lib/elementary/efl_ui_textpath.eo \ - lib/elementary/efl_ui_textpath_internal_part.eo \ + lib/elementary/efl_ui_textpath_part.eo \ $(NULL) # Private classes (not exposed or shipped) elm_private_eolian_files = \ lib/elementary/efl_ui_internal_text_interactive.eo \ - lib/elementary/efl_ui_win_internal_part.eo \ + lib/elementary/efl_ui_win_part.eo \ tests/elementary/focus_test.eo \ tests/elementary/focus_test_sub_main.eo \ $(NULL) diff --git a/src/bin/elementary/test_panes.c b/src/bin/elementary/test_panes.c index a7849d8939..fe38bd6426 100644 --- a/src/bin/elementary/test_panes.c +++ b/src/bin/elementary/test_panes.c @@ -135,7 +135,7 @@ test_panes_minsize(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e efl_gfx_size_hint_min_set(efl_added, 10, 0), efl_content_set(efl_part(panes_h, "first"), efl_added) ); - efl_ui_panes_internal_part_hint_min_allow_set(efl_part(panes_h, "first"), EINA_TRUE); + efl_ui_panes_part_hint_min_allow_set(efl_part(panes_h, "first"), EINA_TRUE); efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Down - min size 50 40"), diff --git a/src/lib/edje/Edje_Eo.h b/src/lib/edje/Edje_Eo.h index 1d3d4e4cd1..23e9efc451 100644 --- a/src/lib/edje/Edje_Eo.h +++ b/src/lib/edje/Edje_Eo.h @@ -6,9 +6,9 @@ #include "edje_object.eo.h" #include "edje_edit.eo.h" -#include "efl_canvas_layout_internal.eo.h" -#include "efl_canvas_layout_internal_box.eo.h" -#include "efl_canvas_layout_internal_table.eo.h" -#include "efl_canvas_layout_internal_swallow.eo.h" -#include "efl_canvas_layout_internal_text.eo.h" +#include "efl_canvas_layout_part.eo.h" +#include "efl_canvas_layout_part_box.eo.h" +#include "efl_canvas_layout_part_table.eo.h" +#include "efl_canvas_layout_part_swallow.eo.h" +#include "efl_canvas_layout_part_text.eo.h" #include "efl_canvas_layout_external.eo.h" diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c index fba9d6a55e..f35b499b76 100644 --- a/src/lib/edje/edje_legacy.c +++ b/src/lib/edje/edje_legacy.c @@ -44,7 +44,7 @@ EAPI const char * edje_object_part_state_get(const Edje_Object *obj, const char * part, double *val_ret) { const char *str = ""; - efl_canvas_layout_internal_state_get(efl_part(obj, part), &str, val_ret); + efl_canvas_layout_part_state_get(efl_part(obj, part), &str, val_ret); return str; } diff --git a/src/lib/edje/edje_part.c b/src/lib/edje/edje_part.c index 6fb1566366..061df2120e 100644 --- a/src/lib/edje/edje_part.c +++ b/src/lib/edje/edje_part.c @@ -1,6 +1,6 @@ #include "edje_private.h" #include "edje_part_helper.h" -#define MY_CLASS EFL_CANVAS_LAYOUT_INTERNAL_CLASS +#define MY_CLASS EFL_CANVAS_LAYOUT_PART_CLASS PROXY_IMPLEMENTATION(other, MY_CLASS, EINA_FALSE) #undef PROXY_IMPLEMENTATION @@ -36,7 +36,7 @@ _part_type_to_string(unsigned char type) } void -_part_reuse_error(Efl_Canvas_Layout_Internal_Data *pd) +_part_reuse_error(Efl_Canvas_Layout_Part_Data *pd) { Edje *ed; @@ -79,9 +79,9 @@ _edje_internal_proxy_shutdown(void) void _edje_real_part_set(Eo *obj, Edje *ed, Edje_Real_Part *rp, const char *part) { - Efl_Canvas_Layout_Internal_Data *pd; + Efl_Canvas_Layout_Part_Data *pd; - pd = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_INTERNAL_CLASS); + pd = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_PART_CLASS); pd->obj = ed->obj; pd->ed = ed; pd->rp = rp; @@ -93,7 +93,7 @@ _edje_real_part_set(Eo *obj, Edje *ed, Edje_Real_Part *rp, const char *part) } EOLIAN static Efl_Object * -_efl_canvas_layout_internal_efl_object_finalize(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd) +_efl_canvas_layout_part_efl_object_finalize(Eo *obj, Efl_Canvas_Layout_Part_Data *pd) { EINA_SAFETY_ON_FALSE_RETURN_VAL(pd->rp && pd->ed && pd->part, NULL); // Do not use RETURN_VAL() here! @@ -101,7 +101,7 @@ _efl_canvas_layout_internal_efl_object_finalize(Eo *obj, Efl_Canvas_Layout_Inter } EOLIAN void -_efl_canvas_layout_internal_efl_gfx_geometry_get(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, int *x, int *y, int *w, int *h) +_efl_canvas_layout_part_efl_gfx_geometry_get(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, int *x, int *y, int *w, int *h) { Edje_Real_Part *rp = pd->rp; PROXY_CALL_BEGIN(pd); @@ -124,7 +124,7 @@ _efl_canvas_layout_internal_efl_gfx_geometry_get(Eo *obj, Efl_Canvas_Layout_Inte } EOLIAN static void -_efl_canvas_layout_internal_state_get(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, const char **name, double *val) +_efl_canvas_layout_part_state_get(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, const char **name, double *val) { const char *str; PROXY_CALL_BEGIN(pd); @@ -137,91 +137,91 @@ _efl_canvas_layout_internal_state_get(Eo *obj, Efl_Canvas_Layout_Internal_Data * } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_efl_ui_drag_drag_value_set(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, double dx, double dy) +_efl_canvas_layout_part_efl_ui_drag_drag_value_set(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, double dx, double dy) { PROXY_CALL_BEGIN(pd); RETURN_VAL(_edje_object_part_drag_value_set(pd->ed, pd->part, dx, dy)); } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_efl_ui_drag_drag_value_get(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, double *dx, double *dy) +_efl_canvas_layout_part_efl_ui_drag_drag_value_get(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, double *dx, double *dy) { PROXY_CALL_BEGIN(pd); RETURN_VAL(_edje_object_part_drag_value_get(pd->ed, pd->part, dx, dy)); } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_efl_ui_drag_drag_size_set(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, double dw, double dh) +_efl_canvas_layout_part_efl_ui_drag_drag_size_set(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, double dw, double dh) { PROXY_CALL_BEGIN(pd); RETURN_VAL(_edje_object_part_drag_size_set(pd->ed, pd->part, dw, dh)); } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_efl_ui_drag_drag_size_get(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, double *dw, double *dh) +_efl_canvas_layout_part_efl_ui_drag_drag_size_get(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, double *dw, double *dh) { PROXY_CALL_BEGIN(pd); RETURN_VAL(_edje_object_part_drag_size_get(pd->ed, pd->part, dw, dh)); } EOLIAN static Efl_Ui_Drag_Dir -_efl_canvas_layout_internal_efl_ui_drag_drag_dir_get(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd) +_efl_canvas_layout_part_efl_ui_drag_drag_dir_get(Eo *obj, Efl_Canvas_Layout_Part_Data *pd) { PROXY_CALL_BEGIN(pd); RETURN_VAL(_edje_object_part_drag_dir_get(pd->ed, pd->part)); } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_efl_ui_drag_drag_step_set(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, double dx, double dy) +_efl_canvas_layout_part_efl_ui_drag_drag_step_set(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, double dx, double dy) { PROXY_CALL_BEGIN(pd); RETURN_VAL(_edje_object_part_drag_step_set(pd->ed, pd->part, dx, dy)); } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_efl_ui_drag_drag_step_get(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, double *dx, double *dy) +_efl_canvas_layout_part_efl_ui_drag_drag_step_get(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, double *dx, double *dy) { PROXY_CALL_BEGIN(pd); RETURN_VAL(_edje_object_part_drag_step_get(pd->ed, pd->part, dx, dy)); } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_efl_ui_drag_drag_step_move(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, double dx, double dy) +_efl_canvas_layout_part_efl_ui_drag_drag_step_move(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, double dx, double dy) { PROXY_CALL_BEGIN(pd); RETURN_VAL(_edje_object_part_drag_step(pd->ed, pd->part, dx, dy)); } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_efl_ui_drag_drag_page_set(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, double dx, double dy) +_efl_canvas_layout_part_efl_ui_drag_drag_page_set(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, double dx, double dy) { PROXY_CALL_BEGIN(pd); RETURN_VAL(_edje_object_part_drag_page_set(pd->ed, pd->part, dx, dy)); } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_efl_ui_drag_drag_page_get(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, double *dx, double *dy) +_efl_canvas_layout_part_efl_ui_drag_drag_page_get(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, double *dx, double *dy) { PROXY_CALL_BEGIN(pd); RETURN_VAL(_edje_object_part_drag_page_get(pd->ed, pd->part, dx, dy)); } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_efl_ui_drag_drag_page_move(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, double dx, double dy) +_efl_canvas_layout_part_efl_ui_drag_drag_page_move(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, double dx, double dy) { PROXY_CALL_BEGIN(pd); RETURN_VAL(_edje_object_part_drag_page(pd->ed, pd->part, dx, dy)); } static Eo * -_edje_invalid_part_efl_content_get(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd) +_edje_invalid_part_efl_content_get(Eo *obj, Efl_Canvas_Layout_Part_Data *pd) { ERR("Part '%s' (type: %s) of group '%s' is not a SWALLOW part!", pd->part, _part_type_to_string(pd->rp->type), pd->ed->group); RETURN_VAL(NULL); } static Eina_Bool -_edje_invalid_part_efl_content_set(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, Eo *subobj EINA_UNUSED) +_edje_invalid_part_efl_content_set(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, Eo *subobj EINA_UNUSED) { ERR("Part '%s' (type: %s) of group '%s' is not a SWALLOW part!", pd->part, _part_type_to_string(pd->rp->type), pd->ed->group); RETURN_VAL(EINA_FALSE); @@ -229,8 +229,8 @@ _edje_invalid_part_efl_content_set(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, /* Internal EO APIs and hidden overrides */ -#define EFL_CANVAS_LAYOUT_INTERNAL_EXTRA_OPS \ +#define EFL_CANVAS_LAYOUT_PART_EXTRA_OPS \ EFL_OBJECT_OP_FUNC(efl_content_get, _edje_invalid_part_efl_content_get), \ EFL_OBJECT_OP_FUNC(efl_content_set, _edje_invalid_part_efl_content_set), \ -#include "efl_canvas_layout_internal.eo.c" +#include "efl_canvas_layout_part.eo.c" diff --git a/src/lib/edje/edje_part_box.c b/src/lib/edje/edje_part_box.c index b7b8080c85..5c6a57a99c 100644 --- a/src/lib/edje/edje_part_box.c +++ b/src/lib/edje/edje_part_box.c @@ -1,7 +1,7 @@ #include "edje_private.h" #include "edje_part_helper.h" -#include "efl_canvas_layout_internal_box.eo.h" -#define MY_CLASS EFL_CANVAS_LAYOUT_INTERNAL_BOX_CLASS +#include "efl_canvas_layout_part_box.eo.h" +#define MY_CLASS EFL_CANVAS_LAYOUT_PART_BOX_CLASS #include "../evas/canvas/evas_box.eo.h" @@ -13,21 +13,21 @@ typedef struct _Part_Item_Iterator Part_Item_Iterator; /* Legacy features */ EOLIAN static Eina_Bool -_efl_canvas_layout_internal_box_efl_pack_pack_clear(Eo *obj, void *_pd EINA_UNUSED) +_efl_canvas_layout_part_box_efl_pack_pack_clear(Eo *obj, void *_pd EINA_UNUSED) { PROXY_DATA_GET(obj, pd); RETURN_VAL(_edje_part_box_remove_all(pd->ed, pd->part, EINA_TRUE)); } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_box_efl_pack_unpack_all(Eo *obj, void *_pd EINA_UNUSED) +_efl_canvas_layout_part_box_efl_pack_unpack_all(Eo *obj, void *_pd EINA_UNUSED) { PROXY_DATA_GET(obj, pd); RETURN_VAL(_edje_part_box_remove_all(pd->ed, pd->part, EINA_FALSE)); } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_box_efl_pack_unpack(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj) +_efl_canvas_layout_part_box_efl_pack_unpack(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj) { Evas_Object *removed; PROXY_DATA_GET(obj, pd); @@ -36,42 +36,42 @@ _efl_canvas_layout_internal_box_efl_pack_unpack(Eo *obj, void *_pd EINA_UNUSED, } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_box_efl_pack_pack(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj) +_efl_canvas_layout_part_box_efl_pack_pack(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj) { PROXY_DATA_GET(obj, pd); RETURN_VAL(_edje_part_box_append(pd->ed, pd->part, subobj)); } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_box_efl_pack_linear_pack_begin(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj) +_efl_canvas_layout_part_box_efl_pack_linear_pack_begin(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj) { PROXY_DATA_GET(obj, pd); RETURN_VAL(_edje_part_box_prepend(pd->ed, pd->part, subobj)); } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_box_efl_pack_linear_pack_end(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj) +_efl_canvas_layout_part_box_efl_pack_linear_pack_end(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj) { PROXY_DATA_GET(obj, pd); RETURN_VAL(_edje_part_box_append(pd->ed, pd->part, subobj)); } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_box_efl_pack_linear_pack_before(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing) +_efl_canvas_layout_part_box_efl_pack_linear_pack_before(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing) { PROXY_DATA_GET(obj, pd); RETURN_VAL(_edje_part_box_insert_before(pd->ed, pd->part, subobj, existing)); } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_box_efl_pack_linear_pack_after(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing) +_efl_canvas_layout_part_box_efl_pack_linear_pack_after(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing) { PROXY_DATA_GET(obj, pd); RETURN_VAL(_edje_part_box_insert_after(pd->ed, pd->part, subobj, existing)); } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_box_efl_pack_linear_pack_at(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, int index) +_efl_canvas_layout_part_box_efl_pack_linear_pack_at(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, int index) { PROXY_DATA_GET(obj, pd); int cnt = PROXY_CALL(efl_content_count(obj)); @@ -84,7 +84,7 @@ _efl_canvas_layout_internal_box_efl_pack_linear_pack_at(Eo *obj, void *_pd EINA_ } EOLIAN static Efl_Gfx * -_efl_canvas_layout_internal_box_efl_pack_linear_pack_unpack_at(Eo *obj, void *_pd EINA_UNUSED, int index) +_efl_canvas_layout_part_box_efl_pack_linear_pack_unpack_at(Eo *obj, void *_pd EINA_UNUSED, int index) { PROXY_DATA_GET(obj, pd); if (index < 0) index += PROXY_CALL(efl_content_count(obj)); @@ -94,7 +94,7 @@ _efl_canvas_layout_internal_box_efl_pack_linear_pack_unpack_at(Eo *obj, void *_p /* New APIs with Eo */ EOLIAN static Efl_Gfx * -_efl_canvas_layout_internal_box_efl_pack_linear_pack_content_get(Eo *obj, void *_pd EINA_UNUSED, int index) +_efl_canvas_layout_part_box_efl_pack_linear_pack_content_get(Eo *obj, void *_pd EINA_UNUSED, int index) { PROXY_DATA_GET(obj, pd); if (index < 0) index += PROXY_CALL(efl_content_count(obj)); @@ -102,14 +102,14 @@ _efl_canvas_layout_internal_box_efl_pack_linear_pack_content_get(Eo *obj, void * } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_box_efl_container_content_remove(Eo *obj, void *_pd EINA_UNUSED EINA_UNUSED, Efl_Gfx *subobj) +_efl_canvas_layout_part_box_efl_container_content_remove(Eo *obj, void *_pd EINA_UNUSED EINA_UNUSED, Efl_Gfx *subobj) { PROXY_DATA_GET(obj, pd); RETURN_VAL(PROXY_CALL(efl_pack_unpack(obj, subobj))); } EOLIAN static int -_efl_canvas_layout_internal_box_efl_pack_linear_pack_index_get(Eo *obj, void *_pd EINA_UNUSED, const Efl_Gfx * subobj) +_efl_canvas_layout_part_box_efl_pack_linear_pack_index_get(Eo *obj, void *_pd EINA_UNUSED, const Efl_Gfx * subobj) { Evas_Object_Box_Option *opt; Evas_Object_Box_Data *priv; @@ -177,7 +177,7 @@ _part_item_iterator_create(Eo *obj, Eina_Iterator *real_iterator) } EOLIAN static Eina_Iterator * -_efl_canvas_layout_internal_box_efl_container_content_iterate(Eo *obj, void *_pd EINA_UNUSED) +_efl_canvas_layout_part_box_efl_container_content_iterate(Eo *obj, void *_pd EINA_UNUSED) { Eina_Iterator *it; @@ -189,14 +189,14 @@ _efl_canvas_layout_internal_box_efl_container_content_iterate(Eo *obj, void *_pd } EOLIAN static int -_efl_canvas_layout_internal_box_efl_container_content_count(Eo *obj, void *_pd EINA_UNUSED) +_efl_canvas_layout_part_box_efl_container_content_count(Eo *obj, void *_pd EINA_UNUSED) { PROXY_DATA_GET(obj, pd); RETURN_VAL(evas_obj_box_count(pd->rp->object)); } EOLIAN static Efl_Ui_Dir -_efl_canvas_layout_internal_box_efl_ui_direction_direction_get(Eo *obj, void *_pd EINA_UNUSED) +_efl_canvas_layout_part_box_efl_ui_direction_direction_get(Eo *obj, void *_pd EINA_UNUSED) { PROXY_DATA_GET(obj, pd); const Edje_Part_Description_Box *desc = @@ -214,4 +214,4 @@ _efl_canvas_layout_internal_box_efl_ui_direction_direction_get(Eo *obj, void *_p RETURN_VAL(EFL_UI_DIR_DEFAULT); } -#include "efl_canvas_layout_internal_box.eo.c" +#include "efl_canvas_layout_part_box.eo.c" diff --git a/src/lib/edje/edje_part_helper.h b/src/lib/edje/edje_part_helper.h index f72dadcc65..8cb3fa86ec 100644 --- a/src/lib/edje/edje_part_helper.h +++ b/src/lib/edje/edje_part_helper.h @@ -1,9 +1,9 @@ #include "edje_private.h" -#include "efl_canvas_layout_internal.eo.h" +#include "efl_canvas_layout_part.eo.h" -typedef struct _Efl_Canvas_Layout_Internal_Data Efl_Canvas_Layout_Internal_Data; +typedef struct _Efl_Canvas_Layout_Part_Data Efl_Canvas_Layout_Part_Data; -struct _Efl_Canvas_Layout_Internal_Data +struct _Efl_Canvas_Layout_Part_Data { Edje *ed; Edje_Real_Part *rp; @@ -20,7 +20,7 @@ struct _Part_Item_Iterator Eo *object; }; -void _part_reuse_error(Efl_Canvas_Layout_Internal_Data *pd); +void _part_reuse_error(Efl_Canvas_Layout_Part_Data *pd); const char * _part_type_to_string(unsigned char type); #define PROXY_CALL_BEGIN(pd) do { pd->in_call = 1; } while (0) @@ -41,11 +41,11 @@ void _edje_real_part_set(Eo *obj, Edje *ed, Edje_Real_Part *rp, const char *part static inline void _part_proxy_del_cb(Eo *proxy, Eo **static_var) { - Efl_Canvas_Layout_Internal_Data *pd; + Efl_Canvas_Layout_Part_Data *pd; if (*static_var) { // FIXME: Enable debug checks only in debug mode - pd = efl_data_scope_get(*static_var, EFL_CANVAS_LAYOUT_INTERNAL_CLASS); + pd = efl_data_scope_get(*static_var, EFL_CANVAS_LAYOUT_PART_CLASS); if (pd && pd->temp && !pd->in_call) _part_reuse_error(pd); if (*static_var != proxy) @@ -57,7 +57,7 @@ _part_proxy_del_cb(Eo *proxy, Eo **static_var) efl_parent_set(proxy, NULL); } efl_reuse(proxy); - pd = efl_data_scope_get(proxy, EFL_CANVAS_LAYOUT_INTERNAL_CLASS); + pd = efl_data_scope_get(proxy, EFL_CANVAS_LAYOUT_PART_CLASS); pd->in_use = EINA_FALSE; *static_var = proxy; } @@ -77,7 +77,7 @@ void \ _ ## type ## _shutdown(void); \ #define PROXY_DATA_GET(obj, pd) \ - Efl_Canvas_Layout_Internal_Data *pd = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_INTERNAL_CLASS); \ + Efl_Canvas_Layout_Part_Data *pd = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_PART_CLASS); \ PROXY_CALL_BEGIN(pd) #define PROXY_IMPLEMENTATION(type, KLASS, no_del_cb, ...) \ @@ -98,10 +98,10 @@ _ ## type ## _shutdown(void) \ Eo * \ _edje_ ## type ## _internal_proxy_get(Edje_Object *obj EINA_UNUSED, Edje *ed, Edje_Real_Part *rp) \ { \ - Efl_Canvas_Layout_Internal_Data *pd; \ + Efl_Canvas_Layout_Part_Data *pd; \ Eo *proxy; \ \ - pd = PROXY_STATIC_VAR(type) ? efl_data_scope_get(PROXY_STATIC_VAR(type), EFL_CANVAS_LAYOUT_INTERNAL_CLASS) : NULL; \ + pd = PROXY_STATIC_VAR(type) ? efl_data_scope_get(PROXY_STATIC_VAR(type), EFL_CANVAS_LAYOUT_PART_CLASS) : NULL; \ if (!pd) \ { \ if (PROXY_STATIC_VAR(type)) \ @@ -130,7 +130,7 @@ end: \ #ifdef DEBUG #define PART_TABLE_GET(obj, part, ...) ({ \ Eo *__table = efl_part(obj, part); \ - if (!__table || !efl_isa(__table, EFL_CANVAS_LAYOUT_INTERNAL_TABLE_CLASS)) \ + if (!__table || !efl_isa(__table, EFL_CANVAS_LAYOUT_PART_TABLE_CLASS)) \ { \ ERR("No such table part '%s' in layout %p", part, obj); \ return __VA_ARGS__; \ diff --git a/src/lib/edje/edje_part_swallow.c b/src/lib/edje/edje_part_swallow.c index 4e9564d67e..6bd2721636 100644 --- a/src/lib/edje/edje_part_swallow.c +++ b/src/lib/edje/edje_part_swallow.c @@ -1,28 +1,28 @@ #include "edje_private.h" #include "edje_part_helper.h" -#include "efl_canvas_layout_internal_swallow.eo.h" -#define MY_CLASS EFL_CANVAS_LAYOUT_INTERNAL_SWALLOW_CLASS +#include "efl_canvas_layout_part_swallow.eo.h" +#define MY_CLASS EFL_CANVAS_LAYOUT_PART_SWALLOW_CLASS PROXY_IMPLEMENTATION(swallow, MY_CLASS, EINA_FALSE) #undef PROXY_IMPLEMENTATION /* Swallow parts */ EOLIAN static Efl_Gfx * -_efl_canvas_layout_internal_swallow_efl_container_content_get(Eo *obj, void *_pd EINA_UNUSED) +_efl_canvas_layout_part_swallow_efl_container_content_get(Eo *obj, void *_pd EINA_UNUSED) { PROXY_DATA_GET(obj, pd); RETURN_VAL(_edje_efl_container_content_get(pd->ed, pd->part)); } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_swallow_efl_container_content_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *content) +_efl_canvas_layout_part_swallow_efl_container_content_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *content) { PROXY_DATA_GET(obj, pd); RETURN_VAL(_edje_efl_container_content_set(pd->ed, pd->part, content)); } EOLIAN static Efl_Gfx * -_efl_canvas_layout_internal_swallow_efl_container_content_unset(Eo *obj, void *_pd EINA_UNUSED) +_efl_canvas_layout_part_swallow_efl_container_content_unset(Eo *obj, void *_pd EINA_UNUSED) { PROXY_DATA_GET(obj, pd); Efl_Gfx *content = _edje_efl_container_content_get(pd->ed, pd->part); @@ -31,4 +31,4 @@ _efl_canvas_layout_internal_swallow_efl_container_content_unset(Eo *obj, void *_ RETURN_VAL(content); } -#include "efl_canvas_layout_internal_swallow.eo.c" +#include "efl_canvas_layout_part_swallow.eo.c" diff --git a/src/lib/edje/edje_part_table.c b/src/lib/edje/edje_part_table.c index 211dce1296..50c5899546 100644 --- a/src/lib/edje/edje_part_table.c +++ b/src/lib/edje/edje_part_table.c @@ -1,7 +1,7 @@ #include "edje_private.h" #include "edje_part_helper.h" -#include "efl_canvas_layout_internal_table.eo.h" -#define MY_CLASS EFL_CANVAS_LAYOUT_INTERNAL_TABLE_CLASS +#include "efl_canvas_layout_part_table.eo.h" +#define MY_CLASS EFL_CANVAS_LAYOUT_PART_TABLE_CLASS #include "../evas/canvas/evas_table.eo.h" @@ -59,7 +59,7 @@ _part_item_iterator_create(Eo *obj, Eina_Iterator *real_iterator) } EOLIAN static Eina_Iterator * -_efl_canvas_layout_internal_table_efl_container_content_iterate(Eo *obj, void *_pd EINA_UNUSED) +_efl_canvas_layout_part_table_efl_container_content_iterate(Eo *obj, void *_pd EINA_UNUSED) { Eina_Iterator *it; @@ -71,56 +71,56 @@ _efl_canvas_layout_internal_table_efl_container_content_iterate(Eo *obj, void *_ } EOLIAN static int -_efl_canvas_layout_internal_table_efl_container_content_count(Eo *obj, void *_pd EINA_UNUSED) +_efl_canvas_layout_part_table_efl_container_content_count(Eo *obj, void *_pd EINA_UNUSED) { PROXY_DATA_GET(obj, pd); RETURN_VAL(evas_obj_table_count(pd->rp->object)); } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_table_efl_container_content_remove(Eo *obj, void *_pd EINA_UNUSED EINA_UNUSED, Efl_Gfx *content) +_efl_canvas_layout_part_table_efl_container_content_remove(Eo *obj, void *_pd EINA_UNUSED EINA_UNUSED, Efl_Gfx *content) { PROXY_DATA_GET(obj, pd); RETURN_VAL(PROXY_CALL(efl_pack_unpack(obj, content))); } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_table_efl_pack_pack_clear(Eo *obj, void *_pd EINA_UNUSED) +_efl_canvas_layout_part_table_efl_pack_pack_clear(Eo *obj, void *_pd EINA_UNUSED) { PROXY_DATA_GET(obj, pd); RETURN_VAL(_edje_part_table_clear(pd->ed, pd->part, EINA_TRUE)); } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_table_efl_pack_unpack_all(Eo *obj, void *_pd EINA_UNUSED) +_efl_canvas_layout_part_table_efl_pack_unpack_all(Eo *obj, void *_pd EINA_UNUSED) { PROXY_DATA_GET(obj, pd); RETURN_VAL(_edje_part_table_clear(pd->ed, pd->part, EINA_FALSE)); } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_table_efl_pack_unpack(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Efl_Gfx *subobj) +_efl_canvas_layout_part_table_efl_pack_unpack(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Efl_Gfx *subobj) { PROXY_DATA_GET(obj, pd); RETURN_VAL(_edje_part_table_unpack(pd->ed, pd->part, subobj)); } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_table_efl_pack_grid_pack_grid(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, int col, int row, int colspan, int rowspan) +_efl_canvas_layout_part_table_efl_pack_grid_pack_grid(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, int col, int row, int colspan, int rowspan) { PROXY_DATA_GET(obj, pd); RETURN_VAL(_edje_part_table_pack(pd->ed, pd->part, subobj, col, row, colspan, rowspan)); } EOLIAN static Efl_Gfx * -_efl_canvas_layout_internal_table_efl_pack_grid_grid_content_get(Eo *obj, void *_pd EINA_UNUSED, int col, int row) +_efl_canvas_layout_part_table_efl_pack_grid_grid_content_get(Eo *obj, void *_pd EINA_UNUSED, int col, int row) { PROXY_DATA_GET(obj, pd); RETURN_VAL(_edje_part_table_child_get(pd->ed, pd->part, col, row)); } EOLIAN static void -_efl_canvas_layout_internal_table_efl_pack_grid_grid_size_get(Eo *obj, void *_pd EINA_UNUSED, int *cols, int *rows) +_efl_canvas_layout_part_table_efl_pack_grid_grid_size_get(Eo *obj, void *_pd EINA_UNUSED, int *cols, int *rows) { PROXY_DATA_GET(obj, pd); _edje_part_table_col_row_size_get(pd->ed, pd->part, cols, rows); @@ -128,7 +128,7 @@ _efl_canvas_layout_internal_table_efl_pack_grid_grid_size_get(Eo *obj, void *_pd } EOLIAN static int -_efl_canvas_layout_internal_table_efl_pack_grid_grid_columns_get(Eo *obj, void *_pd EINA_UNUSED) +_efl_canvas_layout_part_table_efl_pack_grid_grid_columns_get(Eo *obj, void *_pd EINA_UNUSED) { PROXY_DATA_GET(obj, pd); int cols = 0, rows = 0; @@ -137,7 +137,7 @@ _efl_canvas_layout_internal_table_efl_pack_grid_grid_columns_get(Eo *obj, void * } EOLIAN static int -_efl_canvas_layout_internal_table_efl_pack_grid_grid_rows_get(Eo *obj, void *_pd EINA_UNUSED) +_efl_canvas_layout_part_table_efl_pack_grid_grid_rows_get(Eo *obj, void *_pd EINA_UNUSED) { PROXY_DATA_GET(obj, pd); int cols = 0, rows = 0; @@ -176,7 +176,7 @@ _table_item_iterator_free(Part_Item_Iterator *it) } EOLIAN static Eina_Iterator * -_efl_canvas_layout_internal_table_efl_pack_grid_grid_contents_get(Eo *obj, void *_pd EINA_UNUSED, int col, int row, Eina_Bool below) +_efl_canvas_layout_part_table_efl_pack_grid_grid_contents_get(Eo *obj, void *_pd EINA_UNUSED, int col, int row, Eina_Bool below) { Evas_Object *sobj; Eina_Iterator *it; @@ -219,7 +219,7 @@ _efl_canvas_layout_internal_table_efl_pack_grid_grid_contents_get(Eo *obj, void } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_table_efl_pack_grid_grid_position_get(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx * subobj, int *col, int *row, int *colspan, int *rowspan) +_efl_canvas_layout_part_table_efl_pack_grid_grid_position_get(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx * subobj, int *col, int *row, int *colspan, int *rowspan) { unsigned short c, r, cs, rs; Eina_Bool ret; @@ -239,7 +239,7 @@ _efl_canvas_layout_internal_table_efl_pack_grid_grid_position_get(Eo *obj, void #ifdef DEGUG #define PART_BOX_GET(obj, part, ...) ({ \ Eo *__box = efl_part(obj, part); \ - if (!__box || !efl_isa(__box, EFL_CANVAS_LAYOUT_INTERNAL_BOX_CLASS)) \ + if (!__box || !efl_isa(__box, EFL_CANVAS_LAYOUT_PART_BOX_CLASS)) \ { \ ERR("No such box part '%s' in layout %p", part, obj); \ return __VA_ARGS__; \ @@ -352,4 +352,4 @@ edje_object_part_table_clear(Edje_Object *obj, const char *part, Eina_Bool clear return efl_pack_unpack_all(table); } -#include "efl_canvas_layout_internal_table.eo.c" +#include "efl_canvas_layout_part_table.eo.c" diff --git a/src/lib/edje/edje_part_text.c b/src/lib/edje/edje_part_text.c index 5db8c453c6..dc5a944743 100644 --- a/src/lib/edje/edje_part_text.c +++ b/src/lib/edje/edje_part_text.c @@ -1,13 +1,13 @@ #include "edje_private.h" #include "edje_part_helper.h" -#include "efl_canvas_layout_internal_text.eo.h" -#define MY_CLASS EFL_CANVAS_LAYOUT_INTERNAL_TEXT_CLASS +#include "efl_canvas_layout_part_text.eo.h" +#define MY_CLASS EFL_CANVAS_LAYOUT_PART_TEXT_CLASS PROXY_IMPLEMENTATION(text, MY_CLASS, EINA_FALSE) #undef PROXY_IMPLEMENTATION EOLIAN static void -_efl_canvas_layout_internal_text_efl_text_text_set(Eo *obj, +_efl_canvas_layout_part_text_efl_text_text_set(Eo *obj, void *_pd EINA_UNUSED, const char *text) { PROXY_DATA_GET(obj, pd); @@ -16,7 +16,7 @@ _efl_canvas_layout_internal_text_efl_text_text_set(Eo *obj, } EOLIAN static const char * -_efl_canvas_layout_internal_text_efl_text_text_get(Eo *obj, +_efl_canvas_layout_part_text_efl_text_text_get(Eo *obj, void *_pd EINA_UNUSED) { PROXY_DATA_GET(obj, pd); @@ -24,7 +24,7 @@ _efl_canvas_layout_internal_text_efl_text_text_get(Eo *obj, } EOLIAN static Efl_Text_Cursor_Cursor * -_efl_canvas_layout_internal_text_efl_text_cursor_cursor_get(Eo *obj, +_efl_canvas_layout_part_text_efl_text_cursor_cursor_get(Eo *obj, void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Get_Type get_type) { PROXY_DATA_GET(obj, pd); @@ -32,7 +32,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_get(Eo *obj, } EOLIAN static void -_efl_canvas_layout_internal_text_efl_text_cursor_cursor_paragraph_first(Eo *obj, +_efl_canvas_layout_part_text_efl_text_cursor_cursor_paragraph_first(Eo *obj, void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) { PROXY_DATA_GET(obj, pd); @@ -41,7 +41,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_paragraph_first(Eo *obj, } EOLIAN static void -_efl_canvas_layout_internal_text_efl_text_cursor_cursor_paragraph_last(Eo *obj, +_efl_canvas_layout_part_text_efl_text_cursor_cursor_paragraph_last(Eo *obj, void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) { PROXY_DATA_GET(obj, pd); @@ -50,7 +50,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_paragraph_last(Eo *obj, } EOLIAN static void -_efl_canvas_layout_internal_text_efl_text_cursor_cursor_position_set(Eo *obj, +_efl_canvas_layout_part_text_efl_text_cursor_cursor_position_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur, int pos) { PROXY_DATA_GET(obj, pd); @@ -59,7 +59,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_position_set(Eo *obj, } EOLIAN static int -_efl_canvas_layout_internal_text_efl_text_cursor_cursor_position_get(Eo *obj, +_efl_canvas_layout_part_text_efl_text_cursor_cursor_position_get(Eo *obj, void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) { PROXY_DATA_GET(obj, pd); @@ -67,7 +67,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_position_get(Eo *obj, } EOLIAN static void -_efl_canvas_layout_internal_text_efl_text_cursor_cursor_coord_set(Eo *obj, +_efl_canvas_layout_part_text_efl_text_cursor_cursor_coord_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur, int x, int y) { @@ -77,7 +77,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_coord_set(Eo *obj, } EOLIAN static void -_efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_char_first(Eo *obj, +_efl_canvas_layout_part_text_efl_text_cursor_cursor_line_char_first(Eo *obj, void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) { PROXY_DATA_GET(obj, pd); @@ -86,7 +86,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_char_first(Eo *obj, } EOLIAN static void -_efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_char_last(Eo *obj, +_efl_canvas_layout_part_text_efl_text_cursor_cursor_line_char_last(Eo *obj, void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) { PROXY_DATA_GET(obj, pd); @@ -95,7 +95,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_char_last(Eo *obj, } EOLIAN static void -_efl_canvas_layout_internal_text_efl_text_cursor_cursor_char_prev(Eo *obj, +_efl_canvas_layout_part_text_efl_text_cursor_cursor_char_prev(Eo *obj, void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) { PROXY_DATA_GET(obj, pd); @@ -104,7 +104,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_char_prev(Eo *obj, } EOLIAN static void -_efl_canvas_layout_internal_text_efl_text_cursor_cursor_char_next(Eo *obj, +_efl_canvas_layout_part_text_efl_text_cursor_cursor_char_next(Eo *obj, void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) { PROXY_DATA_GET(obj, pd); @@ -113,7 +113,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_char_next(Eo *obj, } EOLIAN static void -_efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_jump_by(Eo *obj, +_efl_canvas_layout_part_text_efl_text_cursor_cursor_line_jump_by(Eo *obj, void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur, int by) { PROXY_DATA_GET(obj, pd); @@ -129,7 +129,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_jump_by(Eo *obj, } EOLIAN static void -_efl_canvas_layout_internal_text_efl_text_cursor_cursor_copy(Eo *obj, +_efl_canvas_layout_part_text_efl_text_cursor_cursor_copy(Eo *obj, void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *dst, const Efl_Text_Cursor_Cursor *cur) @@ -140,7 +140,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_copy(Eo *obj, } EOLIAN static Eina_Unicode -_efl_canvas_layout_internal_text_efl_text_cursor_cursor_content_get(Eo *obj, +_efl_canvas_layout_part_text_efl_text_cursor_cursor_content_get(Eo *obj, void *_pd EINA_UNUSED, const Efl_Text_Cursor_Cursor *cur) { @@ -162,7 +162,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_content_get(Eo *obj, } EOLIAN static Eina_Bool -_efl_canvas_layout_internal_text_efl_text_cursor_cursor_geometry_get(Eo *obj, +_efl_canvas_layout_part_text_efl_text_cursor_cursor_geometry_get(Eo *obj, void *_pd EINA_UNUSED, const Efl_Text_Cursor_Cursor *cur EINA_UNUSED, Efl_Text_Cursor_Cursor_Type ctype EINA_UNUSED, @@ -181,7 +181,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_geometry_get(Eo *obj, } EOLIAN static int -_efl_canvas_layout_internal_text_efl_text_cursor_cursor_text_insert(Eo *obj, +_efl_canvas_layout_part_text_efl_text_cursor_cursor_text_insert(Eo *obj, void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED, const char *text) { @@ -192,5 +192,5 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_text_insert(Eo *obj, RETURN_VAL(0); } -#include "efl_canvas_layout_internal_text.eo.c" +#include "efl_canvas_layout_part_text.eo.c" diff --git a/src/lib/edje/efl_canvas_layout_external.eo b/src/lib/edje/efl_canvas_layout_external.eo index dcbd475a9f..bf723a5945 100644 --- a/src/lib/edje/efl_canvas_layout_external.eo +++ b/src/lib/edje/efl_canvas_layout_external.eo @@ -1,6 +1,6 @@ import edje_types; -class Efl.Canvas.Layout.External (Efl.Canvas.Layout_Internal, Efl.Container, +class Efl.Canvas.Layout.External (Efl.Canvas.Layout.Part, Efl.Container, Efl.Canvas.Object) { [[Class representing an external part in Edje layouts. diff --git a/src/lib/edje/efl_canvas_layout_internal.eo b/src/lib/edje/efl_canvas_layout_part.eo similarity index 95% rename from src/lib/edje/efl_canvas_layout_internal.eo rename to src/lib/edje/efl_canvas_layout_part.eo index c06613f053..d6dc45d59b 100644 --- a/src/lib/edje/efl_canvas_layout_internal.eo +++ b/src/lib/edje/efl_canvas_layout_part.eo @@ -1,5 +1,5 @@ /* FIXME: Rename to Efl.Canvas.Layout.Part */ -class Efl.Canvas.Layout_Internal (Efl.Object, Efl.Gfx, Efl.Ui.Drag) +class Efl.Canvas.Layout.Part (Efl.Object, Efl.Gfx, Efl.Ui.Drag) { [[Common class for part proxy objects for $Efl.Canvas.Layout. diff --git a/src/lib/edje/efl_canvas_layout_internal_box.eo b/src/lib/edje/efl_canvas_layout_part_box.eo similarity index 90% rename from src/lib/edje/efl_canvas_layout_internal_box.eo rename to src/lib/edje/efl_canvas_layout_part_box.eo index e062c61f09..28a95d0f53 100644 --- a/src/lib/edje/efl_canvas_layout_internal_box.eo +++ b/src/lib/edje/efl_canvas_layout_part_box.eo @@ -1,4 +1,4 @@ -class Efl.Canvas.Layout_Internal.Box (Efl.Canvas.Layout_Internal, Efl.Pack.Linear, +class Efl.Canvas.Layout.Part_Box (Efl.Canvas.Layout.Part, Efl.Pack.Linear, Efl.Ui.Direction) { [[Represents a Box created as part of a layout. diff --git a/src/lib/edje/efl_canvas_layout_internal_swallow.eo b/src/lib/edje/efl_canvas_layout_part_swallow.eo similarity index 76% rename from src/lib/edje/efl_canvas_layout_internal_swallow.eo rename to src/lib/edje/efl_canvas_layout_part_swallow.eo index a5e9098b6a..c3dc8ad4fd 100644 --- a/src/lib/edje/efl_canvas_layout_internal_swallow.eo +++ b/src/lib/edje/efl_canvas_layout_part_swallow.eo @@ -1,4 +1,4 @@ -class Efl.Canvas.Layout_Internal.Swallow (Efl.Canvas.Layout_Internal, Efl.Container) +class Efl.Canvas.Layout.Part_Swallow (Efl.Canvas.Layout.Part, Efl.Container) { [[Represents a SWALLOW part of an Edje object. diff --git a/src/lib/edje/efl_canvas_layout_internal_table.eo b/src/lib/edje/efl_canvas_layout_part_table.eo similarity index 88% rename from src/lib/edje/efl_canvas_layout_internal_table.eo rename to src/lib/edje/efl_canvas_layout_part_table.eo index 1bc84f2816..17979895ea 100644 --- a/src/lib/edje/efl_canvas_layout_internal_table.eo +++ b/src/lib/edje/efl_canvas_layout_part_table.eo @@ -1,4 +1,4 @@ -class Efl.Canvas.Layout_Internal.Table (Efl.Canvas.Layout_Internal, Efl.Pack.Grid) +class Efl.Canvas.Layout.Part_Table (Efl.Canvas.Layout.Part, Efl.Pack.Grid) { [[Represents a Table created as part of a layout. diff --git a/src/lib/edje/efl_canvas_layout_internal_text.eo b/src/lib/edje/efl_canvas_layout_part_text.eo similarity index 91% rename from src/lib/edje/efl_canvas_layout_internal_text.eo rename to src/lib/edje/efl_canvas_layout_part_text.eo index 58ca552d2a..67cb7c396f 100644 --- a/src/lib/edje/efl_canvas_layout_internal_text.eo +++ b/src/lib/edje/efl_canvas_layout_part_text.eo @@ -1,4 +1,4 @@ -class Efl.Canvas.Layout_Internal.Text (Efl.Canvas.Layout_Internal, Efl.Text, +class Efl.Canvas.Layout.Part_Text (Efl.Canvas.Layout.Part, Efl.Text, Efl.Text.Cursor) { [[Represents a TEXT part of a layout diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c index dadba18631..81b04e889c 100644 --- a/src/lib/elementary/efl_ui_button.c +++ b/src/lib/elementary/efl_ui_button.c @@ -10,7 +10,7 @@ #include "elm_priv.h" #include "efl_ui_button_private.h" #include "elm_widget_layout.h" -#include "efl_ui_button_internal_part.eo.h" +#include "efl_ui_button_part.eo.h" #include "elm_part_helper.h" #define MY_CLASS EFL_UI_BUTTON_CLASS @@ -426,7 +426,7 @@ EFL_TEXT_PART_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data) ELM_PART_OVERRIDE(efl_ui_button, EFL_UI_BUTTON, EFL_UI_LAYOUT, Efl_Ui_Button_Data, Elm_Part_Data) ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_button, EFL_UI_BUTTON, EFL_UI_LAYOUT, Efl_Ui_Button_Data, Elm_Part_Data) -#include "efl_ui_button_internal_part.eo.c" +#include "efl_ui_button_part.eo.c" /* Efl.Part end */ diff --git a/src/lib/elementary/efl_ui_button_internal_part.eo b/src/lib/elementary/efl_ui_button_part.eo similarity index 65% rename from src/lib/elementary/efl_ui_button_internal_part.eo rename to src/lib/elementary/efl_ui_button_part.eo index d0f9914b95..4f5952f0d9 100644 --- a/src/lib/elementary/efl_ui_button_internal_part.eo +++ b/src/lib/elementary/efl_ui_button_part.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Button.Internal.Part (Efl.Ui.Layout.Internal.Part) +class Efl.Ui.Button.Part (Efl.Ui.Layout.Part) { [[Elementary button internal part class]] data: null; diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c index f551566f63..e08a3c3485 100644 --- a/src/lib/elementary/efl_ui_flip.c +++ b/src/lib/elementary/efl_ui_flip.c @@ -9,7 +9,7 @@ #include "efl_ui_widget_flip.h" #include "elm_widget_container.h" -#include "efl_ui_flip_internal_part.eo.h" +#include "efl_ui_flip_part.eo.h" #include "elm_part_helper.h" #define MY_CLASS EFL_UI_FLIP_CLASS @@ -2403,7 +2403,7 @@ ELM_PART_IMPLEMENT_CONTENT_SET(efl_ui_flip, EFL_UI_FLIP, Efl_Ui_Flip_Data, Elm_P ELM_PART_IMPLEMENT_CONTENT_GET(efl_ui_flip, EFL_UI_FLIP, Efl_Ui_Flip_Data, Elm_Part_Data) ELM_PART_IMPLEMENT_CONTENT_UNSET(efl_ui_flip, EFL_UI_FLIP, Efl_Ui_Flip_Data, Elm_Part_Data) ELM_PART_CONTENT_DEFAULT_SET(efl_ui_flip, "front") -#include "efl_ui_flip_internal_part.eo.c" +#include "efl_ui_flip_part.eo.c" /* Efl.Part end */ diff --git a/src/lib/elementary/efl_ui_flip_internal_part.eo b/src/lib/elementary/efl_ui_flip_part.eo similarity index 75% rename from src/lib/elementary/efl_ui_flip_internal_part.eo rename to src/lib/elementary/efl_ui_flip_part.eo index 4592f699f5..2edd41157a 100644 --- a/src/lib/elementary/efl_ui_flip_internal_part.eo +++ b/src/lib/elementary/efl_ui_flip_part.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Flip.Internal.Part (Efl.Object, Efl.Container) +class Efl.Ui.Flip.Part (Efl.Object, Efl.Container) { [[Efl UI flip internal class]] data: Elm_Part_Data; diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index a2b3c7e0d2..11a703eba7 100644 --- a/src/lib/elementary/efl_ui_layout.c +++ b/src/lib/elementary/efl_ui_layout.c @@ -10,7 +10,7 @@ #include "elm_priv.h" #include "elm_widget_layout.h" -#include "efl_ui_layout_internal_part.eo.h" +#include "efl_ui_layout_part.eo.h" #include "elm_part_helper.h" #define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT @@ -2477,8 +2477,8 @@ _efl_ui_layout_efl_part_part(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, return _efl_ui_layout_pack_proxy_get((Eo *) obj, type, part); // Generic parts (text, anything, ...) - proxy = efl_add(EFL_UI_LAYOUT_INTERNAL_PART_CLASS, (Eo *) obj); - pd = efl_data_scope_get(proxy, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); + proxy = efl_add(EFL_UI_LAYOUT_PART_CLASS, (Eo *) obj); + pd = efl_data_scope_get(proxy, EFL_UI_LAYOUT_PART_CLASS); if (pd) { pd->obj = (Eo *) obj; @@ -2509,37 +2509,37 @@ _efl_ui_layout_default_text_part_get(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_ } EOLIAN static Eina_Bool -_efl_ui_layout_internal_part_efl_ui_cursor_cursor_set(Eo *obj, Elm_Part_Data *pd, const char *cursor) +_efl_ui_layout_part_efl_ui_cursor_cursor_set(Eo *obj, Elm_Part_Data *pd, const char *cursor) { ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_set(pd->sd, pd->part, cursor)); } EOLIAN static const char * -_efl_ui_layout_internal_part_efl_ui_cursor_cursor_get(Eo *obj, Elm_Part_Data *pd) +_efl_ui_layout_part_efl_ui_cursor_cursor_get(Eo *obj, Elm_Part_Data *pd) { ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_get(pd->sd, pd->part)); } EOLIAN static Eina_Bool -_efl_ui_layout_internal_part_efl_ui_cursor_cursor_style_set(Eo *obj, Elm_Part_Data *pd, const char *style) +_efl_ui_layout_part_efl_ui_cursor_cursor_style_set(Eo *obj, Elm_Part_Data *pd, const char *style) { ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_style_set(pd->sd, pd->part, style)); } EOLIAN static const char * -_efl_ui_layout_internal_part_efl_ui_cursor_cursor_style_get(Eo *obj, Elm_Part_Data *pd) +_efl_ui_layout_part_efl_ui_cursor_cursor_style_get(Eo *obj, Elm_Part_Data *pd) { ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_style_get(pd->sd, pd->part)); } EOLIAN static Eina_Bool -_efl_ui_layout_internal_part_efl_ui_cursor_cursor_theme_search_enabled_set(Eo *obj, Elm_Part_Data *pd, Eina_Bool allow) +_efl_ui_layout_part_efl_ui_cursor_cursor_theme_search_enabled_set(Eo *obj, Elm_Part_Data *pd, Eina_Bool allow) { ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_engine_only_set(pd->sd, pd->part, !allow)); } EOLIAN static Eina_Bool -_efl_ui_layout_internal_part_efl_ui_cursor_cursor_theme_search_enabled_get(Eo *obj, Elm_Part_Data *pd) +_efl_ui_layout_part_efl_ui_cursor_cursor_theme_search_enabled_get(Eo *obj, Elm_Part_Data *pd) { ELM_PART_RETURN_VAL(!_efl_ui_layout_part_cursor_engine_only_get(pd->sd, pd->part)); } @@ -2550,7 +2550,7 @@ ELM_PART_IMPLEMENT_CONTENT_GET(efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data, ELM_PART_IMPLEMENT_CONTENT_UNSET(efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data, Elm_Part_Data) ELM_PART_IMPLEMENT_TEXT_SET(efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data, Elm_Part_Data) ELM_PART_IMPLEMENT_TEXT_GET(efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data, Elm_Part_Data) -#include "efl_ui_layout_internal_part.eo.c" +#include "efl_ui_layout_part.eo.c" /* Efl.Part end */ diff --git a/src/lib/elementary/efl_ui_layout_pack.c b/src/lib/elementary/efl_ui_layout_pack.c index e160af940b..f002a34f33 100644 --- a/src/lib/elementary/efl_ui_layout_pack.c +++ b/src/lib/elementary/efl_ui_layout_pack.c @@ -3,8 +3,8 @@ #endif #define ELM_LAYOUT_PROTECTED -#define EFL_UI_LAYOUT_INTERNAL_BOX_PROTECTED -#define EFL_UI_LAYOUT_INTERNAL_TABLE_PROTECTED +#define EFL_UI_LAYOUT_PART_BOX_PROTECTED +#define EFL_UI_LAYOUT_PART_TABLE_PROTECTED #include @@ -12,8 +12,8 @@ #include "elm_widget_layout.h" #include "elm_part_helper.h" -#include "efl_ui_layout_internal_box.eo.h" -#include "efl_ui_layout_internal_table.eo.h" +#include "efl_ui_layout_part_box.eo.h" +#include "efl_ui_layout_part_table.eo.h" #include "../evas/canvas/evas_box.eo.h" #include "../evas/canvas/evas_table.eo.h" @@ -28,8 +28,8 @@ Eina_Bool _efl_ui_layout_table_pack(Eo *obj, Efl_Ui_Layout_Data *sd, const ch 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); -#define BOX_CLASS EFL_UI_LAYOUT_INTERNAL_BOX_CLASS -#define TABLE_CLASS EFL_UI_LAYOUT_INTERNAL_TABLE_CLASS +#define BOX_CLASS EFL_UI_LAYOUT_PART_BOX_CLASS +#define TABLE_CLASS EFL_UI_LAYOUT_PART_TABLE_CLASS typedef struct _Layout_Part_Data Efl_Ui_Layout_Box_Data; typedef struct _Layout_Part_Data Efl_Ui_Layout_Table_Data; @@ -56,16 +56,16 @@ _efl_ui_layout_pack_proxy_get(Efl_Ui_Layout *obj, Edje_Part_Type type, const cha { if (type == EDJE_PART_TYPE_BOX) return efl_add(BOX_CLASS, obj, - efl_ui_layout_internal_box_real_part_set(efl_added, obj, part)); + efl_ui_layout_part_box_real_part_set(efl_added, obj, part)); else if (type == EDJE_PART_TYPE_TABLE) return efl_add(TABLE_CLASS, obj, - efl_ui_layout_internal_table_real_part_set(efl_added, obj, part)); + efl_ui_layout_part_table_real_part_set(efl_added, obj, part)); else return NULL; } EOLIAN static void -_efl_ui_layout_internal_box_efl_object_destructor(Eo *obj, Efl_Ui_Layout_Table_Data *pd) +_efl_ui_layout_part_box_efl_object_destructor(Eo *obj, Efl_Ui_Layout_Table_Data *pd) { ELM_PART_HOOK; efl_data_xunref(pd->obj, pd->sd, obj); @@ -74,7 +74,7 @@ _efl_ui_layout_internal_box_efl_object_destructor(Eo *obj, Efl_Ui_Layout_Table_D } EOLIAN static void -_efl_ui_layout_internal_box_real_part_set(Eo *obj, Efl_Ui_Layout_Box_Data *pd, Eo *layout, const char *part) +_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); @@ -133,7 +133,7 @@ _part_item_iterator_create(Eo *obj, Eina_Iterator *real_iterator, Eina_List *lis } EOLIAN static Eina_Iterator * -_efl_ui_layout_internal_box_efl_container_content_iterate(Eo *obj, Efl_Ui_Layout_Box_Data *pd) +_efl_ui_layout_part_box_efl_container_content_iterate(Eo *obj, Efl_Ui_Layout_Box_Data *pd) { Eina_Iterator *it; Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); @@ -142,63 +142,63 @@ _efl_ui_layout_internal_box_efl_container_content_iterate(Eo *obj, Efl_Ui_Layout } EOLIAN static int -_efl_ui_layout_internal_box_efl_container_content_count(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd) +_efl_ui_layout_part_box_efl_container_content_count(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd) { Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); ELM_PART_RETURN_VAL(evas_obj_box_count(pack)); } EOLIAN static Eina_Bool -_efl_ui_layout_internal_box_efl_pack_pack_clear(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd) +_efl_ui_layout_part_box_efl_pack_pack_clear(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd) { ELM_PART_RETURN_VAL(_efl_ui_layout_box_remove_all(pd->obj, pd->sd, pd->part, EINA_TRUE)); } EOLIAN static Eina_Bool -_efl_ui_layout_internal_box_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd) +_efl_ui_layout_part_box_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd) { ELM_PART_RETURN_VAL(_efl_ui_layout_box_remove_all(pd->obj, pd->sd, pd->part, EINA_FALSE)); } EOLIAN static Eina_Bool -_efl_ui_layout_internal_box_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj) +_efl_ui_layout_part_box_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj) { ELM_PART_RETURN_VAL(_efl_ui_layout_box_remove(pd->obj, pd->sd, pd->part, subobj) != NULL); } EOLIAN static Eina_Bool -_efl_ui_layout_internal_box_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *content) +_efl_ui_layout_part_box_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *content) { // alias for efl_pack_unpack - return _efl_ui_layout_internal_box_efl_pack_unpack(obj, pd, content); + return _efl_ui_layout_part_box_efl_pack_unpack(obj, pd, content); } EOLIAN static Eina_Bool -_efl_ui_layout_internal_box_efl_pack_pack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj) +_efl_ui_layout_part_box_efl_pack_pack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj) { ELM_PART_RETURN_VAL(_efl_ui_layout_box_append(pd->obj, pd->sd, pd->part, subobj)); } EOLIAN static Eina_Bool -_efl_ui_layout_internal_box_efl_pack_linear_pack_begin(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj) +_efl_ui_layout_part_box_efl_pack_linear_pack_begin(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj) { ELM_PART_RETURN_VAL(_efl_ui_layout_box_prepend(pd->obj, pd->sd, pd->part, subobj)); } EOLIAN static Eina_Bool -_efl_ui_layout_internal_box_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj) +_efl_ui_layout_part_box_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj) { ELM_PART_RETURN_VAL(_efl_ui_layout_box_append(pd->obj, pd->sd, pd->part, subobj)); } EOLIAN static Eina_Bool -_efl_ui_layout_internal_box_efl_pack_linear_pack_before(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj, const Efl_Gfx *existing) +_efl_ui_layout_part_box_efl_pack_linear_pack_before(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj, const Efl_Gfx *existing) { ELM_PART_RETURN_VAL(_efl_ui_layout_box_insert_before(pd->obj, pd->sd, pd->part, subobj, existing)); } EOLIAN static Eina_Bool -_efl_ui_layout_internal_box_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj, const Efl_Gfx *existing) +_efl_ui_layout_part_box_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj, const Efl_Gfx *existing) { const Efl_Gfx *other; int index; @@ -215,13 +215,13 @@ _efl_ui_layout_internal_box_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED, Efl_ } EOLIAN static Eina_Bool -_efl_ui_layout_internal_box_efl_pack_linear_pack_at(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj, int index) +_efl_ui_layout_part_box_efl_pack_linear_pack_at(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj, int index) { ELM_PART_RETURN_VAL(_efl_ui_layout_box_insert_at(pd->obj, pd->sd, pd->part, subobj, index)); } EOLIAN static Efl_Gfx * -_efl_ui_layout_internal_box_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, int index) +_efl_ui_layout_part_box_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, int index) { Evas_Object_Box_Option *opt; Evas_Object_Box_Data *priv; @@ -234,7 +234,7 @@ _efl_ui_layout_internal_box_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED } EOLIAN static Efl_Gfx * -_efl_ui_layout_internal_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Layout_Box_Data *pd, int index) +_efl_ui_layout_part_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Layout_Box_Data *pd, int index) { Efl_Gfx *subobj; Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); @@ -249,14 +249,14 @@ _efl_ui_layout_internal_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Layou } EOLIAN static int -_efl_ui_layout_internal_box_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, const Efl_Gfx *subobj) +_efl_ui_layout_part_box_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, const Efl_Gfx *subobj) { Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); ELM_PART_RETURN_VAL(efl_pack_index_get(pack, subobj)); } EOLIAN static Efl_Orient -_efl_ui_layout_internal_box_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd) +_efl_ui_layout_part_box_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_ORIENT_NONE); @@ -267,7 +267,7 @@ _efl_ui_layout_internal_box_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, /* Table proxy implementation */ EOLIAN static void -_efl_ui_layout_internal_table_real_part_set(Eo *obj, Efl_Ui_Layout_Table_Data *pd, Eo *layout, const char *part) +_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); @@ -276,7 +276,7 @@ _efl_ui_layout_internal_table_real_part_set(Eo *obj, Efl_Ui_Layout_Table_Data *p } EOLIAN static void -_efl_ui_layout_internal_table_efl_object_destructor(Eo *obj, Efl_Ui_Layout_Table_Data *pd) +_efl_ui_layout_part_table_efl_object_destructor(Eo *obj, Efl_Ui_Layout_Table_Data *pd) { ELM_PART_HOOK; efl_data_xunref(pd->obj, pd->sd, obj); @@ -285,7 +285,7 @@ _efl_ui_layout_internal_table_efl_object_destructor(Eo *obj, Efl_Ui_Layout_Table } EOLIAN static Eina_Iterator * -_efl_ui_layout_internal_table_efl_container_content_iterate(Eo *obj, Efl_Ui_Layout_Table_Data *pd) +_efl_ui_layout_part_table_efl_container_content_iterate(Eo *obj, Efl_Ui_Layout_Table_Data *pd) { Eina_Iterator *it; Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); @@ -296,53 +296,53 @@ _efl_ui_layout_internal_table_efl_container_content_iterate(Eo *obj, Efl_Ui_Layo } EOLIAN static int -_efl_ui_layout_internal_table_efl_container_content_count(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd) +_efl_ui_layout_part_table_efl_container_content_count(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd) { Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); ELM_PART_RETURN_VAL(evas_obj_table_count(pack)); } EOLIAN static Eina_Bool -_efl_ui_layout_internal_table_efl_pack_pack_clear(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd) +_efl_ui_layout_part_table_efl_pack_pack_clear(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd) { ELM_PART_RETURN_VAL(_efl_ui_layout_table_clear(pd->obj, pd->sd, pd->part, EINA_TRUE)); } EOLIAN static Eina_Bool -_efl_ui_layout_internal_table_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd) +_efl_ui_layout_part_table_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd) { ELM_PART_RETURN_VAL(_efl_ui_layout_table_clear(pd->obj, pd->sd, pd->part, EINA_FALSE)); } EOLIAN static Eina_Bool -_efl_ui_layout_internal_table_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *subobj) +_efl_ui_layout_part_table_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *subobj) { if (!subobj) ELM_PART_RETURN_VAL(EINA_FALSE); ELM_PART_RETURN_VAL(_efl_ui_layout_table_unpack(pd->obj, pd->sd, pd->part, subobj) == subobj); } EOLIAN static Eina_Bool -_efl_ui_layout_internal_table_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *content) +_efl_ui_layout_part_table_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *content) { // alias for efl_pack_unpack - return _efl_ui_layout_internal_table_efl_pack_unpack(obj, pd, content); + return _efl_ui_layout_part_table_efl_pack_unpack(obj, pd, content); } EOLIAN static Eina_Bool -_efl_ui_layout_internal_table_efl_pack_grid_pack_grid(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *subobj, int col, int row, int colspan, int rowspan) +_efl_ui_layout_part_table_efl_pack_grid_pack_grid(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *subobj, int col, int row, int colspan, int rowspan) { ELM_PART_RETURN_VAL(_efl_ui_layout_table_pack(pd->obj, pd->sd, pd->part, subobj, col, row, colspan, rowspan)); } EOLIAN static Efl_Gfx * -_efl_ui_layout_internal_table_efl_pack_grid_grid_content_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, int col, int row) +_efl_ui_layout_part_table_efl_pack_grid_grid_content_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, int col, int row) { Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); ELM_PART_RETURN_VAL(evas_object_table_child_get(pack, col, row)); } EOLIAN static Eina_Iterator * -_efl_ui_layout_internal_table_efl_pack_grid_grid_contents_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, int col, int row, Eina_Bool below) +_efl_ui_layout_part_table_efl_pack_grid_grid_contents_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, int col, int row, Eina_Bool below) { // contents at col,row - see also Efl.Ui.Grid or edje_containers.c // not reusing edje's iterator because the container would be wrong @@ -371,7 +371,7 @@ _efl_ui_layout_internal_table_efl_pack_grid_grid_contents_get(Eo *obj EINA_UNUSE } EOLIAN static Eina_Bool -_efl_ui_layout_internal_table_efl_pack_grid_grid_position_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx * subobj, int *col, int *row, int *colspan, int *rowspan) +_efl_ui_layout_part_table_efl_pack_grid_grid_position_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx * subobj, int *col, int *row, int *colspan, int *rowspan) { unsigned short c, r, cs, rs; Eina_Bool ret; @@ -387,14 +387,14 @@ _efl_ui_layout_internal_table_efl_pack_grid_grid_position_get(Eo *obj EINA_UNUSE } EOLIAN static void -_efl_ui_layout_internal_table_efl_pack_grid_grid_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, int *cols, int *rows) +_efl_ui_layout_part_table_efl_pack_grid_grid_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, int *cols, int *rows) { Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); evas_object_table_col_row_size_get(pack, cols, rows); } EOLIAN static int -_efl_ui_layout_internal_table_efl_pack_grid_grid_columns_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd) +_efl_ui_layout_part_table_efl_pack_grid_grid_columns_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd) { int cols, rows; Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); @@ -403,7 +403,7 @@ _efl_ui_layout_internal_table_efl_pack_grid_grid_columns_get(Eo *obj EINA_UNUSED } EOLIAN static int -_efl_ui_layout_internal_table_efl_pack_grid_grid_rows_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd) +_efl_ui_layout_part_table_efl_pack_grid_grid_rows_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd) { int cols, rows; Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); @@ -411,5 +411,5 @@ _efl_ui_layout_internal_table_efl_pack_grid_grid_rows_get(Eo *obj EINA_UNUSED, E ELM_PART_RETURN_VAL(rows); } -#include "efl_ui_layout_internal_box.eo.c" -#include "efl_ui_layout_internal_table.eo.c" +#include "efl_ui_layout_part_box.eo.c" +#include "efl_ui_layout_part_table.eo.c" diff --git a/src/lib/elementary/efl_ui_layout_internal_part.eo b/src/lib/elementary/efl_ui_layout_part.eo similarity index 76% rename from src/lib/elementary/efl_ui_layout_internal_part.eo rename to src/lib/elementary/efl_ui_layout_part.eo index 1d7ab3905c..dd075c209d 100644 --- a/src/lib/elementary/efl_ui_layout_internal_part.eo +++ b/src/lib/elementary/efl_ui_layout_part.eo @@ -1,5 +1,4 @@ -class Efl.Ui.Layout.Internal.Part (Efl.Object, Efl.Container, Efl.Text, - Efl.Ui.Cursor) +class Efl.Ui.Layout.Part (Efl.Object, Efl.Container, Efl.Text, Efl.Ui.Cursor) { [[Elementary layout internal part class]] data: Elm_Part_Data; diff --git a/src/lib/elementary/efl_ui_layout_internal_box.eo b/src/lib/elementary/efl_ui_layout_part_box.eo similarity index 94% rename from src/lib/elementary/efl_ui_layout_internal_box.eo rename to src/lib/elementary/efl_ui_layout_part_box.eo index 62783686a0..a0e72964f6 100644 --- a/src/lib/elementary/efl_ui_layout_internal_box.eo +++ b/src/lib/elementary/efl_ui_layout_part_box.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Layout_Internal.Box (Efl.Object, Efl.Pack.Linear, +class Efl.Ui.Layout.Part.Box (Efl.Object, Efl.Pack.Linear, Efl.Orientation) { [[Represents a Box created as part of a layout. diff --git a/src/lib/elementary/efl_ui_layout_internal_table.eo b/src/lib/elementary/efl_ui_layout_part_table.eo similarity index 93% rename from src/lib/elementary/efl_ui_layout_internal_table.eo rename to src/lib/elementary/efl_ui_layout_part_table.eo index 7104c9b37d..495aa6eff4 100644 --- a/src/lib/elementary/efl_ui_layout_internal_table.eo +++ b/src/lib/elementary/efl_ui_layout_part_table.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Layout_Internal.Table (Efl.Object, Efl.Pack.Grid) +class Efl.Ui.Layout.Part.Table (Efl.Object, Efl.Pack.Grid) { [[Represents a Table created as part of a layout. diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c index 0163b95ca0..98a331cc0c 100644 --- a/src/lib/elementary/efl_ui_panes.c +++ b/src/lib/elementary/efl_ui_panes.c @@ -12,7 +12,7 @@ #include "elm_widget_layout.h" #include "efl_ui_panes_private.h" -#include "efl_ui_panes_internal_part.eo.h" +#include "efl_ui_panes_part.eo.h" #include "elm_part_helper.h" #define MY_CLASS EFL_UI_PANES_CLASS @@ -534,9 +534,9 @@ _efl_ui_panes_class_constructor(Efl_Class *klass) ELM_PART_OVERRIDE(efl_ui_panes, EFL_UI_PANES, EFL_UI_LAYOUT, Efl_Ui_Panes_Data, Elm_Part_Data) EOLIAN static void -_efl_ui_panes_internal_part_hint_min_allow_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, Eina_Bool allow) +_efl_ui_panes_part_hint_min_allow_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, Eina_Bool allow) { - Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); + Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_PART_CLASS); Efl_Ui_Panes_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PANES_CLASS); if (!strcmp(pd->part, "first")) @@ -554,10 +554,10 @@ _efl_ui_panes_internal_part_hint_min_allow_set(Eo *obj, Elm_Part_Data *_pd EINA_ } EOLIAN static Eina_Bool -_efl_ui_panes_internal_part_hint_min_allow_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED) +_efl_ui_panes_part_hint_min_allow_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED) { Eina_Bool ret = EINA_FALSE; - Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); + Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_PART_CLASS); Efl_Ui_Panes_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PANES_CLASS); if (!strcmp(pd->part, "first")) @@ -573,9 +573,9 @@ _efl_ui_panes_internal_part_hint_min_allow_get(Eo *obj, Elm_Part_Data *_pd EINA_ } EOLIAN static double -_efl_ui_panes_internal_part_split_ratio_min_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED) +_efl_ui_panes_part_split_ratio_min_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED) { - Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); + Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_PART_CLASS); Efl_Ui_Panes_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PANES_CLASS); double ret = 0.0; @@ -588,9 +588,9 @@ _efl_ui_panes_internal_part_split_ratio_min_get(Eo *obj, Elm_Part_Data *_pd EINA } EOLIAN static void -_efl_ui_panes_internal_part_split_ratio_min_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, double ratio) +_efl_ui_panes_part_split_ratio_min_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, double ratio) { - Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); + Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_PART_CLASS); Efl_Ui_Panes_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PANES_CLASS); if (!strcmp(pd->part, "first")) @@ -607,7 +607,7 @@ _efl_ui_panes_internal_part_split_ratio_min_set(Eo *obj, Elm_Part_Data *_pd EINA } } -#include "efl_ui_panes_internal_part.eo.c" +#include "efl_ui_panes_part.eo.c" /* Efl.Part end */ diff --git a/src/lib/elementary/efl_ui_panes_internal_part.eo b/src/lib/elementary/efl_ui_panes_part.eo similarity index 93% rename from src/lib/elementary/efl_ui_panes_internal_part.eo rename to src/lib/elementary/efl_ui_panes_part.eo index 473decaeb8..322fd5e7ce 100644 --- a/src/lib/elementary/efl_ui_panes_internal_part.eo +++ b/src/lib/elementary/efl_ui_panes_part.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Panes.Internal.Part (Efl.Ui.Layout.Internal.Part) +class Efl.Ui.Panes.Part (Efl.Ui.Layout.Part) { [[Elementary Panes internal part class]] data: Elm_Part_Data; diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c index 8af271bbbd..7e0291183e 100644 --- a/src/lib/elementary/efl_ui_progressbar.c +++ b/src/lib/elementary/efl_ui_progressbar.c @@ -11,7 +11,7 @@ #include "efl_ui_progressbar_private.h" #include "elm_widget_layout.h" -#include "efl_ui_progressbar_internal_part.eo.h" +#include "efl_ui_progressbar_part.eo.h" #include "elm_part_helper.h" #define MY_CLASS EFL_UI_PROGRESSBAR_CLASS @@ -644,32 +644,32 @@ _efl_ui_progressbar_class_constructor(Efl_Class *klass) ELM_PART_OVERRIDE(efl_ui_progressbar, EFL_UI_PROGRESSBAR, EFL_UI_LAYOUT, Efl_Ui_Progressbar_Data, Elm_Part_Data) static EOLIAN Eina_Bool -_efl_ui_progressbar_internal_part_efl_container_content_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, Efl_Gfx *content) +_efl_ui_progressbar_part_efl_container_content_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, Efl_Gfx *content) { - Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); + Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_PART_CLASS); Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS); ELM_PART_RETURN_VAL(_efl_ui_progressbar_content_set(pd->obj, sd, pd->part, content)); } EOLIAN static void -_efl_ui_progressbar_internal_part_efl_ui_range_range_value_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, double val) +_efl_ui_progressbar_part_efl_ui_range_range_value_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, double val) { - Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); + Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_PART_CLASS); Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS); _progressbar_part_value_set(pd->obj, sd, pd->part, val); } EOLIAN static double -_efl_ui_progressbar_internal_part_efl_ui_range_range_value_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED) +_efl_ui_progressbar_part_efl_ui_range_range_value_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED) { - Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); + Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_PART_CLASS); Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS); return _progressbar_part_value_get(sd, pd->part); } -#include "efl_ui_progressbar_internal_part.eo.c" +#include "efl_ui_progressbar_part.eo.c" /* Efl.Part end */ diff --git a/src/lib/elementary/efl_ui_progressbar_internal_part.eo b/src/lib/elementary/efl_ui_progressbar_part.eo similarity index 68% rename from src/lib/elementary/efl_ui_progressbar_internal_part.eo rename to src/lib/elementary/efl_ui_progressbar_part.eo index 18dbc7f672..17051547a0 100644 --- a/src/lib/elementary/efl_ui_progressbar_internal_part.eo +++ b/src/lib/elementary/efl_ui_progressbar_part.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Progressbar.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Ui.Range) +class Efl.Ui.Progressbar.Part (Efl.Ui.Layout.Part, Efl.Ui.Range) { [[Elementary progressbar internal part class]] data: Elm_Part_Data; diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c index 3bc1f67d20..581c3e1f12 100644 --- a/src/lib/elementary/efl_ui_slider.c +++ b/src/lib/elementary/efl_ui_slider.c @@ -13,7 +13,7 @@ #include "efl_ui_slider_private.h" #include "elm_widget_layout.h" -#include "efl_ui_slider_internal_part.eo.h" +#include "efl_ui_slider_part.eo.h" #include "elm_part_helper.h" #define MY_CLASS EFL_UI_SLIDER_CLASS @@ -1524,9 +1524,9 @@ _efl_ui_slider_content_set(Eo *obj, Efl_Ui_Slider_Data *_pd EINA_UNUSED, const c } static EOLIAN Eina_Bool -_efl_ui_slider_internal_part_efl_container_content_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, Efl_Gfx *content) +_efl_ui_slider_part_efl_container_content_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, Efl_Gfx *content) { - Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); + Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_PART_CLASS); Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS); ELM_PART_RETURN_VAL(_efl_ui_slider_content_set(pd->obj, sd, pd->part, content)); } @@ -1565,18 +1565,18 @@ _span_size_set(Eo *obj, Efl_Ui_Slider_Data *sd, int w, int h) } EOLIAN void -_efl_ui_slider_internal_part_efl_gfx_size_hint_hint_min_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, int w, int h) +_efl_ui_slider_part_efl_gfx_size_hint_hint_min_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, int w, int h) { - Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); + Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_PART_CLASS); Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS); _span_size_set(pd->obj, sd, w, h); } EOLIAN void -_efl_ui_slider_internal_part_efl_gfx_size_hint_hint_min_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, int *w, int *h) +_efl_ui_slider_part_efl_gfx_size_hint_hint_min_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, int *w, int *h) { - Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); + Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_PART_CLASS); Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS); if (_is_horizontal(sd->dir)) @@ -1591,7 +1591,7 @@ _efl_ui_slider_internal_part_efl_gfx_size_hint_hint_min_get(Eo *obj, Elm_Part_Da } } -#include "efl_ui_slider_internal_part.eo.c" +#include "efl_ui_slider_part.eo.c" /* Efl.Part end */ /* Legacy APIs */ diff --git a/src/lib/elementary/efl_ui_slider_internal_part.eo b/src/lib/elementary/efl_ui_slider_part.eo similarity index 68% rename from src/lib/elementary/efl_ui_slider_internal_part.eo rename to src/lib/elementary/efl_ui_slider_part.eo index 8ea97e4253..0496ff2717 100644 --- a/src/lib/elementary/efl_ui_slider_internal_part.eo +++ b/src/lib/elementary/efl_ui_slider_part.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Slider.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Gfx.Size.Hint) +class Efl.Ui.Slider.Part (Efl.Ui.Layout.Part, Efl.Gfx.Size.Hint) { [[Elementary slider internal part class]] data: Elm_Part_Data; diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index fccb5c877c..24aa926a91 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -11,7 +11,7 @@ #include #include "elm_priv.h" -//#include "elm_entry_internal_part.eo.h" +//#include "elm_entry_part.eo.h" //#include "elm_part_helper.h" // #include "elm_interface_scrollable.h" @@ -5346,7 +5346,7 @@ _efl_ui_text_move_cb(void *data, Evas *e EINA_UNUSED, ELM_PART_OVERRIDE(elm_entry, EFL_UI_TEXT, EFL_UI_LAYOUT, Efl_Ui_Text_Data, Elm_Part_Data) ELM_PART_OVERRIDE_CONTENT_SET(elm_entry, EFL_UI_TEXT, EFL_UI_LAYOUT, Efl_Ui_Text_Data, Elm_Part_Data) ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, EFL_UI_TEXT, EFL_UI_LAYOUT, Efl_Ui_Text_Data, Elm_Part_Data) -#include "elm_entry_internal_part.eo.c" +#include "elm_entry_part.eo.c" /* Efl.Part end */ #endif diff --git a/src/lib/elementary/efl_ui_textpath.c b/src/lib/elementary/efl_ui_textpath.c index c5ff22a5e0..5eb5ac0ee2 100644 --- a/src/lib/elementary/efl_ui_textpath.c +++ b/src/lib/elementary/efl_ui_textpath.c @@ -8,7 +8,7 @@ #include "elm_priv.h" #include "elm_widget_layout.h" -#include "efl_ui_textpath_internal_part.eo.h" +#include "efl_ui_textpath_part.eo.h" #include "elm_part_helper.h" @@ -660,7 +660,7 @@ _efl_ui_textpath_ellipsis_get(Eo *obj EINA_UNUSED, Efl_Ui_Textpath_Data *pd) ELM_PART_OVERRIDE(efl_ui_textpath, EFL_UI_TEXTPATH, EFL_UI_LAYOUT, Efl_Ui_Textpath_Data, Elm_Part_Data) ELM_PART_OVERRIDE_TEXT_SET(efl_ui_textpath, EFL_UI_TEXTPATH, EFL_UI_LAYOUT, Efl_Ui_Textpath_Data, Elm_Part_Data) ELM_PART_OVERRIDE_TEXT_GET(efl_ui_textpath, EFL_UI_TEXTPATH, EFL_UI_LAYOUT, Efl_Ui_Textpath_Data, Elm_Part_Data) -#include "efl_ui_textpath_internal_part.eo.c" +#include "efl_ui_textpath_part.eo.c" /* Efl.Part end */ #define EFL_UI_TEXTPATH_EXTRA_OPS \ diff --git a/src/lib/elementary/efl_ui_textpath_internal_part.eo b/src/lib/elementary/efl_ui_textpath_part.eo similarity index 60% rename from src/lib/elementary/efl_ui_textpath_internal_part.eo rename to src/lib/elementary/efl_ui_textpath_part.eo index daba6f3a33..026f9b6800 100644 --- a/src/lib/elementary/efl_ui_textpath_internal_part.eo +++ b/src/lib/elementary/efl_ui_textpath_part.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Textpath.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text) +class Efl.Ui.Textpath.Part (Efl.Ui.Layout.Part, Efl.Text) { [[Efl UI Textpath internal part class]] data: null; diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 84b986cad0..3d0a2d6f09 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -27,7 +27,7 @@ #include "interfaces/efl_common_internal.h" #include "elm_part_helper.h" -#include "efl_ui_win_internal_part.eo.h" +#include "efl_ui_win_part.eo.h" #define MY_CLASS EFL_UI_WIN_CLASS #define MY_CLASS_NAME "Efl.Ui.Win" @@ -6991,7 +6991,7 @@ _efl_ui_win_part_file_get(Eo *obj, Efl_Ui_Win_Data *sd, const char *part, const /* Efl.Part begin */ static void -_efl_ui_win_internal_part_efl_gfx_color_set(Eo *obj, Elm_Part_Data *pd, int r, int g, int b, int a) +_efl_ui_win_part_efl_gfx_color_set(Eo *obj, Elm_Part_Data *pd, int r, int g, int b, int a) { if (EVAS_COLOR_SANITIZE(r, g, b, a)) ERR("Evas only handles premultiplied colors (0 <= R,G,B <= A <= 255)"); @@ -7001,20 +7001,20 @@ _efl_ui_win_internal_part_efl_gfx_color_set(Eo *obj, Elm_Part_Data *pd, int r, i } static void -_efl_ui_win_internal_part_efl_gfx_color_get(Eo *obj, Elm_Part_Data *pd, int *r, int *g, int *b, int *a) +_efl_ui_win_part_efl_gfx_color_get(Eo *obj, Elm_Part_Data *pd, int *r, int *g, int *b, int *a) { _efl_ui_win_part_color_get(pd->obj, pd->sd, pd->part, r, g, b, a); ELM_PART_RETURN_VOID; } static Eina_Bool -_efl_ui_win_internal_part_efl_file_file_set(Eo *obj, Elm_Part_Data *pd, const char *file, const char *key) +_efl_ui_win_part_efl_file_file_set(Eo *obj, Elm_Part_Data *pd, const char *file, const char *key) { ELM_PART_RETURN_VAL(_efl_ui_win_part_file_set(pd->obj, pd->sd, pd->part, file, key)); } static void -_efl_ui_win_internal_part_efl_file_file_get(Eo *obj, Elm_Part_Data *pd, const char **file, const char **key) +_efl_ui_win_part_efl_file_file_get(Eo *obj, Elm_Part_Data *pd, const char **file, const char **key) { _efl_ui_win_part_file_get(pd->obj, pd->sd, pd->part, file, key); ELM_PART_RETURN_VOID; @@ -7043,7 +7043,7 @@ ELM_PART_IMPLEMENT_CONTENT_SET(efl_ui_win, EFL_UI_WIN, Efl_Ui_Win_Data, Elm_Part ELM_PART_IMPLEMENT_CONTENT_GET(efl_ui_win, EFL_UI_WIN, Efl_Ui_Win_Data, Elm_Part_Data) ELM_PART_IMPLEMENT_CONTENT_UNSET(efl_ui_win, EFL_UI_WIN, Efl_Ui_Win_Data, Elm_Part_Data) ELM_PART_CONTENT_DEFAULT_SET(efl_ui_win, "content") -#include "efl_ui_win_internal_part.eo.c" +#include "efl_ui_win_part.eo.c" /* Efl.Part end */ diff --git a/src/lib/elementary/efl_ui_win_internal_part.eo b/src/lib/elementary/efl_ui_win_part.eo similarity index 77% rename from src/lib/elementary/efl_ui_win_internal_part.eo rename to src/lib/elementary/efl_ui_win_part.eo index a791ea7550..e5d4b4daba 100644 --- a/src/lib/elementary/efl_ui_win_internal_part.eo +++ b/src/lib/elementary/efl_ui_win_part.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Win.Internal.Part (Efl.Object, Efl.Container, Efl.Gfx, Efl.File) +class Efl.Ui.Win.Part (Efl.Object, Efl.Container, Efl.Gfx, Efl.File) { [[Efl UI window interal part class]] data: Elm_Part_Data; diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c index 22789a72cd..80437bc6dc 100644 --- a/src/lib/elementary/elc_ctxpopup.c +++ b/src/lib/elementary/elc_ctxpopup.c @@ -13,7 +13,7 @@ #include "elm_priv.h" #include "elm_widget_ctxpopup.h" -#include "elm_ctxpopup_internal_part.eo.h" +#include "elm_ctxpopup_part.eo.h" #include "elm_part_helper.h" #define MY_CLASS ELM_CTXPOPUP_CLASS @@ -1641,7 +1641,7 @@ ELM_PART_OVERRIDE_CONTENT_SET(elm_ctxpopup, ELM_CTXPOPUP, EFL_UI_LAYOUT, Elm_Ctx ELM_PART_OVERRIDE_CONTENT_GET(elm_ctxpopup, ELM_CTXPOPUP, EFL_UI_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data) ELM_PART_OVERRIDE_CONTENT_UNSET(elm_ctxpopup, ELM_CTXPOPUP, EFL_UI_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data) ELM_PART_CONTENT_DEFAULT_SET(elm_ctxpopup, "default") -#include "elm_ctxpopup_internal_part.eo.c" +#include "elm_ctxpopup_part.eo.c" /* Efl.Part end */ diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c index 3308aef974..900da0ac15 100644 --- a/src/lib/elementary/elc_fileselector.c +++ b/src/lib/elementary/elc_fileselector.c @@ -19,7 +19,7 @@ #include "elm_interface_fileselector.h" #include "elm_widget_fileselector.h" -#include "elm_fileselector_internal_part.eo.h" +#include "elm_fileselector_part.eo.h" #include "elm_part_helper.h" #define MY_CLASS ELM_FILESELECTOR_CLASS @@ -3225,7 +3225,7 @@ ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(elm_fileselector, Elm_Fileselector_Data) ELM_PART_OVERRIDE(elm_fileselector, ELM_FILESELECTOR, EFL_UI_LAYOUT, Elm_Fileselector_Data, Elm_Part_Data) ELM_PART_OVERRIDE_TEXT_SET(elm_fileselector, ELM_FILESELECTOR, EFL_UI_LAYOUT, Elm_Fileselector_Data, Elm_Part_Data) -#include "elm_fileselector_internal_part.eo.c" +#include "elm_fileselector_part.eo.c" /* Efl.Part end */ diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c index 6bda4162d7..906e5f619e 100644 --- a/src/lib/elementary/elc_fileselector_entry.c +++ b/src/lib/elementary/elc_fileselector_entry.c @@ -12,7 +12,7 @@ #include "elm_interface_fileselector.h" #include "elm_widget_fileselector_entry.h" -#include "elm_fileselector_entry_internal_part.eo.h" +#include "elm_fileselector_entry_part.eo.h" #include "elm_part_helper.h" #define MY_CLASS ELM_FILESELECTOR_ENTRY_CLASS @@ -677,7 +677,7 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, ELM_PART_OVERRIDE_TEXT_SET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, EFL_UI_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data) ELM_PART_OVERRIDE_TEXT_GET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, EFL_UI_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data) ELM_PART_CONTENT_DEFAULT_SET(elm_fileselector_entry, "button icon") -#include "elm_fileselector_entry_internal_part.eo.c" +#include "elm_fileselector_entry_part.eo.c" /* Efl.Part end */ diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c index 7e2883c89e..e156bfa09e 100644 --- a/src/lib/elementary/elc_multibuttonentry.c +++ b/src/lib/elementary/elc_multibuttonentry.c @@ -10,7 +10,7 @@ #include "elm_priv.h" #include "elm_widget_multibuttonentry.h" -#include "elm_multibuttonentry_internal_part.eo.h" +#include "elm_multibuttonentry_part.eo.h" #include "elm_part_helper.h" #define MY_CLASS ELM_MULTIBUTTONENTRY_CLASS @@ -2148,7 +2148,7 @@ _elm_multibuttonentry_item_elm_interface_atspi_widget_action_elm_actions_get(Eo ELM_PART_OVERRIDE(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, EFL_UI_LAYOUT, Elm_Multibuttonentry_Data, Elm_Part_Data) ELM_PART_OVERRIDE_TEXT_SET(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, EFL_UI_LAYOUT, Elm_Multibuttonentry_Data, Elm_Part_Data) ELM_PART_OVERRIDE_TEXT_GET(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, EFL_UI_LAYOUT, Elm_Multibuttonentry_Data, Elm_Part_Data) -#include "elm_multibuttonentry_internal_part.eo.c" +#include "elm_multibuttonentry_part.eo.c" /* Efl.Part end */ /* Internal EO APIs and hidden overrides */ diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c index 9f4f425c78..c379c5a993 100644 --- a/src/lib/elementary/elc_naviframe.c +++ b/src/lib/elementary/elc_naviframe.c @@ -14,7 +14,7 @@ #include "elm_widget_naviframe.h" #include "elm_widget_container.h" -#include "elm_naviframe_internal_part.eo.h" +#include "elm_naviframe_part.eo.h" #include "elm_part_helper.h" #define MY_CLASS ELM_NAVIFRAME_CLASS @@ -2105,7 +2105,7 @@ ELM_PART_OVERRIDE_CONTENT_GET(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_N ELM_PART_OVERRIDE_CONTENT_UNSET(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data) ELM_PART_OVERRIDE_TEXT_SET(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data) ELM_PART_OVERRIDE_TEXT_GET(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data) -#include "elm_naviframe_internal_part.eo.c" +#include "elm_naviframe_part.eo.c" /* Efl.Part end */ diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c index 42b51717e6..04613a7a01 100644 --- a/src/lib/elementary/elc_player.c +++ b/src/lib/elementary/elc_player.c @@ -12,7 +12,7 @@ #include "elm_widget_layout.h" #include "elm_widget_player.h" -#include "elm_player_internal_part.eo.h" +#include "elm_player_part.eo.h" #include "elm_part_helper.h" #define MY_CLASS ELM_PLAYER_CLASS @@ -699,7 +699,7 @@ ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(elm_player, Elm_Player_Data) ELM_PART_OVERRIDE(elm_player, ELM_PLAYER, EFL_UI_LAYOUT, Elm_Player_Data, Elm_Part_Data) ELM_PART_OVERRIDE_CONTENT_SET(elm_player, ELM_PLAYER, EFL_UI_LAYOUT, Elm_Player_Data, Elm_Part_Data) ELM_PART_CONTENT_DEFAULT_SET(elm_player, "video") -#include "elm_player_internal_part.eo.c" +#include "elm_player_part.eo.c" /* End of Efl.Part */ diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index 1ca4b50814..634eb18db9 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c @@ -13,7 +13,7 @@ #include "elm_popup_item.eo.h" -#include "elm_popup_internal_part.eo.h" +#include "elm_popup_part.eo.h" #include "elm_part_helper.h" #define MY_CLASS ELM_POPUP_CLASS @@ -1924,7 +1924,7 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_popup, ELM_POPUP, EFL_UI_LAYOUT, Elm_Popup_D ELM_PART_OVERRIDE_TEXT_SET(elm_popup, ELM_POPUP, EFL_UI_LAYOUT, Elm_Popup_Data, Elm_Part_Data) ELM_PART_OVERRIDE_TEXT_GET(elm_popup, ELM_POPUP, EFL_UI_LAYOUT, Elm_Popup_Data, Elm_Part_Data) ELM_PART_CONTENT_DEFAULT_SET(elm_popup, "default") -#include "elm_popup_internal_part.eo.c" +#include "elm_popup_part.eo.c" /* Efl.Part end */ diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c index 0c4a5f4bc6..414bf2ebab 100644 --- a/src/lib/elementary/elm_actionslider.c +++ b/src/lib/elementary/elm_actionslider.c @@ -13,7 +13,7 @@ #include "elm_actionslider.eo.h" -#include "elm_actionslider_internal_part.eo.h" +#include "elm_actionslider_part.eo.h" #include "elm_part_helper.h" #define MY_CLASS ELM_ACTIONSLIDER_CLASS @@ -663,7 +663,7 @@ ELM_PART_OVERRIDE(elm_actionslider, ELM_ACTIONSLIDER, EFL_UI_LAYOUT, Elm_Actions ELM_PART_OVERRIDE_TEXT_SET(elm_actionslider, ELM_ACTIONSLIDER, EFL_UI_LAYOUT, Elm_Actionslider_Data, Elm_Part_Data) ELM_PART_OVERRIDE_TEXT_GET(elm_actionslider, ELM_ACTIONSLIDER, EFL_UI_LAYOUT, Elm_Actionslider_Data, Elm_Part_Data) -#include "elm_actionslider_internal_part.eo.c" +#include "elm_actionslider_part.eo.c" /* Efl.Part end */ /* Internal EO APIs and hidden overrides */ diff --git a/src/lib/elementary/elm_actionslider_internal_part.eo b/src/lib/elementary/elm_actionslider_part.eo similarity index 61% rename from src/lib/elementary/elm_actionslider_internal_part.eo rename to src/lib/elementary/elm_actionslider_part.eo index 09bb0c686f..038332c1c7 100644 --- a/src/lib/elementary/elm_actionslider_internal_part.eo +++ b/src/lib/elementary/elm_actionslider_part.eo @@ -1,4 +1,4 @@ -class Elm_Actionslider.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text) +class Elm_Actionslider.Part (Efl.Ui.Layout.Part, Efl.Text) { [[Elementary Actionslider internal part class]] data: null; diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c index 237d2ff591..84eb857371 100644 --- a/src/lib/elementary/elm_bubble.c +++ b/src/lib/elementary/elm_bubble.c @@ -11,7 +11,7 @@ #include "elm_widget_bubble.h" #include "elm_widget_layout.h" -#include "elm_bubble_internal_part.eo.h" +#include "elm_bubble_part.eo.h" #include "elm_part_helper.h" #define MY_CLASS ELM_BUBBLE_CLASS @@ -284,7 +284,7 @@ _elm_bubble_class_constructor(Efl_Class *klass) ELM_PART_OVERRIDE(elm_bubble, ELM_BUBBLE, EFL_UI_LAYOUT, Elm_Bubble_Data, Elm_Part_Data) ELM_PART_OVERRIDE_TEXT_SET(elm_bubble, ELM_BUBBLE, EFL_UI_LAYOUT, Elm_Bubble_Data, Elm_Part_Data) -#include "elm_bubble_internal_part.eo.c" +#include "elm_bubble_part.eo.c" /* Efl.Part end */ /* Internal EO APIs and hidden overrides */ diff --git a/src/lib/elementary/elm_bubble_internal_part.eo b/src/lib/elementary/elm_bubble_part.eo similarity index 61% rename from src/lib/elementary/elm_bubble_internal_part.eo rename to src/lib/elementary/elm_bubble_part.eo index 7deaa91340..3822913bc3 100644 --- a/src/lib/elementary/elm_bubble_internal_part.eo +++ b/src/lib/elementary/elm_bubble_part.eo @@ -1,4 +1,4 @@ -class Elm_Bubble.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text) +class Elm_Bubble.Part (Efl.Ui.Layout.Part, Efl.Text) { [[Elementary Bubble internal part class]] data: null; diff --git a/src/lib/elementary/elm_ctxpopup_internal_part.eo b/src/lib/elementary/elm_ctxpopup_part.eo similarity index 72% rename from src/lib/elementary/elm_ctxpopup_internal_part.eo rename to src/lib/elementary/elm_ctxpopup_part.eo index a1b49a7dfc..da725aa3b2 100644 --- a/src/lib/elementary/elm_ctxpopup_internal_part.eo +++ b/src/lib/elementary/elm_ctxpopup_part.eo @@ -1,4 +1,4 @@ -class Elm.Ctxpopup.Internal.Part (Efl.Ui.Layout.Internal.Part) +class Elm.Ctxpopup.Part (Efl.Ui.Layout.Part) { [[Elementary contex popup internal part class]] data: null; diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c index cef0cf1f59..e48bbb0cec 100644 --- a/src/lib/elementary/elm_dayselector.c +++ b/src/lib/elementary/elm_dayselector.c @@ -9,7 +9,7 @@ #include "elm_widget_dayselector.h" #include "elm_widget_container.h" -#include "elm_dayselector_internal_part.eo.h" +#include "elm_dayselector_part.eo.h" #include "elm_part_helper.h" #define MY_CLASS ELM_DAYSELECTOR_CLASS @@ -610,7 +610,7 @@ _elm_dayselector_class_constructor(Efl_Class *klass) ELM_PART_OVERRIDE(elm_dayselector, ELM_DAYSELECTOR, EFL_UI_LAYOUT, Elm_Dayselector_Data, Elm_Part_Data) ELM_PART_OVERRIDE_CONTENT_SET(elm_dayselector, ELM_DAYSELECTOR, EFL_UI_LAYOUT, Elm_Dayselector_Data, Elm_Part_Data) ELM_PART_OVERRIDE_CONTENT_UNSET(elm_dayselector, ELM_DAYSELECTOR, EFL_UI_LAYOUT, Elm_Dayselector_Data, Elm_Part_Data) -#include "elm_dayselector_internal_part.eo.c" +#include "elm_dayselector_part.eo.c" /* Efl.Part end */ diff --git a/src/lib/elementary/elm_dayselector_internal_part.eo b/src/lib/elementary/elm_dayselector_part.eo similarity index 71% rename from src/lib/elementary/elm_dayselector_internal_part.eo rename to src/lib/elementary/elm_dayselector_part.eo index 1b2677f655..fad25580dc 100644 --- a/src/lib/elementary/elm_dayselector_internal_part.eo +++ b/src/lib/elementary/elm_dayselector_part.eo @@ -1,4 +1,4 @@ -class Elm.Dayselector.Internal.Part (Efl.Ui.Layout.Internal.Part) +class Elm.Dayselector.Part (Efl.Ui.Layout.Part) { [[Elementary dayselector internal part class]] data: null; diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 25aa2ba7b5..7d9f461519 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -12,7 +12,7 @@ #include "elm_priv.h" #include "elm_widget_entry.h" -#include "elm_entry_internal_part.eo.h" +#include "elm_entry_part.eo.h" #include "elm_part_helper.h" #include "elm_hoversel.eo.h" @@ -6056,7 +6056,7 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, ELM_ENTRY, EFL_UI_LAYOUT, Elm_Entry_D ELM_PART_OVERRIDE_TEXT_SET(elm_entry, ELM_ENTRY, EFL_UI_LAYOUT, Elm_Entry_Data, Elm_Part_Data) ELM_PART_OVERRIDE_TEXT_GET(elm_entry, ELM_ENTRY, EFL_UI_LAYOUT, Elm_Entry_Data, Elm_Part_Data) ELM_PART_CONTENT_DEFAULT_SET(elm_entry, "icon") -#include "elm_entry_internal_part.eo.c" +#include "elm_entry_part.eo.c" /* Efl.Part end */ diff --git a/src/lib/elementary/elm_entry_internal_part.eo b/src/lib/elementary/elm_entry_part.eo similarity index 73% rename from src/lib/elementary/elm_entry_internal_part.eo rename to src/lib/elementary/elm_entry_part.eo index 14fe0fbe9e..454ba7c32c 100644 --- a/src/lib/elementary/elm_entry_internal_part.eo +++ b/src/lib/elementary/elm_entry_part.eo @@ -1,4 +1,4 @@ -class Elm.Entry.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text) +class Elm.Entry.Part (Efl.Ui.Layout.Part, Efl.Text) { [[Elementary entry internal part class]] data: null; diff --git a/src/lib/elementary/elm_fileselector_entry_internal_part.eo b/src/lib/elementary/elm_fileselector_entry_part.eo similarity index 71% rename from src/lib/elementary/elm_fileselector_entry_internal_part.eo rename to src/lib/elementary/elm_fileselector_entry_part.eo index 3adbf14480..75e301b09b 100644 --- a/src/lib/elementary/elm_fileselector_entry_internal_part.eo +++ b/src/lib/elementary/elm_fileselector_entry_part.eo @@ -1,4 +1,4 @@ -class Elm.Fileselector.Entry.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text) +class Elm.Fileselector.Entry.Part (Efl.Ui.Layout.Part, Efl.Text) { [[Elementary fileselector entry internal part class]] data: null; diff --git a/src/lib/elementary/elm_fileselector_internal_part.eo b/src/lib/elementary/elm_fileselector_part.eo similarity index 62% rename from src/lib/elementary/elm_fileselector_internal_part.eo rename to src/lib/elementary/elm_fileselector_part.eo index 91a27b0f7d..6b2dff7ed2 100644 --- a/src/lib/elementary/elm_fileselector_internal_part.eo +++ b/src/lib/elementary/elm_fileselector_part.eo @@ -1,4 +1,4 @@ -class Elm.Fileselector.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text) +class Elm.Fileselector.Part (Efl.Ui.Layout.Part, Efl.Text) { [[Elementary fileselector entry internal part class]] data: null; diff --git a/src/lib/elementary/elm_flip_internal_part.eo b/src/lib/elementary/elm_flip_part.eo similarity index 77% rename from src/lib/elementary/elm_flip_internal_part.eo rename to src/lib/elementary/elm_flip_part.eo index 8bcb6931e1..037f59c0b1 100644 --- a/src/lib/elementary/elm_flip_internal_part.eo +++ b/src/lib/elementary/elm_flip_part.eo @@ -1,4 +1,4 @@ -class Elm.Flip.Internal.Part (Efl.Object, Efl.Container) +class Elm.Flip.Part (Efl.Object, Efl.Container) { [[Elementary flip internal part class]] data: Elm_Part_Data; diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c index 47b710eaf5..0bb2f5ec1f 100644 --- a/src/lib/elementary/elm_hover.c +++ b/src/lib/elementary/elm_hover.c @@ -12,7 +12,7 @@ #include "elm_priv.h" #include "elm_widget_hover.h" -#include "elm_hover_internal_part.eo.h" +#include "elm_hover_part.eo.h" #include "elm_part_helper.h" #define MY_CLASS ELM_HOVER_CLASS @@ -896,7 +896,7 @@ ELM_PART_OVERRIDE(elm_hover, ELM_HOVER, EFL_UI_LAYOUT, Elm_Hover_Data, Elm_Part_ ELM_PART_OVERRIDE_CONTENT_SET(elm_hover, ELM_HOVER, EFL_UI_LAYOUT, Elm_Hover_Data, Elm_Part_Data) ELM_PART_OVERRIDE_CONTENT_GET(elm_hover, ELM_HOVER, EFL_UI_LAYOUT, Elm_Hover_Data, Elm_Part_Data) ELM_PART_OVERRIDE_CONTENT_UNSET(elm_hover, ELM_HOVER, EFL_UI_LAYOUT, Elm_Hover_Data, Elm_Part_Data) -#include "elm_hover_internal_part.eo.c" +#include "elm_hover_part.eo.c" /* Efl.Part end */ diff --git a/src/lib/elementary/elm_hover_internal_part.eo b/src/lib/elementary/elm_hover_part.eo similarity index 72% rename from src/lib/elementary/elm_hover_internal_part.eo rename to src/lib/elementary/elm_hover_part.eo index cd56689438..a8920fe2fd 100644 --- a/src/lib/elementary/elm_hover_internal_part.eo +++ b/src/lib/elementary/elm_hover_part.eo @@ -1,4 +1,4 @@ -class Elm.Hover.Internal.Part (Efl.Ui.Layout.Internal.Part) +class Elm.Hover.Part (Efl.Ui.Layout.Part) { [[elementary hover internal part class]] data: null; diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c index 6a451df3c7..8c619e3e99 100644 --- a/src/lib/elementary/elm_label.c +++ b/src/lib/elementary/elm_label.c @@ -10,7 +10,7 @@ #include "elm_priv.h" #include "elm_widget_layout.h" #include "elm_widget_label.h" -#include "elm_label_internal_part.eo.h" +#include "elm_label_part.eo.h" #include "elm_part_helper.h" #define MY_CLASS ELM_LABEL_CLASS @@ -637,7 +637,7 @@ _elm_label_class_constructor(Efl_Class *klass) ELM_PART_OVERRIDE(elm_label, ELM_LABEL, EFL_UI_LAYOUT, Elm_Label_Data, Elm_Part_Data) ELM_PART_OVERRIDE_TEXT_SET(elm_label, ELM_LABEL, EFL_UI_LAYOUT, Elm_Label_Data, Elm_Part_Data) -#include "elm_label_internal_part.eo.c" +#include "elm_label_part.eo.c" /* Efl.Part end */ /* Internal EO APIs and hidden overrides */ diff --git a/src/lib/elementary/elm_label_internal_part.eo b/src/lib/elementary/elm_label_part.eo similarity index 61% rename from src/lib/elementary/elm_label_internal_part.eo rename to src/lib/elementary/elm_label_part.eo index ff3731085a..36b0e03fe7 100644 --- a/src/lib/elementary/elm_label_internal_part.eo +++ b/src/lib/elementary/elm_label_part.eo @@ -1,4 +1,4 @@ -class Elm_Label.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text) +class Elm_Label.Part (Efl.Ui.Layout.Part, Efl.Text) { [[Elementary button internal part class]] data: null; diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c index f3f9302f19..8ae1058e6b 100644 --- a/src/lib/elementary/elm_mapbuf.c +++ b/src/lib/elementary/elm_mapbuf.c @@ -11,7 +11,7 @@ #include "elm_widget_container.h" #include "elm_mapbuf.eo.h" -#include "elm_mapbuf_internal_part.eo.h" +#include "elm_mapbuf_part.eo.h" #include "elm_part_helper.h" #define MY_CLASS ELM_MAPBUF_CLASS @@ -445,7 +445,7 @@ ELM_PART_IMPLEMENT_CONTENT_SET(elm_mapbuf, ELM_MAPBUF, Elm_Mapbuf_Data, Elm_Part ELM_PART_IMPLEMENT_CONTENT_GET(elm_mapbuf, ELM_MAPBUF, Elm_Mapbuf_Data, Elm_Part_Data) ELM_PART_IMPLEMENT_CONTENT_UNSET(elm_mapbuf, ELM_MAPBUF, Elm_Mapbuf_Data, Elm_Part_Data) ELM_PART_CONTENT_DEFAULT_SET(elm_mapbuf, "default") -#include "elm_mapbuf_internal_part.eo.c" +#include "elm_mapbuf_part.eo.c" /* Efl.Part end */ diff --git a/src/lib/elementary/elm_mapbuf_internal_part.eo b/src/lib/elementary/elm_mapbuf_part.eo similarity index 77% rename from src/lib/elementary/elm_mapbuf_internal_part.eo rename to src/lib/elementary/elm_mapbuf_part.eo index 6832f198e1..d9b411994a 100644 --- a/src/lib/elementary/elm_mapbuf_internal_part.eo +++ b/src/lib/elementary/elm_mapbuf_part.eo @@ -1,4 +1,4 @@ -class Elm.Mapbuf.Internal.Part (Efl.Object, Efl.Container) +class Elm.Mapbuf.Part (Efl.Object, Efl.Container) { [[Elementary mapbuf internal part class]] data: Elm_Part_Data; diff --git a/src/lib/elementary/elm_multibuttonentry_internal_part.eo b/src/lib/elementary/elm_multibuttonentry_part.eo similarity index 61% rename from src/lib/elementary/elm_multibuttonentry_internal_part.eo rename to src/lib/elementary/elm_multibuttonentry_part.eo index 44f1abe1af..737915fcb2 100644 --- a/src/lib/elementary/elm_multibuttonentry_internal_part.eo +++ b/src/lib/elementary/elm_multibuttonentry_part.eo @@ -1,4 +1,4 @@ -class Elm.Multibuttonentry.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text) +class Elm.Multibuttonentry.Part (Efl.Ui.Layout.Part, Efl.Text) { [[Elementary multibuttonentry internal part class]] data: null; diff --git a/src/lib/elementary/elm_naviframe_internal_part.eo b/src/lib/elementary/elm_naviframe_part.eo similarity index 75% rename from src/lib/elementary/elm_naviframe_internal_part.eo rename to src/lib/elementary/elm_naviframe_part.eo index 5e951404c5..de62c47d1f 100644 --- a/src/lib/elementary/elm_naviframe_internal_part.eo +++ b/src/lib/elementary/elm_naviframe_part.eo @@ -1,4 +1,4 @@ -class Elm.Naviframe.Internal.Part (Efl.Ui.Layout.Internal.Part) +class Elm.Naviframe.Part (Efl.Ui.Layout.Part) { [[Elementary naviframe internal part class]] data: null; diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c index f381018b47..89f621c8c2 100644 --- a/src/lib/elementary/elm_notify.c +++ b/src/lib/elementary/elm_notify.c @@ -11,7 +11,7 @@ #include "elm_widget_notify.h" #include "elm_widget_container.h" -#include "elm_notify_internal_part.eo.h" +#include "elm_notify_part.eo.h" #include "elm_part_helper.h" #define MY_CLASS ELM_NOTIFY_CLASS @@ -747,7 +747,7 @@ ELM_PART_IMPLEMENT_CONTENT_SET(elm_notify, ELM_NOTIFY, Elm_Notify_Data, Elm_Part ELM_PART_IMPLEMENT_CONTENT_GET(elm_notify, ELM_NOTIFY, Elm_Notify_Data, Elm_Part_Data) ELM_PART_IMPLEMENT_CONTENT_UNSET(elm_notify, ELM_NOTIFY, Elm_Notify_Data, Elm_Part_Data) ELM_PART_CONTENT_DEFAULT_SET(elm_notify, "default") -#include "elm_notify_internal_part.eo.c" +#include "elm_notify_part.eo.c" /* Efl.Part end */ diff --git a/src/lib/elementary/elm_notify_internal_part.eo b/src/lib/elementary/elm_notify_part.eo similarity index 77% rename from src/lib/elementary/elm_notify_internal_part.eo rename to src/lib/elementary/elm_notify_part.eo index 7970cd9642..17662e3e9f 100644 --- a/src/lib/elementary/elm_notify_internal_part.eo +++ b/src/lib/elementary/elm_notify_part.eo @@ -1,4 +1,4 @@ -class Elm.Notify.Internal.Part (Efl.Object, Efl.Container, Efl.Text) +class Elm.Notify.Part (Efl.Object, Efl.Container, Efl.Text) { [[Elementary notification internel part class]] data: Elm_Part_Data; diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index 9b2147dc4f..011fe9adb4 100644 --- a/src/lib/elementary/elm_panel.c +++ b/src/lib/elementary/elm_panel.c @@ -12,7 +12,7 @@ #include "els_box.h" -#include "elm_panel_internal_part.eo.h" +#include "elm_panel_part.eo.h" #include "elm_part_helper.h" #define MY_CLASS ELM_PANEL_CLASS @@ -1484,7 +1484,7 @@ ELM_PART_IMPLEMENT(elm_panel, ELM_PANEL, Elm_Panel_Data, Elm_Part_Data) ELM_PART_IMPLEMENT_CONTENT_SET(elm_panel, ELM_PANEL, Elm_Panel_Data, Elm_Part_Data) ELM_PART_IMPLEMENT_CONTENT_GET(elm_panel, ELM_PANEL, Elm_Panel_Data, Elm_Part_Data) ELM_PART_IMPLEMENT_CONTENT_UNSET(elm_panel, ELM_PANEL, Elm_Panel_Data, Elm_Part_Data) -#include "elm_panel_internal_part.eo.c" +#include "elm_panel_part.eo.c" /* Efl.Part end */ diff --git a/src/lib/elementary/elm_panel_internal_part.eo b/src/lib/elementary/elm_panel_part.eo similarity index 77% rename from src/lib/elementary/elm_panel_internal_part.eo rename to src/lib/elementary/elm_panel_part.eo index f6118da8e9..45f6a07a28 100644 --- a/src/lib/elementary/elm_panel_internal_part.eo +++ b/src/lib/elementary/elm_panel_part.eo @@ -1,4 +1,4 @@ -class Elm.Panel.Internal.Part (Efl.Object, Efl.Container) +class Elm.Panel.Part (Efl.Object, Efl.Container) { [[Elementary panel internal part class]] data: Elm_Part_Data; diff --git a/src/lib/elementary/elm_panes.h b/src/lib/elementary/elm_panes.h index 02d0c03da4..10eaf35e4e 100644 --- a/src/lib/elementary/elm_panes.h +++ b/src/lib/elementary/elm_panes.h @@ -56,7 +56,7 @@ #ifdef EFL_EO_API_SUPPORT #include "efl_ui_panes_eo.h" -#include "efl_ui_panes_internal_part.eo.h" +#include "efl_ui_panes_part.eo.h" #endif #ifndef EFL_NOLEGACY_API_SUPPORT #include "elm_panes_legacy.h" diff --git a/src/lib/elementary/elm_part_helper.h b/src/lib/elementary/elm_part_helper.h index 040ab987c5..56b352e558 100644 --- a/src/lib/elementary/elm_part_helper.h +++ b/src/lib/elementary/elm_part_helper.h @@ -1,7 +1,7 @@ #ifndef _ELM_PART_HELPER_H #define _ELM_PART_HELPER_H -#include "efl_ui_layout_internal_part.eo.h" +#include "efl_ui_layout_part.eo.h" //#define ELM_PART_HOOK do { ERR("%p:%s [%d]", pd->obj, pd->part, (int) pd->temp); } while(0) #define ELM_PART_HOOK do {} while(0) @@ -26,12 +26,12 @@ struct _Elm_Part_Data #define ELM_PART_IMPLEMENT_DESTRUCTOR(type, TYPE, typedata, partdata) \ static EOLIAN void \ -_ ## type ## _internal_part_efl_object_destructor(Eo *obj, partdata *pd) \ +_ ## type ## _part_efl_object_destructor(Eo *obj, partdata *pd) \ { \ ELM_PART_HOOK; \ free(pd->part); \ efl_data_xunref(pd->obj, pd->sd, obj); \ - efl_destructor(efl_super(obj, TYPE ## _INTERNAL_PART_CLASS)); \ + efl_destructor(efl_super(obj, TYPE ## _PART_CLASS)); \ } \ // Main part proxy implementation @@ -44,8 +44,8 @@ _ ## type ## _efl_part_part(const Eo *obj, typedata *priv EINA_UNUSED, const cha Eo *proxy; \ \ EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL); \ - proxy = efl_add(TYPE ## _INTERNAL_PART_CLASS, (Eo *) obj); \ - pd = efl_data_scope_get(proxy, TYPE ## _INTERNAL_PART_CLASS); \ + proxy = efl_add(TYPE ## _PART_CLASS, (Eo *) obj); \ + pd = efl_data_scope_get(proxy, TYPE ## _PART_CLASS); \ if (pd) \ { \ pd->obj = (Eo *) obj; \ @@ -59,35 +59,35 @@ _ ## type ## _efl_part_part(const Eo *obj, typedata *priv EINA_UNUSED, const cha #define ELM_PART_IMPLEMENT_CONTENT_SET(type, TYPE, typedata, partdata) \ static EOLIAN Eina_Bool \ -_ ## type ## _internal_part_efl_container_content_set(Eo *obj, partdata *pd, Efl_Gfx *content) \ +_ ## type ## _part_efl_container_content_set(Eo *obj, partdata *pd, Efl_Gfx *content) \ { \ ELM_PART_RETURN_VAL(_ ## type ## _content_set(pd->obj, pd->sd, pd->part, content)); \ } #define ELM_PART_IMPLEMENT_CONTENT_GET(type, TYPE, typedata, partdata) \ static EOLIAN Efl_Gfx * \ -_ ## type ## _internal_part_efl_container_content_get(Eo *obj, partdata *pd) \ +_ ## type ## _part_efl_container_content_get(Eo *obj, partdata *pd) \ { \ ELM_PART_RETURN_VAL(_ ## type ## _content_get(pd->obj, pd->sd, pd->part)); \ } #define ELM_PART_IMPLEMENT_CONTENT_UNSET(type, TYPE, typedata, partdata) \ static EOLIAN Efl_Gfx * \ -_ ## type ## _internal_part_efl_container_content_unset(Eo *obj, partdata *pd) \ +_ ## type ## _part_efl_container_content_unset(Eo *obj, partdata *pd) \ { \ ELM_PART_RETURN_VAL(_ ## type ## _content_unset(pd->obj, pd->sd, pd->part)); \ } #define ELM_PART_IMPLEMENT_TEXT_SET(type, TYPE, typedata, partdata) \ static EOLIAN void \ -_ ## type ## _internal_part_efl_text_text_set(Eo *obj EINA_UNUSED, partdata *pd, const char *text) \ +_ ## type ## _part_efl_text_text_set(Eo *obj EINA_UNUSED, partdata *pd, const char *text) \ { \ _ ## type ## _text_set(pd->obj, pd->sd, pd->part, text); \ } #define ELM_PART_IMPLEMENT_TEXT_GET(type, TYPE, typedata, partdata) \ static EOLIAN const char * \ -_ ## type ## _internal_part_efl_text_text_get(Eo *obj, partdata *pd) \ +_ ## type ## _part_efl_text_text_get(Eo *obj, partdata *pd) \ { \ ELM_PART_RETURN_VAL(_ ## type ## _text_get(pd->obj, pd->sd, pd->part)); \ } @@ -113,8 +113,8 @@ _ ## type ## _efl_part_part(const Eo *obj, typedata *priv EINA_UNUSED, const cha Eo *proxy; \ \ EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL); \ - proxy = efl_add(TYPE ## _INTERNAL_PART_CLASS, (Eo *) obj); \ - pd = efl_data_scope_get(proxy, SUPER ## _INTERNAL_PART_CLASS); \ + proxy = efl_add(TYPE ## _PART_CLASS, (Eo *) obj); \ + pd = efl_data_scope_get(proxy, SUPER ## _PART_CLASS); \ if (pd) \ { \ pd->obj = (Eo *) obj; \ @@ -128,45 +128,45 @@ _ ## type ## _efl_part_part(const Eo *obj, typedata *priv EINA_UNUSED, const cha #define ELM_PART_OVERRIDE_CONTENT_SET(type, TYPE, SUPER, typedata, partdata) \ static EOLIAN Eina_Bool \ -_ ## type ## _internal_part_efl_container_content_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *content) \ +_ ## type ## _part_efl_container_content_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *content) \ { \ - partdata *pd = efl_data_scope_get(obj, SUPER ## _INTERNAL_PART_CLASS); \ + partdata *pd = efl_data_scope_get(obj, SUPER ## _PART_CLASS); \ typedata *sd = efl_data_scope_get(pd->obj, TYPE ## _CLASS); \ ELM_PART_RETURN_VAL(_ ## type ## _content_set(pd->obj, sd, pd->part, content)); \ } #define ELM_PART_OVERRIDE_CONTENT_GET(type, TYPE, SUPER, typedata, partdata) \ static EOLIAN Efl_Gfx * \ -_ ## type ## _internal_part_efl_container_content_get(Eo *obj, void *_pd EINA_UNUSED) \ +_ ## type ## _part_efl_container_content_get(Eo *obj, void *_pd EINA_UNUSED) \ { \ - partdata *pd = efl_data_scope_get(obj, SUPER ## _INTERNAL_PART_CLASS); \ + partdata *pd = efl_data_scope_get(obj, SUPER ## _PART_CLASS); \ typedata *sd = efl_data_scope_get(pd->obj, TYPE ## _CLASS); \ ELM_PART_RETURN_VAL(_ ## type ## _content_get(pd->obj, sd, pd->part)); \ } #define ELM_PART_OVERRIDE_CONTENT_UNSET(type, TYPE, SUPER, typedata, partdata) \ static EOLIAN Efl_Gfx * \ -_ ## type ## _internal_part_efl_container_content_unset(Eo *obj, void *_pd EINA_UNUSED) \ +_ ## type ## _part_efl_container_content_unset(Eo *obj, void *_pd EINA_UNUSED) \ { \ - partdata *pd = efl_data_scope_get(obj, SUPER ## _INTERNAL_PART_CLASS); \ + partdata *pd = efl_data_scope_get(obj, SUPER ## _PART_CLASS); \ typedata *sd = efl_data_scope_get(pd->obj, TYPE ## _CLASS); \ ELM_PART_RETURN_VAL(_ ## type ## _content_unset(pd->obj, sd, pd->part)); \ } #define ELM_PART_OVERRIDE_TEXT_SET(type, TYPE, SUPER, typedata, partdata) \ static EOLIAN void \ -_ ## type ## _internal_part_efl_text_text_set(Eo *obj, void *_pd EINA_UNUSED, const char *text) \ +_ ## type ## _part_efl_text_text_set(Eo *obj, void *_pd EINA_UNUSED, const char *text) \ { \ - partdata *pd = efl_data_scope_get(obj, SUPER ## _INTERNAL_PART_CLASS); \ + partdata *pd = efl_data_scope_get(obj, SUPER ## _PART_CLASS); \ typedata *sd = efl_data_scope_get(pd->obj, TYPE ## _CLASS); \ ELM_PART_CALL(_ ## type ## _text_set(pd->obj, sd, pd->part, text)); \ } #define ELM_PART_OVERRIDE_TEXT_GET(type, TYPE, SUPER, typedata, partdata) \ static EOLIAN const char *\ -_ ## type ## _internal_part_efl_text_text_get(Eo *obj, void *_pd EINA_UNUSED) \ +_ ## type ## _part_efl_text_text_get(Eo *obj, void *_pd EINA_UNUSED) \ { \ - partdata *pd = efl_data_scope_get(obj, SUPER ## _INTERNAL_PART_CLASS); \ + partdata *pd = efl_data_scope_get(obj, SUPER ## _PART_CLASS); \ typedata *sd = efl_data_scope_get(pd->obj, TYPE ## _CLASS); \ ELM_PART_RETURN_VAL(_ ## type ## _text_get(pd->obj, sd, pd->part)); \ } diff --git a/src/lib/elementary/elm_player_internal_part.eo b/src/lib/elementary/elm_player_part.eo similarity index 66% rename from src/lib/elementary/elm_player_internal_part.eo rename to src/lib/elementary/elm_player_part.eo index 655bf9c086..bfa1eaf891 100644 --- a/src/lib/elementary/elm_player_internal_part.eo +++ b/src/lib/elementary/elm_player_part.eo @@ -1,4 +1,4 @@ -class Elm.Player.Internal.Part (Efl.Ui.Layout.Internal.Part) +class Elm.Player.Part (Efl.Ui.Layout.Part) { [[Elementary player internal part class]] data: null; diff --git a/src/lib/elementary/elm_popup_internal_part.eo b/src/lib/elementary/elm_popup_part.eo similarity index 73% rename from src/lib/elementary/elm_popup_internal_part.eo rename to src/lib/elementary/elm_popup_part.eo index 29ca9e84be..ff7ef972ec 100644 --- a/src/lib/elementary/elm_popup_internal_part.eo +++ b/src/lib/elementary/elm_popup_part.eo @@ -1,4 +1,4 @@ -class Elm.Popup.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text) +class Elm.Popup.Part (Efl.Ui.Layout.Part, Efl.Text) { [[Elementary popup internal part class]] data: null; diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index 2c06b1aefa..40983e7066 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -12,7 +12,7 @@ #include "elm_widget_layout.h" #include "elm_widget_scroller.h" -#include "elm_scroller_internal_part.eo.h" +#include "elm_scroller_part.eo.h" #include "elm_part_helper.h" #define MY_CLASS ELM_SCROLLER_CLASS @@ -1483,7 +1483,7 @@ ELM_PART_OVERRIDE_CONTENT_GET(elm_scroller, ELM_SCROLLER, EFL_UI_LAYOUT, Elm_Scr ELM_PART_OVERRIDE_CONTENT_UNSET(elm_scroller, ELM_SCROLLER, EFL_UI_LAYOUT, Elm_Scroller_Data, Elm_Part_Data) // FIXME: should be "content" but "default" was legacy API ELM_PART_CONTENT_DEFAULT_SET(elm_scroller, "default") -#include "elm_scroller_internal_part.eo.c" +#include "elm_scroller_part.eo.c" /* Efl.Part end */ diff --git a/src/lib/elementary/elm_scroller_internal_part.eo b/src/lib/elementary/elm_scroller_part.eo similarity index 72% rename from src/lib/elementary/elm_scroller_internal_part.eo rename to src/lib/elementary/elm_scroller_part.eo index 0410363f3f..1f17665007 100644 --- a/src/lib/elementary/elm_scroller_internal_part.eo +++ b/src/lib/elementary/elm_scroller_part.eo @@ -1,4 +1,4 @@ -class Elm.Scroller.Internal.Part (Efl.Ui.Layout.Internal.Part) +class Elm.Scroller.Part (Efl.Ui.Layout.Part) { [[Elementary scroller internal part class]] data: null;