as promised, deprecated menu api functions have now been removed

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

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 457845d..272dbf2 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -12084,14 +12084,6 @@ extern "C" {
     */
    EAPI const char        *elm_menu_item_object_icon_name_get(const Elm_Menu_Item *item) EINA_ARG_NONNULL(1);
    /**
-    * @deprecated Use elm_menu_item_object_icon_name_set()
-    */
-   EAPI void               elm_menu_item_icon_set(Elm_Menu_Item *item, const char *icon) EINA_ARG_NONNULL(1, 2) EINA_DEPRECATED;
-   /**
-    * @deprecated Use elm_menu_item_object_icon_name_get()
-    */
-   EAPI const char        *elm_menu_item_icon_get(const Elm_Menu_Item *item) EINA_ARG_NONNULL(1) EINA_DEPRECATED;
-   /**
     * @brief Set the content object of a menu item
     *
     * @param item The menu item object
@@ -12115,10 +12107,6 @@ extern "C" {
     */
    EAPI Evas_Object *elm_menu_item_object_content_get(const Elm_Menu_Item *item) EINA_ARG_NONNULL(1);
    /**
-    * @deprecated Use elm_menu_item_object_content_get() instead.
-    */
-   EAPI Evas_Object *elm_menu_item_object_icon_get(const Elm_Menu_Item *item) EINA_ARG_NONNULL(1) EINA_DEPRECATED;
-   /**
     * @brief Set the selected state of @p item.
     *
     * @param item The menu item object.

diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index 88e971a..0cee0f7 100644 (file)
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -714,12 +714,6 @@ elm_menu_item_object_icon_name_set(Elm_Menu_Item *item, const char *icon)
 }
 
 EAPI void
-elm_menu_item_icon_set(Elm_Menu_Item *item, const char *icon)
-{
-   elm_menu_item_object_icon_name_set(item, icon);
-}
-
-EAPI void
 elm_menu_item_disabled_set(Elm_Menu_Item *item, Eina_Bool disabled)
 {
    ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
@@ -801,12 +795,6 @@ elm_menu_item_object_content_get(const Elm_Menu_Item *item)
    return item->content;
 }
 
-EAPI Evas_Object *
-elm_menu_item_object_icon_get(const Elm_Menu_Item *item)
-{
-   return elm_menu_item_object_content_get(item);
-}
-
 EAPI const char *
 elm_menu_item_object_icon_name_get(const Elm_Menu_Item *item)
 {
@@ -814,12 +802,6 @@ elm_menu_item_object_icon_name_get(const Elm_Menu_Item *item)
    return item->icon_str;
 }
 
-EAPI const char *
-elm_menu_item_icon_get(const Elm_Menu_Item *item)
-{
-   return elm_menu_item_object_icon_name_get(item);
-}
-
 EAPI Eina_Bool
 elm_menu_item_is_separator(Elm_Menu_Item *item)
 {