[*][editfield & searchbar] deprecated

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 904d05c..6a5889a 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -192,7 +192,6 @@ EAPI extern Elm_Version *elm_version;
 #include <elm_dayselector.h>
 #include <elm_debug.h>
 #include <elm_diskselector.h>
-#include <elm_editfield.h>
 #include <elm_engine.h>
 #include <elm_factory.h>
 #include <elm_finger.h>
@@ -235,7 +234,6 @@ EAPI extern Elm_Version *elm_version;
 #include <elm_route.h>
 #include <elm_scale.h>
 #include <elm_scroll.h>
-#include <elm_searchbar.h>
 #include <elm_segment_control.h>
 #include <elm_separator.h>
 #include <elm_slider.h>

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 0322c8d..fd9788a 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -78,7 +78,6 @@ elm_debug.h \
 elm_deprecated.h \
 elm_deprecated_before.h \
 elm_diskselector.h \
-elm_editfield.h \
 elm_engine.h \
 elm_entry.h \
 elm_factory.h \
@@ -129,7 +128,6 @@ elm_route.h \
 elm_scale.h \
 elm_scroller.h \
 elm_scroll.h \
-elm_searchbar.h \
 elm_segment_control.h \
 elm_separator.h \
 elm_slider.h \

diff --git a/src/lib/elm_deprecated.h b/src/lib/elm_deprecated.h
index 8230a1f..0f48e27 100644 (file)
--- a/src/lib/elm_deprecated.h
+++ b/src/lib/elm_deprecated.h
@@ -3846,3 +3846,93 @@ EINA_DEPRECATED EAPI Evas_Object       *elm_entry_end_unset(Evas_Object *obj);
  */
 EINA_DEPRECATED EAPI void                  elm_map_utils_rotate_coord(const Evas_Object *obj, const Evas_Coord x, const Evas_Coord y, const Evas_Coord cx, const Evas_Coord cy, const double degree, Evas_Coord *xx, Evas_Coord *yy);
 
+// All elm_editfield APIs were deprecated.
+EINA_DEPRECATED Evas_Object *elm_editfield_add(Evas_Object *parent);
+EINA_DEPRECATED void         elm_editfield_label_set(Evas_Object *obj, const char *label);
+EINA_DEPRECATED const char  *elm_editfield_label_get(Evas_Object *obj);
+EINA_DEPRECATED void         elm_editfield_guide_text_set(Evas_Object *obj, const char *text);
+EINA_DEPRECATED const char  *elm_editfield_guide_text_get(Evas_Object *obj);
+EINA_DEPRECATED Evas_Object *elm_editfield_entry_get(Evas_Object *obj);
+EINA_DEPRECATED void         elm_editfield_entry_single_line_set(Evas_Object *obj, Eina_Bool single_line);
+EINA_DEPRECATED Eina_Bool    elm_editfield_entry_single_line_get(Evas_Object *obj);
+EINA_DEPRECATED void         elm_editfield_eraser_set(Evas_Object *obj, Eina_Bool visible);
+EINA_DEPRECATED Eina_Bool    elm_editfield_eraser_get(Evas_Object *obj);
+
+/**
+    * @defgroup Searchbar Searchbar
+    * @addtogroup Searchbar
+    * @{
+    * @ingroup Elementary
+    *
+    * This is Searchbar.
+    * It can contain a simple entry and button object.
+    */
+
+   /**
+    * Add a new searchbar to the parent
+    * @param parent The parent object
+    * @return The new object or NULL if it cannot be created
+    */
+   EINA_DEPRECATED Evas_Object *elm_searchbar_add(Evas_Object *parent);
+   /**
+    * set the text of entry
+    *
+    * @param obj The searchbar object
+    * @return void
+    */
+   EINA_DEPRECATED void         elm_searchbar_text_set(Evas_Object *obj, const char *entry);
+   /**
+    * get the text of entry
+    *
+    * @param obj The searchbar object
+    * @return string pointer of entry
+    */
+   EINA_DEPRECATED const char  *elm_searchbar_text_get(Evas_Object *obj);
+   /**
+    * get the pointer of entry
+    *
+    * @param obj The searchbar object
+    * @return the entry object
+    */
+   EINA_DEPRECATED Evas_Object *elm_searchbar_entry_get(Evas_Object *obj);
+   /**
+    * get the pointer of editfield
+    *
+    * @param obj The searchbar object
+    * @return the editfield object
+    */
+   EINA_DEPRECATED Evas_Object *elm_searchbar_editfield_get(Evas_Object *obj);
+   /**
+    * set the cancel button animation flag
+    *
+    * @param obj The searchbar object
+    * @param cancel_btn_ani_flag The flag of animating cancen button or not
+    * @return void
+    */
+   EINA_DEPRECATED void         elm_searchbar_cancel_button_animation_set(Evas_Object *obj, Eina_Bool cancel_btn_ani_flag);
+   /**
+    * set the cancel button show mode
+    *
+    * @param obj The searchbar object
+    * @param visible The flag of cancen button show or not
+    * @return void
+    */
+   EINA_DEPRECATED void         elm_searchbar_cancel_button_set(Evas_Object *obj, Eina_Bool visible);
+   /**
+    * clear searchbar status
+    *
+    * @param obj The searchbar object
+    * @return void
+    */
+   EINA_DEPRECATED void         elm_searchbar_clear(Evas_Object *obj);
+   /**
+    * set the searchbar boundary rect mode(with bg rect) set
+    *
+    * @param obj The searchbar object
+    * @param boundary The present flag of boundary rect or not
+    * @return void
+    */
+   EINA_DEPRECATED void         elm_searchbar_boundary_rect_set(Evas_Object *obj, Eina_Bool boundary);
+   /**
+    * @}
+    */

