Formatting.
authorChristopher Michael <cpmichael1@comcast.net>
Sat, 26 Sep 2009 17:46:05 +0000 (17:46 +0000)
committerChristopher Michael <cpmichael1@comcast.net>
Sat, 26 Sep 2009 17:46:05 +0000 (17:46 +0000)
Remove some duplicate code.

SVN revision: 42717

src/lib/elm_check.c

index 52772d5..c0ba760 100644 (file)
@@ -23,8 +23,7 @@ typedef struct _Widget_Data Widget_Data;
 
 struct _Widget_Data
 {
-   Evas_Object *chk;
-   Evas_Object *icon;
+   Evas_Object *chk, *icon;
    Eina_Bool state;
    Eina_Bool *statep;
    const char *label;
@@ -113,8 +112,8 @@ _sub_del(void *data, Evas_Object *obj, void *event_info)
    if (sub == wd->icon)
      {
        edje_object_signal_emit(wd->chk, "elm,state,icon,hidden", "elm");
-       evas_object_event_callback_del
-         (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints);
+       evas_object_event_callback_del(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, 
+                                       _changed_size_hints);
        wd->icon = NULL;
        _sizing_eval(obj);
      }
@@ -180,9 +179,12 @@ elm_check_add(Evas_Object *parent)
 
    wd->chk = edje_object_add(e);
    _elm_theme_set(wd->chk, "check", "base", "default");
-   edje_object_signal_callback_add(wd->chk, "elm,action,check,on", "", _signal_check_on, obj);
-   edje_object_signal_callback_add(wd->chk, "elm,action,check,off", "", _signal_check_off, obj);
-   edje_object_signal_callback_add(wd->chk, "elm,action,check,toggle", "", _signal_check_toggle, obj);
+   edje_object_signal_callback_add(wd->chk, "elm,action,check,on", "", 
+                                   _signal_check_on, obj);
+   edje_object_signal_callback_add(wd->chk, "elm,action,check,off", "", 
+                                   _signal_check_off, obj);
+   edje_object_signal_callback_add(wd->chk, "elm,action,check,toggle", "", 
+                                   _signal_check_toggle, obj);
    elm_widget_resize_object_set(obj, wd->chk);
 
    evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
@@ -210,14 +212,13 @@ elm_check_label_set(Evas_Object *obj, const char *label)
      {
        wd->label = eina_stringshare_add(label);
        edje_object_signal_emit(wd->chk, "elm,state,text,visible", "elm");
-       edje_object_message_signal_process(wd->chk);
      }
    else
      {
        wd->label = NULL;
        edje_object_signal_emit(wd->chk, "elm,state,text,hidden", "elm");
-       edje_object_message_signal_process(wd->chk);
      }
+   edje_object_message_signal_process(wd->chk);
    edje_object_part_text_set(wd->chk, "elm.text", label);
    _sizing_eval(obj);
 }
@@ -235,7 +236,6 @@ elm_check_label_get(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
-
    return wd->label;
 }
 
@@ -346,7 +346,6 @@ EAPI void
 elm_check_state_pointer_set(Evas_Object *obj, Eina_Bool *statep)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-
    if (statep)
      {
        wd->statep = statep;
@@ -360,7 +359,5 @@ elm_check_state_pointer_set(Evas_Object *obj, Eina_Bool *statep)
          }
      }
    else
-     {
-       wd->statep = NULL;
-     }
+     wd->statep = NULL;
 }