[actionslider,calendar,conform] Deprecated API support is deleted from the widgets.

diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c
index c8a488a..49cdda1 100644 (file)
--- a/src/lib/elm_actionslider.c
+++ b/src/lib/elm_actionslider.c
@@ -14,7 +14,6 @@ struct _Widget_Data
    Ecore_Animator *button_animator;
    double final_position;
    Eina_Bool mouse_down : 1;
-   Eina_Bool mouse_hold : 1;
 };
 
 static const char *widtype = NULL;
@@ -232,7 +231,6 @@ _drag_button_up_cb(void *data, Evas_Object *o __UNUSED__, const char *emission _
    if (!wd) return;
 
    wd->mouse_down = EINA_FALSE;
-   if (wd->mouse_hold == EINA_TRUE) return;
 
    edje_object_part_drag_value_get(wd->as, "elm.drag_button_base",
                                    &position, NULL);
@@ -392,7 +390,6 @@ elm_actionslider_add(Evas_Object *parent)
    elm_widget_text_get_hook_set(obj, _elm_actionslider_label_get);
 
    wd->mouse_down = EINA_FALSE;
-   wd->mouse_hold = EINA_FALSE;
    wd->enabled_position = ELM_ACTIONSLIDER_ALL;
 
    wd->as = edje_object_add(e);
@@ -506,59 +503,3 @@ elm_actionslider_selected_label_get(const Evas_Object *obj)
 
    return NULL;
 }
-
-// Deprecated APIs
-
-EAPI void
-elm_actionslider_label_set(Evas_Object *obj, Elm_Actionslider_Label_Pos pos, const char *label)
-{
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-
-   if (pos == ELM_ACTIONSLIDER_LABEL_LEFT)
-     _elm_actionslider_label_set(obj, "left", label);
-   else if (pos == ELM_ACTIONSLIDER_LABEL_RIGHT)
-     _elm_actionslider_label_set(obj, "right", label);
-   else if (pos == ELM_ACTIONSLIDER_LABEL_CENTER)
-     _elm_actionslider_label_set(obj, "center", label);
-   else if (pos == ELM_ACTIONSLIDER_LABEL_BUTTON)
-     _elm_actionslider_label_set(obj, NULL, label);
-}
-
-EAPI void
-elm_actionslider_labels_get(const Evas_Object *obj, const char **left_label, const char **center_label, const char **right_label)
-{
-   if (left_label) *left_label= NULL;
-   if (center_label) *center_label= NULL;
-   if (right_label) *right_label= NULL;
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-
-   if (left_label) *left_label = _elm_actionslider_label_get(obj, "left");
-   if (center_label) *center_label = _elm_actionslider_label_get(obj, "center");
-   if (right_label) *right_label = _elm_actionslider_label_get(obj, "right");
-}
-
-EAPI void
-elm_actionslider_indicator_label_set(Evas_Object *obj, const char *label)
-{
-   _elm_actionslider_label_set(obj, NULL, label);
-}
-
-EAPI const char *
-elm_actionslider_indicator_label_get(Evas_Object *obj)
-{
-   return _elm_actionslider_label_get(obj, NULL);
-}
-
-EAPI void
-elm_actionslider_hold(Evas_Object *obj, Eina_Bool flag)
-{
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-
-   wd->mouse_hold = flag;
-}

diff --git a/src/lib/elm_actionslider.h b/src/lib/elm_actionslider.h
index 51ed2f9..1f2e1f5 100644 (file)
--- a/src/lib/elm_actionslider.h
+++ b/src/lib/elm_actionslider.h
@@ -117,18 +117,6 @@ EAPI void                        elm_actionslider_enabled_pos_set(Evas_Object *o
  */
 EAPI Elm_Actionslider_Pos        elm_actionslider_enabled_pos_get(const Evas_Object *obj);
 
-/*
- *  Deprecated API support
- */
-
-typedef enum
-  {
-     ELM_ACTIONSLIDER_LABEL_LEFT,
-     ELM_ACTIONSLIDER_LABEL_RIGHT,
-     ELM_ACTIONSLIDER_LABEL_CENTER,
-     ELM_ACTIONSLIDER_LABEL_BUTTON
-  } Elm_Actionslider_Label_Pos;
-
 /**
  * @}
  */

diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index c822cf2..040d156 100644 (file)
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -197,16 +197,6 @@ _text_day_color_update(Widget_Data *wd, int pos)
    edje_object_signal_emit(wd->calendar, emission, "elm");
 }
 
-// EINA_DEPRECATED
-static void
-_text_day_color_set(Widget_Data *wd, Day_Color col, int pos)
-{
-   if ((pos < 0) || (pos >= 42)) return;
-   if (wd->day_color[pos] == col) return;
-   wd->day_color[pos] = col;
-   _text_day_color_update(wd, pos);
-}
-
 static void
 _set_month_year(Widget_Data *wd)
 {
@@ -995,30 +985,3 @@ elm_calendar_marks_draw(Evas_Object *obj)
    if (!wd) return;
    _populate(obj);
 }
-
-EINA_DEPRECATED EAPI void
-elm_calendar_text_saturday_color_set(Evas_Object *obj, int pos)
-{
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   _text_day_color_set(wd, DAY_SATURDAY, pos);
-}
-
-EINA_DEPRECATED EAPI void
-elm_calendar_text_sunday_color_set(Evas_Object *obj, int pos)
-{
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   _text_day_color_set(wd, DAY_SUNDAY, pos);
-}
-
-EINA_DEPRECATED EAPI void
-elm_calendar_text_weekday_color_set(Evas_Object *obj, int pos)
-{
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   _text_day_color_set(wd, DAY_WEEKDAY, pos);
-}

diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index 455e748..6c5ced0 100644 (file)
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -671,24 +671,6 @@ elm_conformant_add(Evas_Object *parent)
    return obj;
 }
 
-EAPI void
-elm_conformant_content_set(Evas_Object *obj, Evas_Object *content)
-{
-   _content_set_hook(obj, NULL, content);
-}
-
-EAPI Evas_Object *
-elm_conformant_content_get(const Evas_Object *obj)
-{
-   return _content_get_hook(obj, NULL);
-}
-
-EAPI Evas_Object *
-elm_conformant_content_unset(Evas_Object *obj)
-{
-   return _content_unset_hook(obj, NULL);
-}
-
 EINA_DEPRECATED EAPI Evas_Object *
 elm_conformant_content_area_get(const Evas_Object *obj)
 {