Add c++ armoring.

2002-03-01  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-vtrash-folder.h:
	* camel-vee-store.h:
	* camel-vee-folder.h:
	* camel-stream-null.h:
	* camel-stream-filter.h:
	* camel-store-summary.h:
	* camel-news-address.h:
	* camel-mime-utils.h:
	* camel-mime-parser.h:
	* camel-mime-filter-save.h:
	* camel-mime-filter-linewrap.h:
	* camel-mime-filter-index.h:
	* camel-mime-filter-html.h:
	* camel-mime-filter.h:
	* camel-mime-filter-from.h:
	* camel-mime-filter-crlf.h:
	* camel-mime-filter-chomp.h:
	* camel-mime-filter-charset.h:
	* camel-mime-filter-bestenc.h:
	* camel-mime-filter-basic.h:
	* camel-internet-address.h:
	* camel-folder-thread.h:
	* camel-folder-summary.h:
	* camel-folder-search.h:
	* camel-filter-driver.h:
	* camel-charset-map.h:
	* camel-address.h: Add c++ armoring.

	* camel-object.h: s/class/klass

svn path=/trunk/; revision=15885

1 files changed, 15 insertions, 16 deletions

diff --git a/camel/camel-object.h b/camel/camel-object.h
index 63f3520809..27e30a7728 100644
--- a/camel/camel-object.h
+++ b/camel/camel-object.h
@@ -38,14 +38,14 @@ extern "C" {
 
 #ifdef G_DISABLE_CHECKS
 #define CAMEL_CHECK_CAST( obj, ctype, ptype )         ((ptype *) obj)
-#define CAMEL_CHECK_CLASS_CAST( class, ctype, ptype ) ((ptype *) class)
+#define CAMEL_CHECK_CLASS_CAST( klass, ctype, ptype ) ((ptype *) klass)
 #define CAMEL_CHECK_TYPE( obj, ctype )                (TRUE)
-#define CAMEL_CHECK_CLASS_TYPE( class, ctype )        (TRUE)
+#define CAMEL_CHECK_CLASS_TYPE( klass, ctype )        (TRUE)
 #else
 #define CAMEL_CHECK_CAST( obj, ctype, ptype )         ((ptype *) camel_object_check_cast( (CamelObject *)(obj), (CamelType)(ctype) ))
-#define CAMEL_CHECK_CLASS_CAST( class, ctype, ptype ) ((ptype *) camel_object_class_check_cast( (CamelObjectClass *)(class), (CamelType)(ctype) ))
+#define CAMEL_CHECK_CLASS_CAST( klass, ctype, ptype ) ((ptype *) camel_object_class_check_cast( (CamelObjectClass *)(klass), (CamelType)(ctype) ))
 #define CAMEL_CHECK_TYPE( obj, ctype )                (camel_object_is_of_type( (CamelObject *)(obj), (CamelType)(ctype) ))
-#define CAMEL_CHECK_CLASS_TYPE( class, ctype )        (camel_object_class_is_of_type( (CamelObjectClass *)(class), (CamelType)(ctype) ))
+#define CAMEL_CHECK_CLASS_TYPE( klass, ctype )        (camel_object_class_is_of_type( (CamelObjectClass *)(klass), (CamelType)(ctype) ))
 #endif
 
 #define CAMEL_INVALID_TYPE ((CamelType)0)
@@ -124,26 +124,25 @@ void camel_object_unref (CamelObject *obj);
 #define camel_object_unref(o) (printf("%s (%s:%d):unref (%p)\n", __FUNCTION__, __FILE__, __LINE__, o), camel_object_unref (o))
 #endif
 
-CamelObject *camel_object_check_cast (CamelObject * obj,
+CamelObject *camel_object_check_cast (CamelObject *obj,
 				      CamelType ctype);
-CamelObjectClass *camel_object_class_check_cast (CamelObjectClass *
-						 class,
+CamelObjectClass *camel_object_class_check_cast (CamelObjectClass *klass,
 						 CamelType ctype);
-gboolean camel_object_is_of_type (CamelObject * obj, CamelType ctype);
-gboolean camel_object_class_is_of_type (CamelObjectClass * class,
+gboolean camel_object_is_of_type (CamelObject *obj, CamelType ctype);
+gboolean camel_object_class_is_of_type (CamelObjectClass *klass,
 					CamelType ctype);
-gchar *camel_object_describe (CamelObject * obj);
-void camel_object_class_declare_event (CamelObjectClass * class,
-				       const gchar * name,
+gchar *camel_object_describe (CamelObject *obj);
+void camel_object_class_declare_event (CamelObjectClass *klass,
+				       const char *name,
 				       CamelObjectEventPrepFunc prep);
-void camel_object_hook_event (CamelObject * obj, const gchar * name,
+void camel_object_hook_event (CamelObject *obj, const char * name,
 			      CamelObjectEventHookFunc hook,
 			      gpointer user_data);
-void camel_object_unhook_event (CamelObject * obj, const gchar * name,
+void camel_object_unhook_event (CamelObject *obj, const char * name,
 				CamelObjectEventHookFunc hook,
 				gpointer user_data);
-void camel_object_trigger_event (CamelObject * obj,
-				 const gchar * name,
+void camel_object_trigger_event (CamelObject *obj,
+				 const char *name,
 				 gpointer event_data);
 
 #ifdef __cplusplus