remove warning

diff --git a/src/lib/elm_multibuttonentry.c b/src/lib/elm_multibuttonentry.c
index a3bd063..95d142d 100644 (file)
--- a/src/lib/elm_multibuttonentry.c
+++ b/src/lib/elm_multibuttonentry.c
@@ -7,10 +7,10 @@
  *\r
  * This is a Multibuttonentry.\r
  */\r
-      \r
-#define MAX_STR 256      \r
-#define MAX_W_BTN 200      \r
-#define MIN_W_ENTRY 20   \r
+\r
+#define MAX_STR 256\r
+#define MAX_W_BTN 200\r
+#define MIN_W_ENTRY 20\r
 \r
 typedef enum _Multibuttonentry_Pos\r
 {\r
@@ -28,18 +28,18 @@ typedef enum _Multibuttonentry_Button_State
    MULTIBUTONENTRY_BUTTON_STATE_NUM\r
 } Multibuttonentry_Button_State;\r
 \r
-struct _Multibuttonentry_Item \r
+struct _Multibuttonentry_Item\r
    {\r
    Evas_Object *multibuttonentry;\r
    Evas_Object *button;\r
    Evas_Object *label;\r
    void *data;\r
    Evas_Coord vw, rw; // vw: visual width, real width\r
-   Eina_Bool  visible: 1;   \r
+   Eina_Bool  visible: 1;\r
 };\r
 \r
 typedef struct _Widget_Data Widget_Data;\r
-struct _Widget_Data \r
+struct _Widget_Data\r
    {\r
    Evas_Object *base;\r
    Evas_Object *box;\r
@@ -55,8 +55,8 @@ struct _Widget_Data
    int n_str;\r
 \r
    Evas_Coord w_box, h_box;\r
-   int  contracted;   \r
-   Eina_Bool  focused: 1;   \r
+   int  contracted;\r
+   Eina_Bool  focused: 1;\r
 };\r
 \r
 static const char *widtype = NULL;\r
@@ -87,10 +87,10 @@ _del_hook(Evas_Object *obj)
    Widget_Data *wd = elm_widget_data_get(obj);\r
    if (!wd) return;\r
 \r
-   if (wd->items) \r
+   if (wd->items)\r
      {\r
         Elm_Multibuttonentry_Item *item;\r
-        EINA_LIST_FREE(wd->items, item) \r
+        EINA_LIST_FREE(wd->items, item)\r
           {\r
              _del_button_obj(obj, item->button);\r
              free(item);\r
@@ -103,7 +103,7 @@ _del_hook(Evas_Object *obj)
    if (wd->entry) evas_object_del (wd->entry);\r
    if (wd->label) evas_object_del (wd->label);\r
    if (wd->guidetext) evas_object_del (wd->guidetext);\r
-   if (wd->end) evas_object_del (wd->end);   \r
+   if (wd->end) evas_object_del (wd->end);\r
 }\r
 \r
 static void\r
@@ -113,16 +113,16 @@ _theme_hook(Evas_Object *obj)
    Eina_List *l;\r
    Elm_Multibuttonentry_Item *item;\r
    if (!wd) return;\r
-   \r
+\r
    _elm_theme_object_set(obj, wd->base, "multibuttonentry", "base", elm_widget_style_get(obj));\r
    if (wd->box)   edje_object_part_swallow (wd->base, "box.swallow", wd->box);\r
    edje_object_scale_set(wd->base, elm_widget_scale_get(obj) * _elm_config->scale);\r
 \r
-   EINA_LIST_FOREACH(wd->items, l, item) \r
+   EINA_LIST_FOREACH(wd->items, l, item)\r
      {\r
-        if (item->button)   \r
+        if (item->button)\r
          _elm_theme_object_set (obj, item->button, "multibuttonentry", "btn", elm_widget_style_get (obj));\r
-        if (item->label)      \r
+        if (item->label)\r
          edje_object_part_swallow (item->button, "elm.label", item->label);\r
         edje_object_scale_set(item->button, elm_widget_scale_get(obj) * _elm_config->scale);\r
      }\r
@@ -162,15 +162,15 @@ _sizing_eval(Evas_Object *obj)
 \r
    evas_object_size_hint_min_get(wd->box, &minw, &minh);\r
    edje_object_part_geometry_get(wd->base, "top.left.pad", NULL, NULL, &left, &top);\r
-   edje_object_part_geometry_get(wd->base, "bottom.right.pad", NULL, NULL, &right, &bottom);   \r
+   edje_object_part_geometry_get(wd->base, "bottom.right.pad", NULL, NULL, &right, &bottom);\r
 \r
    minw += (left + right);\r
    minh += (top + bottom);\r
-   \r
+\r
    evas_object_size_hint_min_set(obj, minw, minh);\r
 }\r
 \r
