From 00d56cd32c5d0a7f49567d5241ba0d6fd80940bb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 18 Jun 2009 10:50:51 -0400 Subject: Use G_BEGIN_DECLS / G_END_DECLS macros. --- widgets/menus/gal-define-views-dialog.h | 9 ++------- widgets/menus/gal-define-views-model.h | 8 ++------ widgets/menus/gal-view-factory-etable.h | 8 ++------ widgets/menus/gal-view-factory.h | 8 ++------ widgets/menus/gal-view-instance-save-as-dialog.h | 9 ++------- widgets/menus/gal-view-new-dialog.h | 9 ++------- widgets/menus/gal-view.h | 8 ++------ 7 files changed, 14 insertions(+), 45 deletions(-) (limited to 'widgets/menus') diff --git a/widgets/menus/gal-define-views-dialog.h b/widgets/menus/gal-define-views-dialog.h index 14112dfdb3..ab499d45d5 100644 --- a/widgets/menus/gal-define-views-dialog.h +++ b/widgets/menus/gal-define-views-dialog.h @@ -28,10 +28,7 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS /* GalDefineViewsDialog - A dialog displaying information about a contact. * @@ -70,9 +67,7 @@ struct _GalDefineViewsDialogClass GtkWidget *gal_define_views_dialog_new (GalViewCollection *collection); GType gal_define_views_dialog_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GAL_DEFINE_VIEWS_DIALOG_H__ */ diff --git a/widgets/menus/gal-define-views-model.h b/widgets/menus/gal-define-views-model.h index 2441cf7654..c408fea067 100644 --- a/widgets/menus/gal-define-views-model.h +++ b/widgets/menus/gal-define-views-model.h @@ -28,9 +28,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAL_DEFINE_VIEWS_MODEL_TYPE (gal_define_views_model_get_type ()) #define GAL_DEFINE_VIEWS_MODEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_DEFINE_VIEWS_MODEL_TYPE, GalDefineViewsModel)) @@ -65,8 +63,6 @@ void gal_define_views_model_delete_view (GalDefineViewsModel *model, void gal_define_views_model_copy_view (GalDefineViewsModel *model, gint i); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _GAL_DEFINE_VIEWS_MODEL_H_ */ diff --git a/widgets/menus/gal-view-factory-etable.h b/widgets/menus/gal-view-factory-etable.h index 440d6c6d22..50d3a0ac50 100644 --- a/widgets/menus/gal-view-factory-etable.h +++ b/widgets/menus/gal-view-factory-etable.h @@ -28,9 +28,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAL_VIEW_FACTORY_ETABLE_TYPE (gal_view_factory_etable_get_type ()) #define GAL_VIEW_FACTORY_ETABLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_VIEW_FACTORY_ETABLE_TYPE, GalViewFactoryEtable)) @@ -55,8 +53,6 @@ GalViewFactory *gal_view_factory_etable_new (ETableSpecification *spec); GalViewFactory *gal_view_factory_etable_construct (GalViewFactoryEtable *factory, ETableSpecification *spec); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _GAL_VIEW_FACTORY_ETABLE_H_ */ diff --git a/widgets/menus/gal-view-factory.h b/widgets/menus/gal-view-factory.h index 59f46a20e9..41b7564de0 100644 --- a/widgets/menus/gal-view-factory.h +++ b/widgets/menus/gal-view-factory.h @@ -27,9 +27,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAL_VIEW_FACTORY_TYPE (gal_view_factory_get_type ()) #define GAL_VIEW_FACTORY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_VIEW_FACTORY_TYPE, GalViewFactory)) @@ -71,9 +69,7 @@ const gchar *gal_view_factory_get_type_code (GalViewFactory *factory); GalView *gal_view_factory_new_view (GalViewFactory *factory, const gchar *name); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _GAL_VIEW_FACTORY_H_ */ diff --git a/widgets/menus/gal-view-instance-save-as-dialog.h b/widgets/menus/gal-view-instance-save-as-dialog.h index 2135bc560f..600aa6765a 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.h +++ b/widgets/menus/gal-view-instance-save-as-dialog.h @@ -28,10 +28,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS /* GalViewInstanceSaveAsDialog - A dialog displaying information about a contact. * @@ -83,9 +80,7 @@ GType gal_view_instance_save_as_dialog_get_type (void); void gal_view_instance_save_as_dialog_save (GalViewInstanceSaveAsDialog *dialog); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GAL_VIEW_INSTANCE_SAVE_AS_DIALOG_H__ */ diff --git a/widgets/menus/gal-view-new-dialog.h b/widgets/menus/gal-view-new-dialog.h index d2acd5d301..06bcb96bb9 100644 --- a/widgets/menus/gal-view-new-dialog.h +++ b/widgets/menus/gal-view-new-dialog.h @@ -27,10 +27,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS /* GalViewNewDialog - A dialog displaying information about a contact. * @@ -76,9 +73,7 @@ GType gal_view_new_dialog_get_type (void); GtkWidget *gal_view_new_dialog_construct (GalViewNewDialog *dialog, GalViewCollection *collection); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GAL_VIEW_NEW_DIALOG_H__ */ diff --git a/widgets/menus/gal-view.h b/widgets/menus/gal-view.h index ce73400033..8973733a3b 100644 --- a/widgets/menus/gal-view.h +++ b/widgets/menus/gal-view.h @@ -27,9 +27,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAL_VIEW_TYPE (gal_view_get_type ()) #define GAL_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_VIEW_TYPE, GalView)) @@ -91,8 +89,6 @@ GalView *gal_view_clone (GalView *view); void gal_view_changed (GalView *view); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _GAL_VIEW_H_ */ -- cgit v1.2.3