seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=d11bcdffcca503abce97d70ec74c822d8423058d
commit d11bcdffcca503abce97d70ec74c822d8423058d Author: Daniel Juyung Seo <seojuyu...@gmail.com> Date: Sat Oct 5 17:15:46 2013 +0900 elm_slider.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro. --- src/lib/elm_slider.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c index 15660db..162d423 100644 --- a/src/lib/elm_slider.c +++ b/src/lib/elm_slider.c @@ -62,7 +62,7 @@ _val_fetch(Evas_Object *obj, Eina_Bool user_event) double posx = 0.0, posy = 0.0, pos = 0.0, val; ELM_SLIDER_DATA_GET(obj, sd); - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); edje_object_part_drag_value_get (wd->resize_obj, "elm.dragable.slider", &posx, &posy); @@ -110,7 +110,7 @@ _val_set(Evas_Object *obj) (sd->horizontal && !sd->inverted)))) pos = 1.0 - pos; - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); edje_object_part_drag_value_set (wd->resize_obj, "elm.dragable.slider", pos, pos); } @@ -264,7 +264,7 @@ _drag_up(void *data, if (sd->inverted) step *= -1.0; - Elm_Widget_Smart_Data *wd = eo_data_scope_get(data, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(data, wd); edje_object_part_drag_step (wd->resize_obj, "elm.dragable.slider", step, step); } @@ -282,7 +282,7 @@ _drag_down(void *data, if (sd->inverted) step *= -1.0; - Elm_Widget_Smart_Data *wd = eo_data_scope_get(data, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(data, wd); edje_object_part_drag_step (wd->resize_obj, "elm.dragable.slider", step, step); } @@ -472,7 +472,7 @@ _elm_slider_smart_theme(Eo *obj, void *_pd, va_list *list) if (ret) *ret = EINA_FALSE; Eina_Bool int_ret; Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS); - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); if (sd->horizontal) { @@ -536,8 +536,7 @@ _elm_slider_smart_theme(Eo *obj, void *_pd, va_list *list) static void _elm_slider_smart_sizing_eval(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) { - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); - + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1; elm_coords_finger_size_adjust(1, &minw, 1, &minh); @@ -578,7 +577,7 @@ _spacer_down_cb(void *data, if (button_y < 0) button_y = 0; } - Elm_Widget_Smart_Data *wd = eo_data_scope_get(data, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(data, wd); edje_object_part_drag_value_set (wd->resize_obj, "elm.dragable.slider", button_x, button_y); @@ -643,7 +642,7 @@ _spacer_move_cb(void *data, if (button_y < 0) button_y = 0; } - Elm_Widget_Smart_Data *wd = eo_data_scope_get(data, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(data, wd); edje_object_part_drag_value_set (wd->resize_obj, "elm.dragable.slider", button_x, button_y); @@ -795,7 +794,7 @@ static void _elm_slider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) { Elm_Slider_Smart_Data *priv = _pd; - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); @@ -977,7 +976,7 @@ _elm_slider_unit_format_set(Eo *obj, void *_pd, va_list *list) { const char *units = va_arg(*list, const char *); Elm_Slider_Smart_Data *sd = _pd; - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); eina_stringshare_replace(&sd->units, units); if (units) @@ -1188,7 +1187,7 @@ _elm_slider_inverted_set(Eo *obj, void *_pd, va_list *list) { Eina_Bool inverted = va_arg(*list, int); Elm_Slider_Smart_Data *sd = _pd; - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); inverted = !!inverted; if (sd->inverted == inverted) return; --