q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=487512347218b48535020ea15e03ea7e34b12c40
commit 487512347218b48535020ea15e03ea7e34b12c40
Author: Daniel Kolesa <d.kol...@samsung.com>
Date: Tue Sep 9 14:21:39 2014 +0100
eo: update the EFL to use builtin complex types
---
src/lib/ecore_audio/ecore_audio_out.eo | 2 +-
src/lib/edje/edje_object.eo | 8 ++++----
src/lib/eo/eo_base.eo | 2 +-
src/lib/evas/canvas/evas_3d_node.eo | 4 ++--
src/lib/evas/canvas/evas_3d_scene.eo | 6 +++---
src/lib/evas/canvas/evas_box.eo | 6 ++++--
src/lib/evas/canvas/evas_canvas.eo | 13 +++++++------
src/lib/evas/canvas/evas_grid.eo | 8 +++++---
src/lib/evas/canvas/evas_object.eo | 4 ++--
src/lib/evas/canvas/evas_object_smart.eo | 5 +++--
src/lib/evas/canvas/evas_table.eo | 8 +++++---
src/lib/evas/canvas/evas_textblock.eo | 2 +-
12 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/src/lib/ecore_audio/ecore_audio_out.eo
b/src/lib/ecore_audio/ecore_audio_out.eo
index 437a57e..1ea52d0 100644
--- a/src/lib/ecore_audio/ecore_audio_out.eo
+++ b/src/lib/ecore_audio/ecore_audio_out.eo
@@ -29,7 +29,7 @@ class Ecore_Audio_Out (Ecore_Audio)
Returns the list of all attached inputs
@since 1.8 */
- return: Eina.List *; /*An @ref Eina_List of the inputs that are
attached to the output*/
+ return: list<Eo*> *; /*An @ref Eina_List of the inputs that are
attached to the output*/
}
}
implements {
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index 8d2fa3d..618d5fd 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -391,7 +391,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
@return A list all accessibility part names on @p obj
@since 1.7.0 */
- return: Eina.List *;
+ return: list<const(char)*> *;
}
}
load_error {
@@ -1173,7 +1173,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
This function return a list of Evas_Textblock_Rectangle anchor
rectangles. */
- return: const(Eina.List)*;
+ return: const(list<const(Evas.Textblock_Rectangle)*>)*;
params {
@in const(char)* part; /*@ The part name */
@in const(char)* anchor; /*@ The anchor name */
@@ -2179,7 +2179,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
@return The list of anchors (const char *), do not modify!
This function returns a list of char anchor names. */
- return: const(Eina.List)*;
+ return: const(list<const(char)*>)*;
params {
@in const(char)* part; /*@ The part name */
}
@@ -2314,7 +2314,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
@return The list of items (const char *), do not modify!
This function returns a list of char item names. */
- return: const(Eina.List)*;
+ return: const(list<const(char)*>)*;
params {
@in const(char)* part; /*@ The part name */
}
diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index b76b45b..dc05c3e 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -171,7 +171,7 @@ callbacks of the same priority are called in reverse order
of creation. */
}
children_iterator_new {
/*@ Get an iterator on all childrens */
- return: Eina.Iterator *;
+ return: free(own(iterator<Eo *> *), eina_iterator_free) @warn_unused;
}
}
implements {
diff --git a/src/lib/evas/canvas/evas_3d_node.eo
b/src/lib/evas/canvas/evas_3d_node.eo
index ec862e1..b78079b 100644
--- a/src/lib/evas/canvas/evas_3d_node.eo
+++ b/src/lib/evas/canvas/evas_3d_node.eo
@@ -75,7 +75,7 @@ class Evas_3D_Node (Evas_3D_Object, Evas.Common_Interface)
@ingroup Evas_3D_Node
*/
- return: const(Eina.List)*;
+ return: const(list<Evas_3D_Node *>)*;
}
position_set {
@@ -319,7 +319,7 @@ class Evas_3D_Node (Evas_3D_Object, Evas.Common_Interface)
@ingroup Evas_3D_Node
*/
- return: const(Eina.List)*;
+ return: const(list<Evas_3D_Mesh *>)*;
}
bounding_box_get{
diff --git a/src/lib/evas/canvas/evas_3d_scene.eo
b/src/lib/evas/canvas/evas_3d_scene.eo
index df4de87..c165ef1 100644
--- a/src/lib/evas/canvas/evas_3d_scene.eo
+++ b/src/lib/evas/canvas/evas_3d_scene.eo
@@ -105,7 +105,7 @@ class Evas_3D_Scene (Evas_3D_Object, Evas.Common_Interface)
@ingroup Evas_3D_Scene
*/
- return: Eina.List *;
+ return: list<Evas_3D_Node *> *;
params {
@in Evas_Real x; /*@ X coordinate of the picking position.
*/
@in Evas_Real y; /*@ Y coordinate of the picking position.
*/
@@ -121,7 +121,7 @@ class Evas_3D_Scene (Evas_3D_Object, Evas.Common_Interface)
@ingroup Evas_3D_Scene
*/
params {
- @in Eina_Bool shadows_enabled; /*@ shadows enabled status. */
+ @in bool shadows_enabled; /*@ shadows enabled status. */
}
}
@@ -132,7 +132,7 @@ class Evas_3D_Scene (Evas_3D_Object, Evas.Common_Interface)
@ingroup Evas_3D_Scene
*/
- return: Eina_Bool;
+ return: bool;
params {
}
}
diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo
index ed2c124..fb56a44 100644
--- a/src/lib/evas/canvas/evas_box.eo
+++ b/src/lib/evas/canvas/evas_box.eo
@@ -274,7 +274,8 @@ class Evas.Box (Evas.Smart_Clipped)
on errors
@note Do @b not remove or delete objects while walking the list. */
- return: Eina.Iterator * @warn_unused;
+ return: free(own(iterator<Evas.Object *> *), eina_iterator_free)
+ @warn_unused;
}
add_to {
/*@
@@ -363,7 +364,8 @@ class Evas.Box (Evas.Smart_Clipped)
on errors
@note Do not remove or delete objects while walking the list. */
- return: Eina.Accessor * @warn_unused;
+ return: free(own(accessor<Evas.Object *> *), eina_accessor_free)
+ @warn_unused;
}
internal_append {
/*@ No description supplied by the EAPI. */
diff --git a/src/lib/evas/canvas/evas_canvas.eo
b/src/lib/evas/canvas/evas_canvas.eo
index 936065c..893850d 100644
--- a/src/lib/evas/canvas/evas_canvas.eo
+++ b/src/lib/evas/canvas/evas_canvas.eo
@@ -591,7 +591,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
It will not append to the list pass events as hidden objects.
Call eina_list_free on the returned list after usage. */
- return: Eina.List * @warn_unused;
+ return: list<Evas.Object *> * @warn_unused;
params {
@in Evas_Object *stop; /*@ An Evas Object where to stop searching.
*/
@in int x; /*@ The horizontal coordinate of the position. */
@@ -807,7 +807,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
@warning This function will @b skip objects parented by smart
objects, acting only on the ones at the "top level", with regard to
object parenting. */
- return: Eina.List * @warn_unused;
+ return: list<Evas.Object *> * @warn_unused;
params {
@in Evas_Coord x; /*@ The horizontal coordinate of the position */
@in Evas_Coord y; /*@ The vertical coordinate of the position */
@@ -1115,10 +1115,10 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
after you're done.
@ingroup Evas_Font_Group */
- return: Eina.List * @warn_unused;
+ return: list<const(char) *> * @warn_unused;
}
objects_in_rectangle_get @const {
- return: Eina.List * @warn_unused;
+ return: list<Evas.Object *> * @warn_unused;
params {
@in Evas_Coord x;
@in Evas_Coord y;
@@ -1271,7 +1271,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
Retrieves the list of font paths used by the given evas.
@return The list of font paths used.
@ingroup Evas_Font_Path_Group */
- return: const(Eina.List)* @warn_unused;
+ return: const(list<const(char) *>)* @warn_unused;
}
image_cache_reload {
/*@
@@ -1351,7 +1351,8 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
@ingroup Evas_Canvas */
- return: Eina.List * @warn_unused;
+ return: free(own(list<Eina.Rectangle *> *), evas_render_updates_free)
+ @warn_unused;
}
image_cache_flush {
/*@
diff --git a/src/lib/evas/canvas/evas_grid.eo b/src/lib/evas/canvas/evas_grid.eo
index 7c80d90..393b533 100644
--- a/src/lib/evas/canvas/evas_grid.eo
+++ b/src/lib/evas/canvas/evas_grid.eo
@@ -53,7 +53,7 @@ class Evas.Grid (Evas.Smart_Clipped)
It's possible to remove objects from the grid when walking this
list, but these removals won't be reflected on it.
@since 1.1 */
- return: Eina.List * @warn_unused;
+ return: free(own(list<Evas.Object *> *), eina_list_free)
@warn_unused;
}
}
}
@@ -64,7 +64,8 @@ class Evas.Grid (Evas.Smart_Clipped)
@note Do not remove or delete objects while walking the list.
@since 1.1 */
- return: Eina.Accessor * @warn_unused;
+ return: free(own(accessor<Evas.Object *> *), eina_accessor_free)
+ @warn_unused;
}
clear {
/*@
@@ -82,7 +83,8 @@ class Evas.Grid (Evas.Smart_Clipped)
@note Do not remove or delete objects while walking the list.
@since 1.1 */
- return: Eina.Iterator * @warn_unused;
+ return: free(own(iterator<Evas.Object *> *), eina_iterator_free)
+ @warn_unused;
}
add_to {
/*@
diff --git a/src/lib/evas/canvas/evas_object.eo
b/src/lib/evas/canvas/evas_object.eo
index 9ce8923..9e3ed0b 100644
--- a/src/lib/evas/canvas/evas_object.eo
+++ b/src/lib/evas/canvas/evas_object.eo
@@ -1171,7 +1171,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface)
clipper = evas_object_clip_get(obj);
if (clipper)
{
- Eina.List *clippees, *l;
+ Eina_List *clippees, *l;
Evas_Object *obj_tmp;
clippees = evas_object_clipees_get(clipper);
@@ -1180,7 +1180,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface)
evas_object_show(obj_tmp);
}
@endcode */
- return: const(Eina.List)* @warn_unused;
+ return: const(list<Evas.Object*>)* @warn_unused;
}
}
smart_parent {
diff --git a/src/lib/evas/canvas/evas_object_smart.eo
b/src/lib/evas/canvas/evas_object_smart.eo
index 006dbf4..6ca9a15 100644
--- a/src/lib/evas/canvas/evas_object_smart.eo
+++ b/src/lib/evas/canvas/evas_object_smart.eo
@@ -102,7 +102,7 @@ class Evas.Object_Smart (Evas.Object, Evas.Signal_Interface)
@see evas_object_smart_member_add()
@see evas_object_smart_member_del()
@see evas_object_smart_iterator_new() */
- return: Eina.List * @warn_unused;
+ return: list<Evas.Object*> * @warn_unused;
}
}
smart {
@@ -212,7 +212,8 @@ class Evas.Object_Smart (Evas.Object, Evas.Signal_Interface)
@see evas_object_smart_member_add()
@see evas_object_smart_member_del()
@see evas_object_smart_members_get() */
- return: Eina.Iterator * @warn_unused;
+ return: free(own(iterator<Evas.Object *> *), eina_iterator_free)
+ @warn_unused;
}
callback_description_find @const {
/*@
diff --git a/src/lib/evas/canvas/evas_table.eo
b/src/lib/evas/canvas/evas_table.eo
index d49d5e9..6af1482 100644
--- a/src/lib/evas/canvas/evas_table.eo
+++ b/src/lib/evas/canvas/evas_table.eo
@@ -130,7 +130,7 @@ class Evas.Table (Evas.Smart_Clipped)
It's up to the user to destroy it when it no longer needs it.
It's possible to remove objects from the table when walking this
list, but these removals won't be reflected on it. */
- return: Eina.List * @warn_unused;
+ return: free(own(list<Evas.Object *> *), eina_list_free)
@warn_unused;
}
}
child {
@@ -163,14 +163,16 @@ class Evas.Table (Evas.Smart_Clipped)
Get an accessor to get random access to the list of children for the
table.
@note Do not remove or delete objects while walking the list. */
- return: Eina.Accessor * @warn_unused;
+ return: free(own(accessor<Evas.Object *> *), eina_accessor_free)
+ @warn_unused;
}
iterator_new @const {
/*@
Get an iterator to walk the list of children for the table.
@note Do not remove or delete objects while walking the list. */
- return: Eina.Iterator * @warn_unused;
+ return: free(own(iterator<Evas.Object *> *), eina_iterator_free)
+ @warn_unused;
}
add_to {
/*@
diff --git a/src/lib/evas/canvas/evas_textblock.eo
b/src/lib/evas/canvas/evas_textblock.eo
index a956026..399df7c 100644
--- a/src/lib/evas/canvas/evas_textblock.eo
+++ b/src/lib/evas/canvas/evas_textblock.eo
@@ -249,7 +249,7 @@ class Evas.Textblock (Evas.Object)
node_format_list_get @const {
/*@ No description supplied by the EAPI. */
legacy: evas_textblock_node_format_list_get;
- return: const(Eina.List)*;
+ return: const(list<Evas.Object*>)*;
params {
@in const(char)* anchor;
}
--
