Again, Resubmission after merge fail. [SegmentControl] DEPRECATED APIs are

removed.

Change-Id: I5444bdc56945b0239284e6516f609bf60e4642b5

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 13e7493..a5142ba 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -1937,16 +1937,6 @@ extern "C" {
    EAPI Evas_Object      *elm_segment_control_item_object_get(const Elm_Segment_Item *it) EINA_ARG_NONNULL(1);
    EAPI Elm_Segment_Item *elm_segment_control_item_selected_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
    EAPI void              elm_segment_control_item_selected_set(Elm_Segment_Item *it, Eina_Bool select) EINA_ARG_NONNULL(1);
-   EINA_DEPRECATED EAPI int               elm_segment_control_get_segment_count(Evas_Object *obj);
-   EINA_DEPRECATED EAPI Elm_Segment_Item *elm_segment_control_selected_segment_get(const Evas_Object *obj, int *value);
-   EINA_DEPRECATED EAPI Evas_Object      *elm_segment_control_get_segment_icon_at(Evas_Object *obj, unsigned int index);
-   EINA_DEPRECATED EAPI const char       *elm_segment_control_get_segment_label_at(Evas_Object *obj, unsigned int index);
-   EINA_DEPRECATED EAPI void              elm_segment_control_delete_segment_at(Evas_Object *obj, unsigned int index, Eina_Bool animate);
-   EINA_DEPRECATED EAPI void              elm_segment_control_delete_segment(Evas_Object *obj, Elm_Segment_Item *item, Eina_Bool animate);
-   EINA_DEPRECATED EAPI void              elm_segment_control_insert_segment_at(Evas_Object *obj, Evas_Object *icon, const char *label, unsigned int index, Eina_Bool animate);
-   EINA_DEPRECATED EAPI Elm_Segment_Item *elm_segment_control_add_segment(Evas_Object *obj, Evas_Object *icon, const char *label, Eina_Bool animate);
-   EINA_DEPRECATED EAPI Evas_Object      *elm_segment_control_item_label_object_set(Elm_Segment_Item *item, char *label);
-
 
    EAPI Evas_Object *elm_page_control_add(Evas_Object *parent);
    EAPI void         elm_page_control_page_count_set(Evas_Object *obj, unsigned int page_count);

diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c
index aab4996..c4173b4 100644 (file)
--- a/src/lib/elm_segment_control.c
+++ b/src/lib/elm_segment_control.c
@@ -888,113 +888,3 @@ elm_segment_control_item_index_get(const Elm_Segment_Item *it)
 
    return it->seg_index;
 }
