Clean elm of undefined assigned values

SVN revision: 53398
This commit is contained in:
Bruno Dilly 2010-10-14 14:11:53 +00:00
parent 21e71c932e
commit 294fa1d974
3 changed files with 17 additions and 27 deletions

View File

@ -852,9 +852,8 @@ elm_diskpicker_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *
ELM_CHECK_WIDTYPE(obj, widtype);
Elm_Smart_Scroller_Policy s_policy_h, s_policy_v;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
if (wd->scroller)
elm_smart_scroller_policy_get(wd->scroller, &s_policy_h, &s_policy_v);
if (!wd || !wd->scroller) return;
elm_smart_scroller_policy_get(wd->scroller, &s_policy_h, &s_policy_v);
*policy_h = (Elm_Scroller_Policy) s_policy_h;
*policy_v = (Elm_Scroller_Policy) s_policy_v;
}

View File

@ -2058,9 +2058,8 @@ elm_list_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
Elm_Smart_Scroller_Policy s_policy_h, s_policy_v;
if (!wd) return;
if (wd->scr)
elm_smart_scroller_policy_get(wd->scr, &s_policy_h, &s_policy_v);
if (!wd || !wd->scr) return;
elm_smart_scroller_policy_get(wd->scr, &s_policy_h, &s_policy_v);
*policy_h = (Elm_Scroller_Policy) s_policy_h;
*policy_v = (Elm_Scroller_Policy) s_policy_v;
}

View File

@ -620,9 +620,8 @@ elm_scroller_region_show(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coor
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
if (wd->scr)
elm_smart_scroller_child_region_show(wd->scr, x, y, w, h);
if (!wd || !wd->scr) return;
elm_smart_scroller_child_region_show(wd->scr, x, y, w, h);
}
/**
@ -651,10 +650,9 @@ elm_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scro
ELM_SMART_SCROLLER_POLICY_ON,
ELM_SMART_SCROLLER_POLICY_OFF
};
if (!wd) return;
if (!wd || !wd->scr) return;
if ((policy_h >= 3) || (policy_v >= 3)) return;
if (wd->scr)
elm_smart_scroller_policy_set(wd->scr, map[policy_h], map[policy_v]);
elm_smart_scroller_policy_set(wd->scr, map[policy_h], map[policy_v]);
}
EAPI void
@ -663,9 +661,8 @@ elm_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy_h, E
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
Elm_Smart_Scroller_Policy s_policy_h, s_policy_v;
if (!wd) return;
if (wd->scr)
elm_smart_scroller_policy_get(wd->scr, &s_policy_h, &s_policy_v);
if (!wd || !wd->scr) return;
elm_smart_scroller_policy_get(wd->scr, &s_policy_h, &s_policy_v);
*policy_h = (Elm_Scroller_Policy) s_policy_h;
*policy_v = (Elm_Scroller_Policy) s_policy_v;
}
@ -690,12 +687,9 @@ elm_scroller_region_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Ev
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
if (wd->scr)
{
if ((x) && (y)) elm_smart_scroller_child_pos_get(wd->scr, x, y);
if ((w) && (h)) elm_smart_scroller_child_viewport_size_get(wd->scr, w, h);
}
if (!wd || !wd->scr) return;
if ((x) && (y)) elm_smart_scroller_child_pos_get(wd->scr, x, y);
if ((w) && (h)) elm_smart_scroller_child_viewport_size_get(wd->scr, w, h);
}
/**
@ -739,9 +733,8 @@ elm_scroller_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
if (wd->scr)
elm_smart_scroller_bounce_allow_set(wd->scr, h_bounce, v_bounce);
if (!wd || !wd->scr) return;
elm_smart_scroller_bounce_allow_set(wd->scr, h_bounce, v_bounce);
}
/**
@ -827,7 +820,6 @@ elm_scroller_region_bring_in(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
if (wd->scr)
elm_smart_scroller_region_bring_in(wd->scr, x, y, w, h);
if (!wd || !wd->scr) return;
elm_smart_scroller_region_bring_in(wd->scr, x, y, w, h);
}