diff --git a/legacy/elementary/src/lib/elc_ctxpopup.c b/legacy/elementary/src/lib/elc_ctxpopup.c index 2b4bfee2cc..7ff98b8a32 100644 --- a/legacy/elementary/src/lib/elc_ctxpopup.c +++ b/legacy/elementary/src/lib/elc_ctxpopup.c @@ -51,7 +51,7 @@ _elm_ctxpopup_elm_widget_translate(Eo *obj, Elm_Ctxpopup_Data *sd) if (sd->auto_hide) evas_object_hide(obj); EINA_LIST_FOREACH(sd->items, l, it) - eo_do((Eo *)it, elm_wdg_item_translate()); + eo_do(it, elm_wdg_item_translate()); eo_do_super(obj, MY_CLASS, elm_obj_widget_translate()); @@ -1142,7 +1142,7 @@ _elm_ctxpopup_evas_object_smart_del(Eo *obj, Elm_Ctxpopup_Data *sd) ELM_SAFE_FREE(sd->bg, evas_object_del); EINA_LIST_FREE(sd->items, it) - eo_del((Eo *)it); + eo_del(it); eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); } @@ -1270,7 +1270,7 @@ _elm_ctxpopup_item_append(Eo *obj, Elm_Ctxpopup_Data *sd, const char *label, Eva if (sd->visible) elm_layout_sizing_eval(obj); - return (Elm_Object_Item *)eo_item; + return eo_item; } EOLIAN static void @@ -1363,13 +1363,13 @@ _elm_ctxpopup_item_prepend(Eo *obj, Elm_Ctxpopup_Data *sd, const char *label, Ev if (sd->visible) elm_layout_sizing_eval(obj); - return (Elm_Object_Item *)eo_item; + return eo_item; } EAPI Elm_Object_Item * elm_ctxpopup_item_prev_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_obj_ctxpopup_item_prev_get()); + return eo_do(it, elm_obj_ctxpopup_item_prev_get()); } EOLIAN static Elm_Object_Item * @@ -1390,7 +1390,7 @@ _elm_ctxpopup_item_prev_get(Eo *eo_item EINA_UNUSED, Elm_Ctxpopup_Item_Data *ite EAPI Elm_Object_Item * elm_ctxpopup_item_next_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_obj_ctxpopup_item_next_get()); + return eo_do(it, elm_obj_ctxpopup_item_next_get()); } EOLIAN static Elm_Object_Item * diff --git a/legacy/elementary/src/lib/elc_fileselector.c b/legacy/elementary/src/lib/elc_fileselector.c index da8af1d2d7..350d700694 100644 --- a/legacy/elementary/src/lib/elc_fileselector.c +++ b/legacy/elementary/src/lib/elc_fileselector.c @@ -1089,7 +1089,7 @@ _on_text_activated(void *data, Elm_Object_Item *item = elm_genlist_first_item_get(sd->files_view); while (item) { - const char *item_path = eo_do((Eo *)item, elm_wdg_item_data_get()); + const char *item_path = eo_do(item, elm_wdg_item_data_get()); if (!strcmp(item_path, path)) { elm_genlist_item_selected_set(item, EINA_TRUE); @@ -1324,7 +1324,7 @@ _resource_deleted(void *data, int type EINA_UNUSED, void *ev) } } - if (it) eo_do((Eo *)it, elm_wdg_item_del()); + if (it) eo_do(it, elm_wdg_item_del()); if (selected) { diff --git a/legacy/elementary/src/lib/elc_hoversel.c b/legacy/elementary/src/lib/elc_hoversel.c index bb94f9b4fe..8a32e1db29 100644 --- a/legacy/elementary/src/lib/elc_hoversel.c +++ b/legacy/elementary/src/lib/elc_hoversel.c @@ -308,7 +308,7 @@ _elm_hoversel_evas_object_smart_del(Eo *obj, Elm_Hoversel_Data *sd) eina_stringshare_del(item->label); eina_stringshare_del(item->icon_file); eina_stringshare_del(item->icon_group); - eo_del((Eo *)eo_item); + eo_del(eo_item); } elm_hoversel_hover_parent_set(obj, NULL); @@ -441,7 +441,7 @@ _elm_hoversel_clear(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd) EINA_LIST_FOREACH_SAFE(sd->items, l, ll, it) { - eo_do((Eo *)it, elm_wdg_item_del()); + eo_do(it, elm_wdg_item_del()); } } @@ -474,7 +474,7 @@ _elm_hoversel_item_add(Eo *obj, Elm_Hoversel_Data *sd, const char *label, const sd->items = eina_list_append(sd->items, eo_item); - return (Elm_Object_Item *)eo_item; + return eo_item; } EAPI void @@ -483,7 +483,7 @@ elm_hoversel_item_icon_set(Elm_Object_Item *it, const char *icon_group, Elm_Icon_Type icon_type) { - eo_do((Eo *)it, elm_obj_hoversel_item_icon_set(icon_file, icon_group, icon_type)); + eo_do(it, elm_obj_hoversel_item_icon_set(icon_file, icon_group, icon_type)); } EOLIAN static void @@ -505,7 +505,7 @@ elm_hoversel_item_icon_get(const Elm_Object_Item *it, const char **icon_group, Elm_Icon_Type *icon_type) { - eo_do((Eo *)it, elm_obj_hoversel_item_icon_get(icon_file, icon_group, icon_type)); + eo_do(it, elm_obj_hoversel_item_icon_get(icon_file, icon_group, icon_type)); } EOLIAN static void diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.c b/legacy/elementary/src/lib/elc_multibuttonentry.c index 2c6fc36a03..78f581b69c 100644 --- a/legacy/elementary/src/lib/elc_multibuttonentry.c +++ b/legacy/elementary/src/lib/elc_multibuttonentry.c @@ -49,7 +49,7 @@ _elm_multibuttonentry_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Multibuttone Eina_List *l; EINA_LIST_FOREACH(sd->items, l, it) - eo_do((Eo *)it, elm_wdg_item_translate()); + eo_do(it, elm_wdg_item_translate()); eo_do_super(obj, MY_CLASS, elm_obj_widget_translate()); @@ -507,7 +507,7 @@ _button_deleted_cb(void *data, ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_item, item); if (item->button == obj) { - eo_do((Eo *)eo_item, elm_wdg_item_del()); + eo_do(eo_item, elm_wdg_item_del()); break; } } @@ -665,7 +665,7 @@ _button_item_add(Elm_Multibuttonentry_Data *sd, Evas_Coord width = -1, height = -1; Elm_Multibuttonentry_Item_Filter *item_filter; Elm_Multibuttonentry_Item_Data *reference = eo_reference? - eo_data_scope_get((Eo *)eo_reference, ELM_MULTIBUTTONENTRY_ITEM_CLASS): + eo_data_scope_get(eo_reference, ELM_MULTIBUTTONENTRY_ITEM_CLASS): NULL; Evas_Object *obj; @@ -728,7 +728,7 @@ _button_item_add(Elm_Multibuttonentry_Data *sd, _elm_access_say(text); eina_strbuf_free(buf); - _access_multibuttonentry_item_register(obj, (Elm_Object_Item *)eo_item, EINA_TRUE); + _access_multibuttonentry_item_register(obj, eo_item, EINA_TRUE); } if (func) @@ -840,7 +840,7 @@ _button_item_add(Elm_Multibuttonentry_Data *sd, free(str_utf8); - return (Elm_Object_Item *)eo_item; + return eo_item; } //FIXME: having an empty event handling function and reacting on Evas @@ -1007,7 +1007,7 @@ _layout_key_down_cb(void *data, Elm_Multibuttonentry_Item_Data *item = sd->selected_it; if (item && sd->editable) { - eo_do((Eo *)EO_OBJ(item), elm_wdg_item_del()); + eo_do(EO_OBJ(item), elm_wdg_item_del()); elm_object_focus_set(sd->entry, EINA_TRUE); } } @@ -1517,7 +1517,7 @@ _elm_multibuttonentry_evas_object_smart_del(Eo *obj, Elm_Multibuttonentry_Data * { ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_item, item); evas_object_del(item->button); - eo_del((Eo *)eo_item); + eo_del(eo_item); } sd->items = NULL; @@ -1749,7 +1749,7 @@ EAPI void elm_multibuttonentry_item_selected_set(Elm_Object_Item *it, Eina_Bool selected) { - eo_do((Eo *)it, elm_obj_multibuttonentry_item_selected_set(selected)); + eo_do(it, elm_obj_multibuttonentry_item_selected_set(selected)); } EOLIAN static void @@ -1764,7 +1764,7 @@ _elm_multibuttonentry_item_selected_set(Eo *eo_item EINA_UNUSED, EAPI Eina_Bool elm_multibuttonentry_item_selected_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_obj_multibuttonentry_item_selected_get()); + return eo_do(it, elm_obj_multibuttonentry_item_selected_get()); } EOLIAN static Eina_Bool @@ -1789,7 +1789,7 @@ _elm_multibuttonentry_clear(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_item, item); elm_box_unpack(sd->box, item->button); evas_object_del(item->button); - eo_del((Eo *)eo_item); + eo_del(eo_item); } sd->items = NULL; } @@ -1800,7 +1800,7 @@ _elm_multibuttonentry_clear(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) EAPI Elm_Object_Item * elm_multibuttonentry_item_prev_get(const Elm_Object_Item *it) { - return (Elm_Object_Item *)eo_do((Eo *)it, elm_obj_multibuttonentry_item_prev_get()); + return eo_do(it, elm_obj_multibuttonentry_item_prev_get()); } EOLIAN static Elm_Object_Item * @@ -1814,7 +1814,7 @@ _elm_multibuttonentry_item_prev_get(Eo *eo_it, EINA_LIST_FOREACH(sd->items, l, eo_item) { - if (eo_item == (Elm_Object_Item *)eo_it) + if (eo_item == eo_it) { l = eina_list_prev(l); if (!l) return NULL; @@ -1827,7 +1827,7 @@ _elm_multibuttonentry_item_prev_get(Eo *eo_it, EAPI Elm_Object_Item * elm_multibuttonentry_item_next_get(const Elm_Object_Item *it) { - return (Elm_Object_Item *)eo_do((Eo *)it, elm_obj_multibuttonentry_item_next_get()); + return eo_do(it, elm_obj_multibuttonentry_item_next_get()); } EOLIAN static Elm_Object_Item * @@ -1841,7 +1841,7 @@ _elm_multibuttonentry_item_next_get(Eo *eo_it, EINA_LIST_FOREACH(sd->items, l, eo_item) { - if (eo_item == (Elm_Object_Item *)eo_it) + if (eo_item == eo_it) { l = eina_list_next(l); if (!l) return NULL; @@ -1854,14 +1854,14 @@ _elm_multibuttonentry_item_next_get(Eo *eo_it, EINA_DEPRECATED EAPI void * elm_multibuttonentry_item_data_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_wdg_item_data_get()); + return eo_do(it, elm_wdg_item_data_get()); } EINA_DEPRECATED EAPI void elm_multibuttonentry_item_data_set(Elm_Object_Item *it, void *data) { - eo_do((Eo *)it, elm_wdg_item_data_set(data)); + eo_do(it, elm_wdg_item_data_set(data)); } EOLIAN static void diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/legacy/elementary/src/lib/elc_naviframe.c index 8fff872f1d..78b1b9a412 100644 --- a/legacy/elementary/src/lib/elc_naviframe.c +++ b/legacy/elementary/src/lib/elc_naviframe.c @@ -84,7 +84,7 @@ _elm_naviframe_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd) Elm_Naviframe_Item_Data *it; EINA_INLIST_FOREACH(sd->stack, it) - eo_do((Eo *)EO_OBJ(it), elm_wdg_item_translate()); + eo_do(EO_OBJ(it), elm_wdg_item_translate()); eo_do_super(obj, MY_CLASS, elm_obj_widget_translate()); @@ -540,7 +540,7 @@ _elm_naviframe_item_elm_widget_item_del_pre(Eo *eo_item, Elm_Naviframe_Item_Data ecore_animator_del(nit->animator); - top = (eo_item == (Eo *)elm_naviframe_top_item_get(WIDGET(nit))); + top = (eo_item == elm_naviframe_top_item_get(WIDGET(nit))); if (evas_object_data_get(VIEW(nit), "out_of_list")) goto end; @@ -1100,7 +1100,7 @@ _on_item_pop_finished(void *data, elm_widget_tree_unfocusable_set(VIEW(it), EINA_FALSE); sd->popping = eina_list_remove(sd->popping, it); - eo_do((Eo *)EO_OBJ(it), elm_wdg_item_del()); + eo_do(EO_OBJ(it), elm_wdg_item_del()); } /* "elm,state,new,pushed", @@ -1400,14 +1400,14 @@ _elm_naviframe_evas_object_smart_del(Eo *obj, Elm_Naviframe_Data *sd) while (sd->stack) { it = EINA_INLIST_CONTAINER_GET(sd->stack, Elm_Naviframe_Item_Data); - eo_do((Eo *)EO_OBJ(it), elm_wdg_item_del()); + eo_do(EO_OBJ(it), elm_wdg_item_del()); } //All popping items which are not called yet by animator. EINA_LIST_FREE(sd->popping, it) { ecore_animator_del(it->animator); - eo_do((Eo *)EO_OBJ(it), elm_wdg_item_del()); + eo_do(EO_OBJ(it), elm_wdg_item_del()); } evas_object_del(sd->dummy_edje); @@ -1421,7 +1421,7 @@ _elm_naviframe_evas_object_smart_show(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSE { Elm_Object_Item *eo_top; - eo_top = (Elm_Object_Item *)elm_naviframe_top_item_get(obj); + eo_top = elm_naviframe_top_item_get(obj); ELM_NAVIFRAME_ITEM_DATA_GET(eo_top, top); if (top && !top->delete_me) @@ -1584,7 +1584,7 @@ _elm_naviframe_item_insert_before(Eo *obj, Elm_Naviframe_Data *sd, Elm_Object_It title_label, prev_btn, next_btn, content, item_style); if (!eo_it) return NULL; - it = eo_data_scope_get((Eo *)eo_it, ELM_NAVIFRAME_ITEM_CLASS); + it = eo_data_scope_get(eo_it, ELM_NAVIFRAME_ITEM_CLASS); sd->stack = eina_inlist_prepend_relative (sd->stack, EINA_INLIST_GET(it), @@ -1619,7 +1619,7 @@ _elm_naviframe_item_insert_after(Eo *obj, Elm_Naviframe_Data *sd, Elm_Object_Ite sd->stack = eina_inlist_append_relative (sd->stack, EINA_INLIST_GET(it), - EINA_INLIST_GET(((Elm_Naviframe_Item_Data *)after))); + EINA_INLIST_GET(after)); if (top_inserted) @@ -1669,7 +1669,7 @@ _elm_naviframe_item_pop(Eo *obj, Elm_Naviframe_Data *sd) { it->ref--; if (it->delete_me) - eo_do((Eo *)eo_item, elm_wdg_item_del()); + eo_do(eo_item, elm_wdg_item_del()); else it->popping = EINA_FALSE; evas_object_unref(obj); @@ -1716,7 +1716,7 @@ _elm_naviframe_item_pop(Eo *obj, Elm_Naviframe_Data *sd) sd->popping = eina_list_append(sd->popping, it); } else - eo_do((Eo *)eo_item, elm_wdg_item_del()); + eo_do(eo_item, elm_wdg_item_del()); return content; } @@ -1724,7 +1724,7 @@ _elm_naviframe_item_pop(Eo *obj, Elm_Naviframe_Data *sd) EAPI void elm_naviframe_item_pop_to(Elm_Object_Item *it) { - eo_do((Eo *)it, elm_obj_naviframe_item_pop_to()); + eo_do(it, elm_obj_naviframe_item_pop_to()); } EOLIAN static void @@ -1734,7 +1734,7 @@ _elm_naviframe_item_pop_to(Eo *eo_it, Elm_Naviframe_Item_Data *it) ELM_NAVIFRAME_DATA_GET(WIDGET(it), sd); - if (eo_it == (Eo *)elm_naviframe_top_item_get(WIDGET(it))) return; + if (eo_it == elm_naviframe_top_item_get(WIDGET(it))) return; l = sd->stack->last->prev; @@ -1749,7 +1749,7 @@ _elm_naviframe_item_pop_to(Eo *eo_it, Elm_Naviframe_Item_Data *it) l = l->prev; - eo_do((Eo *)EO_OBJ(iit), elm_wdg_item_del()); + eo_do(EO_OBJ(iit), elm_wdg_item_del()); } sd->on_deletion = EINA_FALSE; @@ -1760,7 +1760,7 @@ _elm_naviframe_item_pop_to(Eo *eo_it, Elm_Naviframe_Item_Data *it) EAPI void elm_naviframe_item_promote(Elm_Object_Item *it) { - eo_do((Eo *)it, elm_obj_naviframe_item_promote()); + eo_do(it, elm_obj_naviframe_item_promote()); } EOLIAN static void @@ -1772,7 +1772,7 @@ _elm_naviframe_item_promote(Eo *eo_it, Elm_Naviframe_Item_Data *it) ELM_NAVIFRAME_DATA_GET(WIDGET(nit), sd); eo_prev_top = elm_naviframe_top_item_get(WIDGET(nit)); - if (eo_it == (Eo *)eo_prev_top) return; + if (eo_it == eo_prev_top) return; sd->stack = eina_inlist_remove(sd->stack, EINA_INLIST_GET(nit)); _item_push_helper(nit); @@ -1785,9 +1785,9 @@ _elm_naviframe_item_simple_promote(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd, EINA_INLIST_FOREACH(sd->stack, itr) { - if (elm_object_item_content_get((Elm_Object_Item *)EO_OBJ(itr)) == content) + if (elm_object_item_content_get(EO_OBJ(itr)) == content) { - elm_naviframe_item_promote((Elm_Object_Item *)EO_OBJ(itr)); + elm_naviframe_item_promote(EO_OBJ(itr)); break; } } @@ -1827,7 +1827,7 @@ EAPI void elm_naviframe_item_style_set(Elm_Object_Item *it, const char *item_style) { - eo_do((Eo *)it, elm_obj_naviframe_item_style_set(item_style)); + eo_do(it, elm_obj_naviframe_item_style_set(item_style)); } EOLIAN static void @@ -1848,7 +1848,7 @@ _elm_naviframe_item_style_set(Eo *eo_item EINA_UNUSED, EAPI const char * elm_naviframe_item_style_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_obj_naviframe_item_style_get()); + return eo_do(it, elm_obj_naviframe_item_style_get()); } EOLIAN static const char * @@ -1876,7 +1876,7 @@ elm_naviframe_item_title_enabled_set(Elm_Object_Item *it, Eina_Bool enabled, Eina_Bool transition) { - eo_do((Eo *)it, elm_obj_naviframe_item_title_enabled_set(enabled, transition)); + eo_do(it, elm_obj_naviframe_item_title_enabled_set(enabled, transition)); } EOLIAN static void @@ -1897,7 +1897,7 @@ _elm_naviframe_item_title_enabled_set(Eo *eo_item EINA_UNUSED, EAPI Eina_Bool elm_naviframe_item_title_enabled_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_obj_naviframe_item_title_enabled_get()); + return eo_do(it, elm_obj_naviframe_item_title_enabled_get()); } EOLIAN static Eina_Bool @@ -1909,7 +1909,7 @@ _elm_naviframe_item_title_enabled_get(Eo *eo_item EINA_UNUSED, Elm_Naviframe_Ite EAPI void elm_naviframe_item_pop_cb_set(Elm_Object_Item *it, Elm_Naviframe_Item_Pop_Cb func, void *data) { - eo_do((Eo *)it, elm_obj_naviframe_item_pop_cb_set(func, data)); + eo_do(it, elm_obj_naviframe_item_pop_cb_set(func, data)); } EOLIAN static void diff --git a/legacy/elementary/src/lib/elc_popup.c b/legacy/elementary/src/lib/elc_popup.c index 9f22588363..17b444b731 100644 --- a/legacy/elementary/src/lib/elc_popup.c +++ b/legacy/elementary/src/lib/elc_popup.c @@ -58,7 +58,7 @@ _elm_popup_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd) Eina_List *l; EINA_LIST_FOREACH(sd->items, l, it) - eo_do((Eo *)EO_OBJ(it), elm_wdg_item_translate()); + eo_do(EO_OBJ(it), elm_wdg_item_translate()); eo_do_super(obj, MY_CLASS, elm_obj_widget_translate()); eo_do(sd->main_layout, elm_obj_widget_translate()); @@ -184,7 +184,7 @@ _items_remove(Elm_Popup_Data *sd) if (!sd->items) return; EINA_LIST_FREE(sd->items, it) - eo_do((Eo *)EO_OBJ(it), elm_wdg_item_del()); + eo_do(EO_OBJ(it), elm_wdg_item_del()); sd->items = NULL; } @@ -760,7 +760,7 @@ _elm_popup_item_elm_widget_item_disable(Eo *eo_it, Elm_Popup_Item_Data *it) { ELM_POPUP_ITEM_CHECK_OR_RETURN(it); - if (eo_do((Eo *)eo_it, elm_wdg_item_disabled_get())) + if (eo_do(eo_it, elm_wdg_item_disabled_get())) elm_layout_signal_emit(VIEW(it), "elm,state,item,disabled", "elm"); else elm_layout_signal_emit(VIEW(it), "elm,state,item,enabled", "elm"); diff --git a/legacy/elementary/src/lib/elm_access.c b/legacy/elementary/src/lib/elm_access.c index 754aba9c63..3ca73c9dbb 100644 --- a/legacy/elementary/src/lib/elm_access.c +++ b/legacy/elementary/src/lib/elm_access.c @@ -129,7 +129,7 @@ _elm_access_elm_widget_activate(Eo *obj, void *_pd EINA_UNUSED, Elm_Activate act if (ac->activate) ac->activate(ac->activate_data, ac->part_object, - (Elm_Object_Item *)ac->widget_item->eo_obj); + ac->widget_item->eo_obj); return EINA_TRUE; } diff --git a/legacy/elementary/src/lib/elm_colorselector.c b/legacy/elementary/src/lib/elm_colorselector.c index 3d8b7fe98f..56aafcc45e 100644 --- a/legacy/elementary/src/lib/elm_colorselector.c +++ b/legacy/elementary/src/lib/elm_colorselector.c @@ -59,7 +59,7 @@ _items_del(Elm_Colorselector_Data *sd) EINA_LIST_FREE(sd->items, item) { - eo_del ((Eo *)item); + eo_del (item); } sd->items = NULL; @@ -1355,7 +1355,7 @@ _access_info_cb(void *data, Evas_Object *obj EINA_UNUSED) Elm_Color_Item_Data *it = data; ELM_COLORSELECTOR_ITEM_CHECK_OR_RETURN(it, NULL); - elm_colorselector_palette_item_color_get((Elm_Object_Item *)EO_OBJ(it), &r, &g, &b, &a); + elm_colorselector_palette_item_color_get(EO_OBJ(it), &r, &g, &b, &a); buf = eina_strbuf_new(); eina_strbuf_append_printf(buf, "red %d, green %d, blue %d, alpha %d", r, g, b, a); @@ -1660,7 +1660,7 @@ _palette_box_vertical_item_get(Eina_List* ref_item, enum Palette_Box_Direction d for (l = ref_item; l; l = dir_func(l)) { eo_item = eina_list_data_get(l); - item = eo_data_scope_get((Eo *)eo_item, ELM_COLOR_ITEM_CLASS); + item = eo_data_scope_get(eo_item, ELM_COLOR_ITEM_CLASS); evas_object_geometry_get(VIEW(item), &x, &y, NULL, NULL); if (basey != y) break; } @@ -1671,7 +1671,7 @@ _palette_box_vertical_item_get(Eina_List* ref_item, enum Palette_Box_Direction d for (; l; l = dir_func(l)) { eo_item = eina_list_data_get(l); - item = eo_data_scope_get((Eo *)eo_item, ELM_COLOR_ITEM_CLASS); + item = eo_data_scope_get(eo_item, ELM_COLOR_ITEM_CLASS); evas_object_geometry_get(VIEW(item), &x, &y, NULL, NULL); if (basey != y) break; @@ -1834,7 +1834,7 @@ _elm_colorselector_elm_widget_focus_next(Eo *obj, Elm_Colorselector_Data *sd, El EINA_LIST_FOREACH(sd->items, l, eo_item) { - Elm_Widget_Item_Data *witem = eo_data_scope_get((Eo *)eo_item, ELM_WIDGET_ITEM_CLASS); + Elm_Widget_Item_Data *witem = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS); items = eina_list_append(items, witem->access_obj); } @@ -1861,7 +1861,7 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access) if (is_access) { EINA_LIST_FOREACH(sd->items, l, eo_it) - eo_do((Eo *)eo_it, elm_wdg_item_access_register()); + eo_do(eo_it, elm_wdg_item_access_register()); for (i = 0; i < 4; i++) _access_colorbar_register(obj, sd->cb_data[i], @@ -1870,7 +1870,7 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access) else { EINA_LIST_FOREACH(sd->items, l, eo_it) - eo_do((Eo *)eo_it, elm_wdg_item_access_unregister()); + eo_do(eo_it, elm_wdg_item_access_unregister()); //TODO: _elm_access_edje_object_part_object_unregister() ? } @@ -2006,7 +2006,7 @@ elm_colorselector_palette_item_color_get(const Elm_Object_Item *it, int *b, int *a) { - eo_do((Eo *) it, elm_obj_color_item_color_get(r, g, b, a)); + eo_do( it, elm_obj_color_item_color_get(r, g, b, a)); } EOLIAN static void @@ -2030,7 +2030,7 @@ elm_colorselector_palette_item_color_set(Elm_Object_Item *it, int b, int a) { - eo_do((Eo *) it, elm_obj_color_item_color_set(r, g, b, a)); + eo_do( it, elm_obj_color_item_color_set(r, g, b, a)); } EOLIAN static void @@ -2108,7 +2108,7 @@ EAPI void elm_colorselector_palette_item_selected_set(Elm_Object_Item *it, Eina_Bool selected) { - eo_do((Eo *) it, elm_obj_color_item_selected_set(selected)); + eo_do( it, elm_obj_color_item_selected_set(selected)); } EOLIAN static void @@ -2147,7 +2147,7 @@ _elm_color_item_selected_set(Eo *eo_item, EAPI Eina_Bool elm_colorselector_palette_item_selected_get(const Elm_Object_Item *it) { - return eo_do((Eo *) it, elm_obj_color_item_selected_get()); + return eo_do( it, elm_obj_color_item_selected_get()); } EOLIAN static Eina_Bool diff --git a/legacy/elementary/src/lib/elm_dayselector.c b/legacy/elementary/src/lib/elm_dayselector.c index 4cafaed353..2c7236de28 100644 --- a/legacy/elementary/src/lib/elm_dayselector.c +++ b/legacy/elementary/src/lib/elm_dayselector.c @@ -173,7 +173,7 @@ _item_del_cb(void *data, elm_layout_signal_emit(obj, buf, "elm"); VIEW(it) = NULL; - eo_del((Eo *)EO_OBJ(it)); + eo_del(EO_OBJ(it)); elm_layout_sizing_eval(obj); break; @@ -331,7 +331,7 @@ _elm_dayselector_elm_container_content_unset(Eo *obj, Elm_Dayselector_Data *sd, elm_layout_signal_emit(obj, buf, "elm"); VIEW(it) = NULL; - eo_del((Eo *)EO_OBJ(it)); + eo_del(EO_OBJ(it)); elm_layout_sizing_eval(obj); @@ -438,7 +438,7 @@ _elm_dayselector_evas_object_smart_del(Eo *obj, Elm_Dayselector_Data *sd) { sd->items = eina_list_remove(sd->items, it); eina_stringshare_del(it->day_style); - eo_del((Eo *)EO_OBJ(it)); + eo_del(EO_OBJ(it)); } /* handles freeing sd */ diff --git a/legacy/elementary/src/lib/elm_dbus_menu.c b/legacy/elementary/src/lib/elm_dbus_menu.c index 59fa09338f..84a5e59371 100644 --- a/legacy/elementary/src/lib/elm_dbus_menu.c +++ b/legacy/elementary/src/lib/elm_dbus_menu.c @@ -201,7 +201,7 @@ _property_exists(Elm_Menu_Item_Data *item, return EINA_FALSE; case ELM_DBUS_PROPERTY_ENABLED: - return elm_object_item_disabled_get((Elm_Object_Item *)EO_OBJ(item)); + return elm_object_item_disabled_get(EO_OBJ(item)); case ELM_DBUS_PROPERTY_ICON_NAME: return _freedesktop_icon_exists(item); @@ -229,7 +229,7 @@ _property_append(Elm_Menu_Item_Data *item, { case ELM_DBUS_PROPERTY_LABEL: variant = eldbus_message_iter_container_new(iter, 'v', "s"); - t = elm_object_item_part_text_get((Elm_Object_Item *)EO_OBJ(item), NULL); + t = elm_object_item_part_text_get(EO_OBJ(item), NULL); if (!t) { t = elm_object_part_text_get(item->content, NULL); @@ -409,7 +409,7 @@ _event_handle(Elm_DBus_Menu *dbus_menu, Eldbus_Message_Iter *iter, int *error_id } if (!strcmp(event, "clicked")) - _elm_dbus_menu_item_select_cb((Elm_Object_Item *)EO_OBJ(item)); + _elm_dbus_menu_item_select_cb(EO_OBJ(item)); return EINA_TRUE; } diff --git a/legacy/elementary/src/lib/elm_diskselector.c b/legacy/elementary/src/lib/elm_diskselector.c index 3976430998..681f64ae95 100644 --- a/legacy/elementary/src/lib/elm_diskselector.c +++ b/legacy/elementary/src/lib/elm_diskselector.c @@ -54,7 +54,7 @@ _elm_diskselector_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Diskselector_Dat Eina_List *l; EINA_LIST_FOREACH(sd->items, l, it) - eo_do((Eo *)EO_OBJ(it), elm_wdg_item_translate()); + eo_do(EO_OBJ(it), elm_wdg_item_translate()); return EINA_TRUE; } @@ -1107,7 +1107,7 @@ _round_item_del(Elm_Diskselector_Data *sd, elm_box_unpack(sd->main_box, VIEW(it)); sd->r_items = eina_list_remove(sd->r_items, it); eina_stringshare_del(it->label); - eo_del((Eo *)EO_OBJ(it)); + eo_del(EO_OBJ(it)); } static void @@ -1334,28 +1334,28 @@ _elm_diskselector_evas_object_smart_del(Eo *obj, Elm_Diskselector_Data *sd) { eina_stringshare_del(sd->last->label); evas_object_del(sd->VIEW(last)); - eo_del((Eo *)EO_OBJ(sd->last)); + eo_del(EO_OBJ(sd->last)); } if (sd->s_last) { eina_stringshare_del(sd->s_last->label); evas_object_del(sd->VIEW(s_last)); - eo_del((Eo *)EO_OBJ(sd->s_last)); + eo_del(EO_OBJ(sd->s_last)); } if (sd->second) { eina_stringshare_del(sd->second->label); evas_object_del(sd->VIEW(second)); - eo_del((Eo *)EO_OBJ(sd->second)); + eo_del(EO_OBJ(sd->second)); } if (sd->first) { eina_stringshare_del(sd->first->label); evas_object_del(sd->VIEW(first)); - eo_del((Eo *)EO_OBJ(sd->first)); + eo_del(EO_OBJ(sd->first)); } EINA_LIST_FOREACH(sd->under_items, l, it) @@ -1364,7 +1364,7 @@ _elm_diskselector_evas_object_smart_del(Eo *obj, Elm_Diskselector_Data *sd) { eina_stringshare_del(it->label); evas_object_del(VIEW(it)); - eo_del((Eo *)EO_OBJ(it)); + eo_del(EO_OBJ(it)); } } @@ -1374,14 +1374,14 @@ _elm_diskselector_evas_object_smart_del(Eo *obj, Elm_Diskselector_Data *sd) { eina_stringshare_del(it->label); evas_object_del(VIEW(it)); - eo_del((Eo *)EO_OBJ(it)); + eo_del(EO_OBJ(it)); } } EINA_LIST_FREE(sd->items, it) { _item_del(it); - eo_del((Eo *)EO_OBJ(it)); + eo_del(EO_OBJ(it)); } sd->r_items = eina_list_free(sd->r_items); @@ -1607,7 +1607,7 @@ _elm_diskselector_clear(Eo *obj, Elm_Diskselector_Data *sd) EINA_LIST_FREE(sd->items, it) { _item_del(it); - eo_del((Eo *)EO_OBJ(it)); + eo_del(EO_OBJ(it)); } _round_items_del(sd); @@ -1693,7 +1693,7 @@ EAPI void elm_diskselector_item_selected_set(Elm_Object_Item *item, Eina_Bool selected) { - eo_do((Eo *)item, elm_obj_diskselector_item_selected_set(selected)); + eo_do(item, elm_obj_diskselector_item_selected_set(selected)); } EOLIAN static void @@ -1721,7 +1721,7 @@ _elm_diskselector_item_selected_set(Eo *eo_it EINA_UNUSED, Elm_Diskselector_Item EAPI Eina_Bool elm_diskselector_item_selected_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_obj_diskselector_item_selected_get()); + return eo_do(it, elm_obj_diskselector_item_selected_get()); } EOLIAN static Eina_Bool @@ -1736,7 +1736,7 @@ _elm_diskselector_item_selected_get(Eo *eo_it EINA_UNUSED, Elm_Diskselector_Item EAPI Elm_Object_Item * elm_diskselector_item_prev_get(const Elm_Object_Item *item) { - return eo_do((Eo *)item, elm_obj_diskselector_item_prev_get()); + return eo_do(item, elm_obj_diskselector_item_prev_get()); } EOLIAN static Elm_Object_Item * @@ -1753,7 +1753,7 @@ _elm_diskselector_item_prev_get(Eo *eo_it EINA_UNUSED, Elm_Diskselector_Item_Dat EAPI Elm_Object_Item * elm_diskselector_item_next_get(const Elm_Object_Item *item) { - return eo_do((Eo *)item, elm_obj_diskselector_item_next_get()); + return eo_do(item, elm_obj_diskselector_item_next_get()); } EOLIAN static Elm_Object_Item * diff --git a/legacy/elementary/src/lib/elm_flipselector.c b/legacy/elementary/src/lib/elm_flipselector.c index f0bd51663d..c38f0124c1 100644 --- a/legacy/elementary/src/lib/elm_flipselector.c +++ b/legacy/elementary/src/lib/elm_flipselector.c @@ -230,7 +230,7 @@ _flipselector_process_deletions(Elm_Flipselector_Data *sd) if (!sd->current) sd->current = sd->items; - eo_do((Eo *)eo_item, elm_wdg_item_del()); + eo_do(eo_item, elm_wdg_item_del()); skip = EINA_FALSE; if (eina_list_count(sd->items) <= 1) @@ -314,7 +314,7 @@ _elm_flipselector_item_elm_widget_item_del_pre(Eo *eo_item, Elm_Flipselector_Ite EINA_LIST_FOREACH(sd->items, l, eo_item2) { - if ((Eo *)eo_item2 == eo_item) + if (eo_item2 == eo_item) { if (sd->current == l) { @@ -372,7 +372,7 @@ _item_new(Evas_Object *obj, /* TODO: no view here, but if one desires general contents in the * future... */ - return (Elm_Object_Item *)eo_item; + return eo_item; } EOLIAN static Eina_Bool @@ -751,7 +751,7 @@ EAPI void elm_flipselector_item_selected_set(Elm_Object_Item *it, Eina_Bool selected) { - eo_do((Eo*)it, elm_obj_flipselector_item_selected_set(selected)); + eo_do(it, elm_obj_flipselector_item_selected_set(selected)); } EOLIAN static void @@ -766,11 +766,11 @@ _elm_flipselector_item_selected_set(Eo *eo_item, ELM_FLIPSELECTOR_DATA_GET(WIDGET(item), sd); eo_cur = DATA_GET(sd->current); - if ((selected) && ((Eo *)eo_cur == eo_item)) return; + if ((selected) && (eo_cur == eo_item)) return; _flipselector_walk(sd); - if ((!selected) && ((Eo *)eo_cur == eo_item)) + if ((!selected) && (eo_cur == eo_item)) { EINA_LIST_FOREACH(sd->items, l, _eo_item) { @@ -790,7 +790,7 @@ _elm_flipselector_item_selected_set(Eo *eo_item, { if (_eo_item == eo_cur) flipside = MSG_FLIP_DOWN; - if ((Eo *)_eo_item == eo_item) + if (_eo_item == eo_item) { ELM_FLIPSELECTOR_ITEM_DATA_GET(_eo_item, _item); sd->current = l; @@ -805,7 +805,7 @@ _elm_flipselector_item_selected_set(Eo *eo_item, EAPI Eina_Bool elm_flipselector_item_selected_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_obj_flipselector_item_selected_get()); + return eo_do(it, elm_obj_flipselector_item_selected_get()); } EOLIAN static Eina_Bool @@ -820,7 +820,7 @@ _elm_flipselector_item_selected_get(Eo *eo_item, EAPI Elm_Object_Item * elm_flipselector_item_prev_get(const Elm_Object_Item *it) { - return (Elm_Object_Item *)eo_do((Eo *)it, elm_obj_flipselector_item_prev_get()); + return eo_do(it, elm_obj_flipselector_item_prev_get()); } EOLIAN static Elm_Object_Item * @@ -842,7 +842,7 @@ _elm_flipselector_item_prev_get(Eo *eo_item, EAPI Elm_Object_Item * elm_flipselector_item_next_get(const Elm_Object_Item *it) { - return (Elm_Object_Item *)eo_do((Eo *)it, elm_obj_flipselector_item_next_get()); + return eo_do(it, elm_obj_flipselector_item_next_get()); } EOLIAN static Elm_Object_Item * diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c index b85f6dfa45..3847055f30 100644 --- a/legacy/elementary/src/lib/elm_gengrid.c +++ b/legacy/elementary/src/lib/elm_gengrid.c @@ -508,7 +508,7 @@ _long_press_cb(void *data) ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd); it->long_timer = NULL; - if (eo_do((Eo *)EO_OBJ(it), elm_wdg_item_disabled_get()) || (it->dragging)) + if (eo_do(EO_OBJ(it), elm_wdg_item_disabled_get()) || (it->dragging)) return ECORE_CALLBACK_CANCEL; sd->longpressed = EINA_TRUE; evas_object_smart_callback_call(WIDGET(it), SIG_LONGPRESSED, EO_OBJ(it)); @@ -614,7 +614,7 @@ _elm_gengrid_item_unrealize(Elm_Gen_Item *it, EINA_LIST_FREE(it->content_objs, content) evas_object_del(content); - eo_do((Eo *)EO_OBJ(it), elm_wdg_item_track_cancel()); + eo_do(EO_OBJ(it), elm_wdg_item_track_cancel()); it->unrealize_cb(it); @@ -689,7 +689,7 @@ _item_mouse_up_cb(void *data, _elm_gengrid_item_unrealize(it, EINA_FALSE); } - if (eo_do((Eo *)eo_it, elm_wdg_item_disabled_get()) || (dragged)) return; + if (eo_do(eo_it, elm_wdg_item_disabled_get()) || (dragged)) return; if (sd->focused_item != eo_it) elm_object_item_focus_set(eo_it, EINA_TRUE); @@ -712,7 +712,7 @@ _item_mouse_up_cb(void *data, while (sd->selected) { Elm_Object_Item *eo_sel = sd->selected->data; - Elm_Gen_Item *sel = eo_data_scope_get((Eo *)eo_sel, ELM_GENGRID_ITEM_CLASS); + Elm_Gen_Item *sel = eo_data_scope_get(eo_sel, ELM_GENGRID_ITEM_CLASS); it->unsel_cb(sel); } } @@ -959,7 +959,7 @@ _item_realize(Elm_Gen_Item *it) if (it->selected) edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm"); - if (eo_do((Eo *)EO_OBJ(it), elm_wdg_item_disabled_get())) + if (eo_do(EO_OBJ(it), elm_wdg_item_disabled_get())) edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm"); } edje_object_message_signal_process(VIEW(it)); @@ -967,7 +967,7 @@ _item_realize(Elm_Gen_Item *it) if (it->tooltip.content_cb) { - eo_do((Eo *)EO_OBJ(it), + eo_do(EO_OBJ(it), elm_wdg_item_tooltip_content_cb_set( it->tooltip.content_cb, it->tooltip.data, NULL), elm_wdg_item_tooltip_style_set(it->tooltip.style), @@ -975,7 +975,7 @@ _item_realize(Elm_Gen_Item *it) } if (it->mouse_cursor) - eo_do((Eo *)EO_OBJ(it), elm_wdg_item_cursor_set(it->mouse_cursor)); + eo_do(EO_OBJ(it), elm_wdg_item_cursor_set(it->mouse_cursor)); it->realized = EINA_TRUE; it->want_unrealize = EINA_FALSE; @@ -1560,7 +1560,7 @@ _elm_gengrid_item_focused(Elm_Object_Item *eo_it) if (_is_no_select(it) || (eo_it == sd->focused_item) || - (eo_do((Eo *)eo_it, elm_wdg_item_disabled_get()))) + (eo_do(eo_it, elm_wdg_item_disabled_get()))) return; switch (_elm_config->focus_autoscroll_mode) @@ -1637,7 +1637,7 @@ _item_focus_up(Elm_Gengrid_Data *sd) { Elm_Object_Item *eo_prev = elm_gengrid_item_prev_get(sd->focused_item); if (!eo_prev) return EINA_FALSE; - prev = eo_data_scope_get((Eo *)eo_prev, ELM_GENGRID_ITEM_CLASS); + prev = eo_data_scope_get(eo_prev, ELM_GENGRID_ITEM_CLASS); if (eo_prev == sd->focused_item) return EINA_FALSE; } @@ -1646,7 +1646,7 @@ _item_focus_up(Elm_Gengrid_Data *sd) Elm_Object_Item *eo_tmp = elm_gengrid_item_prev_get(EO_OBJ(prev)); if (!eo_tmp) return EINA_FALSE; - prev = eo_data_scope_get((Eo *)eo_tmp, ELM_GENGRID_ITEM_CLASS); + prev = eo_data_scope_get(eo_tmp, ELM_GENGRID_ITEM_CLASS); } elm_object_item_focus_set(EO_OBJ(prev), EINA_TRUE); @@ -1673,7 +1673,7 @@ _item_focus_down(Elm_Gengrid_Data *sd) { Elm_Object_Item *eo_next = elm_gengrid_item_next_get(sd->focused_item); if (!eo_next) return EINA_FALSE; - next = eo_data_scope_get((Eo *)eo_next, ELM_GENGRID_ITEM_CLASS); + next = eo_data_scope_get(eo_next, ELM_GENGRID_ITEM_CLASS); if (eo_next == sd->focused_item) return EINA_FALSE; } @@ -1682,7 +1682,7 @@ _item_focus_down(Elm_Gengrid_Data *sd) Elm_Object_Item *eo_tmp = elm_gengrid_item_next_get(EO_OBJ(next)); if (!eo_tmp) return EINA_FALSE; - next = eo_data_scope_get((Eo *)eo_tmp, ELM_GENGRID_ITEM_CLASS); + next = eo_data_scope_get(eo_tmp, ELM_GENGRID_ITEM_CLASS); } elm_object_item_focus_set(EO_OBJ(next), EINA_TRUE); @@ -1705,7 +1705,7 @@ _item_focus_left(Elm_Gengrid_Data *sd) { Elm_Object_Item *eo_prev = elm_gengrid_item_prev_get(sd->focused_item); if (!eo_prev) return EINA_FALSE; - prev = eo_data_scope_get((Eo *)eo_prev, ELM_GENGRID_ITEM_CLASS); + prev = eo_data_scope_get(eo_prev, ELM_GENGRID_ITEM_CLASS); if (eo_prev == sd->focused_item) return EINA_FALSE; } @@ -1729,7 +1729,7 @@ _item_focus_right(Elm_Gengrid_Data *sd) { Elm_Object_Item *eo_next = elm_gengrid_item_next_get(sd->focused_item); if (!eo_next) return EINA_FALSE; - next = eo_data_scope_get((Eo *)eo_next, ELM_GENGRID_ITEM_CLASS); + next = eo_data_scope_get(eo_next, ELM_GENGRID_ITEM_CLASS); if (eo_next == sd->focused_item) return EINA_FALSE; } @@ -1914,7 +1914,7 @@ _item_single_select_left(Elm_Gengrid_Data *sd) break; eo_prev = elm_gengrid_item_prev_get(eo_prev); } - prev = eo_data_scope_get((Eo *)eo_prev, ELM_GENGRID_ITEM_CLASS); + prev = eo_data_scope_get(eo_prev, ELM_GENGRID_ITEM_CLASS); } if (!prev) return EINA_FALSE; @@ -1948,7 +1948,7 @@ _item_single_select_right(Elm_Gengrid_Data *sd) break; eo_next = elm_gengrid_item_next_get(eo_next); } - next = eo_data_scope_get((Eo *)eo_next, ELM_GENGRID_ITEM_CLASS); + next = eo_data_scope_get(eo_next, ELM_GENGRID_ITEM_CLASS); } if (!next) return EINA_FALSE; @@ -2491,7 +2491,7 @@ _item_horizontal_loop(Evas_Object *obj, Elm_Focus_Direction dir) while (!_elm_gengrid_item_edge_check(EO_OBJ(item), dir)) { eo_item = elm_gengrid_item_prev_get(eo_item); - item = eo_data_scope_get((Eo *)eo_item, ELM_GENGRID_ITEM_CLASS); + item = eo_data_scope_get(eo_item, ELM_GENGRID_ITEM_CLASS); counter++; } eo_item = elm_gengrid_first_item_get(obj); @@ -2508,7 +2508,7 @@ _item_horizontal_loop(Evas_Object *obj, Elm_Focus_Direction dir) { for (i = 0; i < sd->nmax; i++) eo_item = elm_gengrid_item_next_get(eo_item); - item = eo_data_scope_get((Eo *)eo_item, ELM_GENGRID_ITEM_CLASS); + item = eo_data_scope_get(eo_item, ELM_GENGRID_ITEM_CLASS); } } } @@ -2522,7 +2522,7 @@ _item_horizontal_loop(Evas_Object *obj, Elm_Focus_Direction dir) if (!elm_gengrid_item_next_get(eo_item)) break; eo_item = elm_gengrid_item_next_get(eo_item); - item = eo_data_scope_get((Eo *)eo_item, ELM_GENGRID_ITEM_CLASS); + item = eo_data_scope_get(eo_item, ELM_GENGRID_ITEM_CLASS); } } else if (dir == ELM_FOCUS_LEFT) @@ -2532,7 +2532,7 @@ _item_horizontal_loop(Evas_Object *obj, Elm_Focus_Direction dir) if (!elm_gengrid_item_prev_get(EO_OBJ(item))) break; eo_item = elm_gengrid_item_prev_get(eo_item); - item = eo_data_scope_get((Eo *)eo_item, ELM_GENGRID_ITEM_CLASS); + item = eo_data_scope_get(eo_item, ELM_GENGRID_ITEM_CLASS); } } else @@ -3027,7 +3027,7 @@ _elm_gengrid_elm_widget_on_focus(Eo *obj, Elm_Gengrid_Data *sd) (!sd->last_selected_item)) { Elm_Object_Item *sel = eina_list_data_get(sd->selected); - sd->last_selected_item = eo_data_scope_get((Eo *)sel, ELM_GENGRID_ITEM_CLASS); + sd->last_selected_item = eo_data_scope_get(sel, ELM_GENGRID_ITEM_CLASS); } if (elm_widget_focus_get(obj) && !sd->mouse_down) @@ -3150,7 +3150,7 @@ _elm_gengrid_item_del_not_serious(Elm_Gen_Item *it) ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd); Elm_Object_Item *eo_it = EO_OBJ(it); - eo_do((Eo *)eo_it, elm_wdg_item_pre_notify_del()); + eo_do(eo_it, elm_wdg_item_pre_notify_del()); it->generation = sd->generation - 1; /* This means that the item is deleted */ if (it->walking > 0) return; @@ -3304,7 +3304,7 @@ _elm_gengrid_item_elm_widget_item_disable(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *i if (it->realized) { - if (eo_do((Eo *)EO_OBJ(it), elm_wdg_item_disabled_get())) + if (eo_do(EO_OBJ(it), elm_wdg_item_disabled_get())) edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm"); else edje_object_signal_emit(VIEW(it), "elm,state,enabled", "elm"); @@ -3416,7 +3416,7 @@ _internal_elm_gengrid_clear(Evas_Object *obj, if (next) itn = ELM_GEN_ITEM_FROM_INLIST(next); if (itn) itn->walking++; /* prevent early death of subitem */ it->del_cb(it); - eo_del((Eo *)EO_OBJ(it)); + eo_del(EO_OBJ(it)); if (itn) itn->walking--; } } @@ -3479,7 +3479,7 @@ _item_select(Elm_Gen_Item *it) if ((!it->walking) && (it->generation < sd->generation)) { it->del_cb(it); - eo_del((Eo *)EO_OBJ(it)); + eo_del(EO_OBJ(it)); } else sd->last_selected_item = EO_OBJ(it); @@ -3491,7 +3491,7 @@ EOLIAN static void _elm_gengrid_item_eo_base_constructor(Eo *eo_it, Elm_Gen_Item *it) { eo_do_super(eo_it, ELM_GENGRID_ITEM_CLASS, eo_constructor()); - it->base = eo_data_scope_get((Eo *)eo_it, ELM_WIDGET_ITEM_CLASS); + it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS); } static Elm_Gen_Item * @@ -3905,7 +3905,7 @@ elm_gengrid_item_object_get(const Elm_Object_Item *eo_it) EAPI void elm_gengrid_item_update(Elm_Object_Item *item) { - eo_do((Eo *)item, elm_obj_gengrid_item_update()); + eo_do(item, elm_obj_gengrid_item_update()); } EOLIAN static void @@ -3924,7 +3924,7 @@ _elm_gengrid_item_update(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it) EAPI const Elm_Gengrid_Item_Class * elm_gengrid_item_item_class_get(const Elm_Object_Item *item) { - return eo_do((Eo *)item, elm_obj_gengrid_item_class_get()); + return eo_do(item, elm_obj_gengrid_item_class_get()); } EOLIAN static const Elm_Gengrid_Item_Class * @@ -3938,7 +3938,7 @@ EAPI void elm_gengrid_item_item_class_update(Elm_Object_Item *item, const Elm_Gengrid_Item_Class *itc) { - eo_do((Eo *)item, elm_obj_gengrid_item_class_update(itc)); + eo_do(item, elm_obj_gengrid_item_class_update(itc)); } EOLIAN static void @@ -3957,7 +3957,7 @@ elm_gengrid_item_pos_get(const Elm_Object_Item *it, unsigned int *x, unsigned int *y) { - return eo_do((Eo *)it, elm_obj_gengrid_item_pos_get(x, y)); + return eo_do(it, elm_obj_gengrid_item_pos_get(x, y)); } EOLIAN static void @@ -4014,7 +4014,7 @@ EAPI void elm_gengrid_item_selected_set(Elm_Object_Item *item, Eina_Bool selected) { - eo_do((Eo *)item, elm_obj_gengrid_item_selected_set(selected)); + eo_do(item, elm_obj_gengrid_item_selected_set(selected)); } EOLIAN static void @@ -4022,7 +4022,7 @@ _elm_gengrid_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, Eina_Bool selected) { ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd); - if ((it->generation < sd->generation) || eo_do((Eo *)EO_OBJ(it), elm_wdg_item_disabled_get())) + if ((it->generation < sd->generation) || eo_do(EO_OBJ(it), elm_wdg_item_disabled_get())) return; selected = !!selected; if (it->selected == selected) return; @@ -4050,7 +4050,7 @@ _elm_gengrid_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, EAPI Eina_Bool elm_gengrid_item_selected_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_obj_gengrid_item_selected_get()); + return eo_do(it, elm_obj_gengrid_item_selected_get()); } EOLIAN static Eina_Bool @@ -4111,7 +4111,7 @@ EAPI void elm_gengrid_item_tooltip_text_set(Elm_Object_Item *it, const char *text) { - eo_do((Eo *)it, elm_wdg_item_tooltip_text_set(text)); + eo_do(it, elm_wdg_item_tooltip_text_set(text)); } EOLIAN static void @@ -4129,7 +4129,7 @@ elm_gengrid_item_tooltip_content_cb_set(Elm_Object_Item *item, const void *data, Evas_Smart_Cb del_cb) { - eo_do((Eo *)item, elm_wdg_item_tooltip_content_cb_set(func, data, del_cb)); + eo_do(item, elm_wdg_item_tooltip_content_cb_set(func, data, del_cb)); } EOLIAN static void @@ -4167,7 +4167,7 @@ error: EAPI void elm_gengrid_item_tooltip_unset(Elm_Object_Item *item) { - eo_do((Eo *)item, elm_wdg_item_tooltip_unset()); + eo_do(item, elm_wdg_item_tooltip_unset()); } EOLIAN static void @@ -4193,7 +4193,7 @@ EAPI void elm_gengrid_item_tooltip_style_set(Elm_Object_Item *it, const char *style) { - eo_do((Eo *)it, elm_wdg_item_tooltip_style_set(style)); + eo_do(it, elm_wdg_item_tooltip_style_set(style)); } EOLIAN static void @@ -4208,7 +4208,7 @@ _elm_gengrid_item_elm_widget_item_tooltip_style_set(Eo *eo_it, Elm_Gen_Item *it, EAPI const char * elm_gengrid_item_tooltip_style_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_wdg_item_tooltip_style_get()); + return eo_do(it, elm_wdg_item_tooltip_style_get()); } EOLIAN static const char * @@ -4221,7 +4221,7 @@ EAPI Eina_Bool elm_gengrid_item_tooltip_window_mode_set(Elm_Object_Item *it, Eina_Bool disable) { - return eo_do((Eo *)it, elm_wdg_item_tooltip_window_mode_set(disable)); + return eo_do(it, elm_wdg_item_tooltip_window_mode_set(disable)); } EOLIAN static Eina_Bool @@ -4239,7 +4239,7 @@ _elm_gengrid_item_elm_widget_item_tooltip_window_mode_set(Eo *eo_it, Elm_Gen_Ite EAPI Eina_Bool elm_gengrid_item_tooltip_window_mode_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_wdg_item_tooltip_window_mode_get()); + return eo_do(it, elm_wdg_item_tooltip_window_mode_get()); } EOLIAN static Eina_Bool @@ -4254,7 +4254,7 @@ EAPI void elm_gengrid_item_cursor_set(Elm_Object_Item *it, const char *cursor) { - eo_do((Eo *)it, elm_wdg_item_cursor_set(cursor)); + eo_do(it, elm_wdg_item_cursor_set(cursor)); } EOLIAN static void @@ -4271,13 +4271,13 @@ _elm_gengrid_item_elm_widget_item_cursor_set(Eo *eo_it, Elm_Gen_Item *it, EAPI const char * elm_gengrid_item_cursor_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_wdg_item_cursor_get()); + return eo_do(it, elm_wdg_item_cursor_get()); } EAPI void elm_gengrid_item_cursor_unset(Elm_Object_Item *item) { - eo_do((Eo *)item, elm_wdg_item_cursor_unset()); + eo_do(item, elm_wdg_item_cursor_unset()); } EOLIAN static void @@ -4297,26 +4297,26 @@ EAPI void elm_gengrid_item_cursor_style_set(Elm_Object_Item *it, const char *style) { - eo_do((Eo *)it, elm_wdg_item_cursor_style_set(style)); + eo_do(it, elm_wdg_item_cursor_style_set(style)); } EAPI const char * elm_gengrid_item_cursor_style_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_wdg_item_cursor_style_get()); + return eo_do(it, elm_wdg_item_cursor_style_get()); } EAPI void elm_gengrid_item_cursor_engine_only_set(Elm_Object_Item *it, Eina_Bool engine_only) { - eo_do((Eo *)it, elm_wdg_item_cursor_engine_only_set(engine_only)); + eo_do(it, elm_wdg_item_cursor_engine_only_set(engine_only)); } EAPI Eina_Bool elm_gengrid_item_cursor_engine_only_get(const Elm_Object_Item *it) { - return eo_do((Eo *) it, elm_wdg_item_cursor_engine_only_get()); + return eo_do( it, elm_wdg_item_cursor_engine_only_get()); } EAPI void @@ -4382,7 +4382,7 @@ elm_gengrid_bounce_get(const Evas_Object *obj, Eina_Bool *v_bounce) { ELM_GENGRID_CHECK(obj); - eo_do((Eo *) obj, elm_interface_scrollable_bounce_allow_get(h_bounce, v_bounce)); + eo_do( obj, elm_interface_scrollable_bounce_allow_get(h_bounce, v_bounce)); } EOLIAN static void @@ -4391,15 +4391,15 @@ _elm_gengrid_page_relative_set(Eo *obj, Elm_Gengrid_Data *_pd EINA_UNUSED, doubl Evas_Coord pagesize_h; Evas_Coord pagesize_v; - eo_do((Eo *) obj, elm_interface_scrollable_paging_get(NULL, NULL, &pagesize_h, &pagesize_v)); - eo_do((Eo *) obj, elm_interface_scrollable_paging_set + eo_do( obj, elm_interface_scrollable_paging_get(NULL, NULL, &pagesize_h, &pagesize_v)); + eo_do( obj, elm_interface_scrollable_paging_set (h_pagerel, v_pagerel, pagesize_h, pagesize_v)); } EOLIAN static void _elm_gengrid_page_relative_get(Eo *obj, Elm_Gengrid_Data *_pd EINA_UNUSED, double *h_pagerel, double *v_pagerel) { - eo_do((Eo *) obj, elm_interface_scrollable_paging_get(h_pagerel, v_pagerel, NULL, NULL)); + eo_do( obj, elm_interface_scrollable_paging_get(h_pagerel, v_pagerel, NULL, NULL)); } EOLIAN static void @@ -4408,8 +4408,8 @@ _elm_gengrid_page_size_set(Eo *obj, Elm_Gengrid_Data *_pd EINA_UNUSED, Evas_Coor double pagerel_h; double pagerel_v; - eo_do((Eo *) obj, elm_interface_scrollable_paging_get(&pagerel_h, &pagerel_v, NULL, NULL)); - eo_do((Eo *) obj, elm_interface_scrollable_paging_set + eo_do( obj, elm_interface_scrollable_paging_get(&pagerel_h, &pagerel_v, NULL, NULL)); + eo_do( obj, elm_interface_scrollable_paging_set (pagerel_h, pagerel_v, h_pagesize, v_pagesize)); } @@ -4419,7 +4419,7 @@ elm_gengrid_current_page_get(const Evas_Object *obj, int *v_pagenumber) { ELM_GENGRID_CHECK(obj); - eo_do((Eo *) obj, elm_interface_scrollable_current_page_get(h_pagenumber, v_pagenumber)); + eo_do( obj, elm_interface_scrollable_current_page_get(h_pagenumber, v_pagenumber)); } EAPI void @@ -4428,7 +4428,7 @@ elm_gengrid_last_page_get(const Evas_Object *obj, int *v_pagenumber) { ELM_GENGRID_CHECK(obj); - eo_do((Eo *) obj, elm_interface_scrollable_last_page_get(h_pagenumber, v_pagenumber)); + eo_do( obj, elm_interface_scrollable_last_page_get(h_pagenumber, v_pagenumber)); } EINA_DEPRECATED EAPI void @@ -4437,7 +4437,7 @@ elm_gengrid_page_show(const Evas_Object *obj, int v_pagenumber) { ELM_GENGRID_CHECK(obj); - eo_do((Eo *) obj, elm_interface_scrollable_page_show(h_pagenumber, v_pagenumber)); + eo_do( obj, elm_interface_scrollable_page_show(h_pagenumber, v_pagenumber)); } EINA_DEPRECATED EAPI void @@ -4446,7 +4446,7 @@ elm_gengrid_page_bring_in(const Evas_Object *obj, int v_pagenumber) { ELM_GENGRID_CHECK(obj); - eo_do((Eo *) obj, elm_interface_scrollable_page_bring_in(h_pagenumber, v_pagenumber)); + eo_do( obj, elm_interface_scrollable_page_bring_in(h_pagenumber, v_pagenumber)); } EAPI void @@ -4474,7 +4474,7 @@ elm_gengrid_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy_v) { ELM_GENGRID_CHECK(obj); - eo_do((Eo *) obj, elm_interface_scrollable_policy_get(policy_h, policy_v)); + eo_do( obj, elm_interface_scrollable_policy_get(policy_h, policy_v)); } EOLIAN static void @@ -4482,7 +4482,7 @@ _elm_gengrid_elm_interface_scrollable_policy_get(Eo *obj, Elm_Gengrid_Data *sd E { Elm_Scroller_Policy s_policy_h, s_policy_v; - eo_do_super((Eo *)obj, MY_CLASS, elm_interface_scrollable_policy_get(&s_policy_h, &s_policy_v)); + eo_do_super(obj, MY_CLASS, elm_interface_scrollable_policy_get(&s_policy_h, &s_policy_v)); if (policy_h) *policy_h = (Elm_Scroller_Policy)s_policy_h; if (policy_v) *policy_v = (Elm_Scroller_Policy)s_policy_v; } @@ -4603,7 +4603,7 @@ _elm_gengrid_last_item_get(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *sd) EAPI Elm_Object_Item * elm_gengrid_item_next_get(const Elm_Object_Item *item) { - return eo_do((Eo *)item, elm_obj_gengrid_item_next_get()); + return eo_do(item, elm_obj_gengrid_item_next_get()); } EOLIAN static Elm_Object_Item * @@ -4623,7 +4623,7 @@ _elm_gengrid_item_next_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) EAPI Elm_Object_Item * elm_gengrid_item_prev_get(const Elm_Object_Item *item) { - return eo_do((Eo *)item, elm_obj_gengrid_item_prev_get()); + return eo_do(item, elm_obj_gengrid_item_prev_get()); } EOLIAN static Elm_Object_Item * @@ -4644,7 +4644,7 @@ EAPI void elm_gengrid_item_show(Elm_Object_Item *item, Elm_Gengrid_Item_Scrollto_Type type) { - eo_do((Eo *)item, elm_obj_gengrid_item_show(type)); + eo_do(item, elm_obj_gengrid_item_show(type)); } EOLIAN static void @@ -4665,7 +4665,7 @@ EAPI void elm_gengrid_item_bring_in(Elm_Object_Item *item, Elm_Gengrid_Item_Scrollto_Type type) { - eo_do((Eo *)item, elm_obj_gengrid_item_bring_in(type)); + eo_do(item, elm_obj_gengrid_item_bring_in(type)); } EOLIAN static void @@ -4783,7 +4783,7 @@ _elm_gengrid_highlight_mode_get(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *sd) EAPI int elm_gengrid_item_index_get(const Elm_Object_Item *item) { - return eo_do((Eo *)item, elm_obj_gengrid_item_index_get()); + return eo_do(item, elm_obj_gengrid_item_index_get()); } EOLIAN static int @@ -4798,7 +4798,7 @@ EAPI void elm_gengrid_item_select_mode_set(Elm_Object_Item *item, Elm_Object_Select_Mode mode) { - eo_do((Eo *)item, elm_obj_gengrid_item_select_mode_set(mode)); + eo_do(item, elm_obj_gengrid_item_select_mode_set(mode)); } EOLIAN static void @@ -4819,7 +4819,7 @@ _elm_gengrid_item_select_mode_set(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it, EAPI Elm_Object_Select_Mode elm_gengrid_item_select_mode_get(const Elm_Object_Item *item) { - return eo_do((Eo *)item, elm_obj_gengrid_item_select_mode_get()); + return eo_do(item, elm_obj_gengrid_item_select_mode_get()); } EOLIAN static Elm_Object_Select_Mode diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c index 2ebbae6b2c..563ac99d75 100644 --- a/legacy/elementary/src/lib/elm_genlist.c +++ b/legacy/elementary/src/lib/elm_genlist.c @@ -331,7 +331,7 @@ _item_content_realize(Elm_Gen_Item *it, edje_object_part_swallow(target, key, ic); evas_object_show(ic); elm_widget_sub_object_add(WIDGET(it), ic); - if (eo_do((Eo *)EO_OBJ(it), elm_wdg_item_disabled_get())) + if (eo_do(EO_OBJ(it), elm_wdg_item_disabled_get())) elm_widget_disabled_set(ic, EINA_TRUE); } } @@ -556,7 +556,7 @@ _elm_genlist_item_unrealize(Elm_Gen_Item *it, ELM_SAFE_FREE(it->item_focus_chain, eina_list_free); - eo_do((Eo *)EO_OBJ(it), elm_wdg_item_track_cancel()); + eo_do(EO_OBJ(it), elm_wdg_item_track_cancel()); it->unrealize_cb(it); @@ -949,7 +949,7 @@ _item_sub_items_clear(Elm_Gen_Item *it) EINA_LIST_FOREACH(it->item->items, l, it2) tl = eina_list_append(tl, it2); EINA_LIST_FREE(tl, it2) - eo_do((Eo *)EO_OBJ(it2), elm_wdg_item_del()); + eo_do(EO_OBJ(it2), elm_wdg_item_del()); } static void @@ -1151,9 +1151,9 @@ _elm_genlist_item_state_update(Elm_Gen_Item *it, (it->deco_all_view, "elm,state,selected", "elm"); } } - if (eo_do((Eo *)EO_OBJ(it), elm_wdg_item_disabled_get()) != itc->disabled) + if (eo_do(EO_OBJ(it), elm_wdg_item_disabled_get()) != itc->disabled) { - if (eo_do((Eo *)EO_OBJ(it), elm_wdg_item_disabled_get())) + if (eo_do(EO_OBJ(it), elm_wdg_item_disabled_get())) edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm"); if (it->deco_all_view) edje_object_signal_emit @@ -1177,7 +1177,7 @@ _elm_genlist_item_state_update(Elm_Gen_Item *it, edje_object_signal_emit (it->deco_all_view, "elm,state,selected", "elm"); } - if (eo_do((Eo *)EO_OBJ(it), elm_wdg_item_disabled_get())) + if (eo_do(EO_OBJ(it), elm_wdg_item_disabled_get())) { edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm"); if (it->deco_all_view) @@ -1422,7 +1422,7 @@ _item_cache_add(Elm_Gen_Item *it) itc->item_style = eina_stringshare_add(it->itc->item_style); if (it->item->type & ELM_GENLIST_ITEM_TREE) itc->tree = 1; itc->selected = it->selected; - itc->disabled = eo_do((Eo *)EO_OBJ(it), elm_wdg_item_disabled_get()); + itc->disabled = eo_do(EO_OBJ(it), elm_wdg_item_disabled_get()); itc->expanded = it->item->expanded; ELM_SAFE_FREE(it->long_timer, ecore_timer_del); ELM_SAFE_FREE(it->item->swipe_timer, ecore_timer_del); @@ -1545,7 +1545,7 @@ _access_widget_item_register(Elm_Gen_Item *it) { Elm_Access_Info *ai; - _elm_access_widget_item_register((Elm_Widget_Item_Data *)it); + _elm_access_widget_item_register(it->base); ai = _elm_access_info_get(it->base->access_obj); @@ -1694,7 +1694,7 @@ _item_realize(Elm_Gen_Item *it, /* access: unregister item which have no text and content */ if (_elm_config->access_mode && !it->texts && !it->contents) - _elm_access_widget_item_unregister((Elm_Widget_Item_Data *)it); + _elm_access_widget_item_unregister(it->base); if (!it->item->mincalcd) { @@ -1728,7 +1728,7 @@ _item_realize(Elm_Gen_Item *it, if (it->tooltip.content_cb) { - eo_do((Eo *)EO_OBJ(it), + eo_do(EO_OBJ(it), elm_wdg_item_tooltip_content_cb_set( it->tooltip.content_cb, it->tooltip.data, NULL), elm_wdg_item_tooltip_style_set(it->tooltip.style), @@ -1736,7 +1736,7 @@ _item_realize(Elm_Gen_Item *it, } if (it->mouse_cursor) - eo_do((Eo *)EO_OBJ(it), + eo_do(EO_OBJ(it), elm_wdg_item_cursor_set(it->mouse_cursor)); it->realized = EINA_TRUE; @@ -1821,7 +1821,7 @@ _tree_effect_animator_cb(void *data) eo_it2 = EO_OBJ(it2); while (eo_it2 && vis) { - it2 = eo_data_scope_get((Eo *)eo_it2, ELM_GENLIST_ITEM_CLASS); + it2 = eo_data_scope_get(eo_it2, ELM_GENLIST_ITEM_CLASS); evas_object_move(VIEW(it2), it2->item->scrl_x, it2->item->scrl_y); vis = (ELM_RECTS_INTERSECT(it2->item->scrl_x, it2->item->scrl_y, it2->item->w, it2->item->h, cvx, cvy, cvw, @@ -1923,7 +1923,7 @@ _tree_effect_animator_cb(void *data) while (eo_it) { - it = eo_data_scope_get((Eo *)eo_it, ELM_GENLIST_ITEM_CLASS); + it = eo_data_scope_get(eo_it, ELM_GENLIST_ITEM_CLASS); num++; if (sd->expanded_item->item->expanded_depth >= it->item->expanded_depth) break; @@ -2407,7 +2407,7 @@ _item_single_select_up(Elm_Genlist_Data *sd) { Elm_Object_Item *eo_prev = elm_genlist_item_prev_get (sd->last_selected_item); - prev = eo_data_scope_get((Eo *)eo_prev, ELM_GENLIST_ITEM_CLASS); + prev = eo_data_scope_get(eo_prev, ELM_GENLIST_ITEM_CLASS); } while (prev) @@ -2437,7 +2437,7 @@ _item_single_select_down(Elm_Genlist_Data *sd) else { eo_next = elm_genlist_item_next_get(sd->last_selected_item); - next = eo_data_scope_get((Eo *)eo_next, ELM_GENLIST_ITEM_CLASS); + next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS); } while ((next)) @@ -2470,7 +2470,7 @@ _elm_genlist_item_focused(Elm_Object_Item *eo_it) if (_is_no_select(it) || (eo_it == sd->focused_item) || - (eo_do((Eo *)eo_it, elm_wdg_item_disabled_get()))) + (eo_do(eo_it, elm_wdg_item_disabled_get()))) return; switch (_elm_config->focus_autoscroll_mode) @@ -2549,7 +2549,7 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction dir) while ((next) && (next->generation < sd->generation) && - (!eo_do((Eo *)EO_OBJ(next), elm_wdg_item_disabled_get()))) + (!eo_do(EO_OBJ(next), elm_wdg_item_disabled_get()))) next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next); } else @@ -2560,12 +2560,12 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction dir) eo_first_item = elm_genlist_first_item_get(WIDGET(focus_it)); if (eo_first_item == sd->focused_item) return EINA_FALSE; eo_next = elm_genlist_item_prev_get(sd->focused_item); - next = eo_data_scope_get((Eo *)eo_next, ELM_GENLIST_ITEM_CLASS); + next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS); - while (eo_do((Eo *)eo_next, elm_wdg_item_disabled_get())) + while (eo_do(eo_next, elm_wdg_item_disabled_get())) { eo_next = elm_genlist_item_prev_get(eo_next); - next = eo_data_scope_get((Eo *)eo_next, ELM_GENLIST_ITEM_CLASS); + next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS); } } else if (dir == ELM_FOCUS_DOWN) @@ -2573,12 +2573,12 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction dir) eo_last_item = elm_genlist_last_item_get(WIDGET(focus_it)); if (eo_last_item == sd->focused_item) return EINA_FALSE; eo_next = elm_genlist_item_next_get(sd->focused_item); - next = eo_data_scope_get((Eo *)eo_next, ELM_GENLIST_ITEM_CLASS); + next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS); - while (eo_do((Eo *)eo_next, elm_wdg_item_disabled_get())) + while (eo_do(eo_next, elm_wdg_item_disabled_get())) { eo_next = elm_genlist_item_next_get(eo_next); - next = eo_data_scope_get((Eo *)eo_next, ELM_GENLIST_ITEM_CLASS); + next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS); } } else @@ -3155,7 +3155,7 @@ _item_highlight(Elm_Gen_Item *it) if (_is_no_select(it) || (!sd->highlight) || (it->generation < sd->generation) || - (it->highlighted) || eo_do((Eo *)EO_OBJ(it), elm_wdg_item_disabled_get()) || + (it->highlighted) || eo_do(EO_OBJ(it), elm_wdg_item_disabled_get()) || (it->item->deco_it_view)) return; @@ -3367,7 +3367,7 @@ _elm_genlist_item_del_not_serious(Elm_Gen_Item *it) ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd); Elm_Object_Item *eo_it = EO_OBJ(it); - eo_do((Eo *)eo_it, elm_wdg_item_pre_notify_del()); + eo_do(eo_it, elm_wdg_item_pre_notify_del()); it->generation = sd->generation - 1; /* This means that * the item is * deleted */ @@ -3662,7 +3662,7 @@ _long_press_cb(void *data) it->long_timer = NULL; if (_is_no_select(it) || - eo_do((Eo *)EO_OBJ(it), elm_wdg_item_disabled_get()) || (it->dragging)) + eo_do(EO_OBJ(it), elm_wdg_item_disabled_get()) || (it->dragging)) return ECORE_CALLBACK_CANCEL; sd->longpressed = EINA_TRUE; @@ -3709,7 +3709,7 @@ _swipe_do(Elm_Gen_Item *it) ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd); if (_is_no_select(it) || - eo_do((Eo *)EO_OBJ(it), elm_wdg_item_disabled_get())) return; + eo_do(EO_OBJ(it), elm_wdg_item_disabled_get())) return; sd->swipe = EINA_FALSE; for (i = 0; i < sd->movements; i++) @@ -4446,7 +4446,7 @@ _access_activate_cb(void *data EINA_UNUSED, while (sd->selected) { Elm_Object_Item *eo_sel = sd->selected->data; - Elm_Gen_Item *sel = eo_data_scope_get((Eo *)eo_sel, ELM_GENLIST_ITEM_CLASS); + Elm_Gen_Item *sel = eo_data_scope_get(eo_sel, ELM_GENLIST_ITEM_CLASS); it->unsel_cb(sel); } } @@ -4587,7 +4587,7 @@ _item_mouse_up_cb(void *data, } if (_is_no_select(it) || - (eo_do((Eo *)EO_OBJ(it), elm_wdg_item_disabled_get()) || (dragged))) + (eo_do(EO_OBJ(it), elm_wdg_item_disabled_get()) || (dragged))) return; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; @@ -4614,7 +4614,7 @@ _item_mouse_up_cb(void *data, while (sd->selected) { Elm_Object_Item *eo_sel = sd->selected->data; - Elm_Gen_Item *sel = eo_data_scope_get((Eo *)eo_sel, ELM_GENLIST_ITEM_CLASS); + Elm_Gen_Item *sel = eo_data_scope_get(eo_sel, ELM_GENLIST_ITEM_CLASS); it->unsel_cb(sel); } } @@ -4820,7 +4820,7 @@ _item_unrealize_cb(Elm_Gen_Item *it) /* access */ if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) - _elm_access_widget_item_unregister((Elm_Widget_Item_Data *)it); + _elm_access_widget_item_unregister(it->base); // unswallow VIEW(it) first then manipulate VIEW(it) _decorate_item_unrealize(it); @@ -5447,7 +5447,7 @@ _access_obj_process(Elm_Genlist_Data *sd, Eina_Bool is_access) if (!it->realized) continue; if (is_access) _access_widget_item_register(it); else - _elm_access_widget_item_unregister((Elm_Widget_Item_Data *)it); + _elm_access_widget_item_unregister(it->base); } } else if (done) break; @@ -5525,7 +5525,7 @@ _internal_elm_genlist_clear(Evas_Object *obj, if (next) itn = ELM_GEN_ITEM_FROM_INLIST(next); if (itn) itn->walking++; /* prevent early death of subitem */ it->del_cb(it); - eo_del((Eo *)EO_OBJ(it)); + eo_del(EO_OBJ(it)); if (itn) itn->walking--; } } @@ -5610,7 +5610,7 @@ _item_select(Elm_Gen_Item *it) if ((!it->walking) && (it->generation < sd->generation)) { it->del_cb(it); - eo_del((Eo *)EO_OBJ(it)); + eo_del(EO_OBJ(it)); } else sd->last_selected_item = EO_OBJ(it); @@ -5669,7 +5669,7 @@ _elm_genlist_item_elm_widget_item_disable(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *i if (it->realized) { - if (eo_do((Eo *)EO_OBJ(it), elm_wdg_item_disabled_get())) + if (eo_do(EO_OBJ(it), elm_wdg_item_disabled_get())) { edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm"); if (it->deco_all_view) @@ -5684,7 +5684,7 @@ _elm_genlist_item_elm_widget_item_disable(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *i (it->deco_all_view, "elm,state,enabled", "elm"); } EINA_LIST_FOREACH(it->content_objs, l, obj) - elm_widget_disabled_set(obj, eo_do((Eo *)EO_OBJ(it), elm_wdg_item_disabled_get())); + elm_widget_disabled_set(obj, eo_do(EO_OBJ(it), elm_wdg_item_disabled_get())); } } @@ -5707,7 +5707,7 @@ _elm_genlist_item_elm_widget_item_del_pre(Eo *eo_it, Elm_Gen_Item *it) Elm_Gen_Item *tmp; EINA_LIST_FREE(it->item->rel_revs, tmp) tmp->item->rel = NULL; } - elm_genlist_item_subitems_clear((Elm_Object_Item *)eo_it); + elm_genlist_item_subitems_clear(eo_it); if (sd->show_item == it) sd->show_item = NULL; @@ -6290,7 +6290,7 @@ _elm_genlist_last_item_get(Eo *obj EINA_UNUSED, Elm_Genlist_Data *sd) EAPI Elm_Object_Item * elm_genlist_item_next_get(const Elm_Object_Item *item) { - return eo_do((Eo *)item, elm_obj_genlist_item_next_get()); + return eo_do(item, elm_obj_genlist_item_next_get()); } EOLIAN static Elm_Object_Item * @@ -6309,7 +6309,7 @@ _elm_genlist_item_next_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) EAPI Elm_Object_Item * elm_genlist_item_prev_get(const Elm_Object_Item *item) { - return eo_do((Eo *)item, elm_obj_genlist_item_prev_get()); + return eo_do(item, elm_obj_genlist_item_prev_get()); } EOLIAN static Elm_Object_Item * @@ -6328,7 +6328,7 @@ _elm_genlist_item_prev_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) EAPI Elm_Object_Item * elm_genlist_item_parent_get(const Elm_Object_Item *item) { - return eo_do((Eo *)item, elm_obj_genlist_item_parent_get()); + return eo_do(item, elm_obj_genlist_item_parent_get()); } EOLIAN static Elm_Object_Item * @@ -6342,7 +6342,7 @@ _elm_genlist_item_parent_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) EAPI unsigned int elm_genlist_item_subitems_count(const Elm_Object_Item *item) { - return eo_do((Eo *)item, elm_obj_genlist_item_subitems_count()); + return eo_do(item, elm_obj_genlist_item_subitems_count()); } EOLIAN static unsigned int @@ -6356,7 +6356,7 @@ _elm_genlist_item_subitems_count(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *item) EAPI const Eina_List * elm_genlist_item_subitems_get(const Elm_Object_Item *item) { - return eo_do((Eo *)item, elm_obj_genlist_item_subitems_get()); + return eo_do(item, elm_obj_genlist_item_subitems_get()); } EOLIAN static const Eina_List * @@ -6370,7 +6370,7 @@ _elm_genlist_item_subitems_get(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *item) EAPI void elm_genlist_item_subitems_clear(Elm_Object_Item *item) { - eo_do((Eo *)item, elm_obj_genlist_item_subitems_clear()); + eo_do(item, elm_obj_genlist_item_subitems_clear()); } EOLIAN static void @@ -6402,7 +6402,7 @@ EAPI void elm_genlist_item_selected_set(Elm_Object_Item *item, Eina_Bool selected) { - eo_do((Eo *)item, elm_obj_genlist_item_selected_set(selected)); + eo_do(item, elm_obj_genlist_item_selected_set(selected)); } EOLIAN static void @@ -6412,7 +6412,7 @@ _elm_genlist_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, ELM_GENLIST_ITEM_CHECK_OR_RETURN(it); ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd); - if ((it->generation < sd->generation) || eo_do((Eo *)EO_OBJ(it), elm_wdg_item_disabled_get())) + if ((it->generation < sd->generation) || eo_do(EO_OBJ(it), elm_wdg_item_disabled_get())) return; selected = !!selected; if (it->selected == selected) return; @@ -6442,7 +6442,7 @@ _elm_genlist_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, EAPI Eina_Bool elm_genlist_item_selected_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_obj_genlist_item_selected_get()); + return eo_do(it, elm_obj_genlist_item_selected_get()); } EOLIAN static Eina_Bool @@ -6475,7 +6475,7 @@ _elm_genlist_expanded_next_item_get(Elm_Gen_Item *it) eo_it2 = elm_genlist_item_next_get(eo_it2); } } - return eo_data_scope_get((Eo *)eo_it2, ELM_GENLIST_ITEM_CLASS); + return eo_data_scope_get(eo_it2, ELM_GENLIST_ITEM_CLASS); } static void @@ -6513,7 +6513,7 @@ _elm_genlist_move_items_set(Elm_Gen_Item *it) while (eo_it2 && (dh < oy + oh)) { - it2 = eo_data_scope_get((Eo *)eo_it2, ELM_GENLIST_ITEM_CLASS); + it2 = eo_data_scope_get(eo_it2, ELM_GENLIST_ITEM_CLASS); dh += it2->item->h; sd->move_items = eina_list_append(sd->move_items, it2); eo_it2 = elm_genlist_item_next_get(eo_it2); @@ -6546,7 +6546,7 @@ EAPI void elm_genlist_item_expanded_set(Elm_Object_Item *item, Eina_Bool expanded) { - eo_do((Eo *)item, elm_obj_genlist_item_expanded_set(expanded)); + eo_do(item, elm_obj_genlist_item_expanded_set(expanded)); } EOLIAN static void @@ -6586,7 +6586,7 @@ _elm_genlist_item_expanded_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, Eina_B EAPI Eina_Bool elm_genlist_item_expanded_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_obj_genlist_item_expanded_get()); + return eo_do(it, elm_obj_genlist_item_expanded_get()); } EOLIAN static Eina_Bool @@ -6600,7 +6600,7 @@ _elm_genlist_item_expanded_get(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it) EAPI int elm_genlist_item_expanded_depth_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_obj_genlist_item_expanded_depth_get()); + return eo_do(it, elm_obj_genlist_item_expanded_depth_get()); } EOLIAN static int @@ -6676,7 +6676,7 @@ _elm_genlist_item_coordinates_calc(Elm_Gen_Item *it, EAPI void elm_genlist_item_promote(Elm_Object_Item *item) { - eo_do((Eo *)item, elm_obj_genlist_item_promote()); + eo_do(item, elm_obj_genlist_item_promote()); } EOLIAN static void @@ -6693,7 +6693,7 @@ _elm_genlist_item_promote(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) EAPI void elm_genlist_item_demote(Elm_Object_Item *item) { - eo_do((Eo *)item, elm_obj_genlist_item_demote()); + eo_do(item, elm_obj_genlist_item_demote()); } EOLIAN static void @@ -6710,7 +6710,7 @@ EAPI void elm_genlist_item_show(Elm_Object_Item *item, Elm_Genlist_Item_Scrollto_Type type) { - eo_do((Eo *)item, elm_obj_genlist_item_show(type)); + eo_do(item, elm_obj_genlist_item_show(type)); } EOLIAN static void @@ -6730,7 +6730,7 @@ EAPI void elm_genlist_item_bring_in(Elm_Object_Item *item, Elm_Genlist_Item_Scrollto_Type type) { - eo_do((Eo *)item, elm_obj_genlist_item_bring_in(type)); + eo_do(item, elm_obj_genlist_item_bring_in(type)); } EOLIAN static void @@ -6749,7 +6749,7 @@ EAPI void elm_genlist_item_all_contents_unset(Elm_Object_Item *it, Eina_List **l) { - eo_do((Eo *)it, elm_obj_genlist_item_all_contents_unset(l)); + eo_do(it, elm_obj_genlist_item_all_contents_unset(l)); } EOLIAN static void @@ -6771,7 +6771,7 @@ _elm_genlist_item_all_contents_unset(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, EAPI void elm_genlist_item_update(Elm_Object_Item *item) { - eo_do((Eo *)item, elm_obj_genlist_item_update()); + eo_do(item, elm_obj_genlist_item_update()); } EOLIAN static void @@ -6794,7 +6794,7 @@ elm_genlist_item_fields_update(Elm_Object_Item *item, const char *parts, Elm_Genlist_Item_Field_Type itf) { - eo_do((Eo *)item, elm_obj_genlist_item_fields_update(parts, itf)); + eo_do(item, elm_obj_genlist_item_fields_update(parts, itf)); } EOLIAN static void @@ -6869,14 +6869,14 @@ _elm_genlist_item_fields_update(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, if ((!itf) || (itf & ELM_GENLIST_ITEM_FIELD_STATE)) _item_state_realize(it, VIEW(it), &it->states, parts); if (!it->item->mincalcd) - elm_genlist_item_update((Elm_Object_Item *)eo_item); + elm_genlist_item_update(eo_item); } EAPI void elm_genlist_item_item_class_update(Elm_Object_Item *item, const Elm_Genlist_Item_Class *itc) { - eo_do((Eo *)item, elm_obj_genlist_item_class_update(itc)); + eo_do(item, elm_obj_genlist_item_class_update(itc)); } EOLIAN static void @@ -6915,13 +6915,13 @@ _elm_genlist_item_item_class_update(Eo *eo_it, Elm_Gen_Item *it, it->item->deco_all_contents = NULL; } - elm_genlist_item_update((Elm_Object_Item *)eo_it); + elm_genlist_item_update(eo_it); } EAPI const Elm_Genlist_Item_Class * elm_genlist_item_item_class_get(const Elm_Object_Item *item) { - return eo_do((Eo *)item, elm_obj_genlist_item_class_get()); + return eo_do(item, elm_obj_genlist_item_class_get()); } EOLIAN static const Elm_Genlist_Item_Class * @@ -6962,7 +6962,7 @@ EAPI void elm_genlist_item_tooltip_text_set(Elm_Object_Item *it, const char *text) { - eo_do((Eo *)it, elm_wdg_item_tooltip_text_set(text)); + eo_do(it, elm_wdg_item_tooltip_text_set(text)); } EOLIAN static void @@ -6972,7 +6972,7 @@ _elm_genlist_item_elm_widget_item_tooltip_text_set(Eo *eo_it, Elm_Gen_Item *it, text = eina_stringshare_add(text); elm_genlist_item_tooltip_content_cb_set - ((Elm_Object_Item *)eo_it, _elm_genlist_item_label_create, text, + (eo_it, _elm_genlist_item_label_create, text, _elm_genlist_item_label_del_cb); } @@ -6982,7 +6982,7 @@ elm_genlist_item_tooltip_content_cb_set(Elm_Object_Item *item, const void *data, Evas_Smart_Cb del_cb) { - eo_do((Eo *)item, elm_wdg_item_tooltip_content_cb_set(func, data, del_cb)); + eo_do(item, elm_wdg_item_tooltip_content_cb_set(func, data, del_cb)); } EOLIAN static void @@ -7022,7 +7022,7 @@ error: EAPI void elm_genlist_item_tooltip_unset(Elm_Object_Item *item) { - eo_do((Eo *)item, elm_wdg_item_tooltip_unset()); + eo_do(item, elm_wdg_item_tooltip_unset()); } EOLIAN static void @@ -7048,7 +7048,7 @@ EAPI void elm_genlist_item_tooltip_style_set(Elm_Object_Item *item, const char *style) { - eo_do((Eo *)item, elm_wdg_item_tooltip_style_set(style)); + eo_do(item, elm_wdg_item_tooltip_style_set(style)); } EOLIAN static void @@ -7065,14 +7065,14 @@ _elm_genlist_item_elm_widget_item_tooltip_style_set(Eo *eo_it, Elm_Gen_Item *it, EAPI const char * elm_genlist_item_tooltip_style_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_wdg_item_tooltip_style_get()); + return eo_do(it, elm_wdg_item_tooltip_style_get()); } EAPI Eina_Bool elm_genlist_item_tooltip_window_mode_set(Elm_Object_Item *item, Eina_Bool disable) { - return eo_do((Eo *)item, elm_wdg_item_tooltip_window_mode_set(disable)); + return eo_do(item, elm_wdg_item_tooltip_window_mode_set(disable)); } EOLIAN static Eina_Bool @@ -7100,7 +7100,7 @@ EAPI void elm_genlist_item_cursor_set(Elm_Object_Item *item, const char *cursor) { - eo_do((Eo *)item, elm_wdg_item_cursor_set(cursor)); + eo_do(item, elm_wdg_item_cursor_set(cursor)); } EOLIAN static void @@ -7116,13 +7116,13 @@ _elm_genlist_item_elm_widget_item_cursor_set(Eo *eo_it, Elm_Gen_Item *it, EAPI const char * elm_genlist_item_cursor_get(const Elm_Object_Item *eo_it) { - return eo_do((Eo *)eo_it, elm_wdg_item_cursor_get()); + return eo_do(eo_it, elm_wdg_item_cursor_get()); } EAPI void elm_genlist_item_cursor_unset(Elm_Object_Item *item) { - eo_do((Eo *)item, elm_wdg_item_cursor_unset()); + eo_do(item, elm_wdg_item_cursor_unset()); } EOLIAN static void @@ -7142,32 +7142,32 @@ EAPI void elm_genlist_item_cursor_style_set(Elm_Object_Item *eo_it, const char *style) { - eo_do((Eo *)eo_it, elm_wdg_item_cursor_style_set(style)); + eo_do(eo_it, elm_wdg_item_cursor_style_set(style)); } EAPI const char * elm_genlist_item_cursor_style_get(const Elm_Object_Item *eo_it) { - return eo_do((Eo *) eo_it, elm_wdg_item_cursor_style_get()); + return eo_do( eo_it, elm_wdg_item_cursor_style_get()); } EAPI void elm_genlist_item_cursor_engine_only_set(Elm_Object_Item *eo_it, Eina_Bool engine_only) { - eo_do((Eo *)eo_it, elm_wdg_item_cursor_engine_only_set(engine_only)); + eo_do(eo_it, elm_wdg_item_cursor_engine_only_set(engine_only)); } EAPI Eina_Bool elm_genlist_item_cursor_engine_only_get(const Elm_Object_Item *eo_it) { - return eo_do((Eo *) eo_it, elm_wdg_item_cursor_engine_only_get()); + return eo_do( eo_it, elm_wdg_item_cursor_engine_only_get()); } EAPI int elm_genlist_item_index_get(const Elm_Object_Item *item) { - return eo_do((Eo *)item, elm_obj_genlist_item_index_get()); + return eo_do(item, elm_obj_genlist_item_index_get()); } EOLIAN static int @@ -7219,7 +7219,7 @@ elm_genlist_bounce_get(const Evas_Object *obj, Eina_Bool *v_bounce) { ELM_GENLIST_CHECK(obj); - eo_do((Eo *) obj, elm_interface_scrollable_bounce_allow_get + eo_do( obj, elm_interface_scrollable_bounce_allow_get (h_bounce, v_bounce)); } @@ -7295,7 +7295,7 @@ elm_genlist_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy_v) { ELM_GENLIST_CHECK(obj); - eo_do((Eo *) obj, elm_interface_scrollable_policy_get(policy_h, policy_v)); + eo_do( obj, elm_interface_scrollable_policy_get(policy_h, policy_v)); } EOLIAN static void @@ -7303,7 +7303,7 @@ _elm_genlist_elm_interface_scrollable_policy_get(Eo *obj, Elm_Genlist_Data *sd E { Elm_Scroller_Policy s_policy_h, s_policy_v; - eo_do_super((Eo *)obj, MY_CLASS, elm_interface_scrollable_policy_get + eo_do_super(obj, MY_CLASS, elm_interface_scrollable_policy_get (&s_policy_h, &s_policy_v)); if (policy_h) *policy_h = (Elm_Scroller_Policy)s_policy_h; if (policy_v) *policy_v = (Elm_Scroller_Policy)s_policy_v; @@ -7325,7 +7325,7 @@ elm_genlist_item_decorate_mode_set(Elm_Object_Item *item, const char *decorate_it_type, Eina_Bool decorate_it_set) { - eo_do((Eo *)item, elm_obj_genlist_item_decorate_mode_set(decorate_it_type, decorate_it_set)); + eo_do(item, elm_obj_genlist_item_decorate_mode_set(decorate_it_type, decorate_it_set)); } EOLIAN static void @@ -7365,7 +7365,7 @@ _elm_genlist_item_decorate_mode_set(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it, { Elm_Gen_Item *it2 = NULL; eo_it2 = elm_genlist_selected_item_get(sd->obj); - if (eo_it2) it2 = eo_data_scope_get((Eo *)eo_it2, ELM_GENLIST_ITEM_CLASS); + if (eo_it2) it2 = eo_data_scope_get(eo_it2, ELM_GENLIST_ITEM_CLASS); if (it2 && it2->realized) elm_genlist_item_selected_set(eo_it2, EINA_FALSE); } @@ -7382,7 +7382,7 @@ _elm_genlist_item_decorate_mode_set(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it, EAPI const char * elm_genlist_item_decorate_mode_get(const Elm_Object_Item *item) { - return eo_do((Eo *)item, elm_obj_genlist_item_decorate_mode_get()); + return eo_do(item, elm_obj_genlist_item_decorate_mode_get()); } EOLIAN static const char * @@ -7395,7 +7395,7 @@ _elm_genlist_item_decorate_mode_get(Eo *eo_i EINA_UNUSED, Elm_Gen_Item *i) EOLIAN static Elm_Object_Item * _elm_genlist_decorated_item_get(Eo *obj EINA_UNUSED, Elm_Genlist_Data *sd) { - return (Elm_Object_Item *)EO_OBJ(sd->mode_item); + return EO_OBJ(sd->mode_item); } EOLIAN static Eina_Bool @@ -7432,7 +7432,7 @@ _elm_genlist_decorate_mode_set(Eo *obj, Elm_Genlist_Data *sd, Eina_Bool decorate else { // unset decorated item - deco_it = (Elm_Object_Item *)elm_genlist_decorated_item_get(obj); + deco_it = elm_genlist_decorated_item_get(obj); if (deco_it) { elm_genlist_item_decorate_mode_set @@ -7493,7 +7493,7 @@ _elm_genlist_reorder_mode_get(Eo *obj EINA_UNUSED, Elm_Genlist_Data *sd) EAPI Elm_Genlist_Item_Type elm_genlist_item_type_get(const Elm_Object_Item *item) { - return eo_do((Eo *)item, elm_obj_genlist_item_type_get()); + return eo_do(item, elm_obj_genlist_item_type_get()); } EOLIAN static Elm_Genlist_Item_Type @@ -7575,7 +7575,7 @@ EAPI void elm_genlist_item_flip_set(Elm_Object_Item *item, Eina_Bool flip) { - eo_do((Eo *)item, elm_obj_genlist_item_flip_set(flip)); + eo_do(item, elm_obj_genlist_item_flip_set(flip)); } EOLIAN static void @@ -7594,7 +7594,7 @@ _elm_genlist_item_flip_set(Eo *eo_it, Elm_Gen_Item *it, Eina_Bool flip) { it->flipped = flip; _item_cache_zero(GL_IT(it)->wsd); - elm_genlist_item_update((Elm_Object_Item *)eo_it); + elm_genlist_item_update(eo_it); it->item->nocache = EINA_FALSE; } } @@ -7602,7 +7602,7 @@ _elm_genlist_item_flip_set(Eo *eo_it, Elm_Gen_Item *it, Eina_Bool flip) EAPI Eina_Bool elm_genlist_item_flip_get(const Elm_Object_Item *item) { - return eo_do((Eo *)item, elm_obj_genlist_item_flip_get()); + return eo_do(item, elm_obj_genlist_item_flip_get()); } EOLIAN static Eina_Bool @@ -7645,7 +7645,7 @@ EAPI void elm_genlist_item_select_mode_set(Elm_Object_Item *item, Elm_Object_Select_Mode mode) { - eo_do((Eo *)item, elm_obj_genlist_item_select_mode_set(mode)); + eo_do(item, elm_obj_genlist_item_select_mode_set(mode)); } EOLIAN static void @@ -7683,7 +7683,7 @@ _elm_genlist_item_select_mode_set(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it, EAPI Elm_Object_Select_Mode elm_genlist_item_select_mode_get(const Elm_Object_Item *item) { - return eo_do((Eo *)item, elm_obj_genlist_item_select_mode_get()); + return eo_do(item, elm_obj_genlist_item_select_mode_get()); } EOLIAN static Elm_Object_Select_Mode @@ -7800,7 +7800,7 @@ _elm_genlist_search_by_text_item_get(Eo *obj EINA_UNUSED, #endif start = (item_to_search_from) ? - EINA_INLIST_GET((Elm_Gen_Item *)eo_data_scope_get((Eo *)item_to_search_from, ELM_GENLIST_ITEM_CLASS)) : + EINA_INLIST_GET((Elm_Gen_Item *)eo_data_scope_get(item_to_search_from, ELM_GENLIST_ITEM_CLASS)) : sd->items; EINA_INLIST_FOREACH(start, it) { diff --git a/legacy/elementary/src/lib/elm_index.c b/legacy/elementary/src/lib/elm_index.c index 9ce654e3c6..b83c9cb016 100644 --- a/legacy/elementary/src/lib/elm_index.c +++ b/legacy/elementary/src/lib/elm_index.c @@ -321,7 +321,7 @@ _index_box_auto_fill(Evas_Object *obj, // ACCESS if ((it->level == 0) && (_elm_config->access_mode == ELM_ACCESS_MODE_ON)) - eo_do((Eo *)eo_item, elm_wdg_item_access_register()); + eo_do(eo_item, elm_wdg_item_access_register()); } evas_object_smart_calculate(sd->bx[level]); @@ -462,7 +462,7 @@ _item_new(Evas_Object *obj, it->base->data = data; it->level = sd->level; - return (Elm_Object_Item *)eo_item; + return eo_item; } static Elm_Index_Item_Data * @@ -523,7 +523,7 @@ _sel_eval(Evas_Object *obj, EINA_LIST_FOREACH(sd->items, l, eo_item) { - it = eo_data_scope_get((Eo *)eo_item, ELM_INDEX_ITEM_CLASS); + it = eo_data_scope_get(eo_item, ELM_INDEX_ITEM_CLASS); if (it->level != i) continue; if (it->level != sd->level) { @@ -1060,8 +1060,8 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access) { ELM_INDEX_ITEM_DATA_GET(eo_item, it); if (it->level != 0) continue; - if (is_access) eo_do((Eo *)eo_item, elm_wdg_item_access_register()); - else eo_do((Eo *)eo_item, elm_wdg_item_access_unregister()); + if (is_access) eo_do(eo_item, elm_wdg_item_access_register()); + else eo_do(eo_item, elm_wdg_item_access_unregister()); } if (is_access) @@ -1157,7 +1157,7 @@ _elm_index_item_level_get(Eo *obj EINA_UNUSED, Elm_Index_Data *sd) EAPI void elm_index_item_selected_set(Elm_Object_Item *it, Eina_Bool selected) { - eo_do((Eo*)it, elm_obj_index_item_selected_set(selected)); + eo_do(it, elm_obj_index_item_selected_set(selected)); } EOLIAN static void @@ -1237,7 +1237,7 @@ _elm_index_selected_item_get(Eo *obj EINA_UNUSED, Elm_Index_Data *sd, int level) ELM_INDEX_ITEM_DATA_GET(eo_item, it); if ((it->selected) && (it->level == level)) { - return (Elm_Object_Item *)eo_item; + return eo_item; } } @@ -1255,7 +1255,7 @@ _elm_index_item_append(Eo *obj, Elm_Index_Data *sd, const char *letter, Evas_Sma sd->items = eina_list_append(sd->items, it); _index_box_clear(obj, sd->level); - return (Elm_Object_Item *)it; + return it; } EOLIAN static Elm_Object_Item* @@ -1269,7 +1269,7 @@ _elm_index_item_prepend(Eo *obj, Elm_Index_Data *sd, const char *letter, Evas_Sm sd->items = eina_list_prepend(sd->items, it); _index_box_clear(obj, sd->level); - return (Elm_Object_Item *)it; + return it; } EINA_DEPRECATED EAPI Elm_Object_Item * @@ -1296,7 +1296,7 @@ _elm_index_item_insert_after(Eo *obj, Elm_Index_Data *sd, Elm_Object_Item *after sd->items = eina_list_append_relative(sd->items, it, after); _index_box_clear(obj, sd->level); - return (Elm_Object_Item *)it; + return it; } EOLIAN static Elm_Object_Item* @@ -1312,7 +1312,7 @@ _elm_index_item_insert_before(Eo *obj, Elm_Index_Data *sd, Elm_Object_Item *befo sd->items = eina_list_prepend_relative(sd->items, it, before); _index_box_clear(obj, sd->level); - return (Elm_Object_Item *)it; + return it; } EOLIAN static Elm_Object_Item* @@ -1344,14 +1344,14 @@ _elm_index_item_sorted_insert(Eo *obj, Elm_Index_Data *sd, const char *letter, E ELM_INDEX_ITEM_DATA_GET(eo_item, it); if (cmp_data_func(p_it->base->data, it->base->data) >= 0) p_it->base->data = it->base->data; - eo_do((Eo *)eo_item, elm_wdg_item_del()); + eo_do(eo_item, elm_wdg_item_del()); eo_item = NULL; } } _index_box_clear(obj, sd->level); if (!eo_item) return NULL; - else return (Elm_Object_Item *)eo_item; + else return eo_item; } EOLIAN static Elm_Object_Item* @@ -1375,7 +1375,7 @@ _elm_index_item_clear(Eo *obj, Elm_Index_Data *sd) clear = eina_list_append(clear, eo_item); } EINA_LIST_FREE(clear, eo_item) - eo_do((Eo *)eo_item, elm_wdg_item_del()); + eo_do(eo_item, elm_wdg_item_del()); } EOLIAN static void @@ -1413,7 +1413,7 @@ _elm_index_indicator_disabled_get(Eo *obj EINA_UNUSED, Elm_Index_Data *sd) EAPI const char * elm_index_item_letter_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_obj_index_item_letter_get()); + return eo_do(it, elm_obj_index_item_letter_get()); } EOLIAN static const char * diff --git a/legacy/elementary/src/lib/elm_list.c b/legacy/elementary/src/lib/elm_list.c index 9cf7d16738..18d7701caa 100644 --- a/legacy/elementary/src/lib/elm_list.c +++ b/legacy/elementary/src/lib/elm_list.c @@ -190,7 +190,7 @@ _all_items_unselect(Elm_List_Data *sd) while (sd->selected) elm_list_item_selected_set - ((Elm_Object_Item *)sd->selected->data, EINA_FALSE); + (sd->selected->data, EINA_FALSE); return EINA_TRUE; } @@ -644,7 +644,7 @@ _elm_list_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_List_Data *sd) Eina_List *l; EINA_LIST_FOREACH(sd->items, l, it) - eo_do((Eo *)it, elm_wdg_item_translate()); + eo_do(it, elm_wdg_item_translate()); eo_do_super(obj, MY_CLASS, elm_obj_widget_translate()); @@ -664,7 +664,7 @@ _elm_list_deletions_process(Elm_List_Data *sd) /* issuing free because of "locking" item del pre hook */ _elm_list_item_free(it); - eo_del((Eo *)EO_OBJ(it)); + eo_del(EO_OBJ(it)); } sd->walking--; @@ -909,7 +909,7 @@ _items_fix(Evas_Object *obj) { edje_object_part_text_escaped_set (VIEW(it), "elm.text", it->label); - eo_do((Eo *)EO_OBJ(it), elm_wdg_item_part_text_custom_update()); + eo_do(EO_OBJ(it), elm_wdg_item_part_text_custom_update()); if ((!it->icon) && (minh[0] > 0)) { @@ -1255,7 +1255,7 @@ _elm_list_elm_widget_on_focus(Eo *obj, Elm_List_Data *sd) if (elm_widget_focus_get(obj) && sd->selected && !sd->last_selected_item) { Elm_Object_Item *sel = eina_list_data_get(sd->selected); - sd->last_selected_item = eo_data_scope_get((Eo *)sel, ELM_LIST_ITEM_CLASS); + sd->last_selected_item = eo_data_scope_get(sel, ELM_LIST_ITEM_CLASS); } if (!sd->items) return EINA_FALSE; @@ -2071,7 +2071,7 @@ _access_state_cb(void *data, Evas_Object *obj EINA_UNUSED) static void _access_on_highlight_cb(void *data) { - Elm_Object_Item *it = (Elm_Object_Item *)data; + Elm_Object_Item *it = data; if (!it) return; elm_list_item_bring_in(it); @@ -2369,7 +2369,7 @@ _elm_list_evas_object_smart_del(Eo *obj, Elm_List_Data *sd) ELM_LIST_ITEM_DATA_GET(eo_it, it); /* issuing free because of "locking" item del pre hook */ _elm_list_item_free(it); - eo_del((Eo *)EO_OBJ(it)); + eo_del(EO_OBJ(it)); } _elm_list_unwalk(obj, sd); @@ -2621,7 +2621,7 @@ _elm_list_clear(Eo *obj, Elm_List_Data *sd) ELM_LIST_ITEM_DATA_GET(eo_it, it); /* issuing free because of "locking" item del pre hook */ _elm_list_item_free(it); - eo_del((Eo *)EO_OBJ(it)); + eo_del(EO_OBJ(it)); } _elm_list_unwalk(obj, sd); @@ -2641,7 +2641,7 @@ _elm_list_items_get(Eo *obj EINA_UNUSED, Elm_List_Data *sd) EOLIAN static Elm_Object_Item* _elm_list_selected_item_get(Eo *obj EINA_UNUSED, Elm_List_Data *sd) { - if (sd->selected) return (Elm_Object_Item *)sd->selected->data; + if (sd->selected) return sd->selected->data; else return NULL; } @@ -2747,7 +2747,7 @@ EAPI void elm_list_item_separator_set(Elm_Object_Item *it, Eina_Bool setting) { - eo_do((Eo *)it, elm_obj_list_item_separator_set(setting)); + eo_do(it, elm_obj_list_item_separator_set(setting)); } EOLIAN static void @@ -2762,7 +2762,7 @@ _elm_list_item_separator_set(Eo *eo_item EINA_UNUSED, Elm_List_Item_Data *it, EAPI Eina_Bool elm_list_item_separator_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_obj_list_item_separator_get()); + return eo_do(it, elm_obj_list_item_separator_get()); } EOLIAN static Eina_Bool @@ -2777,7 +2777,7 @@ EAPI void elm_list_item_selected_set(Elm_Object_Item *it, Eina_Bool selected) { - eo_do((Eo *)it, elm_obj_list_item_selected_set(selected)); + eo_do(it, elm_obj_list_item_selected_set(selected)); } EOLIAN static void @@ -2825,7 +2825,7 @@ _elm_list_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_List_Item_Data *item, EAPI Eina_Bool elm_list_item_selected_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_obj_list_item_selected_get()); + return eo_do(it, elm_obj_list_item_selected_get()); } EOLIAN static Eina_Bool @@ -2839,7 +2839,7 @@ _elm_list_item_selected_get(Eo *eo_item EINA_UNUSED, Elm_List_Item_Data *it) EAPI void elm_list_item_show(Elm_Object_Item *it) { - eo_do((Eo *)it, elm_obj_list_item_show()); + eo_do(it, elm_obj_list_item_show()); } EOLIAN static void @@ -2863,7 +2863,7 @@ _elm_list_item_show(Eo *eo_it EINA_UNUSED, Elm_List_Item_Data *it) EAPI void elm_list_item_bring_in(Elm_Object_Item *it) { - eo_do((Eo *)it, elm_obj_list_item_bring_in()); + eo_do(it, elm_obj_list_item_bring_in()); } EOLIAN static void @@ -2887,7 +2887,7 @@ _elm_list_item_bring_in(Eo *eo_it EINA_UNUSED, Elm_List_Item_Data *it) EAPI Evas_Object * elm_list_item_object_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_obj_list_item_object_get()); + return eo_do(it, elm_obj_list_item_object_get()); } EOLIAN static Evas_Object * @@ -2901,7 +2901,7 @@ _elm_list_item_object_get(Eo *eo_it EINA_UNUSED, Elm_List_Item_Data *it) EAPI Elm_Object_Item * elm_list_item_prev(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_obj_list_item_prev_get()); + return eo_do(it, elm_obj_list_item_prev_get()); } EOLIAN static Elm_Object_Item * @@ -2915,7 +2915,7 @@ _elm_list_item_prev_get(Eo *eo_item EINA_UNUSED, Elm_List_Item_Data *item) EAPI Elm_Object_Item * elm_list_item_next(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_obj_list_item_next_get()); + return eo_do(it, elm_obj_list_item_next_get()); } EOLIAN static Elm_Object_Item * diff --git a/legacy/elementary/src/lib/elm_main.c b/legacy/elementary/src/lib/elm_main.c index 8e9b0d1ac6..e5e3312781 100644 --- a/legacy/elementary/src/lib/elm_main.c +++ b/legacy/elementary/src/lib/elm_main.c @@ -1656,24 +1656,24 @@ elm_coords_finger_size_adjust(int times_w, // Object item Eo migration defines, will be removed later #define IF_EO_DO(obj, func) \ - if (eo_isa((Eo *)obj, ELM_WIDGET_ITEM_CLASS)) \ + if (eo_isa(obj, ELM_WIDGET_ITEM_CLASS)) \ { \ - eo_do ((Eo *)obj, func); \ + eo_do (obj, func); \ return; \ } #define IF_EO_RETURN(obj, type, func) \ - if (eo_isa((Eo *)obj, ELM_WIDGET_ITEM_CLASS)) \ + if (eo_isa(obj, ELM_WIDGET_ITEM_CLASS)) \ { \ type ret; \ - eo_do ((Eo *)obj, ret = func); \ + eo_do (obj, ret = func); \ return ret; \ } EAPI Evas_Object * elm_object_item_widget_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_wdg_item_widget_get()); + return eo_do(it, elm_wdg_item_widget_get()); } EAPI void @@ -1681,20 +1681,20 @@ elm_object_item_part_content_set(Elm_Object_Item *it, const char *part, Evas_Object *content) { - eo_do((Eo *)it, elm_wdg_item_part_content_set(part, content)); + eo_do(it, elm_wdg_item_part_content_set(part, content)); } EAPI Evas_Object * elm_object_item_part_content_get(const Elm_Object_Item *it, const char *part) { - return eo_do((Eo *)it, elm_wdg_item_part_content_get(part)); + return eo_do(it, elm_wdg_item_part_content_get(part)); } EAPI Evas_Object * elm_object_item_part_content_unset(Elm_Object_Item *it, const char *part) { - return eo_do((Eo *)it, elm_wdg_item_part_content_unset(part)); + return eo_do(it, elm_wdg_item_part_content_unset(part)); } EAPI void @@ -1702,31 +1702,31 @@ elm_object_item_part_text_set(Elm_Object_Item *it, const char *part, const char *label) { - eo_do((Eo *)it, elm_wdg_item_part_text_set(part, label)); + eo_do(it, elm_wdg_item_part_text_set(part, label)); } EAPI const char * elm_object_item_part_text_get(const Elm_Object_Item *it, const char *part) { - return eo_do((Eo *)it, elm_wdg_item_part_text_get(part)); + return eo_do(it, elm_wdg_item_part_text_get(part)); } EAPI void elm_object_item_domain_translatable_part_text_set(Elm_Object_Item *it, const char *part, const char *domain, const char *text) { - eo_do((Eo *)it, elm_wdg_item_domain_translatable_part_text_set(part, domain, text)); + eo_do(it, elm_wdg_item_domain_translatable_part_text_set(part, domain, text)); } EAPI const char * elm_object_item_translatable_part_text_get(const Elm_Object_Item *it, const char *part) { - return eo_do((Eo *)it, elm_wdg_item_translatable_part_text_get(part)); + return eo_do(it, elm_wdg_item_translatable_part_text_get(part)); } EAPI void elm_object_item_domain_part_text_translatable_set(Elm_Object_Item *it, const char *part, const char *domain, Eina_Bool translatable) { - eo_do((Eo *)it, elm_wdg_item_domain_part_text_translatable_set(part, domain, translatable)); + eo_do(it, elm_wdg_item_domain_part_text_translatable_set(part, domain, translatable)); } EAPI void @@ -1763,217 +1763,217 @@ elm_object_focused_item_get(const Evas_Object *obj) EAPI void elm_object_item_access_info_set(Elm_Object_Item *it, const char *txt) { - eo_do((Eo *)it, elm_wdg_item_access_info_set(txt)); + eo_do(it, elm_wdg_item_access_info_set(txt)); } EAPI Evas_Object * elm_object_item_access_register(Elm_Object_Item *item) { - return eo_do((Eo *)item, elm_wdg_item_access_register()); + return eo_do(item, elm_wdg_item_access_register()); } EAPI void elm_object_item_access_unregister(Elm_Object_Item *item) { - eo_do((Eo *)item, elm_wdg_item_access_unregister()); + eo_do(item, elm_wdg_item_access_unregister()); } EAPI Evas_Object * elm_object_item_access_object_get(const Elm_Object_Item *item) { - return eo_do((Eo *)item, elm_wdg_item_access_object_get()); + return eo_do(item, elm_wdg_item_access_object_get()); } EAPI void elm_object_item_access_order_set(Elm_Object_Item *item, Eina_List *objs) { - eo_do((Eo *)item, elm_wdg_item_access_order_set(objs)); + eo_do(item, elm_wdg_item_access_order_set(objs)); } EAPI const Eina_List * elm_object_item_access_order_get(const Elm_Object_Item *item) { - return eo_do((Eo *)item, elm_wdg_item_access_order_get()); + return eo_do(item, elm_wdg_item_access_order_get()); } EAPI void elm_object_item_access_order_unset(Elm_Object_Item *item) { - eo_do((Eo *)item, elm_wdg_item_access_order_unset()); + eo_do(item, elm_wdg_item_access_order_unset()); } EAPI void * elm_object_item_data_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_wdg_item_data_get()); + return eo_do(it, elm_wdg_item_data_get()); } EAPI void elm_object_item_data_set(Elm_Object_Item *it, void *data) { - eo_do((Eo *)it, elm_wdg_item_data_set(data)); + eo_do(it, elm_wdg_item_data_set(data)); } EAPI void elm_object_item_signal_emit(Elm_Object_Item *it, const char *emission, const char *source) { - eo_do((Eo *)it, elm_wdg_item_signal_emit(emission, source)); + eo_do(it, elm_wdg_item_signal_emit(emission, source)); } EAPI void elm_object_item_signal_callback_add(Elm_Object_Item *it, const char *emission, const char *source, Elm_Object_Item_Signal_Cb func, void *data) { - eo_do((Eo *)it, elm_wdg_item_signal_callback_add(emission, source, func, data)); + eo_do(it, elm_wdg_item_signal_callback_add(emission, source, func, data)); } EAPI void * elm_object_item_signal_callback_del(Elm_Object_Item *it, const char *emission, const char *source, Elm_Object_Item_Signal_Cb func) { - return eo_do((Eo *)it, elm_wdg_item_signal_callback_del(emission, source, func)); + return eo_do(it, elm_wdg_item_signal_callback_del(emission, source, func)); } EAPI void elm_object_item_style_set(Elm_Object_Item *it, const char *style) { - eo_do((Eo *)it, elm_wdg_item_style_set(style)); + eo_do(it, elm_wdg_item_style_set(style)); } EAPI const char * elm_object_item_style_get(Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_wdg_item_style_get()); + return eo_do(it, elm_wdg_item_style_get()); } EAPI void elm_object_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled) { - eo_do((Eo *)it, elm_wdg_item_disabled_set(disabled)); + eo_do(it, elm_wdg_item_disabled_set(disabled)); } EAPI Eina_Bool elm_object_item_disabled_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_wdg_item_disabled_get()); + return eo_do(it, elm_wdg_item_disabled_get()); } EAPI void elm_object_item_del_cb_set(Elm_Object_Item *it, Evas_Smart_Cb del_cb) { - eo_do((Eo *)it, elm_wdg_item_del_cb_set(del_cb)); + eo_do(it, elm_wdg_item_del_cb_set(del_cb)); } EAPI void elm_object_item_del(Elm_Object_Item *it) { - eo_do((Eo *)it, elm_wdg_item_del()); + eo_do(it, elm_wdg_item_del()); } EAPI void elm_object_item_tooltip_text_set(Elm_Object_Item *it, const char *text) { - eo_do((Eo *)it, elm_wdg_item_tooltip_text_set(text)); + eo_do(it, elm_wdg_item_tooltip_text_set(text)); } EAPI void elm_object_item_tooltip_content_cb_set(Elm_Object_Item *it, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb) { - eo_do((Eo *)it, elm_wdg_item_tooltip_content_cb_set(func, data, del_cb)); + eo_do(it, elm_wdg_item_tooltip_content_cb_set(func, data, del_cb)); } EAPI void elm_object_item_tooltip_unset(Elm_Object_Item *it) { - eo_do((Eo *)it, elm_wdg_item_tooltip_unset()); + eo_do(it, elm_wdg_item_tooltip_unset()); } EAPI Eina_Bool elm_object_item_tooltip_window_mode_set(Elm_Object_Item *it, Eina_Bool disable) { - return eo_do((Eo *)it, elm_wdg_item_tooltip_window_mode_set(disable)); + return eo_do(it, elm_wdg_item_tooltip_window_mode_set(disable)); } EAPI Eina_Bool elm_object_item_tooltip_window_mode_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_wdg_item_tooltip_window_mode_get()); + return eo_do(it, elm_wdg_item_tooltip_window_mode_get()); } EAPI void elm_object_item_tooltip_style_set(Elm_Object_Item *it, const char *style) { - eo_do((Eo *)it, elm_wdg_item_tooltip_style_set(style)); + eo_do(it, elm_wdg_item_tooltip_style_set(style)); } EAPI const char * elm_object_item_tooltip_style_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_wdg_item_tooltip_style_get()); + return eo_do(it, elm_wdg_item_tooltip_style_get()); } EAPI void elm_object_item_cursor_set(Elm_Object_Item *it, const char *cursor) { - eo_do((Eo *)it, elm_wdg_item_cursor_set(cursor)); + eo_do(it, elm_wdg_item_cursor_set(cursor)); } EAPI const char * elm_object_item_cursor_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_wdg_item_cursor_get()); + return eo_do(it, elm_wdg_item_cursor_get()); } EAPI void elm_object_item_cursor_unset(Elm_Object_Item *it) { - eo_do((Eo *)it, elm_wdg_item_cursor_unset()); + eo_do(it, elm_wdg_item_cursor_unset()); } EAPI void elm_object_item_cursor_style_set(Elm_Object_Item *it, const char *style) { - eo_do((Eo *)it, elm_wdg_item_cursor_style_set(style)); + eo_do(it, elm_wdg_item_cursor_style_set(style)); } EAPI const char * elm_object_item_cursor_style_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_wdg_item_cursor_style_get()); + return eo_do(it, elm_wdg_item_cursor_style_get()); } EAPI void elm_object_item_cursor_engine_only_set(Elm_Object_Item *it, Eina_Bool engine_only) { - eo_do((Eo *)it, elm_wdg_item_cursor_engine_only_set(engine_only)); + eo_do(it, elm_wdg_item_cursor_engine_only_set(engine_only)); } EAPI Eina_Bool elm_object_item_cursor_engine_only_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_wdg_item_cursor_engine_only_get()); + return eo_do(it, elm_wdg_item_cursor_engine_only_get()); } EAPI Evas_Object * elm_object_item_track(Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_wdg_item_track()); + return eo_do(it, elm_wdg_item_track()); } void elm_object_item_untrack(Elm_Object_Item *it) { - eo_do((Eo *)it, elm_wdg_item_untrack()); + eo_do(it, elm_wdg_item_untrack()); } int elm_object_item_track_get(const Elm_Object_Item *it) { - return eo_do((Eo *)it, elm_wdg_item_track_get()); + return eo_do(it, elm_wdg_item_track_get()); } EAPI void elm_object_item_focus_set(Elm_Object_Item *item, Eina_Bool focused) { - eo_do((Eo *)item, elm_wdg_item_focus_set(focused)); + eo_do(item, elm_wdg_item_focus_set(focused)); } EAPI Eina_Bool elm_object_item_focus_get(const Elm_Object_Item *item) { - return eo_do((Eo *)item, elm_wdg_item_focus_get()); + return eo_do(item, elm_wdg_item_focus_get()); } diff --git a/legacy/elementary/src/lib/elm_menu.c b/legacy/elementary/src/lib/elm_menu.c index a59a0dd1d2..a33e738c0e 100644 --- a/legacy/elementary/src/lib/elm_menu.c +++ b/legacy/elementary/src/lib/elm_menu.c @@ -36,7 +36,7 @@ _elm_menu_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd) Eina_List *l; EINA_LIST_FOREACH(sd->items, l, it) - eo_do ((Eo *)EO_OBJ(it), elm_wdg_item_translate()); + eo_do (EO_OBJ(it), elm_wdg_item_translate()); return EINA_TRUE; } @@ -57,7 +57,7 @@ _item_del(Elm_Object_Item *eo_item) evas_object_del(item->submenu.location); eina_stringshare_del(item->icon_str); - eo_del((Eo *)eo_item); + eo_del(eo_item); } static void @@ -277,13 +277,13 @@ _elm_menu_elm_widget_theme_apply(Eo *obj, Elm_Menu_Data *sd) elm_widget_style_get(obj))) CRI("Failed to set layout!"); - elm_object_item_text_set((Elm_Object_Item *)eo_item, + elm_object_item_text_set(eo_item, item->label); if (item->icon_str) - elm_menu_item_icon_name_set((Elm_Object_Item *)eo_item, + elm_menu_item_icon_name_set(eo_item, item->icon_str); } - eo_do((Eo *)eo_item, elm_wdg_item_disable()); + eo_do(eo_item, elm_wdg_item_disable()); /* SEOZ edje_object_scale_set (VIEW(item), elm_widget_scale_get(obj) * @@ -524,7 +524,7 @@ _block_menu(void *_sd, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSE EINA_LIST_FOREACH(items, l, eo_current) { ELM_MENU_ITEM_DATA_GET(eo_current, current); - if (!current->blocked) current->was_enabled = !eo_do((Eo *)eo_current, elm_wdg_item_disabled_get()); + if (!current->blocked) current->was_enabled = !eo_do(eo_current, elm_wdg_item_disabled_get()); current->blocked = EINA_TRUE; elm_object_item_disabled_set(eo_current, EINA_TRUE); } @@ -863,7 +863,7 @@ elm_menu_parent_get(const Evas_Object *obj) { ELM_MENU_CHECK(obj) NULL; Evas_Object *ret = NULL; - eo_do((Eo *) obj, ret = elm_obj_widget_parent_get()); + eo_do( obj, ret = elm_obj_widget_parent_get()); return ret; } @@ -890,7 +890,7 @@ _elm_menu_close(Eo *obj, Elm_Menu_Data *sd) EAPI Evas_Object * elm_menu_item_object_get(const Elm_Object_Item *it) { - return eo_do((Eo*)it, elm_obj_menu_item_object_get()); + return eo_do(it, elm_obj_menu_item_object_get()); } EOLIAN static Evas_Object * @@ -910,17 +910,17 @@ _item_clone(Evas_Object *obj, ELM_MENU_ITEM_DATA_GET(eo_item, item); if (item->separator) - new_item = elm_menu_item_separator_add(obj, (Elm_Object_Item *)parent); + new_item = elm_menu_item_separator_add(obj, parent); else new_item = elm_menu_item_add(obj, - (Elm_Object_Item *)parent, + parent, item->icon_str, item->label, item->func, item->base->data); - Eina_Bool disabled = eo_do((Eo *)eo_item, elm_wdg_item_disabled_get()); - eo_do((Eo *)new_item, elm_wdg_item_disabled_set(disabled)); + Eina_Bool disabled = eo_do(eo_item, elm_wdg_item_disabled_get()); + eo_do(new_item, elm_wdg_item_disabled_set(disabled)); EINA_LIST_FOREACH(item->submenu.items, iter, subitem) _item_clone(obj, new_item, subitem); @@ -972,7 +972,7 @@ _elm_menu_item_elm_widget_item_del_pre(Eo *eo_item, Elm_Menu_Item_Data *item) { ELM_MENU_DATA_GET(WIDGET(item), sd); - elm_menu_item_subitems_clear((Elm_Object_Item *)eo_item); + elm_menu_item_subitems_clear(eo_item); eina_stringshare_del(item->label); evas_object_del(item->content); evas_object_del(item->submenu.hv); @@ -1006,7 +1006,7 @@ _elm_menu_item_add(Eo *obj, Elm_Menu_Data *sd, Elm_Object_Item *parent, const ch icon_obj = elm_icon_add(obj); if (!icon_obj) return NULL; - eo_item = (Elm_Object_Item *)eo_add(ELM_MENU_ITEM_CLASS, obj); + eo_item = eo_add(ELM_MENU_ITEM_CLASS, obj); if (!eo_item) { evas_object_del(icon_obj); @@ -1017,7 +1017,7 @@ _elm_menu_item_add(Eo *obj, Elm_Menu_Data *sd, Elm_Object_Item *parent, const ch it->base->data = data; it->func = func; - it->parent = eo_data_scope_get((Eo *)parent, ELM_MENU_ITEM_CLASS); + it->parent = eo_data_scope_get(parent, ELM_MENU_ITEM_CLASS); it->content = icon_obj; _item_obj_create(it); @@ -1041,7 +1041,7 @@ _elm_menu_item_add(Eo *obj, Elm_Menu_Data *sd, Elm_Object_Item *parent, const ch EAPI unsigned int elm_menu_item_index_get(const Elm_Object_Item *it) { - return eo_do((Eo*)it, elm_obj_menu_item_index_get()); + return eo_do(it, elm_obj_menu_item_index_get()); } EOLIAN static unsigned int @@ -1054,7 +1054,7 @@ EAPI void elm_menu_item_icon_name_set(Elm_Object_Item *it, const char *icon) { - eo_do((Eo*)it, elm_obj_menu_item_icon_name_set(icon)); + eo_do(it, elm_obj_menu_item_icon_name_set(icon)); } EOLIAN static void @@ -1101,10 +1101,10 @@ _elm_menu_item_separator_add(Eo *obj, Elm_Menu_Data *sd, Elm_Object_Item *eo_p_i ELM_MENU_ITEM_DATA_GET(eo_subitem, subitem); if (subitem->separator) return NULL; - eo_subitem = (Elm_Object_Item *)eo_add(ELM_MENU_ITEM_CLASS, obj); + eo_subitem = eo_add(ELM_MENU_ITEM_CLASS, obj); if (!eo_subitem) return NULL; - subitem = eo_data_scope_get((Eo *)eo_subitem, ELM_MENU_ITEM_CLASS); + subitem = eo_data_scope_get(eo_subitem, ELM_MENU_ITEM_CLASS); subitem->separator = EINA_TRUE; _item_separator_obj_create(subitem); @@ -1126,13 +1126,13 @@ _elm_menu_item_separator_add(Eo *obj, Elm_Menu_Data *sd, Elm_Object_Item *eo_p_i if (sd->dbus_menu) subitem->dbus_idx = _elm_dbus_menu_item_add(sd->dbus_menu, eo_subitem); - return (Elm_Object_Item *)eo_subitem; + return eo_subitem; } EAPI const char * elm_menu_item_icon_name_get(const Elm_Object_Item *it) { - return eo_do((Eo*)it, elm_obj_menu_item_icon_name_get()); + return eo_do(it, elm_obj_menu_item_icon_name_get()); } EOLIAN static const char * @@ -1144,7 +1144,7 @@ _elm_menu_item_icon_name_get(Eo *eo_item EINA_UNUSED, Elm_Menu_Item_Data *item) EAPI Eina_Bool elm_menu_item_is_separator(Elm_Object_Item *it) { - return eo_do((Eo*)it, elm_obj_menu_item_is_separator()); + return eo_do(it, elm_obj_menu_item_is_separator()); } EOLIAN static Eina_Bool @@ -1156,7 +1156,7 @@ _elm_menu_item_is_separator(Eo *eo_item EINA_UNUSED, Elm_Menu_Item_Data *item) EAPI const Eina_List * elm_menu_item_subitems_get(const Elm_Object_Item *it) { - return eo_do((Eo*)it, elm_obj_menu_item_subitems_get()); + return eo_do(it, elm_obj_menu_item_subitems_get()); } EOLIAN static const Eina_List * @@ -1168,7 +1168,7 @@ _elm_menu_item_subitems_get(Eo *eo_item EINA_UNUSED, Elm_Menu_Item_Data *item) EAPI void elm_menu_item_subitems_clear(Elm_Object_Item *it) { - eo_do((Eo*)it, elm_obj_menu_item_subitems_clear()); + eo_do(it, elm_obj_menu_item_subitems_clear()); } EOLIAN static void @@ -1179,7 +1179,7 @@ _elm_menu_item_subitems_clear(Eo *eo_item EINA_UNUSED, Elm_Menu_Item_Data *it) EINA_LIST_FOREACH_SAFE(it->submenu.items, l, l_next, sub_it) - eo_do((Eo *)sub_it, elm_wdg_item_del()); + eo_do(sub_it, elm_wdg_item_del()); } EOLIAN static const Eina_List* @@ -1192,7 +1192,7 @@ EAPI void elm_menu_item_selected_set(Elm_Object_Item *it, Eina_Bool selected) { - eo_do((Eo*)it, elm_obj_menu_item_selected_set(selected)); + eo_do(it, elm_obj_menu_item_selected_set(selected)); } EOLIAN static void @@ -1218,7 +1218,7 @@ _elm_menu_item_selected_set(Eo *eo_item EINA_UNUSED, EAPI Eina_Bool elm_menu_item_selected_get(const Elm_Object_Item *it) { - return eo_do((Eo*)it, elm_obj_menu_item_selected_get()); + return eo_do(it, elm_obj_menu_item_selected_get()); } EOLIAN static Eina_Bool @@ -1230,7 +1230,7 @@ _elm_menu_item_selected_get(Eo *eo_item EINA_UNUSED, Elm_Menu_Item_Data *item) EAPI Elm_Object_Item * elm_menu_item_prev_get(const Elm_Object_Item *it) { - return (Elm_Object_Item *)eo_do((Eo*)it, elm_obj_menu_item_prev_get()); + return eo_do(it, elm_obj_menu_item_prev_get()); } EOLIAN static Elm_Object_Item * @@ -1260,7 +1260,7 @@ _elm_menu_item_prev_get(Eo *eo_item, Elm_Menu_Item_Data *item) EAPI Elm_Object_Item * elm_menu_item_next_get(const Elm_Object_Item *it) { - return (Elm_Object_Item *)eo_do((Eo*)it, elm_obj_menu_item_next_get()); + return eo_do(it, elm_obj_menu_item_next_get()); } EOLIAN static Elm_Object_Item * diff --git a/legacy/elementary/src/lib/elm_segment_control.c b/legacy/elementary/src/lib/elm_segment_control.c index a5b51c5eba..d5be57d087 100644 --- a/legacy/elementary/src/lib/elm_segment_control.c +++ b/legacy/elementary/src/lib/elm_segment_control.c @@ -30,7 +30,7 @@ _elm_segment_control_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Segment_Contr Eina_List *l; EINA_LIST_FOREACH(sd->items, l, it) - eo_do((Eo *)it, elm_wdg_item_translate()); + eo_do(it, elm_wdg_item_translate()); eo_do_super(obj, MY_CLASS, elm_obj_widget_translate()); @@ -580,7 +580,7 @@ _item_new(Evas_Object *obj, if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) eo_do(eo_item, elm_wdg_item_access_register()); - return (Elm_Object_Item *)eo_item; + return eo_item; } EOLIAN static void @@ -630,7 +630,7 @@ _elm_segment_control_evas_object_smart_del(Eo *obj, Elm_Segment_Control_Data *sd { ELM_SEGMENT_ITEM_DATA_GET(eo_it, it); _item_free(it); - eo_del((Eo *)eo_it); + eo_del(eo_it); } eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); @@ -721,7 +721,7 @@ _elm_segment_control_item_add(Eo *obj, Elm_Segment_Control_Data *sd, Evas_Object sd->items = eina_list_append(sd->items, eo_item); _update_list(sd); - return (Elm_Object_Item *)eo_item; + return eo_item; } EOLIAN static Elm_Object_Item* @@ -742,7 +742,7 @@ _elm_segment_control_item_insert_at(Eo *obj, Elm_Segment_Control_Data *sd, Evas_ _update_list(sd); - return (Elm_Object_Item *)eo_item; + return eo_item; } EOLIAN static void @@ -753,7 +753,7 @@ _elm_segment_control_item_del_at(Eo *obj, Elm_Segment_Control_Data *_pd EINA_UNU it = _item_find(obj, idx); if (!it) return; - eo_do((Eo *)EO_OBJ(it), elm_wdg_item_del()); + eo_do(EO_OBJ(it), elm_wdg_item_del()); } EOLIAN static const char* @@ -784,7 +784,7 @@ _elm_segment_control_item_count_get(Eo *obj EINA_UNUSED, Elm_Segment_Control_Dat EAPI Evas_Object * elm_segment_control_item_object_get(const Elm_Object_Item *it) { - return eo_do((Eo*)it, elm_obj_segment_control_item_object_get()); + return eo_do(it, elm_obj_segment_control_item_object_get()); } EOLIAN static Evas_Object * @@ -796,7 +796,7 @@ _elm_segment_control_item_object_get(Eo *eo_it EINA_UNUSED, Elm_Segment_Control_ EOLIAN static Elm_Object_Item* _elm_segment_control_item_selected_get(Eo *obj EINA_UNUSED, Elm_Segment_Control_Data *sd) { - return (Elm_Object_Item *)EO_OBJ(sd->selected_item); + return EO_OBJ(sd->selected_item); } EAPI void @@ -830,7 +830,7 @@ EOLIAN static Elm_Object_Item* _elm_segment_control_item_get(Eo *obj, Elm_Segment_Control_Data *_pd EINA_UNUSED, int idx) { Elm_Segment_Control_Item_Data *it = _item_find(obj, idx); - return (Elm_Object_Item *)EO_OBJ(it); + return EO_OBJ(it); } EOLIAN static int diff --git a/legacy/elementary/src/lib/elm_slideshow.c b/legacy/elementary/src/lib/elm_slideshow.c index d2e5cfe36d..92836e6e24 100644 --- a/legacy/elementary/src/lib/elm_slideshow.c +++ b/legacy/elementary/src/lib/elm_slideshow.c @@ -310,7 +310,7 @@ _elm_slideshow_item_elm_widget_item_del_pre(Eo *eo_item, Elm_Slideshow_Item_Data sd->items_built = eina_list_remove_list(sd->items_built, item->l_built); if ((VIEW(item)) && (item->itc->func.del)) - item->itc->func.del(elm_object_item_data_get((Elm_Object_Item *)eo_item), VIEW(item)); + item->itc->func.del(elm_object_item_data_get(eo_item), VIEW(item)); return EINA_TRUE; } @@ -415,9 +415,9 @@ _elm_slideshow_item_add(Eo *obj, Elm_Slideshow_Data *sd, const Elm_Slideshow_Ite sd->items = eina_list_merge(sd->items, item->l); - if (!sd->current) elm_slideshow_item_show((Elm_Object_Item *)eo_item); + if (!sd->current) elm_slideshow_item_show(eo_item); - return (Elm_Object_Item *)eo_item; + return eo_item; } EOLIAN static Elm_Object_Item* @@ -436,15 +436,15 @@ _elm_slideshow_item_sorted_insert(Eo *obj, Elm_Slideshow_Data *sd, const Elm_Sli sd->items = eina_list_sorted_merge(sd->items, item->l, func); - if (!sd->current) elm_slideshow_item_show((Elm_Object_Item *)eo_item); + if (!sd->current) elm_slideshow_item_show(eo_item); - return (Elm_Object_Item *)eo_item; + return eo_item; } EAPI void elm_slideshow_item_show(Elm_Object_Item *it) { - eo_do((Eo*)it, elm_obj_slideshow_item_show()); + eo_do(it, elm_obj_slideshow_item_show()); } EOLIAN static void @@ -658,7 +658,7 @@ _elm_slideshow_items_get(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) EOLIAN static Elm_Object_Item* _elm_slideshow_item_current_get(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) { - return (Elm_Object_Item *)EO_OBJ(sd->current); + return EO_OBJ(sd->current); } EOLIAN static Evas_Object * diff --git a/legacy/elementary/src/lib/elm_widget.c b/legacy/elementary/src/lib/elm_widget.c index 19db423c17..e030cb4db3 100644 --- a/legacy/elementary/src/lib/elm_widget.c +++ b/legacy/elementary/src/lib/elm_widget.c @@ -145,9 +145,9 @@ _elm_widget_item_highlight_in_theme(Evas_Object *obj, Elm_Object_Item *eo_it) const char *str; if (!eo_it) return; - if (eo_isa((Eo *)eo_it, ELM_WIDGET_ITEM_CLASS)) + if (eo_isa(eo_it, ELM_WIDGET_ITEM_CLASS)) { - Elm_Widget_Item_Data *it = eo_data_scope_get((Eo *)eo_it, ELM_WIDGET_ITEM_CLASS); + Elm_Widget_Item_Data *it = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS); str = edje_object_data_get(it->view, "focus_highlight"); } else diff --git a/legacy/elementary/src/lib/elm_widget.h b/legacy/elementary/src/lib/elm_widget.h index e38a7a0f21..9b59bbeac9 100644 --- a/legacy/elementary/src/lib/elm_widget.h +++ b/legacy/elementary/src/lib/elm_widget.h @@ -582,7 +582,7 @@ struct _Elm_Widget_Item_Data /* simple accessor macros */ #define VIEW(X) X->base->view #define WIDGET(X) X->base->widget -#define EO_OBJ(X) (Elm_Object_Item *)((X)?X->base->eo_obj:NULL) +#define EO_OBJ(X) ((X)?X->base->eo_obj:NULL) /**< the owner widget that owns this item */ Evas_Object *widget; /**< The Eo item, useful to invoke eo_do when only the item data is available */ @@ -795,7 +795,7 @@ EAPI void elm_widget_tree_dot_dump(const Evas_Object *top, FILE *out * @param item a valid item. */ #define elm_widget_item_free(item) \ - _elm_widget_item_free((Elm_Widget_Item_Data *)item) + _elm_widget_item_free(item) /** * Convenience macro to delete widget item, doing casts for you. @@ -803,86 +803,87 @@ EAPI void elm_widget_tree_dot_dump(const Evas_Object *top, FILE *out * @param item a valid item. */ #define elm_widget_item_del(item) \ - _elm_widget_item_internal_del((Elm_Widget_Item_Data *)item) + _elm_widget_item_internal_del(item) #define elm_widget_item_pre_notify_del(item) \ - elm_widget_item_internal_pre_notify_del((Elm_Widget_Item_Data *)item) + elm_widget_item_internal_pre_notify_del(item) #define elm_widget_item_del_cb_set(item, del_cb) \ - elm_widget_item_internal_del_cb_set((Elm_Widget_Item_Data *)item, del_cb) + elm_widget_item_internal_del_cb_set(item, del_cb) #define elm_widget_item_widget_get(item) \ - elm_widget_item_internal_widget_get((const Elm_Widget_Item_Data *)item) + elm_widget_item_internal_widget_get(item) #define elm_widget_item_data_set(item, data) \ - elm_widget_item_internal_data_set((Elm_Widget_Item_Data *)item, data) + elm_widget_item_internal_data_set(item, data) #define elm_widget_item_data_get(item) \ - elm_widget_item_internal_data_get((const Elm_Widget_Item_Data *)item) + elm_widget_item_internal_data_get(item) #define elm_widget_item_tooltip_text_set(item, text) \ - elm_widget_item_internal_tooltip_text_set((Elm_Widget_Item_Data *)item, text) + elm_widget_item_internal_tooltip_text_set(item, text) #define elm_widget_item_tooltip_translatable_text_set(item, text) \ - elm_widget_item_internal_tooltip_translatable_text_set((Elm_Widget_Item_Data *)item, text) + elm_widget_item_internal_tooltip_translatable_text_set(item, text) #define elm_widget_item_tooltip_content_cb_set(item, func, data, del_cb) \ - elm_widget_item_internal_tooltip_content_cb_set((Elm_Widget_Item_Data *)item, \ + elm_widget_item_internal_tooltip_content_cb_set(item, \ func, data, del_cb) #define elm_widget_item_tooltip_unset(item) \ - elm_widget_item_internal_tooltip_unset((Elm_Widget_Item_Data *)item) + elm_widget_item_internal_tooltip_unset(item) #define elm_widget_item_tooltip_style_set(item, style) \ - elm_widget_item_internal_tooltip_style_set((Elm_Widget_Item_Data *)item, style) + elm_widget_item_internal_tooltip_style_set(item, style) #define elm_widget_item_tooltip_window_mode_set(item, disable) \ - elm_widget_item_internal_tooltip_window_mode_set((Elm_Widget_Item_Data *)item, disable) + elm_widget_item_internal_tooltip_window_mode_set(item, disable) #define elm_widget_item_tooltip_window_mode_get(item) \ - elm_widget_item_internal_tooltip_window_mode_get((Elm_Widget_Item_Data *)item) + elm_widget_item_internal_tooltip_window_mode_get(item) #define elm_widget_item_tooltip_style_get(item) \ - elm_widget_item_internal_tooltip_style_get((const Elm_Widget_Item_Data *)item) + elm_widget_item_internal_tooltip_style_get(item) #define elm_widget_item_cursor_set(item, cursor) \ - elm_widget_item_internal_cursor_set((Elm_Widget_Item_Data *)item, cursor) + elm_widget_item_internal_cursor_set(item, cursor) #define elm_widget_item_cursor_get(item) \ - elm_widget_item_internal_cursor_get((const Elm_Widget_Item_Data *)item) + elm_widget_item_internal_cursor_get(item) #define elm_widget_item_cursor_unset(item) \ - elm_widget_item_internal_cursor_unset((Elm_Widget_Item_Data *)item) + elm_widget_item_internal_cursor_unset(item) #define elm_widget_item_cursor_style_set(item, style) \ - elm_widget_item_internal_cursor_style_set((Elm_Widget_Item_Data *)item, style) + elm_widget_item_internal_cursor_style_set(item, style) #define elm_widget_item_cursor_style_get(item) \ - elm_widget_item_internal_cursor_style_get((const Elm_Widget_Item_Data *)item) + elm_widget_item_internal_cursor_style_get(item) #define elm_widget_item_cursor_engine_only_set(item, engine_only) \ - elm_widget_item_internal_cursor_engine_only_set((Elm_Widget_Item_Data *)item, engine_only) + elm_widget_item_internal_cursor_engine_only_set(item, engine_only) #define elm_widget_item_cursor_engine_only_get(item) \ - elm_widget_item_internal_cursor_engine_only_get((const Elm_Widget_Item_Data *)item) + elm_widget_item_internal_cursor_engine_only_get(item) /** * Convenience function to query disable get hook. * @see elm_widget_item_internal_disabled_get() */ #define elm_widget_item_disabled_get(item) \ + elm_widget_item_internal_disabled_get(item) #define elm_widget_item_style_set(item, style) \ - elm_widget_item_internal_style_set((Elm_Widget_Item_Data *)item, style) + elm_widget_item_internal_style_set(item, style) #define elm_widget_item_style_get(item) \ - elm_widget_item_internal_style_get((Elm_Widget_Item_Data *)item) + elm_widget_item_internal_style_get(item) /** * Convenience function to query track_cancel. * @see elm_widget_item_internal_del_pre_hook_set() */ #define elm_widget_item_track_cancel(item) \ - elm_widget_item_internal_track_cancel((Elm_Widget_Item_Data *)item) + elm_widget_item_internal_track_cancel(item) #define elm_widget_item_translate(item) \ - elm_widget_item_internal_translate((Elm_Widget_Item_Data *)item) + elm_widget_item_internal_translate(item) #define elm_widget_item_part_text_custom_set(item, part, text) \ - _elm_widget_item_internal_part_text_custom_set((Elm_Widget_Item_Data *)item, part, text) + _elm_widget_item_internal_part_text_custom_set(item, part, text) #define elm_widget_item_part_text_custom_get(item, part) \ - _elm_widget_item_internal_part_text_custom_get((Elm_Widget_Item_Data *)item, part) + _elm_widget_item_internal_part_text_custom_get(item, part) #define elm_widget_item_part_text_custom_update(item) \ - _elm_widget_item_internal_part_text_custom_update((Elm_Widget_Item_Data *)item) + _elm_widget_item_internal_part_text_custom_update(item) #define elm_widget_item_focus_set(item, focused) \ - elm_widget_item_internal_focus_set((Elm_Widget_Item_Data *)item, focused) + elm_widget_item_internal_focus_set(item, focused) #define elm_widget_item_focus_get(item) \ - elm_widget_item_internal_focus_get((const Elm_Widget_Item_Data *)item) + elm_widget_item_internal_focus_get(item) #define ELM_WIDGET_CHECK_OR_RETURN(obj, ...) \ do { \ diff --git a/legacy/elementary/src/lib/elm_widget_colorselector.h b/legacy/elementary/src/lib/elm_widget_colorselector.h index 8ee8101b54..b7372956df 100644 --- a/legacy/elementary/src/lib/elm_widget_colorselector.h +++ b/legacy/elementary/src/lib/elm_widget_colorselector.h @@ -124,18 +124,18 @@ struct _Elm_Color_Item_Data } #define ELM_COLOR_ITEM_DATA_GET(o, sd) \ - Elm_Color_Item_Data * sd = eo_data_scope_get((Eo *)o, ELM_COLOR_ITEM_CLASS) + Elm_Color_Item_Data * sd = eo_data_scope_get(o, ELM_COLOR_ITEM_CLASS) #define ELM_COLORSELECTOR_CHECK(obj) \ if (EINA_UNLIKELY(!eo_isa((obj), ELM_COLORSELECTOR_CLASS))) \ return #define ELM_COLORSELECTOR_ITEM_CHECK(it) \ - if (EINA_UNLIKELY(!eo_isa((Eo *)it->base->eo_obj, ELM_COLOR_ITEM_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa(it->base->eo_obj, ELM_COLOR_ITEM_CLASS))) \ return #define ELM_COLORSELECTOR_ITEM_CHECK_OR_RETURN(it, ...) \ - if (EINA_UNLIKELY(!eo_isa((Eo *)it->base->eo_obj, ELM_COLOR_ITEM_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa(it->base->eo_obj, ELM_COLOR_ITEM_CLASS))) \ return __VA_ARGS__; #endif diff --git a/legacy/elementary/src/lib/elm_widget_ctxpopup.h b/legacy/elementary/src/lib/elm_widget_ctxpopup.h index e545a5da34..3db688aa5f 100644 --- a/legacy/elementary/src/lib/elm_widget_ctxpopup.h +++ b/legacy/elementary/src/lib/elm_widget_ctxpopup.h @@ -97,6 +97,6 @@ struct _Elm_Ctxpopup_Data ELM_CTXPOPUP_CHECK(it->base->widget) __VA_ARGS__; #define ELM_CTXPOPUP_ITEM_DATA_GET(o, sd) \ - Elm_Ctxpopup_Item_Data *sd = eo_data_scope_get((Eo *)o, ELM_CTXPOPUP_ITEM_CLASS) + Elm_Ctxpopup_Item_Data *sd = eo_data_scope_get(o, ELM_CTXPOPUP_ITEM_CLASS) #endif diff --git a/legacy/elementary/src/lib/elm_widget_dayselector.h b/legacy/elementary/src/lib/elm_widget_dayselector.h index 17ec8b3fa4..7dca70c2b5 100644 --- a/legacy/elementary/src/lib/elm_widget_dayselector.h +++ b/legacy/elementary/src/lib/elm_widget_dayselector.h @@ -73,6 +73,6 @@ struct _Elm_Dayselector_Item_Data return #define ELM_DAYSELECTOR_ITEM_DATA_GET(o, sd) \ - Elm_Dayselector_Item_Data * sd = eo_data_scope_get((Eo *)o, ELM_DAYSELECTOR_ITEM_CLASS) + Elm_Dayselector_Item_Data * sd = eo_data_scope_get(o, ELM_DAYSELECTOR_ITEM_CLASS) #endif diff --git a/legacy/elementary/src/lib/elm_widget_diskselector.h b/legacy/elementary/src/lib/elm_widget_diskselector.h index 90e67fbd44..b391af6db3 100644 --- a/legacy/elementary/src/lib/elm_widget_diskselector.h +++ b/legacy/elementary/src/lib/elm_widget_diskselector.h @@ -109,6 +109,6 @@ struct _Elm_Diskselector_Item_Data goto label; #define ELM_DISKSELECTOR_ITEM_DATA_GET(o, sd) \ - Elm_Diskselector_Item_Data* sd = eo_data_scope_get((Eo *)o, ELM_DISKSELECTOR_ITEM_CLASS) + Elm_Diskselector_Item_Data* sd = eo_data_scope_get(o, ELM_DISKSELECTOR_ITEM_CLASS) #endif diff --git a/legacy/elementary/src/lib/elm_widget_flipselector.h b/legacy/elementary/src/lib/elm_widget_flipselector.h index 8bddd9bea2..f5e06264ee 100644 --- a/legacy/elementary/src/lib/elm_widget_flipselector.h +++ b/legacy/elementary/src/lib/elm_widget_flipselector.h @@ -74,18 +74,18 @@ struct _Elm_Flipselector_Item_Data } #define ELM_FLIPSELECTOR_ITEM_DATA_GET(o, sd) \ - Elm_Flipselector_Item_Data * sd = eo_data_scope_get((Eo *)o, ELM_FLIPSELECTOR_ITEM_CLASS) + Elm_Flipselector_Item_Data * sd = eo_data_scope_get(o, ELM_FLIPSELECTOR_ITEM_CLASS) #define ELM_FLIPSELECTOR_CHECK(obj) \ if (EINA_UNLIKELY(!eo_isa((obj), ELM_FLIPSELECTOR_CLASS))) \ return #define ELM_FLIPSELECTOR_ITEM_CHECK(it) \ - if (EINA_UNLIKELY(!eo_isa(((Eo *)it->base->eo_obj), ELM_FLIPSELECTOR_ITEM_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((it->base->eo_obj), ELM_FLIPSELECTOR_ITEM_CLASS))) \ return #define ELM_FLIPSELECTOR_ITEM_CHECK_OR_RETURN(it, ...) \ - if (EINA_UNLIKELY(!eo_isa(((Eo *)it->base->eo_obj), ELM_FLIPSELECTOR_ITEM_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa((it->base->eo_obj), ELM_FLIPSELECTOR_ITEM_CLASS))) \ return __VA_ARGS__; #endif diff --git a/legacy/elementary/src/lib/elm_widget_gengrid.h b/legacy/elementary/src/lib/elm_widget_gengrid.h index e38156af77..5ffca3731b 100644 --- a/legacy/elementary/src/lib/elm_widget_gengrid.h +++ b/legacy/elementary/src/lib/elm_widget_gengrid.h @@ -205,6 +205,6 @@ struct _Elm_Gengrid_Pan_Data ((it->base->widget), ELM_GENGRID_CLASS)) goto label; #define ELM_GENGRID_ITEM_DATA_GET(o, sd) \ - Elm_Gen_Item* sd = eo_data_scope_get((Eo *)o, ELM_GENGRID_ITEM_CLASS) + Elm_Gen_Item* sd = eo_data_scope_get(o, ELM_GENGRID_ITEM_CLASS) #endif diff --git a/legacy/elementary/src/lib/elm_widget_genlist.h b/legacy/elementary/src/lib/elm_widget_genlist.h index 94627bb963..623ae65ba2 100644 --- a/legacy/elementary/src/lib/elm_widget_genlist.h +++ b/legacy/elementary/src/lib/elm_widget_genlist.h @@ -337,6 +337,6 @@ struct _Elm_Genlist_Pan_Data ((it->base->widget), ELM_GENLIST_CLASS)) goto label; #define ELM_GENLIST_ITEM_DATA_GET(o, sd) \ - Elm_Gen_Item* sd = eo_data_scope_get((Eo *)o, ELM_GENLIST_ITEM_CLASS) + Elm_Gen_Item* sd = eo_data_scope_get(o, ELM_GENLIST_ITEM_CLASS) #endif diff --git a/legacy/elementary/src/lib/elm_widget_hoversel.h b/legacy/elementary/src/lib/elm_widget_hoversel.h index 74255a6385..66da026ae2 100644 --- a/legacy/elementary/src/lib/elm_widget_hoversel.h +++ b/legacy/elementary/src/lib/elm_widget_hoversel.h @@ -83,14 +83,14 @@ struct _Elm_Hoversel_Item_Data return #define ELM_HOVERSEL_ITEM_DATA_GET(o, sd) \ - Elm_Hoversel_Item_Data *sd = eo_data_scope_get((Eo *)o, ELM_HOVERSEL_ITEM_CLASS) + Elm_Hoversel_Item_Data *sd = eo_data_scope_get(o, ELM_HOVERSEL_ITEM_CLASS) #define ELM_HOVERSEL_ITEM_CHECK(it) \ - if (EINA_UNLIKELY(!eo_isa((Eo *)it->base->eo_obj, ELM_HOVERSEL_ITEM_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa(it->base->eo_obj, ELM_HOVERSEL_ITEM_CLASS))) \ return #define ELM_HOVERSEL_ITEM_CHECK_OR_RETURN(it, ...) \ - if (EINA_UNLIKELY(!eo_isa((Eo *)it->base->eo_obj, ELM_HOVERSEL_ITEM_CLASS))) \ + if (EINA_UNLIKELY(!eo_isa(it->base->eo_obj, ELM_HOVERSEL_ITEM_CLASS))) \ return __VA_ARGS__; #endif diff --git a/legacy/elementary/src/lib/elm_widget_index.h b/legacy/elementary/src/lib/elm_widget_index.h index 381e3dee83..415ecca1a8 100644 --- a/legacy/elementary/src/lib/elm_widget_index.h +++ b/legacy/elementary/src/lib/elm_widget_index.h @@ -109,6 +109,6 @@ struct _Elm_Index_Omit return __VA_ARGS__; #define ELM_INDEX_ITEM_DATA_GET(o, sd) \ - Elm_Index_Item_Data *sd = eo_data_scope_get((Eo *)o, ELM_INDEX_ITEM_CLASS) + Elm_Index_Item_Data *sd = eo_data_scope_get(o, ELM_INDEX_ITEM_CLASS) #endif diff --git a/legacy/elementary/src/lib/elm_widget_list.h b/legacy/elementary/src/lib/elm_widget_list.h index 6ddd4d88b3..cfbdaebacd 100644 --- a/legacy/elementary/src/lib/elm_widget_list.h +++ b/legacy/elementary/src/lib/elm_widget_list.h @@ -122,7 +122,7 @@ struct _Elm_List_Item_Data #define ELM_LIST_ITEM_CHECK(it) \ ELM_WIDGET_ITEM_CHECK_OR_RETURN(it->base, ); \ ELM_LIST_CHECK(it->base->widget); \ - if (((Elm_List_Item_Data *)it)->deleted) \ + if (it->deleted) \ { \ ERR("ERROR: " #it " has been DELETED.\n"); \ return; \ @@ -131,13 +131,13 @@ struct _Elm_List_Item_Data #define ELM_LIST_ITEM_CHECK_OR_RETURN(it, ...) \ ELM_WIDGET_ITEM_CHECK_OR_RETURN(it->base, __VA_ARGS__); \ ELM_LIST_CHECK(it->base->widget) __VA_ARGS__; \ - if (((Elm_List_Item_Data *)it)->deleted) \ + if (it->deleted) \ { \ ERR("ERROR: " #it " has been DELETED.\n"); \ return __VA_ARGS__; \ } #define ELM_LIST_ITEM_DATA_GET(o, sd) \ - Elm_List_Item_Data* sd = eo_data_scope_get((Eo *)o, ELM_LIST_ITEM_CLASS) + Elm_List_Item_Data* sd = eo_data_scope_get(o, ELM_LIST_ITEM_CLASS) #endif diff --git a/legacy/elementary/src/lib/elm_widget_menu.h b/legacy/elementary/src/lib/elm_widget_menu.h index 067daa2770..3f5f03406b 100644 --- a/legacy/elementary/src/lib/elm_widget_menu.h +++ b/legacy/elementary/src/lib/elm_widget_menu.h @@ -90,7 +90,7 @@ struct _Elm_Menu_Item_Data } #define ELM_MENU_ITEM_DATA_GET(o, sd) \ - Elm_Menu_Item_Data *sd = eo_data_scope_get((Eo *)o, ELM_MENU_ITEM_CLASS) + Elm_Menu_Item_Data *sd = eo_data_scope_get(o, ELM_MENU_ITEM_CLASS) #define ELM_MENU_CHECK(obj) \ if (EINA_UNLIKELY(!eo_isa((obj), ELM_MENU_CLASS))) \ diff --git a/legacy/elementary/src/lib/elm_widget_multibuttonentry.h b/legacy/elementary/src/lib/elm_widget_multibuttonentry.h index ce4c657ac8..ba2abde757 100644 --- a/legacy/elementary/src/lib/elm_widget_multibuttonentry.h +++ b/legacy/elementary/src/lib/elm_widget_multibuttonentry.h @@ -132,7 +132,7 @@ struct _Elm_Multibuttonentry_Data } #define ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(o, sd) \ - Elm_Multibuttonentry_Item_Data *sd = eo_data_scope_get((Eo *)o, ELM_MULTIBUTTONENTRY_ITEM_CLASS) + Elm_Multibuttonentry_Item_Data *sd = eo_data_scope_get(o, ELM_MULTIBUTTONENTRY_ITEM_CLASS) #define ELM_MULTIBUTTONENTRY_CHECK(obj) \ if (EINA_UNLIKELY(!eo_isa((obj), ELM_MULTIBUTTONENTRY_CLASS))) \ diff --git a/legacy/elementary/src/lib/elm_widget_naviframe.h b/legacy/elementary/src/lib/elm_widget_naviframe.h index c02ad0519c..ece815af3a 100644 --- a/legacy/elementary/src/lib/elm_widget_naviframe.h +++ b/legacy/elementary/src/lib/elm_widget_naviframe.h @@ -122,6 +122,6 @@ struct _Elm_Naviframe_Text_Item_Pair return __VA_ARGS__; #define ELM_NAVIFRAME_ITEM_DATA_GET(o, sd) \ - Elm_Naviframe_Item_Data *sd = eo_data_scope_get((Eo *)o, ELM_NAVIFRAME_ITEM_CLASS) + Elm_Naviframe_Item_Data *sd = eo_data_scope_get(o, ELM_NAVIFRAME_ITEM_CLASS) #endif diff --git a/legacy/elementary/src/lib/elm_widget_popup.h b/legacy/elementary/src/lib/elm_widget_popup.h index 95a1a696ba..04c044d110 100644 --- a/legacy/elementary/src/lib/elm_widget_popup.h +++ b/legacy/elementary/src/lib/elm_widget_popup.h @@ -110,6 +110,6 @@ struct _Action_Area_Data ELM_POPUP_CHECK(it->base->widget) __VA_ARGS__; #define ELM_POPUP_ITEM_DATA_GET(o, sd) \ - Elm_Popup_Item_Data* sd = eo_data_scope_get((Eo *)o, ELM_POPUP_ITEM_CLASS) + Elm_Popup_Item_Data* sd = eo_data_scope_get(o, ELM_POPUP_ITEM_CLASS) #endif diff --git a/legacy/elementary/src/lib/elm_widget_segment_control.h b/legacy/elementary/src/lib/elm_widget_segment_control.h index 0a53e1aecb..0fa4b28a84 100644 --- a/legacy/elementary/src/lib/elm_widget_segment_control.h +++ b/legacy/elementary/src/lib/elm_widget_segment_control.h @@ -76,7 +76,7 @@ struct _Elm_Segment_Control_Item_Data return #define ELM_SEGMENT_ITEM_DATA_GET(o, sd) \ - Elm_Segment_Control_Item_Data *sd = eo_data_scope_get((Eo *)o, ELM_SEGMENT_CONTROL_ITEM_CLASS) + Elm_Segment_Control_Item_Data *sd = eo_data_scope_get(o, ELM_SEGMENT_CONTROL_ITEM_CLASS) #define ELM_SEGMENT_CONTROL_ITEM_CHECK(it) \ if (EINA_UNLIKELY(!eo_isa((it)->base->eo_obj, ELM_SEGMENT_CONTROL_ITEM_CLASS))) \ diff --git a/legacy/elementary/src/lib/elm_widget_slideshow.h b/legacy/elementary/src/lib/elm_widget_slideshow.h index 39a0b41d43..20aa85f87f 100644 --- a/legacy/elementary/src/lib/elm_widget_slideshow.h +++ b/legacy/elementary/src/lib/elm_widget_slideshow.h @@ -100,6 +100,6 @@ struct _Elm_Slideshow_Data return __VA_ARGS__; #define ELM_SLIDESHOW_ITEM_DATA_GET(o, sd) \ - Elm_Slideshow_Item_Data *sd = eo_data_scope_get((Eo *)o, ELM_SLIDESHOW_ITEM_CLASS) + Elm_Slideshow_Item_Data *sd = eo_data_scope_get(o, ELM_SLIDESHOW_ITEM_CLASS) #endif diff --git a/legacy/elementary/src/lib/elm_widget_toolbar.h b/legacy/elementary/src/lib/elm_widget_toolbar.h index 2bdd3292b0..e9438fb615 100644 --- a/legacy/elementary/src/lib/elm_widget_toolbar.h +++ b/legacy/elementary/src/lib/elm_widget_toolbar.h @@ -140,6 +140,6 @@ struct _Elm_Toolbar_Item_State if (!it->base->widget || !eo_isa ((it->base->widget), ELM_TOOLBAR_CLASS)) goto label; #define ELM_TOOLBAR_ITEM_DATA_GET(o, sd) \ - Elm_Toolbar_Item_Data* sd = eo_data_scope_get((Eo *)o, ELM_TOOLBAR_ITEM_CLASS) + Elm_Toolbar_Item_Data *sd = eo_data_scope_get(o, ELM_TOOLBAR_ITEM_CLASS) #endif