undeprecate elm_entry_entry_set/get

SVN revision: 66743

diff --git a/src/lib/elm_deprecated.h b/src/lib/elm_deprecated.h
index b8ff947..3ad2cf6 100644 (file)
--- a/src/lib/elm_deprecated.h
+++ b/src/lib/elm_deprecated.h
@@ -249,28 +249,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);
 
 /**
- * This sets the text displayed within the entry to @p entry.
- *
- * @param obj The entry object
- * @param entry The text to be displayed
- *
- * @deprecated Use elm_object_text_set() instead.
- * @note Using this function bypasses text filters
- */
-EINA_DEPRECATED EAPI void               elm_entry_entry_set(Evas_Object *obj, const char *entry);
-
-/**
- * This returns the text currently shown in object @p entry.
- * See also elm_entry_entry_set().
- *
- * @param obj The entry object
- * @return The currently displayed text or NULL on failure
- *
- * @deprecated Use elm_object_text_get() instead.
- */
-EINA_DEPRECATED EAPI const char        *elm_entry_entry_get(const 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

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 4b3af83..886678f 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -2475,12 +2475,18 @@ elm_entry_password_get(const Evas_Object *obj)
    return wd->password;
 }
 
-EINA_DEPRECATED EAPI void
+EAPI void
 elm_entry_entry_set(Evas_Object *obj, const char *entry)
 {
    _elm_entry_text_set(obj, NULL, entry);
 }
 
+EAPI const char *
+elm_entry_entry_get(const Evas_Object *obj)
+{
+   return _elm_entry_text_get(obj, NULL);
+}
+
 EAPI void
 elm_entry_entry_append(Evas_Object *obj, const char *entry)
 {
@@ -2512,12 +2518,6 @@ elm_entry_entry_append(Evas_Object *obj, const char *entry)
      }
 }
 
-EINA_DEPRECATED EAPI const char *
-elm_entry_entry_get(const Evas_Object *obj)
-{
-   return _elm_entry_text_get(obj, NULL);
-}
-
 EAPI Eina_Bool
 elm_entry_is_empty(const Evas_Object *obj)
 {

diff --git a/src/lib/elm_entry.h b/src/lib/elm_entry.h
index 6dd7998..5bd8290 100644 (file)
--- a/src/lib/elm_entry.h
+++ b/src/lib/elm_entry.h
@@ -367,6 +367,25 @@ EAPI void               elm_entry_password_set(Evas_Object *obj, Eina_Bool passw
 EAPI Eina_Bool          elm_entry_password_get(const Evas_Object *obj);
 
 /**
+ * This sets the text displayed within the entry to @p entry.
+ *
+ * @param obj The entry object
+ * @param entry The text to be displayed
+ *
+ * @note Using this function bypasses text filters
+ */
+EAPI void               elm_entry_entry_set(Evas_Object *obj, const char *entry);
+
+/**
+ * This returns the text currently shown in object @p entry.
+ * See also elm_entry_entry_set().
+ *
+ * @param obj The entry object
+ * @return The currently displayed text or NULL on failure
+ */
+EAPI const char        *elm_entry_entry_get(const Evas_Object *obj);
+
+/**
  * Appends @p entry to the text of the entry.
  *
  * Adds the text in @p entry to the end of any text already present in the