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. --- calendar/gui/dialogs/calendar-setup.h | 9 ++------- calendar/gui/e-cal-config.h | 9 ++------- calendar/gui/e-cal-event.h | 9 ++------- calendar/gui/e-cal-menu.h | 9 ++------- calendar/gui/e-cal-popup.h | 9 ++------- calendar/gui/e-day-view-layout.h | 8 ++------ calendar/gui/e-day-view-main-item.h | 8 ++------ calendar/gui/e-day-view-time-item.h | 8 ++------ calendar/gui/e-day-view-top-item.h | 8 ++------ calendar/gui/e-meeting-attendee.h | 9 ++------- calendar/gui/e-meeting-time-sel-item.h | 4 +--- calendar/gui/e-meeting-types.h | 9 ++------- calendar/gui/e-meeting-utils.h | 9 ++------- calendar/gui/e-week-view-event-item.h | 8 ++------ calendar/gui/e-week-view-layout.h | 8 ++------ calendar/gui/e-week-view-main-item.h | 8 ++------ calendar/gui/e-week-view-titles-item.h | 8 ++------ calendar/gui/e-week-view.h | 8 ++------ 18 files changed, 35 insertions(+), 113 deletions(-) (limited to 'calendar/gui') diff --git a/calendar/gui/dialogs/calendar-setup.h b/calendar/gui/dialogs/calendar-setup.h index 4ec9980532..d92993c1a6 100644 --- a/calendar/gui/dialogs/calendar-setup.h +++ b/calendar/gui/dialogs/calendar-setup.h @@ -27,10 +27,7 @@ struct _GtkWindow; struct _ESource; -#ifdef __cplusplus -extern "C" { -#pragma } -#endif +G_BEGIN_DECLS void calendar_setup_edit_calendar (struct _GtkWindow *parent, struct _ESource *source, struct _ESourceGroup *group); void calendar_setup_new_calendar (struct _GtkWindow *parent); @@ -41,8 +38,6 @@ void calendar_setup_new_task_list (struct _GtkWindow *parent); void calendar_setup_edit_memo_list (struct _GtkWindow *parent, ESource *source); void calendar_setup_new_memo_list (struct _GtkWindow *parent); -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif /* __CALENDAR_SETUP_H__ */ diff --git a/calendar/gui/e-cal-config.h b/calendar/gui/e-cal-config.h index f9876e7adf..52989aa0e2 100644 --- a/calendar/gui/e-cal-config.h +++ b/calendar/gui/e-cal-config.h @@ -29,10 +29,7 @@ #include #include "e-util/e-config.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif +G_BEGIN_DECLS typedef struct _ECalConfig ECalConfig; typedef struct _ECalConfigClass ECalConfigClass; @@ -89,8 +86,6 @@ struct _ECalConfigHookClass { GType e_cal_config_hook_get_type (void); -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif diff --git a/calendar/gui/e-cal-event.h b/calendar/gui/e-cal-event.h index 0802640d2c..8fb28dfd17 100644 --- a/calendar/gui/e-cal-event.h +++ b/calendar/gui/e-cal-event.h @@ -28,10 +28,7 @@ #include "e-util/e-event.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif +G_BEGIN_DECLS typedef struct _ECalEvent ECalEvent; typedef struct _ECalEventClass ECalEventClass; @@ -82,8 +79,6 @@ struct _ECalEventHookClass { GType e_cal_event_hook_get_type (void); -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif /* __E_CAL_EVENT_H__ */ diff --git a/calendar/gui/e-cal-menu.h b/calendar/gui/e-cal-menu.h index f1d9f4b729..0667f92051 100644 --- a/calendar/gui/e-cal-menu.h +++ b/calendar/gui/e-cal-menu.h @@ -28,10 +28,7 @@ #include "e-util/e-menu.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS typedef struct _ECalMenu ECalMenu; typedef struct _ECalMenuClass ECalMenuClass; @@ -119,8 +116,6 @@ struct _ECalMenuHookClass { GType e_cal_menu_hook_get_type(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_CAL_MENU_H__ */ diff --git a/calendar/gui/e-cal-popup.h b/calendar/gui/e-cal-popup.h index 9887c66366..ed59ae29e6 100644 --- a/calendar/gui/e-cal-popup.h +++ b/calendar/gui/e-cal-popup.h @@ -29,10 +29,7 @@ #include "e-util/e-popup.h" #include "dialogs/comp-editor.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS typedef struct _ECalPopup ECalPopup; typedef struct _ECalPopupClass ECalPopupClass; @@ -211,8 +208,6 @@ struct _ECalPopupHookClass { GType e_cal_popup_hook_get_type(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_CAL_POPUP_H__ */ diff --git a/calendar/gui/e-day-view-layout.h b/calendar/gui/e-day-view-layout.h index f3d431ca20..36f2e0c52d 100644 --- a/calendar/gui/e-day-view-layout.h +++ b/calendar/gui/e-day-view-layout.h @@ -26,9 +26,7 @@ #include "e-day-view.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* I've split these functions away from EDayView so we can use them for printing. */ @@ -51,8 +49,6 @@ gboolean e_day_view_find_long_event_days (EDayViewEvent *event, gint *start_day, gint *end_day); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_DAY_VIEW_LAYOUT_H_ */ diff --git a/calendar/gui/e-day-view-main-item.h b/calendar/gui/e-day-view-main-item.h index c9ce721341..3f28bde608 100644 --- a/calendar/gui/e-day-view-main-item.h +++ b/calendar/gui/e-day-view-main-item.h @@ -25,9 +25,7 @@ #include "e-day-view.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* * EDayViewMainItem - canvas item which displays most of the appointment @@ -57,8 +55,6 @@ typedef struct { GType e_day_view_main_item_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_DAY_VIEW_MAIN_ITEM_H_ */ diff --git a/calendar/gui/e-day-view-time-item.h b/calendar/gui/e-day-view-time-item.h index 9d7bdcae9f..237b556df6 100644 --- a/calendar/gui/e-day-view-time-item.h +++ b/calendar/gui/e-day-view-time-item.h @@ -26,9 +26,7 @@ #include "e-day-view.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* * EDayViewTimeItem - canvas item which displays the times down the left of @@ -71,8 +69,6 @@ GType e_day_view_time_item_get_type (void); gint e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_DAY_VIEW_TIME_ITEM_H_ */ diff --git a/calendar/gui/e-day-view-top-item.h b/calendar/gui/e-day-view-top-item.h index 01a7c44842..61dfdceab8 100644 --- a/calendar/gui/e-day-view-top-item.h +++ b/calendar/gui/e-day-view-top-item.h @@ -26,9 +26,7 @@ #include "e-day-view.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* * EDayViewTopItem - displays the top part of the Day/Work Week calendar view. @@ -62,8 +60,6 @@ void e_day_view_top_item_get_day_label (EDayView *day_view, gint day, gchar *buffer, gint buffer_len); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_DAY_VIEW_TOP_ITEM_H_ */ diff --git a/calendar/gui/e-meeting-attendee.h b/calendar/gui/e-meeting-attendee.h index a259de6619..fb7e32edc7 100644 --- a/calendar/gui/e-meeting-attendee.h +++ b/calendar/gui/e-meeting-attendee.h @@ -32,10 +32,7 @@ #include #include "e-meeting-types.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define E_TYPE_MEETING_ATTENDEE (e_meeting_attendee_get_type ()) #define E_MEETING_ATTENDEE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MEETING_ATTENDEE, EMeetingAttendee)) @@ -169,8 +166,6 @@ gboolean e_meeting_attendee_set_end_busy_range (EMeetingAttendee *ia, void e_meeting_attendee_clear_busy_periods (EMeetingAttendee *ia); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_MEETING_ATTENDEE_H_ */ diff --git a/calendar/gui/e-meeting-time-sel-item.h b/calendar/gui/e-meeting-time-sel-item.h index 310eb4c3a0..e9daa3d56a 100644 --- a/calendar/gui/e-meeting-time-sel-item.h +++ b/calendar/gui/e-meeting-time-sel-item.h @@ -33,9 +33,7 @@ #include "e-meeting-time-sel.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define E_MEETING_TIME_SELECTOR_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), e_meeting_time_selector_item_get_type (), EMeetingTimeSelectorItem)) diff --git a/calendar/gui/e-meeting-types.h b/calendar/gui/e-meeting-types.h index bfcdfc5854..49ddaf22e3 100644 --- a/calendar/gui/e-meeting-types.h +++ b/calendar/gui/e-meeting-types.h @@ -31,10 +31,7 @@ #include #include "e-meeting-types.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS @@ -73,8 +70,6 @@ struct _EMeetingFreeBusyPeriod EMeetingFreeBusyType busy_type; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_MEETING_TYPES_H_ */ diff --git a/calendar/gui/e-meeting-utils.h b/calendar/gui/e-meeting-utils.h index c71efec135..cd2e76df38 100644 --- a/calendar/gui/e-meeting-utils.h +++ b/calendar/gui/e-meeting-utils.h @@ -31,19 +31,14 @@ #include #include "e-meeting-types.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS gint e_meeting_time_compare_times (EMeetingTime *time1, EMeetingTime *time2); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_MEETING_UTILS_H_ */ diff --git a/calendar/gui/e-week-view-event-item.h b/calendar/gui/e-week-view-event-item.h index 69d041f046..ebc5d07e07 100644 --- a/calendar/gui/e-week-view-event-item.h +++ b/calendar/gui/e-week-view-event-item.h @@ -26,9 +26,7 @@ #include "e-week-view.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* * EWeekViewEventItem - displays the background, times and icons for an event @@ -63,8 +61,6 @@ GType e_week_view_event_item_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_WEEK_VIEW_EVENT_ITEM_H_ */ diff --git a/calendar/gui/e-week-view-layout.h b/calendar/gui/e-week-view-layout.h index 0acd41d232..67975b2b20 100644 --- a/calendar/gui/e-week-view-layout.h +++ b/calendar/gui/e-week-view-layout.h @@ -26,9 +26,7 @@ #include "e-week-view.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* I've split these functions away from EWeekView so we can use them for printing. */ @@ -63,8 +61,6 @@ gboolean e_week_view_layout_get_span_position (EWeekViewEvent *event, gboolean compress_weekend, gint *span_num_days); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_WEEK_VIEW_LAYOUT_H_ */ diff --git a/calendar/gui/e-week-view-main-item.h b/calendar/gui/e-week-view-main-item.h index 34bdfa2e1f..135a25e662 100644 --- a/calendar/gui/e-week-view-main-item.h +++ b/calendar/gui/e-week-view-main-item.h @@ -26,9 +26,7 @@ #include "e-week-view.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* * EWeekViewMainItem - displays the background grid and dates for the Week and @@ -59,8 +57,6 @@ GType e_week_view_main_item_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_WEEK_VIEW_MAIN_ITEM_H_ */ diff --git a/calendar/gui/e-week-view-titles-item.h b/calendar/gui/e-week-view-titles-item.h index 0463c95cb0..6ee6cdaa96 100644 --- a/calendar/gui/e-week-view-titles-item.h +++ b/calendar/gui/e-week-view-titles-item.h @@ -26,9 +26,7 @@ #include "e-week-view.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* * EWeekViewTitlesItem - displays the 'Monday', 'Tuesday' etc. at the top of @@ -59,8 +57,6 @@ GType e_week_view_titles_item_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_WEEK_VIEW_TITLES_ITEM_H_ */ diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h index 605c96b24b..513dae247b 100644 --- a/calendar/gui/e-week-view.h +++ b/calendar/gui/e-week-view.h @@ -29,9 +29,7 @@ #include "e-calendar-view.h" #include "gnome-cal.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* * EWeekView - displays the Week & Month views of the calendar. @@ -449,8 +447,6 @@ gboolean e_week_view_is_jump_button_visible (EWeekView *week_view, gint day); void e_week_view_jump_to_button_item (EWeekView *week_view, GnomeCanvasItem *item); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_WEEK_VIEW_H_ */ -- cgit v1.2.3