Enlightenment CVS committal
Author : cedric
Project : e17
Module : proto/eina
Dir : e17/proto/eina/src/include
Modified Files:
eina_private.h eina_iterator.h eina_accessor.h
Log Message:
Easier API and follow gustavo's remark.
===================================================================
RCS file: /cvs/e/e17/proto/eina/src/include/eina_private.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- eina_private.h 11 Aug 2008 16:30:16 -0000 1.8
+++ eina_private.h 11 Aug 2008 17:22:36 -0000 1.9
@@ -115,30 +115,25 @@
} Eina_Mempool_Backend;
/* Iterator/accessor private type */
-typedef Eina_Bool (*Eina_Iterator_Next_Callback)(Eina_Iterator *it);
-typedef void *(*Eina_Iterator_Get_Content_Callback)(Eina_Iterator *it);
+typedef Eina_Bool (*Eina_Iterator_Next_Callback)(Eina_Iterator *it, void
**data);
typedef void *(*Eina_Iterator_Get_Container_Callback)(Eina_Iterator *it);
typedef void (*Eina_Iterator_Free_Callback)(Eina_Iterator *it);
#define FUNC_ITERATOR_NEXT(Function) ((Eina_Iterator_Next_Callback)Function)
-#define FUNC_ITERATOR_GET_CONTENT(Function)
((Eina_Iterator_Get_Content_Callback)Function)
#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);
-typedef void *(*Eina_Accessor_Get_Content_Callback)(Eina_Accessor *it);
+typedef Eina_Bool (*Eina_Accessor_Jump_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_CONTENT(Function)
((Eina_Accessor_Get_Content_Callback)Function)
#define FUNC_ACCESSOR_GET_CONTAINER(Function)
((Eina_Accessor_Get_Container_Callback)Function)
#define FUNC_ACCESSOR_FREE(Function) ((Eina_Accessor_Free_Callback)Function)
struct _Eina_Iterator
{
Eina_Iterator_Next_Callback next;
- Eina_Iterator_Get_Content_Callback get_content;
Eina_Iterator_Get_Container_Callback get_container;
Eina_Iterator_Free_Callback free;
};
@@ -146,9 +141,9 @@
struct _Eina_Accessor
{
Eina_Accessor_Jump_At_Callback jump_at;
- Eina_Accessor_Get_Content_Callback get_content;
Eina_Accessor_Get_Container_Callback get_container;
Eina_Accessor_Free_Callback free;
};
#endif /* EINA_PRIVATE_H_ */
+
===================================================================
RCS file: /cvs/e/e17/proto/eina/src/include/eina_iterator.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- eina_iterator.h 11 Aug 2008 16:30:16 -0000 1.1
+++ eina_iterator.h 11 Aug 2008 17:22:36 -0000 1.2
@@ -26,10 +26,8 @@
EAPI void eina_iterator_free (Eina_Iterator *iterator);
-EAPI void *eina_iterator_data_get (Eina_Iterator *iterator);
EAPI void *eina_iterator_container_get (Eina_Iterator *iterator);
-
-EAPI Eina_Error eina_iterator_next (Eina_Iterator *iterator);
+EAPI Eina_Bool eina_iterator_next (Eina_Iterator *iterator, void **data);
EAPI void eina_iterator_foreach (Eina_Iterator *iterator,
Eina_Each callback,
===================================================================
RCS file: /cvs/e/e17/proto/eina/src/include/eina_accessor.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- eina_accessor.h 11 Aug 2008 16:30:15 -0000 1.1
+++ eina_accessor.h 11 Aug 2008 17:22:36 -0000 1.2
@@ -26,7 +26,7 @@
EAPI void eina_accessor_free (Eina_Accessor *accessor);
-EAPI void *eina_accessor_data_get (Eina_Accessor *accessor, unsigned int
position);
+EAPI Eina_Bool eina_accessor_data_get (Eina_Accessor *accessor, unsigned int
position, void **data);
EAPI void *eina_accessor_container_get (Eina_Accessor *accessor);
EAPI void eina_accessor_over (Eina_Accessor *accessor,
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
