remove deprecated function related with

anchorview and block's text set/get

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

diff --git a/src/examples/anchorblock_example_01.c b/src/examples/anchorblock_example_01.c
index a7c6a14..6d1a4fc 100644 (file)
--- a/src/examples/anchorblock_example_01.c
+++ b/src/examples/anchorblock_example_01.c
@@ -57,7 +57,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__)
    o = elm_anchorblock_add(win);
    elm_anchorblock_hover_style_set(o, "popout");
    elm_anchorblock_hover_parent_set(o, win);
-   elm_anchorblock_text_set(o, anchortext);
+   elm_object_text_set(o, anchortext);
    evas_object_smart_callback_add(o, "anchor,clicked", _anchorblock_clicked_cb,
                                   NULL);
    evas_object_show(o);
@@ -73,7 +73,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__)
    o = elm_anchorview_add(win);
    elm_anchorview_hover_parent_set(o, frame);
    elm_anchorview_bounce_set(o, EINA_FALSE, EINA_TRUE);
-   elm_anchorview_text_set(o, anchortext);
+   elm_object_text_set(o, anchortext);
    evas_object_smart_callback_add(o, "anchor,clicked", _anchorview_clicked_cb,
                                   NULL);
    evas_object_show(o);

diff --git a/src/lib/elc_anchorblock.c b/src/lib/elc_anchorblock.c
index d37e939..fe1866a 100644 (file)
--- a/src/lib/elc_anchorblock.c
+++ b/src/lib/elc_anchorblock.c
@@ -251,18 +251,6 @@ elm_anchorblock_add(Evas_Object *parent)
 }
 
 EAPI void
-elm_anchorblock_text_set(Evas_Object *obj, const char *text)
-{
-   _elm_anchorblock_text_set(obj, NULL, text);
-}
-
-EAPI const char*
-elm_anchorblock_text_get(const Evas_Object *obj)
-{
-   return _elm_anchorblock_text_get(obj, NULL);
-}
-
-EAPI void
 elm_anchorblock_hover_parent_set(Evas_Object *obj, Evas_Object *parent)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);

diff --git a/src/lib/elc_anchorview.c b/src/lib/elc_anchorview.c
index 1245d95..ebe9528 100644 (file)
--- a/src/lib/elc_anchorview.c
+++ b/src/lib/elc_anchorview.c
@@ -248,18 +248,6 @@ elm_anchorview_add(Evas_Object *parent)
 }
 
 EAPI void
-elm_anchorview_text_set(Evas_Object *obj, const char *text)
-{
-   _elm_anchorview_text_set(obj, NULL, text);
-}
-
-EAPI const char*
-elm_anchorview_text_get(const Evas_Object *obj)
-{
-   return _elm_anchorview_text_get(obj, NULL);
-}
-
-EAPI void
 elm_anchorview_hover_parent_set(Evas_Object *obj, Evas_Object *parent)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);

diff --git a/src/lib/elm_deprecated.h b/src/lib/elm_deprecated.h
index ac59e71..3890857 100644 (file)
--- a/src/lib/elm_deprecated.h
+++ b/src/lib/elm_deprecated.h
@@ -1,17 +1,4 @@
 /**
- * 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
@@ -239,66 +226,6 @@ EINA_DEPRECATED EAPI void         elm_scrolled_entry_cnp_textonly_set(Evas_Objec
 EINA_DEPRECATED EAPI Eina_Bool    elm_scrolled_entry_cnp_textonly_get(Evas_Object *obj);
 
 /**
- * Set the text to show in the anchorblock
- *
- * Sets the text of the anchorblock to @p text. This text can include markup
- * format tags, including <c>\<a href=anchorname\></a></c> to begin a segment
- * of text that will be specially styled and react to click events, ended
- * with either of \</a\> or \</\>. When clicked, the anchor will emit an
- * "anchor,clicked" signal that you can attach a callback to with
- * evas_object_smart_callback_add(). The name of the anchor given in the
- * event info struct will be the one set in the href attribute, in this
- * case, anchorname.
- *
- * Other markup can be used to style the text in different ways, but it's
- * up to the style defined in the theme which tags do what.
- * @deprecated use elm_object_text_set() instead.
- */
-EINA_DEPRECATED EAPI void        elm_anchorblock_text_set(Evas_Object *obj, const char *text);
-
-/**
- * Get the markup text set for the anchorblock
- *
- * Retrieves the text set on the anchorblock, with markup tags included.
- *
- * @param obj The anchorblock object
- * @return The markup text set or @c NULL if nothing was set or an error
- * occurred
- * @deprecated use elm_object_text_set() instead.
- */
-EINA_DEPRECATED EAPI const char *elm_anchorblock_text_get(const Evas_Object *obj);
-
-/**
- * Set the text to show in the anchorview
- *
- * Sets the text of the anchorview to @p text. This text can include markup
- * format tags, including <c>\<a href=anchorname\></c> to begin a segment of
- * text that will be specially styled and react to click events, ended with
- * either of \</a\> or \</\>. When clicked, the anchor will emit an
- * "anchor,clicked" signal that you can attach a callback to with
- * evas_object_smart_callback_add(). The name of the anchor given in the
- * event info struct will be the one set in the href attribute, in this
- * case, anchorname.
- *
- * Other markup can be used to style the text in different ways, but it's
- * up to the style defined in the theme which tags do what.
- * @deprecated use elm_object_text_set() instead.
- */
-EINA_DEPRECATED EAPI void        elm_anchorview_text_set(Evas_Object *obj, const char *text);
-
-/**
- * Get the markup text set for the anchorview
- *
- * Retrieves the text set on the anchorview, with markup tags included.
- *
- * @param obj The anchorview object
- * @return The markup text set or @c NULL if nothing was set or an error
- * occurred
- * @deprecated use elm_object_text_set() instead.
- */
-EINA_DEPRECATED EAPI const char *elm_anchorview_text_get(const Evas_Object *obj);
-
-/**
  * @brief Get the ctxpopup item's disabled/enabled state.
  *
  * @param it Ctxpopup item to be enabled/disabled

diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index 1248b79..3a90c76 100644 (file)
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -2048,12 +2048,6 @@ elm_object_item_tooltip_style_get(const Elm_Object_Item *it)
    return elm_widget_item_tooltip_style_get(it);
 }
 
-EINA_DEPRECATED EAPI Evas_Object *
-elm_object_item_object_get(const Elm_Object_Item *it)
-{
-   return elm_object_item_widget_get(it);
-}
-
 EAPI void
 elm_object_item_cursor_set(Elm_Object_Item *it, const char *cursor)
 {