summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-06-17 14:42:07 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-06-17 19:25:47 +0900
commit2a0bb33f1d049f35914cc4597022702f297bdc3c (patch)
treee4dcd32a490bc066373747ffd9aa811b0219891a
parent3d1e474fc6d88f5c883e3804d4ba16012f9588d6 (diff)
Evas: Move smart_members_get to legacy
Going forward, we prefer to return iterators rather than lists.
Diffstat (limited to '')
-rw-r--r--src/lib/evas/Evas_Legacy.h20
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c5
-rw-r--r--src/lib/evas/canvas/evas_object_smart.eo15
3 files changed, 23 insertions, 17 deletions
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 74893f7f75..15948a0179 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -5192,6 +5192,26 @@ EAPI void evas_object_smart_data_set(Evas_Object *obj, void *data);
5192EAPI void *evas_object_smart_data_get(const Evas_Object *obj); 5192EAPI void *evas_object_smart_data_get(const Evas_Object *obj);
5193 5193
5194/** 5194/**
5195 * @brief Retrieves the list of the member objects of a given Evas smart
5196 * object.
5197 *
5198 * The returned list should be freed with @c eina_list_free() when you no
5199 * longer need it.
5200 *
5201 * This function will return @c null when a non-smart object is passed.
5202 *
5203 * See also @ref Evas.Object.Smart.member_add,
5204 * @ref Evas.Object.Smart.member_del and @ref evas_object_smart_iterator_new.
5205 *
5206 * @return Returns the list of the member objects of @c obj.
5207 *
5208 * @since 1.7
5209 *
5210 * @ingroup Evas_Object_Smart
5211 */
5212EAPI Eina_List *evas_object_smart_members_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT;
5213
5214/**
5195 * This gets the internal counter that counts the number of smart calculations 5215 * This gets the internal counter that counts the number of smart calculations
5196 * 5216 *
5197 * @param e The canvas to get the calculate counter from 5217 * @param e The canvas to get the calculate counter from
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index b304ed2de6..d8246589ce 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -464,9 +464,10 @@ _evas_object_smart_iterator_new(const Eo *eo_obj, Evas_Smart_Data *priv)
464 return &it->iterator; 464 return &it->iterator;
465} 465}
466 466
467EOLIAN static Eina_List* 467EAPI Eina_List*
468_evas_object_smart_members_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o) 468evas_object_smart_members_get(const Evas_Object *eo_obj)
469{ 469{
470 EVAS_OBJECT_SMART_GET_OR_RETURN(eo_obj, NULL);
470 Eina_List *members = NULL; 471 Eina_List *members = NULL;
471 Eina_Inlist *member; 472 Eina_Inlist *member;
472 473
diff --git a/src/lib/evas/canvas/evas_object_smart.eo b/src/lib/evas/canvas/evas_object_smart.eo
index 35edfd7407..37e1ed4311 100644
--- a/src/lib/evas/canvas/evas_object_smart.eo
+++ b/src/lib/evas/canvas/evas_object_smart.eo
@@ -62,21 +62,6 @@ class Evas.Object.Smart (Evas.Object)
62 a: int; 62 a: int;
63 } 63 }
64 } 64 }
65 @property members {
66 get {
67 [[Retrieves the list of the member objects of a given Evas smart object.
68
69 The returned list should be freed with $eina_list_free() when you
70 no longer need it.
71
72 This function will return $null when a non-smart object is passed.
73
74 See also @.member_add, @.member_del and @.iterator_new.
75
76 @since 1.7]]
77 return: list<Evas.Object> @warn_unused; [[Returns the list of the member objects of $obj.]]
78 }
79 }
80 show { 65 show {
81 [[No description supplied by the EAPI.]] 66 [[No description supplied by the EAPI.]]
82 legacy: null; 67 legacy: null;