elementary - rename an API

elm_object_item_object_get -> elm_object_item_widget_get

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@67235 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/elm_deprecated.h b/src/lib/elm_deprecated.h
index 260b805..5422ec4 100644 (file)
--- a/src/lib/elm_deprecated.h
+++ b/src/lib/elm_deprecated.h
@@ -22,6 +22,19 @@ EINA_DEPRECATED EAPI Elm_Gen_Item *elm_gen_item_prev_get(const Elm_Gen_Item *it)
 EINA_DEPRECATED EAPI Evas_Object  *elm_gen_item_widget_get(const Elm_Gen_Item *it);
 
 /**
+ * Get the widget object's handle which contains a given item
+ *
+ * @param it The Elementary object item
+ * @return The widget object
+ *
+ * @note This returns the widget object itself that an item belongs to.
+ * @note Every elm_object_item supports this API
+ * @deprecated Use elm_object_item_widget_get() instead
+ * @ingroup General
+ */
+EINA_DEPRECATED EAPI Evas_Object                 *elm_object_item_object_get(const Elm_Object_Item *it);
+
+/**
  * @defgroup Toggle Toggle
  *
  * @image html img/widget/toggle/preview-00.png

diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index 9d12f3e..d9e595e 100644 (file)
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -2008,9 +2008,9 @@ elm_longpress_timeout_get(void)
 }
 
 EAPI Evas_Object *
-elm_object_item_object_get(const Elm_Object_Item *it)
+elm_object_item_widget_get(const Elm_Object_Item *it)
 {
-   return ((Elm_Widget_Item *) it)->widget;
+   return WIDGET(it);
 }
 
 EAPI void
@@ -2181,3 +2181,8 @@ elm_object_item_tooltip_style_get(const Elm_Object_Item *item)
    return elm_widget_item_tooltip_style_get(item);
 }
 
+EINA_DEPRECATED EAPI Evas_Object *
+elm_object_item_object_get(const Elm_Object_Item *it)
+{
+   return elm_object_item_widget_get(it);
+}

diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index f4ef091..b2d6ba4 100644 (file)
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -1036,7 +1036,7 @@ elm_menu_item_next_get(const Elm_Object_Item *it)
 EAPI Evas_Object *
 elm_menu_item_menu_get(const Elm_Object_Item *it)
 {
-   return elm_object_item_object_get(it);
+   return elm_object_item_widget_get(it);
 }
 
 EAPI Elm_Object_Item *

diff --git a/src/lib/elm_object_item.h b/src/lib/elm_object_item.h
index f7911be..ccd0d62 100644 (file)
--- a/src/lib/elm_object_item.h
+++ b/src/lib/elm_object_item.h
@@ -8,7 +8,7 @@
  * @note Every elm_object_item supports this API
  * @ingroup General
  */
-EAPI Evas_Object                 *elm_object_item_object_get(const Elm_Object_Item *it);
+EAPI Evas_Object                 *elm_object_item_widget_get(const Elm_Object_Item *it);
 
 /**
  * Set a content of an object item

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index b31285a..7de897b 100644 (file)
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -1259,7 +1259,7 @@ EAPI Evas_Object *
 elm_toolbar_item_toolbar_get(const Elm_Object_Item *it)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
-   return elm_object_item_object_get(it);
+   return elm_object_item_widget_get(it);
 }
 
 EAPI void