-
-//////////////////////////////////  BEGIN  //////////////////////////////////////////////
-/////////////////////////// OLD SLP APIs - TO BE DEPRECATED /////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////
-
-EAPI int
-elm_segment_control_get_segment_count(Evas_Object *obj)
-{
-   fprintf(stderr, "=============================> Warning!!! <========================\n");
-   fprintf(stderr, "==> elm_segment_control_get_segment_count() is deprecated. <=======\n");
-   fprintf(stderr, "===> Please use elm_segment_control_item_count_get() instead. <====\n");
-   fprintf(stderr, "===================================================================\n");
-   return elm_segment_control_item_count_get(obj);
-}
-
-EAPI Elm_Segment_Item *
-elm_segment_control_selected_segment_get(const Evas_Object *obj, int *value)
-{
-   Elm_Segment_Item *it;
-   it = elm_segment_control_item_selected_get(obj);
-   if (!it) return NULL;
-   *value = it->seg_index;
-
-   fprintf(stderr, "=============================> Warning!!! <===========================\n");
-   fprintf(stderr, "==> elm_segment_control_selected_segment_get() is deprecated. <=======\n");
-   fprintf(stderr, "===> Please use elm_segment_control_item_selected_get() instead. <====\n");
-   fprintf(stderr, "======================================================================\n");
-   return it;
-}
-
-EAPI Evas_Object *
-elm_segment_control_get_segment_icon_at(Evas_Object *obj, unsigned int index)
-{
-   fprintf(stderr, "=============================> Warning!!! <==========================\n");
-   fprintf(stderr, "==> elm_segment_control_get_segment_icon_at() is deprecated. <=======\n");
-   fprintf(stderr, "=====> Please use elm_segment_control_item_icon_get() instead. <=====\n");
-   fprintf(stderr, "=====================================================================\n");
-   return elm_segment_control_item_icon_get(obj, index);
-}
-
-EAPI const char *
-elm_segment_control_get_segment_label_at(Evas_Object *obj, unsigned int index)
-{
-   fprintf(stderr, "=============================> Warning!!! <===========================\n");
-   fprintf(stderr, "==> elm_segment_control_get_segment_label_at() is deprecated. <=======\n");
-   fprintf(stderr, "=====> Please use elm_segment_control_item_label_get() instead. <=====\n");
-   fprintf(stderr, "======================================================================\n");
-   return elm_segment_control_item_label_get(obj, index);
-}
-
-EAPI void
-elm_segment_control_delete_segment_at(Evas_Object *obj, unsigned int index,
-                                      Eina_Bool animate)
-{
-   fprintf(stderr, "=============================> Warning!!! <========================\n");
-   fprintf(stderr, "==> elm_segment_control_delete_segment_at() is deprecated. <=======\n");
-   fprintf(stderr, "=====> Please use elm_segment_control_item_del_at() instead. <=====\n");
-   fprintf(stderr, "===================================================================\n");
-   elm_segment_control_item_del_at(obj, index);
-}
-
-EAPI void
-elm_segment_control_delete_segment(Evas_Object *obj, Elm_Segment_Item *item,
-                                   Eina_Bool animate)
-{
-   fprintf(stderr, "=============================> Warning!!! <=====================\n");
-   fprintf(stderr, "==> elm_segment_control_delete_segment() is deprecated. <=======\n");
-   fprintf(stderr, "=====> Please use elm_segment_control_item_del() instead. <=====\n");
-   fprintf(stderr, "================================================================\n");
-   elm_segment_control_item_del(item);
-}
-
-EAPI void
-elm_segment_control_insert_segment_at(Evas_Object *obj, Evas_Object *icon,
-                                      const char *label, unsigned int index,
-                                      Eina_Bool animate)
-{
-   fprintf(stderr, "=============================> Warning!!! <===========================\n");
-   fprintf(stderr, "==> elm_segment_control_insert_segment_at() is deprecated. <==========\n");
-   fprintf(stderr, "=====> Please use elm_segment_control_item_insert_at() instead. <=====\n");
-   fprintf(stderr, "======================================================================\n");
-   elm_segment_control_item_insert_at(obj, icon, label, index);
-}
-
-EAPI Elm_Segment_Item *
-elm_segment_control_add_segment(Evas_Object *obj, Evas_Object *icon,
-                                const char *label, Eina_Bool animate)
-{
-   fprintf(stderr, "=============================> Warning!!! <=====================\n");
-   fprintf(stderr, "==> elm_segment_control_add_segment() is deprecated. <==========\n");
-   fprintf(stderr, "=====> Please use elm_segment_control_item_add() instead. <=====\n");
-   fprintf(stderr, "================================================================\n");
-   return elm_segment_control_item_add(obj, icon, label);
-}
-
-EAPI Evas_Object *
-elm_segment_control_item_label_object_set(Elm_Segment_Item *item, char *label)
-{
-   fprintf(stderr, "=============================> Warning!!! <===============================\n");
-   fprintf(stderr, "==> elm_segment_control_item_label_object_set() is deprecated. <==========\n");
-   fprintf(stderr, "=====> Please use elm_segment_control_item_label_set() instead. <=========\n");
-   fprintf(stderr, "==========================================================================\n");
-   elm_segment_control_item_label_set(item, label);
-   if (item) return item->label;
-   else return NULL;
-}
-/////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////// OLD SLP APIs - TO BE DEPRECATED /////////////////////////////
-///////////////////////////////////  END ////////////////////////////////////////////////
-