summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-13 13:29:25 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-13 13:53:49 +0900
commitd5a31f3f307cb59f92bb24b42def504b3cb5e052 (patch)
tree38c21c157b406f7ce984df69205d56df4f9914de
parent8da23c4247bc29b5297157ed4064ab7b76100fb6 (diff)
edje/elm: Rename _internal_ to _part_ (EO)
In Edje and Elementary, we have part objects, which are what is returned by the interface efl_part(). Those objects can't be of an opaque type as this doesn't work nicely with strongly typed languages such as C++ or C#. In JS, Lua, C the types are weak and mostly runtime-based so it doesn't matter much. As a consequence, the documentation and the types need to look nice in this EO API. Thus, we remove the abusive term "internal" and explicitly call all those classes "part" something. Eventually we want the types to be declared in the EO file so bindings (C#, C++, ...) can generate the proper access methods, returning the best possible types. Note that right now a few of those part types are used in the legacy API but don't actually need to be exposed externally. This is kind of a mega commit that does all the renaming at once, but it's really just a big sed operation. The power of good IDEs :) Ref T5315 Ref T5306
-rw-r--r--src/Makefile_Edje.am10
-rw-r--r--src/Makefile_Elementary.am60
-rw-r--r--src/bin/elementary/test_panes.c2
-rw-r--r--src/lib/edje/Edje_Eo.h10
-rw-r--r--src/lib/edje/edje_legacy.c2
-rw-r--r--src/lib/edje/edje_part.c44
-rw-r--r--src/lib/edje/edje_part_box.c38
-rw-r--r--src/lib/edje/edje_part_helper.h22
-rw-r--r--src/lib/edje/edje_part_swallow.c12
-rw-r--r--src/lib/edje/edje_part_table.c34
-rw-r--r--src/lib/edje/edje_part_text.c40
-rw-r--r--src/lib/edje/efl_canvas_layout_external.eo2
-rw-r--r--src/lib/edje/efl_canvas_layout_part.eo (renamed from src/lib/edje/efl_canvas_layout_internal.eo)2
-rw-r--r--src/lib/edje/efl_canvas_layout_part_box.eo (renamed from src/lib/edje/efl_canvas_layout_internal_box.eo)2
-rw-r--r--src/lib/edje/efl_canvas_layout_part_swallow.eo (renamed from src/lib/edje/efl_canvas_layout_internal_swallow.eo)2
-rw-r--r--src/lib/edje/efl_canvas_layout_part_table.eo (renamed from src/lib/edje/efl_canvas_layout_internal_table.eo)2
-rw-r--r--src/lib/edje/efl_canvas_layout_part_text.eo (renamed from src/lib/edje/efl_canvas_layout_internal_text.eo)2
-rw-r--r--src/lib/elementary/efl_ui_button.c4
-rw-r--r--src/lib/elementary/efl_ui_button_part.eo (renamed from src/lib/elementary/efl_ui_button_internal_part.eo)2
-rw-r--r--src/lib/elementary/efl_ui_flip.c4
-rw-r--r--src/lib/elementary/efl_ui_flip_part.eo (renamed from src/lib/elementary/efl_ui_flip_internal_part.eo)2
-rw-r--r--src/lib/elementary/efl_ui_layout.c20
-rw-r--r--src/lib/elementary/efl_ui_layout_pack.c90
-rw-r--r--src/lib/elementary/efl_ui_layout_part.eo (renamed from src/lib/elementary/efl_ui_layout_internal_part.eo)3
-rw-r--r--src/lib/elementary/efl_ui_layout_part_box.eo (renamed from src/lib/elementary/efl_ui_layout_internal_box.eo)2
-rw-r--r--src/lib/elementary/efl_ui_layout_part_table.eo (renamed from src/lib/elementary/efl_ui_layout_internal_table.eo)2
-rw-r--r--src/lib/elementary/efl_ui_panes.c20
-rw-r--r--src/lib/elementary/efl_ui_panes_part.eo (renamed from src/lib/elementary/efl_ui_panes_internal_part.eo)2
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c16
-rw-r--r--src/lib/elementary/efl_ui_progressbar_part.eo (renamed from src/lib/elementary/efl_ui_progressbar_internal_part.eo)2
-rw-r--r--src/lib/elementary/efl_ui_slider.c16
-rw-r--r--src/lib/elementary/efl_ui_slider_part.eo (renamed from src/lib/elementary/efl_ui_slider_internal_part.eo)2
-rw-r--r--src/lib/elementary/efl_ui_text.c4
-rw-r--r--src/lib/elementary/efl_ui_textpath.c4
-rw-r--r--src/lib/elementary/efl_ui_textpath_part.eo (renamed from src/lib/elementary/efl_ui_textpath_internal_part.eo)2
-rw-r--r--src/lib/elementary/efl_ui_win.c12
-rw-r--r--src/lib/elementary/efl_ui_win_part.eo (renamed from src/lib/elementary/efl_ui_win_internal_part.eo)2
-rw-r--r--src/lib/elementary/elc_ctxpopup.c4
-rw-r--r--src/lib/elementary/elc_fileselector.c4
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c4
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c4
-rw-r--r--src/lib/elementary/elc_naviframe.c4
-rw-r--r--src/lib/elementary/elc_player.c4
-rw-r--r--src/lib/elementary/elc_popup.c4
-rw-r--r--src/lib/elementary/elm_actionslider.c4
-rw-r--r--src/lib/elementary/elm_actionslider_part.eo (renamed from src/lib/elementary/elm_actionslider_internal_part.eo)2
-rw-r--r--src/lib/elementary/elm_bubble.c4
-rw-r--r--src/lib/elementary/elm_bubble_part.eo (renamed from src/lib/elementary/elm_bubble_internal_part.eo)2
-rw-r--r--src/lib/elementary/elm_ctxpopup_part.eo (renamed from src/lib/elementary/elm_ctxpopup_internal_part.eo)2
-rw-r--r--src/lib/elementary/elm_dayselector.c4
-rw-r--r--src/lib/elementary/elm_dayselector_part.eo (renamed from src/lib/elementary/elm_dayselector_internal_part.eo)2
-rw-r--r--src/lib/elementary/elm_entry.c4
-rw-r--r--src/lib/elementary/elm_entry_part.eo (renamed from src/lib/elementary/elm_entry_internal_part.eo)2
-rw-r--r--src/lib/elementary/elm_fileselector_entry_part.eo (renamed from src/lib/elementary/elm_fileselector_entry_internal_part.eo)2
-rw-r--r--src/lib/elementary/elm_fileselector_part.eo (renamed from src/lib/elementary/elm_fileselector_internal_part.eo)2
-rw-r--r--src/lib/elementary/elm_flip_part.eo (renamed from src/lib/elementary/elm_flip_internal_part.eo)2
-rw-r--r--src/lib/elementary/elm_hover.c4
-rw-r--r--src/lib/elementary/elm_hover_part.eo (renamed from src/lib/elementary/elm_hover_internal_part.eo)2
-rw-r--r--src/lib/elementary/elm_label.c4
-rw-r--r--src/lib/elementary/elm_label_part.eo (renamed from src/lib/elementary/elm_label_internal_part.eo)2
-rw-r--r--src/lib/elementary/elm_mapbuf.c4
-rw-r--r--src/lib/elementary/elm_mapbuf_part.eo (renamed from src/lib/elementary/elm_mapbuf_internal_part.eo)2
-rw-r--r--src/lib/elementary/elm_multibuttonentry_part.eo (renamed from src/lib/elementary/elm_multibuttonentry_internal_part.eo)2
-rw-r--r--src/lib/elementary/elm_naviframe_part.eo (renamed from src/lib/elementary/elm_naviframe_internal_part.eo)2
-rw-r--r--src/lib/elementary/elm_notify.c4
-rw-r--r--src/lib/elementary/elm_notify_part.eo (renamed from src/lib/elementary/elm_notify_internal_part.eo)2
-rw-r--r--src/lib/elementary/elm_panel.c4
-rw-r--r--src/lib/elementary/elm_panel_part.eo (renamed from src/lib/elementary/elm_panel_internal_part.eo)2
-rw-r--r--src/lib/elementary/elm_panes.h2
-rw-r--r--src/lib/elementary/elm_part_helper.h44
-rw-r--r--src/lib/elementary/elm_player_part.eo (renamed from src/lib/elementary/elm_player_internal_part.eo)2
-rw-r--r--src/lib/elementary/elm_popup_part.eo (renamed from src/lib/elementary/elm_popup_internal_part.eo)2
-rw-r--r--src/lib/elementary/elm_scroller.c4
-rw-r--r--src/lib/elementary/elm_scroller_part.eo (renamed from src/lib/elementary/elm_scroller_internal_part.eo)2
74 files changed, 323 insertions, 324 deletions
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index c1fb523..0148da5 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -6,12 +6,12 @@ edje_eolian_files = \
6 lib/edje/efl_canvas_layout_signal.eo \ 6 lib/edje/efl_canvas_layout_signal.eo \
7 lib/edje/efl_canvas_layout_group.eo \ 7 lib/edje/efl_canvas_layout_group.eo \
8 lib/edje/edje_object.eo \ 8 lib/edje/edje_object.eo \
9 lib/edje/efl_canvas_layout_internal.eo \ 9 lib/edje/efl_canvas_layout_part.eo \
10 lib/edje/efl_canvas_layout_internal_box.eo \ 10 lib/edje/efl_canvas_layout_part_box.eo \
11 lib/edje/efl_canvas_layout_internal_table.eo \ 11 lib/edje/efl_canvas_layout_part_table.eo \
12 lib/edje/efl_canvas_layout_internal_swallow.eo \ 12 lib/edje/efl_canvas_layout_part_swallow.eo \
13 lib/edje/efl_canvas_layout_external.eo \ 13 lib/edje/efl_canvas_layout_external.eo \
14 lib/edje/efl_canvas_layout_internal_text.eo \ 14 lib/edje/efl_canvas_layout_part_text.eo \
15 lib/edje/edje_edit.eo 15 lib/edje/edje_edit.eo
16 16
17edje_eolian_type_files = \ 17edje_eolian_type_files = \
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 08596b8..d192a13 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -17,7 +17,7 @@ elm_public_eolian_files = \
17 lib/elementary/elm_entry.eo \ 17 lib/elementary/elm_entry.eo \
18 lib/elementary/elm_fileselector.eo \ 18 lib/elementary/elm_fileselector.eo \
19 lib/elementary/efl_ui_flip.eo \ 19 lib/elementary/efl_ui_flip.eo \
20 lib/elementary/efl_ui_flip_internal_part.eo \ 20 lib/elementary/efl_ui_flip_part.eo \
21 lib/elementary/efl_ui_frame.eo \ 21 lib/elementary/efl_ui_frame.eo \
22 lib/elementary/elm_gengrid.eo \ 22 lib/elementary/elm_gengrid.eo \
23 lib/elementary/elm_gengrid_pan.eo \ 23 lib/elementary/elm_gengrid_pan.eo \
@@ -62,7 +62,7 @@ elm_public_eolian_files = \
62 lib/elementary/elm_route.eo \ 62 lib/elementary/elm_route.eo \
63 lib/elementary/elm_scroller.eo \ 63 lib/elementary/elm_scroller.eo \
64 lib/elementary/efl_ui_slider.eo \ 64 lib/elementary/efl_ui_slider.eo \
65 lib/elementary/efl_ui_slider_interval.eo \ 65 lib/elementary/efl_ui_slider_interval.eo \
66 lib/elementary/elm_spinner.eo \ 66 lib/elementary/elm_spinner.eo \
67 lib/elementary/elm_sys_notify_interface.eo \ 67 lib/elementary/elm_sys_notify_interface.eo \
68 lib/elementary/elm_sys_notify.eo \ 68 lib/elementary/elm_sys_notify.eo \
@@ -95,31 +95,31 @@ elm_public_eolian_files = \
95 lib/elementary/efl_ui_box_stack.eo \ 95 lib/elementary/efl_ui_box_stack.eo \
96 lib/elementary/efl_ui_grid.eo \ 96 lib/elementary/efl_ui_grid.eo \
97 lib/elementary/efl_ui_grid_static.eo \ 97 lib/elementary/efl_ui_grid_static.eo \
98 lib/elementary/efl_ui_layout_internal_part.eo \ 98 lib/elementary/efl_ui_layout_part.eo \
99 lib/elementary/efl_ui_layout_internal_box.eo \ 99 lib/elementary/efl_ui_layout_part_box.eo \
100 lib/elementary/efl_ui_layout_internal_table.eo \ 100 lib/elementary/efl_ui_layout_part_table.eo \
101 lib/elementary/efl_ui_button_internal_part.eo \ 101 lib/elementary/efl_ui_button_part.eo \
102 lib/elementary/elm_ctxpopup_internal_part.eo \ 102 lib/elementary/elm_ctxpopup_part.eo \
103 lib/elementary/efl_ui_panes_internal_part.eo \ 103 lib/elementary/efl_ui_panes_part.eo \
104 lib/elementary/elm_dayselector_internal_part.eo \ 104 lib/elementary/elm_dayselector_part.eo \
105 lib/elementary/elm_entry_internal_part.eo \ 105 lib/elementary/elm_entry_part.eo \
106 lib/elementary/elm_fileselector_entry_internal_part.eo \ 106 lib/elementary/elm_fileselector_entry_part.eo \
107 lib/elementary/elm_flip_internal_part.eo \ 107 lib/elementary/elm_flip_part.eo \
108 lib/elementary/elm_hover_internal_part.eo \ 108 lib/elementary/elm_hover_part.eo \
109 lib/elementary/elm_mapbuf_internal_part.eo \ 109 lib/elementary/elm_mapbuf_part.eo \
110 lib/elementary/elm_naviframe_internal_part.eo \ 110 lib/elementary/elm_naviframe_part.eo \
111 lib/elementary/elm_notify_internal_part.eo \ 111 lib/elementary/elm_notify_part.eo \
112 lib/elementary/elm_panel_internal_part.eo \ 112 lib/elementary/elm_panel_part.eo \
113 lib/elementary/elm_player_internal_part.eo \ 113 lib/elementary/elm_player_part.eo \
114 lib/elementary/efl_ui_progressbar_internal_part.eo \ 114 lib/elementary/efl_ui_progressbar_part.eo \
115 lib/elementary/elm_popup_internal_part.eo \ 115 lib/elementary/elm_popup_part.eo \
116 lib/elementary/elm_scroller_internal_part.eo \ 116 lib/elementary/elm_scroller_part.eo \
117 lib/elementary/efl_ui_slider_internal_part.eo \ 117 lib/elementary/efl_ui_slider_part.eo \
118 lib/elementary/elm_label_internal_part.eo \ 118 lib/elementary/elm_label_part.eo \
119 lib/elementary/elm_actionslider_internal_part.eo \ 119 lib/elementary/elm_actionslider_part.eo \
120 lib/elementary/elm_bubble_internal_part.eo \ 120 lib/elementary/elm_bubble_part.eo \
121 lib/elementary/elm_fileselector_internal_part.eo \ 121 lib/elementary/elm_fileselector_part.eo \
122 lib/elementary/elm_multibuttonentry_internal_part.eo \ 122 lib/elementary/elm_multibuttonentry_part.eo \
123 lib/elementary/elm_code_widget.eo \ 123 lib/elementary/elm_code_widget.eo \
124 lib/elementary/efl_ui_text_interactive.eo \ 124 lib/elementary/efl_ui_text_interactive.eo \
125 lib/elementary/efl_ui_text.eo \ 125 lib/elementary/efl_ui_text.eo \
@@ -129,19 +129,19 @@ elm_public_eolian_files = \
129 lib/elementary/efl_ui_cursor.eo \ 129 lib/elementary/efl_ui_cursor.eo \
130 lib/elementary/efl_ui_image_factory.eo \ 130 lib/elementary/efl_ui_image_factory.eo \
131 lib/elementary/efl_ui_focus_manager.eo \ 131 lib/elementary/efl_ui_focus_manager.eo \
132 lib/elementary/efl_ui_focus_manager_calc.eo \ 132 lib/elementary/efl_ui_focus_manager_calc.eo \
133 lib/elementary/efl_ui_focus_manager_sub.eo \ 133 lib/elementary/efl_ui_focus_manager_sub.eo \
134 lib/elementary/efl_ui_focus_manager_root_focus.eo \ 134 lib/elementary/efl_ui_focus_manager_root_focus.eo \
135 lib/elementary/efl_ui_focus_object.eo \ 135 lib/elementary/efl_ui_focus_object.eo \
136 lib/elementary/efl_ui_focus_user.eo \ 136 lib/elementary/efl_ui_focus_user.eo \
137 lib/elementary/efl_ui_textpath.eo \ 137 lib/elementary/efl_ui_textpath.eo \
138 lib/elementary/efl_ui_textpath_internal_part.eo \ 138 lib/elementary/efl_ui_textpath_part.eo \
139 $(NULL) 139 $(NULL)
140 140
141# Private classes (not exposed or shipped) 141# Private classes (not exposed or shipped)
142elm_private_eolian_files = \ 142elm_private_eolian_files = \
143 lib/elementary/efl_ui_internal_text_interactive.eo \ 143 lib/elementary/efl_ui_internal_text_interactive.eo \
144 lib/elementary/efl_ui_win_internal_part.eo \ 144 lib/elementary/efl_ui_win_part.eo \
145 tests/elementary/focus_test.eo \ 145 tests/elementary/focus_test.eo \
146 tests/elementary/focus_test_sub_main.eo \ 146 tests/elementary/focus_test_sub_main.eo \
147 $(NULL) 147 $(NULL)
diff --git a/src/bin/elementary/test_panes.c b/src/bin/elementary/test_panes.c
index a7849d8..fe38bd6 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
135 efl_gfx_size_hint_min_set(efl_added, 10, 0), 135 efl_gfx_size_hint_min_set(efl_added, 10, 0),
136 efl_content_set(efl_part(panes_h, "first"), efl_added) 136 efl_content_set(efl_part(panes_h, "first"), efl_added)
137 ); 137 );
138 efl_ui_panes_internal_part_hint_min_allow_set(efl_part(panes_h, "first"), EINA_TRUE); 138 efl_ui_panes_part_hint_min_allow_set(efl_part(panes_h, "first"), EINA_TRUE);
139 139
140 efl_add(EFL_UI_BUTTON_CLASS, win, 140 efl_add(EFL_UI_BUTTON_CLASS, win,
141 efl_text_set(efl_added, "Down - min size 50 40"), 141 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 1d3d4e4..23e9efc 100644
--- a/src/lib/edje/Edje_Eo.h
+++ b/src/lib/edje/Edje_Eo.h
@@ -6,9 +6,9 @@
6#include "edje_object.eo.h" 6#include "edje_object.eo.h"
7#include "edje_edit.eo.h" 7#include "edje_edit.eo.h"
8 8
9#include "efl_canvas_layout_internal.eo.h" 9#include "efl_canvas_layout_part.eo.h"
10#include "efl_canvas_layout_internal_box.eo.h" 10#include "efl_canvas_layout_part_box.eo.h"
11#include "efl_canvas_layout_internal_table.eo.h" 11#include "efl_canvas_layout_part_table.eo.h"
12#include "efl_canvas_layout_internal_swallow.eo.h" 12#include "efl_canvas_layout_part_swallow.eo.h"
13#include "efl_canvas_layout_internal_text.eo.h" 13#include "efl_canvas_layout_part_text.eo.h"
14#include "efl_canvas_layout_external.eo.h" 14#include "efl_canvas_layout_external.eo.h"
diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c
index fba9d6a..f35b499 100644
--- a/src/lib/edje/edje_legacy.c
+++ b/src/lib/edje/edje_legacy.c
@@ -44,7 +44,7 @@ EAPI const char *
44edje_object_part_state_get(const Edje_Object *obj, const char * part, double *val_ret) 44edje_object_part_state_get(const Edje_Object *obj, const char * part, double *val_ret)
45{ 45{
46 const char *str = ""; 46 const char *str = "";
47 efl_canvas_layout_internal_state_get(efl_part(obj, part), &str, val_ret); 47 efl_canvas_layout_part_state_get(efl_part(obj, part), &str, val_ret);
48 return str; 48 return str;
49} 49}
50 50
diff --git a/src/lib/edje/edje_part.c b/src/lib/edje/edje_part.c
index 6fb1566..061df21 100644
--- a/src/lib/edje/edje_part.c
+++ b/src/lib/edje/edje_part.c
@@ -1,6 +1,6 @@
1#include "edje_private.h" 1#include "edje_private.h"
2#include "edje_part_helper.h" 2#include "edje_part_helper.h"
3#define MY_CLASS EFL_CANVAS_LAYOUT_INTERNAL_CLASS 3#define MY_CLASS EFL_CANVAS_LAYOUT_PART_CLASS
4 4
5PROXY_IMPLEMENTATION(other, MY_CLASS, EINA_FALSE) 5PROXY_IMPLEMENTATION(other, MY_CLASS, EINA_FALSE)
6#undef PROXY_IMPLEMENTATION 6#undef PROXY_IMPLEMENTATION
@@ -36,7 +36,7 @@ _part_type_to_string(unsigned char type)
36} 36}
37 37
38void 38void
39_part_reuse_error(Efl_Canvas_Layout_Internal_Data *pd) 39_part_reuse_error(Efl_Canvas_Layout_Part_Data *pd)
40{ 40{
41 Edje *ed; 41 Edje *ed;
42 42
@@ -79,9 +79,9 @@ _edje_internal_proxy_shutdown(void)
79void 79void
80_edje_real_part_set(Eo *obj, Edje *ed, Edje_Real_Part *rp, const char *part) 80_edje_real_part_set(Eo *obj, Edje *ed, Edje_Real_Part *rp, const char *part)
81{ 81{
82 Efl_Canvas_Layout_Internal_Data *pd; 82 Efl_Canvas_Layout_Part_Data *pd;
83 83
84 pd = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_INTERNAL_CLASS); 84 pd = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_PART_CLASS);
85 pd->obj = ed->obj; 85 pd->obj = ed->obj;
86 pd->ed = ed; 86 pd->ed = ed;
87 pd->rp = rp; 87 pd->rp = rp;
@@ -93,7 +93,7 @@ _edje_real_part_set(Eo *obj, Edje *ed, Edje_Real_Part *rp, const char *part)
93} 93}
94 94
95EOLIAN static Efl_Object * 95EOLIAN static Efl_Object *
96_efl_canvas_layout_internal_efl_object_finalize(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd) 96_efl_canvas_layout_part_efl_object_finalize(Eo *obj, Efl_Canvas_Layout_Part_Data *pd)
97{ 97{
98 EINA_SAFETY_ON_FALSE_RETURN_VAL(pd->rp && pd->ed && pd->part, NULL); 98 EINA_SAFETY_ON_FALSE_RETURN_VAL(pd->rp && pd->ed && pd->part, NULL);
99 // Do not use RETURN_VAL() here! 99 // Do not use RETURN_VAL() here!
@@ -101,7 +101,7 @@ _efl_canvas_layout_internal_efl_object_finalize(Eo *obj, Efl_Canvas_Layout_Inter
101} 101}
102 102
103EOLIAN void 103EOLIAN void
104_efl_canvas_layout_internal_efl_gfx_geometry_get(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, int *x, int *y, int *w, int *h) 104_efl_canvas_layout_part_efl_gfx_geometry_get(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, int *x, int *y, int *w, int *h)
105{ 105{
106 Edje_Real_Part *rp = pd->rp; 106 Edje_Real_Part *rp = pd->rp;
107 PROXY_CALL_BEGIN(pd); 107 PROXY_CALL_BEGIN(pd);
@@ -124,7 +124,7 @@ _efl_canvas_layout_internal_efl_gfx_geometry_get(Eo *obj, Efl_Canvas_Layout_Inte
124} 124}
125 125
126EOLIAN static void 126EOLIAN static void
127_efl_canvas_layout_internal_state_get(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, const char **name, double *val) 127_efl_canvas_layout_part_state_get(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, const char **name, double *val)
128{ 128{
129 const char *str; 129 const char *str;
130 PROXY_CALL_BEGIN(pd); 130 PROXY_CALL_BEGIN(pd);
@@ -137,91 +137,91 @@ _efl_canvas_layout_internal_state_get(Eo *obj, Efl_Canvas_Layout_Internal_Data *
137} 137}
138 138
139EOLIAN static Eina_Bool 139EOLIAN static Eina_Bool
140_efl_canvas_layout_internal_efl_ui_drag_drag_value_set(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, double dx, double dy) 140_efl_canvas_layout_part_efl_ui_drag_drag_value_set(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, double dx, double dy)
141{ 141{
142 PROXY_CALL_BEGIN(pd); 142 PROXY_CALL_BEGIN(pd);
143 RETURN_VAL(_edje_object_part_drag_value_set(pd->ed, pd->part, dx, dy)); 143 RETURN_VAL(_edje_object_part_drag_value_set(pd->ed, pd->part, dx, dy));
144} 144}
145 145
146EOLIAN static Eina_Bool 146EOLIAN static Eina_Bool
147_efl_canvas_layout_internal_efl_ui_drag_drag_value_get(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, double *dx, double *dy) 147_efl_canvas_layout_part_efl_ui_drag_drag_value_get(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, double *dx, double *dy)
148{ 148{
149 PROXY_CALL_BEGIN(pd); 149 PROXY_CALL_BEGIN(pd);
150 RETURN_VAL(_edje_object_part_drag_value_get(pd->ed, pd->part, dx, dy)); 150 RETURN_VAL(_edje_object_part_drag_value_get(pd->ed, pd->part, dx, dy));
151} 151}
152 152
153EOLIAN static Eina_Bool 153EOLIAN static Eina_Bool
154_efl_canvas_layout_internal_efl_ui_drag_drag_size_set(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, double dw, double dh) 154_efl_canvas_layout_part_efl_ui_drag_drag_size_set(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, double dw, double dh)
155{ 155{
156 PROXY_CALL_BEGIN(pd); 156 PROXY_CALL_BEGIN(pd);
157 RETURN_VAL(_edje_object_part_drag_size_set(pd->ed, pd->part, dw, dh)); 157 RETURN_VAL(_edje_object_part_drag_size_set(pd->ed, pd->part, dw, dh));
158} 158}
159 159
160EOLIAN static Eina_Bool 160EOLIAN static Eina_Bool
161_efl_canvas_layout_internal_efl_ui_drag_drag_size_get(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, double *dw, double *dh) 161_efl_canvas_layout_part_efl_ui_drag_drag_size_get(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, double *dw, double *dh)
162{ 162{
163 PROXY_CALL_BEGIN(pd); 163 PROXY_CALL_BEGIN(pd);
164 RETURN_VAL(_edje_object_part_drag_size_get(pd->ed, pd->part, dw, dh)); 164 RETURN_VAL(_edje_object_part_drag_size_get(pd->ed, pd->part, dw, dh));
165} 165}
166 166
167EOLIAN static Efl_Ui_Drag_Dir 167EOLIAN static Efl_Ui_Drag_Dir
168_efl_canvas_layout_internal_efl_ui_drag_drag_dir_get(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd) 168_efl_canvas_layout_part_efl_ui_drag_drag_dir_get(Eo *obj, Efl_Canvas_Layout_Part_Data *pd)
169{ 169{
170 PROXY_CALL_BEGIN(pd); 170 PROXY_CALL_BEGIN(pd);
171 RETURN_VAL(_edje_object_part_drag_dir_get(pd->ed, pd->part)); 171 RETURN_VAL(_edje_object_part_drag_dir_get(pd->ed, pd->part));
172} 172}
173 173
174EOLIAN static Eina_Bool 174EOLIAN static Eina_Bool
175_efl_canvas_layout_internal_efl_ui_drag_drag_step_set(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, double dx, double dy) 175_efl_canvas_layout_part_efl_ui_drag_drag_step_set(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, double dx, double dy)
176{ 176{
177 PROXY_CALL_BEGIN(pd); 177 PROXY_CALL_BEGIN(pd);
178 RETURN_VAL(_edje_object_part_drag_step_set(pd->ed, pd->part, dx, dy)); 178 RETURN_VAL(_edje_object_part_drag_step_set(pd->ed, pd->part, dx, dy));
179} 179}
180 180
181EOLIAN static Eina_Bool 181EOLIAN static Eina_Bool
182_efl_canvas_layout_internal_efl_ui_drag_drag_step_get(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, double *dx, double *dy) 182_efl_canvas_layout_part_efl_ui_drag_drag_step_get(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, double *dx, double *dy)
183{ 183{
184 PROXY_CALL_BEGIN(pd); 184 PROXY_CALL_BEGIN(pd);
185 RETURN_VAL(_edje_object_part_drag_step_get(pd->ed, pd->part, dx, dy)); 185 RETURN_VAL(_edje_object_part_drag_step_get(pd->ed, pd->part, dx, dy));
186} 186}
187 187
188EOLIAN static Eina_Bool 188EOLIAN static Eina_Bool
189_efl_canvas_layout_internal_efl_ui_drag_drag_step_move(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, double dx, double dy) 189_efl_canvas_layout_part_efl_ui_drag_drag_step_move(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, double dx, double dy)
190{ 190{
191 PROXY_CALL_BEGIN(pd); 191 PROXY_CALL_BEGIN(pd);
192 RETURN_VAL(_edje_object_part_drag_step(pd->ed, pd->part, dx, dy)); 192 RETURN_VAL(_edje_object_part_drag_step(pd->ed, pd->part, dx, dy));
193} 193}
194 194
195EOLIAN static Eina_Bool 195EOLIAN static Eina_Bool
196_efl_canvas_layout_internal_efl_ui_drag_drag_page_set(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, double dx, double dy) 196_efl_canvas_layout_part_efl_ui_drag_drag_page_set(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, double dx, double dy)
197{ 197{
198 PROXY_CALL_BEGIN(pd); 198 PROXY_CALL_BEGIN(pd);
199 RETURN_VAL(_edje_object_part_drag_page_set(pd->ed, pd->part, dx, dy)); 199 RETURN_VAL(_edje_object_part_drag_page_set(pd->ed, pd->part, dx, dy));
200} 200}
201 201
202EOLIAN static Eina_Bool 202EOLIAN static Eina_Bool
203_efl_canvas_layout_internal_efl_ui_drag_drag_page_get(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, double *dx, double *dy) 203_efl_canvas_layout_part_efl_ui_drag_drag_page_get(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, double *dx, double *dy)
204{ 204{
205 PROXY_CALL_BEGIN(pd); 205 PROXY_CALL_BEGIN(pd);
206 RETURN_VAL(_edje_object_part_drag_page_get(pd->ed, pd->part, dx, dy)); 206 RETURN_VAL(_edje_object_part_drag_page_get(pd->ed, pd->part, dx, dy));
207} 207}
208 208
209EOLIAN static Eina_Bool 209EOLIAN static Eina_Bool
210_efl_canvas_layout_internal_efl_ui_drag_drag_page_move(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, double dx, double dy) 210_efl_canvas_layout_part_efl_ui_drag_drag_page_move(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, double dx, double dy)
211{ 211{
212 PROXY_CALL_BEGIN(pd); 212 PROXY_CALL_BEGIN(pd);
213 RETURN_VAL(_edje_object_part_drag_page(pd->ed, pd->part, dx, dy)); 213 RETURN_VAL(_edje_object_part_drag_page(pd->ed, pd->part, dx, dy));
214} 214}
215 215
216static Eo * 216static Eo *
217_edje_invalid_part_efl_content_get(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd) 217_edje_invalid_part_efl_content_get(Eo *obj, Efl_Canvas_Layout_Part_Data *pd)
218{ 218{
219 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); 219 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);
220 RETURN_VAL(NULL); 220 RETURN_VAL(NULL);
221} 221}
222 222
223static Eina_Bool 223static Eina_Bool
224_edje_invalid_part_efl_content_set(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd, Eo *subobj EINA_UNUSED) 224_edje_invalid_part_efl_content_set(Eo *obj, Efl_Canvas_Layout_Part_Data *pd, Eo *subobj EINA_UNUSED)
225{ 225{
226 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); 226 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);
227 RETURN_VAL(EINA_FALSE); 227 RETURN_VAL(EINA_FALSE);
@@ -229,8 +229,8 @@ _edje_invalid_part_efl_content_set(Eo *obj, Efl_Canvas_Layout_Internal_Data *pd,
229 229
230/* Internal EO APIs and hidden overrides */ 230/* Internal EO APIs and hidden overrides */
231 231
232#define EFL_CANVAS_LAYOUT_INTERNAL_EXTRA_OPS \ 232#define EFL_CANVAS_LAYOUT_PART_EXTRA_OPS \
233 EFL_OBJECT_OP_FUNC(efl_content_get, _edje_invalid_part_efl_content_get), \ 233 EFL_OBJECT_OP_FUNC(efl_content_get, _edje_invalid_part_efl_content_get), \
234 EFL_OBJECT_OP_FUNC(efl_content_set, _edje_invalid_part_efl_content_set), \ 234 EFL_OBJECT_OP_FUNC(efl_content_set, _edje_invalid_part_efl_content_set), \
235 235
236#include "efl_canvas_layout_internal.eo.c" 236#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 b7b8080..5c6a57a 100644
--- a/src/lib/edje/edje_part_box.c
+++ b/src/lib/edje/edje_part_box.c
@@ -1,7 +1,7 @@
1#include "edje_private.h" 1#include "edje_private.h"
2#include "edje_part_helper.h" 2#include "edje_part_helper.h"
3#include "efl_canvas_layout_internal_box.eo.h" 3#include "efl_canvas_layout_part_box.eo.h"
4#define MY_CLASS EFL_CANVAS_LAYOUT_INTERNAL_BOX_CLASS 4#define MY_CLASS EFL_CANVAS_LAYOUT_PART_BOX_CLASS
5 5
6#include "../evas/canvas/evas_box.eo.h" 6#include "../evas/canvas/evas_box.eo.h"
7 7
@@ -13,21 +13,21 @@ typedef struct _Part_Item_Iterator Part_Item_Iterator;
13/* Legacy features */ 13/* Legacy features */
14 14
15EOLIAN static Eina_Bool 15EOLIAN static Eina_Bool
16_efl_canvas_layout_internal_box_efl_pack_pack_clear(Eo *obj, void *_pd EINA_UNUSED) 16_efl_canvas_layout_part_box_efl_pack_pack_clear(Eo *obj, void *_pd EINA_UNUSED)
17{ 17{
18 PROXY_DATA_GET(obj, pd); 18 PROXY_DATA_GET(obj, pd);
19 RETURN_VAL(_edje_part_box_remove_all(pd->ed, pd->part, EINA_TRUE)); 19 RETURN_VAL(_edje_part_box_remove_all(pd->ed, pd->part, EINA_TRUE));
20} 20}
21 21
22EOLIAN static Eina_Bool 22EOLIAN static Eina_Bool
23_efl_canvas_layout_internal_box_efl_pack_unpack_all(Eo *obj, void *_pd EINA_UNUSED) 23_efl_canvas_layout_part_box_efl_pack_unpack_all(Eo *obj, void *_pd EINA_UNUSED)
24{ 24{
25 PROXY_DATA_GET(obj, pd); 25 PROXY_DATA_GET(obj, pd);
26 RETURN_VAL(_edje_part_box_remove_all(pd->ed, pd->part, EINA_FALSE)); 26 RETURN_VAL(_edje_part_box_remove_all(pd->ed, pd->part, EINA_FALSE));
27} 27}
28 28
29EOLIAN static Eina_Bool 29EOLIAN static Eina_Bool
30_efl_canvas_layout_internal_box_efl_pack_unpack(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj) 30_efl_canvas_layout_part_box_efl_pack_unpack(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj)
31{ 31{
32 Evas_Object *removed; 32 Evas_Object *removed;
33 PROXY_DATA_GET(obj, pd); 33 PROXY_DATA_GET(obj, pd);
@@ -36,42 +36,42 @@ _efl_canvas_layout_internal_box_efl_pack_unpack(Eo *obj, void *_pd EINA_UNUSED,
36} 36}
37 37
38EOLIAN static Eina_Bool 38EOLIAN static Eina_Bool
39_efl_canvas_layout_internal_box_efl_pack_pack(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj) 39_efl_canvas_layout_part_box_efl_pack_pack(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj)
40{ 40{
41 PROXY_DATA_GET(obj, pd); 41 PROXY_DATA_GET(obj, pd);
42 RETURN_VAL(_edje_part_box_append(pd->ed, pd->part, subobj)); 42 RETURN_VAL(_edje_part_box_append(pd->ed, pd->part, subobj));
43} 43}
44 44
45EOLIAN static Eina_Bool 45EOLIAN static Eina_Bool
46_efl_canvas_layout_internal_box_efl_pack_linear_pack_begin(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj) 46_efl_canvas_layout_part_box_efl_pack_linear_pack_begin(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj)
47{ 47{
48 PROXY_DATA_GET(obj, pd); 48 PROXY_DATA_GET(obj, pd);
49 RETURN_VAL(_edje_part_box_prepend(pd->ed, pd->part, subobj)); 49 RETURN_VAL(_edje_part_box_prepend(pd->ed, pd->part, subobj));
50} 50}
51 51
52EOLIAN static Eina_Bool 52EOLIAN static Eina_Bool
53_efl_canvas_layout_internal_box_efl_pack_linear_pack_end(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj) 53_efl_canvas_layout_part_box_efl_pack_linear_pack_end(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj)
54{ 54{
55 PROXY_DATA_GET(obj, pd); 55 PROXY_DATA_GET(obj, pd);
56 RETURN_VAL(_edje_part_box_append(pd->ed, pd->part, subobj)); 56 RETURN_VAL(_edje_part_box_append(pd->ed, pd->part, subobj));
57} 57}
58 58
59EOLIAN static Eina_Bool 59EOLIAN static Eina_Bool
60_efl_canvas_layout_internal_box_efl_pack_linear_pack_before(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing) 60_efl_canvas_layout_part_box_efl_pack_linear_pack_before(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing)
61{ 61{
62 PROXY_DATA_GET(obj, pd); 62 PROXY_DATA_GET(obj, pd);
63 RETURN_VAL(_edje_part_box_insert_before(pd->ed, pd->part, subobj, existing)); 63 RETURN_VAL(_edje_part_box_insert_before(pd->ed, pd->part, subobj, existing));
64} 64}
65 65
66EOLIAN static Eina_Bool 66EOLIAN static Eina_Bool
67_efl_canvas_layout_internal_box_efl_pack_linear_pack_after(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing) 67_efl_canvas_layout_part_box_efl_pack_linear_pack_after(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing)
68{ 68{
69 PROXY_DATA_GET(obj, pd); 69 PROXY_DATA_GET(obj, pd);
70 RETURN_VAL(_edje_part_box_insert_after(pd->ed, pd->part, subobj, existing)); 70 RETURN_VAL(_edje_part_box_insert_after(pd->ed, pd->part, subobj, existing));
71} 71}
72 72
73EOLIAN static Eina_Bool 73EOLIAN static Eina_Bool
74_efl_canvas_layout_internal_box_efl_pack_linear_pack_at(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, int index) 74_efl_canvas_layout_part_box_efl_pack_linear_pack_at(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, int index)
75{ 75{
76 PROXY_DATA_GET(obj, pd); 76 PROXY_DATA_GET(obj, pd);
77 int cnt = PROXY_CALL(efl_content_count(obj)); 77 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_
84} 84}
85 85
86EOLIAN static Efl_Gfx * 86EOLIAN static Efl_Gfx *
87_efl_canvas_layout_internal_box_efl_pack_linear_pack_unpack_at(Eo *obj, void *_pd EINA_UNUSED, int index) 87_efl_canvas_layout_part_box_efl_pack_linear_pack_unpack_at(Eo *obj, void *_pd EINA_UNUSED, int index)
88{ 88{
89 PROXY_DATA_GET(obj, pd); 89 PROXY_DATA_GET(obj, pd);
90 if (index < 0) index += PROXY_CALL(efl_content_count(obj)); 90 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
94/* New APIs with Eo */ 94/* New APIs with Eo */
95 95
96EOLIAN static Efl_Gfx * 96EOLIAN static Efl_Gfx *
97_efl_canvas_layout_internal_box_efl_pack_linear_pack_content_get(Eo *obj, void *_pd EINA_UNUSED, int index) 97_efl_canvas_layout_part_box_efl_pack_linear_pack_content_get(Eo *obj, void *_pd EINA_UNUSED, int index)
98{ 98{
99 PROXY_DATA_GET(obj, pd); 99 PROXY_DATA_GET(obj, pd);
100 if (index < 0) index += PROXY_CALL(efl_content_count(obj)); 100 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 *
102} 102}
103 103
104EOLIAN static Eina_Bool 104EOLIAN static Eina_Bool
105_efl_canvas_layout_internal_box_efl_container_content_remove(Eo *obj, void *_pd EINA_UNUSED EINA_UNUSED, Efl_Gfx *subobj) 105_efl_canvas_layout_part_box_efl_container_content_remove(Eo *obj, void *_pd EINA_UNUSED EINA_UNUSED, Efl_Gfx *subobj)
106{ 106{
107 PROXY_DATA_GET(obj, pd); 107 PROXY_DATA_GET(obj, pd);
108 RETURN_VAL(PROXY_CALL(efl_pack_unpack(obj, subobj))); 108 RETURN_VAL(PROXY_CALL(efl_pack_unpack(obj, subobj)));
109} 109}
110 110
111EOLIAN static int 111EOLIAN static int
112_efl_canvas_layout_internal_box_efl_pack_linear_pack_index_get(Eo *obj, void *_pd EINA_UNUSED, const Efl_Gfx * subobj) 112_efl_canvas_layout_part_box_efl_pack_linear_pack_index_get(Eo *obj, void *_pd EINA_UNUSED, const Efl_Gfx * subobj)
113{ 113{
114 Evas_Object_Box_Option *opt; 114 Evas_Object_Box_Option *opt;
115 Evas_Object_Box_Data *priv; 115 Evas_Object_Box_Data *priv;
@@ -177,7 +177,7 @@ _part_item_iterator_create(Eo *obj, Eina_Iterator *real_iterator)
177} 177}
178 178
179EOLIAN static Eina_Iterator * 179EOLIAN static Eina_Iterator *
180_efl_canvas_layout_internal_box_efl_container_content_iterate(Eo *obj, void *_pd EINA_UNUSED) 180_efl_canvas_layout_part_box_efl_container_content_iterate(Eo *obj, void *_pd EINA_UNUSED)
181{ 181{
182 Eina_Iterator *it; 182 Eina_Iterator *it;
183 183
@@ -189,14 +189,14 @@ _efl_canvas_layout_internal_box_efl_container_content_iterate(Eo *obj, void *_pd
189} 189}
190 190
191EOLIAN static int 191EOLIAN static int
192_efl_canvas_layout_internal_box_efl_container_content_count(Eo *obj, void *_pd EINA_UNUSED) 192_efl_canvas_layout_part_box_efl_container_content_count(Eo *obj, void *_pd EINA_UNUSED)
193{ 193{
194 PROXY_DATA_GET(obj, pd); 194 PROXY_DATA_GET(obj, pd);
195 RETURN_VAL(evas_obj_box_count(pd->rp->object)); 195 RETURN_VAL(evas_obj_box_count(pd->rp->object));
196} 196}
197 197
198EOLIAN static Efl_Ui_Dir 198EOLIAN static Efl_Ui_Dir
199_efl_canvas_layout_internal_box_efl_ui_direction_direction_get(Eo *obj, void *_pd EINA_UNUSED) 199_efl_canvas_layout_part_box_efl_ui_direction_direction_get(Eo *obj, void *_pd EINA_UNUSED)
200{ 200{
201 PROXY_DATA_GET(obj, pd); 201 PROXY_DATA_GET(obj, pd);
202 const Edje_Part_Description_Box *desc = 202 const Edje_Part_Description_Box *desc =
@@ -214,4 +214,4 @@ _efl_canvas_layout_internal_box_efl_ui_direction_direction_get(Eo *obj, void *_p
214 RETURN_VAL(EFL_UI_DIR_DEFAULT); 214 RETURN_VAL(EFL_UI_DIR_DEFAULT);
215} 215}
216 216
217#include "efl_canvas_layout_internal_box.eo.c" 217#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 f72dadc..8cb3fa8 100644
--- a/src/lib/edje/edje_part_helper.h
+++ b/src/lib/edje/edje_part_helper.h
@@ -1,9 +1,9 @@
1#include "edje_private.h" 1#include "edje_private.h"
2#include "efl_canvas_layout_internal.eo.h" 2#include "efl_canvas_layout_part.eo.h"
3 3
4typedef struct _Efl_Canvas_Layout_Internal_Data Efl_Canvas_Layout_Internal_Data; 4typedef struct _Efl_Canvas_Layout_Part_Data Efl_Canvas_Layout_Part_Data;
5 5
6struct _Efl_Canvas_Layout_Internal_Data 6struct _Efl_Canvas_Layout_Part_Data
7{ 7{
8 Edje *ed; 8 Edje *ed;
9 Edje_Real_Part *rp; 9 Edje_Real_Part *rp;
@@ -20,7 +20,7 @@ struct _Part_Item_Iterator
20 Eo *object; 20 Eo *object;
21}; 21};
22 22
23void _part_reuse_error(Efl_Canvas_Layout_Internal_Data *pd); 23void _part_reuse_error(Efl_Canvas_Layout_Part_Data *pd);
24const char * _part_type_to_string(unsigned char type); 24const char * _part_type_to_string(unsigned char type);
25 25
26#define PROXY_CALL_BEGIN(pd) do { pd->in_call = 1; } while (0) 26#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
41static inline void 41static inline void
42_part_proxy_del_cb(Eo *proxy, Eo **static_var) 42_part_proxy_del_cb(Eo *proxy, Eo **static_var)
43{ 43{
44 Efl_Canvas_Layout_Internal_Data *pd; 44 Efl_Canvas_Layout_Part_Data *pd;
45 if (*static_var) 45 if (*static_var)
46 { 46 {
47 // FIXME: Enable debug checks only in debug mode 47 // FIXME: Enable debug checks only in debug mode
48 pd = efl_data_scope_get(*static_var, EFL_CANVAS_LAYOUT_INTERNAL_CLASS); 48 pd = efl_data_scope_get(*static_var, EFL_CANVAS_LAYOUT_PART_CLASS);
49 if (pd && pd->temp && !pd->in_call) 49 if (pd && pd->temp && !pd->in_call)
50 _part_reuse_error(pd); 50 _part_reuse_error(pd);
51 if (*static_var != proxy) 51 if (*static_var != proxy)
@@ -57,7 +57,7 @@ _part_proxy_del_cb(Eo *proxy, Eo **static_var)
57 efl_parent_set(proxy, NULL); 57 efl_parent_set(proxy, NULL);
58 } 58 }
59 efl_reuse(proxy); 59 efl_reuse(proxy);
60 pd = efl_data_scope_get(proxy, EFL_CANVAS_LAYOUT_INTERNAL_CLASS); 60 pd = efl_data_scope_get(proxy, EFL_CANVAS_LAYOUT_PART_CLASS);
61 pd->in_use = EINA_FALSE; 61 pd->in_use = EINA_FALSE;
62 *static_var = proxy; 62 *static_var = proxy;
63} 63}
@@ -77,7 +77,7 @@ void \
77_ ## type ## _shutdown(void); \ 77_ ## type ## _shutdown(void); \
78 78
79#define PROXY_DATA_GET(obj, pd) \ 79#define PROXY_DATA_GET(obj, pd) \
80 Efl_Canvas_Layout_Internal_Data *pd = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_INTERNAL_CLASS); \ 80 Efl_Canvas_Layout_Part_Data *pd = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_PART_CLASS); \
81 PROXY_CALL_BEGIN(pd) 81 PROXY_CALL_BEGIN(pd)
82 82
83#define PROXY_IMPLEMENTATION(type, KLASS, no_del_cb, ...) \ 83#define PROXY_IMPLEMENTATION(type, KLASS, no_del_cb, ...) \
@@ -98,10 +98,10 @@ _ ## type ## _shutdown(void) \
98Eo * \ 98Eo * \
99_edje_ ## type ## _internal_proxy_get(Edje_Object *obj EINA_UNUSED, Edje *ed, Edje_Real_Part *rp) \ 99_edje_ ## type ## _internal_proxy_get(Edje_Object *obj EINA_UNUSED, Edje *ed, Edje_Real_Part *rp) \
100{ \ 100{ \
101 Efl_Canvas_Layout_Internal_Data *pd; \ 101 Efl_Canvas_Layout_Part_Data *pd; \
102 Eo *proxy; \ 102 Eo *proxy; \
103 \ 103 \
104 pd = PROXY_STATIC_VAR(type) ? efl_data_scope_get(PROXY_STATIC_VAR(type), EFL_CANVAS_LAYOUT_INTERNAL_CLASS) : NULL; \ 104 pd = PROXY_STATIC_VAR(type) ? efl_data_scope_get(PROXY_STATIC_VAR(type), EFL_CANVAS_LAYOUT_PART_CLASS) : NULL; \
105 if (!pd) \ 105 if (!pd) \
106 { \ 106 { \
107 if (PROXY_STATIC_VAR(type)) \ 107 if (PROXY_STATIC_VAR(type)) \
@@ -130,7 +130,7 @@ end: \
130#ifdef DEBUG 130#ifdef DEBUG
131#define PART_TABLE_GET(obj, part, ...) ({ \ 131#define PART_TABLE_GET(obj, part, ...) ({ \
132 Eo *__table = efl_part(obj, part); \ 132 Eo *__table = efl_part(obj, part); \
133 if (!__table || !efl_isa(__table, EFL_CANVAS_LAYOUT_INTERNAL_TABLE_CLASS)) \ 133 if (!__table || !efl_isa(__table, EFL_CANVAS_LAYOUT_PART_TABLE_CLASS)) \
134 { \ 134 { \
135 ERR("No such table part '%s' in layout %p", part, obj); \ 135 ERR("No such table part '%s' in layout %p", part, obj); \
136 return __VA_ARGS__; \ 136 return __VA_ARGS__; \
diff --git a/src/lib/edje/edje_part_swallow.c b/src/lib/edje/edje_part_swallow.c
index 4e9564d..6bd2721 100644
--- a/src/lib/edje/edje_part_swallow.c
+++ b/src/lib/edje/edje_part_swallow.c
@@ -1,28 +1,28 @@
1#include "edje_private.h" 1#include "edje_private.h"
2#include "edje_part_helper.h" 2#include "edje_part_helper.h"
3#include "efl_canvas_layout_internal_swallow.eo.h" 3#include "efl_canvas_layout_part_swallow.eo.h"
4#define MY_CLASS EFL_CANVAS_LAYOUT_INTERNAL_SWALLOW_CLASS 4#define MY_CLASS EFL_CANVAS_LAYOUT_PART_SWALLOW_CLASS
5 5
6PROXY_IMPLEMENTATION(swallow, MY_CLASS, EINA_FALSE) 6PROXY_IMPLEMENTATION(swallow, MY_CLASS, EINA_FALSE)
7#undef PROXY_IMPLEMENTATION 7#undef PROXY_IMPLEMENTATION
8 8
9/* Swallow parts */ 9/* Swallow parts */
10EOLIAN static Efl_Gfx * 10EOLIAN static Efl_Gfx *
11_efl_canvas_layout_internal_swallow_efl_container_content_get(Eo *obj, void *_pd EINA_UNUSED) 11_efl_canvas_layout_part_swallow_efl_container_content_get(Eo *obj, void *_pd EINA_UNUSED)
12{ 12{
13 PROXY_DATA_GET(obj, pd); 13 PROXY_DATA_GET(obj, pd);
14 RETURN_VAL(_edje_efl_container_content_get(pd->ed, pd->part)); 14 RETURN_VAL(_edje_efl_container_content_get(pd->ed, pd->part));
15} 15}
16 16
17EOLIAN static Eina_Bool 17EOLIAN static Eina_Bool
18_efl_canvas_layout_internal_swallow_efl_container_content_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *content) 18_efl_canvas_layout_part_swallow_efl_container_content_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *content)
19{ 19{
20 PROXY_DATA_GET(obj, pd); 20 PROXY_DATA_GET(obj, pd);
21 RETURN_VAL(_edje_efl_container_content_set(pd->ed, pd->part, content)); 21 RETURN_VAL(_edje_efl_container_content_set(pd->ed, pd->part, content));
22} 22}
23 23
24EOLIAN static Efl_Gfx * 24EOLIAN static Efl_Gfx *
25_efl_canvas_layout_internal_swallow_efl_container_content_unset(Eo *obj, void *_pd EINA_UNUSED) 25_efl_canvas_layout_part_swallow_efl_container_content_unset(Eo *obj, void *_pd EINA_UNUSED)
26{ 26{
27 PROXY_DATA_GET(obj, pd); 27 PROXY_DATA_GET(obj, pd);
28 Efl_Gfx *content = _edje_efl_container_content_get(pd->ed, pd->part); 28 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 *_
31 RETURN_VAL(content); 31 RETURN_VAL(content);
32} 32}
33 33
34#include "efl_canvas_layout_internal_swallow.eo.c" 34#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 211dce1..50c5899 100644
--- a/src/lib/edje/edje_part_table.c
+++ b/src/lib/edje/edje_part_table.c
@@ -1,7 +1,7 @@
1#include "edje_private.h" 1#include "edje_private.h"
2#include "edje_part_helper.h" 2#include "edje_part_helper.h"
3#include "efl_canvas_layout_internal_table.eo.h" 3#include "efl_canvas_layout_part_table.eo.h"
4#define MY_CLASS EFL_CANVAS_LAYOUT_INTERNAL_TABLE_CLASS 4#define MY_CLASS EFL_CANVAS_LAYOUT_PART_TABLE_CLASS
5 5
6#include "../evas/canvas/evas_table.eo.h" 6#include "../evas/canvas/evas_table.eo.h"
7 7
@@ -59,7 +59,7 @@ _part_item_iterator_create(Eo *obj, Eina_Iterator *real_iterator)
59} 59}
60 60
61EOLIAN static Eina_Iterator * 61EOLIAN static Eina_Iterator *
62_efl_canvas_layout_internal_table_efl_container_content_iterate(Eo *obj, void *_pd EINA_UNUSED) 62_efl_canvas_layout_part_table_efl_container_content_iterate(Eo *obj, void *_pd EINA_UNUSED)
63{ 63{
64 Eina_Iterator *it; 64 Eina_Iterator *it;
65 65
@@ -71,56 +71,56 @@ _efl_canvas_layout_internal_table_efl_container_content_iterate(Eo *obj, void *_
71} 71}
72 72
73EOLIAN static int 73EOLIAN static int
74_efl_canvas_layout_internal_table_efl_container_content_count(Eo *obj, void *_pd EINA_UNUSED) 74_efl_canvas_layout_part_table_efl_container_content_count(Eo *obj, void *_pd EINA_UNUSED)
75{ 75{
76 PROXY_DATA_GET(obj, pd); 76 PROXY_DATA_GET(obj, pd);
77 RETURN_VAL(evas_obj_table_count(pd->rp->object)); 77 RETURN_VAL(evas_obj_table_count(pd->rp->object));
78} 78}
79 79
80EOLIAN static Eina_Bool 80EOLIAN static Eina_Bool
81_efl_canvas_layout_internal_table_efl_container_content_remove(Eo *obj, void *_pd EINA_UNUSED EINA_UNUSED, Efl_Gfx *content) 81_efl_canvas_layout_part_table_efl_container_content_remove(Eo *obj, void *_pd EINA_UNUSED EINA_UNUSED, Efl_Gfx *content)
82{ 82{
83 PROXY_DATA_GET(obj, pd); 83 PROXY_DATA_GET(obj, pd);
84 RETURN_VAL(PROXY_CALL(efl_pack_unpack(obj, content))); 84 RETURN_VAL(PROXY_CALL(efl_pack_unpack(obj, content)));
85} 85}
86 86
87EOLIAN static Eina_Bool 87EOLIAN static Eina_Bool
88_efl_canvas_layout_internal_table_efl_pack_pack_clear(Eo *obj, void *_pd EINA_UNUSED) 88_efl_canvas_layout_part_table_efl_pack_pack_clear(Eo *obj, void *_pd EINA_UNUSED)
89{ 89{
90 PROXY_DATA_GET(obj, pd); 90 PROXY_DATA_GET(obj, pd);
91 RETURN_VAL(_edje_part_table_clear(pd->ed, pd->part, EINA_TRUE)); 91 RETURN_VAL(_edje_part_table_clear(pd->ed, pd->part, EINA_TRUE));
92} 92}
93 93
94EOLIAN static Eina_Bool 94EOLIAN static Eina_Bool
95_efl_canvas_layout_internal_table_efl_pack_unpack_all(Eo *obj, void *_pd EINA_UNUSED) 95_efl_canvas_layout_part_table_efl_pack_unpack_all(Eo *obj, void *_pd EINA_UNUSED)
96{ 96{
97 PROXY_DATA_GET(obj, pd); 97 PROXY_DATA_GET(obj, pd);
98 RETURN_VAL(_edje_part_table_clear(pd->ed, pd->part, EINA_FALSE)); 98 RETURN_VAL(_edje_part_table_clear(pd->ed, pd->part, EINA_FALSE));
99} 99}
100 100
101EOLIAN static Eina_Bool 101EOLIAN static Eina_Bool
102_efl_canvas_layout_internal_table_efl_pack_unpack(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Efl_Gfx *subobj) 102_efl_canvas_layout_part_table_efl_pack_unpack(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Efl_Gfx *subobj)
103{ 103{
104 PROXY_DATA_GET(obj, pd); 104 PROXY_DATA_GET(obj, pd);
105 RETURN_VAL(_edje_part_table_unpack(pd->ed, pd->part, subobj)); 105 RETURN_VAL(_edje_part_table_unpack(pd->ed, pd->part, subobj));
106} 106}
107 107
108EOLIAN static Eina_Bool 108EOLIAN static Eina_Bool
109_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) 109_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)
110{ 110{
111 PROXY_DATA_GET(obj, pd); 111 PROXY_DATA_GET(obj, pd);
112 RETURN_VAL(_edje_part_table_pack(pd->ed, pd->part, subobj, col, row, colspan, rowspan)); 112 RETURN_VAL(_edje_part_table_pack(pd->ed, pd->part, subobj, col, row, colspan, rowspan));
113} 113}
114 114
115EOLIAN static Efl_Gfx * 115EOLIAN static Efl_Gfx *
116_efl_canvas_layout_internal_table_efl_pack_grid_grid_content_get(Eo *obj, void *_pd EINA_UNUSED, int col, int row) 116_efl_canvas_layout_part_table_efl_pack_grid_grid_content_get(Eo *obj, void *_pd EINA_UNUSED, int col, int row)
117{ 117{
118 PROXY_DATA_GET(obj, pd); 118 PROXY_DATA_GET(obj, pd);
119 RETURN_VAL(_edje_part_table_child_get(pd->ed, pd->part, col, row)); 119 RETURN_VAL(_edje_part_table_child_get(pd->ed, pd->part, col, row));
120} 120}
121 121
122EOLIAN static void 122EOLIAN static void
123_efl_canvas_layout_internal_table_efl_pack_grid_grid_size_get(Eo *obj, void *_pd EINA_UNUSED, int *cols, int *rows) 123_efl_canvas_layout_part_table_efl_pack_grid_grid_size_get(Eo *obj, void *_pd EINA_UNUSED, int *cols, int *rows)
124{ 124{
125 PROXY_DATA_GET(obj, pd); 125 PROXY_DATA_GET(obj, pd);
126 _edje_part_table_col_row_size_get(pd->ed, pd->part, cols, rows); 126 _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
128} 128}
129 129
130EOLIAN static int 130EOLIAN static int
131_efl_canvas_layout_internal_table_efl_pack_grid_grid_columns_get(Eo *obj, void *_pd EINA_UNUSED) 131_efl_canvas_layout_part_table_efl_pack_grid_grid_columns_get(Eo *obj, void *_pd EINA_UNUSED)
132{ 132{
133 PROXY_DATA_GET(obj, pd); 133 PROXY_DATA_GET(obj, pd);
134 int cols = 0, rows = 0; 134 int cols = 0, rows = 0;
@@ -137,7 +137,7 @@ _efl_canvas_layout_internal_table_efl_pack_grid_grid_columns_get(Eo *obj, void *
137} 137}
138 138
139EOLIAN static int 139EOLIAN static int
140_efl_canvas_layout_internal_table_efl_pack_grid_grid_rows_get(Eo *obj, void *_pd EINA_UNUSED) 140_efl_canvas_layout_part_table_efl_pack_grid_grid_rows_get(Eo *obj, void *_pd EINA_UNUSED)
141{ 141{
142 PROXY_DATA_GET(obj, pd); 142 PROXY_DATA_GET(obj, pd);
143 int cols = 0, rows = 0; 143 int cols = 0, rows = 0;
@@ -176,7 +176,7 @@ _table_item_iterator_free(Part_Item_Iterator *it)
176} 176}
177 177
178EOLIAN static Eina_Iterator * 178EOLIAN static Eina_Iterator *
179_efl_canvas_layout_internal_table_efl_pack_grid_grid_contents_get(Eo *obj, void *_pd EINA_UNUSED, int col, int row, Eina_Bool below) 179_efl_canvas_layout_part_table_efl_pack_grid_grid_contents_get(Eo *obj, void *_pd EINA_UNUSED, int col, int row, Eina_Bool below)
180{ 180{
181 Evas_Object *sobj; 181 Evas_Object *sobj;
182 Eina_Iterator *it; 182 Eina_Iterator *it;
@@ -219,7 +219,7 @@ _efl_canvas_layout_internal_table_efl_pack_grid_grid_contents_get(Eo *obj, void
219} 219}
220 220
221EOLIAN static Eina_Bool 221EOLIAN static Eina_Bool
222_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) 222_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)
223{ 223{
224 unsigned short c, r, cs, rs; 224 unsigned short c, r, cs, rs;
225 Eina_Bool ret; 225 Eina_Bool ret;
@@ -239,7 +239,7 @@ _efl_canvas_layout_internal_table_efl_pack_grid_grid_position_get(Eo *obj, void
239#ifdef DEGUG 239#ifdef DEGUG
240#define PART_BOX_GET(obj, part, ...) ({ \ 240#define PART_BOX_GET(obj, part, ...) ({ \
241 Eo *__box = efl_part(obj, part); \ 241 Eo *__box = efl_part(obj, part); \
242 if (!__box || !efl_isa(__box, EFL_CANVAS_LAYOUT_INTERNAL_BOX_CLASS)) \ 242 if (!__box || !efl_isa(__box, EFL_CANVAS_LAYOUT_PART_BOX_CLASS)) \
243 { \ 243 { \
244 ERR("No such box part '%s' in layout %p", part, obj); \ 244 ERR("No such box part '%s' in layout %p", part, obj); \
245 return __VA_ARGS__; \ 245 return __VA_ARGS__; \
@@ -352,4 +352,4 @@ edje_object_part_table_clear(Edje_Object *obj, const char *part, Eina_Bool clear
352 return efl_pack_unpack_all(table); 352 return efl_pack_unpack_all(table);
353} 353}
354 354
355#include "efl_canvas_layout_internal_table.eo.c" 355#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 5db8c45..dc5a944 100644
--- a/src/lib/edje/edje_part_text.c
+++ b/src/lib/edje/edje_part_text.c
@@ -1,13 +1,13 @@
1#include "edje_private.h" 1#include "edje_private.h"
2#include "edje_part_helper.h" 2#include "edje_part_helper.h"
3#include "efl_canvas_layout_internal_text.eo.h" 3#include "efl_canvas_layout_part_text.eo.h"
4#define MY_CLASS EFL_CANVAS_LAYOUT_INTERNAL_TEXT_CLASS 4#define MY_CLASS EFL_CANVAS_LAYOUT_PART_TEXT_CLASS
5 5
6PROXY_IMPLEMENTATION(text, MY_CLASS, EINA_FALSE) 6PROXY_IMPLEMENTATION(text, MY_CLASS, EINA_FALSE)
7#undef PROXY_IMPLEMENTATION 7#undef PROXY_IMPLEMENTATION
8 8
9EOLIAN static void 9EOLIAN static void
10_efl_canvas_layout_internal_text_efl_text_text_set(Eo *obj, 10_efl_canvas_layout_part_text_efl_text_text_set(Eo *obj,
11 void *_pd EINA_UNUSED, const char *text) 11 void *_pd EINA_UNUSED, const char *text)
12{ 12{
13 PROXY_DATA_GET(obj, pd); 13 PROXY_DATA_GET(obj, pd);
@@ -16,7 +16,7 @@ _efl_canvas_layout_internal_text_efl_text_text_set(Eo *obj,
16} 16}
17 17
18EOLIAN static const char * 18EOLIAN static const char *
19_efl_canvas_layout_internal_text_efl_text_text_get(Eo *obj, 19_efl_canvas_layout_part_text_efl_text_text_get(Eo *obj,
20 void *_pd EINA_UNUSED) 20 void *_pd EINA_UNUSED)
21{ 21{
22 PROXY_DATA_GET(obj, pd); 22 PROXY_DATA_GET(obj, pd);
@@ -24,7 +24,7 @@ _efl_canvas_layout_internal_text_efl_text_text_get(Eo *obj,
24} 24}
25 25
26EOLIAN static Efl_Text_Cursor_Cursor * 26EOLIAN static Efl_Text_Cursor_Cursor *
27_efl_canvas_layout_internal_text_efl_text_cursor_cursor_get(Eo *obj, 27_efl_canvas_layout_part_text_efl_text_cursor_cursor_get(Eo *obj,
28 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Get_Type get_type) 28 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Get_Type get_type)
29{ 29{
30 PROXY_DATA_GET(obj, pd); 30 PROXY_DATA_GET(obj, pd);
@@ -32,7 +32,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_get(Eo *obj,
32} 32}
33 33
34EOLIAN static void 34EOLIAN static void
35_efl_canvas_layout_internal_text_efl_text_cursor_cursor_paragraph_first(Eo *obj, 35_efl_canvas_layout_part_text_efl_text_cursor_cursor_paragraph_first(Eo *obj,
36 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) 36 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
37{ 37{
38 PROXY_DATA_GET(obj, pd); 38 PROXY_DATA_GET(obj, pd);
@@ -41,7 +41,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_paragraph_first(Eo *obj,
41} 41}
42 42
43EOLIAN static void 43EOLIAN static void
44_efl_canvas_layout_internal_text_efl_text_cursor_cursor_paragraph_last(Eo *obj, 44_efl_canvas_layout_part_text_efl_text_cursor_cursor_paragraph_last(Eo *obj,
45 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) 45 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
46{ 46{
47 PROXY_DATA_GET(obj, pd); 47 PROXY_DATA_GET(obj, pd);
@@ -50,7 +50,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_paragraph_last(Eo *obj,
50} 50}
51 51
52EOLIAN static void 52EOLIAN static void
53_efl_canvas_layout_internal_text_efl_text_cursor_cursor_position_set(Eo *obj, 53_efl_canvas_layout_part_text_efl_text_cursor_cursor_position_set(Eo *obj,
54 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur, int pos) 54 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur, int pos)
55{ 55{
56 PROXY_DATA_GET(obj, pd); 56 PROXY_DATA_GET(obj, pd);
@@ -59,7 +59,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_position_set(Eo *obj,
59} 59}
60 60
61EOLIAN static int 61EOLIAN static int
62_efl_canvas_layout_internal_text_efl_text_cursor_cursor_position_get(Eo *obj, 62_efl_canvas_layout_part_text_efl_text_cursor_cursor_position_get(Eo *obj,
63 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) 63 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
64{ 64{
65 PROXY_DATA_GET(obj, pd); 65 PROXY_DATA_GET(obj, pd);
@@ -67,7 +67,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_position_get(Eo *obj,
67} 67}
68 68
69EOLIAN static void 69EOLIAN static void
70_efl_canvas_layout_internal_text_efl_text_cursor_cursor_coord_set(Eo *obj, 70_efl_canvas_layout_part_text_efl_text_cursor_cursor_coord_set(Eo *obj,
71 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur, 71 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur,
72 int x, int y) 72 int x, int y)
73{ 73{
@@ -77,7 +77,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_coord_set(Eo *obj,
77} 77}
78 78
79EOLIAN static void 79EOLIAN static void
80_efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_char_first(Eo *obj, 80_efl_canvas_layout_part_text_efl_text_cursor_cursor_line_char_first(Eo *obj,
81 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) 81 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
82{ 82{
83 PROXY_DATA_GET(obj, pd); 83 PROXY_DATA_GET(obj, pd);
@@ -86,7 +86,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_char_first(Eo *obj,
86} 86}
87 87
88EOLIAN static void 88EOLIAN static void
89_efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_char_last(Eo *obj, 89_efl_canvas_layout_part_text_efl_text_cursor_cursor_line_char_last(Eo *obj,
90 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) 90 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
91{ 91{
92 PROXY_DATA_GET(obj, pd); 92 PROXY_DATA_GET(obj, pd);
@@ -95,7 +95,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_char_last(Eo *obj,
95} 95}
96 96
97EOLIAN static void 97EOLIAN static void
98_efl_canvas_layout_internal_text_efl_text_cursor_cursor_char_prev(Eo *obj, 98_efl_canvas_layout_part_text_efl_text_cursor_cursor_char_prev(Eo *obj,
99 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) 99 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
100{ 100{
101 PROXY_DATA_GET(obj, pd); 101 PROXY_DATA_GET(obj, pd);
@@ -104,7 +104,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_char_prev(Eo *obj,
104} 104}
105 105
106EOLIAN static void 106EOLIAN static void
107_efl_canvas_layout_internal_text_efl_text_cursor_cursor_char_next(Eo *obj, 107_efl_canvas_layout_part_text_efl_text_cursor_cursor_char_next(Eo *obj,
108 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) 108 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
109{ 109{
110 PROXY_DATA_GET(obj, pd); 110 PROXY_DATA_GET(obj, pd);
@@ -113,7 +113,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_char_next(Eo *obj,
113} 113}
114 114
115EOLIAN static void 115EOLIAN static void
116_efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_jump_by(Eo *obj, 116_efl_canvas_layout_part_text_efl_text_cursor_cursor_line_jump_by(Eo *obj,
117 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur, int by) 117 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur, int by)
118{ 118{
119 PROXY_DATA_GET(obj, pd); 119 PROXY_DATA_GET(obj, pd);
@@ -129,7 +129,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_line_jump_by(Eo *obj,
129} 129}
130 130
131EOLIAN static void 131EOLIAN static void
132_efl_canvas_layout_internal_text_efl_text_cursor_cursor_copy(Eo *obj, 132_efl_canvas_layout_part_text_efl_text_cursor_cursor_copy(Eo *obj,
133 void *_pd EINA_UNUSED, 133 void *_pd EINA_UNUSED,
134 Efl_Text_Cursor_Cursor *dst, 134 Efl_Text_Cursor_Cursor *dst,
135 const Efl_Text_Cursor_Cursor *cur) 135 const Efl_Text_Cursor_Cursor *cur)
@@ -140,7 +140,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_copy(Eo *obj,
140} 140}
141 141
142EOLIAN static Eina_Unicode 142EOLIAN static Eina_Unicode
143_efl_canvas_layout_internal_text_efl_text_cursor_cursor_content_get(Eo *obj, 143_efl_canvas_layout_part_text_efl_text_cursor_cursor_content_get(Eo *obj,
144 void *_pd EINA_UNUSED, 144 void *_pd EINA_UNUSED,
145 const Efl_Text_Cursor_Cursor *cur) 145 const Efl_Text_Cursor_Cursor *cur)
146{ 146{
@@ -162,7 +162,7 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_content_get(Eo *obj,
162} 162}
163 163
164EOLIAN static Eina_Bool 164EOLIAN static Eina_Bool
165_efl_canvas_layout_internal_text_efl_text_cursor_cursor_geometry_get(Eo *obj, 165_efl_canvas_layout_part_text_efl_text_cursor_cursor_geometry_get(Eo *obj,
166 void *_pd EINA_UNUSED, 166 void *_pd EINA_UNUSED,
167 const Efl_Text_Cursor_Cursor *cur EINA_UNUSED, 167 const Efl_Text_Cursor_Cursor *cur EINA_UNUSED,
168 Efl_Text_Cursor_Cursor_Type ctype EINA_UNUSED, 168 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,
181} 181}
182 182
183EOLIAN static int 183EOLIAN static int
184_efl_canvas_layout_internal_text_efl_text_cursor_cursor_text_insert(Eo *obj, 184_efl_canvas_layout_part_text_efl_text_cursor_cursor_text_insert(Eo *obj,
185 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED, 185 void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED,
186 const char *text) 186 const char *text)
187{ 187{
@@ -192,5 +192,5 @@ _efl_canvas_layout_internal_text_efl_text_cursor_cursor_text_insert(Eo *obj,
192 RETURN_VAL(0); 192 RETURN_VAL(0);
193} 193}
194 194
195#include "efl_canvas_layout_internal_text.eo.c" 195#include "efl_canvas_layout_part_text.eo.c"
196 196
diff --git a/src/lib/edje/efl_canvas_layout_external.eo b/src/lib/edje/efl_canvas_layout_external.eo
index dcbd475..bf723a5 100644
--- a/src/lib/edje/efl_canvas_layout_external.eo
+++ b/src/lib/edje/efl_canvas_layout_external.eo
@@ -1,6 +1,6 @@
1import edje_types; 1import edje_types;
2 2
3class Efl.Canvas.Layout.External (Efl.Canvas.Layout_Internal, Efl.Container, 3class Efl.Canvas.Layout.External (Efl.Canvas.Layout.Part, Efl.Container,
4 Efl.Canvas.Object) 4 Efl.Canvas.Object)
5{ 5{
6 [[Class representing an external part in Edje layouts. 6 [[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
index c06613f..d6dc45d 100644
--- a/src/lib/edje/efl_canvas_layout_internal.eo
+++ b/src/lib/edje/efl_canvas_layout_part.eo
@@ -1,5 +1,5 @@
1/* FIXME: Rename to Efl.Canvas.Layout.Part */ 1/* FIXME: Rename to Efl.Canvas.Layout.Part */
2class Efl.Canvas.Layout_Internal (Efl.Object, Efl.Gfx, Efl.Ui.Drag) 2class Efl.Canvas.Layout.Part (Efl.Object, Efl.Gfx, Efl.Ui.Drag)
3{ 3{
4 [[Common class for part proxy objects for $Efl.Canvas.Layout. 4 [[Common class for part proxy objects for $Efl.Canvas.Layout.
5 5
diff --git a/src/lib/edje/efl_canvas_layout_internal_box.eo b/src/lib/edje/efl_canvas_layout_part_box.eo
index e062c61..28a95d0 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 @@
1class Efl.Canvas.Layout_Internal.Box (Efl.Canvas.Layout_Internal, Efl.Pack.Linear, 1class Efl.Canvas.Layout.Part_Box (Efl.Canvas.Layout.Part, Efl.Pack.Linear,
2 Efl.Ui.Direction) 2 Efl.Ui.Direction)
3{ 3{
4 [[Represents a Box created as part of a layout. 4 [[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
index a5e9098..c3dc8ad 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 @@
1class Efl.Canvas.Layout_Internal.Swallow (Efl.Canvas.Layout_Internal, Efl.Container) 1class Efl.Canvas.Layout.Part_Swallow (Efl.Canvas.Layout.Part, Efl.Container)
2{ 2{
3 [[Represents a SWALLOW part of an Edje object. 3 [[Represents a SWALLOW part of an Edje object.
4 4
diff --git a/src/lib/edje/efl_canvas_layout_internal_table.eo b/src/lib/edje/efl_canvas_layout_part_table.eo
index 1bc84f2..1797989 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 @@
1class Efl.Canvas.Layout_Internal.Table (Efl.Canvas.Layout_Internal, Efl.Pack.Grid) 1class Efl.Canvas.Layout.Part_Table (Efl.Canvas.Layout.Part, Efl.Pack.Grid)
2{ 2{
3 [[Represents a Table created as part of a layout. 3 [[Represents a Table created as part of a layout.
4 4
diff --git a/src/lib/edje/efl_canvas_layout_internal_text.eo b/src/lib/edje/efl_canvas_layout_part_text.eo
index 58ca552..67cb7c3 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 @@
1class Efl.Canvas.Layout_Internal.Text (Efl.Canvas.Layout_Internal, Efl.Text, 1class Efl.Canvas.Layout.Part_Text (Efl.Canvas.Layout.Part, Efl.Text,
2 Efl.Text.Cursor) 2 Efl.Text.Cursor)
3{ 3{
4 [[Represents a TEXT part of a layout 4 [[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 dadba18..81b04e8 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -10,7 +10,7 @@
10#include "elm_priv.h" 10#include "elm_priv.h"
11#include "efl_ui_button_private.h" 11#include "efl_ui_button_private.h"
12#include "elm_widget_layout.h" 12#include "elm_widget_layout.h"
13#include "efl_ui_button_internal_part.eo.h" 13#include "efl_ui_button_part.eo.h"
14#include "elm_part_helper.h" 14#include "elm_part_helper.h"
15 15
16#define MY_CLASS EFL_UI_BUTTON_CLASS 16#define MY_CLASS EFL_UI_BUTTON_CLASS
@@ -426,7 +426,7 @@ EFL_TEXT_PART_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data)
426 426
427ELM_PART_OVERRIDE(efl_ui_button, EFL_UI_BUTTON, EFL_UI_LAYOUT, Efl_Ui_Button_Data, Elm_Part_Data) 427ELM_PART_OVERRIDE(efl_ui_button, EFL_UI_BUTTON, EFL_UI_LAYOUT, Efl_Ui_Button_Data, Elm_Part_Data)
428ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_button, EFL_UI_BUTTON, EFL_UI_LAYOUT, Efl_Ui_Button_Data, Elm_Part_Data) 428ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_button, EFL_UI_BUTTON, EFL_UI_LAYOUT, Efl_Ui_Button_Data, Elm_Part_Data)
429#include "efl_ui_button_internal_part.eo.c" 429#include "efl_ui_button_part.eo.c"
430 430
431/* Efl.Part end */ 431/* Efl.Part end */
432 432
diff --git a/src/lib/elementary/efl_ui_button_internal_part.eo b/src/lib/elementary/efl_ui_button_part.eo
index d0f9914..4f5952f 100644
--- a/src/lib/elementary/efl_ui_button_internal_part.eo
+++ b/src/lib/elementary/efl_ui_button_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Button.Internal.Part (Efl.Ui.Layout.Internal.Part) 1class Efl.Ui.Button.Part (Efl.Ui.Layout.Part)
2{ 2{
3 [[Elementary button internal part class]] 3 [[Elementary button internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index f551566..e08a3c3 100644
--- a/src/lib/elementary/efl_ui_flip.c
+++ b/src/lib/elementary/efl_ui_flip.c
@@ -9,7 +9,7 @@
9#include "efl_ui_widget_flip.h" 9#include "efl_ui_widget_flip.h"
10#include "elm_widget_container.h" 10#include "elm_widget_container.h"
11 11
12#include "efl_ui_flip_internal_part.eo.h" 12#include "efl_ui_flip_part.eo.h"
13#include "elm_part_helper.h" 13#include "elm_part_helper.h"
14 14
15#define MY_CLASS EFL_UI_FLIP_CLASS 15#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
2403ELM_PART_IMPLEMENT_CONTENT_GET(efl_ui_flip, EFL_UI_FLIP, Efl_Ui_Flip_Data, Elm_Part_Data) 2403ELM_PART_IMPLEMENT_CONTENT_GET(efl_ui_flip, EFL_UI_FLIP, Efl_Ui_Flip_Data, Elm_Part_Data)
2404ELM_PART_IMPLEMENT_CONTENT_UNSET(efl_ui_flip, EFL_UI_FLIP, Efl_Ui_Flip_Data, Elm_Part_Data) 2404ELM_PART_IMPLEMENT_CONTENT_UNSET(efl_ui_flip, EFL_UI_FLIP, Efl_Ui_Flip_Data, Elm_Part_Data)
2405ELM_PART_CONTENT_DEFAULT_SET(efl_ui_flip, "front") 2405ELM_PART_CONTENT_DEFAULT_SET(efl_ui_flip, "front")
2406#include "efl_ui_flip_internal_part.eo.c" 2406#include "efl_ui_flip_part.eo.c"
2407 2407
2408/* Efl.Part end */ 2408/* Efl.Part end */
2409 2409
diff --git a/src/lib/elementary/efl_ui_flip_internal_part.eo b/src/lib/elementary/efl_ui_flip_part.eo
index 4592f69..2edd411 100644
--- a/src/lib/elementary/efl_ui_flip_internal_part.eo
+++ b/src/lib/elementary/efl_ui_flip_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Flip.Internal.Part (Efl.Object, Efl.Container) 1class Efl.Ui.Flip.Part (Efl.Object, Efl.Container)
2{ 2{
3 [[Efl UI flip internal class]] 3 [[Efl UI flip internal class]]
4 data: Elm_Part_Data; 4 data: Elm_Part_Data;
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index a2b3c7e..11a703e 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -10,7 +10,7 @@
10#include "elm_priv.h" 10#include "elm_priv.h"
11#include "elm_widget_layout.h" 11#include "elm_widget_layout.h"
12 12
13#include "efl_ui_layout_internal_part.eo.h" 13#include "efl_ui_layout_part.eo.h"
14#include "elm_part_helper.h" 14#include "elm_part_helper.h"
15 15
16#define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT 16#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,
2477 return _efl_ui_layout_pack_proxy_get((Eo *) obj, type, part); 2477 return _efl_ui_layout_pack_proxy_get((Eo *) obj, type, part);
2478 2478
2479 // Generic parts (text, anything, ...) 2479 // Generic parts (text, anything, ...)
2480 proxy = efl_add(EFL_UI_LAYOUT_INTERNAL_PART_CLASS, (Eo *) obj); 2480 proxy = efl_add(EFL_UI_LAYOUT_PART_CLASS, (Eo *) obj);
2481 pd = efl_data_scope_get(proxy, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); 2481 pd = efl_data_scope_get(proxy, EFL_UI_LAYOUT_PART_CLASS);
2482 if (pd) 2482 if (pd)
2483 { 2483 {
2484 pd->obj = (Eo *) obj; 2484 pd->obj = (Eo *) obj;
@@ -2509,37 +2509,37 @@ _efl_ui_layout_default_text_part_get(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_
2509} 2509}
2510 2510
2511EOLIAN static Eina_Bool 2511EOLIAN static Eina_Bool
2512_efl_ui_layout_internal_part_efl_ui_cursor_cursor_set(Eo *obj, Elm_Part_Data *pd, const char *cursor) 2512_efl_ui_layout_part_efl_ui_cursor_cursor_set(Eo *obj, Elm_Part_Data *pd, const char *cursor)
2513{ 2513{
2514 ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_set(pd->sd, pd->part, cursor)); 2514 ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_set(pd->sd, pd->part, cursor));
2515} 2515}
2516 2516
2517EOLIAN static const char * 2517EOLIAN static const char *
2518_efl_ui_layout_internal_part_efl_ui_cursor_cursor_get(Eo *obj, Elm_Part_Data *pd) 2518_efl_ui_layout_part_efl_ui_cursor_cursor_get(Eo *obj, Elm_Part_Data *pd)
2519{ 2519{
2520 ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_get(pd->sd, pd->part)); 2520 ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_get(pd->sd, pd->part));
2521} 2521}
2522 2522
2523EOLIAN static Eina_Bool 2523EOLIAN static Eina_Bool
2524_efl_ui_layout_internal_part_efl_ui_cursor_cursor_style_set(Eo *obj, Elm_Part_Data *pd, const char *style) 2524_efl_ui_layout_part_efl_ui_cursor_cursor_style_set(Eo *obj, Elm_Part_Data *pd, const char *style)
2525{ 2525{
2526 ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_style_set(pd->sd, pd->part, style)); 2526 ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_style_set(pd->sd, pd->part, style));
2527} 2527}
2528 2528
2529EOLIAN static const char * 2529EOLIAN static const char *
2530_efl_ui_layout_internal_part_efl_ui_cursor_cursor_style_get(Eo *obj, Elm_Part_Data *pd) 2530_efl_ui_layout_part_efl_ui_cursor_cursor_style_get(Eo *obj, Elm_Part_Data *pd)
2531{ 2531{
2532 ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_style_get(pd->sd, pd->part)); 2532 ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_style_get(pd->sd, pd->part));
2533} 2533}
2534 2534
2535EOLIAN static Eina_Bool 2535EOLIAN static Eina_Bool
2536_efl_ui_layout_internal_part_efl_ui_cursor_cursor_theme_search_enabled_set(Eo *obj, Elm_Part_Data *pd, Eina_Bool allow) 2536_efl_ui_layout_part_efl_ui_cursor_cursor_theme_search_enabled_set(Eo *obj, Elm_Part_Data *pd, Eina_Bool allow)
2537{ 2537{
2538 ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_engine_only_set(pd->sd, pd->part, !allow)); 2538 ELM_PART_RETURN_VAL(_efl_ui_layout_part_cursor_engine_only_set(pd->sd, pd->part, !allow));
2539} 2539}
2540 2540
2541EOLIAN static Eina_Bool 2541EOLIAN static Eina_Bool
2542_efl_ui_layout_internal_part_efl_ui_cursor_cursor_theme_search_enabled_get(Eo *obj, Elm_Part_Data *pd) 2542_efl_ui_layout_part_efl_ui_cursor_cursor_theme_search_enabled_get(Eo *obj, Elm_Part_Data *pd)
2543{ 2543{
2544 ELM_PART_RETURN_VAL(!_efl_ui_layout_part_cursor_engine_only_get(pd->sd, pd->part)); 2544 ELM_PART_RETURN_VAL(!_efl_ui_layout_part_cursor_engine_only_get(pd->sd, pd->part));
2545} 2545}
@@ -2550,7 +2550,7 @@ ELM_PART_IMPLEMENT_CONTENT_GET(efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data,
2550ELM_PART_IMPLEMENT_CONTENT_UNSET(efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data, Elm_Part_Data) 2550ELM_PART_IMPLEMENT_CONTENT_UNSET(efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data, Elm_Part_Data)
2551ELM_PART_IMPLEMENT_TEXT_SET(efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data, Elm_Part_Data) 2551ELM_PART_IMPLEMENT_TEXT_SET(efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data, Elm_Part_Data)
2552ELM_PART_IMPLEMENT_TEXT_GET(efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data, Elm_Part_Data) 2552ELM_PART_IMPLEMENT_TEXT_GET(efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data, Elm_Part_Data)
2553#include "efl_ui_layout_internal_part.eo.c" 2553#include "efl_ui_layout_part.eo.c"
2554 2554
2555/* Efl.Part end */ 2555/* Efl.Part end */
2556 2556
diff --git a/src/lib/elementary/efl_ui_layout_pack.c b/src/lib/elementary/efl_ui_layout_pack.c
index e160af9..f002a34 100644
--- a/src/lib/elementary/efl_ui_layout_pack.c
+++ b/src/lib/elementary/efl_ui_layout_pack.c
@@ -3,8 +3,8 @@
3#endif 3#endif
4 4
5#define ELM_LAYOUT_PROTECTED 5#define ELM_LAYOUT_PROTECTED
6#define EFL_UI_LAYOUT_INTERNAL_BOX_PROTECTED 6#define EFL_UI_LAYOUT_PART_BOX_PROTECTED
7#define EFL_UI_LAYOUT_INTERNAL_TABLE_PROTECTED 7#define EFL_UI_LAYOUT_PART_TABLE_PROTECTED
8 8
9#include <Elementary.h> 9#include <Elementary.h>
10 10
@@ -12,8 +12,8 @@
12#include "elm_widget_layout.h" 12#include "elm_widget_layout.h"
13#include "elm_part_helper.h" 13#include "elm_part_helper.h"
14 14
15#include "efl_ui_layout_internal_box.eo.h" 15#include "efl_ui_layout_part_box.eo.h"
16#include "efl_ui_layout_internal_table.eo.h" 16#include "efl_ui_layout_part_table.eo.h"
17#include "../evas/canvas/evas_box.eo.h" 17#include "../evas/canvas/evas_box.eo.h"
18#include "../evas/canvas/evas_table.eo.h" 18#include "../evas/canvas/evas_table.eo.h"
19 19
@@ -28,8 +28,8 @@ Eina_Bool _efl_ui_layout_table_pack(Eo *obj, Efl_Ui_Layout_Data *sd, const ch
28Evas_Object *_efl_ui_layout_table_unpack(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child); 28Evas_Object *_efl_ui_layout_table_unpack(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child);
29Eina_Bool _efl_ui_layout_table_clear(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Eina_Bool clear); 29Eina_Bool _efl_ui_layout_table_clear(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Eina_Bool clear);
30 30
31#define BOX_CLASS EFL_UI_LAYOUT_INTERNAL_BOX_CLASS 31#define BOX_CLASS EFL_UI_LAYOUT_PART_BOX_CLASS
32#define TABLE_CLASS EFL_UI_LAYOUT_INTERNAL_TABLE_CLASS 32#define TABLE_CLASS EFL_UI_LAYOUT_PART_TABLE_CLASS
33 33
34typedef struct _Layout_Part_Data Efl_Ui_Layout_Box_Data; 34typedef struct _Layout_Part_Data Efl_Ui_Layout_Box_Data;
35typedef struct _Layout_Part_Data Efl_Ui_Layout_Table_Data; 35typedef 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
56{ 56{
57 if (type == EDJE_PART_TYPE_BOX) 57 if (type == EDJE_PART_TYPE_BOX)
58 return efl_add(BOX_CLASS, obj, 58 return efl_add(BOX_CLASS, obj,
59 efl_ui_layout_internal_box_real_part_set(efl_added, obj, part)); 59 efl_ui_layout_part_box_real_part_set(efl_added, obj, part));
60 else if (type == EDJE_PART_TYPE_TABLE) 60 else if (type == EDJE_PART_TYPE_TABLE)
61 return efl_add(TABLE_CLASS, obj, 61 return efl_add(TABLE_CLASS, obj,
62 efl_ui_layout_internal_table_real_part_set(efl_added, obj, part)); 62 efl_ui_layout_part_table_real_part_set(efl_added, obj, part));
63 else 63 else
64 return NULL; 64 return NULL;
65} 65}
66 66
67EOLIAN static void 67EOLIAN static void
68_efl_ui_layout_internal_box_efl_object_destructor(Eo *obj, Efl_Ui_Layout_Table_Data *pd) 68_efl_ui_layout_part_box_efl_object_destructor(Eo *obj, Efl_Ui_Layout_Table_Data *pd)
69{ 69{
70 ELM_PART_HOOK; 70 ELM_PART_HOOK;
71 efl_data_xunref(pd->obj, pd->sd, obj); 71 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
74} 74}
75 75
76EOLIAN static void 76EOLIAN static void
77_efl_ui_layout_internal_box_real_part_set(Eo *obj, Efl_Ui_Layout_Box_Data *pd, Eo *layout, const char *part) 77_efl_ui_layout_part_box_real_part_set(Eo *obj, Efl_Ui_Layout_Box_Data *pd, Eo *layout, const char *part)
78{ 78{
79 pd->obj = layout; 79 pd->obj = layout;
80 pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_CLASS, obj); 80 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
133} 133}
134 134
135EOLIAN static Eina_Iterator * 135EOLIAN static Eina_Iterator *
136_efl_ui_layout_internal_box_efl_container_content_iterate(Eo *obj, Efl_Ui_Layout_Box_Data *pd) 136_efl_ui_layout_part_box_efl_container_content_iterate(Eo *obj, Efl_Ui_Layout_Box_Data *pd)
137{ 137{
138 Eina_Iterator *it; 138 Eina_Iterator *it;
139 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); 139 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
142} 142}
143 143
144EOLIAN static int 144EOLIAN static int
145_efl_ui_layout_internal_box_efl_container_content_count(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd) 145_efl_ui_layout_part_box_efl_container_content_count(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd)
146{ 146{
147 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); 147 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part);
148 ELM_PART_RETURN_VAL(evas_obj_box_count(pack)); 148 ELM_PART_RETURN_VAL(evas_obj_box_count(pack));
149} 149}
150 150
151EOLIAN static Eina_Bool 151EOLIAN static Eina_Bool
152_efl_ui_layout_internal_box_efl_pack_pack_clear(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd) 152_efl_ui_layout_part_box_efl_pack_pack_clear(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd)
153{ 153{
154 ELM_PART_RETURN_VAL(_efl_ui_layout_box_remove_all(pd->obj, pd->sd, pd->part, EINA_TRUE)); 154 ELM_PART_RETURN_VAL(_efl_ui_layout_box_remove_all(pd->obj, pd->sd, pd->part, EINA_TRUE));
155} 155}
156 156
157EOLIAN static Eina_Bool 157EOLIAN static Eina_Bool
158_efl_ui_layout_internal_box_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd) 158_efl_ui_layout_part_box_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd)
159{ 159{
160 ELM_PART_RETURN_VAL(_efl_ui_layout_box_remove_all(pd->obj, pd->sd, pd->part, EINA_FALSE)); 160 ELM_PART_RETURN_VAL(_efl_ui_layout_box_remove_all(pd->obj, pd->sd, pd->part, EINA_FALSE));
161} 161}
162 162
163EOLIAN static Eina_Bool 163EOLIAN static Eina_Bool
164_efl_ui_layout_internal_box_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj) 164_efl_ui_layout_part_box_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
165{ 165{
166 ELM_PART_RETURN_VAL(_efl_ui_layout_box_remove(pd->obj, pd->sd, pd->part, subobj) != NULL); 166 ELM_PART_RETURN_VAL(_efl_ui_layout_box_remove(pd->obj, pd->sd, pd->part, subobj) != NULL);
167} 167}
168 168
169EOLIAN static Eina_Bool 169EOLIAN static Eina_Bool
170_efl_ui_layout_internal_box_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *content) 170_efl_ui_layout_part_box_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *content)
171{ 171{
172 // alias for efl_pack_unpack 172 // alias for efl_pack_unpack
173 return _efl_ui_layout_internal_box_efl_pack_unpack(obj, pd, content); 173 return _efl_ui_layout_part_box_efl_pack_unpack(obj, pd, content);
174} 174}
175 175
176EOLIAN static Eina_Bool 176EOLIAN static Eina_Bool
177_efl_ui_layout_internal_box_efl_pack_pack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj) 177_efl_ui_layout_part_box_efl_pack_pack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
178{ 178{
179 ELM_PART_RETURN_VAL(_efl_ui_layout_box_append(pd->obj, pd->sd, pd->part, subobj)); 179 ELM_PART_RETURN_VAL(_efl_ui_layout_box_append(pd->obj, pd->sd, pd->part, subobj));
180} 180}
181 181
182EOLIAN static Eina_Bool 182EOLIAN static Eina_Bool
183_efl_ui_layout_internal_box_efl_pack_linear_pack_begin(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj) 183_efl_ui_layout_part_box_efl_pack_linear_pack_begin(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
184{ 184{
185 ELM_PART_RETURN_VAL(_efl_ui_layout_box_prepend(pd->obj, pd->sd, pd->part, subobj)); 185 ELM_PART_RETURN_VAL(_efl_ui_layout_box_prepend(pd->obj, pd->sd, pd->part, subobj));
186} 186}
187 187
188EOLIAN static Eina_Bool 188EOLIAN static Eina_Bool
189_efl_ui_layout_internal_box_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj) 189_efl_ui_layout_part_box_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
190{ 190{
191 ELM_PART_RETURN_VAL(_efl_ui_layout_box_append(pd->obj, pd->sd, pd->part, subobj)); 191 ELM_PART_RETURN_VAL(_efl_ui_layout_box_append(pd->obj, pd->sd, pd->part, subobj));
192} 192}
193 193
194EOLIAN static Eina_Bool 194EOLIAN static Eina_Bool
195_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) 195_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)
196{ 196{
197 ELM_PART_RETURN_VAL(_efl_ui_layout_box_insert_before(pd->obj, pd->sd, pd->part, subobj, existing)); 197 ELM_PART_RETURN_VAL(_efl_ui_layout_box_insert_before(pd->obj, pd->sd, pd->part, subobj, existing));
198} 198}
199 199
200EOLIAN static Eina_Bool 200EOLIAN static Eina_Bool
201_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) 201_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)
202{ 202{
203 const Efl_Gfx *other; 203 const Efl_Gfx *other;
204 int index; 204 int index;
@@ -215,13 +215,13 @@ _efl_ui_layout_internal_box_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED, Efl_
215} 215}
216 216
217EOLIAN static Eina_Bool 217EOLIAN static Eina_Bool
218_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) 218_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)
219{ 219{
220 ELM_PART_RETURN_VAL(_efl_ui_layout_box_insert_at(pd->obj, pd->sd, pd->part, subobj, index)); 220 ELM_PART_RETURN_VAL(_efl_ui_layout_box_insert_at(pd->obj, pd->sd, pd->part, subobj, index));
221} 221}
222 222
223EOLIAN static Efl_Gfx * 223EOLIAN static Efl_Gfx *
224_efl_ui_layout_internal_box_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, int index) 224_efl_ui_layout_part_box_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, int index)
225{ 225{
226 Evas_Object_Box_Option *opt; 226 Evas_Object_Box_Option *opt;
227 Evas_Object_Box_Data *priv; 227 Evas_Object_Box_Data *priv;
@@ -234,7 +234,7 @@ _efl_ui_layout_internal_box_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED
234} 234}
235 235
236EOLIAN static Efl_Gfx * 236EOLIAN static Efl_Gfx *
237_efl_ui_layout_internal_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Layout_Box_Data *pd, int index) 237_efl_ui_layout_part_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Layout_Box_Data *pd, int index)
238{ 238{
239 Efl_Gfx *subobj; 239 Efl_Gfx *subobj;
240 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); 240 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
249} 249}
250 250
251EOLIAN static int 251EOLIAN static int
252_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) 252_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)
253{ 253{
254 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); 254 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part);
255 ELM_PART_RETURN_VAL(efl_pack_index_get(pack, subobj)); 255 ELM_PART_RETURN_VAL(efl_pack_index_get(pack, subobj));
256} 256}
257 257
258EOLIAN static Efl_Orient 258EOLIAN static Efl_Orient
259_efl_ui_layout_internal_box_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd) 259_efl_ui_layout_part_box_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd)
260{ 260{
261 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_ORIENT_NONE); 261 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_ORIENT_NONE);
262 262
@@ -267,7 +267,7 @@ _efl_ui_layout_internal_box_efl_orientation_orientation_get(Eo *obj EINA_UNUSED,
267/* Table proxy implementation */ 267/* Table proxy implementation */
268 268
269EOLIAN static void 269EOLIAN static void
270_efl_ui_layout_internal_table_real_part_set(Eo *obj, Efl_Ui_Layout_Table_Data *pd, Eo *layout, const char *part) 270_efl_ui_layout_part_table_real_part_set(Eo *obj, Efl_Ui_Layout_Table_Data *pd, Eo *layout, const char *part)
271{ 271{
272 pd->obj = layout; 272 pd->obj = layout;
273 pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_CLASS, obj); 273 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
276} 276}
277 277
278EOLIAN static void 278EOLIAN static void
279_efl_ui_layout_internal_table_efl_object_destructor(Eo *obj, Efl_Ui_Layout_Table_Data *pd) 279_efl_ui_layout_part_table_efl_object_destructor(Eo *obj, Efl_Ui_Layout_Table_Data *pd)
280{ 280{
281 ELM_PART_HOOK; 281 ELM_PART_HOOK;
282 efl_data_xunref(pd->obj, pd->sd, obj); 282 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
285} 285}
286 286
287EOLIAN static Eina_Iterator * 287EOLIAN static Eina_Iterator *
288_efl_ui_layout_internal_table_efl_container_content_iterate(Eo *obj, Efl_Ui_Layout_Table_Data *pd) 288_efl_ui_layout_part_table_efl_container_content_iterate(Eo *obj, Efl_Ui_Layout_Table_Data *pd)
289{ 289{
290 Eina_Iterator *it; 290 Eina_Iterator *it;
291 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); 291 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
296} 296}
297 297
298EOLIAN static int 298EOLIAN static int
299_efl_ui_layout_internal_table_efl_container_content_count(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd) 299_efl_ui_layout_part_table_efl_container_content_count(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd)
300{ 300{
301 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); 301 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part);
302 ELM_PART_RETURN_VAL(evas_obj_table_count(pack)); 302 ELM_PART_RETURN_VAL(evas_obj_table_count(pack));
303} 303}
304 304
305EOLIAN static Eina_Bool 305EOLIAN static Eina_Bool
306_efl_ui_layout_internal_table_efl_pack_pack_clear(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd) 306_efl_ui_layout_part_table_efl_pack_pack_clear(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd)
307{ 307{
308 ELM_PART_RETURN_VAL(_efl_ui_layout_table_clear(pd->obj, pd->sd, pd->part, EINA_TRUE)); 308 ELM_PART_RETURN_VAL(_efl_ui_layout_table_clear(pd->obj, pd->sd, pd->part, EINA_TRUE));
309} 309}
310 310
311EOLIAN static Eina_Bool 311EOLIAN static Eina_Bool
312_efl_ui_layout_internal_table_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd) 312_efl_ui_layout_part_table_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd)
313{ 313{
314 ELM_PART_RETURN_VAL(_efl_ui_layout_table_clear(pd->obj, pd->sd, pd->part, EINA_FALSE)); 314 ELM_PART_RETURN_VAL(_efl_ui_layout_table_clear(pd->obj, pd->sd, pd->part, EINA_FALSE));
315} 315}
316 316
317EOLIAN static Eina_Bool 317EOLIAN static Eina_Bool
318_efl_ui_layout_internal_table_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *subobj) 318_efl_ui_layout_part_table_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *subobj)
319{ 319{
320 if (!subobj) ELM_PART_RETURN_VAL(EINA_FALSE); 320 if (!subobj) ELM_PART_RETURN_VAL(EINA_FALSE);
321 ELM_PART_RETURN_VAL(_efl_ui_layout_table_unpack(pd->obj, pd->sd, pd->part, subobj) == subobj); 321 ELM_PART_RETURN_VAL(_efl_ui_layout_table_unpack(pd->obj, pd->sd, pd->part, subobj) == subobj);
322} 322}
323 323
324EOLIAN static Eina_Bool 324EOLIAN static Eina_Bool
325_efl_ui_layout_internal_table_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *content) 325_efl_ui_layout_part_table_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *content)
326{ 326{
327 // alias for efl_pack_unpack 327 // alias for efl_pack_unpack
328 return _efl_ui_layout_internal_table_efl_pack_unpack(obj, pd, content); 328 return _efl_ui_layout_part_table_efl_pack_unpack(obj, pd, content);
329} 329}
330 330
331EOLIAN static Eina_Bool 331EOLIAN static Eina_Bool
332_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) 332_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)
333{ 333{
334 ELM_PART_RETURN_VAL(_efl_ui_layout_table_pack(pd->obj, pd->sd, pd->part, subobj, col, row, colspan, rowspan)); 334 ELM_PART_RETURN_VAL(_efl_ui_layout_table_pack(pd->obj, pd->sd, pd->part, subobj, col, row, colspan, rowspan));
335} 335}
336 336
337EOLIAN static Efl_Gfx * 337EOLIAN static Efl_Gfx *
338_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) 338_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)
339{ 339{
340 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); 340 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part);
341 ELM_PART_RETURN_VAL(evas_object_table_child_get(pack, col, row)); 341 ELM_PART_RETURN_VAL(evas_object_table_child_get(pack, col, row));
342} 342}
343 343
344EOLIAN static Eina_Iterator * 344EOLIAN static Eina_Iterator *
345_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) 345_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)
346{ 346{
347 // contents at col,row - see also Efl.Ui.Grid or edje_containers.c 347 // contents at col,row - see also Efl.Ui.Grid or edje_containers.c
348 // not reusing edje's iterator because the container would be wrong 348 // 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
371} 371}
372 372
373EOLIAN static Eina_Bool 373EOLIAN static Eina_Bool
374_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) 374_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)
375{ 375{
376 unsigned short c, r, cs, rs; 376 unsigned short c, r, cs, rs;
377 Eina_Bool ret; 377 Eina_Bool ret;
@@ -387,14 +387,14 @@ _efl_ui_layout_internal_table_efl_pack_grid_grid_position_get(Eo *obj EINA_UNUSE
387} 387}
388 388
389EOLIAN static void 389EOLIAN static void
390_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) 390_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)
391{ 391{
392 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); 392 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part);
393 evas_object_table_col_row_size_get(pack, cols, rows); 393 evas_object_table_col_row_size_get(pack, cols, rows);
394} 394}
395 395
396EOLIAN static int 396EOLIAN static int
397_efl_ui_layout_internal_table_efl_pack_grid_grid_columns_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd) 397_efl_ui_layout_part_table_efl_pack_grid_grid_columns_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd)
398{ 398{
399 int cols, rows; 399 int cols, rows;
400 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); 400 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
403} 403}
404 404
405EOLIAN static int 405EOLIAN static int
406_efl_ui_layout_internal_table_efl_pack_grid_grid_rows_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd) 406_efl_ui_layout_part_table_efl_pack_grid_grid_rows_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd)
407{ 407{
408 int cols, rows; 408 int cols, rows;
409 Eo *pack = (Eo *) edje_object_part_object_get(pd->obj, pd->part); 409 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
411 ELM_PART_RETURN_VAL(rows); 411 ELM_PART_RETURN_VAL(rows);
412} 412}
413 413
414#include "efl_ui_layout_internal_box.eo.c" 414#include "efl_ui_layout_part_box.eo.c"
415#include "efl_ui_layout_internal_table.eo.c" 415#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
index 1d7ab39..dd075c2 100644
--- a/src/lib/elementary/efl_ui_layout_internal_part.eo
+++ b/src/lib/elementary/efl_ui_layout_part.eo
@@ -1,5 +1,4 @@
1class Efl.Ui.Layout.Internal.Part (Efl.Object, Efl.Container, Efl.Text, 1class Efl.Ui.Layout.Part (Efl.Object, Efl.Container, Efl.Text, Efl.Ui.Cursor)
2 Efl.Ui.Cursor)
3{ 2{
4 [[Elementary layout internal part class]] 3 [[Elementary layout internal part class]]
5 data: Elm_Part_Data; 4 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
index 6278368..a0e7296 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 @@
1class Efl.Ui.Layout_Internal.Box (Efl.Object, Efl.Pack.Linear, 1class Efl.Ui.Layout.Part.Box (Efl.Object, Efl.Pack.Linear,
2 Efl.Orientation) 2 Efl.Orientation)
3{ 3{
4 [[Represents a Box created as part of a layout. 4 [[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
index 7104c9b..495aa6e 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 @@
1class Efl.Ui.Layout_Internal.Table (Efl.Object, Efl.Pack.Grid) 1class Efl.Ui.Layout.Part.Table (Efl.Object, Efl.Pack.Grid)
2{ 2{
3 [[Represents a Table created as part of a layout. 3 [[Represents a Table created as part of a layout.
4 4
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index 0163b95..98a331c 100644
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -12,7 +12,7 @@
12#include "elm_widget_layout.h" 12#include "elm_widget_layout.h"
13#include "efl_ui_panes_private.h" 13#include "efl_ui_panes_private.h"
14 14
15#include "efl_ui_panes_internal_part.eo.h" 15#include "efl_ui_panes_part.eo.h"
16#include "elm_part_helper.h" 16#include "elm_part_helper.h"
17 17
18#define MY_CLASS EFL_UI_PANES_CLASS 18#define MY_CLASS EFL_UI_PANES_CLASS
@@ -534,9 +534,9 @@ _efl_ui_panes_class_constructor(Efl_Class *klass)
534ELM_PART_OVERRIDE(efl_ui_panes, EFL_UI_PANES, EFL_UI_LAYOUT, Efl_Ui_Panes_Data, Elm_Part_Data) 534ELM_PART_OVERRIDE(efl_ui_panes, EFL_UI_PANES, EFL_UI_LAYOUT, Efl_Ui_Panes_Data, Elm_Part_Data)
535 535
536EOLIAN static void 536EOLIAN static void
537_efl_ui_panes_internal_part_hint_min_allow_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, Eina_Bool allow) 537_efl_ui_panes_part_hint_min_allow_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, Eina_Bool allow)
538{ 538{
539 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); 539 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_PART_CLASS);
540 Efl_Ui_Panes_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PANES_CLASS); 540 Efl_Ui_Panes_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PANES_CLASS);
541 541
542 if (!strcmp(pd->part, "first")) 542 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_
554} 554}
555 555
556EOLIAN static Eina_Bool 556EOLIAN static Eina_Bool
557_efl_ui_panes_internal_part_hint_min_allow_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED) 557_efl_ui_panes_part_hint_min_allow_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED)
558{ 558{
559 Eina_Bool ret = EINA_FALSE; 559 Eina_Bool ret = EINA_FALSE;
560 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); 560 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_PART_CLASS);
561 Efl_Ui_Panes_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PANES_CLASS); 561 Efl_Ui_Panes_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PANES_CLASS);
562 562
563 if (!strcmp(pd->part, "first")) 563 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_
573} 573}
574 574
575EOLIAN static double 575EOLIAN static double
576_efl_ui_panes_internal_part_split_ratio_min_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED) 576_efl_ui_panes_part_split_ratio_min_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED)
577{ 577{
578 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); 578 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_PART_CLASS);
579 Efl_Ui_Panes_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PANES_CLASS); 579 Efl_Ui_Panes_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PANES_CLASS);
580 double ret = 0.0; 580 double ret = 0.0;
581 581
@@ -588,9 +588,9 @@ _efl_ui_panes_internal_part_split_ratio_min_get(Eo *obj, Elm_Part_Data *_pd EINA
588} 588}
589 589
590EOLIAN static void 590EOLIAN static void
591_efl_ui_panes_internal_part_split_ratio_min_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, double ratio) 591_efl_ui_panes_part_split_ratio_min_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, double ratio)
592{ 592{
593 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); 593 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_PART_CLASS);
594 Efl_Ui_Panes_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PANES_CLASS); 594 Efl_Ui_Panes_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PANES_CLASS);
595 595
596 if (!strcmp(pd->part, "first")) 596 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
607 } 607 }
608} 608}
609 609
610#include "efl_ui_panes_internal_part.eo.c" 610#include "efl_ui_panes_part.eo.c"
611 611
612/* Efl.Part end */ 612/* Efl.Part end */
613 613
diff --git a/src/lib/elementary/efl_ui_panes_internal_part.eo b/src/lib/elementary/efl_ui_panes_part.eo
index 473deca..322fd5e 100644
--- a/src/lib/elementary/efl_ui_panes_internal_part.eo
+++ b/src/lib/elementary/efl_ui_panes_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Panes.Internal.Part (Efl.Ui.Layout.Internal.Part) 1class Efl.Ui.Panes.Part (Efl.Ui.Layout.Part)
2{ 2{
3 [[Elementary Panes internal part class]] 3 [[Elementary Panes internal part class]]
4 data: Elm_Part_Data; 4 data: Elm_Part_Data;
diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index 8af271b..7e02911 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -11,7 +11,7 @@
11#include "efl_ui_progressbar_private.h" 11#include "efl_ui_progressbar_private.h"
12#include "elm_widget_layout.h" 12#include "elm_widget_layout.h"
13 13
14#include "efl_ui_progressbar_internal_part.eo.h" 14#include "efl_ui_progressbar_part.eo.h"
15#include "elm_part_helper.h" 15#include "elm_part_helper.h"
16 16
17#define MY_CLASS EFL_UI_PROGRESSBAR_CLASS 17#define MY_CLASS EFL_UI_PROGRESSBAR_CLASS
@@ -644,32 +644,32 @@ _efl_ui_progressbar_class_constructor(Efl_Class *klass)
644ELM_PART_OVERRIDE(efl_ui_progressbar, EFL_UI_PROGRESSBAR, EFL_UI_LAYOUT, Efl_Ui_Progressbar_Data, Elm_Part_Data) 644ELM_PART_OVERRIDE(efl_ui_progressbar, EFL_UI_PROGRESSBAR, EFL_UI_LAYOUT, Efl_Ui_Progressbar_Data, Elm_Part_Data)
645 645
646static EOLIAN Eina_Bool 646static EOLIAN Eina_Bool
647_efl_ui_progressbar_internal_part_efl_container_content_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, Efl_Gfx *content) 647_efl_ui_progressbar_part_efl_container_content_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, Efl_Gfx *content)
648{ 648{
649 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); 649 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_PART_CLASS);
650 Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS); 650 Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS);
651 ELM_PART_RETURN_VAL(_efl_ui_progressbar_content_set(pd->obj, sd, pd->part, content)); 651 ELM_PART_RETURN_VAL(_efl_ui_progressbar_content_set(pd->obj, sd, pd->part, content));
652} 652}
653 653
654EOLIAN static void 654EOLIAN static void
655_efl_ui_progressbar_internal_part_efl_ui_range_range_value_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, double val) 655_efl_ui_progressbar_part_efl_ui_range_range_value_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, double val)
656{ 656{
657 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); 657 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_PART_CLASS);
658 Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS); 658 Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS);
659 659
660 _progressbar_part_value_set(pd->obj, sd, pd->part, val); 660 _progressbar_part_value_set(pd->obj, sd, pd->part, val);
661} 661}
662 662
663EOLIAN static double 663EOLIAN static double
664_efl_ui_progressbar_internal_part_efl_ui_range_range_value_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED) 664_efl_ui_progressbar_part_efl_ui_range_range_value_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED)
665{ 665{
666 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); 666 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_PART_CLASS);
667 Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS); 667 Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS);
668 668
669 return _progressbar_part_value_get(sd, pd->part); 669 return _progressbar_part_value_get(sd, pd->part);
670} 670}
671 671
672#include "efl_ui_progressbar_internal_part.eo.c" 672#include "efl_ui_progressbar_part.eo.c"
673 673
674/* Efl.Part end */ 674/* Efl.Part end */
675 675
diff --git a/src/lib/elementary/efl_ui_progressbar_internal_part.eo b/src/lib/elementary/efl_ui_progressbar_part.eo
index 18dbc7f..1705154 100644
--- a/src/lib/elementary/efl_ui_progressbar_internal_part.eo
+++ b/src/lib/elementary/efl_ui_progressbar_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Progressbar.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Ui.Range) 1class Efl.Ui.Progressbar.Part (Efl.Ui.Layout.Part, Efl.Ui.Range)
2{ 2{
3 [[Elementary progressbar internal part class]] 3 [[Elementary progressbar internal part class]]
4 data: Elm_Part_Data; 4 data: Elm_Part_Data;
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index 3bc1f67..581c3e1 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -13,7 +13,7 @@
13#include "efl_ui_slider_private.h" 13#include "efl_ui_slider_private.h"
14#include "elm_widget_layout.h" 14#include "elm_widget_layout.h"
15 15
16#include "efl_ui_slider_internal_part.eo.h" 16#include "efl_ui_slider_part.eo.h"
17#include "elm_part_helper.h" 17#include "elm_part_helper.h"
18 18
19#define MY_CLASS EFL_UI_SLIDER_CLASS 19#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
1524} 1524}
1525 1525
1526static EOLIAN Eina_Bool 1526static EOLIAN Eina_Bool
1527_efl_ui_slider_internal_part_efl_container_content_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, Efl_Gfx *content) 1527_efl_ui_slider_part_efl_container_content_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, Efl_Gfx *content)
1528{ 1528{
1529 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); 1529 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_PART_CLASS);
1530 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS); 1530 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS);
1531 ELM_PART_RETURN_VAL(_efl_ui_slider_content_set(pd->obj, sd, pd->part, content)); 1531 ELM_PART_RETURN_VAL(_efl_ui_slider_content_set(pd->obj, sd, pd->part, content));
1532} 1532}
@@ -1565,18 +1565,18 @@ _span_size_set(Eo *obj, Efl_Ui_Slider_Data *sd, int w, int h)
1565} 1565}
1566 1566
1567EOLIAN void 1567EOLIAN void
1568_efl_ui_slider_internal_part_efl_gfx_size_hint_hint_min_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, int w, int h) 1568_efl_ui_slider_part_efl_gfx_size_hint_hint_min_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, int w, int h)
1569{ 1569{
1570 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); 1570 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_PART_CLASS);
1571 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS); 1571 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS);
1572 1572
1573 _span_size_set(pd->obj, sd, w, h); 1573 _span_size_set(pd->obj, sd, w, h);
1574} 1574}
1575 1575
1576EOLIAN void 1576EOLIAN void
1577_efl_ui_slider_internal_part_efl_gfx_size_hint_hint_min_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, int *w, int *h) 1577_efl_ui_slider_part_efl_gfx_size_hint_hint_min_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, int *w, int *h)
1578{ 1578{
1579 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_INTERNAL_PART_CLASS); 1579 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_LAYOUT_PART_CLASS);
1580 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS); 1580 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS);
1581 1581
1582 if (_is_horizontal(sd->dir)) 1582 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
1591 } 1591 }
1592} 1592}
1593 1593
1594#include "efl_ui_slider_internal_part.eo.c" 1594#include "efl_ui_slider_part.eo.c"
1595/* Efl.Part end */ 1595/* Efl.Part end */
1596 1596
1597/* Legacy APIs */ 1597/* Legacy APIs */
diff --git a/src/lib/elementary/efl_ui_slider_internal_part.eo b/src/lib/elementary/efl_ui_slider_part.eo
index 8ea97e4..0496ff2 100644
--- a/src/lib/elementary/efl_ui_slider_internal_part.eo
+++ b/src/lib/elementary/efl_ui_slider_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Slider.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Gfx.Size.Hint) 1class Efl.Ui.Slider.Part (Efl.Ui.Layout.Part, Efl.Gfx.Size.Hint)
2{ 2{
3 [[Elementary slider internal part class]] 3 [[Elementary slider internal part class]]
4 data: Elm_Part_Data; 4 data: Elm_Part_Data;
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index fccb5c8..24aa926 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -11,7 +11,7 @@
11#include <Elementary_Cursor.h> 11#include <Elementary_Cursor.h>
12#include "elm_priv.h" 12#include "elm_priv.h"
13 13
14//#include "elm_entry_internal_part.eo.h" 14//#include "elm_entry_part.eo.h"
15//#include "elm_part_helper.h" 15//#include "elm_part_helper.h"
16// 16//
17#include "elm_interface_scrollable.h" 17#include "elm_interface_scrollable.h"
@@ -5346,7 +5346,7 @@ _efl_ui_text_move_cb(void *data, Evas *e EINA_UNUSED,
5346ELM_PART_OVERRIDE(elm_entry, EFL_UI_TEXT, EFL_UI_LAYOUT, Efl_Ui_Text_Data, Elm_Part_Data) 5346ELM_PART_OVERRIDE(elm_entry, EFL_UI_TEXT, EFL_UI_LAYOUT, Efl_Ui_Text_Data, Elm_Part_Data)
5347ELM_PART_OVERRIDE_CONTENT_SET(elm_entry, EFL_UI_TEXT, EFL_UI_LAYOUT, Efl_Ui_Text_Data, Elm_Part_Data) 5347ELM_PART_OVERRIDE_CONTENT_SET(elm_entry, EFL_UI_TEXT, EFL_UI_LAYOUT, Efl_Ui_Text_Data, Elm_Part_Data)
5348ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, EFL_UI_TEXT, EFL_UI_LAYOUT, Efl_Ui_Text_Data, Elm_Part_Data) 5348ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, EFL_UI_TEXT, EFL_UI_LAYOUT, Efl_Ui_Text_Data, Elm_Part_Data)
5349#include "elm_entry_internal_part.eo.c" 5349#include "elm_entry_part.eo.c"
5350 5350
5351/* Efl.Part end */ 5351/* Efl.Part end */
5352#endif 5352#endif
diff --git a/src/lib/elementary/efl_ui_textpath.c b/src/lib/elementary/efl_ui_textpath.c
index c5ff22a..5eb5ac0 100644
--- a/src/lib/elementary/efl_ui_textpath.c
+++ b/src/lib/elementary/efl_ui_textpath.c
@@ -8,7 +8,7 @@
8#include "elm_priv.h" 8#include "elm_priv.h"
9 9
10#include "elm_widget_layout.h" 10#include "elm_widget_layout.h"
11#include "efl_ui_textpath_internal_part.eo.h" 11#include "efl_ui_textpath_part.eo.h"
12#include "elm_part_helper.h" 12#include "elm_part_helper.h"
13 13
14 14
@@ -660,7 +660,7 @@ _efl_ui_textpath_ellipsis_get(Eo *obj EINA_UNUSED, Efl_Ui_Textpath_Data *pd)
660ELM_PART_OVERRIDE(efl_ui_textpath, EFL_UI_TEXTPATH, EFL_UI_LAYOUT, Efl_Ui_Textpath_Data, Elm_Part_Data) 660ELM_PART_OVERRIDE(efl_ui_textpath, EFL_UI_TEXTPATH, EFL_UI_LAYOUT, Efl_Ui_Textpath_Data, Elm_Part_Data)
661ELM_PART_OVERRIDE_TEXT_SET(efl_ui_textpath, EFL_UI_TEXTPATH, EFL_UI_LAYOUT, Efl_Ui_Textpath_Data, Elm_Part_Data) 661ELM_PART_OVERRIDE_TEXT_SET(efl_ui_textpath, EFL_UI_TEXTPATH, EFL_UI_LAYOUT, Efl_Ui_Textpath_Data, Elm_Part_Data)
662ELM_PART_OVERRIDE_TEXT_GET(efl_ui_textpath, EFL_UI_TEXTPATH, EFL_UI_LAYOUT, Efl_Ui_Textpath_Data, Elm_Part_Data) 662ELM_PART_OVERRIDE_TEXT_GET(efl_ui_textpath, EFL_UI_TEXTPATH, EFL_UI_LAYOUT, Efl_Ui_Textpath_Data, Elm_Part_Data)
663#include "efl_ui_textpath_internal_part.eo.c" 663#include "efl_ui_textpath_part.eo.c"
664/* Efl.Part end */ 664/* Efl.Part end */
665 665
666#define EFL_UI_TEXTPATH_EXTRA_OPS \ 666#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
index daba6f3..026f9b6 100644
--- a/src/lib/elementary/efl_ui_textpath_internal_part.eo
+++ b/src/lib/elementary/efl_ui_textpath_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Textpath.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text) 1class Efl.Ui.Textpath.Part (Efl.Ui.Layout.Part, Efl.Text)
2{ 2{
3 [[Efl UI Textpath internal part class]] 3 [[Efl UI Textpath internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 84b986c..3d0a2d6 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -27,7 +27,7 @@
27#include "interfaces/efl_common_internal.h" 27#include "interfaces/efl_common_internal.h"
28 28
29#include "elm_part_helper.h" 29#include "elm_part_helper.h"
30#include "efl_ui_win_internal_part.eo.h" 30#include "efl_ui_win_part.eo.h"
31 31
32#define MY_CLASS EFL_UI_WIN_CLASS 32#define MY_CLASS EFL_UI_WIN_CLASS
33#define MY_CLASS_NAME "Efl.Ui.Win" 33#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
6991/* Efl.Part begin */ 6991/* Efl.Part begin */
6992 6992
6993static void 6993static void
6994_efl_ui_win_internal_part_efl_gfx_color_set(Eo *obj, Elm_Part_Data *pd, int r, int g, int b, int a) 6994_efl_ui_win_part_efl_gfx_color_set(Eo *obj, Elm_Part_Data *pd, int r, int g, int b, int a)
6995{ 6995{
6996 if (EVAS_COLOR_SANITIZE(r, g, b, a)) 6996 if (EVAS_COLOR_SANITIZE(r, g, b, a))
6997 ERR("Evas only handles premultiplied colors (0 <= R,G,B <= A <= 255)"); 6997 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
7001} 7001}
7002 7002
7003static void 7003static void
7004_efl_ui_win_internal_part_efl_gfx_color_get(Eo *obj, Elm_Part_Data *pd, int *r, int *g, int *b, int *a) 7004_efl_ui_win_part_efl_gfx_color_get(Eo *obj, Elm_Part_Data *pd, int *r, int *g, int *b, int *a)
7005{ 7005{
7006 _efl_ui_win_part_color_get(pd->obj, pd->sd, pd->part, r, g, b, a); 7006 _efl_ui_win_part_color_get(pd->obj, pd->sd, pd->part, r, g, b, a);
7007 ELM_PART_RETURN_VOID; 7007 ELM_PART_RETURN_VOID;
7008} 7008}
7009 7009
7010static Eina_Bool 7010static Eina_Bool
7011_efl_ui_win_internal_part_efl_file_file_set(Eo *obj, Elm_Part_Data *pd, const char *file, const char *key) 7011_efl_ui_win_part_efl_file_file_set(Eo *obj, Elm_Part_Data *pd, const char *file, const char *key)
7012{ 7012{
7013 ELM_PART_RETURN_VAL(_efl_ui_win_part_file_set(pd->obj, pd->sd, pd->part, file, key)); 7013 ELM_PART_RETURN_VAL(_efl_ui_win_part_file_set(pd->obj, pd->sd, pd->part, file, key));
7014} 7014}
7015 7015
7016static void 7016static void
7017_efl_ui_win_internal_part_efl_file_file_get(Eo *obj, Elm_Part_Data *pd, const char **file, const char **key) 7017_efl_ui_win_part_efl_file_file_get(Eo *obj, Elm_Part_Data *pd, const char **file, const char **key)
7018{ 7018{
7019 _efl_ui_win_part_file_get(pd->obj, pd->sd, pd->part, file, key); 7019 _efl_ui_win_part_file_get(pd->obj, pd->sd, pd->part, file, key);
7020 ELM_PART_RETURN_VOID; 7020 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
7043ELM_PART_IMPLEMENT_CONTENT_GET(efl_ui_win, EFL_UI_WIN, Efl_Ui_Win_Data, Elm_Part_Data) 7043ELM_PART_IMPLEMENT_CONTENT_GET(efl_ui_win, EFL_UI_WIN, Efl_Ui_Win_Data, Elm_Part_Data)
7044ELM_PART_IMPLEMENT_CONTENT_UNSET(efl_ui_win, EFL_UI_WIN, Efl_Ui_Win_Data, Elm_Part_Data) 7044ELM_PART_IMPLEMENT_CONTENT_UNSET(efl_ui_win, EFL_UI_WIN, Efl_Ui_Win_Data, Elm_Part_Data)
7045ELM_PART_CONTENT_DEFAULT_SET(efl_ui_win, "content") 7045ELM_PART_CONTENT_DEFAULT_SET(efl_ui_win, "content")
7046#include "efl_ui_win_internal_part.eo.c" 7046#include "efl_ui_win_part.eo.c"
7047 7047
7048/* Efl.Part end */ 7048/* Efl.Part end */
7049 7049
diff --git a/src/lib/elementary/efl_ui_win_internal_part.eo b/src/lib/elementary/efl_ui_win_part.eo
index a791ea7..e5d4b4d 100644
--- a/src/lib/elementary/efl_ui_win_internal_part.eo
+++ b/src/lib/elementary/efl_ui_win_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Win.Internal.Part (Efl.Object, Efl.Container, Efl.Gfx, Efl.File) 1class Efl.Ui.Win.Part (Efl.Object, Efl.Container, Efl.Gfx, Efl.File)
2{ 2{
3 [[Efl UI window interal part class]] 3 [[Efl UI window interal part class]]
4 data: Elm_Part_Data; 4 data: Elm_Part_Data;
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index 22789a7..80437bc 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -13,7 +13,7 @@
13#include "elm_priv.h" 13#include "elm_priv.h"
14#include "elm_widget_ctxpopup.h" 14#include "elm_widget_ctxpopup.h"
15 15
16#include "elm_ctxpopup_internal_part.eo.h" 16#include "elm_ctxpopup_part.eo.h"
17#include "elm_part_helper.h" 17#include "elm_part_helper.h"
18 18
19#define MY_CLASS ELM_CTXPOPUP_CLASS 19#define MY_CLASS ELM_CTXPOPUP_CLASS
@@ -1641,7 +1641,7 @@ ELM_PART_OVERRIDE_CONTENT_SET(elm_ctxpopup, ELM_CTXPOPUP, EFL_UI_LAYOUT, Elm_Ctx
1641ELM_PART_OVERRIDE_CONTENT_GET(elm_ctxpopup, ELM_CTXPOPUP, EFL_UI_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data) 1641ELM_PART_OVERRIDE_CONTENT_GET(elm_ctxpopup, ELM_CTXPOPUP, EFL_UI_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data)
1642ELM_PART_OVERRIDE_CONTENT_UNSET(elm_ctxpopup, ELM_CTXPOPUP, EFL_UI_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data) 1642ELM_PART_OVERRIDE_CONTENT_UNSET(elm_ctxpopup, ELM_CTXPOPUP, EFL_UI_LAYOUT, Elm_Ctxpopup_Data, Elm_Part_Data)
1643ELM_PART_CONTENT_DEFAULT_SET(elm_ctxpopup, "default") 1643ELM_PART_CONTENT_DEFAULT_SET(elm_ctxpopup, "default")
1644#include "elm_ctxpopup_internal_part.eo.c" 1644#include "elm_ctxpopup_part.eo.c"
1645 1645
1646/* Efl.Part end */ 1646/* Efl.Part end */
1647 1647
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 3308aef..900da0a 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -19,7 +19,7 @@
19#include "elm_interface_fileselector.h" 19#include "elm_interface_fileselector.h"
20#include "elm_widget_fileselector.h" 20#include "elm_widget_fileselector.h"
21 21
22#include "elm_fileselector_internal_part.eo.h" 22#include "elm_fileselector_part.eo.h"
23#include "elm_part_helper.h" 23#include "elm_part_helper.h"
24 24
25#define MY_CLASS ELM_FILESELECTOR_CLASS 25#define MY_CLASS ELM_FILESELECTOR_CLASS
@@ -3225,7 +3225,7 @@ ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(elm_fileselector, Elm_Fileselector_Data)
3225 3225
3226ELM_PART_OVERRIDE(elm_fileselector, ELM_FILESELECTOR, EFL_UI_LAYOUT, Elm_Fileselector_Data, Elm_Part_Data) 3226ELM_PART_OVERRIDE(elm_fileselector, ELM_FILESELECTOR, EFL_UI_LAYOUT, Elm_Fileselector_Data, Elm_Part_Data)
3227ELM_PART_OVERRIDE_TEXT_SET(elm_fileselector, ELM_FILESELECTOR, EFL_UI_LAYOUT, Elm_Fileselector_Data, Elm_Part_Data) 3227ELM_PART_OVERRIDE_TEXT_SET(elm_fileselector, ELM_FILESELECTOR, EFL_UI_LAYOUT, Elm_Fileselector_Data, Elm_Part_Data)
3228#include "elm_fileselector_internal_part.eo.c" 3228#include "elm_fileselector_part.eo.c"
3229 3229
3230/* Efl.Part end */ 3230/* Efl.Part end */
3231 3231
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 6bda416..906e5f6 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -12,7 +12,7 @@
12#include "elm_interface_fileselector.h" 12#include "elm_interface_fileselector.h"
13#include "elm_widget_fileselector_entry.h" 13#include "elm_widget_fileselector_entry.h"
14 14
15#include "elm_fileselector_entry_internal_part.eo.h" 15#include "elm_fileselector_entry_part.eo.h"
16#include "elm_part_helper.h" 16#include "elm_part_helper.h"
17 17
18#define MY_CLASS ELM_FILESELECTOR_ENTRY_CLASS 18#define MY_CLASS ELM_FILESELECTOR_ENTRY_CLASS
@@ -677,7 +677,7 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY,
677ELM_PART_OVERRIDE_TEXT_SET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, EFL_UI_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data) 677ELM_PART_OVERRIDE_TEXT_SET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, EFL_UI_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data)
678ELM_PART_OVERRIDE_TEXT_GET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, EFL_UI_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data) 678ELM_PART_OVERRIDE_TEXT_GET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, EFL_UI_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data)
679ELM_PART_CONTENT_DEFAULT_SET(elm_fileselector_entry, "button icon") 679ELM_PART_CONTENT_DEFAULT_SET(elm_fileselector_entry, "button icon")
680#include "elm_fileselector_entry_internal_part.eo.c" 680#include "elm_fileselector_entry_part.eo.c"
681 681
682/* Efl.Part end */ 682/* Efl.Part end */
683 683
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index 7e2883c..e156bfa 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -10,7 +10,7 @@
10#include "elm_priv.h" 10#include "elm_priv.h"
11#include "elm_widget_multibuttonentry.h" 11#include "elm_widget_multibuttonentry.h"
12 12
13#include "elm_multibuttonentry_internal_part.eo.h" 13#include "elm_multibuttonentry_part.eo.h"
14#include "elm_part_helper.h" 14#include "elm_part_helper.h"
15 15
16#define MY_CLASS ELM_MULTIBUTTONENTRY_CLASS 16#define MY_CLASS ELM_MULTIBUTTONENTRY_CLASS
@@ -2148,7 +2148,7 @@ _elm_multibuttonentry_item_elm_interface_atspi_widget_action_elm_actions_get(Eo
2148ELM_PART_OVERRIDE(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, EFL_UI_LAYOUT, Elm_Multibuttonentry_Data, Elm_Part_Data) 2148ELM_PART_OVERRIDE(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, EFL_UI_LAYOUT, Elm_Multibuttonentry_Data, Elm_Part_Data)
2149ELM_PART_OVERRIDE_TEXT_SET(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, EFL_UI_LAYOUT, Elm_Multibuttonentry_Data, Elm_Part_Data) 2149ELM_PART_OVERRIDE_TEXT_SET(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, EFL_UI_LAYOUT, Elm_Multibuttonentry_Data, Elm_Part_Data)
2150ELM_PART_OVERRIDE_TEXT_GET(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, EFL_UI_LAYOUT, Elm_Multibuttonentry_Data, Elm_Part_Data) 2150ELM_PART_OVERRIDE_TEXT_GET(elm_multibuttonentry, ELM_MULTIBUTTONENTRY, EFL_UI_LAYOUT, Elm_Multibuttonentry_Data, Elm_Part_Data)
2151#include "elm_multibuttonentry_internal_part.eo.c" 2151#include "elm_multibuttonentry_part.eo.c"
2152 2152
2153/* Efl.Part end */ 2153/* Efl.Part end */
2154/* Internal EO APIs and hidden overrides */ 2154/* Internal EO APIs and hidden overrides */
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 9f4f425..c379c5a 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -14,7 +14,7 @@
14#include "elm_widget_naviframe.h" 14#include "elm_widget_naviframe.h"
15#include "elm_widget_container.h" 15#include "elm_widget_container.h"
16 16
17#include "elm_naviframe_internal_part.eo.h" 17#include "elm_naviframe_part.eo.h"
18#include "elm_part_helper.h" 18#include "elm_part_helper.h"
19 19
20#define MY_CLASS ELM_NAVIFRAME_CLASS 20#define MY_CLASS ELM_NAVIFRAME_CLASS
@@ -2105,7 +2105,7 @@ ELM_PART_OVERRIDE_CONTENT_GET(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_N
2105ELM_PART_OVERRIDE_CONTENT_UNSET(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data) 2105ELM_PART_OVERRIDE_CONTENT_UNSET(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data)
2106ELM_PART_OVERRIDE_TEXT_SET(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data) 2106ELM_PART_OVERRIDE_TEXT_SET(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data)
2107ELM_PART_OVERRIDE_TEXT_GET(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data) 2107ELM_PART_OVERRIDE_TEXT_GET(elm_naviframe, ELM_NAVIFRAME, EFL_UI_LAYOUT, Elm_Naviframe_Data, Elm_Part_Data)
2108#include "elm_naviframe_internal_part.eo.c" 2108#include "elm_naviframe_part.eo.c"
2109 2109
2110/* Efl.Part end */ 2110/* Efl.Part end */
2111 2111
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index 42b5171..04613a7 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -12,7 +12,7 @@
12#include "elm_widget_layout.h" 12#include "elm_widget_layout.h"
13#include "elm_widget_player.h" 13#include "elm_widget_player.h"
14 14
15#include "elm_player_internal_part.eo.h" 15#include "elm_player_part.eo.h"
16#include "elm_part_helper.h" 16#include "elm_part_helper.h"
17 17
18#define MY_CLASS ELM_PLAYER_CLASS 18#define MY_CLASS ELM_PLAYER_CLASS
@@ -699,7 +699,7 @@ ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(elm_player, Elm_Player_Data)
699ELM_PART_OVERRIDE(elm_player, ELM_PLAYER, EFL_UI_LAYOUT, Elm_Player_Data, Elm_Part_Data) 699ELM_PART_OVERRIDE(elm_player, ELM_PLAYER, EFL_UI_LAYOUT, Elm_Player_Data, Elm_Part_Data)
700ELM_PART_OVERRIDE_CONTENT_SET(elm_player, ELM_PLAYER, EFL_UI_LAYOUT, Elm_Player_Data, Elm_Part_Data) 700ELM_PART_OVERRIDE_CONTENT_SET(elm_player, ELM_PLAYER, EFL_UI_LAYOUT, Elm_Player_Data, Elm_Part_Data)
701ELM_PART_CONTENT_DEFAULT_SET(elm_player, "video") 701ELM_PART_CONTENT_DEFAULT_SET(elm_player, "video")
702#include "elm_player_internal_part.eo.c" 702#include "elm_player_part.eo.c"
703 703
704/* End of Efl.Part */ 704/* End of Efl.Part */
705 705
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 1ca4b50..634eb18 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -13,7 +13,7 @@
13 13
14#include "elm_popup_item.eo.h" 14#include "elm_popup_item.eo.h"
15 15
16#include "elm_popup_internal_part.eo.h" 16#include "elm_popup_part.eo.h"
17#include "elm_part_helper.h" 17#include "elm_part_helper.h"
18 18
19#define MY_CLASS ELM_POPUP_CLASS 19#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
1924ELM_PART_OVERRIDE_TEXT_SET(elm_popup, ELM_POPUP, EFL_UI_LAYOUT, Elm_Popup_Data, Elm_Part_Data) 1924ELM_PART_OVERRIDE_TEXT_SET(elm_popup, ELM_POPUP, EFL_UI_LAYOUT, Elm_Popup_Data, Elm_Part_Data)
1925ELM_PART_OVERRIDE_TEXT_GET(elm_popup, ELM_POPUP, EFL_UI_LAYOUT, Elm_Popup_Data, Elm_Part_Data) 1925ELM_PART_OVERRIDE_TEXT_GET(elm_popup, ELM_POPUP, EFL_UI_LAYOUT, Elm_Popup_Data, Elm_Part_Data)
1926ELM_PART_CONTENT_DEFAULT_SET(elm_popup, "default") 1926ELM_PART_CONTENT_DEFAULT_SET(elm_popup, "default")
1927#include "elm_popup_internal_part.eo.c" 1927#include "elm_popup_part.eo.c"
1928 1928
1929/* Efl.Part end */ 1929/* Efl.Part end */
1930 1930
diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c
index 0c4a5f4..414bf2e 100644
--- a/src/lib/elementary/elm_actionslider.c
+++ b/src/lib/elementary/elm_actionslider.c
@@ -13,7 +13,7 @@
13 13
14#include "elm_actionslider.eo.h" 14#include "elm_actionslider.eo.h"
15 15
16#include "elm_actionslider_internal_part.eo.h" 16#include "elm_actionslider_part.eo.h"
17#include "elm_part_helper.h" 17#include "elm_part_helper.h"
18 18
19#define MY_CLASS ELM_ACTIONSLIDER_CLASS 19#define MY_CLASS ELM_ACTIONSLIDER_CLASS
@@ -663,7 +663,7 @@ ELM_PART_OVERRIDE(elm_actionslider, ELM_ACTIONSLIDER, EFL_UI_LAYOUT, Elm_Actions
663ELM_PART_OVERRIDE_TEXT_SET(elm_actionslider, ELM_ACTIONSLIDER, EFL_UI_LAYOUT, Elm_Actionslider_Data, Elm_Part_Data) 663ELM_PART_OVERRIDE_TEXT_SET(elm_actionslider, ELM_ACTIONSLIDER, EFL_UI_LAYOUT, Elm_Actionslider_Data, Elm_Part_Data)
664ELM_PART_OVERRIDE_TEXT_GET(elm_actionslider, ELM_ACTIONSLIDER, EFL_UI_LAYOUT, Elm_Actionslider_Data, Elm_Part_Data) 664ELM_PART_OVERRIDE_TEXT_GET(elm_actionslider, ELM_ACTIONSLIDER, EFL_UI_LAYOUT, Elm_Actionslider_Data, Elm_Part_Data)
665 665
666#include "elm_actionslider_internal_part.eo.c" 666#include "elm_actionslider_part.eo.c"
667/* Efl.Part end */ 667/* Efl.Part end */
668 668
669/* Internal EO APIs and hidden overrides */ 669/* 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
index 09bb0c6..038332c 100644
--- a/src/lib/elementary/elm_actionslider_internal_part.eo
+++ b/src/lib/elementary/elm_actionslider_part.eo
@@ -1,4 +1,4 @@
1class Elm_Actionslider.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text) 1class Elm_Actionslider.Part (Efl.Ui.Layout.Part, Efl.Text)
2{ 2{
3 [[Elementary Actionslider internal part class]] 3 [[Elementary Actionslider internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c
index 237d2ff..84eb857 100644
--- a/src/lib/elementary/elm_bubble.c
+++ b/src/lib/elementary/elm_bubble.c
@@ -11,7 +11,7 @@
11#include "elm_widget_bubble.h" 11#include "elm_widget_bubble.h"
12#include "elm_widget_layout.h" 12#include "elm_widget_layout.h"
13 13
14#include "elm_bubble_internal_part.eo.h" 14#include "elm_bubble_part.eo.h"
15#include "elm_part_helper.h" 15#include "elm_part_helper.h"
16 16
17#define MY_CLASS ELM_BUBBLE_CLASS 17#define MY_CLASS ELM_BUBBLE_CLASS
@@ -284,7 +284,7 @@ _elm_bubble_class_constructor(Efl_Class *klass)
284ELM_PART_OVERRIDE(elm_bubble, ELM_BUBBLE, EFL_UI_LAYOUT, Elm_Bubble_Data, Elm_Part_Data) 284ELM_PART_OVERRIDE(elm_bubble, ELM_BUBBLE, EFL_UI_LAYOUT, Elm_Bubble_Data, Elm_Part_Data)
285ELM_PART_OVERRIDE_TEXT_SET(elm_bubble, ELM_BUBBLE, EFL_UI_LAYOUT, Elm_Bubble_Data, Elm_Part_Data) 285ELM_PART_OVERRIDE_TEXT_SET(elm_bubble, ELM_BUBBLE, EFL_UI_LAYOUT, Elm_Bubble_Data, Elm_Part_Data)
286 286
287#include "elm_bubble_internal_part.eo.c" 287#include "elm_bubble_part.eo.c"
288/* Efl.Part end */ 288/* Efl.Part end */
289 289
290/* Internal EO APIs and hidden overrides */ 290/* 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
index 7deaa91..3822913 100644
--- a/src/lib/elementary/elm_bubble_internal_part.eo
+++ b/src/lib/elementary/elm_bubble_part.eo
@@ -1,4 +1,4 @@
1class Elm_Bubble.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text) 1class Elm_Bubble.Part (Efl.Ui.Layout.Part, Efl.Text)
2{ 2{
3 [[Elementary Bubble internal part class]] 3 [[Elementary Bubble internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_ctxpopup_internal_part.eo b/src/lib/elementary/elm_ctxpopup_part.eo
index a1b49a7..da725aa 100644
--- a/src/lib/elementary/elm_ctxpopup_internal_part.eo
+++ b/src/lib/elementary/elm_ctxpopup_part.eo
@@ -1,4 +1,4 @@
1class Elm.Ctxpopup.Internal.Part (Efl.Ui.Layout.Internal.Part) 1class Elm.Ctxpopup.Part (Efl.Ui.Layout.Part)
2{ 2{
3 [[Elementary contex popup internal part class]] 3 [[Elementary contex popup internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c
index cef0cf1..e48bbb0 100644
--- a/src/lib/elementary/elm_dayselector.c
+++ b/src/lib/elementary/elm_dayselector.c
@@ -9,7 +9,7 @@
9#include "elm_widget_dayselector.h" 9#include "elm_widget_dayselector.h"
10#include "elm_widget_container.h" 10#include "elm_widget_container.h"
11 11
12#include "elm_dayselector_internal_part.eo.h" 12#include "elm_dayselector_part.eo.h"
13#include "elm_part_helper.h" 13#include "elm_part_helper.h"
14 14
15#define MY_CLASS ELM_DAYSELECTOR_CLASS 15#define MY_CLASS ELM_DAYSELECTOR_CLASS
@@ -610,7 +610,7 @@ _elm_dayselector_class_constructor(Efl_Class *klass)
610ELM_PART_OVERRIDE(elm_dayselector, ELM_DAYSELECTOR, EFL_UI_LAYOUT, Elm_Dayselector_Data, Elm_Part_Data) 610ELM_PART_OVERRIDE(elm_dayselector, ELM_DAYSELECTOR, EFL_UI_LAYOUT, Elm_Dayselector_Data, Elm_Part_Data)
611ELM_PART_OVERRIDE_CONTENT_SET(elm_dayselector, ELM_DAYSELECTOR, EFL_UI_LAYOUT, Elm_Dayselector_Data, Elm_Part_Data) 611ELM_PART_OVERRIDE_CONTENT_SET(elm_dayselector, ELM_DAYSELECTOR, EFL_UI_LAYOUT, Elm_Dayselector_Data, Elm_Part_Data)
612ELM_PART_OVERRIDE_CONTENT_UNSET(elm_dayselector, ELM_DAYSELECTOR, EFL_UI_LAYOUT, Elm_Dayselector_Data, Elm_Part_Data) 612ELM_PART_OVERRIDE_CONTENT_UNSET(elm_dayselector, ELM_DAYSELECTOR, EFL_UI_LAYOUT, Elm_Dayselector_Data, Elm_Part_Data)
613#include "elm_dayselector_internal_part.eo.c" 613#include "elm_dayselector_part.eo.c"
614 614
615/* Efl.Part end */ 615/* Efl.Part end */
616 616
diff --git a/src/lib/elementary/elm_dayselector_internal_part.eo b/src/lib/elementary/elm_dayselector_part.eo
index 1b2677f..fad2558 100644
--- a/src/lib/elementary/elm_dayselector_internal_part.eo
+++ b/src/lib/elementary/elm_dayselector_part.eo
@@ -1,4 +1,4 @@
1class Elm.Dayselector.Internal.Part (Efl.Ui.Layout.Internal.Part) 1class Elm.Dayselector.Part (Efl.Ui.Layout.Part)
2{ 2{
3 [[Elementary dayselector internal part class]] 3 [[Elementary dayselector internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 25aa2ba..7d9f461 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -12,7 +12,7 @@
12#include "elm_priv.h" 12#include "elm_priv.h"
13#include "elm_widget_entry.h" 13#include "elm_widget_entry.h"
14 14
15#include "elm_entry_internal_part.eo.h" 15#include "elm_entry_part.eo.h"
16#include "elm_part_helper.h" 16#include "elm_part_helper.h"
17#include "elm_hoversel.eo.h" 17#include "elm_hoversel.eo.h"
18 18
@@ -6056,7 +6056,7 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, ELM_ENTRY, EFL_UI_LAYOUT, Elm_Entry_D
6056ELM_PART_OVERRIDE_TEXT_SET(elm_entry, ELM_ENTRY, EFL_UI_LAYOUT, Elm_Entry_Data, Elm_Part_Data) 6056ELM_PART_OVERRIDE_TEXT_SET(elm_entry, ELM_ENTRY, EFL_UI_LAYOUT, Elm_Entry_Data, Elm_Part_Data)
6057ELM_PART_OVERRIDE_TEXT_GET(elm_entry, ELM_ENTRY, EFL_UI_LAYOUT, Elm_Entry_Data, Elm_Part_Data) 6057ELM_PART_OVERRIDE_TEXT_GET(elm_entry, ELM_ENTRY, EFL_UI_LAYOUT, Elm_Entry_Data, Elm_Part_Data)
6058ELM_PART_CONTENT_DEFAULT_SET(elm_entry, "icon") 6058ELM_PART_CONTENT_DEFAULT_SET(elm_entry, "icon")
6059#include "elm_entry_internal_part.eo.c" 6059#include "elm_entry_part.eo.c"
6060 6060
6061/* Efl.Part end */ 6061/* Efl.Part end */
6062 6062
diff --git a/src/lib/elementary/elm_entry_internal_part.eo b/src/lib/elementary/elm_entry_part.eo
index 14fe0fb..454ba7c 100644
--- a/src/lib/elementary/elm_entry_internal_part.eo
+++ b/src/lib/elementary/elm_entry_part.eo
@@ -1,4 +1,4 @@
1class Elm.Entry.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text) 1class Elm.Entry.Part (Efl.Ui.Layout.Part, Efl.Text)
2{ 2{
3 [[Elementary entry internal part class]] 3 [[Elementary entry internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_fileselector_entry_internal_part.eo b/src/lib/elementary/elm_fileselector_entry_part.eo
index 3adbf14..75e301b 100644
--- a/src/lib/elementary/elm_fileselector_entry_internal_part.eo
+++ b/src/lib/elementary/elm_fileselector_entry_part.eo
@@ -1,4 +1,4 @@
1class Elm.Fileselector.Entry.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text) 1class Elm.Fileselector.Entry.Part (Efl.Ui.Layout.Part, Efl.Text)
2{ 2{
3 [[Elementary fileselector entry internal part class]] 3 [[Elementary fileselector entry internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_fileselector_internal_part.eo b/src/lib/elementary/elm_fileselector_part.eo
index 91a27b0..6b2dff7 100644
--- a/src/lib/elementary/elm_fileselector_internal_part.eo
+++ b/src/lib/elementary/elm_fileselector_part.eo
@@ -1,4 +1,4 @@
1class Elm.Fileselector.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text) 1class Elm.Fileselector.Part (Efl.Ui.Layout.Part, Efl.Text)
2{ 2{
3 [[Elementary fileselector entry internal part class]] 3 [[Elementary fileselector entry internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_flip_internal_part.eo b/src/lib/elementary/elm_flip_part.eo
index 8bcb693..037f59c 100644
--- a/src/lib/elementary/elm_flip_internal_part.eo
+++ b/src/lib/elementary/elm_flip_part.eo
@@ -1,4 +1,4 @@
1class Elm.Flip.Internal.Part (Efl.Object, Efl.Container) 1class Elm.Flip.Part (Efl.Object, Efl.Container)
2{ 2{
3 [[Elementary flip internal part class]] 3 [[Elementary flip internal part class]]
4 data: Elm_Part_Data; 4 data: Elm_Part_Data;
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index 47b710e..0bb2f5e 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -12,7 +12,7 @@
12#include "elm_priv.h" 12#include "elm_priv.h"
13#include "elm_widget_hover.h" 13#include "elm_widget_hover.h"
14 14
15#include "elm_hover_internal_part.eo.h" 15#include "elm_hover_part.eo.h"
16#include "elm_part_helper.h" 16#include "elm_part_helper.h"
17 17
18#define MY_CLASS ELM_HOVER_CLASS 18#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_
896ELM_PART_OVERRIDE_CONTENT_SET(elm_hover, ELM_HOVER, EFL_UI_LAYOUT, Elm_Hover_Data, Elm_Part_Data) 896ELM_PART_OVERRIDE_CONTENT_SET(elm_hover, ELM_HOVER, EFL_UI_LAYOUT, Elm_Hover_Data, Elm_Part_Data)
897ELM_PART_OVERRIDE_CONTENT_GET(elm_hover, ELM_HOVER, EFL_UI_LAYOUT, Elm_Hover_Data, Elm_Part_Data) 897ELM_PART_OVERRIDE_CONTENT_GET(elm_hover, ELM_HOVER, EFL_UI_LAYOUT, Elm_Hover_Data, Elm_Part_Data)
898ELM_PART_OVERRIDE_CONTENT_UNSET(elm_hover, ELM_HOVER, EFL_UI_LAYOUT, Elm_Hover_Data, Elm_Part_Data) 898ELM_PART_OVERRIDE_CONTENT_UNSET(elm_hover, ELM_HOVER, EFL_UI_LAYOUT, Elm_Hover_Data, Elm_Part_Data)
899#include "elm_hover_internal_part.eo.c" 899#include "elm_hover_part.eo.c"
900 900
901/* Efl.Part end */ 901/* Efl.Part end */
902 902
diff --git a/src/lib/elementary/elm_hover_internal_part.eo b/src/lib/elementary/elm_hover_part.eo
index cd56689..a8920fe 100644
--- a/src/lib/elementary/elm_hover_internal_part.eo
+++ b/src/lib/elementary/elm_hover_part.eo
@@ -1,4 +1,4 @@
1class Elm.Hover.Internal.Part (Efl.Ui.Layout.Internal.Part) 1class Elm.Hover.Part (Efl.Ui.Layout.Part)
2{ 2{
3 [[elementary hover internal part class]] 3 [[elementary hover internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c
index 6a451df..8c619e3 100644
--- a/src/lib/elementary/elm_label.c
+++ b/src/lib/elementary/elm_label.c
@@ -10,7 +10,7 @@
10#include "elm_priv.h" 10#include "elm_priv.h"
11#include "elm_widget_layout.h" 11#include "elm_widget_layout.h"
12#include "elm_widget_label.h" 12#include "elm_widget_label.h"
13#include "elm_label_internal_part.eo.h" 13#include "elm_label_part.eo.h"
14#include "elm_part_helper.h" 14#include "elm_part_helper.h"
15 15
16#define MY_CLASS ELM_LABEL_CLASS 16#define MY_CLASS ELM_LABEL_CLASS
@@ -637,7 +637,7 @@ _elm_label_class_constructor(Efl_Class *klass)
637ELM_PART_OVERRIDE(elm_label, ELM_LABEL, EFL_UI_LAYOUT, Elm_Label_Data, Elm_Part_Data) 637ELM_PART_OVERRIDE(elm_label, ELM_LABEL, EFL_UI_LAYOUT, Elm_Label_Data, Elm_Part_Data)
638ELM_PART_OVERRIDE_TEXT_SET(elm_label, ELM_LABEL, EFL_UI_LAYOUT, Elm_Label_Data, Elm_Part_Data) 638ELM_PART_OVERRIDE_TEXT_SET(elm_label, ELM_LABEL, EFL_UI_LAYOUT, Elm_Label_Data, Elm_Part_Data)
639 639
640#include "elm_label_internal_part.eo.c" 640#include "elm_label_part.eo.c"
641/* Efl.Part end */ 641/* Efl.Part end */
642 642
643/* Internal EO APIs and hidden overrides */ 643/* 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
index ff37310..36b0e03 100644
--- a/src/lib/elementary/elm_label_internal_part.eo
+++ b/src/lib/elementary/elm_label_part.eo
@@ -1,4 +1,4 @@
1class Elm_Label.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text) 1class Elm_Label.Part (Efl.Ui.Layout.Part, Efl.Text)
2{ 2{
3 [[Elementary button internal part class]] 3 [[Elementary button internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c
index f3f9302..8ae1058 100644
--- a/src/lib/elementary/elm_mapbuf.c
+++ b/src/lib/elementary/elm_mapbuf.c
@@ -11,7 +11,7 @@
11#include "elm_widget_container.h" 11#include "elm_widget_container.h"
12#include "elm_mapbuf.eo.h" 12#include "elm_mapbuf.eo.h"
13 13
14#include "elm_mapbuf_internal_part.eo.h" 14#include "elm_mapbuf_part.eo.h"
15#include "elm_part_helper.h" 15#include "elm_part_helper.h"
16 16
17#define MY_CLASS ELM_MAPBUF_CLASS 17#define MY_CLASS ELM_MAPBUF_CLASS
@@ -445,7 +445,7 @@ ELM_PART_IMPLEMENT_CONTENT_SET(elm_mapbuf, ELM_MAPBUF, Elm_Mapbuf_Data, Elm_Part
445ELM_PART_IMPLEMENT_CONTENT_GET(elm_mapbuf, ELM_MAPBUF, Elm_Mapbuf_Data, Elm_Part_Data) 445ELM_PART_IMPLEMENT_CONTENT_GET(elm_mapbuf, ELM_MAPBUF, Elm_Mapbuf_Data, Elm_Part_Data)
446ELM_PART_IMPLEMENT_CONTENT_UNSET(elm_mapbuf, ELM_MAPBUF, Elm_Mapbuf_Data, Elm_Part_Data) 446ELM_PART_IMPLEMENT_CONTENT_UNSET(elm_mapbuf, ELM_MAPBUF, Elm_Mapbuf_Data, Elm_Part_Data)
447ELM_PART_CONTENT_DEFAULT_SET(elm_mapbuf, "default") 447ELM_PART_CONTENT_DEFAULT_SET(elm_mapbuf, "default")
448#include "elm_mapbuf_internal_part.eo.c" 448#include "elm_mapbuf_part.eo.c"
449 449
450/* Efl.Part end */ 450/* Efl.Part end */
451 451
diff --git a/src/lib/elementary/elm_mapbuf_internal_part.eo b/src/lib/elementary/elm_mapbuf_part.eo
index 6832f19..d9b4119 100644
--- a/src/lib/elementary/elm_mapbuf_internal_part.eo
+++ b/src/lib/elementary/elm_mapbuf_part.eo
@@ -1,4 +1,4 @@
1class Elm.Mapbuf.Internal.Part (Efl.Object, Efl.Container) 1class Elm.Mapbuf.Part (Efl.Object, Efl.Container)
2{ 2{
3 [[Elementary mapbuf internal part class]] 3 [[Elementary mapbuf internal part class]]
4 data: Elm_Part_Data; 4 data: Elm_Part_Data;
diff --git a/src/lib/elementary/elm_multibuttonentry_internal_part.eo b/src/lib/elementary/elm_multibuttonentry_part.eo
index 44f1abe..737915f 100644
--- a/src/lib/elementary/elm_multibuttonentry_internal_part.eo
+++ b/src/lib/elementary/elm_multibuttonentry_part.eo
@@ -1,4 +1,4 @@
1class Elm.Multibuttonentry.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text) 1class Elm.Multibuttonentry.Part (Efl.Ui.Layout.Part, Efl.Text)
2{ 2{
3 [[Elementary multibuttonentry internal part class]] 3 [[Elementary multibuttonentry internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_naviframe_internal_part.eo b/src/lib/elementary/elm_naviframe_part.eo
index 5e95140..de62c47 100644
--- a/src/lib/elementary/elm_naviframe_internal_part.eo
+++ b/src/lib/elementary/elm_naviframe_part.eo
@@ -1,4 +1,4 @@
1class Elm.Naviframe.Internal.Part (Efl.Ui.Layout.Internal.Part) 1class Elm.Naviframe.Part (Efl.Ui.Layout.Part)
2{ 2{
3 [[Elementary naviframe internal part class]] 3 [[Elementary naviframe internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c
index f381018..89f621c 100644
--- a/src/lib/elementary/elm_notify.c
+++ b/src/lib/elementary/elm_notify.c
@@ -11,7 +11,7 @@
11#include "elm_widget_notify.h" 11#include "elm_widget_notify.h"
12#include "elm_widget_container.h" 12#include "elm_widget_container.h"
13 13
14#include "elm_notify_internal_part.eo.h" 14#include "elm_notify_part.eo.h"
15#include "elm_part_helper.h" 15#include "elm_part_helper.h"
16 16
17#define MY_CLASS ELM_NOTIFY_CLASS 17#define MY_CLASS ELM_NOTIFY_CLASS
@@ -747,7 +747,7 @@ ELM_PART_IMPLEMENT_CONTENT_SET(elm_notify, ELM_NOTIFY, Elm_Notify_Data, Elm_Part
747ELM_PART_IMPLEMENT_CONTENT_GET(elm_notify, ELM_NOTIFY, Elm_Notify_Data, Elm_Part_Data) 747ELM_PART_IMPLEMENT_CONTENT_GET(elm_notify, ELM_NOTIFY, Elm_Notify_Data, Elm_Part_Data)
748ELM_PART_IMPLEMENT_CONTENT_UNSET(elm_notify, ELM_NOTIFY, Elm_Notify_Data, Elm_Part_Data) 748ELM_PART_IMPLEMENT_CONTENT_UNSET(elm_notify, ELM_NOTIFY, Elm_Notify_Data, Elm_Part_Data)
749ELM_PART_CONTENT_DEFAULT_SET(elm_notify, "default") 749ELM_PART_CONTENT_DEFAULT_SET(elm_notify, "default")
750#include "elm_notify_internal_part.eo.c" 750#include "elm_notify_part.eo.c"
751 751
752/* Efl.Part end */ 752/* Efl.Part end */
753 753
diff --git a/src/lib/elementary/elm_notify_internal_part.eo b/src/lib/elementary/elm_notify_part.eo
index 7970cd9..17662e3 100644
--- a/src/lib/elementary/elm_notify_internal_part.eo
+++ b/src/lib/elementary/elm_notify_part.eo
@@ -1,4 +1,4 @@
1class Elm.Notify.Internal.Part (Efl.Object, Efl.Container, Efl.Text) 1class Elm.Notify.Part (Efl.Object, Efl.Container, Efl.Text)
2{ 2{
3 [[Elementary notification internel part class]] 3 [[Elementary notification internel part class]]
4 data: Elm_Part_Data; 4 data: Elm_Part_Data;
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index 9b2147d..011fe9a 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/elm_panel.c
@@ -12,7 +12,7 @@
12 12
13#include "els_box.h" 13#include "els_box.h"
14 14
15#include "elm_panel_internal_part.eo.h" 15#include "elm_panel_part.eo.h"
16#include "elm_part_helper.h" 16#include "elm_part_helper.h"
17 17
18#define MY_CLASS ELM_PANEL_CLASS 18#define MY_CLASS ELM_PANEL_CLASS
@@ -1484,7 +1484,7 @@ ELM_PART_IMPLEMENT(elm_panel, ELM_PANEL, Elm_Panel_Data, Elm_Part_Data)
1484ELM_PART_IMPLEMENT_CONTENT_SET(elm_panel, ELM_PANEL, Elm_Panel_Data, Elm_Part_Data) 1484ELM_PART_IMPLEMENT_CONTENT_SET(elm_panel, ELM_PANEL, Elm_Panel_Data, Elm_Part_Data)
1485ELM_PART_IMPLEMENT_CONTENT_GET(elm_panel, ELM_PANEL, Elm_Panel_Data, Elm_Part_Data) 1485ELM_PART_IMPLEMENT_CONTENT_GET(elm_panel, ELM_PANEL, Elm_Panel_Data, Elm_Part_Data)
1486ELM_PART_IMPLEMENT_CONTENT_UNSET(elm_panel, ELM_PANEL, Elm_Panel_Data, Elm_Part_Data) 1486ELM_PART_IMPLEMENT_CONTENT_UNSET(elm_panel, ELM_PANEL, Elm_Panel_Data, Elm_Part_Data)
1487#include "elm_panel_internal_part.eo.c" 1487#include "elm_panel_part.eo.c"
1488 1488
1489/* Efl.Part end */ 1489/* Efl.Part end */
1490 1490
diff --git a/src/lib/elementary/elm_panel_internal_part.eo b/src/lib/elementary/elm_panel_part.eo
index f6118da..45f6a07 100644
--- a/src/lib/elementary/elm_panel_internal_part.eo
+++ b/src/lib/elementary/elm_panel_part.eo
@@ -1,4 +1,4 @@
1class Elm.Panel.Internal.Part (Efl.Object, Efl.Container) 1class Elm.Panel.Part (Efl.Object, Efl.Container)
2{ 2{
3 [[Elementary panel internal part class]] 3 [[Elementary panel internal part class]]
4 data: Elm_Part_Data; 4 data: Elm_Part_Data;
diff --git a/src/lib/elementary/elm_panes.h b/src/lib/elementary/elm_panes.h
index 02d0c03..10eaf35 100644
--- a/src/lib/elementary/elm_panes.h
+++ b/src/lib/elementary/elm_panes.h
@@ -56,7 +56,7 @@
56 56
57#ifdef EFL_EO_API_SUPPORT 57#ifdef EFL_EO_API_SUPPORT
58#include "efl_ui_panes_eo.h" 58#include "efl_ui_panes_eo.h"
59#include "efl_ui_panes_internal_part.eo.h" 59#include "efl_ui_panes_part.eo.h"
60#endif 60#endif
61#ifndef EFL_NOLEGACY_API_SUPPORT 61#ifndef EFL_NOLEGACY_API_SUPPORT
62#include "elm_panes_legacy.h" 62#include "elm_panes_legacy.h"
diff --git a/src/lib/elementary/elm_part_helper.h b/src/lib/elementary/elm_part_helper.h
index 040ab98..56b352e 100644
--- a/src/lib/elementary/elm_part_helper.h
+++ b/src/lib/elementary/elm_part_helper.h
@@ -1,7 +1,7 @@
1#ifndef _ELM_PART_HELPER_H 1#ifndef _ELM_PART_HELPER_H
2#define _ELM_PART_HELPER_H 2#define _ELM_PART_HELPER_H
3 3
4#include "efl_ui_layout_internal_part.eo.h" 4#include "efl_ui_layout_part.eo.h"
5 5
6//#define ELM_PART_HOOK do { ERR("%p:%s [%d]", pd->obj, pd->part, (int) pd->temp); } while(0) 6//#define ELM_PART_HOOK do { ERR("%p:%s [%d]", pd->obj, pd->part, (int) pd->temp); } while(0)
7#define ELM_PART_HOOK do {} while(0) 7#define ELM_PART_HOOK do {} while(0)
@@ -26,12 +26,12 @@ struct _Elm_Part_Data
26 26
27#define ELM_PART_IMPLEMENT_DESTRUCTOR(type, TYPE, typedata, partdata) \ 27#define ELM_PART_IMPLEMENT_DESTRUCTOR(type, TYPE, typedata, partdata) \
28static EOLIAN void \ 28static EOLIAN void \
29_ ## type ## _internal_part_efl_object_destructor(Eo *obj, partdata *pd) \ 29_ ## type ## _part_efl_object_destructor(Eo *obj, partdata *pd) \
30{ \ 30{ \
31 ELM_PART_HOOK; \ 31 ELM_PART_HOOK; \
32 free(pd->part); \ 32 free(pd->part); \
33 efl_data_xunref(pd->obj, pd->sd, obj); \ 33 efl_data_xunref(pd->obj, pd->sd, obj); \
34 efl_destructor(efl_super(obj, TYPE ## _INTERNAL_PART_CLASS)); \ 34 efl_destructor(efl_super(obj, TYPE ## _PART_CLASS)); \
35} \ 35} \
36 36
37// Main part proxy implementation 37// Main part proxy implementation
@@ -44,8 +44,8 @@ _ ## type ## _efl_part_part(const Eo *obj, typedata *priv EINA_UNUSED, const cha
44 Eo *proxy; \ 44 Eo *proxy; \
45\ 45\
46 EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL); \ 46 EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL); \
47 proxy = efl_add(TYPE ## _INTERNAL_PART_CLASS, (Eo *) obj); \ 47 proxy = efl_add(TYPE ## _PART_CLASS, (Eo *) obj); \
48 pd = efl_data_scope_get(proxy, TYPE ## _INTERNAL_PART_CLASS); \ 48 pd = efl_data_scope_get(proxy, TYPE ## _PART_CLASS); \
49 if (pd) \ 49 if (pd) \
50 { \ 50 { \
51 pd->obj = (Eo *) obj; \ 51 pd->obj = (Eo *) obj; \
@@ -59,35 +59,35 @@ _ ## type ## _efl_part_part(const Eo *obj, typedata *priv EINA_UNUSED, const cha
59 59
60#define ELM_PART_IMPLEMENT_CONTENT_SET(type, TYPE, typedata, partdata) \ 60#define ELM_PART_IMPLEMENT_CONTENT_SET(type, TYPE, typedata, partdata) \
61static EOLIAN Eina_Bool \ 61static EOLIAN Eina_Bool \
62_ ## type ## _internal_part_efl_container_content_set(Eo *obj, partdata *pd, Efl_Gfx *content) \ 62_ ## type ## _part_efl_container_content_set(Eo *obj, partdata *pd, Efl_Gfx *content) \
63{ \ 63{ \
64 ELM_PART_RETURN_VAL(_ ## type ## _content_set(pd->obj, pd->sd, pd->part, content)); \ 64 ELM_PART_RETURN_VAL(_ ## type ## _content_set(pd->obj, pd->sd, pd->part, content)); \
65} 65}
66 66
67#define ELM_PART_IMPLEMENT_CONTENT_GET(type, TYPE, typedata, partdata) \ 67#define ELM_PART_IMPLEMENT_CONTENT_GET(type, TYPE, typedata, partdata) \
68static EOLIAN Efl_Gfx * \ 68static EOLIAN Efl_Gfx * \
69_ ## type ## _internal_part_efl_container_content_get(Eo *obj, partdata *pd) \ 69_ ## type ## _part_efl_container_content_get(Eo *obj, partdata *pd) \
70{ \ 70{ \
71 ELM_PART_RETURN_VAL(_ ## type ## _content_get(pd->obj, pd->sd, pd->part)); \ 71 ELM_PART_RETURN_VAL(_ ## type ## _content_get(pd->obj, pd->sd, pd->part)); \
72} 72}
73 73
74#define ELM_PART_IMPLEMENT_CONTENT_UNSET(type, TYPE, typedata, partdata) \ 74#define ELM_PART_IMPLEMENT_CONTENT_UNSET(type, TYPE, typedata, partdata) \
75static EOLIAN Efl_Gfx * \ 75static EOLIAN Efl_Gfx * \
76_ ## type ## _internal_part_efl_container_content_unset(Eo *obj, partdata *pd) \ 76_ ## type ## _part_efl_container_content_unset(Eo *obj, partdata *pd) \
77{ \ 77{ \
78 ELM_PART_RETURN_VAL(_ ## type ## _content_unset(pd->obj, pd->sd, pd->part)); \ 78 ELM_PART_RETURN_VAL(_ ## type ## _content_unset(pd->obj, pd->sd, pd->part)); \
79} 79}
80 80
81#define ELM_PART_IMPLEMENT_TEXT_SET(type, TYPE, typedata, partdata) \ 81#define ELM_PART_IMPLEMENT_TEXT_SET(type, TYPE, typedata, partdata) \
82static EOLIAN void \ 82static EOLIAN void \
83_ ## type ## _internal_part_efl_text_text_set(Eo *obj EINA_UNUSED, partdata *pd, const char *text) \ 83_ ## type ## _part_efl_text_text_set(Eo *obj EINA_UNUSED, partdata *pd, const char *text) \
84{ \ 84{ \
85 _ ## type ## _text_set(pd->obj, pd->sd, pd->part, text); \ 85 _ ## type ## _text_set(pd->obj, pd->sd, pd->part, text); \
86} 86}
87 87
88#define ELM_PART_IMPLEMENT_TEXT_GET(type, TYPE, typedata, partdata) \ 88#define ELM_PART_IMPLEMENT_TEXT_GET(type, TYPE, typedata, partdata) \
89static EOLIAN const char * \ 89static EOLIAN const char * \
90_ ## type ## _internal_part_efl_text_text_get(Eo *obj, partdata *pd) \ 90_ ## type ## _part_efl_text_text_get(Eo *obj, partdata *pd) \
91{ \ 91{ \
92 ELM_PART_RETURN_VAL(_ ## type ## _text_get(pd->obj, pd->sd, pd->part)); \ 92 ELM_PART_RETURN_VAL(_ ## type ## _text_get(pd->obj, pd->sd, pd->part)); \
93} 93}
@@ -113,8 +113,8 @@ _ ## type ## _efl_part_part(const Eo *obj, typedata *priv EINA_UNUSED, const cha
113 Eo *proxy; \ 113 Eo *proxy; \
114\ 114\
115 EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL); \ 115 EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL); \
116 proxy = efl_add(TYPE ## _INTERNAL_PART_CLASS, (Eo *) obj); \ 116 proxy = efl_add(TYPE ## _PART_CLASS, (Eo *) obj); \
117 pd = efl_data_scope_get(proxy, SUPER ## _INTERNAL_PART_CLASS); \ 117 pd = efl_data_scope_get(proxy, SUPER ## _PART_CLASS); \
118 if (pd) \ 118 if (pd) \
119 { \ 119 { \
120 pd->obj = (Eo *) obj; \ 120 pd->obj = (Eo *) obj; \
@@ -128,45 +128,45 @@ _ ## type ## _efl_part_part(const Eo *obj, typedata *priv EINA_UNUSED, const cha
128 128
129#define ELM_PART_OVERRIDE_CONTENT_SET(type, TYPE, SUPER, typedata, partdata) \ 129#define ELM_PART_OVERRIDE_CONTENT_SET(type, TYPE, SUPER, typedata, partdata) \
130static EOLIAN Eina_Bool \ 130static EOLIAN Eina_Bool \
131_ ## type ## _internal_part_efl_container_content_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *content) \ 131_ ## type ## _part_efl_container_content_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *content) \
132{ \ 132{ \
133 partdata *pd = efl_data_scope_get(obj, SUPER ## _INTERNAL_PART_CLASS); \ 133 partdata *pd = efl_data_scope_get(obj, SUPER ## _PART_CLASS); \
134 typedata *sd = efl_data_scope_get(pd->obj, TYPE ## _CLASS); \ 134 typedata *sd = efl_data_scope_get(pd->obj, TYPE ## _CLASS); \
135 ELM_PART_RETURN_VAL(_ ## type ## _content_set(pd->obj, sd, pd->part, content)); \ 135 ELM_PART_RETURN_VAL(_ ## type ## _content_set(pd->obj, sd, pd->part, content)); \
136} 136}
137 137
138#define ELM_PART_OVERRIDE_CONTENT_GET(type, TYPE, SUPER, typedata, partdata) \ 138#define ELM_PART_OVERRIDE_CONTENT_GET(type, TYPE, SUPER, typedata, partdata) \
139static EOLIAN Efl_Gfx * \ 139static EOLIAN Efl_Gfx * \
140_ ## type ## _internal_part_efl_container_content_get(Eo *obj, void *_pd EINA_UNUSED) \ 140_ ## type ## _part_efl_container_content_get(Eo *obj, void *_pd EINA_UNUSED) \
141{ \ 141{ \
142 partdata *pd = efl_data_scope_get(obj, SUPER ## _INTERNAL_PART_CLASS); \ 142 partdata *pd = efl_data_scope_get(obj, SUPER ## _PART_CLASS); \
143 typedata *sd = efl_data_scope_get(pd->obj, TYPE ## _CLASS); \ 143 typedata *sd = efl_data_scope_get(pd->obj, TYPE ## _CLASS); \
144 ELM_PART_RETURN_VAL(_ ## type ## _content_get(pd->obj, sd, pd->part)); \ 144 ELM_PART_RETURN_VAL(_ ## type ## _content_get(pd->obj, sd, pd->part)); \
145} 145}
146 146
147#define ELM_PART_OVERRIDE_CONTENT_UNSET(type, TYPE, SUPER, typedata, partdata) \ 147#define ELM_PART_OVERRIDE_CONTENT_UNSET(type, TYPE, SUPER, typedata, partdata) \
148static EOLIAN Efl_Gfx * \ 148static EOLIAN Efl_Gfx * \
149_ ## type ## _internal_part_efl_container_content_unset(Eo *obj, void *_pd EINA_UNUSED) \ 149_ ## type ## _part_efl_container_content_unset(Eo *obj, void *_pd EINA_UNUSED) \
150{ \ 150{ \
151 partdata *pd = efl_data_scope_get(obj, SUPER ## _INTERNAL_PART_CLASS); \ 151 partdata *pd = efl_data_scope_get(obj, SUPER ## _PART_CLASS); \
152 typedata *sd = efl_data_scope_get(pd->obj, TYPE ## _CLASS); \ 152 typedata *sd = efl_data_scope_get(pd->obj, TYPE ## _CLASS); \
153 ELM_PART_RETURN_VAL(_ ## type ## _content_unset(pd->obj, sd, pd->part)); \ 153 ELM_PART_RETURN_VAL(_ ## type ## _content_unset(pd->obj, sd, pd->part)); \
154} 154}
155 155
156#define ELM_PART_OVERRIDE_TEXT_SET(type, TYPE, SUPER, typedata, partdata) \ 156#define ELM_PART_OVERRIDE_TEXT_SET(type, TYPE, SUPER, typedata, partdata) \
157static EOLIAN void \ 157static EOLIAN void \
158_ ## type ## _internal_part_efl_text_text_set(Eo *obj, void *_pd EINA_UNUSED, const char *text) \ 158_ ## type ## _part_efl_text_text_set(Eo *obj, void *_pd EINA_UNUSED, const char *text) \
159{ \ 159{ \
160 partdata *pd = efl_data_scope_get(obj, SUPER ## _INTERNAL_PART_CLASS); \ 160 partdata *pd = efl_data_scope_get(obj, SUPER ## _PART_CLASS); \
161 typedata *sd = efl_data_scope_get(pd->obj, TYPE ## _CLASS); \ 161 typedata *sd = efl_data_scope_get(pd->obj, TYPE ## _CLASS); \
162 ELM_PART_CALL(_ ## type ## _text_set(pd->obj, sd, pd->part, text)); \ 162 ELM_PART_CALL(_ ## type ## _text_set(pd->obj, sd, pd->part, text)); \
163} 163}
164 164
165#define ELM_PART_OVERRIDE_TEXT_GET(type, TYPE, SUPER, typedata, partdata) \ 165#define ELM_PART_OVERRIDE_TEXT_GET(type, TYPE, SUPER, typedata, partdata) \
166static EOLIAN const char *\ 166static EOLIAN const char *\
167_ ## type ## _internal_part_efl_text_text_get(Eo *obj, void *_pd EINA_UNUSED) \ 167_ ## type ## _part_efl_text_text_get(Eo *obj, void *_pd EINA_UNUSED) \
168{ \ 168{ \
169 partdata *pd = efl_data_scope_get(obj, SUPER ## _INTERNAL_PART_CLASS); \ 169 partdata *pd = efl_data_scope_get(obj, SUPER ## _PART_CLASS); \
170 typedata *sd = efl_data_scope_get(pd->obj, TYPE ## _CLASS); \ 170 typedata *sd = efl_data_scope_get(pd->obj, TYPE ## _CLASS); \
171 ELM_PART_RETURN_VAL(_ ## type ## _text_get(pd->obj, sd, pd->part)); \ 171 ELM_PART_RETURN_VAL(_ ## type ## _text_get(pd->obj, sd, pd->part)); \
172} 172}
diff --git a/src/lib/elementary/elm_player_internal_part.eo b/src/lib/elementary/elm_player_part.eo
index 655bf9c..bfa1eaf 100644
--- a/src/lib/elementary/elm_player_internal_part.eo
+++ b/src/lib/elementary/elm_player_part.eo
@@ -1,4 +1,4 @@
1class Elm.Player.Internal.Part (Efl.Ui.Layout.Internal.Part) 1class Elm.Player.Part (Efl.Ui.Layout.Part)
2{ 2{
3 [[Elementary player internal part class]] 3 [[Elementary player internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_popup_internal_part.eo b/src/lib/elementary/elm_popup_part.eo
index 29ca9e8..ff7ef97 100644
--- a/src/lib/elementary/elm_popup_internal_part.eo
+++ b/src/lib/elementary/elm_popup_part.eo
@@ -1,4 +1,4 @@
1class Elm.Popup.Internal.Part (Efl.Ui.Layout.Internal.Part, Efl.Text) 1class Elm.Popup.Part (Efl.Ui.Layout.Part, Efl.Text)
2{ 2{
3 [[Elementary popup internal part class]] 3 [[Elementary popup internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index 2c06b1a..40983e7 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -12,7 +12,7 @@
12#include "elm_widget_layout.h" 12#include "elm_widget_layout.h"
13#include "elm_widget_scroller.h" 13#include "elm_widget_scroller.h"
14 14
15#include "elm_scroller_internal_part.eo.h" 15#include "elm_scroller_part.eo.h"
16#include "elm_part_helper.h" 16#include "elm_part_helper.h"
17 17
18#define MY_CLASS ELM_SCROLLER_CLASS 18#define MY_CLASS ELM_SCROLLER_CLASS
@@ -1483,7 +1483,7 @@ ELM_PART_OVERRIDE_CONTENT_GET(elm_scroller, ELM_SCROLLER, EFL_UI_LAYOUT, Elm_Scr
1483ELM_PART_OVERRIDE_CONTENT_UNSET(elm_scroller, ELM_SCROLLER, EFL_UI_LAYOUT, Elm_Scroller_Data, Elm_Part_Data) 1483ELM_PART_OVERRIDE_CONTENT_UNSET(elm_scroller, ELM_SCROLLER, EFL_UI_LAYOUT, Elm_Scroller_Data, Elm_Part_Data)
1484// FIXME: should be "content" but "default" was legacy API 1484// FIXME: should be "content" but "default" was legacy API
1485ELM_PART_CONTENT_DEFAULT_SET(elm_scroller, "default") 1485ELM_PART_CONTENT_DEFAULT_SET(elm_scroller, "default")
1486#include "elm_scroller_internal_part.eo.c" 1486#include "elm_scroller_part.eo.c"
1487 1487
1488/* Efl.Part end */ 1488/* Efl.Part end */
1489 1489
diff --git a/src/lib/elementary/elm_scroller_internal_part.eo b/src/lib/elementary/elm_scroller_part.eo
index 0410363..1f17665 100644
--- a/src/lib/elementary/elm_scroller_internal_part.eo
+++ b/src/lib/elementary/elm_scroller_part.eo
@@ -1,4 +1,4 @@
1class Elm.Scroller.Internal.Part (Efl.Ui.Layout.Internal.Part) 1class Elm.Scroller.Part (Efl.Ui.Layout.Part)
2{ 2{
3 [[Elementary scroller internal part class]] 3 [[Elementary scroller internal part class]]
4 data: null; 4 data: null;