jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2a0bb33f1d049f35914cc4597022702f297bdc3c
commit 2a0bb33f1d049f35914cc4597022702f297bdc3c
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Fri Jun 17 14:42:07 2016 +0900
Evas: Move smart_members_get to legacy
Going forward, we prefer to return iterators rather than
lists.
---
src/lib/evas/Evas_Legacy.h | 20 ++++++++++++++++++++
src/lib/evas/canvas/evas_object_smart.c | 5 +++--
src/lib/evas/canvas/evas_object_smart.eo | 15 ---------------
3 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 74893f7..15948a0 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);
EAPI void *evas_object_smart_data_get(const Evas_Object *obj);
/**
+ * @brief Retrieves the list of the member objects of a given Evas smart
+ * object.
+ *
+ * The returned list should be freed with @c eina_list_free() when you no
+ * longer need it.
+ *
+ * This function will return @c null when a non-smart object is passed.
+ *
+ * See also @ref Evas.Object.Smart.member_add,
+ * @ref Evas.Object.Smart.member_del and @ref evas_object_smart_iterator_new.
+ *
+ * @return Returns the list of the member objects of @c obj.
+ *
+ * @since 1.7
+ *
+ * @ingroup Evas_Object_Smart
+ */
+EAPI Eina_List *evas_object_smart_members_get(const Evas_Object *obj)
EINA_WARN_UNUSED_RESULT;
+
+/**
* This gets the internal counter that counts the number of smart calculations
*
* @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 b304ed2..d824658 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)
return &it->iterator;
}
-EOLIAN static Eina_List*
-_evas_object_smart_members_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o)
+EAPI Eina_List*
+evas_object_smart_members_get(const Evas_Object *eo_obj)
{
+ EVAS_OBJECT_SMART_GET_OR_RETURN(eo_obj, NULL);
Eina_List *members = NULL;
Eina_Inlist *member;
diff --git a/src/lib/evas/canvas/evas_object_smart.eo
b/src/lib/evas/canvas/evas_object_smart.eo
index 35edfd7..37e1ed4 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)
a: int;
}
}
- @property members {
- get {
- [[Retrieves the list of the member objects of a given Evas smart
object.
-
- The returned list should be freed with $eina_list_free() when you
- no longer need it.
-
- This function will return $null when a non-smart object is
passed.
-
- See also @.member_add, @.member_del and @.iterator_new.
-
- @since 1.7]]
- return: list<Evas.Object> @warn_unused; [[Returns the list of the
member objects of $obj.]]
- }
- }
show {
[[No description supplied by the EAPI.]]
legacy: null;
--
