10 files changed, 30 insertions, 30 deletions

diff --git a/src/lib/eio/efl_io_manager.eo b/src/lib/eio/efl_io_manager.eo
index 2d4abda..9d8f46d 100644
--- a/src/lib/eio/efl_io_manager.eo
+++ b/src/lib/eio/efl_io_manager.eo
@@ -63,10 +63,10 @@ class Efl.Io.Manager (Efl.Loop_User)
             data: ptr(Eina.Binbuf); [[Data to set as information]]
             flags: Eina.Xattr.Flags; [[Extended attributes flags]]
          }
-         return: own(ptr(Eina.Future)); [[Future for asynchronous set operation]]
+         return: ptr(Eina.Future) @owned; [[Future for asynchronous set operation]]
       }
       get {
-         return: own(ptr(Eina.Future)); [[Information]]
+         return: ptr(Eina.Future) @owned; [[Information]]
       }
       keys {
          path: string; [[File path]]
@@ -83,7 +83,7 @@ class Efl.Io.Manager (Efl.Loop_User)
         @in path: string; [[Path to file]]
         @in shared: bool; [[$true if the file can be accessed by others, $false otherwise]]
       }
-      return: own(ptr(Eina.Future)); [[Eina file handle]]
+      return: ptr(Eina.Future) @owned; [[Eina file handle]]
     }
     close {
       [[Closes an open Eina.File.]]
@@ -91,7 +91,7 @@ class Efl.Io.Manager (Efl.Loop_User)
         @in file: ptr(Eina.File); [[Eina file handle]]
         // Here we're just interested whether the promise was fullfilled or not. No value needed.
       }
-      return: own(ptr(Eina.Future)); [[Close return code]]
+      return: ptr(Eina.Future) @owned; [[Close return code]]
     }
   }
 }
diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo
index d1dd10c..68d0d19 100644
--- a/src/lib/eo/efl_object.eo
+++ b/src/lib/eo/efl_object.eo
@@ -98,9 +98,9 @@ abstract Efl.Object ()
             @since 1.21
          ]]
          params {
-            @in sb: own(ptr(Eina.Strbuf)); [[A string buffer, must not be $null.]]
+            @in sb: ptr(Eina.Strbuf) @owned; [[A string buffer, must not be $null.]]
          }
-         return: own(ptr(Eina.Strbuf)); [[Should not be $null, may be $sb.]]
+         return: ptr(Eina.Strbuf) @owned; [[Should not be $null, may be $sb.]]
       }
       @property event_global_freeze_count @class {
          get {
@@ -227,7 +227,7 @@ abstract Efl.Object ()
       }
       children_iterator_new {
          [[Get an iterator on all childrens]]
-         return: free(own(iterator<Efl.Object>), eina_iterator_free) @warn_unused; [[Children iterator]]
+         return: iterator<Efl.Object> @owned @warn_unused; [[Children iterator]]
       }
       composite_attach {
            [[Make an object a composite object of another.
diff --git a/src/lib/evas/canvas/efl_canvas_group.eo b/src/lib/evas/canvas/efl_canvas_group.eo
index 093acf5..e3af2ca 100644
--- a/src/lib/evas/canvas/efl_canvas_group.eo
+++ b/src/lib/evas/canvas/efl_canvas_group.eo
@@ -60,7 +60,7 @@ class Efl.Canvas.Group (Efl.Canvas.Object)
            from both the $Efl.Object children list as well as the $Efl.Container
            content list.
          ]]
-         return: free(own(iterator<Efl.Canvas.Object>), eina_iterator_free);
+         return: iterator<Efl.Canvas.Object> @owned;
             [[Iterator to object children]]
          legacy: evas_object_smart_iterator_new;
       }
@@ -81,7 +81,7 @@ class Efl.Canvas.Group (Efl.Canvas.Object)
            See also @.group_member_is.
          ]]
          params {
-            @in sub_obj: own(Efl.Canvas.Object) @nonull; [[The member object.]]
+            @in sub_obj: Efl.Canvas.Object @owned @nonull; [[The member object.]]
          }
          legacy: null;
       }
diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_text.eo
index c765d1a..6600e7a 100644
--- a/src/lib/evas/canvas/efl_canvas_text.eo
+++ b/src/lib/evas/canvas/efl_canvas_text.eo
@@ -159,7 +159,7 @@ Efl.Text.Font, Efl.Text.Style, Efl.Text.Format, Efl.Text.Cursor, Efl.Text.Annota
            @since 1.18
          ]]
          legacy: null;
-         return: own(ptr(char)); [[The text in the given range]]
+         return: string @owned; [[The text in the given range]]
          params {
             @in cur1: const(ptr(Efl.Text.Cursor.Cursor)); [[Start of range]]
             @in cur2: const(ptr(Efl.Text.Cursor.Cursor)); [[End of range]]
@@ -178,9 +178,9 @@ Efl.Text.Font, Efl.Text.Style, Efl.Text.Format, Efl.Text.Cursor, Efl.Text.Annota
              @in cur1: const(ptr(Efl.Text.Cursor.Cursor)); [[Start of range]]
              @in cur2: const(ptr(Efl.Text.Cursor.Cursor)); [[End of range]]
          }
-         return: free(own(iterator<Eina.Rectangle>),
-                         eina_iterator_free); [[Iterator on all geoemtries of
-                     the given range]]
+         return: iterator<Eina.Rectangle> @owned; [[
+            Iterator on all geoemtries of the given range
+         ]]
       }
       range_simple_geometry_get {
          [[Get the "simple" geometry of a range.
@@ -196,9 +196,9 @@ Efl.Text.Font, Efl.Text.Style, Efl.Text.Format, Efl.Text.Cursor, Efl.Text.Annota
              @in cur1: ptr(const(Efl.Text.Cursor.Cursor)); [[Start of range]]
              @in cur2: ptr(const(Efl.Text.Cursor.Cursor)); [[End of range]]
          }
-         return: free(own(iterator<Eina.Rectangle>),
-                         eina_iterator_free); [[Iterator on all simple
-                     geometries of the given range]]
+         return: iterator<Eina.Rectangle> @owned; [[
+            Iterator on all simple geometries of the given range
+         ]]
       }
       range_delete {
          [[Deletes the range between given cursors.
diff --git a/src/lib/evas/canvas/efl_input_event.eo b/src/lib/evas/canvas/efl_input_event.eo
index 43f0753..51679e8 100644
--- a/src/lib/evas/canvas/efl_input_event.eo
+++ b/src/lib/evas/canvas/efl_input_event.eo
@@ -32,7 +32,7 @@ mixin Efl.Input.Event (Efl.Interface, Efl.Object)
       }
       dup @pure_virtual {
          [[Creates a copy of this event.]]
-         return: own(Efl.Input.Event); [[Event copy]]
+         return: Efl.Input.Event @owned; [[Event copy]]
       }
       @property device @pure_virtual {
          [[Input device that originated this event.]]
diff --git a/src/lib/evas/canvas/efl_vg_container.eo b/src/lib/evas/canvas/efl_vg_container.eo
index 75af382..1faad56 100644
--- a/src/lib/evas/canvas/efl_vg_container.eo
+++ b/src/lib/evas/canvas/efl_vg_container.eo
@@ -12,7 +12,7 @@ class Efl.VG.Container (Efl.VG)
       }
       children_get {
          [[Get all children of container]]
-         return: free(own(iterator<Efl.VG>), eina_iterator_free) @warn_unused; [[Iterator to children]]
+         return: iterator<Efl.VG> @owned @warn_unused; [[Iterator to children]]
       }
    }
    implements {
diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo
index 75c8827..041b868 100644
--- a/src/lib/evas/canvas/evas_box.eo
+++ b/src/lib/evas/canvas/evas_box.eo
@@ -253,7 +253,7 @@ class Evas.Box (Efl.Canvas.Group)
          [[Get an iterator to walk the list of children of a given box object.
 
            Note: Do not remove or delete objects while walking the list.]]
-         return: free(own(iterator<Efl.Canvas.Object>), eina_iterator_free)
+         return: iterator<Efl.Canvas.Object> @owned
             @warn_unused; [[An iterator on $o's child objects, on success, or $null, on errors.]]
       }
       add_to {
@@ -325,7 +325,7 @@ class Evas.Box (Efl.Canvas.Group)
            list of children of a given box object.
 
            Note: Do not remove or delete objects while walking the list.]]
-         return: free(own(accessor<Efl.Canvas.Object>), eina_accessor_free)
+         return: accessor<Efl.Canvas.Object> @owned
             @warn_unused; [[An accessor on $o's child objects, on success, or $null,
                             on errors.]]
       }
diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo
index 1f83790..a00e5f2 100644
--- a/src/lib/evas/canvas/evas_canvas.eo
+++ b/src/lib/evas/canvas/evas_canvas.eo
@@ -571,8 +571,8 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
 
            @since 1.15
          ]]
