forked from enlightenment/efl
Change function name to match its new behaviour. jumpt_at -> get_at.
SVN revision: 35444
This commit is contained in:
parent
fbb333c916
commit
9c1d8d3d95
|
@ -123,11 +123,11 @@ typedef void (*Eina_Iterator_Free_Callback)(Eina_Iterator *it);
|
|||
#define FUNC_ITERATOR_GET_CONTAINER(Function) ((Eina_Iterator_Get_Container_Callback)Function)
|
||||
#define FUNC_ITERATOR_FREE(Function) ((Eina_Iterator_Free_Callback)Function)
|
||||
|
||||
typedef Eina_Bool (*Eina_Accessor_Jump_At_Callback)(Eina_Accessor *it, unsigned int index, void **data);
|
||||
typedef Eina_Bool (*Eina_Accessor_Get_At_Callback)(Eina_Accessor *it, unsigned int index, void **data);
|
||||
typedef void *(*Eina_Accessor_Get_Container_Callback)(Eina_Accessor *it);
|
||||
typedef void (*Eina_Accessor_Free_Callback)(Eina_Accessor *it);
|
||||
|
||||
#define FUNC_ACCESSOR_JUMP_AT(Function) ((Eina_Accessor_Jump_At_Callback)Function)
|
||||
#define FUNC_ACCESSOR_GET_AT(Function) ((Eina_Accessor_Get_At_Callback)Function)
|
||||
#define FUNC_ACCESSOR_GET_CONTAINER(Function) ((Eina_Accessor_Get_Container_Callback)Function)
|
||||
#define FUNC_ACCESSOR_FREE(Function) ((Eina_Accessor_Free_Callback)Function)
|
||||
|
||||
|
@ -140,7 +140,7 @@ struct _Eina_Iterator
|
|||
|
||||
struct _Eina_Accessor
|
||||
{
|
||||
Eina_Accessor_Jump_At_Callback jump_at;
|
||||
Eina_Accessor_Get_At_Callback get_at;
|
||||
Eina_Accessor_Get_Container_Callback get_container;
|
||||
Eina_Accessor_Free_Callback free;
|
||||
};
|
||||
|
|
|
@ -36,7 +36,7 @@ EAPI Eina_Bool
|
|||
eina_accessor_data_get(Eina_Accessor *accessor, unsigned int position, void **data)
|
||||
{
|
||||
if (!accessor) return EINA_FALSE;
|
||||
return accessor->jump_at(accessor, position, data);
|
||||
return accessor->get_at(accessor, position, data);
|
||||
}
|
||||
|
||||
EAPI void *
|
||||
|
@ -60,7 +60,7 @@ eina_accessor_over(Eina_Accessor *accessor,
|
|||
if (!accessor) return ;
|
||||
if (!(start < end)) return ;
|
||||
|
||||
for (i = start; i < end && accessor->jump_at(accessor, i, &data) == EINA_TRUE; ++i)
|
||||
for (i = start; i < end && accessor->get_at(accessor, i, &data) == EINA_TRUE; ++i)
|
||||
if (cb(container, data, (void*) fdata) != EINA_TRUE) return ;
|
||||
}
|
||||
|
||||
|
|
|
@ -237,7 +237,7 @@ struct _Eina_Accessor_Array
|
|||
};
|
||||
|
||||
static Eina_Bool
|
||||
eina_array_accessor_jump_at(Eina_Accessor_Array *it, unsigned int index, void **data)
|
||||
eina_array_accessor_get_at(Eina_Accessor_Array *it, unsigned int index, void **data)
|
||||
{
|
||||
if (!(index < eina_array_count(it->array)))
|
||||
return EINA_FALSE;
|
||||
|
@ -274,7 +274,7 @@ eina_array_accessor_new(const Eina_Array *array)
|
|||
|
||||
it->array = array;
|
||||
|
||||
it->accessor.jump_at = FUNC_ACCESSOR_JUMP_AT(eina_array_accessor_jump_at);
|
||||
it->accessor.get_at = FUNC_ACCESSOR_GET_AT(eina_array_accessor_get_at);
|
||||
it->accessor.get_container = FUNC_ACCESSOR_GET_CONTAINER(eina_array_accessor_get_container);
|
||||
it->accessor.free = FUNC_ACCESSOR_FREE(eina_array_accessor_free);
|
||||
|
||||
|
|
Loading…
Reference in New Issue