It is needed for 64 bits where sizeof(void*) > sizeof(int) Don't do these changes without asking anymore :-/
On Thursday, January 26, 2012, Enlightenment SVN <[email protected]> wrote: > Log: > elementary/genlist - deprecated elm_genlist_item_data_set/get > > but please use elm_object_item_data_set/get instead. > > > and what was purpose of this double casting? > > (int)(long) elm_genlist_item_data_get(gli); > > these calls are used in some places. > > I removed the (long) casting because it looks useless. > > > > Author: hermet > Date: 2012-01-25 23:31:30 -0800 (Wed, 25 Jan 2012) > New Revision: 67546 > Trac: http://trac.enlightenment.org/e/changeset/67546 > > Modified: > trunk/elementary/src/bin/test_cursor.c trunk/elementary/src/bin/test_genlist.c trunk/elementary/src/bin/test_tooltip.c trunk/elementary/src/examples/genlist_example_05.c trunk/elementary/src/lib/elc_fileselector.c trunk/elementary/src/lib/elm_deprecated.h trunk/elementary/src/lib/elm_genlist.h trunk/elementary/src/lib/elm_store.c > > Modified: trunk/elementary/src/bin/test_cursor.c > =================================================================== > --- trunk/elementary/src/bin/test_cursor.c 2012-01-26 07:21:27 UTC (rev 67545) > +++ trunk/elementary/src/bin/test_cursor.c 2012-01-26 07:31:30 UTC (rev 67546) > @@ -47,7 +47,7 @@ > { > Elm_Object_Item *glit = event_info; > Evas_Object *gl = elm_genlist_item_genlist_get(glit); > - int val = (int)(long)elm_genlist_item_data_get(glit); > + int val = (int) elm_object_item_data_get(glit); > Elm_Object_Item *glit1, *glit2, *glit3; > > val *= 10; > > Modified: trunk/elementary/src/bin/test_genlist.c > =================================================================== > --- trunk/elementary/src/bin/test_genlist.c 2012-01-26 07:21:27 UTC (rev 67545) > +++ trunk/elementary/src/bin/test_genlist.c 2012-01-26 07:31:30 UTC (rev 67546) > @@ -63,7 +63,7 @@ > Elm_Object_Item *gli; > gli = elm_genlist_at_xy_item_get(gl, ev->cur.canvas.x, ev->cur.canvas.y, &where); > if (gli) > - printf("over %p, where %i\n", elm_genlist_item_data_get(gli), where); > + printf("over %p, where %i\n", elm_object_item_data_get(gli), where); > else > printf("over none, where %i\n", where); > } > @@ -1051,7 +1051,7 @@ > { > Elm_Object_Item *glit = event_info; > Evas_Object *gl = elm_genlist_item_genlist_get(glit); > - int val = (int)(long)elm_genlist_item_data_get(glit); > + int val = (int) elm_object_item_data_get(glit); > val *= 10; > elm_genlist_item_append(gl, &itc4, > (void *)(long)(val + 1)/* item data */, > @@ -1536,7 +1536,7 @@ > { > Elm_Object_Item *glit = event_info; > Evas_Object *gl = elm_genlist_item_genlist_get(glit); > - int val = (int)(long)elm_genlist_item_data_get(glit); > + int val = (int) elm_object_item_data_get(glit); > val *= 10; > elm_genlist_item_append(gl, &itc1, > (void *)(long)(val + 1)/* item data */, > @@ -1953,8 +1953,8 @@ > gl13_cmp(const void *pa, const void *pb) > { > const Elm_Object_Item *ia = pa, *ib = pb; > - int a = (int)(long)elm_genlist_item_data_get(ia); > - int b = (int)(long)elm_genlist_item_data_get(ib); > + int a = (int) elm_object_item_data_get(ia); > + int b = (int) elm_object_item_data_get(ib); > return a - b; > } > > @@ -2172,7 +2172,7 @@ > Elm_Object_Item *sub_glit[6]; > int j; > > - base = 1000 * (long)elm_genlist_item_data_get(pi[i]); > + base = 1000 * (long) elm_object_item_data_get(pi[i]); > > sub_glit[0] = elm_genlist_item_append > (gl, &itc4, (void *)(idx[0] + base)/* item data */, pi[i]/* parent */, > @@ -2211,7 +2211,7 @@ > Elm_Object_Item *sub_glit[6]; > int j; > > - base = 1000 * (long)elm_genlist_item_data_get(pi[i]); > + base = 1000 * (long) elm_object_item_data_get(pi[i]); > > sub_glit[0] = elm_genlist_item_append > (gl, &itc4, (void *)(idx[0] + base)/* item data */, pi[i]/* parent */, > > Modified: trunk/elementary/src/bin/test_tooltip.c > =================================================================== > --- trunk/elementary/src/bin/test_tooltip.c 2012-01-26 07:21:27 UTC (rev 67545) > +++ trunk/elementary/src/bin/test_tooltip.c 2012-01-26 07:31:30 UTC (rev 67546) > @@ -53,7 +53,7 @@ > { > Elm_Object_Item *glit = event_info; > Evas_Object *gl = elm_genlist_item_genlist_get(glit); > - int val = (int)(long)elm_genlist_item_data_get(glit); > + int val = (int) elm_object_item_data_get(glit); > Elm_Object_Item *glit1, *glit2, *glit3; > > val *= 10; > > Modified: trunk/elementary/src/examples/genlist_example_05.c > =================================================================== > --- trunk/elementary/src/examples/genlist_example_05.c 2012-01-26 07:21:27 UTC (rev 67545) > +++ trunk/elementary/src/examples/genlist_example_05.c 2012-01-26 07:31:30 UTC (rev 67546) > @@ -119,7 +119,7 @@ > if (parent) > { > d->level = elm_genlist_item_expanded_depth_get(parent) + 1; > - pdata = elm_genlist_item_data_get(parent); > + pdata = elm_object_item_data_get(parent); > pdata->children = eina_list_append(pdata->children, d); > } > else > @@ -139,7 +139,7 @@ > > if (!glit) return; > > - Node_Data *d = elm_genlist_item_data_get(glit); > + Node_Data *d = elm_object_item_data_get(glit); > d->favorite = !d->favorite; > if (d->favorite) > elm_genlist_item_item_class_update(glit, &_itfav); > @@ -163,7 +163,7 @@ > > if (!glit) return; > > - Node_Data *d = elm_genlist_item_data_get(glit); > + Node_Data *d = elm_object_item_data_get(glit); > glit_prev = elm_genlist_item_prev_get(glit); > glit_parent = elm_genlist_item_parent_get(glit); > > @@ -223,7 +223,7 @@ > > if (!glit) return; > > - Node_Data *pdata, *d = elm_genlist_item_data_get(glit); > + Node_Data *pdata, *d = elm_object_item_data_get(glit); > glit_parent = elm_genlist_item_parent_get(glit); > elm_genlist_item_subitems_clear(glit); > elm_genlist_item_del(glit); > @@ -232,7 +232,7 @@ > > if (!glit_parent) return; > > - pdata = elm_genlist_item_data_get(glit_parent); > + pdata = elm_object_item_data_get(glit_parent); > pdata->children = eina_list_remove(pdata->children, d); > elm_genlist_item_update(glit_parent); > } > @@ -258,7 +258,7 @@ > { > Eina_List *l; > Elm_Object_Item *glit = event_info; > - Node_Data *it_data, *d = elm_genlist_item_data_get(glit); > + Node_Data *it_data, *d = elm_object_item_data_get(glit); > Evas_Object *list = elm_genlist_item_genlist_get(glit); > > Elm_Genlist_Item_Class *ic; > > Modified: trunk/elementary/src/lib/elc_fileselector.c > =================================================================== > --- trunk/elementary/src/lib/elc_fileselector.c 2012-01-26 07:21:27 UTC (rev 67545) > +++ trunk/elementary/src/lib/elc_fileselector.c 2012-01-26 07:31:30 UTC (rev 67546) > @@ -327,7 +327,7 @@ > void *event_info) > { > Elm_Object_Item *it = event_info; > - const char *path = elm_genlist_item_data_get(it); > + const char *path = elm_object_item_data_get(it); > _populate(data, path, it); > } > > @@ -426,7 +426,7 @@ > sd = malloc(sizeof(*sd)); > sd->fs = data; > sd->path = wd->mode == ELM_FILESELECTOR_LIST ? > - elm_genlist_item_data_get(event_info) : > + elm_object_item_data_get(event_info) : > elm_gengrid_item_data_get(event_info); > > if (!sd->path) > @@ -620,7 +620,7 @@ > return 1; > } > > - return strcoll(elm_genlist_item_data_get(la), elm_genlist_item_data_get(lb)); > + return strcoll(elm_object_item_data_get(la), elm_object_item_data_get(lb)); > } > > static void > @@ -1156,7 +1156,7 @@ > { > Elm_Object_Item *it; > it = elm_genlist_selected_item_get(wd->files_list); > - if (it) return elm_genlist_item_data_get(it); > + if (it) return elm_object_item_data_get(it); > } > else > { > > Modified: trunk/elementary/src/lib/elm_deprecated.h > =================================================================== > --- trunk/elementary/src/lib/elm_deprecated.h 2012-01-26 07:21:27 UTC (rev 67545) > +++ trunk/elementary/src/lib/elm_deprecated.h 2012-01-26 07:31:30 UTC (rev 67546) > @@ -1740,7 +1740,42 @@ > */ > EAPI Elm_List_Mode elm_genlist_horizontal_get(const Evas_Object *obj); > > +/** > + * Return the data associated to a given genlist item > + * > + * @param it The genlist item. > + * @return the data associated to this item. > + * > + * This returns the @c data value passed on the > + * elm_genlist_item_append() and related item addition calls. > + * > + * @see elm_genlist_item_append() > + * @see elm_genlist_item_data_set() > + * > + * @deprecated Use elm_object_item_data_get() instead > + * @ingroup Genlist > + */ > +EINA_DEPRECATED EAPI void *elm_genlist_item_data_get(const Elm_Object_Item *it); > > +/** > + * Set the data associated to a given genlist item > + * > + * @param it The genlist item > + * @param data The new data pointer to set on it > + * > + * This @b overrides the @c data value passed on the > + * elm_genlist_item_append() and related item addition calls. This > + * function @b won't call elm_genlist_item_update() automatically, > + * so you'd issue it afterwards if you want to hove the item > + * updated to reflect the that new data. > + * > + * @see elm_genlist_item_data_get() > + * > + * @deprecated Use elm_object_item_data_set() instead > + * @ingroup Genlist > + */ > +EINA_DEPRECATED EAPI void elm_genlist_item_data_set(Elm_Object_Item *it, const void *data); > + > #define ELM_IMAGE_ROTATE_90_CW 1 > #define ELM_IMAGE_ROTATE_180_CW 2 > #define ELM_IMAGE_ROTATE_90_CCW 3 > > Modified: trunk/elementary/src/lib/elm_genlist.h > =================================================================== > --- trunk/elementary/src/lib/elm_genlist.h 2012-01-26 07:21:27 UTC (rev 67545) > +++ trunk/elementary/src/lib/elm_genlist.h 2012-01-26 07:31:30 UTC (rev 67546) > @@ -160,7 +160,7 @@ > * There are also convenience functions. elm_genlist_item_genlist_get() will > * return the genlist object the item belongs to. elm_genlist_item_show() > * will make the scroller scroll to show that specific item so its visible. > - * elm_genlist_item_data_get() returns the data pointer set by the item > + * elm_object_item_data_get() returns the data pointer set by the item > * creation functions. > * > * If an item changes (state of boolean changes, text or contents change), > @@ -1386,40 +1386,6 @@ > EAPI void elm_genlist_item_del(Elm_Object_Item *it); > > /** > - * Return the data associated to a given genlist item > - * > - * @param it The genlist item. > - * @return the data associated to this item. > - * > - * This returns the @c data value passed on the > - * elm_genlist_item_append() and related item addition calls. > - * > - * @see elm_genlist_item_append() > - * @see elm_genlist_item_data_set() > - * > - * @ingroup Genlist > - */ > -EAPI void *elm_genlist_item_data_get(const Elm_Object_Item *it); > - > -/** > - * Set the data associated to a given genlist item > - * > - * @param it The genlist item > - * @param data The new data pointer to set on it > - * > - * This @b overrides the @c data value passed on the > - * elm_genlist_item_append() and related item addition calls. This > - * function @b won't call elm_genlist_item_update() automatically, > - * so you'd issue it afterwards if you want to hove the item > - * updated to reflect the that new data. > - * > - * @see elm_genlist_item_data_get() > - * > - * @ingroup Genlist > - */ > -EAPI void elm_genlist_item_data_set(Elm_Object_Item *it, const void *data); > - > -/** > * Tells genlist to "orphan" contents fetchs by the item class > * > * @param it The item > @@ -1449,7 +1415,7 @@ > * lower level callbacks for events on that object. Do not delete > * this object under any circumstances. > * > - * @see elm_genlist_item_data_get() > + * @see elm_object_item_data_get() > * > * @ingroup Genlist > */ > > Modified: trunk/elementary/src/lib/elm_store.c > =================================================================== > --- trunk/elementary/src/lib/elm_store.c 2012-01-26 07:21:27 UTC (rev 67545) > +++ trunk/elementary/src/lib/elm_store.c 2012-01-26 07:31:30 UTC (rev 67546) > @@ -227,7 +227,7 @@ > { > Elm_Store *st = data; > Elm_Object_Item *gli = event_info; > - Elm_Store_Item *sti = elm_genlist_item_data_get(gli); > + Elm_Store_Item *sti = elm_object_item_data_get(gli); > if (!sti) return; > st->realized_count++; > sti->live = EINA_TRUE; > @@ -240,7 +240,7 @@ > { > Elm_Store *st = data; > Elm_Object_Item *gli = event_info; > - Elm_Store_Item *sti = elm_genlist_item_data_get(gli); > + Elm_Store_Item *sti = elm_object_item_data_get(gli); > if (!sti) return; > st->realized_count--; > sti->live = EINA_FALSE; > > > ------------------------------------------------------------------------------ > Keep Your Developer Skills Current with LearnDevNow! > The most comprehensive online learning library for Microsoft developers > is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, > Metro Style Apps, more. Free future releases when you subscribe now! > http://p.sf.net/sfu/learndevnow-d2d > _______________________________________________ > enlightenment-svn mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > -- Gustavo Sverzut Barbieri http://profusion.mobi embedded systems -------------------------------------- MSN: [email protected] Skype: gsbarbieri Mobile: +55 (19) 9225-2202 ------------------------------------------------------------------------------ Keep Your Developer Skills Current with LearnDevNow! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-d2d _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