-         return: free(own(list<ptr(Eina.Rectangle)>), evas_render_updates_free)
-            @warn_unused; [[
+         return: free(list<ptr(Eina.Rectangle)>, evas_render_updates_free)
+            @owned @warn_unused; [[
             A newly allocated list of updated rectangles of the canvas
             ($Eina.Rectangle structs). Free this list with
             \@ref evas_render_updates_free.
@@ -866,8 +866,8 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
 
          See the full @ref Example_Evas_Events "example".
          */
-         return: free(own(list<ptr(Eina.Rectangle)>), evas_render_updates_free)
-            @warn_unused; [[
+         return: free(list<ptr(Eina.Rectangle)>, evas_render_updates_free)
+            @owned @warn_unused; [[
             A newly allocated list of updated rectangles of the canvas
             ($Eina.Rectangle structs). Free this list with
             \@ref evas_render_updates_free.
diff --git a/src/lib/evas/canvas/evas_grid.eo b/src/lib/evas/canvas/evas_grid.eo
index b060a91..58ba14f 100644
--- a/src/lib/evas/canvas/evas_grid.eo
+++ b/src/lib/evas/canvas/evas_grid.eo
@@ -51,7 +51,7 @@ class Evas.Grid (Efl.Canvas.Group)
               list, but these removals won't be reflected on it.
 
               @since 1.1]]
-            return: free(own(list<Efl.Canvas.Object>), eina_list_free) @warn_unused; [[Iterator to grid children]]
+            return: list<Efl.Canvas.Object> @owned @warn_unused; [[Iterator to grid children]]
          }
       }
       accessor_new @const {
@@ -60,7 +60,7 @@ class Evas.Grid (Efl.Canvas.Group)
            Note: Do not remove or delete objects while walking the list.
 
            @since 1.1]]
-         return: free(own(accessor<Efl.Canvas.Object>), eina_accessor_free) @warn_unused; [[Accessor to children list]]
+         return: accessor<Efl.Canvas.Object> @owned @warn_unused; [[Accessor to children list]]
       }
       clear {
          [[Faster way to remove all child objects from a grid object.
@@ -77,7 +77,7 @@ class Evas.Grid (Efl.Canvas.Group)
            Note: Do not remove or delete objects while walking the list.
 
            @since 1.1]]
-         return: free(own(iterator<Efl.Canvas.Object>), eina_iterator_free) @warn_unused; [[Iterator]]
+         return: iterator<Efl.Canvas.Object> @owned @warn_unused; [[Iterator]]
       }
       add_to {
          [[Create a grid that is child of a given element parent.
diff --git a/src/lib/evas/canvas/evas_table.eo b/src/lib/evas/canvas/evas_table.eo
index 6aafbeb..3736bb4 100644
--- a/src/lib/evas/canvas/evas_table.eo
+++ b/src/lib/evas/canvas/evas_table.eo
@@ -122,7 +122,7 @@ class Evas.Table (Efl.Canvas.Group)
               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: free(own(list<Efl.Canvas.Object>), eina_list_free) @warn_unused; [[Children list]]
+            return: list<Efl.Canvas.Object> @owned @warn_unused; [[Children list]]
          }
       }
       @property child {
@@ -150,14 +150,14 @@ class Evas.Table (Efl.Canvas.Group)
          [[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: free(own(accessor<Efl.Canvas.Object>), eina_accessor_free)
+         return: accessor<Efl.Canvas.Object> @owned
             @warn_unused; [[Accessor to children list]]
       }
       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: free(own(iterator<Efl.Canvas.Object>), eina_iterator_free)
+         return: iterator<Efl.Canvas.Object> @owned
             @warn_unused; [[Iterator to children]]
       }
       add_to {