From 8d2bf6ad14ffff398d0ab4c9558bc6b208f0b322 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 23 Oct 2008 12:03:35 +0100 Subject: trivial: egg updates --- libdevkit-power/egg-obj-list.h | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'libdevkit-power/egg-obj-list.h') diff --git a/libdevkit-power/egg-obj-list.h b/libdevkit-power/egg-obj-list.h index 79e9b76..5237df7 100644 --- a/libdevkit-power/egg-obj-list.h +++ b/libdevkit-power/egg-obj-list.h @@ -48,10 +48,12 @@ typedef struct } EggObjListClass; typedef gpointer (*EggObjListNewFunc) (void); -typedef gpointer (*EggObjListCopyFunc) (const gpointer data); +typedef gpointer (*EggObjListCopyFunc) (gconstpointer data); typedef void (*EggObjListFreeFunc) (gpointer data); +typedef gint (*EggObjListCompareFunc) (gconstpointer data1, + gconstpointer data2); typedef gpointer (*EggObjListFromStringFunc) (const gchar *data); -typedef gchar *(*EggObjListToStringFunc) (gpointer data); +typedef gchar *(*EggObjListToStringFunc) (gconstpointer data); GType egg_obj_list_get_type (void) G_GNUC_CONST; EggObjList *egg_obj_list_new (void); @@ -62,23 +64,32 @@ void egg_obj_list_set_copy (EggObjList *list, EggObjListCopyFunc func); void egg_obj_list_set_free (EggObjList *list, EggObjListFreeFunc func); +void egg_obj_list_set_compare (EggObjList *list, + EggObjListCompareFunc func); void egg_obj_list_set_to_string (EggObjList *list, EggObjListToStringFunc func); void egg_obj_list_set_from_string (EggObjList *list, EggObjListFromStringFunc func); void egg_obj_list_clear (EggObjList *list); void egg_obj_list_print (EggObjList *list); +gchar *egg_obj_list_to_string (EggObjList *list) + G_GNUC_WARN_UNUSED_RESULT; gboolean egg_obj_list_to_file (EggObjList *list, const gchar *filename); gboolean egg_obj_list_from_file (EggObjList *list, const gchar *filename); void egg_obj_list_add (EggObjList *list, - const gpointer data); + gconstpointer data); +void egg_obj_list_add_list (EggObjList *list, + const EggObjList *data); +void egg_obj_list_remove_list (EggObjList *list, + const EggObjList *data); +void egg_obj_list_remove_duplicate (EggObjList *list); gboolean egg_obj_list_remove (EggObjList *list, - const gpointer data); + gconstpointer data); gboolean egg_obj_list_remove_index (EggObjList *list, guint index); -const gpointer egg_obj_list_index (const EggObjList *list, +gconstpointer egg_obj_list_index (const EggObjList *list, guint index); G_END_DECLS -- cgit v1.2.1