tasn pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=48bdd7125acca41fb8fcef814e58f918a5229424

commit 48bdd7125acca41fb8fcef814e58f918a5229424
Author: Tom Hacohen <t...@stosb.com>
Date:   Thu Aug 6 14:30:34 2015 +0100

    Eo files: Use Elm.Widget_Item instead of Elm_Object_Item.
    
    This is the correct Eolian type. Elm_Object_Item is dead.
---
 src/lib/elm_colorselector.eo         |  4 ++--
 src/lib/elm_ctxpopup.eo              |  8 ++++----
 src/lib/elm_ctxpopup_item.eo         |  4 ++--
 src/lib/elm_diskselector.eo          |  8 ++++----
 src/lib/elm_diskselector_item.eo     |  4 ++--
 src/lib/elm_flipselector.eo          | 10 ++++-----
 src/lib/elm_flipselector_item.eo     |  4 ++--
 src/lib/elm_gengrid.eo               | 28 ++++++++++++-------------
 src/lib/elm_gengrid_item.eo          |  4 ++--
 src/lib/elm_genlist.eo               | 40 ++++++++++++++++++------------------
 src/lib/elm_genlist_item.eo          |  8 ++++----
 src/lib/elm_hoversel.eo              |  6 +++---
 src/lib/elm_index.eo                 | 18 ++++++++--------
 src/lib/elm_list.eo                  | 32 ++++++++++++++---------------
 src/lib/elm_list_item.eo             |  4 ++--
 src/lib/elm_menu.eo                  | 16 +++++++--------
 src/lib/elm_menu_item.eo             |  6 +++---
 src/lib/elm_multibuttonentry.eo      | 20 +++++++++---------
 src/lib/elm_multibuttonentry_item.eo |  4 ++--
 src/lib/elm_naviframe.eo             | 18 ++++++++--------
 src/lib/elm_popup.eo                 |  2 +-
 src/lib/elm_segment_control.eo       |  8 ++++----
 src/lib/elm_slideshow.eo             | 12 +++++------
 src/lib/elm_toolbar.eo               | 22 ++++++++++----------
 src/lib/elm_toolbar_item.eo          |  4 ++--
 src/lib/elm_widget.eo                |  2 +-
 src/lib/elm_widget_item.eo           |  2 +-
 27 files changed, 149 insertions(+), 149 deletions(-)

diff --git a/src/lib/elm_colorselector.eo b/src/lib/elm_colorselector.eo
index cc036c7..2f90512 100644
--- a/src/lib/elm_colorselector.eo
+++ b/src/lib/elm_colorselector.eo
@@ -84,14 +84,14 @@ class Elm.Colorselector (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action,
 
               @since 1.9]]
 
-            return: Elm_Object_Item *;[[The selected item, or $null if none
+            return: Elm.Widget_Item *;[[The selected item, or $null if none
 selected.]]
          }
       }
       palette_color_add {
          [[Add a new color item to palette.]]
 
-         return: Elm_Object_Item *;[[A new color palette Item.]]
+         return: Elm.Widget_Item *;[[A new color palette Item.]]
          params {
             @in r: int; [[r-value of color]]
             @in g: int; [[g-value of color]]
diff --git a/src/lib/elm_ctxpopup.eo b/src/lib/elm_ctxpopup.eo
index bd89305..7dade89 100644
--- a/src/lib/elm_ctxpopup.eo
+++ b/src/lib/elm_ctxpopup.eo
@@ -143,7 +143,7 @@ class Elm.Ctxpopup (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action)
 
               @since 1.11
             ]]
-            return: Elm_Object_Item *; [[The first item or $null, if it has no 
items (and on
+            return: Elm.Widget_Item *; [[The first item or $null, if it has no 
items (and on
               errors).]]
 
          }
@@ -158,7 +158,7 @@ class Elm.Ctxpopup (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action)
 
               @since 1.1
             ]]
-            return: Elm_Object_Item *; [[The last item or $null, if it has no 
items (and on
+            return: Elm.Widget_Item *; [[The last item or $null, if it has no 
items (and on
               errors).]]
 
          }
@@ -183,7 +183,7 @@ class Elm.Ctxpopup (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action)
 
            See also \@ref elm_object_content_set.
          ]]
-         return: Elm_Object_Item *; [[A handle to the item added or $null, on 
errors.]]
+         return: Elm.Widget_Item *; [[A handle to the item added or $null, on 
errors.]]
 
          params {
             @in label: const(char)*; [[The Label of the new item]]
@@ -202,7 +202,7 @@ class Elm.Ctxpopup (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action)
 
            @since 1.11
          ]]
-         return: Elm_Object_Item *; [[A handle to the item added or $null, on 
errors.]]
+         return: Elm.Widget_Item *; [[A handle to the item added or $null, on 
errors.]]
 
          params {
             @in label: const(char)*; [[The Label of the new item]]
diff --git a/src/lib/elm_ctxpopup_item.eo b/src/lib/elm_ctxpopup_item.eo
index abbbe49..f42979f 100644
--- a/src/lib/elm_ctxpopup_item.eo
+++ b/src/lib/elm_ctxpopup_item.eo
@@ -13,7 +13,7 @@ class Elm.Ctxpopup_Item(Elm.Widget_Item)
             ]]
          }
          values {
-              item: Elm_Object_Item *; [[The item before the object in its 
parent's list. If there is no previous item for $ it or there's an error, $null 
is returned.]]
+              item: Elm.Widget_Item *; [[The item before the object in its 
parent's list. If there is no previous item for $ it or there's an error, $null 
is returned.]]
          }
       }
       @property next {
@@ -27,7 +27,7 @@ class Elm.Ctxpopup_Item(Elm.Widget_Item)
             ]]
          }
          values {
-              item: Elm_Object_Item *; [[The item after the object in its 
parent's list. If there is no previous item for $ it or there's an error, $null 
is returned.]]
+              item: Elm.Widget_Item *; [[The item after the object in its 
parent's list. If there is no previous item for $ it or there's an error, $null 
is returned.]]
          }
       }
       init {
diff --git a/src/lib/elm_diskselector.eo b/src/lib/elm_diskselector.eo
index d0d4d51..5222f7d 100644
--- a/src/lib/elm_diskselector.eo
+++ b/src/lib/elm_diskselector.eo
@@ -94,7 +94,7 @@ class Elm.Diskselector (Elm.Widget, Elm_Interface_Scrollable,
               See also @.item_append,
               @.items.get.
             ]]
