[evolution-data-server] Camel: Avoid C++ keywords in header files.

[Matthew Barnes <mbarnes src gnome org>]

commit 5f0ac3d26ec6fa5e0d3d94b53b10c1ed1a29b813
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Jun 3 22:25:07 2012 -0400

    Camel: Avoid C++ keywords in header files.

 camel/camel-folder-search.c                |    8 ++++----
 camel/camel-folder-search.h                |    6 +++---
 camel/camel-folder.c                       |    6 +++---
 camel/camel-folder.h                       |    2 +-
 camel/camel-index.c                        |    4 ++--
 camel/camel-index.h                        |    2 +-
 camel/camel-store.h                        |    2 +-
 camel/camel-text-index.c                   |    2 +-
 camel/camel-text-index.h                   |    2 +-
 camel/camel-vee-folder.c                   |    4 ++--
 camel/providers/local/camel-local-folder.c |    4 ++--
 11 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index 876ba9b..6b5bf7d 100644
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -136,7 +136,7 @@ camel_folder_search_class_init (CamelFolderSearchClass *class)
 	object_class->dispose = folder_search_dispose;
 	object_class->finalize = folder_search_finalize;
 
-	class->not = search_not;
+	class->not_ = search_not;
 	class->match_all = search_match_all;
 	class->match_threads = search_match_threads;
 	class->body_contains = search_body_contains;
