aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
Diffstat (limited to 'e-util')
-rw-r--r--e-util/ChangeLog13
-rw-r--r--e-util/e-iterator.c6
-rw-r--r--e-util/e-iterator.h2
-rw-r--r--e-util/e-list-iterator.c6
4 files changed, 20 insertions, 7 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index c79a9f5294..2e8cc8b4d4 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,16 @@
+2004-07-02 Chris Toshok <toshok@ximian.com>
+
+ [ 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.
+
2004-06-03 Dan Winship <danw@novell.com>
* e-icon-factory.c (load_icon): If the icon_name is an abolute
diff --git a/e-util/e-iterator.c b/e-util/e-iterator.c
index d3575a0645..aa7a338eff 100644
--- a/e-util/e-iterator.c
+++ b/e-util/e-iterator.c
@@ -83,7 +83,7 @@ e_iterator_class_init (EIteratorClass *klass)
klass->last = NULL;
klass->next = NULL;
klass->prev = NULL;
- klass->delete = NULL;
+ klass->remove = NULL;
klass->insert = NULL;
klass->set = NULL;
klass->is_valid = NULL;
@@ -144,8 +144,8 @@ e_iterator_prev (EIterator *iterator)
void
e_iterator_delete (EIterator *iterator)
{
- if (E_ITERATOR_GET_CLASS(iterator)->delete)
- E_ITERATOR_GET_CLASS(iterator)->delete(iterator);
+ if (E_ITERATOR_GET_CLASS(iterator)->remove)
+ E_ITERATOR_GET_CLASS(iterator)->remove(iterator);
}
void e_iterator_insert (EIterator *iterator,
diff --git a/e-util/e-iterator.h b/e-util/e-iterator.h
index 9dae97cc3a..da25bd8ab6 100644
--- a/e-util/e-iterator.h
+++ b/e-util/e-iterator.h
@@ -41,7 +41,7 @@ struct _EIteratorClass {
void (*last) (EIterator *iterator);
gboolean (*next) (EIterator *iterator);
gboolean (*prev) (EIterator *iterator);
- void (*delete) (EIterator *iterator);
+ void (*remove) (EIterator *iterator);
void (*insert) (EIterator *iterator,
const void *object,
gboolean before);
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) {