-            return: Elm_Object_Item *; [[The first item, or $null if none.]]
+            return: Elm.Widget_Item *; [[The first item, or $null if none.]]
          }
       }
       @property items {
@@ -118,7 +118,7 @@ class Elm.Diskselector (Elm.Widget, 
Elm_Interface_Scrollable,
               See also @.item_append,
               @.items.get.
             ]]
-            return: Elm_Object_Item *; [[The last item, or $null if none.]]
+            return: Elm.Widget_Item *; [[The last item, or $null if none.]]
          }
       }
       @property selected_item {
@@ -135,7 +135,7 @@ class Elm.Diskselector (Elm.Widget, 
Elm_Interface_Scrollable,
               apply on the selected item. More details on
               @.side_text_max_length.set.
             ]]
-            return: Elm_Object_Item *; [[The selected diskselector item.]]
+            return: Elm.Widget_Item *; [[The selected diskselector item.]]
          }
       }
       item_append {
@@ -174,7 +174,7 @@ class Elm.Diskselector (Elm.Widget, 
Elm_Interface_Scrollable,
             * elm_diskselector_item_append(disk, "label", ic, NULL, NULL);
             * @endcode
             */
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in label: const(char)*; [[The label of the diskselector item.]]
             @in icon: Evas.Object * @optional; [[The icon object to use at 
left side of the item. An
diff --git a/src/lib/elm_diskselector_item.eo b/src/lib/elm_diskselector_item.eo
index eedcfb0..c80a7d5 100644
--- a/src/lib/elm_diskselector_item.eo
+++ b/src/lib/elm_diskselector_item.eo
@@ -17,7 +17,7 @@ class Elm.Diskselector_Item(Elm.Widget_Item)
                     ]]
                 }
                 values {
-                     item: Elm_Object_Item *; [[The item before $item, or 
$null if none or on failure.]]
+                     item: Elm.Widget_Item *; [[The item before $item, or 
$null if none or on failure.]]
                 }
            }
            @property next {
@@ -35,7 +35,7 @@ class Elm.Diskselector_Item(Elm.Widget_Item)
                      ]]
                 }
                 values {
-                     item: Elm_Object_Item *; [[The item after $item, or $null 
if none or on failure.]]
+                     item: Elm.Widget_Item *; [[The item after $item, or $null 
if none or on failure.]]
                 }
            }
            @property selected {
diff --git a/src/lib/elm_flipselector.eo b/src/lib/elm_flipselector.eo
index 4260e3f..e855927 100644
--- a/src/lib/elm_flipselector.eo
+++ b/src/lib/elm_flipselector.eo
@@ -64,7 +64,7 @@ class Elm.Flipselector (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action,
               See also @.item_append,
               @.last_item.get.
             ]]
