From: ChunEon Park Date: Fri, 9 Dec 2011 07:08:49 +0000 (+0000) Subject: elementary/slideshow - deprecated API X-Git-Tag: v1.0.0~1409 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c8bcfff15ac6c4b11f9d8e08fabfa63836dbc8cd;p=platform%2Fupstream%2Felementary.git elementary/slideshow - deprecated API elm_slideshow_item_data_get SVN revision: 66060 --- diff --git a/src/examples/slideshow_example.c b/src/examples/slideshow_example.c index 71c27e7..acdcaeb 100644 --- a/src/examples/slideshow_example.c +++ b/src/examples/slideshow_example.c @@ -173,8 +173,8 @@ _cmp_func(const void *data1, const Elm_Object_Item *slide_it1 = data1; const Elm_Object_Item *slide_it2 = data2; - img_path1 = elm_slideshow_item_data_get(slide_it1); - img_path2 = elm_slideshow_item_data_get(slide_it2); + img_path1 = elm_object_item_data_get(slide_it1); + img_path2 = elm_object_item_data_get(slide_it2); return strcasecmp(img_path1, img_path2); } @@ -221,7 +221,7 @@ elm_main(int argc __UNUSED__, fprintf(stdout, "List of items in the slideshow:\n"); EINA_LIST_FOREACH(list, l, it) fprintf(stdout, "\t%s\n", - (const char *)elm_slideshow_item_data_get(slide_it)); + (const char *)elm_object_item_data_get(slide_it)); notify = elm_notify_add(win); elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_BOTTOM); diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in index 0c7786a..a7922cc 100644 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@ -21497,6 +21497,7 @@ extern "C" { * * @see #Elm_Slideshow_Item_Class * @see elm_slideshow_item_sorted_insert() + * @see elm_object_item_data_set() * * @ingroup Slideshow */ @@ -21759,9 +21760,10 @@ extern "C" { * @param it The slideshow item * @return Returns the data associated to this item * + * @deprecated use elm_object_item_data_get() instead * @ingroup Slideshow */ - EAPI void *elm_slideshow_item_data_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); + EINA_DEPRECATED EAPI void *elm_slideshow_item_data_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1); /** * Returns the currently displayed item, in a given slideshow widget diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c index 329d1fa..7009b83 100644 --- a/src/lib/elm_slideshow.c +++ b/src/lib/elm_slideshow.c @@ -215,7 +215,8 @@ _item_realize(Elm_Slideshow_Item *item) if (!wd) return; if ((!VIEW(item)) && (item->itc->func.get)) { - VIEW(item) = item->itc->func.get((void*)item->base.data, obj); + VIEW(item) = item->itc->func.get(elm_widget_item_data_get(item), + obj); evas_object_smart_member_add(VIEW(item), obj); item->l_built = eina_list_append(NULL, item); wd->items_built = eina_list_merge(wd->items_built, item->l_built); @@ -246,7 +247,7 @@ _item_realize(Elm_Slideshow_Item *item) ic++; VIEW(_item_next) = _item_next->itc->func.get( - (void*)_item_next->base.data, obj); + elm_widget_item_data_get(_item_next), obj); evas_object_smart_member_add(VIEW(_item_next), obj); _item_next->l_built = eina_list_append(NULL, _item_next); wd->items_built = eina_list_merge(wd->items_built, @@ -277,7 +278,7 @@ _item_realize(Elm_Slideshow_Item *item) ic++; VIEW(_item_prev) = _item_prev->itc->func.get( - (void*)_item_prev->base.data, obj); + elm_widget_item_data_get(_item_prev), obj); evas_object_smart_member_add(VIEW(_item_prev), obj); _item_prev->l_built = eina_list_append(NULL, _item_prev); wd->items_built = eina_list_merge(wd->items_built, @@ -303,7 +304,7 @@ _item_realize(Elm_Slideshow_Item *item) wd->items_built = eina_list_remove_list(wd->items_built, wd->items_built); if (item->itc->func.del) - item->itc->func.del((void*)item->base.data, VIEW(item)); + item->itc->func.del(elm_widget_item_data_get(item), VIEW(item)); evas_object_del(VIEW(item)); VIEW(item) = NULL; } @@ -407,9 +408,11 @@ elm_slideshow_item_add(Evas_Object *obj, const Elm_Slideshow_Item_Class *itc, co if (!wd) return NULL; item = elm_widget_item_new(obj, Elm_Slideshow_Item); - item->base.data = data; + if (!item) return NULL; + item->itc = itc; item->l = eina_list_append(item->l, item); + elm_widget_item_data_set(item, data); wd->items = eina_list_merge(wd->items, item->l); @@ -424,12 +427,14 @@ elm_slideshow_item_sorted_insert(Evas_Object *obj, const Elm_Slideshow_Item_Clas Elm_Slideshow_Item *item; ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; + item = elm_widget_item_new(obj, Elm_Slideshow_Item); - item->base.data = data; + if (!item) return NULL; + item->itc = itc; item->l = eina_list_append(item->l, item); + elm_widget_item_data_set(item, data); wd->items = eina_list_sorted_merge(wd->items, item->l, func); @@ -642,7 +647,7 @@ elm_slideshow_clear(Evas_Object *obj) EINA_LIST_FREE(wd->items_built, item) { if (item->itc->func.del) - item->itc->func.del((void*)item->base.data, VIEW(item)); + item->itc->func.del(elm_widget_item_data_get(item), VIEW(item)); evas_object_del(VIEW(item)); VIEW(item) = NULL; } @@ -682,7 +687,7 @@ elm_slideshow_item_del(Elm_Object_Item *it) wd->items_built = eina_list_remove_list(wd->items_built, item->l_built); if ((VIEW(item)) && (item->itc->func.del)) - item->itc->func.del((void*)item->base.data, VIEW(item)); + item->itc->func.del(elm_widget_item_data_get(item), VIEW(item)); if (VIEW(item)) evas_object_del(VIEW(item)); free(item); @@ -716,8 +721,7 @@ elm_slideshow_item_object_get(const Elm_Object_Item * it) EAPI void * elm_slideshow_item_data_get(const Elm_Object_Item * it) { - ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - return elm_widget_item_data_get(it); + return elm_object_item_data_get(it); } EAPI int