diff --git a/src/lib/elm_editfield.c b/src/lib/elm_editfield.c
index 37d1b26..80e59d8 100644 (file)
--- a/src/lib/elm_editfield.c
+++ b/src/lib/elm_editfield.c
@@ -279,7 +279,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source)
  *
  * @ingroup Editfield
  */
-EAPI Evas_Object *
+EINA_DEPRECATED Evas_Object *
 elm_editfield_add(Evas_Object *parent)
 {
    Evas_Object *obj;
@@ -334,7 +334,7 @@ elm_editfield_add(Evas_Object *parent)
  *
  * @ingroup Editfield
  */
-EAPI void
+EINA_DEPRECATED void
 elm_editfield_label_set(Evas_Object *obj, const char *label)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -366,7 +366,7 @@ elm_editfield_label_set(Evas_Object *obj, const char *label)
  *
  * @ingroup Editfield
  */
-EAPI const char*
+EINA_DEPRECATED const char*
 elm_editfield_label_get(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -383,7 +383,7 @@ elm_editfield_label_get(Evas_Object *obj)
  *
  * @ingroup Editfield
  */
-EAPI void
+EINA_DEPRECATED void
 elm_editfield_guide_text_set(Evas_Object *obj, const char *text)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -409,7 +409,7 @@ elm_editfield_guide_text_set(Evas_Object *obj, const char *text)
  *
  * @ingroup Editfield
  */
-EAPI const char*
+EINA_DEPRECATED const char*
 elm_editfield_guide_text_get(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -427,7 +427,7 @@ elm_editfield_guide_text_get(Evas_Object *obj)
  *
  * @ingroup Editfield
  */
-EAPI Evas_Object *
+EINA_DEPRECATED Evas_Object *
 elm_editfield_entry_get(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -444,7 +444,7 @@ elm_editfield_entry_get(Evas_Object *obj)
  *
  * @ingroup Editfield
  */
-EAPI void
+EINA_DEPRECATED void
 elm_editfield_entry_single_line_set(Evas_Object *obj, Eina_Bool single_line)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -477,7 +477,7 @@ elm_editfield_entry_single_line_set(Evas_Object *obj, Eina_Bool single_line)
  *
  * @ingroup Editfield
  */
-EAPI Eina_Bool
+EINA_DEPRECATED Eina_Bool
 elm_editfield_entry_single_line_get(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -495,7 +495,7 @@ elm_editfield_entry_single_line_get(Evas_Object *obj)
  *
  * @ingroup Editfield
  */
-EAPI void
+EINA_DEPRECATED void
 elm_editfield_eraser_set(Evas_Object *obj, Eina_Bool visible)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -514,7 +514,7 @@ elm_editfield_eraser_set(Evas_Object *obj, Eina_Bool visible)
  *
  * @ingroup Editfield
  */
-EAPI Eina_Bool
+EINA_DEPRECATED Eina_Bool
 elm_editfield_eraser_get(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);

diff --git a/src/lib/elm_editfield.h b/src/lib/elm_editfield.h
deleted file mode 100644 (file)
index eb8d3c9..0000000
--- a/src/lib/elm_editfield.h
+++ /dev/null
@@ -1,16 +0,0 @@
-   /* editfield */
-   EAPI Evas_Object *elm_editfield_add(Evas_Object *parent);
-   EAPI void         elm_editfield_label_set(Evas_Object *obj, const char *label);
-   EAPI const char  *elm_editfield_label_get(Evas_Object *obj);
-   EAPI void         elm_editfield_guide_text_set(Evas_Object *obj, const char *text);
-   EAPI const char  *elm_editfield_guide_text_get(Evas_Object *obj);
-   EAPI Evas_Object *elm_editfield_entry_get(Evas_Object *obj);
-   EAPI void         elm_editfield_entry_single_line_set(Evas_Object *obj, Eina_Bool single_line);
-   EAPI Eina_Bool    elm_editfield_entry_single_line_get(Evas_Object *obj);
-   EAPI void         elm_editfield_eraser_set(Evas_Object *obj, Eina_Bool visible);
-   EAPI Eina_Bool    elm_editfield_eraser_get(Evas_Object *obj);
-   /* smart callbacks called:
-    * "clicked" - when an editfield is clicked
-    * "unfocused" - when an editfield is unfocused
-    */
-

diff --git a/src/lib/elm_searchbar.c b/src/lib/elm_searchbar.c
index 722931b..2f126e0 100644 (file)
--- a/src/lib/elm_searchbar.c
+++ b/src/lib/elm_searchbar.c
@@ -167,7 +167,7 @@ _elm_searchbar_text_get(const Evas_Object *obj, const char *item)
 }
 
 
-EAPI Evas_Object *elm_searchbar_add(Evas_Object *parent)
+EINA_DEPRECATED Evas_Object *elm_searchbar_add(Evas_Object *parent)
 {
    Evas_Object *obj;
    Evas *e;
@@ -220,17 +220,17 @@ EAPI Evas_Object *elm_searchbar_add(Evas_Object *parent)
    return obj;
 }
 
-EAPI void elm_searchbar_text_set(Evas_Object *obj, const char *entry)
+EINA_DEPRECATED void elm_searchbar_text_set(Evas_Object *obj, const char *entry)
 {
    _elm_searchbar_text_set(obj, NULL, entry);
 }
 
-EAPI const char* elm_searchbar_text_get(Evas_Object *obj)
+EINA_DEPRECATED const char* elm_searchbar_text_get(Evas_Object *obj)
 {
    return _elm_searchbar_text_get(obj, NULL);
 }
 
-EAPI Evas_Object *elm_searchbar_entry_get(Evas_Object *obj)
+EINA_DEPRECATED Evas_Object *elm_searchbar_entry_get(Evas_Object *obj)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -239,7 +239,7 @@ EAPI Evas_Object *elm_searchbar_entry_get(Evas_Object *obj)
    return elm_editfield_entry_get(wd->ef);
 }
 
-EAPI Evas_Object *elm_searchbar_editfield_get(Evas_Object *obj)
+EINA_DEPRECATED Evas_Object *elm_searchbar_editfield_get(Evas_Object *obj)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -248,7 +248,7 @@ EAPI Evas_Object *elm_searchbar_editfield_get(Evas_Object *obj)
    return wd->ef;
 }
 
-EAPI void elm_searchbar_cancel_button_animation_set(Evas_Object *obj, Eina_Bool cancel_btn_ani_flag)
+EINA_DEPRECATED void elm_searchbar_cancel_button_animation_set(Evas_Object *obj, Eina_Bool cancel_btn_ani_flag)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -258,7 +258,7 @@ EAPI void elm_searchbar_cancel_button_animation_set(Evas_Object *obj, Eina_Bool
    else wd->cancel_btn_ani_flag = cancel_btn_ani_flag;
 }
 
-EAPI void elm_searchbar_cancel_button_set(Evas_Object *obj, Eina_Bool visible)
+EINA_DEPRECATED void elm_searchbar_cancel_button_set(Evas_Object *obj, Eina_Bool visible)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -277,7 +277,7 @@ EAPI void elm_searchbar_cancel_button_set(Evas_Object *obj, Eina_Bool visible)
    _sizing_eval(obj);
 }
 
-EAPI void elm_searchbar_clear(Evas_Object *obj)
+EINA_DEPRECATED void elm_searchbar_clear(Evas_Object *obj)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -293,7 +293,7 @@ EAPI void elm_searchbar_clear(Evas_Object *obj)
 //   elm_entry_entry_set(elm_editfield_entry_get(wd->ef), NULL);
 }
 
