summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYeongjong Lee <yj34.lee@samsung.com>2019-02-12 11:55:11 +0000
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-27 21:20:33 +0100
commit4628021fe547214b81238a0b1d410240174313ff (patch)
treeaaeaa5fa7c0cb66392b327a3c325ade1b98a7354
parent7bda677eb09d1495b0f33c50207eae50f86cb3ec (diff)
efl_container: remove content_remove
Most of classes implements Efl.Container.content_remove are just calling "unpack" except of "Efl.Canvas.Layout" and "Efl.Ui.Layout". This patch remove the asymmetrical API and add content_remove API of "Efl.Canvas.Layout" and "Efl.Ui.Layout" that child can be remove without efl_part APIs. ref T7576 Reviewed-by: Marcel Hollerbach <marcel-hollerbach@t-online.de> Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Differential Revision: https://phab.enlightenment.org/D7913
-rw-r--r--src/lib/edje/edje_part_box.c6
-rw-r--r--src/lib/edje/edje_part_invalid.c1
-rw-r--r--src/lib/edje/edje_part_swallow.c2
-rw-r--r--src/lib/edje/edje_part_table.c6
-rw-r--r--src/lib/edje/edje_util.c4
-rw-r--r--src/lib/edje/efl_canvas_layout.eo8
-rw-r--r--src/lib/edje/efl_canvas_layout_part_box.eo1
-rw-r--r--src/lib/edje/efl_canvas_layout_part_invalid.eo1
-rw-r--r--src/lib/edje/efl_canvas_layout_part_table.eo1
-rw-r--r--src/lib/efl/interfaces/efl_container.eo7
-rw-r--r--src/lib/elementary/efl_ui_box.c8
-rw-r--r--src/lib/elementary/efl_ui_box.eo1
-rw-r--r--src/lib/elementary/efl_ui_flip.c9
-rw-r--r--src/lib/elementary/efl_ui_flip.eo1
-rw-r--r--src/lib/elementary/efl_ui_layout.c17
-rw-r--r--src/lib/elementary/efl_ui_layout_base.eo1
-rw-r--r--src/lib/elementary/efl_ui_layout_pack.c14
-rw-r--r--src/lib/elementary/efl_ui_layout_part_box.eo1
-rw-r--r--src/lib/elementary/efl_ui_layout_part_table.eo1
-rw-r--r--src/lib/elementary/efl_ui_table.c7
-rw-r--r--src/lib/elementary/efl_ui_table.eo1
-rw-r--r--src/tests/edje/edje_test_container.c2
-rw-r--r--src/tests/edje/edje_test_swallow.c2
23 files changed, 12 insertions, 90 deletions
diff --git a/src/lib/edje/edje_part_box.c b/src/lib/edje/edje_part_box.c
index f737159c6e..db158d6cb8 100644
--- a/src/lib/edje/edje_part_box.c
+++ b/src/lib/edje/edje_part_box.c
@@ -99,12 +99,6 @@ _efl_canvas_layout_part_box_efl_pack_linear_pack_content_get(Eo *obj, void *_pd
99 return _edje_part_box_content_at(pd->ed, pd->part, index); 99 return _edje_part_box_content_at(pd->ed, pd->part, index);
100} 100}
101 101
102EOLIAN static Eina_Bool
103_efl_canvas_layout_part_box_efl_container_content_remove(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
104{
105 return efl_pack_unpack(obj, subobj);
106}
107
108EOLIAN static int 102EOLIAN static int
109_efl_canvas_layout_part_box_efl_pack_linear_pack_index_get(Eo *obj, void *_pd EINA_UNUSED, const Efl_Gfx_Entity * subobj) 103_efl_canvas_layout_part_box_efl_pack_linear_pack_index_get(Eo *obj, void *_pd EINA_UNUSED, const Efl_Gfx_Entity * subobj)
110{ 104{
diff --git a/src/lib/edje/edje_part_invalid.c b/src/lib/edje/edje_part_invalid.c
index 3e508b3fe0..d36491d674 100644
--- a/src/lib/edje/edje_part_invalid.c
+++ b/src/lib/edje/edje_part_invalid.c
@@ -74,7 +74,6 @@ EDJE_PART_INVALID_CONST(Eina_Bool, 0, efl_text_cursor_geometry_get, _efl_canvas_
74EDJE_PART_INVALID_VOID(efl_text_markup_interactive_cursor_markup_insert, _efl_canvas_layout_part_invalid_efl_text_markup_interactive_cursor_markup_insert, Efl_Text_Cursor_Cursor *cur, const char *markup) 74EDJE_PART_INVALID_VOID(efl_text_markup_interactive_cursor_markup_insert, _efl_canvas_layout_part_invalid_efl_text_markup_interactive_cursor_markup_insert, Efl_Text_Cursor_Cursor *cur, const char *markup)
75EDJE_PART_INVALID(Eina_Iterator *, 0, efl_content_iterate, _efl_canvas_layout_part_invalid_efl_container_content_iterate) 75EDJE_PART_INVALID(Eina_Iterator *, 0, efl_content_iterate, _efl_canvas_layout_part_invalid_efl_container_content_iterate)
76EDJE_PART_INVALID(int, 0, efl_content_count, _efl_canvas_layout_part_invalid_efl_container_content_count) 76EDJE_PART_INVALID(int, 0, efl_content_count, _efl_canvas_layout_part_invalid_efl_container_content_count)
77EDJE_PART_INVALID(Eina_Bool, 0, efl_content_remove, _efl_canvas_layout_part_invalid_efl_container_content_remove, Efl_Gfx_Entity *content)
78EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_clear, _efl_canvas_layout_part_invalid_efl_pack_pack_clear) 77EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_clear, _efl_canvas_layout_part_invalid_efl_pack_pack_clear)
79EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_unpack_all, _efl_canvas_layout_part_invalid_efl_pack_unpack_all) 78EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_unpack_all, _efl_canvas_layout_part_invalid_efl_pack_unpack_all)
80EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_unpack, _efl_canvas_layout_part_invalid_efl_pack_unpack, Efl_Gfx_Entity *subobj) 79EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_unpack, _efl_canvas_layout_part_invalid_efl_pack_unpack, Efl_Gfx_Entity *subobj)
diff --git a/src/lib/edje/edje_part_swallow.c b/src/lib/edje/edje_part_swallow.c
index bf4c2b59cb..e0c0aec568 100644
--- a/src/lib/edje/edje_part_swallow.c
+++ b/src/lib/edje/edje_part_swallow.c
@@ -27,7 +27,7 @@ _efl_canvas_layout_part_swallow_efl_content_content_unset(Eo *obj, void *_pd EIN
27 PROXY_DATA_GET(obj, pd); 27 PROXY_DATA_GET(obj, pd);
28 Efl_Gfx_Entity *content = _edje_efl_content_content_get(pd->ed, pd->part); 28 Efl_Gfx_Entity *content = _edje_efl_content_content_get(pd->ed, pd->part);
29 if (!content) return NULL; 29 if (!content) return NULL;
30 efl_content_remove(obj, content); 30 efl_canvas_layout_content_remove(obj, content);
31 return content; 31 return content;
32} 32}
33 33
diff --git a/src/lib/edje/edje_part_table.c b/src/lib/edje/edje_part_table.c
index cc2439dd89..87709ed368 100644
--- a/src/lib/edje/edje_part_table.c
+++ b/src/lib/edje/edje_part_table.c
@@ -30,12 +30,6 @@ _efl_canvas_layout_part_table_efl_container_content_count(Eo *obj, void *_pd EIN
30} 30}
31 31
32EOLIAN static Eina_Bool 32EOLIAN static Eina_Bool
33_efl_canvas_layout_part_table_efl_container_content_remove(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED EINA_UNUSED, Efl_Gfx_Entity *content)
34{
35 return efl_pack_unpack(obj, content);
36}
37
38EOLIAN static Eina_Bool
39_efl_canvas_layout_part_table_efl_pack_pack_clear(Eo *obj, void *_pd EINA_UNUSED) 33_efl_canvas_layout_part_table_efl_pack_pack_clear(Eo *obj, void *_pd EINA_UNUSED)
40{ 34{
41 PROXY_DATA_GET(obj, pd); 35 PROXY_DATA_GET(obj, pd);
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 4d1af34575..fa749deab1 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -3363,7 +3363,7 @@ _swallow_real_part_get(Evas_Object *obj_swallow)
3363} 3363}
3364 3364
3365EOLIAN Eina_Bool 3365EOLIAN Eina_Bool
3366_efl_canvas_layout_efl_container_content_remove(Eo *obj EINA_UNUSED, Edje *ed, Evas_Object *obj_swallow) 3366_efl_canvas_layout_content_remove(Eo *obj EINA_UNUSED, Edje *ed, Evas_Object *obj_swallow)
3367{ 3367{
3368 Edje_Real_Part *rp; 3368 Edje_Real_Part *rp;
3369 Edje_User_Defined *eud; 3369 Edje_User_Defined *eud;
@@ -6461,7 +6461,7 @@ edje_object_part_swallow(Edje_Object *obj, const char *part, Evas_Object *obj_sw
6461EAPI void 6461EAPI void
6462edje_object_part_unswallow(Edje_Object *obj, Evas_Object *obj_swallow) 6462edje_object_part_unswallow(Edje_Object *obj, Evas_Object *obj_swallow)
6463{ 6463{
6464 efl_content_remove(obj, obj_swallow); 6464 efl_canvas_layout_content_remove(obj, obj_swallow);
6465} 6465}
6466 6466
6467EAPI Evas_Object * 6467EAPI Evas_Object *
diff --git a/src/lib/edje/efl_canvas_layout.eo b/src/lib/edje/efl_canvas_layout.eo
index 5acf87fcd1..5886c8ec20 100644
--- a/src/lib/edje/efl_canvas_layout.eo
+++ b/src/lib/edje/efl_canvas_layout.eo
@@ -80,6 +80,13 @@ class @beta Efl.Canvas.Layout extends Efl.Canvas.Group implements Efl.File, Efl.
80 error: Efl.Gfx.Image_Load_Error(Efl.Gfx.Image_Load_Error.none); [[The load error code.]] 80 error: Efl.Gfx.Image_Load_Error(Efl.Gfx.Image_Load_Error.none); [[The load error code.]]
81 } 81 }
82 } 82 }
83 content_remove {
84 [[Unswallow an object from this Edje.]]
85 params {
86 @in content: Efl.Gfx.Entity; [[To be removed content.]]
87 }
88 return: bool; [[$false if $content was not a child or can not be removed.]]
89 }
83 } 90 }
84 events { 91 events {
85 part,invalid @beta: string; [[Emitted when trying to use an invalid part. 92 part,invalid @beta: string; [[Emitted when trying to use an invalid part.
@@ -122,7 +129,6 @@ class @beta Efl.Canvas.Layout extends Efl.Canvas.Group implements Efl.File, Efl.
122 Efl.Ui.I18n.language { set; get; } 129 Efl.Ui.I18n.language { set; get; }
123 Efl.Gfx.Entity.scale { set; get; } 130 Efl.Gfx.Entity.scale { set; get; }
124 Efl.File.load; 131 Efl.File.load;
125 Efl.Container.content_remove;
126 Efl.Container.content_iterate; 132 Efl.Container.content_iterate;
127 Efl.Container.content_count; 133 Efl.Container.content_count;
128 Efl.Part.part_get; [[Returns @Efl.Canvas.Layout_Part]] 134 Efl.Part.part_get; [[Returns @Efl.Canvas.Layout_Part]]
diff --git a/src/lib/edje/efl_canvas_layout_part_box.eo b/src/lib/edje/efl_canvas_layout_part_box.eo
index 0fa1e39f17..38c568c8db 100644
--- a/src/lib/edje/efl_canvas_layout_part_box.eo
+++ b/src/lib/edje/efl_canvas_layout_part_box.eo
@@ -10,7 +10,6 @@ class @beta Efl.Canvas.Layout_Part_Box extends Efl.Canvas.Layout_Part implements
10 implements { 10 implements {
11 Efl.Container.content_iterate; 11 Efl.Container.content_iterate;
12 Efl.Container.content_count; 12 Efl.Container.content_count;
13 Efl.Container.content_remove;
14 Efl.Pack.pack_clear; 13 Efl.Pack.pack_clear;
15 Efl.Pack.unpack_all; 14 Efl.Pack.unpack_all;
16 Efl.Pack.unpack; 15 Efl.Pack.unpack;
diff --git a/src/lib/edje/efl_canvas_layout_part_invalid.eo b/src/lib/edje/efl_canvas_layout_part_invalid.eo
index d048657cb8..6268f2a5d5 100644
--- a/src/lib/edje/efl_canvas_layout_part_invalid.eo
+++ b/src/lib/edje/efl_canvas_layout_part_invalid.eo
@@ -48,7 +48,6 @@ class @beta Efl.Canvas.Layout_Part_Invalid extends Efl.Canvas.Layout_Part implem
48 // Efl.Canvas.Layout_Part_Box 48 // Efl.Canvas.Layout_Part_Box
49 Efl.Container.content_iterate; 49 Efl.Container.content_iterate;
50 Efl.Container.content_count; 50 Efl.Container.content_count;
51 Efl.Container.content_remove;
52 Efl.Pack.pack_clear; 51 Efl.Pack.pack_clear;
53 Efl.Pack.unpack_all; 52 Efl.Pack.unpack_all;
54 Efl.Pack.unpack; 53 Efl.Pack.unpack;
diff --git a/src/lib/edje/efl_canvas_layout_part_table.eo b/src/lib/edje/efl_canvas_layout_part_table.eo
index 4abd546bcc..2b9854cc6c 100644
--- a/src/lib/edje/efl_canvas_layout_part_table.eo
+++ b/src/lib/edje/efl_canvas_layout_part_table.eo
@@ -9,7 +9,6 @@ class @beta Efl.Canvas.Layout_Part_Table extends Efl.Canvas.Layout_Part implemen
9 implements { 9 implements {
10 Efl.Container.content_iterate; 10 Efl.Container.content_iterate;
11 Efl.Container.content_count; 11 Efl.Container.content_count;
12 Efl.Container.content_remove;
13 Efl.Pack.pack_clear; 12 Efl.Pack.pack_clear;
14 Efl.Pack.unpack_all; 13 Efl.Pack.unpack_all;
15 Efl.Pack.unpack; 14 Efl.Pack.unpack;
diff --git a/src/lib/efl/interfaces/efl_container.eo b/src/lib/efl/interfaces/efl_container.eo
index c2f90d4e89..42e4d6a2f1 100644
--- a/src/lib/efl/interfaces/efl_container.eo
+++ b/src/lib/efl/interfaces/efl_container.eo
@@ -8,13 +8,6 @@ interface @beta Efl.Container
8 eo_prefix: efl_content; 8 eo_prefix: efl_content;
9 event_prefix: efl_container; 9 event_prefix: efl_container;
10 methods { 10 methods {
11 content_remove {
12 [[Unswallow an object from this container.]]
13 params {
14 @in content: Efl.Gfx.Entity; [[To be removed content]]
15 }
16 return: bool; [[$false if $content was not a child or can not be removed.]]
17 }
18 content_iterate { 11 content_iterate {
19 [[Begin iterating over this object's contents.]] 12 [[Begin iterating over this object's contents.]]
20 return: iterator<Efl.Gfx.Entity> @owned @warn_unused; [[Iterator to object content]] 13 return: iterator<Efl.Gfx.Entity> @owned @warn_unused; [[Iterator to object content]]
diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index dbf4584503..c577bb8e9d 100644
--- a/src/lib/elementary/efl_ui_box.c
+++ b/src/lib/elementary/efl_ui_box.c
@@ -194,14 +194,6 @@ _efl_ui_box_efl_container_content_count(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED
194} 194}
195 195
196EOLIAN static Eina_Bool 196EOLIAN static Eina_Bool
197_efl_ui_box_efl_container_content_remove(Eo *obj EINA_UNUSED, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx_Entity *content)
198{
199 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0);
200
201 return evas_object_box_remove(wd->resize_obj, content);
202}
203
204EOLIAN static Eina_Bool
205_efl_ui_box_efl_pack_pack_clear(Eo *obj, Efl_Ui_Box_Data *pd) 197_efl_ui_box_efl_pack_pack_clear(Eo *obj, Efl_Ui_Box_Data *pd)
206{ 198{
207 Eina_Bool ret; 199 Eina_Bool ret;
diff --git a/src/lib/elementary/efl_ui_box.eo b/src/lib/elementary/efl_ui_box.eo
index 164bdb8879..6ec2da277f 100644
--- a/src/lib/elementary/efl_ui_box.eo
+++ b/src/lib/elementary/efl_ui_box.eo
@@ -30,7 +30,6 @@ class @beta Efl.Ui.Box extends Efl.Ui.Widget implements Efl.Pack_Linear, Efl.Pac
30 implements { 30 implements {
31 Efl.Object.constructor; 31 Efl.Object.constructor;
32 Efl.Canvas.Group.group_calculate; 32 Efl.Canvas.Group.group_calculate;
33 Efl.Container.content_remove;
34 Efl.Container.content_iterate; 33 Efl.Container.content_iterate;
35 Efl.Container.content_count; 34 Efl.Container.content_count;
36 Efl.Ui.Direction.direction { get; set; } 35 Efl.Ui.Direction.direction { get; set; }
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index 7f3238e9bf..7461505e03 100644
--- a/src/lib/elementary/efl_ui_flip.c
+++ b/src/lib/elementary/efl_ui_flip.c
@@ -2210,15 +2210,6 @@ _efl_ui_flip_efl_container_content_count(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *
2210} 2210}
2211 2211
2212EOLIAN static Eina_Bool 2212EOLIAN static Eina_Bool
2213_efl_ui_flip_efl_container_content_remove(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *content)
2214{
2215 pd->content_list = eina_list_remove(pd->content_list, content);
2216 pd->content_list = eina_list_remove(pd->content_list, content);
2217 _content_removed(obj, pd, content);
2218 return EINA_TRUE;
2219}
2220
2221EOLIAN static Eina_Bool
2222_efl_ui_flip_efl_pack_unpack(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj) 2213_efl_ui_flip_efl_pack_unpack(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj)
2223{ 2214{
2224 pd->content_list = eina_list_remove(pd->content_list, subobj); 2215 pd->content_list = eina_list_remove(pd->content_list, subobj);
diff --git a/src/lib/elementary/efl_ui_flip.eo b/src/lib/elementary/efl_ui_flip.eo
index ac233a1fbe..d45e787585 100644
--- a/src/lib/elementary/efl_ui_flip.eo
+++ b/src/lib/elementary/efl_ui_flip.eo
@@ -235,7 +235,6 @@ class @beta Efl.Ui.Flip extends Efl.Ui.Widget implements Efl.Pack_Linear
235 Efl.Ui.Widget.widget_sub_object_del; 235 Efl.Ui.Widget.widget_sub_object_del;
236 Efl.Container.content_iterate; 236 Efl.Container.content_iterate;
237 Efl.Container.content_count; 237 Efl.Container.content_count;
238 Efl.Container.content_remove;
239 Efl.Part.part_get; 238 Efl.Part.part_get;
240 Efl.Pack.unpack; 239 Efl.Pack.unpack;
241 Efl.Pack.pack; 240 Efl.Pack.pack;
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index ed097fc118..54e6334e31 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -1145,23 +1145,6 @@ _efl_ui_layout_content_unset(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part)
1145 return NULL; 1145 return NULL;
1146} 1146}
1147 1147
1148EOLIAN static Eina_Bool
1149_efl_ui_layout_base_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED,
1150 Efl_Gfx_Entity *content)
1151{
1152 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
1153
1154 if (!_elm_widget_sub_object_redirect_to_top(obj, content))
1155 {
1156 ERR("could not remove sub object %p from %p", content, obj);
1157 return EINA_FALSE;
1158 }
1159 edje_object_part_unswallow(wd->resize_obj, content);
1160 _eo_unparent_helper(content, obj);
1161
1162 return EINA_TRUE;
1163}
1164
1165/* legacy only - eo is iterator */ 1148/* legacy only - eo is iterator */
1166EAPI Eina_List * 1149EAPI Eina_List *
1167elm_layout_content_swallow_list_get(const Evas_Object *obj) 1150elm_layout_content_swallow_list_get(const Evas_Object *obj)
diff --git a/src/lib/elementary/efl_ui_layout_base.eo b/src/lib/elementary/efl_ui_layout_base.eo
index 68437219ff..22ab3efce9 100644
--- a/src/lib/elementary/efl_ui_layout_base.eo
+++ b/src/lib/elementary/efl_ui_layout_base.eo
@@ -86,7 +86,6 @@ abstract @beta Efl.Ui.Layout_Base extends Efl.Ui.Widget implements Efl.Container
86 Efl.Ui.Widget.widget_sub_object_del; 86 Efl.Ui.Widget.widget_sub_object_del;
87 Efl.Ui.Focus.Object.on_focus_update; 87 Efl.Ui.Focus.Object.on_focus_update;
88 Efl.Container.content_count; 88 Efl.Container.content_count;
89 Efl.Container.content_remove;
90 Efl.Container.content_iterate; 89 Efl.Container.content_iterate;
91 Efl.Part.part_get; 90 Efl.Part.part_get;
92 Efl.Ui.View.model { get; set; } 91 Efl.Ui.View.model { get; set; }
diff --git a/src/lib/elementary/efl_ui_layout_pack.c b/src/lib/elementary/efl_ui_layout_pack.c
index 9e89df4eb5..0a495ac767 100644
--- a/src/lib/elementary/efl_ui_layout_pack.c
+++ b/src/lib/elementary/efl_ui_layout_pack.c
@@ -112,13 +112,6 @@ _efl_ui_layout_part_box_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_D
112} 112}
113 113
114EOLIAN static Eina_Bool 114EOLIAN static Eina_Bool
115_efl_ui_layout_part_box_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Entity *content)
116{
117 // alias for efl_pack_unpack
118 return _efl_ui_layout_part_box_efl_pack_unpack(obj, pd, content);
119}
120
121EOLIAN static Eina_Bool
122_efl_ui_layout_part_box_efl_pack_pack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Entity *subobj) 115_efl_ui_layout_part_box_efl_pack_pack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Entity *subobj)
123{ 116{
124 return _efl_ui_layout_box_append(pd->obj, pd->sd, pd->part, subobj); 117 return _efl_ui_layout_box_append(pd->obj, pd->sd, pd->part, subobj);
@@ -282,13 +275,6 @@ _efl_ui_layout_part_table_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Tab
282} 275}
283 276
284EOLIAN static Eina_Bool 277EOLIAN static Eina_Bool
285_efl_ui_layout_part_table_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx_Entity *content)
286{
287 // alias for efl_pack_unpack
288 return _efl_ui_layout_part_table_efl_pack_unpack(obj, pd, content);
289}
290
291EOLIAN static Eina_Bool
292_efl_ui_layout_part_table_efl_pack_table_pack_table(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx_Entity *subobj, int col, int row, int colspan, int rowspan) 278_efl_ui_layout_part_table_efl_pack_table_pack_table(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx_Entity *subobj, int col, int row, int colspan, int rowspan)
293{ 279{
294 return _efl_ui_layout_table_pack(pd->obj, pd->sd, pd->part, subobj, col, row, colspan, rowspan); 280 return _efl_ui_layout_table_pack(pd->obj, pd->sd, pd->part, subobj, col, row, colspan, rowspan);
diff --git a/src/lib/elementary/efl_ui_layout_part_box.eo b/src/lib/elementary/efl_ui_layout_part_box.eo
index 3f19196898..f83bff735d 100644
--- a/src/lib/elementary/efl_ui_layout_part_box.eo
+++ b/src/lib/elementary/efl_ui_layout_part_box.eo
@@ -22,7 +22,6 @@ class @beta Efl.Ui.Layout_Part_Box extends Efl.Object implements Efl.Pack_Linear
22 Efl.Object.destructor; 22 Efl.Object.destructor;
23 Efl.Container.content_iterate; 23 Efl.Container.content_iterate;
24 Efl.Container.content_count; 24 Efl.Container.content_count;
25 Efl.Container.content_remove;
26 Efl.Ui.Direction.direction { get; } 25 Efl.Ui.Direction.direction { get; }
27 Efl.Pack.pack_clear; 26 Efl.Pack.pack_clear;
28 Efl.Pack.unpack_all; 27 Efl.Pack.unpack_all;
diff --git a/src/lib/elementary/efl_ui_layout_part_table.eo b/src/lib/elementary/efl_ui_layout_part_table.eo
index a2d580de6c..2ffe6fae99 100644
--- a/src/lib/elementary/efl_ui_layout_part_table.eo
+++ b/src/lib/elementary/efl_ui_layout_part_table.eo
@@ -21,7 +21,6 @@ class @beta Efl.Ui.Layout_Part_Table extends Efl.Object implements Efl.Pack_Tabl
21 Efl.Object.destructor; 21 Efl.Object.destructor;
22 Efl.Container.content_iterate; 22 Efl.Container.content_iterate;
23 Efl.Container.content_count; 23 Efl.Container.content_count;
24 Efl.Container.content_remove;
25 Efl.Pack.pack_clear; 24 Efl.Pack.pack_clear;
26 Efl.Pack.unpack_all; 25 Efl.Pack.unpack_all;
27 Efl.Pack.unpack; 26 Efl.Pack.unpack;
diff --git a/src/lib/elementary/efl_ui_table.c b/src/lib/elementary/efl_ui_table.c
index ff7de54166..541fb7fe16 100644
--- a/src/lib/elementary/efl_ui_table.c
+++ b/src/lib/elementary/efl_ui_table.c
@@ -572,13 +572,6 @@ _efl_ui_table_efl_container_content_count(Eo *obj EINA_UNUSED, Efl_Ui_Table_Data
572 return pd->count; 572 return pd->count;
573} 573}
574 574
575EOLIAN static Eina_Bool
576_efl_ui_table_efl_container_content_remove(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED, Efl_Gfx_Entity *content)
577{
578 return efl_pack_unpack(obj, content);
579}
580
581
582EOLIAN static Eina_Iterator * 575EOLIAN static Eina_Iterator *
583_efl_ui_table_efl_pack_table_table_contents_get(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED, 576_efl_ui_table_efl_pack_table_table_contents_get(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED,
584 int col, int row, Eina_Bool below) 577 int col, int row, Eina_Bool below)
diff --git a/src/lib/elementary/efl_ui_table.eo b/src/lib/elementary/efl_ui_table.eo
index 7ccc7d1bc8..3e3753a94c 100644
--- a/src/lib/elementary/efl_ui_table.eo
+++ b/src/lib/elementary/efl_ui_table.eo
@@ -21,7 +21,6 @@ class @beta Efl.Ui.Table extends Efl.Ui.Widget implements Efl.Pack_Table, Efl.Pa
21 Efl.Object.constructor; 21 Efl.Object.constructor;
22 Efl.Canvas.Group.group_calculate; 22 Efl.Canvas.Group.group_calculate;
23 Efl.Ui.Widget.theme_apply; 23 Efl.Ui.Widget.theme_apply;
24 Efl.Container.content_remove;
25 Efl.Container.content_iterate; 24 Efl.Container.content_iterate;
26 Efl.Container.content_count; 25 Efl.Container.content_count;
27 Efl.Ui.Direction.direction { get; set; } 26 Efl.Ui.Direction.direction { get; set; }
diff --git a/src/tests/edje/edje_test_container.c b/src/tests/edje/edje_test_container.c
index 018de4d3a0..11fc195e09 100644
--- a/src/tests/edje/edje_test_container.c
+++ b/src/tests/edje/edje_test_container.c
@@ -102,7 +102,7 @@ EFL_START_TEST(edje_test_box_eoapi)
102 fail_if(i != 3); 102 fail_if(i != 3);
103 eina_iterator_free(it); 103 eina_iterator_free(it);
104 104
105 fail_if(!efl_content_remove(efl_part(obj, "box"), sobjs[0])); 105 fail_if(!efl_pack_unpack(efl_part(obj, "box"), sobjs[0]));
106 fail_if(efl_content_count(efl_part(obj, "box")) != 2); 106 fail_if(efl_content_count(efl_part(obj, "box")) != 2);
107 fail_if(!efl_pack_unpack_at(efl_part(obj, "box"), 1)); 107 fail_if(!efl_pack_unpack_at(efl_part(obj, "box"), 1));
108 fail_if(efl_content_count(efl_part(obj, "box")) != 1); 108 fail_if(efl_content_count(efl_part(obj, "box")) != 1);
diff --git a/src/tests/edje/edje_test_swallow.c b/src/tests/edje/edje_test_swallow.c
index 0d08951fcd..b8f13cf7ec 100644
--- a/src/tests/edje/edje_test_swallow.c
+++ b/src/tests/edje/edje_test_swallow.c
@@ -107,7 +107,7 @@ EFL_START_TEST(edje_test_swallows_eoapi)
107 fail_if(!efl_content_set(efl_part(ly, "swallow"), o1)); 107 fail_if(!efl_content_set(efl_part(ly, "swallow"), o1));
108 ck_assert_ptr_eq(efl_parent_get(o1), ly); 108 ck_assert_ptr_eq(efl_parent_get(o1), ly);
109 109
110 efl_content_remove(ly, o1); 110 efl_canvas_layout_content_remove(ly, o1);
111 ck_assert_ptr_eq(efl_parent_get(o1), evas_object_evas_get(o1)); 111 ck_assert_ptr_eq(efl_parent_get(o1), evas_object_evas_get(o1));
112 112
113 fail_if(!efl_content_set(efl_part(ly, "swallow"), o1)); 113 fail_if(!efl_content_set(efl_part(ly, "swallow"), o1));