@@ -174,10 +174,10 @@ static struct {
 	gint flags;		/* 0x02 = immediate, 0x01 = always enter */
 } builtins[] = {
 	/* these have default implementations in e-sexp */
-	{ "and", G_STRUCT_OFFSET(CamelFolderSearchClass, and), 2 },
-	{ "or", G_STRUCT_OFFSET(CamelFolderSearchClass, or), 2 },
+	{ "and", G_STRUCT_OFFSET(CamelFolderSearchClass, and_), 2 },
+	{ "or", G_STRUCT_OFFSET(CamelFolderSearchClass, or_), 2 },
 	/* we need to override this one though to implement an 'array not' */
-	{ "not", G_STRUCT_OFFSET(CamelFolderSearchClass, not), 0 },
+	{ "not", G_STRUCT_OFFSET(CamelFolderSearchClass, not_), 0 },
 	{ "<", G_STRUCT_OFFSET(CamelFolderSearchClass, lt), 2 },
 	{ ">", G_STRUCT_OFFSET(CamelFolderSearchClass, gt), 2 },
 	{ "=", G_STRUCT_OFFSET(CamelFolderSearchClass, eq), 2 },
diff --git a/camel/camel-folder-search.h b/camel/camel-folder-search.h
index 58f5ac1..55d0822 100644
--- a/camel/camel-folder-search.h
+++ b/camel/camel-folder-search.h
@@ -75,9 +75,9 @@ struct _CamelFolderSearchClass {
 	CamelObjectClass parent_class;
 
 	/* general bool/comparison options, usually these wont need to be set, unless it is compiling into another language */
-	CamelSExpResult * (*and)(CamelSExp *f, gint argc, CamelSExpTerm **argv, CamelFolderSearch *s);
-	CamelSExpResult * (*or)(CamelSExp *f, gint argc, CamelSExpTerm **argv, CamelFolderSearch *s);
-	CamelSExpResult * (*not)(CamelSExp *f, gint argc, CamelSExpResult **argv, CamelFolderSearch *s);
+	CamelSExpResult * (*and_)(CamelSExp *f, gint argc, CamelSExpTerm **argv, CamelFolderSearch *s);
+	CamelSExpResult * (*or_)(CamelSExp *f, gint argc, CamelSExpTerm **argv, CamelFolderSearch *s);
+	CamelSExpResult * (*not_)(CamelSExp *f, gint argc, CamelSExpResult **argv, CamelFolderSearch *s);
 	CamelSExpResult * (*lt)(CamelSExp *f, gint argc, CamelSExpTerm **argv, CamelFolderSearch *s);
 	CamelSExpResult * (*gt)(CamelSExp *f, gint argc, CamelSExpTerm **argv, CamelFolderSearch *s);
 	CamelSExpResult * (*eq)(CamelSExp *f, gint argc, CamelSExpTerm **argv, CamelFolderSearch *s);
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index a1c5525..f5893d2 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -1767,7 +1767,7 @@ camel_folder_class_init (CamelFolderClass *class)
 	class->get_message_info = folder_get_message_info;
 	class->ref_message_info = folder_ref_message_info;
 	class->free_message_info = folder_free_message_info;
-	class->delete = folder_delete;
+	class->delete_ = folder_delete;
 	class->rename = folder_rename;
 	class->freeze = folder_freeze;
 	class->thaw = folder_thaw;
@@ -2787,7 +2787,7 @@ camel_folder_delete (CamelFolder *folder)
 	g_return_if_fail (CAMEL_IS_FOLDER (folder));
 
 	class = CAMEL_FOLDER_GET_CLASS (folder);
-	g_return_if_fail (class->delete != NULL);
+	g_return_if_fail (class->delete_ != NULL);
 
 	camel_folder_lock (folder, CAMEL_FOLDER_REC_LOCK);
 	if (folder->folder_flags & CAMEL_FOLDER_HAS_BEEN_DELETED) {
@@ -2797,7 +2797,7 @@ camel_folder_delete (CamelFolder *folder)
 
 	folder->folder_flags |= CAMEL_FOLDER_HAS_BEEN_DELETED;
 
-	class->delete (folder);
+	class->delete_ (folder);
 
 	camel_folder_unlock (folder, CAMEL_FOLDER_REC_LOCK);
 
diff --git a/camel/camel-folder.h b/camel/camel-folder.h
index c029c41..d4d6e04 100644
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.h
@@ -201,7 +201,7 @@ struct _CamelFolderClass {
 						 CamelMessageInfo *info);
 	void		(*free_message_info)	(CamelFolder *folder,
 						 CamelMessageInfo *info);
-	void		(*delete)		(CamelFolder *folder);
+	void		(*delete_)		(CamelFolder *folder);
 	void		(*rename)		(CamelFolder *folder,
 						 const gchar *newname);
 	void		(*freeze)		(CamelFolder *folder);
diff --git a/camel/camel-index.c b/camel/camel-index.c
index 28e157f..14a5f67 100644
--- a/camel/camel-index.c
+++ b/camel/camel-index.c
@@ -187,10 +187,10 @@ camel_index_delete (CamelIndex *idx)
 	g_return_val_if_fail (CAMEL_IS_INDEX (idx), -1);
 
 	class = CAMEL_INDEX_GET_CLASS (idx);
-	g_return_val_if_fail (class->delete != NULL, -1);
+	g_return_val_if_fail (class->delete_ != NULL, -1);
 
 	if ((idx->state & CAMEL_INDEX_DELETED) == 0) {
-		ret = class->delete (idx);
+		ret = class->delete_ (idx);
 		idx->state |= CAMEL_INDEX_DELETED;
 	} else {
 		errno = ENOENT;
diff --git a/camel/camel-index.h b/camel/camel-index.h
index d2bf71b..a62e9c9 100644
--- a/camel/camel-index.h
+++ b/camel/camel-index.h
@@ -170,7 +170,7 @@ struct _CamelIndexClass {
 
 	gint		(*sync)			(CamelIndex *index);
 	gint		(*compress)		(CamelIndex *index);
-	gint		(*delete)		(CamelIndex *index);
+	gint		(*delete_)		(CamelIndex *index);
 	gint		(*rename)		(CamelIndex *index,
 						 const gchar *path);
 	gint		(*has_name)		(CamelIndex *index,
diff --git a/camel/camel-store.h b/camel/camel-store.h
index 76a93fc..9263289 100644
--- a/camel/camel-store.h
+++ b/camel/camel-store.h
@@ -332,7 +332,7 @@ void		camel_folder_info_free		(CamelFolderInfo *fi);
 #ifndef CAMEL_DISABLE_DEPRECATED
 CamelFolderInfo *
 		camel_folder_info_build		(GPtrArray *folders,
-						 const gchar *namespace,
+						 const gchar *namespace_,
 						 gchar separator,
 						 gboolean short_names);
 #endif /* CAMEL_DISABLE_DEPRECATED */
diff --git a/camel/camel-text-index.c b/camel/camel-text-index.c
index 906f4ca..a4719dc 100644
--- a/camel/camel-text-index.c
+++ b/camel/camel-text-index.c
@@ -831,7 +831,7 @@ camel_text_index_class_init (CamelTextIndexClass *class)
 	index_class = CAMEL_INDEX_CLASS (class);
 	index_class->sync = text_index_sync;
 	index_class->compress = text_index_compress;
-	index_class->delete = text_index_delete;
+	index_class->delete_ = text_index_delete;
 	index_class->rename = text_index_rename;
 	index_class->has_name = text_index_has_name;
 	index_class->add_name = text_index_add_name;
diff --git a/camel/camel-text-index.h b/camel/camel-text-index.h
index d981f59..74d21a0 100644
--- a/camel/camel-text-index.h
+++ b/camel/camel-text-index.h
@@ -179,7 +179,7 @@ CamelTextIndex *camel_text_index_new		(const gchar *path,
 /* static utility functions */
 gint		camel_text_index_check		(const gchar *path);
 gint		camel_text_index_rename		(const gchar *old,
-						 const gchar *new);
+						 const gchar *new_);
 gint		camel_text_index_remove		(const gchar *old);
 
 void		camel_text_index_dump		(CamelTextIndex *idx);
diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index 68079a4..7924451 100644
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -790,7 +790,7 @@ vee_folder_delete (CamelFolder *folder)
 	}
 	camel_vee_folder_unlock (vfolder, CAMEL_VEE_FOLDER_SUBFOLDER_LOCK);
 
-	((CamelFolderClass *) camel_vee_folder_parent_class)->delete (folder);
+	((CamelFolderClass *) camel_vee_folder_parent_class)->delete_ (folder);
 }
 
 static void
@@ -1128,7 +1128,7 @@ camel_vee_folder_class_init (CamelVeeFolderClass *class)
 	folder_class->search_by_uids = vee_folder_search_by_uids;
 	folder_class->count_by_expression = vee_folder_count_by_expression;
 	folder_class->search_free = vee_folder_search_free;
-	folder_class->delete = vee_folder_delete;
+	folder_class->delete_ = vee_folder_delete;
 	folder_class->freeze = vee_folder_freeze;
 	folder_class->thaw = vee_folder_thaw;
 	folder_class->append_message_sync = vee_folder_append_message_sync;
diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c
index 8ebef32..71f957a 100644
--- a/camel/providers/local/camel-local-folder.c
+++ b/camel/providers/local/camel-local-folder.c
@@ -304,7 +304,7 @@ local_folder_delete (CamelFolder *folder)
 	if (lf->index)
 		camel_index_delete (lf->index);
 
-	CAMEL_FOLDER_CLASS (camel_local_folder_parent_class)->delete (folder);
+	CAMEL_FOLDER_CLASS (camel_local_folder_parent_class)->delete_ (folder);
 }
 
 static void
@@ -475,7 +475,7 @@ camel_local_folder_class_init (CamelLocalFolderClass *class)
 	folder_class->search_by_expression = local_folder_search_by_expression;
 	folder_class->search_by_uids = local_folder_search_by_uids;
 	folder_class->search_free = local_folder_search_free;
-	folder_class->delete = local_folder_delete;
+	folder_class->delete_ = local_folder_delete;
 	folder_class->rename = local_folder_rename;
 	folder_class->count_by_expression = local_folder_count_by_expression;
 	folder_class->get_uncached_uids = local_folder_get_uncached_uids;