-EAPI void elm_searchbar_boundary_rect_set(Evas_Object *obj, Eina_Bool boundary)
+EINA_DEPRECATED void elm_searchbar_boundary_rect_set(Evas_Object *obj, Eina_Bool boundary)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);

diff --git a/src/lib/elm_searchbar.h b/src/lib/elm_searchbar.h
deleted file mode 100644 (file)
index 8bbea99..0000000
--- a/src/lib/elm_searchbar.h
+++ /dev/null
@@ -1,79 +0,0 @@
-   /**
-    * @defgroup Searchbar Searchbar
-    * @addtogroup Searchbar
-    * @{
-    * @ingroup Elementary
-    *
-    * This is Searchbar.
-    * It can contain a simple entry and button object.
-    */
-
-   /**
-    * Add a new searchbar to the parent
-    * @param parent The parent object
-    * @return The new object or NULL if it cannot be created
-    */
-   EAPI Evas_Object *elm_searchbar_add(Evas_Object *parent);
-   /**
-    * set the text of entry
-    *
-    * @param obj The searchbar object
-    * @return void
-    */
-   EAPI void         elm_searchbar_text_set(Evas_Object *obj, const char *entry);
-   /**
-    * get the text of entry
-    *
-    * @param obj The searchbar object
-    * @return string pointer of entry
-    */
-   EAPI const char  *elm_searchbar_text_get(Evas_Object *obj);
-   /**
-    * get the pointer of entry
-    *
-    * @param obj The searchbar object
-    * @return the entry object
-    */
-   EAPI Evas_Object *elm_searchbar_entry_get(Evas_Object *obj);
-   /**
-    * get the pointer of editfield
-    *
-    * @param obj The searchbar object
-    * @return the editfield object
-    */
-   EAPI Evas_Object *elm_searchbar_editfield_get(Evas_Object *obj);
-   /**
-    * set the cancel button animation flag
-    *
-    * @param obj The searchbar object
-    * @param cancel_btn_ani_flag The flag of animating cancen button or not
-    * @return void
-    */
-   EAPI void         elm_searchbar_cancel_button_animation_set(Evas_Object *obj, Eina_Bool cancel_btn_ani_flag);
-   /**
-    * set the cancel button show mode
-    *
-    * @param obj The searchbar object
-    * @param visible The flag of cancen button show or not
-    * @return void
-    */
-   EAPI void         elm_searchbar_cancel_button_set(Evas_Object *obj, Eina_Bool visible);
-   /**
-    * clear searchbar status
-    *
-    * @param obj The searchbar object
-    * @return void
-    */
-   EAPI void         elm_searchbar_clear(Evas_Object *obj);
-   /**
-    * set the searchbar boundary rect mode(with bg rect) set
-    *
-    * @param obj The searchbar object
-    * @param boundary The present flag of boundary rect or not
-    * @return void
-    */
-   EAPI void         elm_searchbar_boundary_rect_set(Evas_Object *obj, Eina_Bool boundary);
-   /**
-    * @}
-    */
-