-            return: Elm_Object_Item *; [[The first item or $null, if it has no 
items (and on
+            return: Elm.Widget_Item *; [[The first item or $null, if it has no 
items (and on
             errors).]]
 
          }
@@ -77,7 +77,7 @@ class Elm.Flipselector (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action,
               See also @.item_prepend,
               @.first_item.get.
             ]]
-            return: Elm_Object_Item *; [[The last item or $null, if it has no 
items (and on
+            return: Elm.Widget_Item *; [[The last item or $null, if it has no 
items (and on
             errors).]]
 
          }
@@ -85,7 +85,7 @@ class Elm.Flipselector (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action,
       @property selected_item {
          get {
             [[Get the currently selected item in a flip selector widget.]]
-            return: Elm_Object_Item *; [[The selected item or $null, if the 
widget has no items
+            return: Elm.Widget_Item *; [[The selected item or $null, if the 
widget has no items
               (and on errors).]]
 
          }
@@ -105,7 +105,7 @@ class Elm.Flipselector (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action,
            determined by the widget's theme. Strings larger than
            that value are going to be truncated.
          ]]
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in label: const(char)*; [[The (text) label of the new item.]]
             @in func: Evas_Smart_Cb @optional; [[Convenience callback function 
to take place when
@@ -136,7 +136,7 @@ class Elm.Flipselector (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action,
            determined by the widget's theme. Strings larger than
            that value are going to be truncated.
          ]]
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in label: const(char)*; [[The (text) label of the new item.]]
             @in func: Evas_Smart_Cb @optional; [[Convenience callback function 
to take place when
diff --git a/src/lib/elm_flipselector_item.eo b/src/lib/elm_flipselector_item.eo
index 3628460..640169d 100644
--- a/src/lib/elm_flipselector_item.eo
+++ b/src/lib/elm_flipselector_item.eo
@@ -33,7 +33,7 @@ class Elm.Flipselector_Item(Elm.Widget_Item)
 
               See also @.next_get.
             ]]
-            return: Elm_Object_Item *; [[The item before the $item, in its 
parent's list. If there is no previous item for $item or there's an error, 
$null is returned.]]
+            return: Elm.Widget_Item *; [[The item before the $item, in its 
parent's list. If there is no previous item for $item or there's an error, 
$null is returned.]]
         }
       next_get @const {
             [[Get the item after $item in a flip selector widget's
@@ -41,7 +41,7 @@ class Elm.Flipselector_Item(Elm.Widget_Item)
 
               See also @.prev_get.
             ]]
-             return: Elm_Object_Item *; [[The item after the $item, in its 
parent's list. If there is no next item for $item or there's an error, $null is 
returned.]]
+             return: Elm.Widget_Item *; [[The item after the $item, in its 
parent's list. If there is no next item for $item or there's an error, $null is 
returned.]]
         }
    }
    implements {
diff --git a/src/lib/elm_gengrid.eo b/src/lib/elm_gengrid.eo
index 1642210..11e7a5d 100644
--- a/src/lib/elm_gengrid.eo
+++ b/src/lib/elm_gengrid.eo
@@ -357,7 +357,7 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
             useful. For that case, see elm_gengrid_selected_items_get().
 
             @ingroup Gengrid */
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       @property realized_items {
@@ -393,7 +393,7 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
             @see elm_gengrid_last_item_get()
 
             @ingroup Gengrid */
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       @property selected_items {
@@ -413,7 +413,7 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
             @see elm_gengrid_selected_item_get()
 
             @ingroup Gengrid */
-            return: const(list<Elm_Object_Item *>)*;
+            return: const(list<Elm.Widget_Item *>)*;
          }
       }
       @property last_item {
@@ -430,7 +430,7 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
             @see elm_gengrid_first_item_get()
 
             @ingroup Gengrid */
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       @property wheel_disabled {
@@ -479,11 +479,11 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
 
          @ingroup Gengrid */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in itc: const(Elm_Gengrid_Item_Class)*; /*@ The item class for 
the item. */
             @in data: const(void)*; /*@ The item data. */
-            @in relative: Elm_Object_Item *; /*@ The item to place this new 
one before. */
+            @in relative: Elm.Widget_Item *; /*@ The item to place this new 
one before. */
             @in func: Evas_Smart_Cb @optional; /*@ Convenience function called 
when the item is
             selected. */
             @in func_data: const(void)* @optional; /*@ Data to be passed to @p 
func. */
@@ -520,11 +520,11 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
 
          @ingroup Gengrid */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in itc: const(Elm_Gengrid_Item_Class)*; /*@ The item class for 
the item. */
             @in data: const(void)*; /*@ The item data. */
-            @in relative: Elm_Object_Item *; /*@ The item to place this new 
one after. */
+            @in relative: Elm.Widget_Item *; /*@ The item to place this new 
one after. */
             @in func: Evas_Smart_Cb @optional; /*@ Convenience function called 
when the item is
             selected. */
             @in func_data: const(void)* @optional; /*@ Data to be passed to @p 
func. */
@@ -562,7 +562,7 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
          the gengrid.
 
          @ingroup Gengrid */
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in x: Evas.Coord; /*@ The input x coordinate */
             @in y: Evas.Coord; /*@ The input y coordinate */
@@ -585,7 +585,7 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
 
          @ingroup Gengrid */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in itc: const(Elm_Gengrid_Item_Class)*; /*@ The item class for 
the item. */
             @in data: const(void)*; /*@ The item data. */
@@ -609,7 +609,7 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
 
          @ingroup Gengrid */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in itc: const(Elm_Gengrid_Item_Class)*; /*@ The item class for 
the item. */
             @in data: const(void)*; /*@ The item data. */
@@ -648,7 +648,7 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
 
          @ingroup Gengrid */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in itc: const(Elm_Gengrid_Item_Class)*; /*@ The item class for 
the item. */
             @in data: const(void)*; /*@ The item data. */
@@ -674,9 +674,9 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
          @ingroup Gengrid
          @since 1.11 */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
-            @in item_to_search_from: Elm_Object_Item * @optional; /*@ Pointer 
to item to start search from. If NULL search will be started from the first 
item of the gengrid. */
+            @in item_to_search_from: Elm.Widget_Item * @optional; /*@ Pointer 
to item to start search from. If NULL search will be started from the first 
item of the gengrid. */
             @in part_name: const(char) *; /*@ Name of the TEXT part of gengrid 
item to search string in. */
             @in pattern: const(char) *; /*@ The search pattern. */
             @in flags: Elm_Glob_Match_Flags; /*@ Search flags */
diff --git a/src/lib/elm_gengrid_item.eo b/src/lib/elm_gengrid_item.eo
index f32b6fb..66c2b82 100644
--- a/src/lib/elm_gengrid_item.eo
+++ b/src/lib/elm_gengrid_item.eo
@@ -42,7 +42,7 @@ class Elm.Gengrid_Item(Elm.Widget_Item)
                       */
                 }
                 values {
-                     item: Elm_Object_Item *; /*@ @return The item before @p 
item, or @c NULL if there's none (and on errors) */
+                     item: Elm.Widget_Item *; /*@ @return The item before @p 
item, or @c NULL if there's none (and on errors) */
                 }
            }
            @property next {
@@ -60,7 +60,7 @@ class Elm.Gengrid_Item(Elm.Widget_Item)
                       */
                 }
                 values {
-                     item: Elm_Object_Item *; /*@ @return The item after @p 
item, or @c NULL if there's none (and on errors) */
+                     item: Elm.Widget_Item *; /*@ @return The item after @p 
item, or @c NULL if there's none (and on errors) */
                 }
            }
            @property selected {
diff --git a/src/lib/elm_genlist.eo b/src/lib/elm_genlist.eo
index e00fe02..e46737d 100644
--- a/src/lib/elm_genlist.eo
+++ b/src/lib/elm_genlist.eo
@@ -391,7 +391,7 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable, 
Evas.Clickable_Interfac
             @see elm_genlist_mode_get()
 
             @ingroup Genlist */
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       @property selected_item {
@@ -411,7 +411,7 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable, 
Evas.Clickable_Interfac
             @see elm_genlist_selected_items_get()
 
             @ingroup Genlist */
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       @property first_item {
@@ -424,7 +424,7 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable, 
Evas.Clickable_Interfac
             @return The first item, or NULL if none
 
             @ingroup Genlist */
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       @property realized_items {
@@ -467,7 +467,7 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable, 
Evas.Clickable_Interfac
             @see elm_genlist_selected_item_get()
 
             @ingroup Genlist */
-            return: const(list<Elm_Object_Item *>)*;
+            return: const(list<Elm.Widget_Item *>)*;
          }
       }
       @property last_item {
@@ -480,7 +480,7 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable, 
Evas.Clickable_Interfac
             @return The last item, or NULL if none
 
             @ingroup Genlist */
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       item_insert_before {
@@ -499,12 +499,12 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable, 
Evas.Clickable_Interfac
 
          @ingroup Genlist */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in itc: const(Elm_Genlist_Item_Class)*; /*@ The item class for 
the item */
             @in data: const(void)*; /*@ The item data */
-            @in parent: Elm_Object_Item * @nullable; /*@ The parent item, or 
NULL if none */
-            @in before_it: Elm_Object_Item *; /*@ The item to place this new 
one before. */
+            @in parent: Elm.Widget_Item * @nullable; /*@ The parent item, or 
NULL if none */
+            @in before_it: Elm.Widget_Item *; /*@ The item to place this new 
one before. */
             @in type: Elm_Genlist_Item_Type; /*@ Item type */
             @in func: Evas_Smart_Cb @optional; /*@ Convenience function called 
when the item is selected */
             @in func_data: const(void)* @optional; /*@ Data passed to @p func 
above. */
@@ -542,12 +542,12 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable, 
Evas.Clickable_Interfac
 
          @ingroup Genlist */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in itc: const(Elm_Genlist_Item_Class)*; /*@ The item class for 
the item */
             @in data: const(void)*; /*@ The item data */
-            @in parent: Elm_Object_Item * @nullable; /*@ The parent item, or 
NULL if none */
-            @in after_it: Elm_Object_Item *; /*@ The item to place this new 
one after. */
+            @in parent: Elm.Widget_Item * @nullable; /*@ The parent item, or 
NULL if none */
+            @in after_it: Elm.Widget_Item *; /*@ The item to place this new 
one after. */
             @in type: Elm_Genlist_Item_Type; /*@ Item type */
             @in func: Evas_Smart_Cb @optional; /*@ Convenience function called 
when the item is selected */
             @in func_data: const(void)* @optional; /*@ Data passed to @p func 
above. */
@@ -570,7 +570,7 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable, 
Evas.Clickable_Interfac
          the genlist.
 
          @ingroup Genlist */
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in x: Evas.Coord; /*@ The input x coordinate */
             @in y: Evas.Coord; /*@ The input y coordinate */
@@ -604,11 +604,11 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable, 
Evas.Clickable_Interfac
 
          @ingroup Genlist */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in itc: const(Elm_Genlist_Item_Class)*; /*@ The item class for 
the item */
             @in data: const(void)*; /*@ The item data */
-            @in parent: Elm_Object_Item * @nullable; /*@ The parent item, or 
NULL if none */
+            @in parent: Elm.Widget_Item * @nullable; /*@ The parent item, or 
NULL if none */
             @in type: Elm_Genlist_Item_Type; /*@ Item type */
             @in func: Evas_Smart_Cb @optional; /*@ Convenience function called 
when the item is selected */
             @in func_data: const(void)* @optional; /*@ Data passed to @p func 
above. */
@@ -641,11 +641,11 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable, 
Evas.Clickable_Interfac
 
          @ingroup Genlist */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in itc: const(Elm_Genlist_Item_Class)*; /*@ The item class for 
the item */
             @in data: const(void)*; /*@ The item data */
-            @in parent: Elm_Object_Item * @nullable; /*@ The parent item, or 
NULL if none */
+            @in parent: Elm.Widget_Item * @nullable; /*@ The parent item, or 
NULL if none */
             @in type: Elm_Genlist_Item_Type; /*@ Item type */
             @in func: Evas_Smart_Cb @optional; /*@ Convenience function called 
when the item is selected */
             @in func_data: const(void)* @optional; /*@ Data passed to @p func 
above. */
@@ -668,11 +668,11 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable, 
Evas.Clickable_Interfac
 
          @ingroup Genlist */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in itc: const(Elm_Genlist_Item_Class)*; /*@ The item class for 
the item */
             @in data: const(void)*; /*@ The item data */
-            @in parent: Elm_Object_Item * @nullable; /*@ The parent item, or 
NULL if none */
+            @in parent: Elm.Widget_Item * @nullable; /*@ The parent item, or 
NULL if none */
             @in type: Elm_Genlist_Item_Type; /*@ Item type */
             @in comp: Eina_Compare_Cb; /*@ The function called for the sort */
             @in func: Evas_Smart_Cb @optional; /*@ Convenience function called 
when item selected */
@@ -695,9 +695,9 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable, 
Evas.Clickable_Interfac
          @ingroup Genlist
          @since 1.11 */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
-            @in item_to_search_from: Elm_Object_Item * @optional; /*@ Pointer 
to item to start search from. If NULL search will be started from the first 
item of the genlist. */
+            @in item_to_search_from: Elm.Widget_Item * @optional; /*@ Pointer 
to item to start search from. If NULL search will be started from the first 
item of the genlist. */
             @in part_name: const(char)*; /*@ Name of the TEXT part of genlist 
item to search string in. */
             @in pattern: const(char)*; /*@ The search pattern. */
             @in flags: Elm_Glob_Match_Flags; /*@ Search flags */
diff --git a/src/lib/elm_genlist_item.eo b/src/lib/elm_genlist_item.eo
index d78a06d..94e4941 100644
--- a/src/lib/elm_genlist_item.eo
+++ b/src/lib/elm_genlist_item.eo
@@ -55,7 +55,7 @@ class Elm.Genlist_Item(Elm.Widget_Item)
                       */
                 }
                 values {
-                     item: Elm_Object_Item *; /*@ @return The item before @p 
item, or @c NULL if there's none (and on errors) */
+                     item: Elm.Widget_Item *; /*@ @return The item before @p 
item, or @c NULL if there's none (and on errors) */
                 }
            }
            @property next {
@@ -73,7 +73,7 @@ class Elm.Genlist_Item(Elm.Widget_Item)
                       */
                 }
                 values {
-                     item: Elm_Object_Item *; /*@ @return The item after @p 
item, or @c NULL if there's none (and on errors) */
+                     item: Elm.Widget_Item *; /*@ @return The item after @p 
item, or @c NULL if there's none (and on errors) */
                 }
            }
            @property parent {
@@ -88,7 +88,7 @@ class Elm.Genlist_Item(Elm.Widget_Item)
                       */
                 }
                 values {
-                     item: Elm_Object_Item *; /*@ @return The parent of the 
item or @c NULL if it has no parent. */
+                     item: Elm.Widget_Item *; /*@ @return The parent of the 
item or @c NULL if it has no parent. */
                 }
            }
            @property subitems {
@@ -103,7 +103,7 @@ class Elm.Genlist_Item(Elm.Widget_Item)
                       */
                 }
                 values {
-                     subitems: const (list<Elm_Object_Item *>) *; /*@ @return 
The list of subitems, @c NULL on error */
+                     subitems: const (list<Elm.Widget_Item *>) *; /*@ @return 
The list of subitems, @c NULL on error */
                 }
            }
            @property selected {
diff --git a/src/lib/elm_hoversel.eo b/src/lib/elm_hoversel.eo
index 24e6a24..59b9bee 100644
--- a/src/lib/elm_hoversel.eo
+++ b/src/lib/elm_hoversel.eo
@@ -73,12 +73,12 @@ class Elm.Hoversel (Elm.Button, Evas.Selectable_Interface,
             /*@
             @brief Get the list of items within the given hoversel.
 
-            @return Returns a list of Elm_Object_Item
+            @return Returns a list of Elm.Widget_Item
 
             @see elm_hoversel_item_add()
 
             @ingroup Hoversel */
-            return: const(list<Elm_Object_Item *>)*;
+            return: const(list<Elm.Widget_Item *>)*;
          }
       }
       @property scroll_enabled {
@@ -144,7 +144,7 @@ class Elm.Hoversel (Elm.Button, Evas.Selectable_Interface,
 
          @ingroup Hoversel */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in label: const(char)* @optional; /*@ The text label to use for 
the item (NULL if not desired) */
             @in icon_file: const(char)* @optional; /*@ An image file path on 
disk to use for the icon or standard
diff --git a/src/lib/elm_index.eo b/src/lib/elm_index.eo
index 05c897c..3db0960 100644
--- a/src/lib/elm_index.eo
+++ b/src/lib/elm_index.eo
@@ -217,7 +217,7 @@ class Elm.Index (Elm.Layout, Evas.Clickable_Interface, 
Evas.Selectable_Interface
 
          @ingroup Index */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in letter: const(char)*; /*@ Letter under which the item should 
be indexed */
             @in func: Evas_Smart_Cb @optional; /*@ The function to call when 
the item is selected. */
@@ -252,9 +252,9 @@ class Elm.Index (Elm.Layout, Evas.Clickable_Interface, 
Evas.Selectable_Interface
 
          @ingroup Index */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
-            @in after: Elm_Object_Item *; /*@ The index item to insert after. 
*/
+            @in after: Elm.Widget_Item *; /*@ The index item to insert after. 
*/
             @in letter: const(char)*; /*@ Letter under which the item should 
be indexed */
             @in func: Evas_Smart_Cb @optional; /*@ The function to call when 
the item is clicked. */
             @in data: const(void)* @optional; /*@ The item data to set for the 
index's item */
@@ -268,7 +268,7 @@ class Elm.Index (Elm.Layout, Evas.Clickable_Interface, 
Evas.Selectable_Interface
 
          @ingroup Index */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in data: const(void)*; /*@ The item data pointed to by the 
desired index item */
          }
@@ -291,9 +291,9 @@ class Elm.Index (Elm.Layout, Evas.Clickable_Interface, 
Evas.Selectable_Interface
 
          @ingroup Index */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
-            @in before: Elm_Object_Item *; /*@ The index item to insert after. 
*/
+            @in before: Elm.Widget_Item *; /*@ The index item to insert after. 
*/
             @in letter: const(char)*; /*@ Letter under which the item should 
be indexed */
             @in func: Evas_Smart_Cb @optional; /*@ The function to call when 
the item is clicked. */
             @in data: const(void)* @optional; /*@ The item data to set for the 
index's item */
@@ -314,7 +314,7 @@ class Elm.Index (Elm.Layout, Evas.Clickable_Interface, 
Evas.Selectable_Interface
 
          @ingroup Index */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in letter: const(char)*; /*@ Letter under which the item should 
be indexed */
             @in func: Evas_Smart_Cb @optional; /*@ The function to call when 
the item is selected. */
@@ -328,7 +328,7 @@ class Elm.Index (Elm.Layout, Evas.Clickable_Interface, 
Evas.Selectable_Interface
          @return The last item @b selected on @p obj (or @c NULL, on errors).
 
          @ingroup Index */
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in level: int; /*@ @c 0 or @c 1, the currently implemented 
levels. */
          }
@@ -349,7 +349,7 @@ class Elm.Index (Elm.Layout, Evas.Clickable_Interface, 
Evas.Selectable_Interface
 
          @ingroup Index */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in letter: const(char)*; /*@ Letter under which the item should 
be indexed */
             @in func: Evas_Smart_Cb @optional; /*@ The function to call when 
the item is clicked. */
diff --git a/src/lib/elm_list.eo b/src/lib/elm_list.eo
index 3f03be2..4ca446b 100644
--- a/src/lib/elm_list.eo
+++ b/src/lib/elm_list.eo
@@ -253,7 +253,7 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
             @see elm_list_selected_items_get()
 
             @ingroup List */
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       @property items {
@@ -261,7 +261,7 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
             /*@
             Get a list of all the list items.
 
-            @return A @c list of list items, #Elm_Object_Item,
+            @return A @c list of list items, #Elm.Widget_Item,
             or @c NULL on failure.
 
             @see elm_list_item_append()
@@ -269,7 +269,7 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
             @see elm_list_clear()
 
             @ingroup List */
-            return: const(list<Elm_Object_Item *>)*;
+            return: const(list<Elm.Widget_Item *>)*;
          }
       }
       @property first_item {
@@ -282,7 +282,7 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
             @return The first item, or NULL if none
 
             @ingroup List */
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       @property selected_items {
@@ -290,7 +290,7 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
             /*@
             Return a list of the currently selected list items.
 
-            @return An @c list of list items, #Elm_Object_Item,
+            @return An @c list of list items, #Elm.Widget_Item,
             or @c NULL on failure.
 
             Multiple items can be selected if multi select is enabled. It can 
be
@@ -300,7 +300,7 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
             @see elm_list_multi_select_set()
 
             @ingroup List */
-            return: const(list<Elm_Object_Item *>)*;
+            return: const(list<Elm.Widget_Item *>)*;
          }
       }
       @property last_item {
@@ -313,7 +313,7 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
             @return The last item, or NULL if none
 
             @ingroup List */
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       item_insert_before {
@@ -350,9 +350,9 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
 
          @ingroup List */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
-            @in before: Elm_Object_Item *; /*@ The list item to insert before. 
*/
+            @in before: Elm.Widget_Item *; /*@ The list item to insert before. 
*/
             @in label: const(char)*; /*@ The label of the list item. */
             @in icon: Evas.Object * @optional; /*@ The icon object to use for 
the left side of the item. An
             icon can be any Evas object, but usually it is an icon created
@@ -415,9 +415,9 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
 
          @ingroup List */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
-            @in after: Elm_Object_Item *; /*@ The list item to insert after. */
+            @in after: Elm.Widget_Item *; /*@ The list item to insert after. */
             @in label: const(char)*; /*@ The label of the list item. */
             @in icon: Evas.Object * @optional; /*@ The icon object to use for 
the left side of the item. An
             icon can be any Evas object, but usually it is an icon created
@@ -446,7 +446,7 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
 
 
          @ingroup List */
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in x: Evas.Coord; /*@ The input x coordinate */
             @in y: Evas.Coord; /*@ The input y coordinate */
@@ -497,7 +497,7 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
 
          @ingroup List */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in label: const(char)*; /*@ The label of the list item. */
             @in icon: Evas.Object * @optional; /*@ The icon object to use for 
the left side of the item. An
@@ -543,7 +543,7 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
 
          @ingroup List */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in label: const(char)*; /*@ The label of the list item. */
             @in icon: Evas.Object * @optional; /*@ The icon object to use for 
the left side of the item. An
@@ -603,7 +603,7 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
 
          @ingroup List */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in label: const(char)*; /*@ The label of the list item. */
             @in icon: Evas.Object * @optional; /*@ The icon object to use for 
the left side of the item. An
@@ -614,7 +614,7 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
             @in func: Evas_Smart_Cb @optional; /*@ The function to call when 
the item is clicked. */
             @in data: const(void)* @optional; /*@ The data to associate with 
the item for related callbacks. */
             @in cmp_func: Eina_Compare_Cb; /*@ The comparing function to be 
used to sort list
-            items <b>by #Elm_Object_Item item handles</b>. This function will
+            items <b>by #Elm.Widget_Item item handles</b>. This function will
             receive two items and compare them, returning a non-negative 
integer
             if the second item should be place after the first, or negative 
value
             if should be placed before. */
diff --git a/src/lib/elm_list_item.eo b/src/lib/elm_list_item.eo
index 50d121a..92b8d3f 100644
--- a/src/lib/elm_list_item.eo
+++ b/src/lib/elm_list_item.eo
@@ -64,7 +64,7 @@ class Elm.List_Item(Elm.Widget_Item)
                      legacy: elm_list_item_prev;
                 }
                 values {
-                     item: Elm_Object_Item *; [[The item before or $null.]]
+                     item: Elm.Widget_Item *; [[The item before or $null.]]
                 }
            }
            @property next {
@@ -76,7 +76,7 @@ class Elm.List_Item(Elm.Widget_Item)
                      legacy: elm_list_item_next;
                 }
                 values {
-                     item: Elm_Object_Item *; [[The item after or $null.]]
+                     item: Elm.Widget_Item *; [[The item after or $null.]]
                 }
            }
            /*      init { FIXME
diff --git a/src/lib/elm_menu.eo b/src/lib/elm_menu.eo
index 71e19d8..13bdaa0 100644
--- a/src/lib/elm_menu.eo
+++ b/src/lib/elm_menu.eo
@@ -5,25 +5,25 @@ class Elm.Menu (Elm.Widget, Evas.Clickable_Interface)
       @property selected_item {
          get {
             [[Get the selected item in the menu.]]
-            return: Elm_Object_Item *; [[The selected item or $null.]]
+            return: Elm.Widget_Item *; [[The selected item or $null.]]
          }
       }
       @property items {
          get {
             [[Returns a list of the item's items.]]
-            return: const(list<Elm_Object_Item *>)*;
+            return: const(list<Elm.Widget_Item *>)*;
          }
       }
       @property first_item {
          get {
             [[Get the first item in the menu.]]
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       @property last_item {
          get {
             [[Get the last item in the menu.]]
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       move {
@@ -43,9 +43,9 @@ class Elm.Menu (Elm.Widget, Evas.Clickable_Interface)
 
            Note: This function does not accept relative icon path.
          ]]
-         return: Elm_Object_Item *; [[The new menu item.]]
+         return: Elm.Widget_Item *; [[The new menu item.]]
          params {
-            @in parent: Elm_Object_Item * @optional; [[The parent menu item 
(optional).]]
+            @in parent: Elm.Widget_Item * @optional; [[The parent menu item 
(optional).]]
             @in icon: const(char)* @optional; [[An icon display on the item. 
The icon will be destroyed by the menu.]]
             @in label: const(char)*; [[The label of the item.]]
             @in func: Evas_Smart_Cb @optional; [[Function called when the user 
select the item.]]
@@ -60,9 +60,9 @@ class Elm.Menu (Elm.Widget, Evas.Clickable_Interface)
       }
       item_separator_add {
          [[Add a separator item to menu $obj under $parent.]]
-         return: Elm_Object_Item *; [[The created item or $null.]]
+         return: Elm.Widget_Item *; [[The created item or $null.]]
          params {
-            @in parent: Elm_Object_Item *; [[The item to add the separator 
under.]]
+            @in parent: Elm.Widget_Item *; [[The item to add the separator 
under.]]
          }
       }
    }
diff --git a/src/lib/elm_menu_item.eo b/src/lib/elm_menu_item.eo
index 36f0ec2..0a95bb8 100644
--- a/src/lib/elm_menu_item.eo
+++ b/src/lib/elm_menu_item.eo
@@ -35,11 +35,11 @@ class Elm.Menu_Item(Elm.Widget_Item)
         }
       prev_get @const {
             [[Get the previous item in the menu.]]
-            return: Elm_Object_Item*;
+            return: Elm.Widget_Item*;
         }
       next_get @const {
              [[Get the next item in the menu.]]
-             return: Elm_Object_Item*;
+             return: Elm.Widget_Item*;
         }
       index_get @const {
              [[Get the next item in the menu.]]
@@ -56,7 +56,7 @@ class Elm.Menu_Item(Elm.Widget_Item)
         }
      subitems_get @const {
              [[Returns a list of $item's subitems.]]
-             return: const (list<Elm_Object_Item *>) *; [[a list of $item's 
subitems]]
+             return: const (list<Elm.Widget_Item *>) *; [[a list of $item's 
subitems]]
         }
      is_separator @const {
              [[Returns whether $item is a separator.]]
diff --git a/src/lib/elm_multibuttonentry.eo b/src/lib/elm_multibuttonentry.eo
index f10b9b0..261f158 100644
--- a/src/lib/elm_multibuttonentry.eo
+++ b/src/lib/elm_multibuttonentry.eo
@@ -77,7 +77,7 @@ class Elm.Multibuttonentry (Elm.Layout)
             @return The list of items, or NULL if none
 
             @ingroup Multibuttonentry */
-            return: const(list<Elm_Object_Item *>)*;
+            return: const(list<Elm.Widget_Item *>)*;
          }
       }
       @property first_item {
@@ -88,7 +88,7 @@ class Elm.Multibuttonentry (Elm.Layout)
             @return The first item, or NULL if none
 
             @ingroup Multibuttonentry */
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       @property last_item {
@@ -99,7 +99,7 @@ class Elm.Multibuttonentry (Elm.Layout)
             @return The last item, or NULL if none
 
             @ingroup Multibuttonentry */
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       @property entry {
@@ -121,7 +121,7 @@ class Elm.Multibuttonentry (Elm.Layout)
             @return The selected item, or NULL if none
 
             @ingroup Multibuttonentry */
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       item_prepend {
@@ -134,7 +134,7 @@ class Elm.Multibuttonentry (Elm.Layout)
 
          @ingroup Multibuttonentry */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in label: const(char)*; /*@ The label of new item */
             @in func: Evas_Smart_Cb @optional; /*@ The callback function to be 
invoked when this item is pressed. */
@@ -173,9 +173,9 @@ class Elm.Multibuttonentry (Elm.Layout)
 
          @ingroup Multibuttonentry */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
-            @in before: Elm_Object_Item *; /*@ The item before which to add it 
*/
+            @in before: Elm.Widget_Item *; /*@ The item before which to add it 
*/
             @in label: const(char)*; /*@ The label of new item */
             @in func: Evas_Smart_Cb @optional; /*@ The callback function to be 
invoked when this item is pressed. */
             @in data: void * @optional; /*@ The pointer to the data to be 
attached */
@@ -191,7 +191,7 @@ class Elm.Multibuttonentry (Elm.Layout)
 
          @ingroup Multibuttonentry */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in label: const(char)*; /*@ The label of new item */
             @in func: Evas_Smart_Cb @optional; /*@ The callback function to be 
invoked when this item is pressed. */
@@ -241,9 +241,9 @@ class Elm.Multibuttonentry (Elm.Layout)
 
          @ingroup Multibuttonentry */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
-            @in after: Elm_Object_Item *; /*@ The item after which to add it */
+            @in after: Elm.Widget_Item *; /*@ The item after which to add it */
             @in label: const(char)*; /*@ The label of new item */
             @in func: Evas_Smart_Cb @optional; /*@ The callback function to be 
invoked when this item is pressed. */
             @in data: void * @optional; /*@ The pointer to the data to be 
attached */
diff --git a/src/lib/elm_multibuttonentry_item.eo 
b/src/lib/elm_multibuttonentry_item.eo
index abaf450..58368a2 100644
--- a/src/lib/elm_multibuttonentry_item.eo
+++ b/src/lib/elm_multibuttonentry_item.eo
@@ -14,11 +14,11 @@ class Elm.Multibuttonentry_Item(Elm.Widget_Item)
         }
         prev_get @const {
              [[Get the previous item in the multibuttonentry]]
-             return: Elm_Object_Item *; [[The item before the item]]
+             return: Elm.Widget_Item *; [[The item before the item]]
         }
         next_get @const {
              [[Get the next item in the multibuttonentry]]
-             return: Elm_Object_Item *; [[The item after the item]]
+             return: Elm.Widget_Item *; [[The item after the item]]
         }
    }
    implements {
diff --git a/src/lib/elm_naviframe.eo b/src/lib/elm_naviframe.eo
index aa7ab07..9741d5f 100644
--- a/src/lib/elm_naviframe.eo
+++ b/src/lib/elm_naviframe.eo
@@ -89,12 +89,12 @@ class Elm.Naviframe (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action)
             /*@
             @brief Get a list of all the naviframe items.
 
-            @return A list of naviframe items, #Elm_Object_Item,
+            @return A list of naviframe items, #Elm.Widget_Item,
             or @c NULL on failure.
             @note The returned list MUST be freed.
 
             @ingroup Naviframe */
-            return: free(own(list<Elm_Object_Item *> *), eina_list_free) 
@warn_unused;
+            return: free(own(list<Elm.Widget_Item *> *), eina_list_free) 
@warn_unused;
          }
       }
       @property top_item {
@@ -106,7 +106,7 @@ class Elm.Naviframe (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action)
             empty
 
             @ingroup Naviframe */
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       @property bottom_item {
@@ -118,7 +118,7 @@ class Elm.Naviframe (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action)
             empty
 
             @ingroup Naviframe */
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       item_pop {
@@ -157,9 +157,9 @@ class Elm.Naviframe (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action)
 
          @ingroup Naviframe */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
-            @in before: Elm_Object_Item *; /*@ The naviframe item to insert 
before. */
+            @in before: Elm.Widget_Item *; /*@ The naviframe item to insert 
before. */
             @in title_label: const(char)* @optional; /*@ The label in the 
title area. The name of the title
             label part is "elm.text.title" */
             @in prev_btn: Evas.Object * @nullable; /*@ The button to go to the 
previous item. If it is NULL,
@@ -191,7 +191,7 @@ class Elm.Naviframe (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action)
 
          @ingroup Naviframe */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in title_label: const(char)* @optional; /*@ The label in the 
title area. The name of the title
             label part is "elm.text.title" */
@@ -234,9 +234,9 @@ class Elm.Naviframe (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action)
 
          @ingroup Naviframe */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
-            @in after: Elm_Object_Item *; /*@ The naviframe item to insert 
after. */
+            @in after: Elm.Widget_Item *; /*@ The naviframe item to insert 
after. */
             @in title_label: const(char)* @optional; /*@ The label in the 
title area. The name of the title
             label part is "elm.text.title" */
             @in prev_btn: Evas.Object * @nullable; /*@ The button to go to the 
previous item. If it is NULL,
diff --git a/src/lib/elm_popup.eo b/src/lib/elm_popup.eo
index e83a9b3..dfd68c9 100644
--- a/src/lib/elm_popup.eo
+++ b/src/lib/elm_popup.eo
@@ -170,7 +170,7 @@ class Elm.Popup (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action)
          of the content area is deleted. At a time, only one of content, 
content-text
          and item(s) can be there in a popup content area. */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in label: const(char)*; /*@ The Label of the new item */
             @in icon: Evas.Object * @optional; /*@ Icon to be set on new item 
*/
diff --git a/src/lib/elm_segment_control.eo b/src/lib/elm_segment_control.eo
index 1ac3908..b29456a 100644
--- a/src/lib/elm_segment_control.eo
+++ b/src/lib/elm_segment_control.eo
@@ -29,7 +29,7 @@ class Elm.Segment_Control (Elm.Layout)
             The selected item always will be highlighted on segment control.
 
             @ingroup SegmentControl */
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       item_label_get @const {
@@ -78,7 +78,7 @@ class Elm.Segment_Control (Elm.Layout)
 
          @ingroup SegmentControl */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in icon: Evas.Object * @optional; /*@ The icon object to use for 
the left side of the item. An
             icon can be any Evas object, but usually it is an icon created
@@ -99,7 +99,7 @@ class Elm.Segment_Control (Elm.Layout)
          elm_segment_control_item_count_get().
 
          @ingroup SegmentControl */
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in idx: int; /*@ The index of the segment item. */
          }
@@ -154,7 +154,7 @@ class Elm.Segment_Control (Elm.Layout)
 
          @ingroup SegmentControl */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in icon: Evas.Object * @optional; /*@ The icon object to use for 
the left side of the item. An
             icon can be any Evas object, but usually it is an icon created
diff --git a/src/lib/elm_slideshow.eo b/src/lib/elm_slideshow.eo
index bfedc94..3db2b2c 100644
--- a/src/lib/elm_slideshow.eo
+++ b/src/lib/elm_slideshow.eo
@@ -189,7 +189,7 @@ class Elm.Slideshow (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action)
             /*@
             Get the internal list of items in a given slideshow widget.
 
-            @return The list of items (#Elm_Object_Item as data) or
+            @return The list of items (#Elm.Widget_Item as data) or
             @c NULL on errors.
 
             This list is @b not to be modified in any way and must not be
@@ -201,7 +201,7 @@ class Elm.Slideshow (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action)
             call to this function when changes happen.
 
             @ingroup Slideshow */
-            return: const(list<Elm_Object_Item *>)*;
+            return: const(list<Elm.Widget_Item *>)*;
          }
       }
       @property transitions {
@@ -266,7 +266,7 @@ class Elm.Slideshow (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action)
             @c NULL, if none is (and on errors)
 
             @ingroup Slideshow */
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       @property layouts {
@@ -328,7 +328,7 @@ class Elm.Slideshow (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action)
          if there's no item with that index (and on errors)
 
          @ingroup Slideshow */
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in nth: uint; /*@ The number of the item to grab a handle to (0 
being
             the first) */
@@ -378,7 +378,7 @@ class Elm.Slideshow (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action)
 
          @ingroup Slideshow */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in itc: const(Elm_Slideshow_Item_Class)*; /*@ The item class for 
the item */
             @in data: const(void)*; /*@ The item's data */
@@ -404,7 +404,7 @@ class Elm.Slideshow (Elm.Layout, 
Elm_Interface_Atspi_Widget_Action)
 
          @ingroup Slideshow */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in itc: const(Elm_Slideshow_Item_Class)*; /*@ The item class for 
the item */
             @in data: const(void)*; /*@ The item's data */
diff --git a/src/lib/elm_toolbar.eo b/src/lib/elm_toolbar.eo
index 2846057..af356c1 100644
--- a/src/lib/elm_toolbar.eo
+++ b/src/lib/elm_toolbar.eo
@@ -290,7 +290,7 @@ class Elm.Toolbar (Elm.Widget, Elm_Interface_Scrollable,
             The selected item always will be highlighted on toolbar.
 
             @ingroup Toolbar */
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       @property first_item {
@@ -306,7 +306,7 @@ class Elm.Toolbar (Elm.Widget, Elm_Interface_Scrollable,
             @see elm_toolbar_last_item_get()
 
             @ingroup Toolbar */
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       @property more_item {
@@ -322,7 +322,7 @@ class Elm.Toolbar (Elm.Widget, Elm_Interface_Scrollable,
             elm_object_item_content_set.
 
             @ingroup Toolbar */
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       @property last_item {
@@ -338,7 +338,7 @@ class Elm.Toolbar (Elm.Widget, Elm_Interface_Scrollable,
             @see elm_toolbar_first_item_get()
 
             @ingroup Toolbar */
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       item_insert_before {
@@ -372,9 +372,9 @@ class Elm.Toolbar (Elm.Widget, Elm_Interface_Scrollable,
 
          @ingroup Toolbar */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
-            @in before: Elm_Object_Item *; /*@ The toolbar item to insert 
before. */
+            @in before: Elm.Widget_Item *; /*@ The toolbar item to insert 
before. */
             @in icon: const(char)* @optional; /*@ A string with icon name or 
the absolute path of an image file. */
             @in label: const(char)*; /*@ The label of the item. */
             @in func: Evas_Smart_Cb @optional; /*@ The function to call when 
the item is clicked. */
@@ -412,9 +412,9 @@ class Elm.Toolbar (Elm.Widget, Elm_Interface_Scrollable,
 
          @ingroup Toolbar */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
-            @in after: Elm_Object_Item *; /*@ The toolbar item to insert 
after. */
+            @in after: Elm.Widget_Item *; /*@ The toolbar item to insert 
after. */
             @in icon: const(char)* @optional; /*@ A string with icon name or 
the absolute path of an image file. */
             @in label: const(char)*; /*@ The label of the item. */
             @in func: Evas_Smart_Cb @optional; /*@ The function to call when 
the item is clicked. */
@@ -452,7 +452,7 @@ class Elm.Toolbar (Elm.Widget, Elm_Interface_Scrollable,
 
          @ingroup Toolbar */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in icon: const(char)* @optional; /*@ A string with icon name or 
the absolute path of an image file. */
             @in label: const(char)*; /*@ The label of the item. */
@@ -498,7 +498,7 @@ class Elm.Toolbar (Elm.Widget, Elm_Interface_Scrollable,
 
          @ingroup Toolbar */
 
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in icon: const(char)* @optional; /*@ A string with icon name or 
the absolute path of an image file. */
             @in label: const(char)*; /*@ The label of the item. */
@@ -514,7 +514,7 @@ class Elm.Toolbar (Elm.Widget, Elm_Interface_Scrollable,
          on failure.
 
          @ingroup Toolbar */
-         return: Elm_Object_Item *;
+         return: Elm.Widget_Item *;
          params {
             @in label: const(char)*; /*@ The label of the item to find. */
          }
diff --git a/src/lib/elm_toolbar_item.eo b/src/lib/elm_toolbar_item.eo
index 24fa8a5..dd0a554 100644
--- a/src/lib/elm_toolbar_item.eo
+++ b/src/lib/elm_toolbar_item.eo
@@ -27,7 +27,7 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
                       */
                 }
                 values {
-                     item: Elm_Object_Item *; /*@ The item before @p item, or 
@c NULL if none or on failure. */
+                     item: Elm.Widget_Item *; /*@ The item before @p item, or 
@c NULL if none or on failure. */
                 }
            }
            @property next {
@@ -43,7 +43,7 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
                       */
                 }
                 values {
-                     item: Elm_Object_Item *; /*@ The item after @p item, or 
@c NULL if none or on failure. */
+                     item: Elm.Widget_Item *; /*@ The item after @p item, or 
@c NULL if none or on failure. */
                 }
            }
            @property priority {
diff --git a/src/lib/elm_widget.eo b/src/lib/elm_widget.eo
index 090cc79..7c665d7 100644
--- a/src/lib/elm_widget.eo
+++ b/src/lib/elm_widget.eo
@@ -381,7 +381,7 @@ abstract Elm.Widget (Evas.Object_Smart, 
Elm_Interface_Atspi_Accessible, Elm_Inte
       @property focused_item {
          get {
             /*@ Get the focused widget item. */
-            return: Elm_Object_Item *;
+            return: Elm.Widget_Item *;
          }
       }
       @property parents_bounce {
diff --git a/src/lib/elm_widget_item.eo b/src/lib/elm_widget_item.eo
index 816dd44..7e66afb 100644
--- a/src/lib/elm_widget_item.eo
+++ b/src/lib/elm_widget_item.eo
@@ -652,7 +652,7 @@ class Elm.Widget_Item(Eo.Base, 
Elm_Interface_Atspi_Accessible,
                   That function will receive these parameters:
                   @li void * item data
                   @li Evas_Object * widget object
-                  @li Elm_Object_Item * widget item
+                  @li Elm.Widget_Item * widget item
 
                   @note Every elm_object_item supports this API
 

-- 


Reply via email to