From 6eb885f2c513311020fb4794309025625ec498c4 Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Tue, 6 Mar 2012 11:51:42 +0000 Subject: [PATCH] elm: Formatting. No spacing after casting. Signed-off-by: Daniel Juyung Seo SVN revision: 68807 --- src/lib/elc_ctxpopup.c | 18 ++++++------ src/lib/elc_hoversel.c | 10 +++---- src/lib/elc_multibuttonentry.c | 12 ++++---- src/lib/elc_naviframe.c | 36 ++++++++++++------------ src/lib/elc_popup.c | 20 +++++++------- src/lib/elm_diskselector.c | 22 +++++++-------- src/lib/elm_flipselector.c | 30 ++++++++++---------- src/lib/elm_gengrid.c | 44 +++++++++++++++--------------- src/lib/elm_index.c | 18 ++++++------ src/lib/elm_list.c | 48 ++++++++++++++++---------------- src/lib/elm_main.c | 32 +++++++++++----------- src/lib/elm_menu.c | 52 +++++++++++++++++------------------ src/lib/elm_segment_control.c | 20 +++++++------- src/lib/elm_slideshow.c | 12 ++++---- src/lib/elm_toolbar.c | 62 +++++++++++++++++++++--------------------- src/lib/elm_widget.c | 16 +++++------ 16 files changed, 226 insertions(+), 226 deletions(-) diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c index 191f3e1..37943ec 100644 --- a/src/lib/elc_ctxpopup.c +++ b/src/lib/elc_ctxpopup.c @@ -938,7 +938,7 @@ _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label) if (part && strcmp(part, "default")) return; - ctxpopup_it = (Elm_Ctxpopup_Item *) it; + ctxpopup_it = (Elm_Ctxpopup_Item *)it; wd = elm_widget_data_get(WIDGET(ctxpopup_it)); if (!wd) return; @@ -958,7 +958,7 @@ _item_text_get_hook(const Elm_Object_Item *it, const char *part) { Elm_Ctxpopup_Item *ctxpopup_it; if (part && strcmp(part, "default")) return NULL; - ctxpopup_it = (Elm_Ctxpopup_Item *) it; + ctxpopup_it = (Elm_Ctxpopup_Item *)it; return ctxpopup_it->label; } @@ -972,7 +972,7 @@ _item_content_set_hook(Elm_Object_Item *it, if (part && strcmp(part, "icon")) return; - ctxpopup_it = (Elm_Ctxpopup_Item *) it; + ctxpopup_it = (Elm_Ctxpopup_Item *)it; wd = elm_widget_data_get(WIDGET(ctxpopup_it)); if (!wd) return; @@ -992,7 +992,7 @@ _item_content_get_hook(const Elm_Object_Item *it, const char *part) { Elm_Ctxpopup_Item *ctxpopup_it; if (part && strcmp(part, "icon")) return NULL; - ctxpopup_it = (Elm_Ctxpopup_Item *) it; + ctxpopup_it = (Elm_Ctxpopup_Item *)it; return ctxpopup_it->icon; } @@ -1000,7 +1000,7 @@ static void _item_disable_hook(Elm_Object_Item *it) { Widget_Data *wd; - Elm_Ctxpopup_Item *ctxpopup_it = (Elm_Ctxpopup_Item *) it; + Elm_Ctxpopup_Item *ctxpopup_it = (Elm_Ctxpopup_Item *)it; wd = elm_widget_data_get(WIDGET(ctxpopup_it)); if (!wd) return; @@ -1015,7 +1015,7 @@ static void _item_signal_emit_hook(Elm_Object_Item *it, const char *emission, const char *source) { - Elm_Ctxpopup_Item *ctxpopup_it = (Elm_Ctxpopup_Item *) it; + Elm_Ctxpopup_Item *ctxpopup_it = (Elm_Ctxpopup_Item *)it; edje_object_signal_emit(VIEW(ctxpopup_it), emission, source); } @@ -1164,7 +1164,7 @@ _item_select_cb(void *data, Evas_Object *obj __UNUSED__, if (elm_widget_item_disabled_get(item)) return; if (item->func) - item->func((void*) item->base.data, WIDGET(item), data); + item->func((void*)item->base.data, WIDGET(item), data); } static void @@ -1275,7 +1275,7 @@ static Eina_Bool _item_del_pre_hook(Elm_Object_Item *it) { Widget_Data *wd; - Elm_Ctxpopup_Item *ctxpopup_it = (Elm_Ctxpopup_Item *) it; + Elm_Ctxpopup_Item *ctxpopup_it = (Elm_Ctxpopup_Item *)it; wd = elm_widget_data_get(WIDGET(ctxpopup_it)); if (!wd) return EINA_FALSE; @@ -1537,7 +1537,7 @@ elm_ctxpopup_item_append(Evas_Object *obj, const char *label, _sizing_eval(obj); } - return (Elm_Object_Item *) item; + return (Elm_Object_Item *)item; } EAPI void diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c index a92b032..63012df 100644 --- a/src/lib/elc_hoversel.c +++ b/src/lib/elc_hoversel.c @@ -305,14 +305,14 @@ static const char * _item_text_get_hook(const Elm_Object_Item *it, const char *part) { if (part && strcmp(part, "default")) return NULL; - return ((Elm_Hoversel_Item *) it)->label; + return ((Elm_Hoversel_Item *)it)->label; } static Eina_Bool _item_del_pre_hook(Elm_Object_Item *it) { Widget_Data *wd; - Elm_Hoversel_Item *item = (Elm_Hoversel_Item *) it; + Elm_Hoversel_Item *item = (Elm_Hoversel_Item *)it; wd = elm_widget_data_get(WIDGET(item)); if (!wd) return EINA_FALSE; elm_hoversel_hover_end(WIDGET(item)); @@ -481,14 +481,14 @@ elm_hoversel_item_add(Evas_Object *obj, const char *label, const char *icon_file item->icon_type = icon_type; item->func = func; item->base.data = data; - return (Elm_Object_Item *) item; + return (Elm_Object_Item *)item; } EAPI void elm_hoversel_item_icon_set(Elm_Object_Item *it, const char *icon_file, const char *icon_group, Elm_Icon_Type icon_type) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Hoversel_Item *item = (Elm_Hoversel_Item *) it; + Elm_Hoversel_Item *item = (Elm_Hoversel_Item *)it; eina_stringshare_replace(&item->icon_file, icon_file); eina_stringshare_replace(&item->icon_group, icon_group); item->icon_type = icon_type; @@ -498,7 +498,7 @@ EAPI void elm_hoversel_item_icon_get(const Elm_Object_Item *it, const char **icon_file, const char **icon_group, Elm_Icon_Type *icon_type) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Hoversel_Item *item = (Elm_Hoversel_Item *) it; + Elm_Hoversel_Item *item = (Elm_Hoversel_Item *)it; if (icon_file) *icon_file = item->icon_file; if (icon_group) *icon_group = item->icon_group; if (icon_type) *icon_type = item->icon_type; diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c index d0b8ab5..466b102 100644 --- a/src/lib/elc_multibuttonentry.c +++ b/src/lib/elc_multibuttonentry.c @@ -786,7 +786,7 @@ _resize_button(Evas_Object *btn, Evas_Coord *realw, Evas_Coord *vieww) static Eina_Bool _item_del_pre_hook(Elm_Object_Item *it) { - _del_button_item((Elm_Multibuttonentry_Item *) it); + _del_button_item((Elm_Multibuttonentry_Item *)it); return EINA_TRUE; } @@ -1346,7 +1346,7 @@ _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label) Elm_Multibuttonentry_Item *item; if (part && strcmp(part, "default")) return; if (!label) return; - item = (Elm_Multibuttonentry_Item *) it; + item = (Elm_Multibuttonentry_Item *)it; edje_object_part_text_set(item->button, "elm.btn.text", label); _resize_button(item->button, &item->rw, &item->vw); } @@ -1356,7 +1356,7 @@ _item_text_get_hook(const Elm_Object_Item *it, const char *part) { Elm_Multibuttonentry_Item *item; if (part && strcmp(part, "default")) return NULL; - item = (Elm_Multibuttonentry_Item *) it; + item = (Elm_Multibuttonentry_Item *)it; return edje_object_part_text_get(item->button, "elm.btn.text"); } @@ -1588,7 +1588,7 @@ EAPI void elm_multibuttonentry_item_select(Elm_Object_Item *it, Eina_Bool selected) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Multibuttonentry_Item *item = (Elm_Multibuttonentry_Item *) it; + Elm_Multibuttonentry_Item *item = (Elm_Multibuttonentry_Item *)it; if (selected) _select_button(WIDGET(item), item->button); else _select_button(WIDGET(item), NULL); } @@ -1655,7 +1655,7 @@ elm_multibuttonentry_item_prev_get(const Elm_Object_Item *it) EINA_LIST_FOREACH(wd->items, l, _item) { - if (_item == (Elm_Multibuttonentry_Item *) it) + if (_item == (Elm_Multibuttonentry_Item *)it) { l = eina_list_prev(l); if (!l) return NULL; @@ -1677,7 +1677,7 @@ elm_multibuttonentry_item_next_get(const Elm_Object_Item *it) EINA_LIST_FOREACH(wd->items, l, _item) { - if (_item == (Elm_Multibuttonentry_Item *) it) + if (_item == (Elm_Multibuttonentry_Item *)it) { l = eina_list_next(l); if (!l) return NULL; diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c index 4b1d2a9..2648eb6 100644 --- a/src/lib/elc_naviframe.c +++ b/src/lib/elc_naviframe.c @@ -242,7 +242,7 @@ _item_text_set_hook(Elm_Object_Item *it, const char *label) { Elm_Naviframe_Text_Item_Pair *pair = NULL; - Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it; + Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *)it; char buf[1024]; if (!part || !strcmp(part, "default")) @@ -304,7 +304,7 @@ _item_content_set_hook(Elm_Object_Item *it, const char *part, Evas_Object *content) { - Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it; + Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *)it; //specified parts if (!part || !strcmp("default", part)) @@ -335,7 +335,7 @@ _item_content_set_hook(Elm_Object_Item *it, static Evas_Object * _item_content_get_hook(const Elm_Object_Item *it, const char *part) { - Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it; + Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *)it; //specified parts if (!part || !strcmp("default", part)) @@ -354,7 +354,7 @@ _item_content_get_hook(const Elm_Object_Item *it, const char *part) static Evas_Object * _item_content_unset_hook(Elm_Object_Item *it, const char *part) { - Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it; + Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *)it; //specified parts if (!part || !strcmp("default", part)) @@ -831,7 +831,7 @@ _item_del_pre_hook(Elm_Object_Item *it) Elm_Naviframe_Item *navi_it; Widget_Data *wd; - navi_it =(Elm_Naviframe_Item *) it; + navi_it =(Elm_Naviframe_Item *)it; wd = elm_widget_data_get(WIDGET(navi_it)); if (!wd) return EINA_FALSE; @@ -1049,7 +1049,7 @@ _item_new(Evas_Object *obj, _title_clicked, it); _item_style_set(it, item_style); - _item_text_set_hook((Elm_Object_Item *) it, "elm.text.title", title_label); + _item_text_set_hook((Elm_Object_Item *)it, "elm.text.title", title_label); //title buttons if ((!prev_btn) && wd->auto_pushed && eina_inlist_count(wd->stack)) @@ -1157,7 +1157,7 @@ elm_naviframe_item_push(Evas_Object *obj, } wd->stack = eina_inlist_append(wd->stack, EINA_INLIST_GET(it)); _sizing_eval(obj); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -1184,7 +1184,7 @@ elm_naviframe_item_insert_before(Elm_Object_Item *before, EINA_INLIST_GET(it), EINA_INLIST_GET(((Elm_Naviframe_Item *) before))); _sizing_eval(WIDGET(before)); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -1216,7 +1216,7 @@ elm_naviframe_item_insert_after(Elm_Object_Item *after, EINA_INLIST_GET(it), EINA_INLIST_GET(((Elm_Naviframe_Item *) after))); _sizing_eval(WIDGET(after)); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Evas_Object * @@ -1275,7 +1275,7 @@ elm_naviframe_item_pop_to(Elm_Object_Item *it) Widget_Data *wd; Eina_Inlist *l, *prev_l; - navi_it = (Elm_Naviframe_Item *) it; + navi_it = (Elm_Naviframe_Item *)it; wd = elm_widget_data_get(WIDGET(navi_it)); if (!wd) return; @@ -1286,7 +1286,7 @@ elm_naviframe_item_pop_to(Elm_Object_Item *it) while(l) { if (EINA_INLIST_CONTAINER_GET(l, Elm_Naviframe_Item) == - ((Elm_Naviframe_Item *) it)) break; + ((Elm_Naviframe_Item *)it)) break; prev_l = l->prev; wd->stack = eina_inlist_remove(wd->stack, l); _item_del(EINA_INLIST_CONTAINER_GET(l, Elm_Naviframe_Item)); @@ -1305,7 +1305,7 @@ elm_naviframe_item_promote(Elm_Object_Item *it) Elm_Naviframe_Item *prev_it; Widget_Data *wd; - navi_it = (Elm_Naviframe_Item *) it; + navi_it = (Elm_Naviframe_Item *)it; wd = elm_widget_data_get(navi_it->base.widget); if (!wd) return; @@ -1341,9 +1341,9 @@ elm_naviframe_item_simple_promote(Evas_Object *obj, Evas_Object *content) Elm_Naviframe_Item *itr; EINA_INLIST_FOREACH(wd->stack, itr) { - if (elm_object_item_content_get((Elm_Object_Item *) itr) == content) + if (elm_object_item_content_get((Elm_Object_Item *)itr) == content) { - elm_naviframe_item_promote((Elm_Object_Item *) itr); + elm_naviframe_item_promote((Elm_Object_Item *)itr); break; } } @@ -1398,7 +1398,7 @@ EAPI void elm_naviframe_item_style_set(Elm_Object_Item *it, const char *item_style) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it; + Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *)it; //Return if new style is exsiting one. if ((item_style && navi_it->style) && (!strcmp(item_style, navi_it->style))) @@ -1414,7 +1414,7 @@ EAPI const char * elm_naviframe_item_style_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it; + Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *)it; return navi_it->style; } @@ -1422,7 +1422,7 @@ EAPI void elm_naviframe_item_title_visible_set(Elm_Object_Item *it, Eina_Bool visible) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it; + Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *)it; visible = !!visible; if (navi_it->title_visible == visible) return; @@ -1435,7 +1435,7 @@ EAPI Eina_Bool elm_naviframe_item_title_visible_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); - Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it; + Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *)it; return navi_it->title_visible; } diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c index 3a9c314..4ea14af 100644 --- a/src/lib/elc_popup.c +++ b/src/lib/elc_popup.c @@ -511,7 +511,7 @@ _item_select_cb(void *data, Evas_Object *obj __UNUSED__, if (!item || item->disabled) return; if (item->func) - item->func((void*) item->base.data, WIDGET(item), data); + item->func((void*)item->base.data, WIDGET(item), data); } static void @@ -1052,7 +1052,7 @@ static void _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Popup_Content_Item *item = (Elm_Popup_Content_Item *) it; + Elm_Popup_Content_Item *item = (Elm_Popup_Content_Item *)it; if ((!part) || (!strcmp(part, "default"))) { @@ -1066,7 +1066,7 @@ static const char * _item_text_get_hook(const Elm_Object_Item *it, const char *part) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - Elm_Popup_Content_Item *item = (Elm_Popup_Content_Item *) it; + Elm_Popup_Content_Item *item = (Elm_Popup_Content_Item *)it; if ((!part) || (!strcmp(part, "default"))) return item->label; @@ -1105,7 +1105,7 @@ _item_content_set_hook(Elm_Object_Item *it, const char *part, Evas_Object *content) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Popup_Content_Item *item = (Elm_Popup_Content_Item *) it; + Elm_Popup_Content_Item *item = (Elm_Popup_Content_Item *)it; if ((!(part)) || (!strcmp(part, "default"))) _item_icon_set(item, content); @@ -1118,7 +1118,7 @@ _item_content_get_hook(const Elm_Object_Item *it, const char *part) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - Elm_Popup_Content_Item *item = (Elm_Popup_Content_Item *) it; + Elm_Popup_Content_Item *item = (Elm_Popup_Content_Item *)it; if ((!(part)) || (!strcmp(part, "default"))) return item->icon; @@ -1147,7 +1147,7 @@ _item_content_unset_hook(const Elm_Object_Item *it, { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); Evas_Object *content = NULL; - Elm_Popup_Content_Item *item = (Elm_Popup_Content_Item *) it; + Elm_Popup_Content_Item *item = (Elm_Popup_Content_Item *)it; if ((!(part)) || (!strcmp(part, "default"))) content = _item_icon_unset(item); @@ -1160,7 +1160,7 @@ static void _item_disable_hook(Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Popup_Content_Item *item = (Elm_Popup_Content_Item *) it; + Elm_Popup_Content_Item *item = (Elm_Popup_Content_Item *)it; Widget_Data *wd = elm_widget_data_get(WIDGET(item)); if (!wd) return; @@ -1174,7 +1174,7 @@ static void _item_del_pre_hook(Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Popup_Content_Item *item = (Elm_Popup_Content_Item *) it; + Elm_Popup_Content_Item *item = (Elm_Popup_Content_Item *)it; Widget_Data *wd = elm_widget_data_get(WIDGET(item)); if (!wd) return; @@ -1194,7 +1194,7 @@ _item_signal_emit_hook(Elm_Object_Item *it, const char *emission, const char *source) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Popup_Content_Item *item = (Elm_Popup_Content_Item *) it; + Elm_Popup_Content_Item *item = (Elm_Popup_Content_Item *)it; edje_object_signal_emit(VIEW(item), emission, source); } @@ -1413,5 +1413,5 @@ elm_popup_item_append(Evas_Object *obj, const char *label, _scroller_size_calc(obj); _sizing_eval(obj); - return (Elm_Object_Item *) item; + return (Elm_Object_Item *)item; } diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c index 4963b85..7e80fbd 100644 --- a/src/lib/elm_diskselector.c +++ b/src/lib/elm_diskselector.c @@ -233,7 +233,7 @@ _item_del_pre_hook(Elm_Object_Item *it) Eina_List *l; int i = 0; Widget_Data *wd; - item = (Elm_Diskselector_Item *) it; + item = (Elm_Diskselector_Item *)it; wd = elm_widget_data_get(WIDGET(item)); if (!wd) return EINA_FALSE; @@ -946,7 +946,7 @@ _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label) { Elm_Diskselector_Item *item; if (part && strcmp(part, "default")) return; - item = (Elm_Diskselector_Item *) it; + item = (Elm_Diskselector_Item *)it; eina_stringshare_replace(&item->label, label); edje_object_part_text_set(VIEW(item), "elm.text", item->label); } @@ -955,7 +955,7 @@ static const char * _item_text_get_hook(const Elm_Object_Item *it, const char *part) { if (part && strcmp(part, "default")) return NULL; - return ((Elm_Diskselector_Item *) it)->label; + return ((Elm_Diskselector_Item *)it)->label; } static void @@ -964,15 +964,15 @@ _item_content_set_hook(Elm_Object_Item *it, Evas_Object *content) { if (part && strcmp(part, "icon")) return; - _item_icon_set((Elm_Diskselector_Item *) it, content); - _check_identical_item((Elm_Diskselector_Item *) it, content); + _item_icon_set((Elm_Diskselector_Item *)it, content); + _check_identical_item((Elm_Diskselector_Item *)it, content); } static Evas_Object * _item_content_get_hook(const Elm_Object_Item *it, const char *part) { if (part && strcmp(part, "icon")) return NULL; - return ((Elm_Diskselector_Item *) it)->icon; + return ((Elm_Diskselector_Item *)it)->icon; } @@ -1254,7 +1254,7 @@ elm_diskselector_item_append(Evas_Object *obj, const char *label, Evas_Object *i if (!wd->idler) wd->idler = ecore_idle_enterer_before_add(_move_scroller, obj); _sizing_eval(obj); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -1271,7 +1271,7 @@ elm_diskselector_item_selected_set(Elm_Object_Item *it, Eina_Bool selected) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); Widget_Data *wd; - Elm_Diskselector_Item *item = (Elm_Diskselector_Item *) it; + Elm_Diskselector_Item *item = (Elm_Diskselector_Item *)it; wd = elm_widget_data_get(WIDGET(item)); if (!wd) return; @@ -1296,14 +1296,14 @@ elm_diskselector_item_selected_get(const Elm_Object_Item *it) ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); Widget_Data *wd = elm_widget_data_get(WIDGET(it)); if (!wd) return EINA_FALSE; - return (wd->selected_item == ((Elm_Diskselector_Item *) it)); + return (wd->selected_item == ((Elm_Diskselector_Item *)it)); } EAPI Elm_Object_Item * elm_diskselector_item_prev_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - Elm_Diskselector_Item *item = (Elm_Diskselector_Item *) it; + Elm_Diskselector_Item *item = (Elm_Diskselector_Item *)it; if (item->node->prev) return item->node->prev->data; else return NULL; } @@ -1312,7 +1312,7 @@ EAPI Elm_Object_Item * elm_diskselector_item_next_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - Elm_Diskselector_Item *item = (Elm_Diskselector_Item *) it; + Elm_Diskselector_Item *item = (Elm_Diskselector_Item *)it; if (item->node->next) return item->node->next->data; else return NULL; } diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c index cead79e..a1c0275 100644 --- a/src/lib/elm_flipselector.c +++ b/src/lib/elm_flipselector.c @@ -81,7 +81,7 @@ _item_text_set_hook(Elm_Object_Item *it, if (part && strcmp(part ,"default")) return; - item = (Elm_Flipselector_Item *) it; + item = (Elm_Flipselector_Item *)it; wd = elm_widget_data_get(WIDGET(item)); if ((!wd) || (!wd->items)) return; @@ -106,7 +106,7 @@ _item_text_get_hook(const Elm_Object_Item *it, const char *part) { if (part && strcmp(part ,"default")) return NULL; - return ((Elm_Flipselector_Item *) it)->label; + return ((Elm_Flipselector_Item *)it)->label; } static void @@ -114,7 +114,7 @@ _item_signal_emit_hook(Elm_Object_Item *it, const char *emission, const char *source) { - Elm_Flipselector_Item *item = (Elm_Flipselector_Item *) it; + Elm_Flipselector_Item *item = (Elm_Flipselector_Item *)it; edje_object_signal_emit(VIEW(item), emission, source); } @@ -226,7 +226,7 @@ _sentinel_eval(Widget_Data *wd) EINA_LIST_FOREACH(wd->items, l, it) { - if (strlen(elm_object_item_text_get((Elm_Object_Item *) it)) > + if (strlen(elm_object_item_text_get((Elm_Object_Item *)it)) > strlen(elm_object_item_text_get(DATA_GET(wd->sentinel)))) wd->sentinel = l; } @@ -579,7 +579,7 @@ _item_del_pre_hook(Elm_Object_Item *it) Elm_Flipselector_Item *item, *item2; Eina_List *l; - item = (Elm_Flipselector_Item *) it; + item = (Elm_Flipselector_Item *)it; wd = elm_widget_data_get(WIDGET(item)); if (!wd) return EINA_FALSE; @@ -706,7 +706,7 @@ elm_flipselector_item_append(Evas_Object *obj, const char *label, void (*func)(v } if (!wd->sentinel || - (strlen(elm_object_item_text_get((Elm_Object_Item *) item)) > + (strlen(elm_object_item_text_get((Elm_Object_Item *)item)) > strlen(elm_object_item_text_get(DATA_GET(wd->sentinel))))) { wd->sentinel = eina_list_last(wd->items); @@ -716,7 +716,7 @@ elm_flipselector_item_append(Evas_Object *obj, const char *label, void (*func)(v if (eina_list_count(wd->items) >= 2) edje_object_signal_emit(wd->base, "elm,state,button,visible", "elm"); - return (Elm_Object_Item *) item; + return (Elm_Object_Item *)item; } EAPI Elm_Object_Item * @@ -741,7 +741,7 @@ elm_flipselector_item_prepend(Evas_Object *obj, const char *label, void (*func)( } if (!wd->sentinel || - (strlen(elm_object_item_text_get((Elm_Object_Item *) item)) > + (strlen(elm_object_item_text_get((Elm_Object_Item *)item)) > strlen(elm_object_item_text_get(DATA_GET(wd->sentinel))))) { wd->sentinel = wd->items; @@ -751,7 +751,7 @@ elm_flipselector_item_prepend(Evas_Object *obj, const char *label, void (*func)( if (eina_list_count(wd->items) >= 2) edje_object_signal_emit(wd->base, "elm,state,button,visible", "elm"); - return (Elm_Object_Item *) item; + return (Elm_Object_Item *)item; } EAPI const Eina_List * @@ -779,7 +779,7 @@ elm_flipselector_first_item_get(const Evas_Object *obj) EINA_LIST_FOREACH(wd->items, l, it) { if (it->deleted) continue; - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } return NULL; } @@ -799,7 +799,7 @@ elm_flipselector_last_item_get(const Evas_Object *obj) EINA_LIST_REVERSE_FOREACH(wd->items, l, it) { if (it->deleted) continue; - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } return NULL; } @@ -824,7 +824,7 @@ elm_flipselector_item_selected_set(Elm_Object_Item *it, Eina_Bool selected) Widget_Data *wd; Eina_List *l; - item = (Elm_Flipselector_Item *) it; + item = (Elm_Flipselector_Item *)it; wd = elm_widget_data_get(WIDGET(item)); if (!wd) return; @@ -870,7 +870,7 @@ elm_flipselector_item_selected_get(const Elm_Object_Item *it) Widget_Data *wd; Elm_Flipselector_Item *item; - item = (Elm_Flipselector_Item *) it; + item = (Elm_Flipselector_Item *)it; wd = elm_widget_data_get(WIDGET(item)); if (!wd) return EINA_FALSE; return (eina_list_data_get(wd->current) == item); @@ -901,7 +901,7 @@ elm_flipselector_item_prev_get(const Elm_Object_Item *it) Widget_Data *wd; Eina_List *l; - Elm_Flipselector_Item *item = (Elm_Flipselector_Item *) it; + Elm_Flipselector_Item *item = (Elm_Flipselector_Item *)it; wd = elm_widget_data_get(WIDGET(item)); if ((!wd) || (!wd->items)) return NULL; @@ -919,7 +919,7 @@ elm_flipselector_item_next_get(const Elm_Object_Item *it) Widget_Data *wd; Eina_List *l; - Elm_Flipselector_Item *item = (Elm_Flipselector_Item *) it; + Elm_Flipselector_Item *item = (Elm_Flipselector_Item *)it; wd = elm_widget_data_get(WIDGET(item)); if ((!wd) || (!wd->items)) return NULL; diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c index 4b020a0..457e604 100644 --- a/src/lib/elm_gengrid.c +++ b/src/lib/elm_gengrid.c @@ -579,7 +579,7 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl) while (it) { edje_object_mirrored_set(VIEW(it), rtl); - elm_gengrid_item_update((Elm_Object_Item *) it); + elm_gengrid_item_update((Elm_Object_Item *)it); it = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next); } } @@ -1852,7 +1852,7 @@ _elm_gengrid_item_compare(const void *data, const void *data1) static void _item_disable_hook(Elm_Object_Item *it) { - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; + Elm_Gen_Item *_it = (Elm_Gen_Item *)it; if (_it->generation < _it->wd->generation) return; @@ -1868,7 +1868,7 @@ _item_disable_hook(Elm_Object_Item *it) static void _item_del_pre_hook(Elm_Object_Item *it) { - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; + Elm_Gen_Item *_it = (Elm_Gen_Item *)it; if ((_it->relcount > 0) || (_it->walking > 0)) { _elm_genlist_item_del_notserious(_it); @@ -2100,7 +2100,7 @@ elm_gengrid_item_append(Evas_Object *obj, if (wd->calc_job) ecore_job_del(wd->calc_job); wd->calc_job = ecore_job_add(_calc_job, wd); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -2124,7 +2124,7 @@ elm_gengrid_item_prepend(Evas_Object *obj, if (wd->calc_job) ecore_job_del(wd->calc_job); wd->calc_job = ecore_job_add(_calc_job, wd); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -2151,7 +2151,7 @@ elm_gengrid_item_insert_before(Evas_Object *obj, if (wd->calc_job) ecore_job_del(wd->calc_job); wd->calc_job = ecore_job_add(_calc_job, wd); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -2178,7 +2178,7 @@ elm_gengrid_item_insert_after(Evas_Object *obj, if (wd->calc_job) ecore_job_del(wd->calc_job); wd->calc_job = ecore_job_add(_calc_job, wd); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -2206,7 +2206,7 @@ elm_gengrid_item_sorted_insert(Evas_Object *obj, if (wd->calc_job) ecore_job_del(wd->calc_job); wd->calc_job = ecore_job_add(_calc_job, wd); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EINA_DEPRECATED Elm_Object_Item * @@ -2268,7 +2268,7 @@ EAPI void elm_gengrid_item_update(Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; + Elm_Gen_Item *_it = (Elm_Gen_Item *)it; if (!_it->realized) return; if (_it->want_unrealize) return; _elm_genlist_item_unrealize(_it, EINA_FALSE); @@ -2308,7 +2308,7 @@ elm_gengrid_item_item_class_update(Elm_Object_Item *it, { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); EINA_SAFETY_ON_NULL_RETURN(itc); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; + Elm_Gen_Item *_it = (Elm_Gen_Item *)it; if (_it->generation < _it->wd->generation) return; _it->itc = itc; elm_gengrid_item_update(it); @@ -2320,8 +2320,8 @@ elm_gengrid_item_pos_get(const Elm_Object_Item *it, unsigned int *y) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - if (x) *x = ((Elm_Gen_Item *) it)->x; - if (y) *y = ((Elm_Gen_Item *) it)->y; + if (x) *x = ((Elm_Gen_Item *)it)->x; + if (y) *y = ((Elm_Gen_Item *)it)->y; } EAPI void @@ -2425,7 +2425,7 @@ elm_gengrid_item_tooltip_content_cb_set(Elm_Object_Item *it, Evas_Smart_Cb del_cb) { ELM_OBJ_ITEM_CHECK_OR_GOTO(it, error); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; + Elm_Gen_Item *_it = (Elm_Gen_Item *)it; if ((_it->tooltip.content_cb == func) && (_it->tooltip.data == data)) return; @@ -2454,7 +2454,7 @@ EAPI void elm_gengrid_item_tooltip_unset(Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; + Elm_Gen_Item *_it = (Elm_Gen_Item *)it; if ((VIEW(_it)) && (_it->tooltip.content_cb)) elm_widget_item_tooltip_unset(_it); @@ -2474,7 +2474,7 @@ elm_gengrid_item_tooltip_style_set(Elm_Object_Item *it, const char *style) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - eina_stringshare_replace(&((Elm_Gen_Item *) it)->tooltip.style, style); + eina_stringshare_replace(&((Elm_Gen_Item *)it)->tooltip.style, style); if (VIEW(it)) elm_widget_item_tooltip_style_set(it, style); } @@ -2482,14 +2482,14 @@ EAPI const char * elm_gengrid_item_tooltip_style_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - return ((Elm_Gen_Item *) it)->tooltip.style; + return ((Elm_Gen_Item *)it)->tooltip.style; } EAPI Eina_Bool elm_gengrid_item_tooltip_window_mode_set(Elm_Object_Item *it, Eina_Bool disable) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); - ((Elm_Gen_Item *) it)->tooltip.free_size = disable; + ((Elm_Gen_Item *)it)->tooltip.free_size = disable; if (VIEW(it)) return elm_widget_item_tooltip_window_mode_set(it, disable); return EINA_TRUE; } @@ -2498,7 +2498,7 @@ EAPI Eina_Bool elm_gengrid_item_tooltip_window_mode_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); - return ((Elm_Gen_Item *) it)->tooltip.free_size; + return ((Elm_Gen_Item *)it)->tooltip.free_size; } EAPI void @@ -2506,7 +2506,7 @@ elm_gengrid_item_cursor_set(Elm_Object_Item *it, const char *cursor) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - eina_stringshare_replace(&((Elm_Gen_Item *) it)->mouse_cursor, cursor); + eina_stringshare_replace(&((Elm_Gen_Item *)it)->mouse_cursor, cursor); if (VIEW(it)) elm_widget_item_cursor_set(it, cursor); } @@ -2520,7 +2520,7 @@ EAPI void elm_gengrid_item_cursor_unset(Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; + Elm_Gen_Item *_it = (Elm_Gen_Item *)it; if (!_it->mouse_cursor) return; @@ -2698,7 +2698,7 @@ EAPI void elm_gengrid_item_show(Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; + Elm_Gen_Item *_it = (Elm_Gen_Item *)it; Widget_Data *wd = _it->wd; Evas_Coord minx = 0, miny = 0; @@ -2723,7 +2723,7 @@ EAPI void elm_gengrid_item_bring_in(Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Gen_Item *_it = (Elm_Gen_Item *) it; + Elm_Gen_Item *_it = (Elm_Gen_Item *)it; if (_it->generation < _it->wd->generation) return; diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c index 8a374c4..a3a83df 100644 --- a/src/lib/elm_index.c +++ b/src/lib/elm_index.c @@ -203,7 +203,7 @@ _item_del_pre_hook(Elm_Object_Item *it) { Widget_Data *wd = elm_widget_data_get(WIDGET(it)); if (!wd) return EINA_FALSE; - _item_free((Elm_Index_Item *) it); + _item_free((Elm_Index_Item *)it); _index_box_clear(WIDGET(it), wd->bx[wd->level], wd->level); return EINA_TRUE; } @@ -492,7 +492,7 @@ _mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event if (item) { evas_object_smart_callback_call(data, SIG_SELECTED, item); - id_item = (Elm_Index_Item *) item; + id_item = (Elm_Index_Item *)item; if (id_item->func) id_item->func((void *)id_item->base.data, WIDGET(id_item), id_item); } @@ -700,7 +700,7 @@ elm_index_selected_item_get(const Evas_Object *obj, int level) EINA_LIST_FOREACH(wd->items, l, it) { if ((it->selected) && (it->level == level)) - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } return NULL; } @@ -716,7 +716,7 @@ elm_index_item_append(Evas_Object *obj, const char *letter, Evas_Smart_Cb func, if (!it) return NULL; wd->items = eina_list_append(wd->items, it); _index_box_clear(obj, wd->bx[wd->level], wd->level); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -731,7 +731,7 @@ elm_index_item_prepend(Evas_Object *obj, const char *letter, Evas_Smart_Cb func, if (!it) return NULL; wd->items = eina_list_prepend(wd->items, it); _index_box_clear(obj, wd->bx[wd->level], wd->level); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EINA_DEPRECATED EAPI Elm_Object_Item * @@ -758,7 +758,7 @@ elm_index_item_insert_after(Evas_Object *obj, Elm_Object_Item *after, const char if (!it) return NULL; wd->items = eina_list_append_relative(wd->items, it, after); _index_box_clear(obj, wd->bx[wd->level], wd->level); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -773,7 +773,7 @@ elm_index_item_insert_before(Evas_Object *obj, Elm_Object_Item *before, const ch if (!it) return NULL; wd->items = eina_list_prepend_relative(wd->items, it, before); _index_box_clear(obj, wd->bx[wd->level], wd->level); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -812,7 +812,7 @@ elm_index_item_sorted_insert(Evas_Object *obj, const char *letter, Evas_Smart_Cb } } _index_box_clear(obj, wd->bx[wd->level], wd->level); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI void @@ -916,6 +916,6 @@ EAPI const char * elm_index_item_letter_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - return ((Elm_Index_Item *) it)->letter; + return ((Elm_Index_Item *)it)->letter; } diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c index 4a9ccf0..3ca4bb0 100644 --- a/src/lib/elm_list.c +++ b/src/lib/elm_list.c @@ -103,7 +103,7 @@ static const Evas_Smart_Cb_Description _signals[] = { #define ELM_LIST_ITEM_CHECK_DELETED_RETURN(it, ...) \ ELM_OBJ_ITEM_CHECK_OR_RETURN(it, __VA_ARGS__); \ -if (((Elm_List_Item *) it)->deleted) \ +if (((Elm_List_Item *)it)->deleted) \ { \ ERR("ERROR: "#it" has been DELETED.\n"); \ return __VA_ARGS__; \ @@ -224,7 +224,7 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty (!strcmp(ev->keyname, "KP_Home"))) { it = eina_list_data_get(wd->items); - elm_list_item_bring_in((Elm_Object_Item *) it); + elm_list_item_bring_in((Elm_Object_Item *)it); ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; return EINA_TRUE; } @@ -232,7 +232,7 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty (!strcmp(ev->keyname, "KP_End"))) { it = eina_list_data_get(eina_list_last(wd->items)); - elm_list_item_bring_in((Elm_Object_Item *) it); + elm_list_item_bring_in((Elm_Object_Item *)it); ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; return EINA_TRUE; } @@ -740,7 +740,7 @@ call: if (it->func) it->func((void *)it->base.data, WIDGET(it), it); evas_object_smart_callback_call(obj, SIG_SELECTED, it); - it->wd->last_selected_item = (Elm_Object_Item *) it; + it->wd->last_selected_item = (Elm_Object_Item *)it; _elm_list_unwalk(wd); evas_object_unref(obj); @@ -1023,7 +1023,7 @@ _mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void * static void _item_disable(Elm_Object_Item *it) { - Elm_List_Item *item = (Elm_List_Item *) it; + Elm_List_Item *item = (Elm_List_Item *)it; if (item->base.disabled) edje_object_signal_emit(VIEW(item), "elm,state,disabled", "elm"); else @@ -1033,7 +1033,7 @@ _item_disable(Elm_Object_Item *it) static void _item_content_set(Elm_Object_Item *it, const char *part, Evas_Object *content) { - Elm_List_Item *item = (Elm_List_Item *) it; + Elm_List_Item *item = (Elm_List_Item *)it; Evas_Object **icon_p = NULL; Eina_Bool dummy = EINA_FALSE; @@ -1075,7 +1075,7 @@ _item_content_set(Elm_Object_Item *it, const char *part, Evas_Object *content) static Evas_Object * _item_content_get(const Elm_Object_Item *it, const char *part) { - Elm_List_Item *item = (Elm_List_Item *) it; + Elm_List_Item *item = (Elm_List_Item *)it; if ((!part) || (!strcmp(part, "start"))) { @@ -1093,18 +1093,18 @@ _item_content_get(const Elm_Object_Item *it, const char *part) static Evas_Object * _item_content_unset(const Elm_Object_Item *it, const char *part) { - Elm_List_Item *item = (Elm_List_Item *) it; + Elm_List_Item *item = (Elm_List_Item *)it; if ((!part) || (!strcmp(part, "start"))) { Evas_Object *obj = item->icon; - _item_content_set((Elm_Object_Item *) it, part, NULL); + _item_content_set((Elm_Object_Item *)it, part, NULL); return obj; } else if (!strcmp(part, "end")) { Evas_Object *obj = item->end; - _item_content_set((Elm_Object_Item *) it, part, NULL); + _item_content_set((Elm_Object_Item *)it, part, NULL); return obj; } return NULL; @@ -1113,7 +1113,7 @@ _item_content_unset(const Elm_Object_Item *it, const char *part) static void _item_text_set(Elm_Object_Item *it, const char *part, const char *text) { - Elm_List_Item *list_it = (Elm_List_Item *) it; + Elm_List_Item *list_it = (Elm_List_Item *)it; if (part && strcmp(part, "default")) return; if (!eina_stringshare_replace(&list_it->label, text)) return; if (VIEW(list_it)) @@ -1124,14 +1124,14 @@ static const char * _item_text_get(const Elm_Object_Item *it, const char *part) { if (part && strcmp(part, "default")) return NULL; - return ((Elm_List_Item *) it)->label; + return ((Elm_List_Item *)it)->label; } static Eina_Bool _item_del_pre_hook(Elm_Object_Item *it) { Evas_Object *obj = WIDGET(it); - Elm_List_Item *item = (Elm_List_Item *) it; + Elm_List_Item *item = (Elm_List_Item *)it; Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return EINA_FALSE; @@ -1762,7 +1762,7 @@ elm_list_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Eva wd->items = eina_list_append(wd->items, it); it->node = eina_list_last(wd->items); elm_box_pack_end(wd->box, VIEW(it)); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -1775,7 +1775,7 @@ elm_list_item_prepend(Evas_Object *obj, const char *label, Evas_Object *icon, Ev wd->items = eina_list_prepend(wd->items, it); it->node = wd->items; elm_box_pack_start(wd->box, VIEW(it)); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -1797,7 +1797,7 @@ elm_list_item_insert_before(Evas_Object *obj, Elm_Object_Item *before, const cha wd->items = eina_list_prepend_relative_list(wd->items, it, before_it->node); it->node = before_it->node->prev; elm_box_pack_before(wd->box, VIEW(it), VIEW(before_it)); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -1819,7 +1819,7 @@ elm_list_item_insert_after(Evas_Object *obj, Elm_Object_Item *after, const char wd->items = eina_list_append_relative_list(wd->items, it, after_it->node); it->node = after_it->node->next; elm_box_pack_after(wd->box, VIEW(it), VIEW(after_it)); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -1844,21 +1844,21 @@ elm_list_item_sorted_insert(Evas_Object *obj, const char *label, Evas_Object *ic it->node = before->node->prev; elm_box_pack_before(wd->box, VIEW(it), VIEW(before)); } - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI void elm_list_item_separator_set(Elm_Object_Item *it, Eina_Bool setting) { ELM_LIST_ITEM_CHECK_DELETED_RETURN(it); - ((Elm_List_Item *) it)->is_separator = !!setting; + ((Elm_List_Item *)it)->is_separator = !!setting; } EAPI Eina_Bool elm_list_item_separator_get(const Elm_Object_Item *it) { ELM_LIST_ITEM_CHECK_DELETED_RETURN(it, EINA_FALSE); - return ((Elm_List_Item *) it)->is_separator; + return ((Elm_List_Item *)it)->is_separator; } EAPI void @@ -1867,7 +1867,7 @@ elm_list_item_selected_set(Elm_Object_Item *it, Eina_Bool selected) ELM_LIST_ITEM_CHECK_DELETED_RETURN(it); Evas_Object *obj = WIDGET(it); Widget_Data *wd = elm_widget_data_get(obj); - Elm_List_Item *item = (Elm_List_Item *) it; + Elm_List_Item *item = (Elm_List_Item *)it; if (!wd) return; selected = !!selected; @@ -1897,7 +1897,7 @@ EAPI Eina_Bool elm_list_item_selected_get(const Elm_Object_Item *it) { ELM_LIST_ITEM_CHECK_DELETED_RETURN(it, EINA_FALSE); - return ((Elm_List_Item *) it)->selected; + return ((Elm_List_Item *)it)->selected; } EAPI void @@ -1943,7 +1943,7 @@ EAPI Elm_Object_Item * elm_list_item_prev(const Elm_Object_Item *it) { ELM_LIST_ITEM_CHECK_DELETED_RETURN(it, NULL); - Elm_List_Item *item = (Elm_List_Item *) it; + Elm_List_Item *item = (Elm_List_Item *)it; if (item->node->prev) return item->node->prev->data; else return NULL; } @@ -1952,7 +1952,7 @@ EAPI Elm_Object_Item * elm_list_item_next(const Elm_Object_Item *it) { ELM_LIST_ITEM_CHECK_DELETED_RETURN(it, NULL); - Elm_List_Item *item = (Elm_List_Item *) it; + Elm_List_Item *item = (Elm_List_Item *)it; if (item->node->next) return item->node->next->data; else return NULL; } diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c index a5c0b16..4d18beb 100644 --- a/src/lib/elm_main.c +++ b/src/lib/elm_main.c @@ -1378,7 +1378,7 @@ elm_object_item_content_part_set(Elm_Object_Item *it, const char *part, Evas_Object *content) { - _elm_widget_item_content_part_set((Elm_Widget_Item *) it, part, content); + _elm_widget_item_content_part_set((Elm_Widget_Item *)it, part, content); } EAPI void @@ -1386,33 +1386,33 @@ elm_object_item_part_content_set(Elm_Object_Item *it, const char *part, Evas_Object *content) { - _elm_widget_item_content_part_set((Elm_Widget_Item *) it, part, content); + _elm_widget_item_content_part_set((Elm_Widget_Item *)it, part, content); } EAPI Evas_Object * elm_object_item_content_part_get(const Elm_Object_Item *it, const char *part) { - return _elm_widget_item_content_part_get((Elm_Widget_Item *) it, part); + return _elm_widget_item_content_part_get((Elm_Widget_Item *)it, part); } EAPI Evas_Object * elm_object_item_part_content_get(const Elm_Object_Item *it, const char *part) { - return _elm_widget_item_content_part_get((Elm_Widget_Item *) it, part); + return _elm_widget_item_content_part_get((Elm_Widget_Item *)it, part); } EAPI Evas_Object * elm_object_item_content_part_unset(Elm_Object_Item *it, const char *part) { - return _elm_widget_item_content_part_unset((Elm_Widget_Item *) it, part); + return _elm_widget_item_content_part_unset((Elm_Widget_Item *)it, part); } EAPI Evas_Object * elm_object_item_part_content_unset(Elm_Object_Item *it, const char *part) { - return _elm_widget_item_content_part_unset((Elm_Widget_Item *) it, part); + return _elm_widget_item_content_part_unset((Elm_Widget_Item *)it, part); } EAPI void @@ -1420,7 +1420,7 @@ elm_object_item_text_part_set(Elm_Object_Item *it, const char *part, const char *label) { - _elm_widget_item_text_part_set((Elm_Widget_Item *) it, part, label); + _elm_widget_item_text_part_set((Elm_Widget_Item *)it, part, label); } EAPI void @@ -1428,19 +1428,19 @@ elm_object_item_part_text_set(Elm_Object_Item *it, const char *part, const char *label) { - _elm_widget_item_text_part_set((Elm_Widget_Item *) it, part, label); + _elm_widget_item_text_part_set((Elm_Widget_Item *)it, part, label); } EAPI const char * elm_object_item_text_part_get(const Elm_Object_Item *it, const char *part) { - return _elm_widget_item_text_part_get((Elm_Widget_Item *) it, part); + return _elm_widget_item_text_part_get((Elm_Widget_Item *)it, part); } EAPI const char * elm_object_item_part_text_get(const Elm_Object_Item *it, const char *part) { - return _elm_widget_item_text_part_get((Elm_Widget_Item *) it, part); + return _elm_widget_item_text_part_get((Elm_Widget_Item *)it, part); } EAPI void @@ -1458,7 +1458,7 @@ elm_object_name_find(const Evas_Object *obj, const char *name, int recurse) EAPI void elm_object_item_access_info_set(Elm_Object_Item *it, const char *txt) { - _elm_widget_item_access_info_set((Elm_Widget_Item *) it, txt); + _elm_widget_item_access_info_set((Elm_Widget_Item *)it, txt); } EAPI void * @@ -1476,27 +1476,27 @@ elm_object_item_data_set(Elm_Object_Item *it, void *data) EAPI void elm_object_item_signal_emit(Elm_Object_Item *it, const char *emission, const char *source) { - _elm_widget_item_signal_emit((Elm_Widget_Item *) it, emission, source); + _elm_widget_item_signal_emit((Elm_Widget_Item *)it, emission, source); } EAPI void elm_object_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled) { - _elm_widget_item_disabled_set((Elm_Widget_Item *) it, disabled); + _elm_widget_item_disabled_set((Elm_Widget_Item *)it, disabled); } EAPI Eina_Bool elm_object_item_disabled_get(const Elm_Object_Item *it) { - return _elm_widget_item_disabled_get((Elm_Widget_Item *) it); + return _elm_widget_item_disabled_get((Elm_Widget_Item *)it); } EAPI void elm_object_item_del_cb_set(Elm_Object_Item *it, Evas_Smart_Cb del_cb) { - _elm_widget_item_del_cb_set((Elm_Widget_Item *) it, del_cb); + _elm_widget_item_del_cb_set((Elm_Widget_Item *)it, del_cb); } EAPI void elm_object_item_del(Elm_Object_Item *it) { - _elm_widget_item_del((Elm_Widget_Item *) it); + _elm_widget_item_del((Elm_Widget_Item *)it); } EAPI void diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c index e4591cf..a43299a 100644 --- a/src/lib/elm_menu.c +++ b/src/lib/elm_menu.c @@ -115,21 +115,21 @@ _theme_hook(Evas_Object *obj) _elm_theme_object_set (obj, VIEW(item), "menu", "item_with_submenu", elm_widget_style_get(obj)); - elm_object_item_text_set((Elm_Object_Item *) item, + elm_object_item_text_set((Elm_Object_Item *)item, item->label); - elm_menu_item_icon_name_set((Elm_Object_Item *) item, + elm_menu_item_icon_name_set((Elm_Object_Item *)item, item->icon_str); } else { _elm_theme_object_set(obj, VIEW(item), "menu", "item", elm_widget_style_get(obj)); - elm_object_item_text_set((Elm_Object_Item *) item, + elm_object_item_text_set((Elm_Object_Item *)item, item->label); - elm_menu_item_icon_name_set((Elm_Object_Item *) item, + elm_menu_item_icon_name_set((Elm_Object_Item *)item, item->icon_str); } - _item_disable_hook((Elm_Object_Item *) item); + _item_disable_hook((Elm_Object_Item *)item); edje_object_scale_set(VIEW(item), elm_widget_scale_get(obj) * _elm_config->scale); } @@ -146,7 +146,7 @@ _item_text_set_hook(Elm_Object_Item *it, if (part && strcmp(part, "default")) return; - item = (Elm_Menu_Item *) it; + item = (Elm_Menu_Item *)it; eina_stringshare_replace(&item->label, label); @@ -164,7 +164,7 @@ static const char * _item_text_get_hook(const Elm_Object_Item *it, const char *part) { if (part && strcmp(part, "default")) return NULL; - return ((Elm_Menu_Item *) it)->label; + return ((Elm_Menu_Item *)it)->label; } static void @@ -176,7 +176,7 @@ _item_content_set_hook(Elm_Object_Item *it, if (part && strcmp(part, "default")) return; - item = (Elm_Menu_Item *) it; + item = (Elm_Menu_Item *)it; if (item->content) { @@ -195,13 +195,13 @@ static Evas_Object * _item_content_get_hook(const Elm_Object_Item *it, const char *part) { if (part && strcmp(part, "default")) return NULL; - return ((Elm_Menu_Item *) it)->content; + return ((Elm_Menu_Item *)it)->content; } static void _item_disable_hook(Elm_Object_Item *it) { - Elm_Menu_Item *item = (Elm_Menu_Item *) it; + Elm_Menu_Item *item = (Elm_Menu_Item *)it; if (elm_widget_item_disabled_get(item)) { @@ -403,7 +403,7 @@ _menu_item_activate(void *data, Evas_Object *obj __UNUSED__, const char *emissio EINA_LIST_FOREACH(item->parent->submenu.items, l, item2) { if (item2 != item) - elm_menu_item_selected_set((Elm_Object_Item *) item2, 0); + elm_menu_item_selected_set((Elm_Object_Item *)item2, 0); } } else @@ -412,7 +412,7 @@ _menu_item_activate(void *data, Evas_Object *obj __UNUSED__, const char *emissio EINA_LIST_FOREACH(wd->items, l, item2) { if (item2 != item) - elm_menu_item_selected_set((Elm_Object_Item *) item2, 0); + elm_menu_item_selected_set((Elm_Object_Item *)item2, 0); } } } @@ -495,10 +495,10 @@ _item_submenu_obj_create(Elm_Menu_Item *item) edje_object_mirrored_set(VIEW(item), elm_widget_mirrored_get(WIDGET(item))); _elm_theme_object_set(WIDGET(item), VIEW(item), "menu", "item_with_submenu", elm_widget_style_get(WIDGET(item))); - elm_object_item_text_set((Elm_Object_Item *) item, + elm_object_item_text_set((Elm_Object_Item *)item, item->label); if (item->icon_str) - elm_menu_item_icon_name_set((Elm_Object_Item *) item, + elm_menu_item_icon_name_set((Elm_Object_Item *)item, item->icon_str); edje_object_signal_callback_add(VIEW(item), "elm,action,open", "", _submenu_open, item); @@ -625,7 +625,7 @@ elm_menu_close(Evas_Object *obj) EAPI Evas_Object * elm_menu_item_object_get(const Elm_Object_Item *it) { - return VIEW(((Elm_Menu_Item *) it)); + return VIEW(((Elm_Menu_Item *)it)); } static void @@ -688,7 +688,7 @@ _elm_menu_item_add_helper(Evas_Object *obj, Elm_Menu_Item *parent, Elm_Menu_Item static Eina_Bool _item_del_pre_hook(Elm_Object_Item *it) { - Elm_Menu_Item *item = (Elm_Menu_Item *) it; + Elm_Menu_Item *item = (Elm_Menu_Item *)it; Elm_Object_Item *_item; EINA_LIST_FREE(item->submenu.items, _item) elm_object_item_del(_item); @@ -790,7 +790,7 @@ EAPI unsigned int elm_menu_item_index_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, 0); - return ((Elm_Menu_Item *) it)->idx; + return ((Elm_Menu_Item *)it)->idx; } EAPI void @@ -817,7 +817,7 @@ elm_menu_item_icon_name_set(Elm_Object_Item *it, const char *icon) ELM_OBJ_ITEM_CHECK_OR_RETURN(it); EINA_SAFETY_ON_NULL_RETURN(icon); char icon_tmp[512]; - Elm_Menu_Item *item = (Elm_Menu_Item *) it; + Elm_Menu_Item *item = (Elm_Menu_Item *)it; if (!*icon) return; if ((item->icon_str) && (!strcmp(item->icon_str, icon))) return; @@ -912,14 +912,14 @@ EAPI const char * elm_menu_item_icon_name_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - return ((Elm_Menu_Item *) it)->icon_str; + return ((Elm_Menu_Item *)it)->icon_str; } EAPI Eina_Bool elm_menu_item_is_separator(Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); - return ((Elm_Menu_Item *) it)->separator; + return ((Elm_Menu_Item *)it)->separator; } EAPI void @@ -950,7 +950,7 @@ EAPI const Eina_List * elm_menu_item_subitems_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - return ((Elm_Menu_Item *) it)->submenu.items; + return ((Elm_Menu_Item *)it)->submenu.items; } EAPI const Eina_List * @@ -965,7 +965,7 @@ EAPI void elm_menu_item_selected_set(Elm_Object_Item *it, Eina_Bool selected) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Menu_Item *item = (Elm_Menu_Item *) it; + Elm_Menu_Item *item = (Elm_Menu_Item *)it; if (selected == item->selected) return; item->selected = selected; @@ -986,14 +986,14 @@ EAPI Eina_Bool elm_menu_item_selected_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); - return ((Elm_Menu_Item *) it)->selected; + return ((Elm_Menu_Item *)it)->selected; } EAPI Elm_Object_Item * elm_menu_item_prev_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - Elm_Menu_Item *item = (Elm_Menu_Item *) it; + Elm_Menu_Item *item = (Elm_Menu_Item *)it; if (item->parent) { @@ -1019,7 +1019,7 @@ EAPI Elm_Object_Item * elm_menu_item_next_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - Elm_Menu_Item *item = (Elm_Menu_Item *) it; + Elm_Menu_Item *item = (Elm_Menu_Item *)it; if (item->parent) { @@ -1078,7 +1078,7 @@ elm_menu_selected_item_get(const Evas_Object * obj) Elm_Menu_Item *item; EINA_LIST_FOREACH(wd->items, l, item) { - if (item->selected) return ((Elm_Object_Item *) item); + if (item->selected) return ((Elm_Object_Item *)item); } return NULL; } diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c index 5f03e57..cf5ecc8 100644 --- a/src/lib/elm_segment_control.c +++ b/src/lib/elm_segment_control.c @@ -442,7 +442,7 @@ _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label) if (part && strcmp(part, "default")) return; - item = (Elm_Segment_Item *) it; + item = (Elm_Segment_Item *)it; wd = elm_widget_item_data_get(item); if (!wd) return; @@ -460,7 +460,7 @@ static const char * _item_text_get_hook(const Elm_Object_Item *it, const char *part) { if (part && strcmp(part, "default")) return NULL; - return ((Elm_Segment_Item *) it)->label; + return ((Elm_Segment_Item *)it)->label; } static void @@ -472,7 +472,7 @@ _item_content_set_hook(Elm_Object_Item *it, if (part && strcmp(part, "icon")) return; - item = (Elm_Segment_Item *) it; + item = (Elm_Segment_Item *)it; //Remove the existing icon if (item->icon) @@ -496,14 +496,14 @@ static Evas_Object * _item_content_get_hook(const Elm_Object_Item *it, const char *part) { if (part && strcmp(part, "icon")) return NULL; - return ((Elm_Segment_Item *) it)->icon; + return ((Elm_Segment_Item *)it)->icon; } static Eina_Bool _item_del_pre_hook(Elm_Object_Item *it) { Widget_Data *wd; - Elm_Segment_Item *item = (Elm_Segment_Item *) it; + Elm_Segment_Item *item = (Elm_Segment_Item *)it; wd = elm_widget_item_data_get(item); if (!wd) return EINA_FALSE; @@ -621,7 +621,7 @@ elm_segment_control_item_add(Evas_Object *obj, Evas_Object *icon, wd->seg_items = eina_list_append(wd->seg_items, it); _update_list(wd); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -646,7 +646,7 @@ elm_segment_control_item_insert_at(Evas_Object *obj, Evas_Object *icon, wd->seg_items = eina_list_append(wd->seg_items, it); _update_list(wd); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI void @@ -667,7 +667,7 @@ elm_segment_control_item_del_at(Evas_Object *obj, int idx) it = _item_find(obj, idx); if (!it) return; - elm_object_item_del((Elm_Object_Item *) it); + elm_object_item_del((Elm_Object_Item *)it); } EAPI const char* @@ -733,7 +733,7 @@ elm_segment_control_item_selected_set(Elm_Object_Item *it, Eina_Bool selected) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); Widget_Data *wd; - Elm_Segment_Item *item = (Elm_Segment_Item *) it; + Elm_Segment_Item *item = (Elm_Segment_Item *)it; wd = elm_widget_item_data_get(item); if (!wd) return; @@ -763,5 +763,5 @@ EAPI int elm_segment_control_item_index_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, -1); - return ((Elm_Segment_Item *) it)->seg_index; + return ((Elm_Segment_Item *)it)->seg_index; } diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c index f9b5b3c..ca041bb 100644 --- a/src/lib/elm_slideshow.c +++ b/src/lib/elm_slideshow.c @@ -351,7 +351,7 @@ _timer_cb(void *data) static Eina_Bool _item_del_pre_hook(Elm_Object_Item *it) { - Elm_Slideshow_Item *item = (Elm_Slideshow_Item *) it; + Elm_Slideshow_Item *item = (Elm_Slideshow_Item *)it; Widget_Data *wd = elm_widget_data_get(WIDGET(item)); if (!wd) return EINA_FALSE; @@ -449,9 +449,9 @@ elm_slideshow_item_add(Evas_Object *obj, const Elm_Slideshow_Item_Class *itc, co wd->items = eina_list_merge(wd->items, item->l); - if (!wd->current) elm_slideshow_item_show((Elm_Object_Item *) item); + if (!wd->current) elm_slideshow_item_show((Elm_Object_Item *)item); - return (Elm_Object_Item *) item; + return (Elm_Object_Item *)item; } EAPI Elm_Object_Item* @@ -471,9 +471,9 @@ elm_slideshow_item_sorted_insert(Evas_Object *obj, const Elm_Slideshow_Item_Clas wd->items = eina_list_sorted_merge(wd->items, item->l, func); - if (!wd->current) elm_slideshow_item_show((Elm_Object_Item *) item); + if (!wd->current) elm_slideshow_item_show((Elm_Object_Item *)item); - return (Elm_Object_Item *) item; + return (Elm_Object_Item *)item; } EAPI void @@ -484,7 +484,7 @@ elm_slideshow_item_show(Elm_Object_Item *it) char buf[1024]; Elm_Slideshow_Item *item, *next = NULL; Widget_Data *wd; - item = (Elm_Slideshow_Item *) it; + item = (Elm_Slideshow_Item *)it; wd = elm_widget_data_get(WIDGET(item)); if (!wd) return; if (item == wd->current) return; diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c index ceec8dd..2407d43 100644 --- a/src/lib/elm_toolbar.c +++ b/src/lib/elm_toolbar.c @@ -92,7 +92,7 @@ static void _item_disable_hook(Elm_Object_Item *it) { Widget_Data *wd; - Elm_Toolbar_Item *toolbar_it = (Elm_Toolbar_Item *) it; + Elm_Toolbar_Item *toolbar_it = (Elm_Toolbar_Item *)it; wd = elm_widget_data_get(WIDGET(toolbar_it)); if (!wd) return; @@ -408,14 +408,14 @@ _item_text_set_hook(Elm_Object_Item *it, const char *label) { if (part && strcmp(part, "default")) return; - _item_label_set(((Elm_Toolbar_Item *) it), label, "elm,state,label_set"); + _item_label_set(((Elm_Toolbar_Item *)it), label, "elm,state,label_set"); } static const char * _item_text_get_hook(const Elm_Object_Item *it, const char *part) { if (part && strcmp(part, "default")) return NULL; - return ((Elm_Toolbar_Item *) it)->label; + return ((Elm_Toolbar_Item *)it)->label; } static void @@ -891,7 +891,7 @@ _item_del_pre_hook(Elm_Object_Item *it) Widget_Data *wd; Evas_Object *obj2; Elm_Toolbar_Item *item, *next; - item = (Elm_Toolbar_Item *) it; + item = (Elm_Toolbar_Item *)it; wd = elm_widget_data_get(WIDGET(item)); if (!wd) return EINA_FALSE; @@ -1300,7 +1300,7 @@ elm_toolbar_item_append(Evas_Object *obj, const char *icon, const char *label, E _theme_hook_item(obj, it, scale, wd->icon_size); _sizing_eval(obj); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -1320,7 +1320,7 @@ elm_toolbar_item_prepend(Evas_Object *obj, const char *icon, const char *label, _theme_hook_item(obj, it, scale, wd->icon_size); _sizing_eval(obj); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -1345,7 +1345,7 @@ elm_toolbar_item_insert_before(Evas_Object *obj, Elm_Object_Item *before, const _theme_hook_item(obj, it, scale, wd->icon_size); _sizing_eval(obj); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -1370,7 +1370,7 @@ elm_toolbar_item_insert_after(Evas_Object *obj, Elm_Object_Item *after, const ch _theme_hook_item(obj, it, scale, wd->icon_size); _sizing_eval(obj); - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } EAPI Elm_Object_Item * @@ -1396,7 +1396,7 @@ elm_toolbar_item_next_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); return (Elm_Object_Item *) ELM_TOOLBAR_ITEM_FROM_INLIST( - EINA_INLIST_GET(((Elm_Toolbar_Item *) it))->next); + EINA_INLIST_GET(((Elm_Toolbar_Item *)it))->next); } EAPI Elm_Object_Item * @@ -1404,7 +1404,7 @@ elm_toolbar_item_prev_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); return (Elm_Object_Item *) ELM_TOOLBAR_ITEM_FROM_INLIST( - EINA_INLIST_GET(((Elm_Toolbar_Item *) it))->prev); + EINA_INLIST_GET(((Elm_Toolbar_Item *)it))->prev); } EAPI Evas_Object * @@ -1418,7 +1418,7 @@ EAPI void elm_toolbar_item_priority_set(Elm_Object_Item *it, int priority) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; + Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; if (item->prio.priority == priority) return; item->prio.priority = priority; _resize(WIDGET(item), NULL, NULL, NULL); @@ -1428,7 +1428,7 @@ EAPI int elm_toolbar_item_priority_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, 0); - return ((Elm_Toolbar_Item *) it)->prio.priority; + return ((Elm_Toolbar_Item *)it)->prio.priority; } EAPI const char * @@ -1466,7 +1466,7 @@ elm_toolbar_item_find_by_label(const Evas_Object *obj, const char *label) EINA_INLIST_FOREACH(wd->items, it) { if (!strcmp(it->label, label)) - return (Elm_Object_Item *) it; + return (Elm_Object_Item *)it; } return NULL; } @@ -1475,7 +1475,7 @@ EAPI void elm_toolbar_item_selected_set(Elm_Object_Item *it, Eina_Bool selected) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; + Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; Widget_Data *wd = elm_widget_data_get(WIDGET(item)); if (!wd) return; @@ -1488,7 +1488,7 @@ EAPI Eina_Bool elm_toolbar_item_selected_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); - return ((Elm_Toolbar_Item *) it)->selected; + return ((Elm_Toolbar_Item *)it)->selected; } EAPI Elm_Object_Item * @@ -1508,7 +1508,7 @@ elm_toolbar_item_icon_set(Elm_Object_Item *it, const char *icon) Evas_Object *icon_obj; Widget_Data *wd; Evas_Object *obj; - Elm_Toolbar_Item * item = (Elm_Toolbar_Item *) it; + Elm_Toolbar_Item * item = (Elm_Toolbar_Item *)it; obj = WIDGET(item); wd = elm_widget_data_get(obj); @@ -1532,7 +1532,7 @@ EAPI const char * elm_toolbar_item_icon_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - return ((Elm_Toolbar_Item *) it)->icon_str; + return ((Elm_Toolbar_Item *)it)->icon_str; } EAPI Evas_Object * @@ -1542,7 +1542,7 @@ elm_toolbar_item_object_get(const Elm_Object_Item *it) Widget_Data *wd; Evas_Object *obj; - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; + Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; obj = WIDGET(item); wd = elm_widget_data_get(obj); @@ -1555,7 +1555,7 @@ EAPI Evas_Object * elm_toolbar_item_icon_object_get(Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - return ((Elm_Toolbar_Item *) it)->icon; + return ((Elm_Toolbar_Item *)it)->icon; } EAPI Eina_Bool @@ -1567,7 +1567,7 @@ elm_toolbar_item_icon_memfile_set(Elm_Object_Item *it, const void *img, size_t s Widget_Data *wd; Evas_Object *obj; Eina_Bool ret; - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; + Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; obj = WIDGET(item); wd = elm_widget_data_get(obj); @@ -1600,7 +1600,7 @@ elm_toolbar_item_icon_file_set(Elm_Object_Item *it, const char *file, const char Widget_Data *wd; Evas_Object *obj; Eina_Bool ret; - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; + Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; obj = WIDGET(item); wd = elm_widget_data_get(obj); @@ -1652,7 +1652,7 @@ EAPI void elm_toolbar_item_separator_set(Elm_Object_Item *it, Eina_Bool separator) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; + Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; Evas_Object *obj = WIDGET(item); Widget_Data *wd = elm_widget_data_get(obj); double scale; @@ -1666,7 +1666,7 @@ EAPI Eina_Bool elm_toolbar_item_separator_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); - return ((Elm_Toolbar_Item *) it)->separator; + return ((Elm_Toolbar_Item *)it)->separator; } EAPI void @@ -1798,7 +1798,7 @@ EAPI void elm_toolbar_item_menu_set(Elm_Object_Item *it, Eina_Bool menu) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; + Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; Widget_Data *wd = elm_widget_data_get(WIDGET(item)); if (!wd) return; @@ -1811,7 +1811,7 @@ EAPI Evas_Object * elm_toolbar_item_menu_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; + Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; if (!item->menu) return NULL; Widget_Data *wd = elm_widget_data_get(WIDGET(item)); if (!wd) return NULL; @@ -1827,7 +1827,7 @@ elm_toolbar_item_state_add(Elm_Object_Item *it, const char *icon, const char *la Evas_Object *icon_obj; Evas_Object *obj; Widget_Data *wd; - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; + Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; obj = WIDGET(item); wd = elm_widget_data_get(WIDGET(item)); if (!wd) return NULL; @@ -1881,7 +1881,7 @@ elm_toolbar_item_state_del(Elm_Object_Item *it, Elm_Toolbar_Item_State *state) if (!state) return EINA_FALSE; - item = (Elm_Toolbar_Item *) it; + item = (Elm_Toolbar_Item *)it; if (!item->states) return EINA_FALSE; del_state = eina_list_data_find_list(item->states, state); @@ -1917,7 +1917,7 @@ elm_toolbar_item_state_set(Elm_Object_Item *it, Elm_Toolbar_Item_State *state) Eina_List *next_state; Elm_Toolbar_Item_State *it_state; Evas_Object *obj; - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; + Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; obj = WIDGET(item); wd = elm_widget_data_get(obj); @@ -1970,7 +1970,7 @@ EAPI Elm_Toolbar_Item_State * elm_toolbar_item_state_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; + Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; if ((!item->states) || (!item->current_state)) return NULL; if (item->current_state == item->states) return NULL; @@ -1986,7 +1986,7 @@ elm_toolbar_item_state_next(Elm_Object_Item *it) Widget_Data *wd; Evas_Object *obj; Eina_List *next_state; - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; + Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; obj = WIDGET(item); wd = elm_widget_data_get(obj); @@ -2007,7 +2007,7 @@ elm_toolbar_item_state_prev(Elm_Object_Item *it) Widget_Data *wd; Evas_Object *obj; Eina_List *prev_state; - Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; + Elm_Toolbar_Item *item = (Elm_Toolbar_Item *)it; obj = WIDGET(item); wd = elm_widget_data_get(obj); diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c index 681b7aa..d19e1a2 100644 --- a/src/lib/elm_widget.c +++ b/src/lib/elm_widget.c @@ -2897,7 +2897,7 @@ _elm_widget_item_del(Elm_Widget_Item *item) //Widget item delete callback if (item->del_pre_func) { - if (item->del_pre_func((Elm_Object_Item *) item)) + if (item->del_pre_func((Elm_Object_Item *)item)) _elm_widget_item_free(item); } else @@ -3403,7 +3403,7 @@ _elm_widget_item_content_part_set(Elm_Widget_Item *item, { ELM_WIDGET_ITEM_CHECK_OR_RETURN(item); if (!item->content_set_func) return; - item->content_set_func((Elm_Object_Item *) item, part, content); + item->content_set_func((Elm_Object_Item *)item, part, content); } EAPI Evas_Object * @@ -3412,7 +3412,7 @@ _elm_widget_item_content_part_get(const Elm_Widget_Item *item, { ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, NULL); if (!item->content_get_func) return NULL; - return item->content_get_func((Elm_Object_Item *) item, part); + return item->content_get_func((Elm_Object_Item *)item, part); } EAPI Evas_Object * @@ -3421,7 +3421,7 @@ _elm_widget_item_content_part_unset(Elm_Widget_Item *item, { ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, NULL); if (!item->content_unset_func) return NULL; - return item->content_unset_func((Elm_Object_Item *) item, part); + return item->content_unset_func((Elm_Object_Item *)item, part); } EAPI void @@ -3431,7 +3431,7 @@ _elm_widget_item_text_part_set(Elm_Widget_Item *item, { ELM_WIDGET_ITEM_CHECK_OR_RETURN(item); if (!item->text_set_func) return; - item->text_set_func((Elm_Object_Item *) item, part, label); + item->text_set_func((Elm_Object_Item *)item, part, label); } EAPI void @@ -3441,7 +3441,7 @@ _elm_widget_item_signal_emit(Elm_Widget_Item *item, { ELM_WIDGET_ITEM_CHECK_OR_RETURN(item); if (item->signal_emit_func) - item->signal_emit_func((Elm_Object_Item *) item, emission, source); + item->signal_emit_func((Elm_Object_Item *)item, emission, source); } EAPI const char * @@ -3450,7 +3450,7 @@ _elm_widget_item_text_part_get(const Elm_Widget_Item *item, { ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, NULL); if (!item->text_get_func) return NULL; - return item->text_get_func((Elm_Object_Item *) item, part); + return item->text_get_func((Elm_Object_Item *)item, part); } EAPI void @@ -3573,7 +3573,7 @@ _elm_widget_item_smart_callback_call(Elm_Widget_Item *item, const char *event, v if (cb->delete_me) continue; cb->walking++; item->walking++; - cb->func(cb->data, (Elm_Object_Item *) item, event_info); + cb->func(cb->data, (Elm_Object_Item *)item, event_info); item->walking--; cb->walking--; if (item->delete_me) break; -- 2.7.4