-static void \r
+static void\r
 _signal_mouse_clicked(void *data, Evas_Object *obj, const char *emission, const char *source)\r
 {\r
    Widget_Data *wd = elm_widget_data_get(data);\r
@@ -181,7 +181,7 @@ _signal_mouse_clicked(void *data, Evas_Object *obj, const char *emission, const
    evas_object_smart_callback_call(data, "clicked", NULL);\r
 }\r
 \r
-static void \r
+static void\r
 _changed_size_hint_cb(void *data, Evas *evas, Evas_Object *obj, void *event)\r
 {\r
    Evas_Object *eo = (Evas_Object *)data;\r
@@ -190,7 +190,7 @@ _changed_size_hint_cb(void *data, Evas *evas, Evas_Object *obj, void *event)
    _sizing_eval(eo);\r
 }\r
 \r
-static void \r
+static void\r
 _resize_cb(void *data, Evas *evas, Evas_Object *obj, void *event)\r
 {\r
    Widget_Data *wd = elm_widget_data_get(data);\r
@@ -241,13 +241,13 @@ _contracted_state_set(Evas_Object *obj, int contracted)
    elm_scrolled_entry_entry_set(wd->entry, "");\r
 \r
    if (contracted == 1)\r
-     {      \r
+     {\r
         Evas_Coord w=0, w_tmp=0;\r
-        \r
+\r
         // unpack all items and entry\r
-        EINA_LIST_FOREACH(wd->items, l, item) \r
+        EINA_LIST_FOREACH(wd->items, l, item)\r
           {\r
-             if (item) \r
+             if (item)\r
                {\r
                   elm_box_unpack(wd->box, item->button);\r
                   evas_object_hide(item->button);\r
@@ -257,7 +257,7 @@ _contracted_state_set(Evas_Object *obj, int contracted)
         elm_box_unpack(wd->box, wd->entry);\r
         evas_object_hide(wd->entry);\r
 \r
-        \r
+\r
         // pack buttons only 1line\r
         w = wd->w_box;\r
 \r
@@ -269,13 +269,13 @@ _contracted_state_set(Evas_Object *obj, int contracted)
         if (wd->label) evas_object_size_hint_min_get (wd->label, &w_tmp, NULL);\r
         w -= w_tmp;\r
 \r
-        // w -= w_btns \r
-        Eina_Bool on_contracted = EINA_FALSE;        \r
+        // w -= w_btns\r
+        Eina_Bool on_contracted = EINA_FALSE;\r
         item = NULL;\r
         int count = eina_list_count(wd->items);\r
-        EINA_LIST_FOREACH(wd->items, l, item) \r
+        EINA_LIST_FOREACH(wd->items, l, item)\r
           {\r
-             if (item) \r
+             if (item)\r
                {\r
                   int w_label_count = 0;\r
                   char buf[MAX_STR] = {0,};\r
@@ -283,10 +283,10 @@ _contracted_state_set(Evas_Object *obj, int contracted)
                   elm_box_pack_end(wd->box, item->button);\r
                   evas_object_show(item->button);\r
                   item->visible = EINA_TRUE;\r
-                  \r
+\r
                   w -= item->vw;\r
                   count--;\r
-                  \r
+\r
                   if (count > 0)\r
                     {\r
                        snprintf(buf, sizeof(buf), "... + %d", count);\r
@@ -310,7 +310,7 @@ _contracted_state_set(Evas_Object *obj, int contracted)
 \r
                        on_contracted = EINA_TRUE;\r
                        wd->contracted = contracted;\r
-                       evas_object_smart_callback_call(obj, "contracted,state,changed", wd->contracted);\r
+                       evas_object_smart_callback_call(obj, "contracted,state,changed", (void *)wd->contracted);\r
 \r
                        break;\r
                     }\r
@@ -334,7 +334,7 @@ _contracted_state_set(Evas_Object *obj, int contracted)
 \r
         // pack remain btns\r
         item = NULL;\r
-        EINA_LIST_FOREACH(wd->items, l, item) \r
+        EINA_LIST_FOREACH(wd->items, l, item)\r
           {\r
              if (item && !item->visible)\r
                {\r
@@ -350,41 +350,41 @@ _contracted_state_set(Evas_Object *obj, int contracted)
            elm_object_focus(wd->entry);\r
 \r
         wd->contracted = contracted;\r
-        evas_object_smart_callback_call(obj, "contracted,state,changed", wd->contracted);\r
+        evas_object_smart_callback_call(obj, "contracted,state,changed", (void *)wd->contracted);\r
      }\r
 }\r
 \r
-static void \r
+static void\r
 _view_update(Evas_Object *obj)\r
 {\r
    Evas_Coord room = 0, w = 0;\r
-   Widget_Data *wd = elm_widget_data_get(obj);   \r
+   Widget_Data *wd = elm_widget_data_get(obj);\r
    if (!wd || !wd->box || !wd->entry || !(wd->w_box > 0)) return;\r
 \r
    room = wd->w_box;\r
    room -= MIN_W_ENTRY;\r
-   \r
+\r
    if (wd->rect)\r
-        {\r
-           evas_object_size_hint_min_get (wd->rect, &w, NULL);\r
+     {\r
+        evas_object_size_hint_min_get (wd->rect, &w, NULL);\r
         room -= w;\r
      }\r
-   \r
+\r
    // update label\r
    if (wd->label)\r
-        {\r
+     {\r
         elm_box_unpack(wd->box, wd->label);\r
-           if (wd->rect) elm_box_pack_after (wd->box, wd->label, wd->rect);\r
+        if (wd->rect) elm_box_pack_after (wd->box, wd->label, wd->rect);\r
         else elm_box_pack_start(wd->box, wd->label);\r
         evas_object_show(wd->label);\r
-        elm_label_wrap_width_set(wd->label, room);     \r
+        elm_label_wrap_width_set(wd->label, room);\r
         evas_object_size_hint_min_get(wd->label, &w, NULL);\r
         room -= w;\r
-        }\r
+     }\r
 \r
    if (wd->guidetext)\r
-      evas_object_size_hint_min_set(wd->guidetext, room, 0);   \r
-   \r
+     evas_object_size_hint_min_set(wd->guidetext, room, 0);\r
+\r
    // update buttons in contracted mode\r
    if (wd->contracted == 1)\r
      {\r
@@ -396,11 +396,11 @@ _view_update(Evas_Object *obj)
    if (wd->contracted != 1)\r
      {\r
         if (wd->guidetext && !eina_list_count (wd->items) && !elm_widget_focus_get(obj) && !wd->focused)\r
-          {            \r
+          {\r
              elm_box_unpack(wd->box, wd->guidetext);\r
              elm_box_unpack(wd->box, wd->entry);\r
              evas_object_hide(wd->entry);\r
-             elm_box_pack_end(wd->box, wd->guidetext);                     \r
+             elm_box_pack_end(wd->box, wd->guidetext);\r
              evas_object_show(wd->guidetext);\r
           }\r
         else\r
@@ -462,8 +462,8 @@ _change_current_button_state(Evas_Object *obj, Multibuttonentry_Button_State sta
    Elm_Multibuttonentry_Item *item = NULL;\r
    if (!wd) return;\r
 \r
-   if (wd->current)   \r
-      item = eina_list_data_get(wd->current);\r
+   if (wd->current)\r
+     item = eina_list_data_get(wd->current);\r
 \r
    if (item && item->button)\r
      {\r
@@ -495,9 +495,9 @@ _change_current_button(Evas_Object *obj, Evas_Object *btn)
 \r
    // change the state of previous button to "default"\r
    _change_current_button_state(obj, MULTIBUTONENTRY_BUTTON_STATE_DEFAULT);\r
-   \r
+\r
    // change the current\r
-   EINA_LIST_FOREACH(wd->items, l, item) \r
+   EINA_LIST_FOREACH(wd->items, l, item)\r
      {\r
         if (item->button == btn)\r
           {\r
@@ -508,7 +508,7 @@ _change_current_button(Evas_Object *obj, Evas_Object *btn)
 \r
    // chagne the state of current button to "focused"\r
    _change_current_button_state(obj, MULTIBUTONENTRY_BUTTON_STATE_SELECTED);\r
-   \r
+\r
 }\r
 \r
 static void\r
@@ -522,13 +522,13 @@ _button_clicked(void *data, Evas_Object *obj, const char *emission, const char *
    strncpy(str, elm_scrolled_entry_entry_get(wd->entry), MAX_STR);\r
    str[MAX_STR - 1]= 0;\r
 \r
-   if (strlen (str))   \r
+   if (strlen (str))\r
       _add_button(data, str);\r
 \r
    _change_current_button(data, obj);\r
 \r
    if (wd->current)\r
-      if(item = eina_list_data_get(wd->current))\r
+      if((item = eina_list_data_get(wd->current)) != NULL)\r
          evas_object_smart_callback_call(data, "item,clicked", item);\r
 }\r
 \r
@@ -538,16 +538,16 @@ _del_button_obj(Evas_Object *obj, Evas_Object *btn)
    Widget_Data *wd = elm_widget_data_get(obj);\r
    Evas_Object *label;\r
    if (!wd || !btn)   return;\r
-   \r
+\r
    if (btn)\r
-     {   \r
+     {\r
         // del label\r
         label = edje_object_part_swallow_get(btn, "elm.label");\r
         edje_object_part_unswallow(btn, label);\r
-        evas_object_del(label);            \r
+        evas_object_del(label);\r
 \r
         // del button\r
-        evas_object_del(btn);      \r
+        evas_object_del(btn);\r
      }\r
 }\r
 \r
@@ -563,17 +563,17 @@ _del_button_item(Elm_Multibuttonentry_Item *item)
    wd = elm_widget_data_get(obj);\r
    if (!wd) return;\r
 \r
-   EINA_LIST_FOREACH(wd->items, l, _item) \r
+   EINA_LIST_FOREACH(wd->items, l, _item)\r
      {\r
-        if (_item == item) \r
+        if (_item == item)\r
           {\r
              wd->items = eina_list_remove(wd->items, _item);\r
              elm_box_unpack(wd->box, _item->button);\r
              evas_object_smart_callback_call(obj, "item,deleted", _item);\r
              _del_button_obj(obj, _item->button);\r
              free(_item);\r
-             if (wd->current == l)   \r
-                wd->current = NULL;\r
+             if (wd->current == l)\r
+               wd->current = NULL;\r
              break;\r
           }\r
      }\r
@@ -589,14 +589,14 @@ _del_button(Evas_Object *obj)
    if (!wd->current)\r
      {\r
         // let the last button focus\r
-        item = eina_list_data_get(eina_list_last(wd->items));   \r
-        if (item->button)   _change_current_button (obj, item->button);            \r
+        item = eina_list_data_get(eina_list_last(wd->items));\r
+        if (item->button)   _change_current_button (obj, item->button);\r
      }\r
    else\r
      {\r
         item = eina_list_data_get(wd->current);\r
         if (item)\r
-          {   \r
+          {\r
              _del_button_item(item);\r
           }\r
      }\r
@@ -612,19 +612,19 @@ _resize_button(Evas_Object *btn, Evas_Object *label, Evas_Coord *realw, Evas_Coo
    evas_object_size_hint_min_get(label, &w_label, &h_label);\r
    edje_object_part_geometry_get(btn, "elm.base", NULL, NULL, NULL, &h_btn);\r
    edje_object_part_geometry_get(btn, "left.padding", NULL, NULL, &padding_outer, NULL);\r
-   edje_object_part_geometry_get(btn, "left.inner.padding", NULL, NULL, &padding_inner, NULL);    \r
-   w_btn = w_label + 2*padding_outer + 2*padding_inner;   \r
+   edje_object_part_geometry_get(btn, "left.inner.padding", NULL, NULL, &padding_inner, NULL);\r
+   w_btn = w_label + 2*padding_outer + 2*padding_inner;\r
 \r
    rw = w_btn;\r
-   vw =(MAX_W_BTN < w_btn) ? MAX_W_BTN : w_btn;    \r
+   vw =(MAX_W_BTN < w_btn) ? MAX_W_BTN : w_btn;\r
 \r
    //resize btn and label\r
    evas_object_resize(btn, vw, h_btn);\r
    evas_object_size_hint_min_set(btn, vw, h_btn);\r
    if ( (rw != vw) &&  (vw - 2*padding_outer - 2*padding_inner >=0))\r
      {\r
-        evas_object_resize(label, vw - 2*padding_outer - 2*padding_inner, h_label);   \r
-        elm_label_wrap_width_set(label, vw - 2*padding_outer - 2*padding_inner ); \r
+        evas_object_resize(label, vw - 2*padding_outer - 2*padding_inner, h_label);\r
+        elm_label_wrap_width_set(label, vw - 2*padding_outer - 2*padding_inner );\r
      }\r
 \r
    if(realw) *realw = rw;\r
@@ -659,7 +659,7 @@ _add_button_item(Evas_Object *obj, const char *str, Multibuttonentry_Pos pos, co
 \r
    // append item list\r
    item = ELM_NEW(Elm_Multibuttonentry_Item);\r
-   if (item) \r
+   if (item)\r
      {\r
         Evas_Coord rw, vw;\r
         _resize_button(btn, label, &rw, &vw);\r
@@ -669,9 +669,9 @@ _add_button_item(Evas_Object *obj, const char *str, Multibuttonentry_Pos pos, co
         item->label = label;\r
         item->data = data;\r
         item->rw = rw;\r
-        item->vw = vw;      \r
+        item->vw = vw;\r
         item->visible = EINA_TRUE;\r
-        \r
+\r
         switch(pos)\r
           {\r
              case MULTIBUTONENTRY_POS_START:\r
@@ -688,7 +688,7 @@ _add_button_item(Evas_Object *obj, const char *str, Multibuttonentry_Pos pos, co
                 break;\r
              case MULTIBUTONENTRY_POS_BEFORE:\r
                 if (reference)\r
-                  {   \r
+                  {\r
                      wd->items = eina_list_prepend_relative(wd->items, item, reference);\r
                      elm_box_pack_before(wd->box, btn, reference->button);\r
                      _view_update(obj);\r
@@ -702,12 +702,13 @@ _add_button_item(Evas_Object *obj, const char *str, Multibuttonentry_Pos pos, co
                 break;\r
              case MULTIBUTONENTRY_POS_AFTER:\r
                 if (reference)\r
-                  {   \r
+                  {\r
                      wd->items = eina_list_append_relative(wd->items, item, reference);\r
                      elm_box_pack_after(wd->box, btn, reference->button);\r
-                     _view_update(obj);                  }\r
+                     _view_update(obj);\r
+                  }\r
                 else\r
-                  {   \r
+                  {\r
                      wd->items = eina_list_append(wd->items, item);\r
                      _view_update(obj);\r
                      elm_box_pack_before(wd->box, btn, wd->entry);\r
@@ -741,15 +742,15 @@ _evas_key_up_cb(void *data, Evas *e , Evas_Object *obj , void *event_info )
 {\r
    Widget_Data *wd = elm_widget_data_get(data);\r
    Evas_Event_Key_Up *ev = (Evas_Event_Key_Up *) event_info;\r
-   static char str[MAX_STR];   \r
+   static char str[MAX_STR];\r
    if (!wd || !wd->base || !wd->box) return;\r
-   \r
+\r
    strncpy(str, elm_scrolled_entry_entry_get(wd->entry), MAX_STR);\r
    str[MAX_STR - 1]= 0;\r
 \r
    if ( (wd->n_str == 0) &&  (strcmp (str, "") == 0) &&  ( (strcmp (ev->keyname, "BackSpace") == 0)|| (strcmp (ev->keyname, "BackSpace (") == 0)))\r
-     { \r
-        _del_button(data);   \r
+     {\r
+        _del_button(data);\r
      }\r
    else if ( (strcmp (str, "") != 0) &&  (strcmp (ev->keyname, "KP_Enter") == 0 ||strcmp (ev->keyname, "Return") == 0 ))\r
      {\r
@@ -762,15 +763,15 @@ _evas_key_up_cb(void *data, Evas *e , Evas_Object *obj , void *event_info )
         //\r
      }\r
 \r
-   wd->n_str = strlen(str); \r
+   wd->n_str = strlen(str);\r
 }\r
 \r
-static void \r
+static void\r
 _view_init(Evas_Object *obj)\r
-{   \r
-   Widget_Data *wd = elm_widget_data_get(obj);   \r
+{\r
+   Widget_Data *wd = elm_widget_data_get(obj);\r
    if (!wd) return;\r
-   \r
+\r
    if (!wd->box)\r
      {\r
         if (! (wd->box = elm_box_add (obj))) return;\r
@@ -779,7 +780,7 @@ _view_init(Evas_Object *obj)
         elm_box_homogenous_set(wd->box, EINA_FALSE);\r
         edje_object_part_swallow(wd->base, "box.swallow", wd->box);\r
      }\r
-   \r
+\r
    if (!wd->rect)\r
      {\r
         Evas_Coord w, h;\r
@@ -787,13 +788,13 @@ _view_init(Evas_Object *obj)
         _elm_theme_object_set(obj, wd->rect, "multibuttonentry", "rect", elm_widget_style_get(obj));\r
         elm_widget_sub_object_add(obj, wd->rect);\r
         edje_object_part_geometry_get(wd->rect, "elm.base", NULL, NULL, &w, &h);\r
-        evas_object_size_hint_min_set(wd->rect, w, h);      \r
+        evas_object_size_hint_min_set(wd->rect, w, h);\r
         evas_object_size_hint_weight_set(wd->rect, 0.0, EVAS_HINT_EXPAND);\r
         evas_object_size_hint_align_set(wd->rect, EVAS_HINT_FILL, EVAS_HINT_FILL);\r
         if (wd->box)   elm_box_pack_start (wd->box, wd->rect);\r
         evas_object_show(wd->rect);\r
      }\r
-   \r
+\r
    if (!wd->entry)\r
      {\r
         if (! (wd->entry = elm_scrolled_entry_add (obj))) return;\r
@@ -833,7 +834,7 @@ elm_multibuttonentry_add(Evas_Object *parent)
 \r
    wd = ELM_NEW(Widget_Data);\r
    e = evas_object_evas_get(parent);\r
-   if (!e) return NULL; \r
+   if (!e) return NULL;\r
    obj = elm_widget_add(e);\r
    ELM_SET_WIDTYPE(widtype, "multibuttonentry");\r
    elm_widget_type_set(obj, "multibuttonentry");\r
@@ -843,16 +844,16 @@ elm_multibuttonentry_add(Evas_Object *parent)
    elm_widget_del_hook_set(obj, _del_hook);\r
    elm_widget_theme_hook_set(obj, _theme_hook);\r
    elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL);\r
-   elm_widget_signal_emit_hook_set(obj, _signal_emit_hook);   \r
-   \r
+   elm_widget_signal_emit_hook_set(obj, _signal_emit_hook);\r
+\r
    wd->base = edje_object_add(e);\r
    _elm_theme_object_set(obj, wd->base, "multibuttonentry", "base", "default");\r
    elm_widget_resize_object_set(obj, wd->base);\r
-   \r
+\r
    wd->contracted = 0;\r
    wd->focused = EINA_FALSE;\r
    wd->n_str = 0;\r
-   \r
+\r
    _view_init(obj);\r
    _event_init(obj);\r
 \r
@@ -909,7 +910,7 @@ elm_multibuttonentry_label_set(Evas_Object *obj, const char *label)
    ELM_CHECK_WIDTYPE(obj, widtype);\r
    Widget_Data *wd = elm_widget_data_get(obj);\r
    if (!wd || !label) return;\r
-   _set_label(obj, label);   \r
+   _set_label(obj, label);\r
 }\r
 \r
 /**\r
@@ -944,14 +945,14 @@ elm_multibuttonentry_guide_text_set(Evas_Object *obj, const char *guidetext)
    ELM_CHECK_WIDTYPE(obj, widtype);\r
    Widget_Data *wd = elm_widget_data_get(obj);\r
    if (!wd || !guidetext) return;\r
-   _set_guidetext(obj, guidetext);   \r
+   _set_guidetext(obj, guidetext);\r
 }\r
 \r
 /**\r
  * Get the value of contracted state.\r
  *\r
  * @param obj The multibuttonentry object\r
- * @param the value of contracted state. \r
+ * @param the value of contracted state.\r
  *\r
  * @ingroup Multibuttonentry\r
  */\r
@@ -968,7 +969,7 @@ elm_multibuttonentry_contracted_state_get(Evas_Object *obj)
  * Set/Unset the multibuttonentry to contracted state of single line\r
  *\r
  * @param obj The multibuttonentry object\r
- * @param the value of contracted state. set this to 1 to set the multibuttonentry to contracted state of single line. set this to 0 to unset the contracted state. \r
+ * @param the value of contracted state. set this to 1 to set the multibuttonentry to contracted state of single line. set this to 0 to unset the contracted state.\r
  *\r
  * @ingroup Multibuttonentry\r
  */\r
@@ -982,7 +983,7 @@ elm_multibuttonentry_contracted_state_set(Evas_Object *obj, int contracted)
 }\r
 \r
 /**\r
- * Prepend a new item to the multibuttonentry \r
+ * Prepend a new item to the multibuttonentry\r
  *\r
  * @param obj The multibuttonentry object\r
  * @param label The label of new item\r
@@ -999,11 +1000,11 @@ elm_multibuttonentry_item_add_start(Evas_Object *obj, const char *label, void *d
    Elm_Multibuttonentry_Item *item;\r
    if (!wd || !label) return NULL;\r
    item = _add_button_item(obj, label, MULTIBUTONENTRY_POS_START, NULL, data);\r
-   return item; \r
+   return item;\r
 }\r
 \r
 /**\r
- * Append a new item to the multibuttonentry \r
+ * Append a new item to the multibuttonentry\r
  *\r
  * @param obj The multibuttonentry object\r
  * @param label The label of new item\r
@@ -1020,7 +1021,7 @@ elm_multibuttonentry_item_add_end(Evas_Object *obj, const char *label, void *dat
    Elm_Multibuttonentry_Item *item;\r
    if (!wd || !label) return NULL;\r
    item = _add_button_item(obj, label, MULTIBUTONENTRY_POS_END, NULL, data);\r
-   return item; \r
+   return item;\r
 }\r
 \r
 /**\r
@@ -1043,7 +1044,7 @@ elm_multibuttonentry_item_add_before(Evas_Object *obj, const char *label, Elm_Mu
    Elm_Multibuttonentry_Item *item;\r
    if (!wd || !label) return NULL;\r
    item = _add_button_item(obj, label, MULTIBUTONENTRY_POS_BEFORE, before, data);\r
-   return item; \r
+   return item;\r
 }\r
 \r
 /**\r
@@ -1065,7 +1066,7 @@ elm_multibuttonentry_item_add_after(Evas_Object *obj, const char *label, Elm_Mul
    Elm_Multibuttonentry_Item *item;\r
    if (!wd || !label) return NULL;\r
    item = _add_button_item(obj, label, MULTIBUTONENTRY_POS_AFTER, after, data);\r
-   return item; \r
+   return item;\r
 }\r
 \r
 /**\r
@@ -1154,9 +1155,9 @@ elm_multibuttonentry_item_selected_set(Elm_Multibuttonentry_Item *item)
    wd = elm_widget_data_get(item->multibuttonentry);\r
    if (!wd) return;\r
 \r
-   EINA_LIST_FOREACH(wd->items, l, _item) \r
+   EINA_LIST_FOREACH(wd->items, l, _item)\r
      {\r
-        if (_item == item) \r
+        if (_item == item)\r
           {\r
              _change_current_button(item->multibuttonentry, item->button);\r
           }\r
@@ -1192,14 +1193,14 @@ elm_multibuttonentry_items_del(Evas_Object *obj)
    ELM_CHECK_WIDTYPE(obj, widtype);\r
    Widget_Data *wd = elm_widget_data_get(obj);\r
    if (!wd) return;\r
-   \r
+\r
    if (wd->contracted == 1)\r
       _contracted_state_set(obj, 0);\r
-      \r
+\r
    if (wd->items)\r
      {\r
         Elm_Multibuttonentry_Item *item;\r
-        EINA_LIST_FREE(wd->items, item) \r
+        EINA_LIST_FREE(wd->items, item)\r
           {\r
              elm_box_unpack(wd->box, item->button);\r
              _del_button_obj(obj, item->button);\r
@@ -1266,14 +1267,14 @@ elm_multibuttonentry_item_label_set(Elm_Multibuttonentry_Item *item, const char
 {\r
    Widget_Data *wd;\r
    Eina_List *l;\r
-   Elm_Multibuttonentry_Item *_item;  \r
+   Elm_Multibuttonentry_Item *_item;\r
    if (!item || !str) return;\r
    ELM_CHECK_WIDTYPE(item->multibuttonentry, widtype);\r
    wd = elm_widget_data_get(item->multibuttonentry);\r
    if (!wd || !wd->items) return;\r
 \r
    EINA_LIST_FOREACH(wd->items, l, _item)\r
-      if (_item == item) \r
+      if (_item == item)\r
         {\r
            Evas_Object *label = edje_object_part_swallow_get(_item->button, "elm.label");\r
            if (label)   elm_label_label_set (label, str);\r
@@ -1302,7 +1303,7 @@ elm_multibuttonentry_item_prev(Elm_Multibuttonentry_Item *item)
    if (!wd || !wd->items) return NULL;\r
 \r
    EINA_LIST_FOREACH(wd->items, l, _item)\r
-      if (_item == item) \r
+      if (_item == item)\r
         {\r
            l = eina_list_prev(l);\r
            if (!l) return NULL;\r
@@ -1331,7 +1332,7 @@ elm_multibuttonentry_item_next(Elm_Multibuttonentry_Item *item)
    if (!wd || !wd->items) return NULL;\r
 \r
    EINA_LIST_FOREACH(wd->items, l, _item)\r
-      if (_item == item) \r
+      if (_item == item)\r
         {\r
            l = eina_list_next(l);\r
            if (!l) return NULL;\r