summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-05-10 12:25:44 +0100
committerTom Hacohen <tom@stosb.com>2016-05-10 12:25:44 +0100
commit0ca59b040277349be60ca6ef73323c4a50970545 (patch)
treea174a7a6afc9e8b0695bbbf9e49a6ee42d56ac50
parent138d4e1353d207b9768be3bdcf7a50f3ff0f1e5a (diff)
Efl gfx: Remove the no longer needed .Base hack.
-rw-r--r--src/Makefile_Efl.am2
-rw-r--r--src/bin/elementary/test_ui_grid.c2
-rw-r--r--src/lib/edje/edje_containers.c36
-rw-r--r--src/lib/edje/edje_util.c10
-rw-r--r--src/lib/efl/Efl.h4
-rw-r--r--src/lib/efl/Makefile.am2
-rw-r--r--src/lib/efl/interfaces/efl_container.eo16
-rw-r--r--src/lib/efl/interfaces/efl_gfx.eo (renamed from src/lib/efl/interfaces/efl_gfx_base.eo)4
-rw-r--r--src/lib/efl/interfaces/efl_gfx_buffer.eo2
-rw-r--r--src/lib/efl/interfaces/efl_gfx_filter.eo2
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c2
-rw-r--r--src/lib/efl/interfaces/efl_pack.eo4
-rw-r--r--src/lib/efl/interfaces/efl_pack_grid.eo8
-rw-r--r--src/lib/efl/interfaces/efl_pack_layout.eo2
-rw-r--r--src/lib/efl/interfaces/efl_pack_linear.eo20
-rw-r--r--src/lib/elementary/efl_ui_box.c26
-rw-r--r--src/lib/elementary/efl_ui_grid.c20
-rw-r--r--src/lib/elementary/elm_layout.c4
-rw-r--r--src/lib/elementary/elm_layout_pack.c38
-rw-r--r--src/lib/elementary/elm_win.c8
-rw-r--r--src/lib/evas/canvas/efl_vg_base.eo20
-rw-r--r--src/lib/evas/canvas/efl_vg_shape.eo4
-rw-r--r--src/lib/evas/canvas/evas_filter_mixin.c4
-rw-r--r--src/lib/evas/canvas/evas_object.eo22
-rw-r--r--src/lib/evas/canvas/evas_object_main.c24
-rw-r--r--src/lib/evas/canvas/evas_object_text.c2
-rw-r--r--src/lib/evas/canvas/evas_text.eo2
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c22
-rw-r--r--src/lib/evas/canvas/evas_vg_shape.c4
29 files changed, 158 insertions, 158 deletions
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 21a1c002b7..58a00c5510 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -1,7 +1,7 @@
1# Even though libefl is new, it contains definitions used by legacy APIs 1# Even though libefl is new, it contains definitions used by legacy APIs
2efl_eolian_legacy_files = \ 2efl_eolian_legacy_files = \
3 lib/efl/interfaces/efl_gfx_fill.eo \ 3 lib/efl/interfaces/efl_gfx_fill.eo \
4 lib/efl/interfaces/efl_gfx_base.eo \ 4 lib/efl/interfaces/efl_gfx.eo \
5 lib/efl/interfaces/efl_image.eo \ 5 lib/efl/interfaces/efl_image.eo \
6 lib/efl/interfaces/efl_image_animated.eo \ 6 lib/efl/interfaces/efl_image_animated.eo \
7 $(NULL) 7 $(NULL)
diff --git a/src/bin/elementary/test_ui_grid.c b/src/bin/elementary/test_ui_grid.c
index 59a1da9e36..fbd85e41ac 100644
--- a/src/bin/elementary/test_ui_grid.c
+++ b/src/bin/elementary/test_ui_grid.c
@@ -132,7 +132,7 @@ static Eina_Bool
132child_evt_cb(void *data, const Eo_Event *event) 132child_evt_cb(void *data, const Eo_Event *event)
133{ 133{
134 Elm_Label *o = data; 134 Elm_Label *o = data;
135 Efl_Gfx_Base *it = event->info; 135 Efl_Gfx *it = event->info;
136 int col, row, colspan, rowspan; 136 int col, row, colspan, rowspan;
137 char buf[64]; 137 char buf[64];
138 138
diff --git a/src/lib/edje/edje_containers.c b/src/lib/edje/edje_containers.c
index 75d61c4a53..f6d7155495 100644
--- a/src/lib/edje/edje_containers.c
+++ b/src/lib/edje/edje_containers.c
@@ -83,7 +83,7 @@ _efl_canvas_layout_internal_box_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Edje_Bo
83} 83}
84 84
85EOLIAN static Eina_Bool 85EOLIAN static Eina_Bool
86_efl_canvas_layout_internal_box_efl_pack_unpack(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx_Base *subobj) 86_efl_canvas_layout_internal_box_efl_pack_unpack(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx *subobj)
87{ 87{
88 Evas_Object *removed; 88 Evas_Object *removed;
89 removed = _edje_part_box_remove(pd->ed, pd->part, subobj); 89 removed = _edje_part_box_remove(pd->ed, pd->part, subobj);
@@ -91,37 +91,37 @@ _efl_canvas_layout_internal_box_efl_pack_unpack(Eo *obj EINA_UNUSED, Edje_Box_Da
91} 91}
92 92
93EOLIAN static Eina_Bool 93EOLIAN static Eina_Bool
94_efl_canvas_layout_internal_box_efl_pack_pack(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx_Base *subobj) 94_efl_canvas_layout_internal_box_efl_pack_pack(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx *subobj)
95{ 95{
96 return _edje_part_box_append(pd->ed, pd->part, subobj); 96 return _edje_part_box_append(pd->ed, pd->part, subobj);
97} 97}
98 98
99EOLIAN static Eina_Bool 99EOLIAN static Eina_Bool
100_efl_canvas_layout_internal_box_efl_pack_linear_pack_begin(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx_Base *subobj) 100_efl_canvas_layout_internal_box_efl_pack_linear_pack_begin(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx *subobj)
101{ 101{
102 return _edje_part_box_prepend(pd->ed, pd->part, subobj); 102 return _edje_part_box_prepend(pd->ed, pd->part, subobj);
103} 103}
104 104
105EOLIAN static Eina_Bool 105EOLIAN static Eina_Bool
106_efl_canvas_layout_internal_box_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx_Base *subobj) 106_efl_canvas_layout_internal_box_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx *subobj)
107{ 107{
108 return _edje_part_box_append(pd->ed, pd->part, subobj); 108 return _edje_part_box_append(pd->ed, pd->part, subobj);
109} 109}
110 110
111EOLIAN static Eina_Bool 111EOLIAN static Eina_Bool
112_efl_canvas_layout_internal_box_efl_pack_linear_pack_before(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx_Base *subobj, const Efl_Gfx_Base *existing) 112_efl_canvas_layout_internal_box_efl_pack_linear_pack_before(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx *subobj, const Efl_Gfx *existing)
113{ 113{
114 return _edje_part_box_insert_before(pd->ed, pd->part, subobj, existing); 114 return _edje_part_box_insert_before(pd->ed, pd->part, subobj, existing);
115} 115}
116 116
117EOLIAN static Eina_Bool 117EOLIAN static Eina_Bool
118_efl_canvas_layout_internal_box_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx_Base *subobj, const Efl_Gfx_Base *existing) 118_efl_canvas_layout_internal_box_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx *subobj, const Efl_Gfx *existing)
119{ 119{
120 return _edje_part_box_insert_after(pd->ed, pd->part, subobj, existing); 120 return _edje_part_box_insert_after(pd->ed, pd->part, subobj, existing);
121} 121}
122 122
123EOLIAN static Eina_Bool 123EOLIAN static Eina_Bool
124_efl_canvas_layout_internal_box_efl_pack_linear_pack_at(Eo *obj, Edje_Box_Data *pd, Efl_Gfx_Base *subobj, int index) 124_efl_canvas_layout_internal_box_efl_pack_linear_pack_at(Eo *obj, Edje_Box_Data *pd, Efl_Gfx *subobj, int index)
125{ 125{
126 int cnt = efl_content_count(obj); 126 int cnt = efl_content_count(obj);
127 if ((index < 0) && ((-index) <= (cnt + 1))) 127 if ((index < 0) && ((-index) <= (cnt + 1)))
@@ -132,7 +132,7 @@ _efl_canvas_layout_internal_box_efl_pack_linear_pack_at(Eo *obj, Edje_Box_Data *
132 return _edje_part_box_append(pd->ed, pd->part, subobj); 132 return _edje_part_box_append(pd->ed, pd->part, subobj);
133} 133}
134 134
135EOLIAN static Efl_Gfx_Base * 135EOLIAN static Efl_Gfx *
136_efl_canvas_layout_internal_box_efl_pack_linear_pack_unpack_at(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, int index) 136_efl_canvas_layout_internal_box_efl_pack_linear_pack_unpack_at(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, int index)
137{ 137{
138 if (index < 0) index += efl_content_count(obj); 138 if (index < 0) index += efl_content_count(obj);
@@ -141,7 +141,7 @@ _efl_canvas_layout_internal_box_efl_pack_linear_pack_unpack_at(Eo *obj EINA_UNUS
141 141
142/* New APIs with Eo */ 142/* New APIs with Eo */
143 143
144EOLIAN static Efl_Gfx_Base * 144EOLIAN static Efl_Gfx *
145_efl_canvas_layout_internal_box_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, int index) 145_efl_canvas_layout_internal_box_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, int index)
146{ 146{
147 if (index < 0) index += efl_content_count(obj); 147 if (index < 0) index += efl_content_count(obj);
@@ -149,13 +149,13 @@ _efl_canvas_layout_internal_box_efl_pack_linear_pack_content_get(Eo *obj EINA_UN
149} 149}
150 150
151EOLIAN static Eina_Bool 151EOLIAN static Eina_Bool
152_efl_canvas_layout_internal_box_efl_container_content_remove(Eo *obj, Edje_Box_Data *pd EINA_UNUSED, Efl_Gfx_Base *subobj) 152_efl_canvas_layout_internal_box_efl_container_content_remove(Eo *obj, Edje_Box_Data *pd EINA_UNUSED, Efl_Gfx *subobj)
153{ 153{
154 return efl_pack_unpack(obj, subobj); 154 return efl_pack_unpack(obj, subobj);
155} 155}
156 156
157EOLIAN static int 157EOLIAN static int
158_efl_canvas_layout_internal_box_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, const Efl_Gfx_Base * subobj) 158_efl_canvas_layout_internal_box_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, const Efl_Gfx * subobj)
159{ 159{
160 Evas_Object_Box_Option *opt; 160 Evas_Object_Box_Option *opt;
161 Evas_Object_Box_Data *priv; 161 Evas_Object_Box_Data *priv;
@@ -177,7 +177,7 @@ _efl_canvas_layout_internal_box_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUS
177static Eina_Bool 177static Eina_Bool
178_part_item_iterator_next(Part_Item_Iterator *it, void **data) 178_part_item_iterator_next(Part_Item_Iterator *it, void **data)
179{ 179{
180 Efl_Gfx_Base *sub; 180 Efl_Gfx *sub;
181 181
182 if (!it->object) return EINA_FALSE; 182 if (!it->object) return EINA_FALSE;
183 if (!eina_iterator_next(it->real_iterator, (void **) &sub)) 183 if (!eina_iterator_next(it->real_iterator, (void **) &sub))
@@ -305,7 +305,7 @@ _efl_canvas_layout_internal_table_efl_container_content_count(Eo *obj EINA_UNUSE
305} 305}
306 306
307EOLIAN static Eina_Bool 307EOLIAN static Eina_Bool
308_efl_canvas_layout_internal_table_efl_container_content_remove(Eo *obj, Edje_Table_Data *pd EINA_UNUSED, Efl_Gfx_Base *content) 308_efl_canvas_layout_internal_table_efl_container_content_remove(Eo *obj, Edje_Table_Data *pd EINA_UNUSED, Efl_Gfx *content)
309{ 309{
310 return efl_pack_unpack(obj, content); 310 return efl_pack_unpack(obj, content);
311} 311}
@@ -323,18 +323,18 @@ _efl_canvas_layout_internal_table_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Edje_
323} 323}
324 324
325EOLIAN static Eina_Bool 325EOLIAN static Eina_Bool
326_efl_canvas_layout_internal_table_efl_pack_unpack(Eo *obj EINA_UNUSED EINA_UNUSED, Edje_Table_Data *pd, Efl_Gfx_Base *subobj) 326_efl_canvas_layout_internal_table_efl_pack_unpack(Eo *obj EINA_UNUSED EINA_UNUSED, Edje_Table_Data *pd, Efl_Gfx *subobj)
327{ 327{
328 return _edje_part_table_unpack(pd->ed, pd->part, subobj); 328 return _edje_part_table_unpack(pd->ed, pd->part, subobj);
329} 329}
330 330
331EOLIAN static Eina_Bool 331EOLIAN static Eina_Bool
332_efl_canvas_layout_internal_table_efl_pack_grid_pack_grid(Eo *obj EINA_UNUSED, Edje_Table_Data *pd, Efl_Gfx_Base *subobj, int col, int row, int colspan, int rowspan) 332_efl_canvas_layout_internal_table_efl_pack_grid_pack_grid(Eo *obj EINA_UNUSED, Edje_Table_Data *pd, Efl_Gfx *subobj, int col, int row, int colspan, int rowspan)
333{ 333{
334 return _edje_part_table_pack(pd->ed, pd->part, subobj, col, row, colspan, rowspan); 334 return _edje_part_table_pack(pd->ed, pd->part, subobj, col, row, colspan, rowspan);
335} 335}
336 336
337EOLIAN static Efl_Gfx_Base * 337EOLIAN static Efl_Gfx *
338_efl_canvas_layout_internal_table_efl_pack_grid_grid_content_get(Eo *obj EINA_UNUSED, Edje_Table_Data *pd, int col, int row) 338_efl_canvas_layout_internal_table_efl_pack_grid_grid_content_get(Eo *obj EINA_UNUSED, Edje_Table_Data *pd, int col, int row)
339{ 339{
340 return _edje_part_table_child_get(pd->ed, pd->part, col, row); 340 return _edje_part_table_child_get(pd->ed, pd->part, col, row);
@@ -367,7 +367,7 @@ _efl_canvas_layout_internal_table_efl_pack_grid_grid_rows_get(Eo *obj EINA_UNUSE
367static Eina_Bool 367static Eina_Bool
368_table_item_iterator_next(Part_Item_Iterator *it, void **data) 368_table_item_iterator_next(Part_Item_Iterator *it, void **data)
369{ 369{
370 Efl_Gfx_Base *sub; 370 Efl_Gfx *sub;
371 371
372 if (!it->object) return EINA_FALSE; 372 if (!it->object) return EINA_FALSE;
373 if (!eina_iterator_next(it->real_iterator, (void **) &sub)) 373 if (!eina_iterator_next(it->real_iterator, (void **) &sub))
@@ -435,7 +435,7 @@ _efl_canvas_layout_internal_table_efl_pack_grid_grid_contents_get(Eo *obj EINA_U
435} 435}
436 436
437EOLIAN static Eina_Bool 437EOLIAN static Eina_Bool
438_efl_canvas_layout_internal_table_efl_pack_grid_grid_position_get(Eo *obj EINA_UNUSED, Edje_Table_Data *pd, Efl_Gfx_Base * subobj, int *col, int *row, int *colspan, int *rowspan) 438_efl_canvas_layout_internal_table_efl_pack_grid_grid_position_get(Eo *obj EINA_UNUSED, Edje_Table_Data *pd, Efl_Gfx * subobj, int *col, int *row, int *colspan, int *rowspan)
439{ 439{
440 unsigned short c, r, cs, rs; 440 unsigned short c, r, cs, rs;
441 Eina_Bool ret; 441 Eina_Bool ret;
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 4ecb521adc..7009fda9a9 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -3513,7 +3513,7 @@ _edje_object_text_markup_filter_callback_del_full(Eo *obj EINA_UNUSED, Edje *ed,
3513 3513
3514EOLIAN Eina_Bool 3514EOLIAN Eina_Bool
3515_edje_object_efl_container_content_set(Eo *obj EINA_UNUSED, Edje *ed, 3515_edje_object_efl_container_content_set(Eo *obj EINA_UNUSED, Edje *ed,
3516 const char *part, Efl_Gfx_Base *obj_swallow) 3516 const char *part, Efl_Gfx *obj_swallow)
3517{ 3517{
3518 Edje_Real_Part *rp, *rpcur; 3518 Edje_Real_Part *rp, *rpcur;
3519 Edje_User_Defined *eud = NULL; 3519 Edje_User_Defined *eud = NULL;
@@ -3884,7 +3884,7 @@ _edje_object_efl_container_content_remove(Eo *obj EINA_UNUSED, Edje *ed, Evas_Ob
3884 return EINA_TRUE; 3884 return EINA_TRUE;
3885} 3885}
3886 3886
3887EOLIAN Efl_Gfx_Base * 3887EOLIAN Efl_Gfx *
3888_edje_object_efl_container_content_get(Eo *obj, Edje *ed, const char *part) 3888_edje_object_efl_container_content_get(Eo *obj, Edje *ed, const char *part)
3889{ 3889{
3890 Edje_Real_Part *rp; 3890 Edje_Real_Part *rp;
@@ -3917,10 +3917,10 @@ _edje_object_efl_container_content_get(Eo *obj, Edje *ed, const char *part)
3917} 3917}
3918 3918
3919/* new in eo */ 3919/* new in eo */
3920EOLIAN Efl_Gfx_Base * 3920EOLIAN Efl_Gfx *
3921_edje_object_efl_container_content_unset(Eo *obj, Edje *ed EINA_UNUSED, const char *part) 3921_edje_object_efl_container_content_unset(Eo *obj, Edje *ed EINA_UNUSED, const char *part)
3922{ 3922{
3923 Efl_Gfx_Base *content; 3923 Efl_Gfx *content;
3924 3924
3925 content = efl_content_get(obj, part); 3925 content = efl_content_get(obj, part);
3926 if (!content) return NULL; 3926 if (!content) return NULL;
@@ -3933,7 +3933,7 @@ _edje_object_efl_container_content_unset(Eo *obj, Edje *ed EINA_UNUSED, const ch
3933 3933
3934/* new in eo */ 3934/* new in eo */
3935EOLIAN const char * 3935EOLIAN const char *
3936_edje_object_efl_container_content_part_name_get(Eo *obj EINA_UNUSED, Edje *ed EINA_UNUSED, Efl_Gfx_Base *content) 3936_edje_object_efl_container_content_part_name_get(Eo *obj EINA_UNUSED, Edje *ed EINA_UNUSED, Efl_Gfx *content)
3937{ 3937{
3938 Edje_Real_Part *rp; 3938 Edje_Real_Part *rp;
3939 3939
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 074d0359d3..61b62d9ec6 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -93,7 +93,7 @@ EAPI extern const Eo_Event_Description _EFL_GFX_PATH_CHANGED;
93#define EFL_GFX_CHANGED (&(_EFL_GFX_CHANGED)) 93#define EFL_GFX_CHANGED (&(_EFL_GFX_CHANGED))
94#define EFL_GFX_PATH_CHANGED (&(_EFL_GFX_PATH_CHANGED)) 94#define EFL_GFX_PATH_CHANGED (&(_EFL_GFX_PATH_CHANGED))
95 95
96#include "interfaces/efl_gfx_base.eo.h" 96#include "interfaces/efl_gfx.eo.h"
97#include "interfaces/efl_gfx_buffer.eo.h" 97#include "interfaces/efl_gfx_buffer.eo.h"
98#include "interfaces/efl_gfx_stack.eo.h" 98#include "interfaces/efl_gfx_stack.eo.h"
99#include "interfaces/efl_gfx_fill.eo.h" 99#include "interfaces/efl_gfx_fill.eo.h"
@@ -129,7 +129,7 @@ static inline void efl_gfx_color16_type_set(Efl_Gfx_Color *color,
129#ifndef EFL_NOLEGACY_API_SUPPORT 129#ifndef EFL_NOLEGACY_API_SUPPORT
130#include "interfaces/efl_gfx_types.eot.h" 130#include "interfaces/efl_gfx_types.eot.h"
131#include "interfaces/efl_gfx_fill.eo.legacy.h" 131#include "interfaces/efl_gfx_fill.eo.legacy.h"
132#include "interfaces/efl_gfx_base.eo.legacy.h" 132#include "interfaces/efl_gfx.eo.legacy.h"
133#include "interfaces/efl_image.eo.legacy.h" 133#include "interfaces/efl_image.eo.legacy.h"
134#include "interfaces/efl_image_animated.eo.legacy.h" 134#include "interfaces/efl_image_animated.eo.legacy.h"
135#endif 135#endif
diff --git a/src/lib/efl/Makefile.am b/src/lib/efl/Makefile.am
index 321152ef46..17ce1d450a 100644
--- a/src/lib/efl/Makefile.am
+++ b/src/lib/efl/Makefile.am
@@ -5,7 +5,7 @@ include ../../Makefile_Eolian_Subbuild_Helper.am
5# Even though libefl is new, it contains definitions used by legacy APIs 5# Even though libefl is new, it contains definitions used by legacy APIs
6efl_eolian_legacy_files = \ 6efl_eolian_legacy_files = \
7interfaces/efl_gfx_fill.eo \ 7interfaces/efl_gfx_fill.eo \
8interfaces/efl_gfx_base.eo \ 8interfaces/efl_gfx.eo \
9interfaces/efl_image.eo \ 9interfaces/efl_image.eo \
10interfaces/efl_image_animated.eo \ 10interfaces/efl_image_animated.eo \
11$(NULL) 11$(NULL)
diff --git a/src/lib/efl/interfaces/efl_container.eo b/src/lib/efl/interfaces/efl_container.eo
index c31e2c09f1..9663ebe383 100644
--- a/src/lib/efl/interfaces/efl_container.eo
+++ b/src/lib/efl/interfaces/efl_container.eo
@@ -1,4 +1,4 @@
1interface Efl.Container (Efl.Gfx.Base) 1interface Efl.Container (Efl.Gfx)
2{ 2{
3 [[API common to all UI container objects.]] 3 [[API common to all UI container objects.]]
4 legacy_prefix: null; 4 legacy_prefix: null;
@@ -14,14 +14,14 @@ interface Efl.Container (Efl.Gfx.Base)
14 part: const(char)*; [[the part in which to swallow the object]] 14 part: const(char)*; [[the part in which to swallow the object]]
15 } 15 }
16 values { 16 values {
17 content: Efl.Gfx.Base*; [[the object to swallow.]] 17 content: Efl.Gfx*; [[the object to swallow.]]
18 } 18 }
19 } 19 }
20 @property content_part_name { 20 @property content_part_name {
21 [[The name of the part under which an object is swallowed.]] 21 [[The name of the part under which an object is swallowed.]]
22 get {} 22 get {}
23 keys { 23 keys {
24 content: Efl.Gfx.Base*; 24 content: Efl.Gfx*;
25 } 25 }
26 values { 26 values {
27 name: const(char)*; 27 name: const(char)*;
@@ -32,18 +32,18 @@ interface Efl.Container (Efl.Gfx.Base)
32 params { 32 params {
33 @in name: const(char)* @nullable; 33 @in name: const(char)* @nullable;
34 } 34 }
35 return: Efl.Gfx.Base*; 35 return: Efl.Gfx*;
36 } 36 }
37 content_remove { 37 content_remove {
38 [[Unswallow an object from this container.]] 38 [[Unswallow an object from this container.]]
39 params { 39 params {
40 @in content: Efl.Gfx.Base*; 40 @in content: Efl.Gfx*;
41 } 41 }
42 return: bool; [[$false if $content was not a child or can not be removed.]] 42 return: bool; [[$false if $content was not a child or can not be removed.]]
43 } 43 }
44 content_iterate { 44 content_iterate {
45 [[Begin iterating over this object's contents.]] 45 [[Begin iterating over this object's contents.]]
46 return: free(own(iterator<Efl.Gfx.Base *> *), eina_iterator_free) @warn_unused; 46 return: free(own(iterator<Efl.Gfx *> *), eina_iterator_free) @warn_unused;
47 } 47 }
48 content_count { 48 content_count {
49 [[Returns the number of UI elements packed in this container.]] 49 [[Returns the number of UI elements packed in this container.]]
@@ -51,7 +51,7 @@ interface Efl.Container (Efl.Gfx.Base)
51 } 51 }
52 } 52 }
53 events { 53 events {
54 content,added: Efl.Gfx.Base*; [[Sent after a new item was added.]] 54 content,added: Efl.Gfx*; [[Sent after a new item was added.]]
55 content,removed: Efl.Gfx.Base*; [[Sent after an item was removed, before unref.]] 55 content,removed: Efl.Gfx*; [[Sent after an item was removed, before unref.]]
56 } 56 }
57} 57}
diff --git a/src/lib/efl/interfaces/efl_gfx_base.eo b/src/lib/efl/interfaces/efl_gfx.eo
index 2b757cf46c..9c47e7bc2d 100644
--- a/src/lib/efl/interfaces/efl_gfx_base.eo
+++ b/src/lib/efl/interfaces/efl_gfx.eo
@@ -1,6 +1,6 @@
1import efl_gfx_types; 1import efl_gfx_types;
2 2
3interface Efl.Gfx.Base { 3interface Efl.Gfx {
4 legacy_prefix: null; 4 legacy_prefix: null;
5 eo_prefix: efl_gfx; 5 eo_prefix: efl_gfx;
6 methods { 6 methods {
@@ -72,7 +72,7 @@ interface Efl.Gfx.Base {
72 } 72 }
73 @property color_part { 73 @property color_part {
74 set { 74 set {
75 [[Sets a specifc color of the given Efl.Gfx.Base object to the 75 [[Sets a specifc color of the given Efl.Gfx object to the
76 given one. 76 given one.
77 77
78 See also @.color.get (for an example) 78 See also @.color.get (for an example)
diff --git a/src/lib/efl/interfaces/efl_gfx_buffer.eo b/src/lib/efl/interfaces/efl_gfx_buffer.eo
index 80191451cd..08a92f9376 100644
--- a/src/lib/efl/interfaces/efl_gfx_buffer.eo
+++ b/src/lib/efl/interfaces/efl_gfx_buffer.eo
@@ -59,7 +59,7 @@ interface Efl.Gfx.Buffer ()
59 whether or not to use alpha channel data. A value of $true 59 whether or not to use alpha channel data. A value of $true
60 makes it use alpha channel data, and $false makes it ignore 60 makes it use alpha channel data, and $false makes it ignore
61 that data. Note that this has nothing to do with an object's 61 that data. Note that this has nothing to do with an object's
62 color as manipulated by @Efl.Gfx.Base.color.set. 62 color as manipulated by @Efl.Gfx.color.set.
63 ]] 63 ]]
64 } 64 }
65 get { 65 get {
diff --git a/src/lib/efl/interfaces/efl_gfx_filter.eo b/src/lib/efl/interfaces/efl_gfx_filter.eo
index 52267dec40..b59d857593 100644
--- a/src/lib/efl/interfaces/efl_gfx_filter.eo
+++ b/src/lib/efl/interfaces/efl_gfx_filter.eo
@@ -86,7 +86,7 @@ interface Efl.Gfx.Filter
86 name: const(char)*; [[Buffer name as used in the program.]] 86 name: const(char)*; [[Buffer name as used in the program.]]
87 } 87 }
88 values { 88 values {
89 source: Efl.Gfx.Base*; [[Object to use as a source of pixels.]] 89 source: Efl.Gfx*; [[Object to use as a source of pixels.]]
90 } 90 }
91 } 91 }
92 @property filter_data { 92 @property filter_data {
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index 14b665ba89..b3ece1e3ca 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -13,7 +13,7 @@
13#include "interfaces/efl_text.eo.c" 13#include "interfaces/efl_text.eo.c"
14#include "interfaces/efl_text_properties.eo.c" 14#include "interfaces/efl_text_properties.eo.c"
15 15
16#include "interfaces/efl_gfx_base.eo.c" 16#include "interfaces/efl_gfx.eo.c"
17#include "interfaces/efl_gfx_buffer.eo.c" 17#include "interfaces/efl_gfx_buffer.eo.c"
18#include "interfaces/efl_gfx_stack.eo.c" 18#include "interfaces/efl_gfx_stack.eo.c"
19#include "interfaces/efl_gfx_fill.eo.c" 19#include "interfaces/efl_gfx_fill.eo.c"
diff --git a/src/lib/efl/interfaces/efl_pack.eo b/src/lib/efl/interfaces/efl_pack.eo
index 76ffc48386..95c60feaed 100644
--- a/src/lib/efl/interfaces/efl_pack.eo
+++ b/src/lib/efl/interfaces/efl_pack.eo
@@ -20,7 +20,7 @@ interface Efl.Pack (Efl.Container)
20 unpack { 20 unpack {
21 [[Removes an existing item from the container, without deleting it.]] 21 [[Removes an existing item from the container, without deleting it.]]
22 params { 22 params {
23 subobj: own(Efl.Gfx.Base *); 23 subobj: own(Efl.Gfx *);
24 } 24 }
25 return: bool; [[$false if $subobj wasn't a child or can't be removed]] 25 return: bool; [[$false if $subobj wasn't a child or can't be removed]]
26 } 26 }
@@ -35,7 +35,7 @@ interface Efl.Pack (Efl.Container)
35 failed, the object will be unrefed. 35 failed, the object will be unrefed.
36 ]] 36 ]]
37 params { 37 params {
38 subobj: own(Efl.Gfx.Base *); 38 subobj: own(Efl.Gfx *);
39 } 39 }
40 return: bool; [[$false if $subobj could not be packed.]] 40 return: bool; [[$false if $subobj could not be packed.]]
41 } 41 }
diff --git a/src/lib/efl/interfaces/efl_pack_grid.eo b/src/lib/efl/interfaces/efl_pack_grid.eo
index 9b2b184ca0..0e282babf1 100644
--- a/src/lib/efl/interfaces/efl_pack_grid.eo
+++ b/src/lib/efl/interfaces/efl_pack_grid.eo
@@ -8,7 +8,7 @@ interface Efl.Pack_Grid (Efl.Pack_Linear)
8 methods { 8 methods {
9 pack_grid { 9 pack_grid {
10 params { 10 params {
11 subobj: own(Efl.Gfx.Base *); 11 subobj: own(Efl.Gfx *);
12 col: int; 12 col: int;
13 row: int; 13 row: int;
14 colspan: int @optional; [[0 means 1, -1 means @.grid_columns]] 14 colspan: int @optional; [[0 means 1, -1 means @.grid_columns]]
@@ -18,7 +18,7 @@ interface Efl.Pack_Grid (Efl.Pack_Linear)
18 } 18 }
19 grid_contents_get { 19 grid_contents_get {
20 [[Returns all objects at a given position in this grid.]] 20 [[Returns all objects at a given position in this grid.]]
21 return: free(own(iterator<Efl.Gfx.Base *> *), eina_iterator_free); 21 return: free(own(iterator<Efl.Gfx *> *), eina_iterator_free);
22 params { 22 params {
23 @in col: int; 23 @in col: int;
24 @in row: int; 24 @in row: int;
@@ -27,7 +27,7 @@ interface Efl.Pack_Grid (Efl.Pack_Linear)
27 } 27 }
28 grid_content_get { 28 grid_content_get {
29 [[Returns a child at a given position, see @.grid_contents_get.]] 29 [[Returns a child at a given position, see @.grid_contents_get.]]
30 return: Efl.Gfx.Base*; 30 return: Efl.Gfx*;
31 params { 31 params {
32 @in col: int; 32 @in col: int;
33 @in row: int; 33 @in row: int;
@@ -37,7 +37,7 @@ interface Efl.Pack_Grid (Efl.Pack_Linear)
37 [[position and span of the $subobj in this container, may be modified to move the $subobj]] 37 [[position and span of the $subobj in this container, may be modified to move the $subobj]]
38 get { return: bool; [[returns false if item is not a child]] } 38 get { return: bool; [[returns false if item is not a child]] }
39 keys { 39 keys {
40 subobj: Efl.Gfx.Base*; 40 subobj: Efl.Gfx*;
41 } 41 }
42 values { 42 values {
43 col: int; 43 col: int;
diff --git a/src/lib/efl/interfaces/efl_pack_layout.eo b/src/lib/efl/interfaces/efl_pack_layout.eo
index dbae2ee218..a20bae384d 100644
--- a/src/lib/efl/interfaces/efl_pack_layout.eo
+++ b/src/lib/efl/interfaces/efl_pack_layout.eo
@@ -37,7 +37,7 @@ interface Efl.Pack_Layout ()
37 layout_do @class @protected { 37 layout_do @class @protected {
38 [[Lay out (resize and move) children objects of $pack.]] 38 [[Lay out (resize and move) children objects of $pack.]]
39 params { 39 params {
40 pack: Efl.Gfx.Base*; [[The container to lay out.]] 40 pack: Efl.Gfx*; [[The container to lay out.]]
41 data: const(void)* @optional; [[Extra data passed by the caller.]] 41 data: const(void)* @optional; [[Extra data passed by the caller.]]
42 } 42 }
43 } 43 }
diff --git a/src/lib/efl/interfaces/efl_pack_linear.eo b/src/lib/efl/interfaces/efl_pack_linear.eo
index 3ff3f017b6..d379fee1a5 100644
--- a/src/lib/efl/interfaces/efl_pack_linear.eo
+++ b/src/lib/efl/interfaces/efl_pack_linear.eo
@@ -13,7 +13,7 @@ interface Efl.Pack_Linear (Efl.Pack)
13 This is the same as @.pack_at($subobj, 0). 13 This is the same as @.pack_at($subobj, 0).
14 ]] 14 ]]
15 params { 15 params {
16 @in subobj: own(Efl.Gfx.Base *); [[Item to pack.]] 16 @in subobj: own(Efl.Gfx *); [[Item to pack.]]
17 } 17 }
18 return: bool; [[$false if $subobj could not be packed]] 18 return: bool; [[$false if $subobj could not be packed]]
19 } 19 }
@@ -23,15 +23,15 @@ interface Efl.Pack_Linear (Efl.Pack)
23 This is the same as @.pack_at($subobj, -1). 23 This is the same as @.pack_at($subobj, -1).
24 ]] 24 ]]
25 params { 25 params {
26 @in subobj: own(Efl.Gfx.Base *); [[Item to pack.]] 26 @in subobj: own(Efl.Gfx *); [[Item to pack.]]
27 } 27 }
28 return: bool; [[$false if $subobj could not be packed]] 28 return: bool; [[$false if $subobj could not be packed]]
29 } 29 }
30 pack_before { 30 pack_before {
31 [[Prepend item before other sub object.]] 31 [[Prepend item before other sub object.]]
32 params { 32 params {
33 @in subobj: own(Efl.Gfx.Base *); [[Item to pack.]] 33 @in subobj: own(Efl.Gfx *); [[Item to pack.]]
34 @in existing: const(Efl.Gfx.Base)*; [[Item to refer to.]] 34 @in existing: const(Efl.Gfx)*; [[Item to refer to.]]
35 } 35 }
36 return: bool; [[$false if $existing could not be found or $subobj 36 return: bool; [[$false if $existing could not be found or $subobj
37 could not be packed]] 37 could not be packed]]
@@ -39,8 +39,8 @@ interface Efl.Pack_Linear (Efl.Pack)
39 pack_after { 39 pack_after {
40 [[Append item after other sub object.]] 40 [[Append item after other sub object.]]
41 params { 41 params {
42 @in subobj: own(Efl.Gfx.Base *); [[Item to pack.]] 42 @in subobj: own(Efl.Gfx *); [[Item to pack.]]
43 @in existing: const(Efl.Gfx.Base)*; [[Item to refer to.]] 43 @in existing: const(Efl.Gfx)*; [[Item to refer to.]]
44 } 44 }
45 return: bool; [[$false if $existing could not be found or $subobj 45 return: bool; [[$false if $existing could not be found or $subobj
46 could not be packed]] 46 could not be packed]]
@@ -52,7 +52,7 @@ interface Efl.Pack_Linear (Efl.Pack)
52 Out of range indices will trigger an append. 52 Out of range indices will trigger an append.
53 ]] 53 ]]
54 params { 54 params {
55 @in subobj: own(Efl.Gfx.Base *); [[Item to pack.]] 55 @in subobj: own(Efl.Gfx *); [[Item to pack.]]
56 @in index: int; [[A position.]] 56 @in index: int; [[A position.]]
57 } 57 }
58 return: bool; [[$false if $subobj could not be packed]] 58 return: bool; [[$false if $subobj could not be packed]]
@@ -66,12 +66,12 @@ interface Efl.Pack_Linear (Efl.Pack)
66 params { 66 params {
67 index: int; 67 index: int;
68 } 68 }
69 return: Efl.Gfx.Base *; [[The object contained at the given $index.]] 69 return: Efl.Gfx *; [[The object contained at the given $index.]]
70 } 70 }
71 pack_index_get { 71 pack_index_get {
72 [[Get the index of a child in this container.]] 72 [[Get the index of a child in this container.]]
73 params { 73 params {
74 subobj: const(Efl.Gfx.Base)*; [[An object contained in this pack.]] 74 subobj: const(Efl.Gfx)*; [[An object contained in this pack.]]
75 } 75 }
76 return: int(-1); [[-1 in case of failure, or the index of this item.]] 76 return: int(-1); [[-1 in case of failure, or the index of this item.]]
77 } 77 }
@@ -83,7 +83,7 @@ interface Efl.Pack_Linear (Efl.Pack)
83 params { 83 params {
84 index: int; 84 index: int;
85 } 85 }
86 return: Efl.Gfx.Base*; [[The child item if it could be removed.]] 86 return: Efl.Gfx*; [[The child item if it could be removed.]]
87 } 87 }
88 @property pack_direction { 88 @property pack_direction {
89 [[Primary up/left/right/down orientation. Default is right.]] 89 [[Primary up/left/right/down orientation. Default is right.]]
diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index 157b462d57..38c3b17346 100644
--- a/src/lib/elementary/efl_ui_box.c
+++ b/src/lib/elementary/efl_ui_box.c
@@ -320,7 +320,7 @@ _efl_ui_box_efl_pack_unpack_all(Eo *obj, Efl_Ui_Box_Data *pd)
320} 320}
321 321
322EOLIAN static Eina_Bool 322EOLIAN static Eina_Bool
323_efl_ui_box_efl_pack_unpack(Eo *obj, Efl_Ui_Box_Data *pd, Efl_Gfx_Base *subobj) 323_efl_ui_box_efl_pack_unpack(Eo *obj, Efl_Ui_Box_Data *pd, Efl_Gfx *subobj)
324{ 324{
325 Eina_Bool ret = EINA_FALSE; 325 Eina_Bool ret = EINA_FALSE;
326 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 326 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -335,13 +335,13 @@ _efl_ui_box_efl_pack_unpack(Eo *obj, Efl_Ui_Box_Data *pd, Efl_Gfx_Base *subobj)
335} 335}
336 336
337EOLIAN static Eina_Bool 337EOLIAN static Eina_Bool
338_efl_ui_box_efl_pack_pack(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx_Base *subobj) 338_efl_ui_box_efl_pack_pack(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx *subobj)
339{ 339{
340 return efl_pack_end(obj, subobj); 340 return efl_pack_end(obj, subobj);
341} 341}
342 342
343EOLIAN static Eina_Bool 343EOLIAN static Eina_Bool
344_efl_ui_box_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx_Base *subobj) 344_efl_ui_box_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx *subobj)
345{ 345{
346 Eina_Bool ret; 346 Eina_Bool ret;
347 347
@@ -354,7 +354,7 @@ _efl_ui_box_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, E
354} 354}
355 355
356EOLIAN static Eina_Bool 356EOLIAN static Eina_Bool
357_efl_ui_box_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx_Base *subobj) 357_efl_ui_box_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx *subobj)
358{ 358{
359 Eina_Bool ret; 359 Eina_Bool ret;
360 360
@@ -367,7 +367,7 @@ _efl_ui_box_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED
367} 367}
368 368
369EOLIAN static Eina_Bool 369EOLIAN static Eina_Bool
370_efl_ui_box_efl_pack_linear_pack_before(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx_Base *subobj, const Efl_Gfx_Base *existing) 370_efl_ui_box_efl_pack_linear_pack_before(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing)
371{ 371{
372 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 372 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
373 373
@@ -384,7 +384,7 @@ _efl_ui_box_efl_pack_linear_pack_before(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSE
384} 384}
385 385
386EOLIAN static Eina_Bool 386EOLIAN static Eina_Bool
387_efl_ui_box_efl_pack_linear_pack_after(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx_Base *subobj, const Efl_Gfx_Base *existing) 387_efl_ui_box_efl_pack_linear_pack_after(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing)
388{ 388{
389 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 389 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
390 390
@@ -402,7 +402,7 @@ _efl_ui_box_efl_pack_linear_pack_after(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED
402 402
403EOLIAN static Eina_Bool 403EOLIAN static Eina_Bool
404_efl_ui_box_efl_pack_linear_pack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, 404_efl_ui_box_efl_pack_linear_pack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
405 Efl_Gfx_Base *subobj, int index) 405 Efl_Gfx *subobj, int index)
406{ 406{
407 if (!index) 407 if (!index)
408 return efl_pack_begin(obj, subobj); 408 return efl_pack_begin(obj, subobj);
@@ -428,13 +428,13 @@ _efl_ui_box_efl_pack_linear_pack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
428 } 428 }
429} 429}
430 430
431static inline Efl_Gfx_Base * 431static inline Efl_Gfx *
432_box_item(Evas_Object_Box_Option *opt) 432_box_item(Evas_Object_Box_Option *opt)
433{ 433{
434 return opt ? opt->obj : NULL; 434 return opt ? opt->obj : NULL;
435} 435}
436 436
437EOLIAN static Efl_Gfx_Base * 437EOLIAN static Efl_Gfx *
438_efl_ui_box_efl_pack_linear_pack_content_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, 438_efl_ui_box_efl_pack_linear_pack_content_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
439 int index) 439 int index)
440{ 440{
@@ -465,11 +465,11 @@ _efl_ui_box_efl_pack_linear_pack_content_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_U
465 return _box_item(eina_list_nth(bd->children, index)); 465 return _box_item(eina_list_nth(bd->children, index));
466} 466}
467 467
468EOLIAN static Efl_Gfx_Base * 468EOLIAN static Efl_Gfx *
469_efl_ui_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, 469_efl_ui_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
470 int index) 470 int index)
471{ 471{
472 Efl_Gfx_Base *content; 472 Efl_Gfx *content;
473 473
474 content = efl_pack_content_get(obj, index); 474 content = efl_pack_content_get(obj, index);
475 if (!content) return NULL; 475 if (!content) return NULL;
@@ -482,7 +482,7 @@ _efl_ui_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNU
482 482
483EOLIAN static int 483EOLIAN static int
484_efl_ui_box_efl_pack_linear_pack_index_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, 484_efl_ui_box_efl_pack_linear_pack_index_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
485 const Efl_Gfx_Base *subobj) 485 const Efl_Gfx *subobj)
486{ 486{
487 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, -1); 487 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, -1);
488 Evas_Object_Box_Data *bd; 488 Evas_Object_Box_Data *bd;
@@ -516,7 +516,7 @@ _efl_ui_box_efl_pack_layout_layout_request(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNU
516static Eina_Bool 516static Eina_Bool
517_box_item_iterator_next(Box_Item_Iterator *it, void **data) 517_box_item_iterator_next(Box_Item_Iterator *it, void **data)
518{ 518{
519 Efl_Gfx_Base *sub; 519 Efl_Gfx *sub;
520 520
521 if (!eina_iterator_next(it->real_iterator, (void **) &sub)) 521 if (!eina_iterator_next(it->real_iterator, (void **) &sub))
522 return EINA_FALSE; 522 return EINA_FALSE;
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index bc13d964c7..2638dc067c 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -19,7 +19,7 @@ typedef struct _Grid_Item Grid_Item;
19typedef struct _Custom_Table_Data Custom_Table_Data; 19typedef struct _Custom_Table_Data Custom_Table_Data;
20 20
21static Eina_Bool _subobj_del_cb(void *data, const Eo_Event *event); 21static Eina_Bool _subobj_del_cb(void *data, const Eo_Event *event);
22static void _item_remove(Efl_Ui_Grid *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx_Base *subobj); 22static void _item_remove(Efl_Ui_Grid *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj);
23 23
24#define GRID_ITEM_KEY "__grid_item" 24#define GRID_ITEM_KEY "__grid_item"
25 25
@@ -27,7 +27,7 @@ struct _Grid_Item
27{ 27{
28 EINA_INLIST; 28 EINA_INLIST;
29 29
30 Efl_Gfx_Base *object; 30 Efl_Gfx *object;
31 int col_span, row_span; 31 int col_span, row_span;
32 int col, row; 32 int col, row;
33 33
@@ -408,7 +408,7 @@ _subobj_del_cb(void *data, const Eo_Event *event)
408} 408}
409 409
410static Eina_Bool 410static Eina_Bool
411_pack_at(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx_Base *subobj, 411_pack_at(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj,
412 int col, int row, int colspan, int rowspan, Eina_Bool linear) 412 int col, int row, int colspan, int rowspan, Eina_Bool linear)
413{ 413{
414 Grid_Item *gi = NULL; 414 Grid_Item *gi = NULL;
@@ -474,7 +474,7 @@ _pack_at(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx_Base *subobj,
474 474
475EOLIAN static Eina_Bool 475EOLIAN static Eina_Bool
476_efl_ui_grid_efl_pack_grid_pack_grid(Eo *obj, Efl_Ui_Grid_Data *pd, 476_efl_ui_grid_efl_pack_grid_pack_grid(Eo *obj, Efl_Ui_Grid_Data *pd,
477 Efl_Gfx_Base *subobj, 477 Efl_Gfx *subobj,
478 int col, int row, int colspan, int rowspan) 478 int col, int row, int colspan, int rowspan)
479{ 479{
480 EINA_SAFETY_ON_NULL_RETURN_VAL(subobj, EINA_FALSE); 480 EINA_SAFETY_ON_NULL_RETURN_VAL(subobj, EINA_FALSE);
@@ -514,7 +514,7 @@ end:
514 return ret; 514 return ret;
515} 515}
516 516
517EOLIAN static Efl_Gfx_Base * 517EOLIAN static Efl_Gfx *
518_efl_ui_grid_efl_pack_grid_grid_content_get(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED, int col, int row) 518_efl_ui_grid_efl_pack_grid_grid_content_get(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED, int col, int row)
519{ 519{
520 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 520 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
@@ -523,7 +523,7 @@ _efl_ui_grid_efl_pack_grid_grid_content_get(Eo *obj, Efl_Ui_Grid_Data *pd EINA_U
523} 523}
524 524
525static void 525static void
526_item_remove(Efl_Ui_Grid *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx_Base *subobj) 526_item_remove(Efl_Ui_Grid *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj)
527{ 527{
528 Grid_Item *gi = eo_key_data_get(subobj, GRID_ITEM_KEY); 528 Grid_Item *gi = eo_key_data_get(subobj, GRID_ITEM_KEY);
529 Grid_Item *gi2, *last = NULL; 529 Grid_Item *gi2, *last = NULL;
@@ -580,7 +580,7 @@ end:
580} 580}
581 581
582EOLIAN static Eina_Bool 582EOLIAN static Eina_Bool
583_efl_ui_grid_efl_pack_unpack(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx_Base *subobj) 583_efl_ui_grid_efl_pack_unpack(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj)
584{ 584{
585 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 585 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
586 586
@@ -622,7 +622,7 @@ _efl_ui_grid_efl_pack_layout_layout_request(Eo *obj, Efl_Ui_Grid_Data *pd EINA_U
622static Eina_Bool 622static Eina_Bool
623_grid_item_iterator_next(Grid_Item_Iterator *it, void **data) 623_grid_item_iterator_next(Grid_Item_Iterator *it, void **data)
624{ 624{
625 Efl_Gfx_Base *sub; 625 Efl_Gfx *sub;
626 626
627 if (!eina_iterator_next(it->real_iterator, (void **) &sub)) 627 if (!eina_iterator_next(it->real_iterator, (void **) &sub))
628 return EINA_FALSE; 628 return EINA_FALSE;
@@ -835,14 +835,14 @@ _efl_ui_grid_efl_pack_grid_grid_rows_get(Eo *obj EINA_UNUSED, Efl_Ui_Grid_Data *
835} 835}
836 836
837EOLIAN static Eina_Bool 837EOLIAN static Eina_Bool
838_efl_ui_grid_efl_pack_pack(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED, Efl_Gfx_Base *subobj) 838_efl_ui_grid_efl_pack_pack(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED, Efl_Gfx *subobj)
839{ 839{
840 /* this is just an alias */ 840 /* this is just an alias */
841 return efl_pack_end(obj, subobj); 841 return efl_pack_end(obj, subobj);
842} 842}
843 843
844EOLIAN static Eina_Bool 844EOLIAN static Eina_Bool
845_efl_ui_grid_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx_Base *subobj) 845_efl_ui_grid_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj)
846{ 846{
847 EINA_SAFETY_ON_NULL_RETURN_VAL(subobj, EINA_FALSE); 847 EINA_SAFETY_ON_NULL_RETURN_VAL(subobj, EINA_FALSE);
848 848
diff --git a/src/lib/elementary/elm_layout.c b/src/lib/elementary/elm_layout.c
index 522b432174..c6694cf9e5 100644
--- a/src/lib/elementary/elm_layout.c
+++ b/src/lib/elementary/elm_layout.c
@@ -1137,7 +1137,7 @@ _elm_layout_efl_container_content_unset(Eo *obj, Elm_Layout_Smart_Data *sd, cons
1137 1137
1138EOLIAN static Eina_Bool 1138EOLIAN static Eina_Bool
1139_elm_layout_efl_container_content_remove(Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED, 1139_elm_layout_efl_container_content_remove(Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED,
1140 Efl_Gfx_Base *content) 1140 Efl_Gfx *content)
1141{ 1141{
1142 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 1142 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
1143 1143
@@ -1225,7 +1225,7 @@ _elm_layout_efl_container_content_iterate(Eo *eo_obj EINA_UNUSED, Elm_Layout_Sma
1225EOLIAN static const char * 1225EOLIAN static const char *
1226_elm_layout_efl_container_content_part_name_get(Eo *eo_obj EINA_UNUSED, 1226_elm_layout_efl_container_content_part_name_get(Eo *eo_obj EINA_UNUSED,
1227 Elm_Layout_Smart_Data *sd, 1227 Elm_Layout_Smart_Data *sd,
1228 Efl_Gfx_Base *content) 1228 Efl_Gfx *content)
1229{ 1229{
1230 Elm_Layout_Sub_Object_Data *sub; 1230 Elm_Layout_Sub_Object_Data *sub;
1231 Eina_List *l; 1231 Eina_List *l;
diff --git a/src/lib/elementary/elm_layout_pack.c b/src/lib/elementary/elm_layout_pack.c
index 13c27276f3..bbab226635 100644
--- a/src/lib/elementary/elm_layout_pack.c
+++ b/src/lib/elementary/elm_layout_pack.c
@@ -99,7 +99,7 @@ _efl_ui_layout_internal_box_eo_base_destructor(Eo *obj, Efl_Ui_Layout_Box_Data *
99static Eina_Bool 99static Eina_Bool
100_part_item_iterator_next(Part_Item_Iterator *it, void **data) 100_part_item_iterator_next(Part_Item_Iterator *it, void **data)
101{ 101{
102 Efl_Gfx_Base *sub; 102 Efl_Gfx *sub;
103 103
104 if (!it->object) return EINA_FALSE; 104 if (!it->object) return EINA_FALSE;
105 if (!eina_iterator_next(it->real_iterator, (void **) &sub)) 105 if (!eina_iterator_next(it->real_iterator, (void **) &sub))
@@ -161,7 +161,7 @@ _efl_ui_layout_internal_box_efl_container_content_count(Eo *obj EINA_UNUSED, Efl
161} 161}
162 162
163EOLIAN static Eina_Bool 163EOLIAN static Eina_Bool
164_efl_ui_layout_internal_box_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Box_Data *pd EINA_UNUSED, Efl_Gfx_Base *content) 164_efl_ui_layout_internal_box_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Box_Data *pd EINA_UNUSED, Efl_Gfx *content)
165{ 165{
166 // alias 166 // alias
167 return efl_pack_unpack(obj, content); 167 return efl_pack_unpack(obj, content);
@@ -180,39 +180,39 @@ _efl_ui_layout_internal_box_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Efl_Ui_Layo
180} 180}
181 181
182EOLIAN static Eina_Bool 182EOLIAN static Eina_Bool
183_efl_ui_layout_internal_box_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Base *subobj) 183_efl_ui_layout_internal_box_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
184{ 184{
185 return _elm_layout_box_remove(pd->obj, pd->sd, pd->part, subobj) != NULL; 185 return _elm_layout_box_remove(pd->obj, pd->sd, pd->part, subobj) != NULL;
186} 186}
187 187
188EOLIAN static Eina_Bool 188EOLIAN static Eina_Bool
189_efl_ui_layout_internal_box_efl_pack_pack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Base *subobj) 189_efl_ui_layout_internal_box_efl_pack_pack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
190{ 190{
191 return _elm_layout_box_append(pd->obj, pd->sd, pd->part, subobj); 191 return _elm_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_begin(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Base *subobj) 195_efl_ui_layout_internal_box_efl_pack_linear_pack_begin(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
196{ 196{
197 return _elm_layout_box_prepend(pd->obj, pd->sd, pd->part, subobj); 197 return _elm_layout_box_prepend(pd->obj, pd->sd, pd->part, subobj);
198} 198}
199 199
200EOLIAN static Eina_Bool 200EOLIAN static Eina_Bool
201_efl_ui_layout_internal_box_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Base *subobj) 201_efl_ui_layout_internal_box_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
202{ 202{
203 return _elm_layout_box_append(pd->obj, pd->sd, pd->part, subobj); 203 return _elm_layout_box_append(pd->obj, pd->sd, pd->part, subobj);
204} 204}
205 205
206EOLIAN static Eina_Bool 206EOLIAN static Eina_Bool
207_efl_ui_layout_internal_box_efl_pack_linear_pack_before(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Base *subobj, const Efl_Gfx_Base *existing) 207_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)
208{ 208{
209 return _elm_layout_box_insert_before(pd->obj, pd->sd, pd->part, subobj, existing); 209 return _elm_layout_box_insert_before(pd->obj, pd->sd, pd->part, subobj, existing);
210} 210}
211 211
212EOLIAN static Eina_Bool 212EOLIAN static Eina_Bool
213_efl_ui_layout_internal_box_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Base *subobj, const Efl_Gfx_Base *existing) 213_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)
214{ 214{
215 const Efl_Gfx_Base *other; 215 const Efl_Gfx *other;
216 int index; 216 int index;
217 217
218 index = efl_pack_index_get(pd->pack, existing); 218 index = efl_pack_index_get(pd->pack, existing);
@@ -227,12 +227,12 @@ _efl_ui_layout_internal_box_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED, Efl_
227} 227}
228 228
229EOLIAN static Eina_Bool 229EOLIAN static Eina_Bool
230_efl_ui_layout_internal_box_efl_pack_linear_pack_at(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Base *subobj, int index) 230_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)
231{ 231{
232 return _elm_layout_box_insert_at(pd->obj, pd->sd, pd->part, subobj, index); 232 return _elm_layout_box_insert_at(pd->obj, pd->sd, pd->part, subobj, index);
233} 233}
234 234
235EOLIAN static Efl_Gfx_Base * 235EOLIAN static Efl_Gfx *
236_efl_ui_layout_internal_box_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, int index) 236_efl_ui_layout_internal_box_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, int index)
237{ 237{
238 Evas_Object_Box_Option *opt; 238 Evas_Object_Box_Option *opt;
@@ -244,10 +244,10 @@ _efl_ui_layout_internal_box_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED
244 return opt->obj; 244 return opt->obj;
245} 245}
246 246
247EOLIAN static Efl_Gfx_Base * 247EOLIAN static Efl_Gfx *
248_efl_ui_layout_internal_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Layout_Box_Data *pd, int index) 248_efl_ui_layout_internal_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Layout_Box_Data *pd, int index)
249{ 249{
250 Efl_Gfx_Base *subobj; 250 Efl_Gfx *subobj;
251 251
252 subobj = efl_pack_content_get(pd->pack, index); 252 subobj = efl_pack_content_get(pd->pack, index);
253 if (!subobj) return NULL; 253 if (!subobj) return NULL;
@@ -259,7 +259,7 @@ _efl_ui_layout_internal_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Layou
259} 259}
260 260
261EOLIAN static int 261EOLIAN static int
262_efl_ui_layout_internal_box_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, const Efl_Gfx_Base *subobj) 262_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)
263{ 263{
264 return efl_pack_index_get(pd->pack, subobj); 264 return efl_pack_index_get(pd->pack, subobj);
265} 265}
@@ -313,7 +313,7 @@ _efl_ui_layout_internal_table_efl_container_content_count(Eo *obj EINA_UNUSED, E
313} 313}
314 314
315EOLIAN static Eina_Bool 315EOLIAN static Eina_Bool
316_efl_ui_layout_internal_table_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Table_Data *pd EINA_UNUSED, Efl_Gfx_Base *content) 316_efl_ui_layout_internal_table_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Table_Data *pd EINA_UNUSED, Efl_Gfx *content)
317{ 317{
318 return efl_pack_unpack(obj, content); 318 return efl_pack_unpack(obj, content);
319} 319}
@@ -331,19 +331,19 @@ _efl_ui_layout_internal_table_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Efl_Ui_La
331} 331}
332 332
333EOLIAN static Eina_Bool 333EOLIAN static Eina_Bool
334_efl_ui_layout_internal_table_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx_Base *subobj) 334_efl_ui_layout_internal_table_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *subobj)
335{ 335{
336 if (!subobj) return EINA_FALSE; 336 if (!subobj) return EINA_FALSE;
337 return _elm_layout_table_unpack(pd->obj, pd->sd, pd->part, subobj) == subobj; 337 return _elm_layout_table_unpack(pd->obj, pd->sd, pd->part, subobj) == subobj;
338} 338}
339 339
340EOLIAN static Eina_Bool 340EOLIAN static Eina_Bool
341_efl_ui_layout_internal_table_efl_pack_grid_pack_grid(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx_Base *subobj, int col, int row, int colspan, int rowspan) 341_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)
342{ 342{
343 return _elm_layout_table_pack(pd->obj, pd->sd, pd->part, subobj, col, row, colspan, rowspan); 343 return _elm_layout_table_pack(pd->obj, pd->sd, pd->part, subobj, col, row, colspan, rowspan);
344} 344}
345 345
346EOLIAN static Efl_Gfx_Base * 346EOLIAN static Efl_Gfx *
347_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) 347_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)
348{ 348{
349 return evas_object_table_child_get(pd->pack, col, row); 349 return evas_object_table_child_get(pd->pack, col, row);
@@ -378,7 +378,7 @@ _efl_ui_layout_internal_table_efl_pack_grid_grid_contents_get(Eo *obj EINA_UNUSE
378} 378}
379 379
380EOLIAN static Eina_Bool 380EOLIAN static Eina_Bool
381_efl_ui_layout_internal_table_efl_pack_grid_grid_position_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx_Base * subobj, int *col, int *row, int *colspan, int *rowspan) 381_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)
382{ 382{
383 unsigned short c, r, cs, rs; 383 unsigned short c, r, cs, rs;
384 Eina_Bool ret; 384 Eina_Bool ret;
diff --git a/src/lib/elementary/elm_win.c b/src/lib/elementary/elm_win.c
index c0f0a25758..a9d592b643 100644
--- a/src/lib/elementary/elm_win.c
+++ b/src/lib/elementary/elm_win.c
@@ -4158,7 +4158,7 @@ elm_win_util_dialog_add(Evas_Object *parent, const char *name, const char *title
4158} 4158}
4159 4159
4160EOLIAN static Eina_Bool 4160EOLIAN static Eina_Bool
4161_elm_win_efl_pack_pack(Eo *obj, Elm_Win_Data *sd, Efl_Gfx_Base *subobj) 4161_elm_win_efl_pack_pack(Eo *obj, Elm_Win_Data *sd, Efl_Gfx *subobj)
4162{ 4162{
4163 Eina_Bool ret; 4163 Eina_Bool ret;
4164 4164
@@ -4172,7 +4172,7 @@ _elm_win_efl_pack_pack(Eo *obj, Elm_Win_Data *sd, Efl_Gfx_Base *subobj)
4172} 4172}
4173 4173
4174EOLIAN static Eina_Bool 4174EOLIAN static Eina_Bool
4175_elm_win_efl_pack_unpack(Eo *obj, Elm_Win_Data *sd, Efl_Gfx_Base *subobj) 4175_elm_win_efl_pack_unpack(Eo *obj, Elm_Win_Data *sd, Efl_Gfx *subobj)
4176{ 4176{
4177 Eina_Bool ret; 4177 Eina_Bool ret;
4178 4178
@@ -4187,7 +4187,7 @@ _elm_win_efl_pack_unpack(Eo *obj, Elm_Win_Data *sd, Efl_Gfx_Base *subobj)
4187 4187
4188EOLIAN static Eina_Bool 4188EOLIAN static Eina_Bool
4189_elm_win_efl_container_content_remove(Eo *obj, Elm_Win_Data *sd EINA_UNUSED, 4189_elm_win_efl_container_content_remove(Eo *obj, Elm_Win_Data *sd EINA_UNUSED,
4190 Efl_Gfx_Base *subobj) 4190 Efl_Gfx *subobj)
4191{ 4191{
4192 return efl_pack_unpack(obj, subobj); 4192 return efl_pack_unpack(obj, subobj);
4193} 4193}
@@ -4207,7 +4207,7 @@ _elm_win_efl_container_content_count(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
4207static Eina_Bool 4207static Eina_Bool
4208_box_item_iterator_next(Box_Item_Iterator *it, void **data) 4208_box_item_iterator_next(Box_Item_Iterator *it, void **data)
4209{ 4209{
4210 Efl_Gfx_Base *sub; 4210 Efl_Gfx *sub;
4211 4211
4212 if (!eina_iterator_next(it->real_iterator, (void **) &sub)) 4212 if (!eina_iterator_next(it->real_iterator, (void **) &sub))
4213 return EINA_FALSE; 4213 return EINA_FALSE;
diff --git a/src/lib/evas/canvas/efl_vg_base.eo b/src/lib/evas/canvas/efl_vg_base.eo
index 66ca5e429a..85c0e2b012 100644
--- a/src/lib/evas/canvas/efl_vg_base.eo
+++ b/src/lib/evas/canvas/efl_vg_base.eo
@@ -1,6 +1,6 @@
1import eina_types; 1import eina_types;
2 2
3abstract Efl.VG.Base (Eo.Base, Efl.Gfx.Base, Efl.Gfx.Stack) 3abstract Efl.VG.Base (Eo.Base, Efl.Gfx, Efl.Gfx.Stack)
4{ 4{
5 eo_prefix: efl_vg; 5 eo_prefix: efl_vg;
6 legacy_prefix: evas_vg_node; 6 legacy_prefix: evas_vg_node;
@@ -109,15 +109,15 @@ abstract Efl.VG.Base (Eo.Base, Efl.Gfx.Base, Efl.Gfx.Stack)
109 Eo.Base.parent.set; 109 Eo.Base.parent.set;
110 Eo.Base.constructor; 110 Eo.Base.constructor;
111 Eo.Base.destructor; 111 Eo.Base.destructor;
112 Efl.Gfx.Base.visible.set; 112 Efl.Gfx.visible.set;
113 Efl.Gfx.Base.visible.get; 113 Efl.Gfx.visible.get;
114 Efl.Gfx.Base.color.set; 114 Efl.Gfx.color.set;
115 Efl.Gfx.Base.color.get; 115 Efl.Gfx.color.get;
116 Efl.Gfx.Base.color_part.set; 116 Efl.Gfx.color_part.set;
117 Efl.Gfx.Base.color_part.get; 117 Efl.Gfx.color_part.get;
118 Efl.Gfx.Base.size.get; 118 Efl.Gfx.size.get;
119 Efl.Gfx.Base.position.set; 119 Efl.Gfx.position.set;
120 Efl.Gfx.Base.position.get; 120 Efl.Gfx.position.get;
121 Efl.Gfx.Stack.below.get; 121 Efl.Gfx.Stack.below.get;
122 Efl.Gfx.Stack.above.get; 122 Efl.Gfx.Stack.above.get;
123 Efl.Gfx.Stack.stack_below; 123 Efl.Gfx.Stack.stack_below;
diff --git a/src/lib/evas/canvas/efl_vg_shape.eo b/src/lib/evas/canvas/efl_vg_shape.eo
index 10abbff396..bee31b0a8b 100644
--- a/src/lib/evas/canvas/efl_vg_shape.eo
+++ b/src/lib/evas/canvas/efl_vg_shape.eo
@@ -31,8 +31,8 @@ class Efl.VG.Shape (Efl.VG.Base, Efl.Gfx.Shape)
31 } 31 }
32 } 32 }
33 implements { 33 implements {
34 Efl.Gfx.Base.color_part.set; 34 Efl.Gfx.color_part.set;
35 Efl.Gfx.Base.color_part.get; 35 Efl.Gfx.color_part.get;
36 Efl.VG.Base.bounds_get; 36 Efl.VG.Base.bounds_get;
37 Efl.VG.Base.interpolate; 37 Efl.VG.Base.interpolate;
38 Efl.VG.Base.dup; 38 Efl.VG.Base.dup;
diff --git a/src/lib/evas/canvas/evas_filter_mixin.c b/src/lib/evas/canvas/evas_filter_mixin.c
index 6461776f0f..4529d7b931 100644
--- a/src/lib/evas/canvas/evas_filter_mixin.c
+++ b/src/lib/evas/canvas/evas_filter_mixin.c
@@ -409,7 +409,7 @@ _evas_filter_efl_gfx_filter_filter_program_get(Eo *eo_obj EINA_UNUSED, Evas_Filt
409 409
410EOLIAN static void 410EOLIAN static void
411_evas_filter_efl_gfx_filter_filter_source_set(Eo *eo_obj, Evas_Filter_Data *pd, 411_evas_filter_efl_gfx_filter_filter_source_set(Eo *eo_obj, Evas_Filter_Data *pd,
412 const char *name, Efl_Gfx_Base *eo_source) 412 const char *name, Efl_Gfx *eo_source)
413{ 413{
414 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); 414 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
415 Evas_Filter_Proxy_Binding *pb, *pb_old = NULL; 415 Evas_Filter_Proxy_Binding *pb, *pb_old = NULL;
@@ -490,7 +490,7 @@ update:
490 evas_filter_dirty(eo_obj); 490 evas_filter_dirty(eo_obj);
491} 491}
492 492
493EOLIAN static Efl_Gfx_Base * 493EOLIAN static Efl_Gfx *
494_evas_filter_efl_gfx_filter_filter_source_get(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd, 494_evas_filter_efl_gfx_filter_filter_source_get(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd,
495 const char * name) 495 const char * name)
496{ 496{
diff --git a/src/lib/evas/canvas/evas_object.eo b/src/lib/evas/canvas/evas_object.eo
index 65020c80f9..285ba6bb39 100644
--- a/src/lib/evas/canvas/evas_object.eo
+++ b/src/lib/evas/canvas/evas_object.eo
@@ -1,6 +1,6 @@
1import evas_types; 1import evas_types;
2 2
3abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stack, Efl.Animator) 3abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator)
4{ 4{
5 eo_prefix: evas_obj; 5 eo_prefix: evas_obj;
6 data: Evas_Object_Protected_Data; 6 data: Evas_Object_Protected_Data;
@@ -1225,16 +1225,16 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stac
1225 Eo.Base.destructor; 1225 Eo.Base.destructor;
1226 Eo.Base.dbg_info_get; 1226 Eo.Base.dbg_info_get;
1227 Evas.Common_Interface.evas.get; 1227 Evas.Common_Interface.evas.get;
1228 Efl.Gfx.Base.visible.set; 1228 Efl.Gfx.visible.set;
1229 Efl.Gfx.Base.visible.get; 1229 Efl.Gfx.visible.get;
1230 Efl.Gfx.Base.position.set; 1230 Efl.Gfx.position.set;
1231 Efl.Gfx.Base.position.get; 1231 Efl.Gfx.position.get;
1232 Efl.Gfx.Base.color.set; 1232 Efl.Gfx.color.set;
1233 Efl.Gfx.Base.color.get; 1233 Efl.Gfx.color.get;
1234 Efl.Gfx.Base.color_part.set; 1234 Efl.Gfx.color_part.set;
1235 Efl.Gfx.Base.color_part.get; 1235 Efl.Gfx.color_part.get;
1236 Efl.Gfx.Base.size.set; 1236 Efl.Gfx.size.set;
1237 Efl.Gfx.Base.size.get; 1237 Efl.Gfx.size.get;
1238 Efl.Gfx.Stack.layer.set; 1238 Efl.Gfx.Stack.layer.set;
1239 Efl.Gfx.Stack.layer.get; 1239 Efl.Gfx.Stack.layer.get;
1240 Efl.Gfx.Stack.below.get; 1240 Efl.Gfx.Stack.below.get;
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index ae8cc04e88..83a85bf4ae 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -849,7 +849,7 @@ evas_object_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
849} 849}
850 850
851EOLIAN static void 851EOLIAN static void
852_evas_object_efl_gfx_base_position_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, 852_evas_object_efl_gfx_position_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
853 Evas_Coord x, Evas_Coord y) 853 Evas_Coord x, Evas_Coord y)
854{ 854{
855 855
@@ -940,7 +940,7 @@ evas_object_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
940} 940}
941 941
942EOLIAN static void 942EOLIAN static void
943_evas_object_efl_gfx_base_size_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, 943_evas_object_efl_gfx_size_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
944 Evas_Coord w, Evas_Coord h) 944 Evas_Coord w, Evas_Coord h)
945{ 945{
946 Eina_Bool is, was = EINA_FALSE; 946 Eina_Bool is, was = EINA_FALSE;
@@ -1030,7 +1030,7 @@ evas_object_geometry_get(const Evas_Object *eo_obj, Evas_Coord *x, Evas_Coord *y
1030} 1030}
1031 1031
1032EOLIAN static void 1032EOLIAN static void
1033_evas_object_efl_gfx_base_position_get(Eo *obj EINA_UNUSED, 1033_evas_object_efl_gfx_position_get(Eo *obj EINA_UNUSED,
1034 Evas_Object_Protected_Data *pd, 1034 Evas_Object_Protected_Data *pd,
1035 Evas_Coord *x, Evas_Coord *y) 1035 Evas_Coord *x, Evas_Coord *y)
1036{ 1036{
@@ -1045,7 +1045,7 @@ _evas_object_efl_gfx_base_position_get(Eo *obj EINA_UNUSED,
1045} 1045}
1046 1046
1047EOLIAN static void 1047EOLIAN static void
1048_evas_object_efl_gfx_base_size_get(Eo *obj EINA_UNUSED, 1048_evas_object_efl_gfx_size_get(Eo *obj EINA_UNUSED,
1049 Evas_Object_Protected_Data *pd, 1049 Evas_Object_Protected_Data *pd,
1050 Evas_Coord *w, Evas_Coord *h) 1050 Evas_Coord *w, Evas_Coord *h)
1051{ 1051{
@@ -1310,7 +1310,7 @@ evas_object_visible_get(const Evas_Object *obj)
1310} 1310}
1311 1311
1312static void 1312static void
1313_evas_object_efl_gfx_base_visible_set(Eo *eo_obj, 1313_evas_object_efl_gfx_visible_set(Eo *eo_obj,
1314 Evas_Object_Protected_Data *obj, 1314 Evas_Object_Protected_Data *obj,
1315 Eina_Bool visible) 1315 Eina_Bool visible)
1316{ 1316{
@@ -1488,7 +1488,7 @@ _hide(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
1488} 1488}
1489 1489
1490static Eina_Bool 1490static Eina_Bool
1491_evas_object_efl_gfx_base_visible_get(Eo *eo_obj EINA_UNUSED, 1491_evas_object_efl_gfx_visible_get(Eo *eo_obj EINA_UNUSED,
1492 Evas_Object_Protected_Data *obj) 1492 Evas_Object_Protected_Data *obj)
1493{ 1493{
1494 if (obj->delete_me) return EINA_FALSE; 1494 if (obj->delete_me) return EINA_FALSE;
@@ -1502,7 +1502,7 @@ evas_object_color_set(Evas_Object *obj, int r, int g, int b, int a)
1502} 1502}
1503 1503
1504EOLIAN static void 1504EOLIAN static void
1505_evas_object_efl_gfx_base_color_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, 1505_evas_object_efl_gfx_color_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
1506 int r, int g, int b, int a) 1506 int r, int g, int b, int a)
1507{ 1507{
1508 if (obj->delete_me) return; 1508 if (obj->delete_me) return;
@@ -1559,13 +1559,13 @@ _evas_object_efl_gfx_base_color_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
1559} 1559}
1560 1560
1561EOLIAN static Eina_Bool 1561EOLIAN static Eina_Bool
1562_evas_object_efl_gfx_base_color_part_set(Eo *obj, Evas_Object_Protected_Data *pd, 1562_evas_object_efl_gfx_color_part_set(Eo *obj, Evas_Object_Protected_Data *pd,
1563 const char *part, 1563 const char *part,
1564 int r, int g, int b, int a) 1564 int r, int g, int b, int a)
1565{ 1565{
1566 if (part) return EINA_FALSE; 1566 if (part) return EINA_FALSE;
1567 1567
1568 _evas_object_efl_gfx_base_color_set(obj, pd, r, g, b, a); 1568 _evas_object_efl_gfx_color_set(obj, pd, r, g, b, a);
1569 return EINA_TRUE; 1569 return EINA_TRUE;
1570} 1570}
1571 1571
@@ -1576,7 +1576,7 @@ evas_object_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a)
1576} 1576}
1577 1577
1578EOLIAN static void 1578EOLIAN static void
1579_evas_object_efl_gfx_base_color_get(Eo *eo_obj EINA_UNUSED, 1579_evas_object_efl_gfx_color_get(Eo *eo_obj EINA_UNUSED,
1580 Evas_Object_Protected_Data *obj, 1580 Evas_Object_Protected_Data *obj,
1581 int *r, int *g, int *b, int *a) 1581 int *r, int *g, int *b, int *a)
1582{ 1582{
@@ -1592,14 +1592,14 @@ _evas_object_efl_gfx_base_color_get(Eo *eo_obj EINA_UNUSED,
1592} 1592}
1593 1593
1594EOLIAN static Eina_Bool 1594EOLIAN static Eina_Bool
1595_evas_object_efl_gfx_base_color_part_get(Eo *obj, 1595_evas_object_efl_gfx_color_part_get(Eo *obj,
1596 Evas_Object_Protected_Data *pd, 1596 Evas_Object_Protected_Data *pd,
1597 const char *part, 1597 const char *part,
1598 int *r, int *g, int *b, int *a) 1598 int *r, int *g, int *b, int *a)
1599{ 1599{
1600 if (part) return EINA_FALSE; 1600 if (part) return EINA_FALSE;
1601 1601
1602 _evas_object_efl_gfx_base_color_get(obj, pd, r, g, b, a); 1602 _evas_object_efl_gfx_color_get(obj, pd, r, g, b, a);
1603 return EINA_TRUE; 1603 return EINA_TRUE;
1604} 1604}
1605 1605
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 186200ebe8..7e55f40d24 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -972,7 +972,7 @@ _evas_object_text_layout(Evas_Object *eo_obj, Evas_Text_Data *o, Eina_Unicode *t
972} 972}
973 973
974EOLIAN static void 974EOLIAN static void
975_evas_text_efl_gfx_base_size_set(Eo *eo_obj, Evas_Text_Data *o, int w, int h) 975_evas_text_efl_gfx_size_set(Eo *eo_obj, Evas_Text_Data *o, int w, int h)
976{ 976{
977 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); 977 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
978 978
diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo
index 9e326a21ed..9c86ff31de 100644
--- a/src/lib/evas/canvas/evas_text.eo
+++ b/src/lib/evas/canvas/evas_text.eo
@@ -253,7 +253,7 @@ class Evas.Text (Evas.Object, Efl.Text, Efl.Text_Properties, Evas.Filter)
253 Eo.Base.constructor; 253 Eo.Base.constructor;
254 Eo.Base.destructor; 254 Eo.Base.destructor;
255 Eo.Base.dbg_info_get; 255 Eo.Base.dbg_info_get;
256 Efl.Gfx.Base.size.set; 256 Efl.Gfx.size.set;
257 Efl.Text.text.set; 257 Efl.Text.text.set;
258 Efl.Text.text.get; 258 Efl.Text.text.get;
259 Efl.Text_Properties.font.get; 259 Efl.Text_Properties.font.get;
diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index 10aa752bee..c120cf77d3 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -87,7 +87,7 @@ _efl_vg_base_origin_get(Eo *obj EINA_UNUSED,
87} 87}
88 88
89static void 89static void
90_efl_vg_base_efl_gfx_base_position_set(Eo *obj EINA_UNUSED, 90_efl_vg_base_efl_gfx_position_set(Eo *obj EINA_UNUSED,
91 Efl_VG_Base_Data *pd, 91 Efl_VG_Base_Data *pd,
92 int x, int y) 92 int x, int y)
93{ 93{
@@ -98,7 +98,7 @@ _efl_vg_base_efl_gfx_base_position_set(Eo *obj EINA_UNUSED,
98} 98}
99 99
100static void 100static void
101_efl_vg_base_efl_gfx_base_position_get(Eo *obj EINA_UNUSED, 101_efl_vg_base_efl_gfx_position_get(Eo *obj EINA_UNUSED,
102 Efl_VG_Base_Data *pd, 102 Efl_VG_Base_Data *pd,
103 int *x, int *y) 103 int *x, int *y)
104{ 104{
@@ -107,7 +107,7 @@ _efl_vg_base_efl_gfx_base_position_get(Eo *obj EINA_UNUSED,
107} 107}
108 108
109static void 109static void
110_efl_vg_base_efl_gfx_base_visible_set(Eo *obj EINA_UNUSED, 110_efl_vg_base_efl_gfx_visible_set(Eo *obj EINA_UNUSED,
111 Efl_VG_Base_Data *pd, Eina_Bool v) 111 Efl_VG_Base_Data *pd, Eina_Bool v)
112{ 112{
113 pd->visibility = v; 113 pd->visibility = v;
@@ -117,14 +117,14 @@ _efl_vg_base_efl_gfx_base_visible_set(Eo *obj EINA_UNUSED,
117 117
118 118
119static Eina_Bool 119static Eina_Bool
120_efl_vg_base_efl_gfx_base_visible_get(Eo *obj EINA_UNUSED, 120_efl_vg_base_efl_gfx_visible_get(Eo *obj EINA_UNUSED,
121 Efl_VG_Base_Data *pd) 121 Efl_VG_Base_Data *pd)
122{ 122{
123 return pd->visibility; 123 return pd->visibility;
124} 124}
125 125
126static void 126static void
127_efl_vg_base_efl_gfx_base_color_set(Eo *obj EINA_UNUSED, 127_efl_vg_base_efl_gfx_color_set(Eo *obj EINA_UNUSED,
128 Efl_VG_Base_Data *pd, 128 Efl_VG_Base_Data *pd,
129 int r, int g, int b, int a) 129 int r, int g, int b, int a)
130{ 130{
@@ -157,18 +157,18 @@ _efl_vg_base_efl_gfx_base_color_set(Eo *obj EINA_UNUSED,
157} 157}
158 158
159static Eina_Bool 159static Eina_Bool
160_efl_vg_base_efl_gfx_base_color_part_set(Eo *obj, Efl_VG_Base_Data *pd, 160_efl_vg_base_efl_gfx_color_part_set(Eo *obj, Efl_VG_Base_Data *pd,
161 const char *part, 161 const char *part,
162 int r, int g, int b, int a) 162 int r, int g, int b, int a)
163{ 163{
164 if (part) return EINA_FALSE; 164 if (part) return EINA_FALSE;
165 165
166 _efl_vg_base_efl_gfx_base_color_set(obj, pd, r, g, b, a); 166 _efl_vg_base_efl_gfx_color_set(obj, pd, r, g, b, a);
167 return EINA_TRUE; 167 return EINA_TRUE;
168} 168}
169 169
170static void 170static void
171_efl_vg_base_efl_gfx_base_color_get(Eo *obj EINA_UNUSED, 171_efl_vg_base_efl_gfx_color_get(Eo *obj EINA_UNUSED,
172 Efl_VG_Base_Data *pd, 172 Efl_VG_Base_Data *pd,
173 int *r, int *g, int *b, int *a) 173 int *r, int *g, int *b, int *a)
174{ 174{
@@ -179,13 +179,13 @@ _efl_vg_base_efl_gfx_base_color_get(Eo *obj EINA_UNUSED,
179} 179}
180 180
181static Eina_Bool 181static Eina_Bool
182_efl_vg_base_efl_gfx_base_color_part_get(Eo *obj, Efl_VG_Base_Data *pd, 182_efl_vg_base_efl_gfx_color_part_get(Eo *obj, Efl_VG_Base_Data *pd,
183 const char *part, 183 const char *part,
184 int *r, int *g, int *b, int *a) 184 int *r, int *g, int *b, int *a)
185{ 185{
186 if (part) return EINA_FALSE; 186 if (part) return EINA_FALSE;
187 187
188 _efl_vg_base_efl_gfx_base_color_get(obj, pd, r, g, b, a); 188 _efl_vg_base_efl_gfx_color_get(obj, pd, r, g, b, a);
189 return EINA_TRUE; 189 return EINA_TRUE;
190} 190}
191 191
@@ -209,7 +209,7 @@ _efl_vg_base_mask_get(Eo *obj EINA_UNUSED, Efl_VG_Base_Data *pd)
209} 209}
210 210
211static void 211static void
212_efl_vg_base_efl_gfx_base_size_get(Eo *obj, 212_efl_vg_base_efl_gfx_size_get(Eo *obj,
213 Efl_VG_Base_Data *pd EINA_UNUSED, 213 Efl_VG_Base_Data *pd EINA_UNUSED,
214 int *w, int *h) 214 int *w, int *h)
215{ 215{
diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c
index 1123fdf653..0651c8ced4 100644
--- a/src/lib/evas/canvas/evas_vg_shape.c
+++ b/src/lib/evas/canvas/evas_vg_shape.c
@@ -45,7 +45,7 @@ _efl_vg_shape_fill_get(Eo *obj EINA_UNUSED, Efl_VG_Shape_Data *pd)
45} 45}
46 46
47static Eina_Bool 47static Eina_Bool
48_efl_vg_shape_efl_gfx_base_color_part_set(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED, 48_efl_vg_shape_efl_gfx_color_part_set(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED,
49 const char * part, 49 const char * part,
50 int r, int g, int b, int a) 50 int r, int g, int b, int a)
51{ 51{
@@ -63,7 +63,7 @@ _efl_vg_shape_efl_gfx_base_color_part_set(Eo *obj, Efl_VG_Shape_Data *pd EINA_UN
63} 63}
64 64
65static Eina_Bool 65static Eina_Bool
66_efl_vg_shape_efl_gfx_base_color_part_get(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED, 66_efl_vg_shape_efl_gfx_color_part_get(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED,
67 const char * part, 67 const char * part,
68 int *r, int *g, int *b, int *a) 68 int *r, int *g, int *b, int *a)
69{ 69{