From 4f74bf09a94e4f503c38e56ad1a5aba507e05d9e Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Fri, 2 Jul 2004 16:03:56 +0000 Subject: [ fixes #60691 ] 2004-07-02 Chris Toshok [ fixes #60691 ] * e-iterator.h: rename the "delete" member to "remove", to fix c++ build. * e-iterator.c (e_iterator_delete): same. (e_iterator_class_init): same. * e-list-iterator.c (e_list_iterator_class_init): same. (e_list_iterator_remove): same. svn path=/trunk/; revision=26563 --- e-util/e-list-iterator.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'e-util/e-list-iterator.c') diff --git a/e-util/e-list-iterator.c b/e-util/e-list-iterator.c index e801c22ef8..2f7e2aa953 100644 --- a/e-util/e-list-iterator.c +++ b/e-util/e-list-iterator.c @@ -20,7 +20,7 @@ static void e_list_iterator_invalidate (EIterator *iterator); static gboolean e_list_iterator_is_valid (EIterator *iterator); static void e_list_iterator_set (EIterator *iterator, const void *object); -static void e_list_iterator_delete (EIterator *iterator); +static void e_list_iterator_remove (EIterator *iterator); static void e_list_iterator_insert (EIterator *iterator, const void *object, gboolean before); @@ -87,7 +87,7 @@ e_list_iterator_class_init (EListIteratorClass *klass) iterator_class->last = e_list_iterator_last; iterator_class->next = e_list_iterator_next; iterator_class->prev = e_list_iterator_prev; - iterator_class->delete = e_list_iterator_delete; + iterator_class->remove = e_list_iterator_remove; iterator_class->insert = e_list_iterator_insert; iterator_class->set = e_list_iterator_set; iterator_class->is_valid = e_list_iterator_is_valid; @@ -211,7 +211,7 @@ e_list_iterator_insert (EIterator *_iterator, } static void -e_list_iterator_delete (EIterator *_iterator) +e_list_iterator_remove (EIterator *_iterator) { EListIterator *iterator = E_LIST_ITERATOR(_iterator); if (iterator->iterator) { -- cgit v1.2.3