[EGIT] [core/elementary] master 36/59: elm_label.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.

[Daniel Juyung Seo]

seoz pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=03479224957d47ccdac89813fe1cd92d8c57819b

commit 03479224957d47ccdac89813fe1cd92d8c57819b
Author: Daniel Juyung Seo <seojuyu...@gmail.com>
Date:   Sat Oct 5 17:14:43 2013 +0900

    elm_label.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro.
---
 src/lib/elm_label.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index 32fa2bb..05b59b3 100644
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -33,7 +33,7 @@ static void
 _recalc(void *data)
 {
    ELM_LABEL_DATA_GET(data, sd);
-   Elm_Widget_Smart_Data *wd = eo_data_scope_get(data, ELM_OBJ_WIDGET_CLASS);
+   ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
 
    Evas_Coord minw = -1, minh = -1;
    Evas_Coord resw;
@@ -81,7 +81,7 @@ _label_slide_change(Evas_Object *obj)
    int plainlen = 0;
 
    ELM_LABEL_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_signal_emit(wd->resize_obj, "elm,state,slide,stop", "elm");
 
@@ -162,7 +162,7 @@ _elm_label_smart_theme(Eo *obj, void *_pd, va_list *list)
    Eina_Bool int_ret = EINA_FALSE;
 
    Elm_Label_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);
 
    evas_event_freeze(evas_object_evas_get(obj));
 
@@ -186,7 +186,7 @@ _elm_label_smart_sizing_eval(Eo *obj, void *_pd 
EINA_UNUSED, va_list *list EINA_
    Evas_Coord resw, resh;
 
    ELM_LABEL_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);
 
    if (sd->linewrap)
      {
@@ -324,7 +324,7 @@ static void
 _elm_label_smart_text_set(Eo *obj, void *_pd, va_list *list)
 {
    Elm_Label_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);
    const char *part = va_arg(*list, const char *);
    const char *label = va_arg(*list, const char *);
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
@@ -379,7 +379,7 @@ static void
 _elm_label_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 {
    Elm_Label_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());
 
@@ -449,7 +449,7 @@ _line_wrap_set(Eo *obj, void *_pd, va_list *list)
    int len;
 
    Elm_Label_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);
 
    if (sd->linewrap == wrap) return;
 
@@ -516,7 +516,7 @@ _wrap_width_set(Eo *obj, void *_pd, va_list *list)
 {
    Evas_Coord w = va_arg(*list, Evas_Coord);
    Elm_Label_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);
 
    if (w < 0) w = 0;
 
@@ -563,7 +563,7 @@ _ellipsis_set(Eo *obj, void *_pd, va_list *list)
    const char *text;
 
    Elm_Label_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);
 
    if (sd->ellipsis == ellipsis) return;
    sd->ellipsis = ellipsis;

--