summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-02-27 13:17:28 -0500
committerMike Blumenkrantz <zmike@samsung.com>2019-02-27 13:17:28 -0500
commit4192753490a3c791cc18c57be07c230b9ca33732 (patch)
tree3cf63f2580a0b68aaea80ca0d1b8957f690f491e
parent235dadb1abdbace96c33f871e5b5b3d3f4da6214 (diff)
efl.canvas.group: group_member_del -> group_member_remove
Summary: api naming in efl uses 'del' when deleting an object and 'remove' when removing something from an object ref T7554 Depends on D8034 Reviewers: segfaultxavi, bu5hm4n Reviewed By: segfaultxavi Subscribers: cedric, #reviewers, #committers Tags: #efl_api Maniphest Tasks: T7554 Differential Revision: https://phab.enlightenment.org/D8035
-rw-r--r--src/lib/elementary/efl_ui_pan.c2
-rw-r--r--src/lib/elementary/efl_ui_widget.c4
-rw-r--r--src/lib/elementary/efl_ui_widget.eo2
-rw-r--r--src/lib/evas/Evas_Legacy.h4
-rw-r--r--src/lib/evas/canvas/efl_canvas_event_grabber.c6
-rw-r--r--src/lib/evas/canvas/efl_canvas_event_grabber.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_group.eo4
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c4
8 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/elementary/efl_ui_pan.c b/src/lib/elementary/efl_ui_pan.c
index dc9ddcc5e0..fcbe6dd728 100644
--- a/src/lib/elementary/efl_ui_pan.c
+++ b/src/lib/elementary/efl_ui_pan.c
@@ -194,7 +194,7 @@ _efl_ui_pan_efl_content_content_unset(Eo *obj EINA_UNUSED, Efl_Ui_Pan_Data *pd)
194{ 194{
195 Efl_Gfx_Stack *old_content = pd->content; 195 Efl_Gfx_Stack *old_content = pd->content;
196 196
197 efl_canvas_group_member_del(obj, pd->content); 197 efl_canvas_group_member_remove(obj, pd->content);
198 evas_object_event_callback_del_full 198 evas_object_event_callback_del_full
199 (pd->content, EVAS_CALLBACK_DEL, _efl_ui_pan_content_del_cb, obj); 199 (pd->content, EVAS_CALLBACK_DEL, _efl_ui_pan_content_del_cb, obj);
200 evas_object_event_callback_del_full 200 evas_object_event_callback_del_full
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index fe65abbd87..a101040b86 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -1070,11 +1070,11 @@ _efl_ui_widget_efl_canvas_group_group_member_add(Eo *obj, Elm_Widget_Smart_Data
1070} 1070}
1071 1071
1072EOLIAN static void 1072EOLIAN static void
1073_efl_ui_widget_efl_canvas_group_group_member_del(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child) 1073_efl_ui_widget_efl_canvas_group_group_member_remove(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child)
1074{ 1074{
1075 if (!evas_object_data_get(child, "_elm_leaveme")) 1075 if (!evas_object_data_get(child, "_elm_leaveme"))
1076 evas_object_clip_unset(child); 1076 evas_object_clip_unset(child);
1077 efl_canvas_group_member_del(efl_super(obj, MY_CLASS), child); 1077 efl_canvas_group_member_remove(efl_super(obj, MY_CLASS), child);
1078} 1078}
1079 1079
1080// internal funcs 1080// internal funcs
diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo
index 20e7e3f4c1..15de2ce24b 100644
--- a/src/lib/elementary/efl_ui_widget.eo
+++ b/src/lib/elementary/efl_ui_widget.eo
@@ -628,7 +628,7 @@ abstract @beta Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Obje
628 Efl.Canvas.Object.clip { set; } 628 Efl.Canvas.Object.clip { set; }
629 Efl.Canvas.Object.no_render { set; } 629 Efl.Canvas.Object.no_render { set; }
630 Efl.Canvas.Group.group_calculate; 630 Efl.Canvas.Group.group_calculate;
631 Efl.Canvas.Group.group_member_del; 631 Efl.Canvas.Group.group_member_remove;
632 Efl.Canvas.Group.group_member_add; 632 Efl.Canvas.Group.group_member_add;
633 Efl.Access.Object.i18n_name { get; } 633 Efl.Access.Object.i18n_name { get; }
634 Efl.Access.Object.state_set { get; } 634 Efl.Access.Object.state_set { get; }
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 36c669db34..57f9ec1a65 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -6641,7 +6641,7 @@ EAPI Evas_Object *evas_object_smart_clipped_clipper_get(const Evas_Object *obj)
6641 * This function will return @c null when a non-smart object is passed. 6641 * This function will return @c null when a non-smart object is passed.
6642 * 6642 *
6643 * See also @ref Efl.Canvas.Group.group_member_add, 6643 * See also @ref Efl.Canvas.Group.group_member_add,
6644 * @ref Efl.Canvas.Group.group_member_del and @ref evas_object_smart_iterator_new. 6644 * @ref Efl.Canvas.Group.group_member_remove and @ref evas_object_smart_iterator_new.
6645 * 6645 *
6646 * @return Returns the list of the member objects of @c obj. 6646 * @return Returns the list of the member objects of @c obj.
6647 * 6647 *
@@ -6698,7 +6698,7 @@ EAPI Eina_Bool evas_object_smart_need_recalculate_get(const Evas_Object *obj);
6698 * object. 6698 * object.
6699 * 6699 *
6700 * See also @ref Efl.Canvas.Group.group_member_add and 6700 * See also @ref Efl.Canvas.Group.group_member_add and
6701 * @ref Efl.Canvas.Group.group_member_del 6701 * @ref Efl.Canvas.Group.group_member_remove
6702 * 6702 *
6703 * @return Returns the iterator of the member objects of @c obj. 6703 * @return Returns the iterator of the member objects of @c obj.
6704 * 6704 *
diff --git a/src/lib/evas/canvas/efl_canvas_event_grabber.c b/src/lib/evas/canvas/efl_canvas_event_grabber.c
index c0563b0b57..dae4e9b007 100644
--- a/src/lib/evas/canvas/efl_canvas_event_grabber.c
+++ b/src/lib/evas/canvas/efl_canvas_event_grabber.c
@@ -193,7 +193,7 @@ _efl_canvas_object_event_grabber_child_invalidate(void *data, const Efl_Event *e
193{ 193{
194 Efl_Object_Event_Grabber_Data *pd = data; 194 Efl_Object_Event_Grabber_Data *pd = data;
195 195
196 efl_canvas_group_member_del(efl_parent_get(pd->rect), event->object); 196 efl_canvas_group_member_remove(efl_parent_get(pd->rect), event->object);
197} 197}
198 198
199EOLIAN static void 199EOLIAN static void
@@ -250,7 +250,7 @@ _efl_canvas_event_grabber_efl_canvas_group_group_member_add(Eo *eo_obj, Efl_Obje
250} 250}
251 251
252EOLIAN static void 252EOLIAN static void
253_efl_canvas_event_grabber_efl_canvas_group_group_member_del(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd, Eo *member) 253_efl_canvas_event_grabber_efl_canvas_group_group_member_remove(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd, Eo *member)
254{ 254{
255 Evas_Object_Protected_Data *obj = efl_data_scope_get(member, EFL_CANVAS_OBJECT_CLASS); 255 Evas_Object_Protected_Data *obj = efl_data_scope_get(member, EFL_CANVAS_OBJECT_CLASS);
256 256
@@ -366,7 +366,7 @@ _efl_canvas_event_grabber_efl_object_destructor(Eo *eo_obj, Efl_Object_Event_Gra
366 Eina_List *l, *ln; 366 Eina_List *l, *ln;
367 367
368 EINA_LIST_FOREACH_SAFE(pd->contained, l, ln, obj) 368 EINA_LIST_FOREACH_SAFE(pd->contained, l, ln, obj)
369 efl_canvas_group_member_del(eo_obj, obj->object); 369 efl_canvas_group_member_remove(eo_obj, obj->object);
370 efl_canvas_group_del(eo_obj); 370 efl_canvas_group_del(eo_obj);
371 efl_destructor(efl_super(eo_obj, MY_CLASS)); 371 efl_destructor(efl_super(eo_obj, MY_CLASS));
372} 372}
diff --git a/src/lib/evas/canvas/efl_canvas_event_grabber.eo b/src/lib/evas/canvas/efl_canvas_event_grabber.eo
index 4d55be3eca..d36d73cfc5 100644
--- a/src/lib/evas/canvas/efl_canvas_event_grabber.eo
+++ b/src/lib/evas/canvas/efl_canvas_event_grabber.eo
@@ -35,7 +35,7 @@ class @beta Efl.Canvas.Event_Grabber extends Efl.Canvas.Group
35 Efl.Object.constructor; 35 Efl.Object.constructor;
36 Efl.Object.destructor; 36 Efl.Object.destructor;
37 Efl.Canvas.Group.group_member_add; 37 Efl.Canvas.Group.group_member_add;
38 Efl.Canvas.Group.group_member_del; 38 Efl.Canvas.Group.group_member_remove;
39 Efl.Canvas.Group.group_member_is; 39 Efl.Canvas.Group.group_member_is;
40 Efl.Canvas.Group.group_members_iterate; 40 Efl.Canvas.Group.group_members_iterate;
41 Efl.Canvas.Group.group_calculate; 41 Efl.Canvas.Group.group_calculate;
diff --git a/src/lib/evas/canvas/efl_canvas_group.eo b/src/lib/evas/canvas/efl_canvas_group.eo
index 5ef8016e9e..2602729f44 100644
--- a/src/lib/evas/canvas/efl_canvas_group.eo
+++ b/src/lib/evas/canvas/efl_canvas_group.eo
@@ -77,7 +77,7 @@ class @beta Efl.Canvas.Group extends Efl.Canvas.Object
77 to ensure the proper stacking of special objects, such as clippers, 77 to ensure the proper stacking of special objects, such as clippers,
78 event rectangles, etc... 78 event rectangles, etc...
79 79
80 See also @.group_member_del. 80 See also @.group_member_remove.
81 See also @.group_member_is. 81 See also @.group_member_is.
82 ]] 82 ]]
83 params { 83 params {
@@ -85,7 +85,7 @@ class @beta Efl.Canvas.Group extends Efl.Canvas.Object
85 } 85 }
86 legacy: null; 86 legacy: null;
87 } 87 }
88 group_member_del { 88 group_member_remove {
89 [[Removes a member object from a given smart object. 89 [[Removes a member object from a given smart object.
90 90
91 This removes a member object from a smart object, if it was added 91 This removes a member object from a smart object, if it was added
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 16b697042a..147e28526d 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -342,11 +342,11 @@ evas_object_smart_member_del(Evas_Object *eo_obj)
342 if (!obj) return; 342 if (!obj) return;
343 if (!obj->smart.parent) return; 343 if (!obj->smart.parent) return;
344 Evas_Object *smart_obj = obj->smart.parent; 344 Evas_Object *smart_obj = obj->smart.parent;
345 efl_canvas_group_member_del(smart_obj, eo_obj); 345 efl_canvas_group_member_remove(smart_obj, eo_obj);
346} 346}
347 347
348EOLIAN static void 348EOLIAN static void
349_efl_canvas_group_group_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Object *eo_obj) 349_efl_canvas_group_group_member_remove(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Object *eo_obj)
350{ 350{
351 Evas_Object_Protected_Data *obj = efl_data_scope_safe_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 351 Evas_Object_Protected_Data *obj = efl_data_scope_safe_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
352 Evas_Object_Protected_Data *smart; 352 Evas_Object_Protected_Data *smart;