From 67159043da2de9df576f6a4eaa245e0c3926f004 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 18 Jun 2009 12:56:51 -0400 Subject: Use G_BEGIN_DECLS / G_END_DECLS macros. --- e-util/e-bconf-map.h | 9 ++------- e-util/e-bit-array.h | 8 ++------ e-util/e-config.h | 9 ++------- e-util/e-event.h | 9 ++------- e-util/e-import.h | 9 ++------- e-util/e-menu.h | 9 ++------- e-util/e-popup.h | 9 ++------- e-util/e-profile-event.h | 9 ++------- e-util/e-signature.h | 9 ++------- e-util/e-sorter.h | 8 ++------ e-util/e-text-event-processor-emacs-like.h | 9 ++------- e-util/e-text-event-processor.h | 9 ++------- 12 files changed, 24 insertions(+), 82 deletions(-) (limited to 'e-util') diff --git a/e-util/e-bconf-map.h b/e-util/e-bconf-map.h index 57ba17e169..4e72f5ebb3 100644 --- a/e-util/e-bconf-map.h +++ b/e-util/e-bconf-map.h @@ -28,10 +28,7 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS enum { E_BCONF_MAP_END = 0, /* end of table */ @@ -95,8 +92,6 @@ typedef struct { gint e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t *remap_list); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_BCONF_MAP_H__ */ diff --git a/e-util/e-bit-array.h b/e-util/e-bit-array.h index a9bf113d5f..6f021c51b1 100644 --- a/e-util/e-bit-array.h +++ b/e-util/e-bit-array.h @@ -26,9 +26,7 @@ #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define E_BIT_ARRAY_TYPE (e_bit_array_get_type ()) #define E_BIT_ARRAY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_BIT_ARRAY_TYPE, EBitArray)) @@ -95,9 +93,7 @@ void e_bit_array_move_row (EBitArray *esm, gboolean e_bit_array_cross_and (EBitArray *esm); gboolean e_bit_array_cross_or (EBitArray *esm); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_BIT_ARRAY_H_ */ diff --git a/e-util/e-config.h b/e-util/e-config.h index 55bd6abc8b..2f2e4a2a3b 100644 --- a/e-util/e-config.h +++ b/e-util/e-config.h @@ -27,10 +27,7 @@ #include #include "libedataserver/e-msgport.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS struct _GtkWindow; struct _GtkWidget; @@ -386,8 +383,6 @@ GType e_config_hook_get_type(void); /* for implementors */ void e_config_hook_class_add_target_map(EConfigHookClass *klass, const EConfigHookTargetMap *); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_CONFIG_H__ */ diff --git a/e-util/e-event.h b/e-util/e-event.h index 3ea5c8202b..6f561a007c 100644 --- a/e-util/e-event.h +++ b/e-util/e-event.h @@ -30,10 +30,7 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS /* This is an abstract event management class. */ @@ -231,8 +228,6 @@ GType e_event_hook_get_type(void); /* for implementors */ void e_event_hook_class_add_target_map(EEventHookClass *klass, const EEventHookTargetMap *); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_EVENT_H__ */ diff --git a/e-util/e-import.h b/e-util/e-import.h index 5e95d6ae6b..4474db18da 100644 --- a/e-util/e-import.h +++ b/e-util/e-import.h @@ -27,10 +27,7 @@ #include #include "libedataserver/e-msgport.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS struct _GtkWindow; struct _GtkWidget; @@ -265,8 +262,6 @@ GType e_import_hook_get_type(void); void e_import_hook_class_add_target_map(EImportHookClass *klass, const EImportHookTargetMap *); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_IMPORT_H__ */ diff --git a/e-util/e-menu.h b/e-util/e-menu.h index d0a8e9939d..7b8d6f5ce3 100644 --- a/e-util/e-menu.h +++ b/e-util/e-menu.h @@ -27,10 +27,7 @@ #include #include "libedataserver/e-msgport.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS /* This is an abstract popup menu management/merging class. @@ -317,8 +314,6 @@ GType e_menu_hook_get_type(void); /* for implementors */ void e_menu_hook_class_add_target_map(EMenuHookClass *klass, const EMenuHookTargetMap *); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_MENU_H__ */ diff --git a/e-util/e-popup.h b/e-util/e-popup.h index 8779ce8dd9..6ca872b186 100644 --- a/e-util/e-popup.h +++ b/e-util/e-popup.h @@ -27,10 +27,7 @@ #include #include "libedataserver/e-msgport.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS /* This is an abstract popup menu management/merging class. @@ -303,8 +300,6 @@ GType e_popup_hook_get_type(void); /* for implementors */ void e_popup_hook_class_add_target_map(EPopupHookClass *klass, const EPopupHookTargetMap *); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_POPUP_H__ */ diff --git a/e-util/e-profile-event.h b/e-util/e-profile-event.h index 5caa50cf4d..256bec218a 100644 --- a/e-util/e-profile-event.h +++ b/e-util/e-profile-event.h @@ -29,10 +29,7 @@ #include "e-util/e-event.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS struct _CamelFolder; struct _CamelMimeMessage; @@ -103,8 +100,6 @@ struct _EProfileEventHookClass { GType e_profile_event_hook_get_type(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_PROFILE_EVENT_H__ */ diff --git a/e-util/e-signature.h b/e-util/e-signature.h index e965f9c65e..a58a42992c 100644 --- a/e-util/e-signature.h +++ b/e-util/e-signature.h @@ -26,10 +26,7 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define E_TYPE_SIGNATURE (e_signature_get_type ()) #define E_SIGNATURE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SIGNATURE, ESignature)) @@ -69,8 +66,6 @@ gboolean e_signature_set_from_xml (ESignature *sig, const gchar *xml); gchar *e_signature_to_xml (ESignature *sig); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_SIGNATURE_H__ */ diff --git a/e-util/e-sorter.h b/e-util/e-sorter.h index 579d9bd36d..37015e54ae 100644 --- a/e-util/e-sorter.h +++ b/e-util/e-sorter.h @@ -26,9 +26,7 @@ #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define E_SORTER_TYPE (e_sorter_get_type ()) #define E_SORTER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_SORTER_TYPE, ESorter)) @@ -75,8 +73,6 @@ void e_sorter_get_sorted_to_model_array (ESorter *sorter, gboolean e_sorter_needs_sorting (ESorter *sorter); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_SORTER_H_ */ diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h index efb8c7e665..a93db0f440 100644 --- a/e-util/e-text-event-processor-emacs-like.h +++ b/e-util/e-text-event-processor-emacs-like.h @@ -26,10 +26,7 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS /* ETextEventProcessorEmacsLike - Turns events on a text widget into commands. Uses an emacs-ish interface. * @@ -62,9 +59,7 @@ struct _ETextEventProcessorEmacsLikeClass GType e_text_event_processor_emacs_like_get_type (void); ETextEventProcessor *e_text_event_processor_emacs_like_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__ */ diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h index a9d329c140..1f313bd35d 100644 --- a/e-util/e-text-event-processor.h +++ b/e-util/e-text-event-processor.h @@ -26,10 +26,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS /* ETextEventProcessor - Turns events on a text widget into commands. * @@ -67,9 +64,7 @@ struct _ETextEventProcessorClass GType e_text_event_processor_get_type (void); gint e_text_event_processor_handle_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_TEXT_EVENT_PROCESSOR_H__ */ -- cgit