summaryrefslogtreecommitdiff
path: root/src/lib/edje
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 /src/lib/edje
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
Diffstat (limited to 'src/lib/edje')
-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
14 files changed, 107 insertions, 107 deletions
diff --git a/src/lib/edje/Edje_Eo.h b/src/lib/edje/Edje_Eo.h
index 1d3d4e4cd1..23e9efc451 100644
--- a/src/lib/edje/Edje_Eo.h
+++ b/src/lib/edje/Edje_Eo.h
@@ -6,9 +6,9 @@
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 fba9d6a55e..f35b499b76 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 6fb1566366..061df2120e 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 b7b8080c85..5c6a57a99c 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 f72dadcc65..8cb3fa86ec 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 4e9564d67e..6bd2721636 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 211dce1296..50c5899546 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 5db8c453c6..dc5a944743 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 dcbd475a9f..bf723a5945 100644
--- a/src/lib/edje/efl_canvas_layout_external.eo
+++ b/src/lib/edje/efl_canvas_layout_external.eo
@@ -1,6 +1,6 @@
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 c06613f053..d6dc45d59b 100644
--- a/src/lib/edje/efl_canvas_layout_internal.eo
+++ b/src/lib/edje/efl_canvas_layout_part.eo
@@ -1,5 +1,5 @@
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 e062c61f09..28a95d0f53 100644
--- a/src/lib/edje/efl_canvas_layout_internal_box.eo
+++ b/src/lib/edje/efl_canvas_layout_part_box.eo
@@ -1,4 +1,4 @@
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 a5e9098b6a..c3dc8ad4fd 100644
--- a/src/lib/edje/efl_canvas_layout_internal_swallow.eo
+++ b/src/lib/edje/efl_canvas_layout_part_swallow.eo
@@ -1,4 +1,4 @@
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 1bc84f2816..17979895ea 100644
--- a/src/lib/edje/efl_canvas_layout_internal_table.eo
+++ b/src/lib/edje/efl_canvas_layout_part_table.eo
@@ -1,4 +1,4 @@
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 58ca552d2a..67cb7c396f 100644
--- a/src/lib/edje/efl_canvas_layout_internal_text.eo
+++ b/src/lib/edje/efl_canvas_layout_part_text.eo
@@ -1,4 +1,4 @@
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