From 547e123d2777bd3beba36e74e018efb590ed44d4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 18 Jun 2009 15:26:21 -0400 Subject: Stop abusing forward declarations. --- calendar/gui/dialogs/calendar-setup.c | 18 +++++++++--------- calendar/gui/dialogs/calendar-setup.h | 17 +++++++++-------- calendar/gui/e-cal-popup.h | 23 ++++++++++++----------- calendar/gui/e-calendar-view.h | 4 ++-- calendar/gui/gnome-cal.h | 12 ++++++------ calendar/gui/migration.h | 8 +++----- 6 files changed, 41 insertions(+), 41 deletions(-) (limited to 'calendar') diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c index 32fbc9bd68..de7025fd96 100644 --- a/calendar/gui/dialogs/calendar-setup.c +++ b/calendar/gui/dialogs/calendar-setup.c @@ -211,7 +211,7 @@ name_changed (GtkEntry *entry, ECalConfigTargetSource *t) } static GtkWidget * -eccp_get_source_name (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +eccp_get_source_name (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { static GtkWidget *label, *entry; gint row; @@ -252,7 +252,7 @@ offline_status_changed_cb (GtkWidget *widget, CalendarSourceDialog *sdialog) } static GtkWidget * -eccp_general_offline (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +eccp_general_offline (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { CalendarSourceDialog *sdialog = data; GtkWidget *offline_setting = NULL; @@ -318,7 +318,7 @@ choose_initial_color (void) } static GtkWidget * -eccp_get_source_color (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data) +eccp_get_source_color (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { CalendarSourceDialog *sdialog = data; static GtkWidget *label, *color_button; @@ -431,7 +431,7 @@ cs_load_sources (CalendarSourceDialog *sdialog, const gchar *conf_key, ESourceGr * Show calendar properties for @source. **/ void -calendar_setup_edit_calendar (struct _GtkWindow *parent, ESource *source, ESourceGroup *group) +calendar_setup_edit_calendar (GtkWindow *parent, ESource *source, ESourceGroup *group) { CalendarSourceDialog *sdialog = g_new0 (CalendarSourceDialog, 1); gchar *xml; @@ -482,13 +482,13 @@ calendar_setup_edit_calendar (struct _GtkWindow *parent, ESource *source, ESourc } void -calendar_setup_new_calendar (struct _GtkWindow *parent) +calendar_setup_new_calendar (GtkWindow *parent) { calendar_setup_edit_calendar (parent, NULL, NULL); } void -calendar_setup_edit_task_list (struct _GtkWindow *parent, ESource *source) +calendar_setup_edit_task_list (GtkWindow *parent, ESource *source) { CalendarSourceDialog *sdialog = g_new0 (CalendarSourceDialog, 1); gchar *xml; @@ -538,13 +538,13 @@ calendar_setup_edit_task_list (struct _GtkWindow *parent, ESource *source) } void -calendar_setup_new_task_list (struct _GtkWindow *parent) +calendar_setup_new_task_list (GtkWindow *parent) { calendar_setup_edit_task_list (parent, NULL); } void -calendar_setup_edit_memo_list (struct _GtkWindow *parent, ESource *source) +calendar_setup_edit_memo_list (GtkWindow *parent, ESource *source) { CalendarSourceDialog *sdialog = g_new0 (CalendarSourceDialog, 1); gchar *xml; @@ -594,7 +594,7 @@ calendar_setup_edit_memo_list (struct _GtkWindow *parent, ESource *source) } void -calendar_setup_new_memo_list (struct _GtkWindow *parent) +calendar_setup_new_memo_list (GtkWindow *parent) { calendar_setup_edit_memo_list (parent, NULL); } diff --git a/calendar/gui/dialogs/calendar-setup.h b/calendar/gui/dialogs/calendar-setup.h index d92993c1a6..18dc042848 100644 --- a/calendar/gui/dialogs/calendar-setup.h +++ b/calendar/gui/dialogs/calendar-setup.h @@ -24,19 +24,20 @@ #ifndef __CALENDAR_SETUP_H__ #define __CALENDAR_SETUP_H__ -struct _GtkWindow; -struct _ESource; +#include +#include +#include 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); +void calendar_setup_edit_calendar (GtkWindow *parent, ESource *source, ESourceGroup *group); +void calendar_setup_new_calendar (GtkWindow *parent); -void calendar_setup_edit_task_list (struct _GtkWindow *parent, struct _ESource *source); -void calendar_setup_new_task_list (struct _GtkWindow *parent); +void calendar_setup_edit_task_list (GtkWindow *parent, ESource *source); +void calendar_setup_new_task_list (GtkWindow *parent); -void calendar_setup_edit_memo_list (struct _GtkWindow *parent, ESource *source); -void calendar_setup_new_memo_list (struct _GtkWindow *parent); +void calendar_setup_edit_memo_list (GtkWindow *parent, ESource *source); +void calendar_setup_new_memo_list (GtkWindow *parent); G_END_DECLS diff --git a/calendar/gui/e-cal-popup.h b/calendar/gui/e-cal-popup.h index ed59ae29e6..2cd20ebd9d 100644 --- a/calendar/gui/e-cal-popup.h +++ b/calendar/gui/e-cal-popup.h @@ -25,17 +25,14 @@ #define __E_CAL_POPUP_H__ #include +#include -#include "e-util/e-popup.h" +#include #include "dialogs/comp-editor.h" +#include "e-cal-model.h" G_BEGIN_DECLS -typedef struct _ECalPopup ECalPopup; -typedef struct _ECalPopupClass ECalPopupClass; - -struct _ECalendarView; - /** * enum _e_cal_popup_target_t - A list of mail popup target types. * @@ -141,7 +138,7 @@ typedef struct _ECalPopupTargetAttachments ECalPopupTargetAttachments; struct _ECalPopupTargetSelect { EPopupTarget target; - struct _ECalModel *model; + ECalModel *model; GPtrArray *events; }; @@ -156,7 +153,7 @@ struct _ECalPopupTargetSelect { struct _ECalPopupTargetSource { EPopupTarget target; - struct _ESourceSelector *selector; + ESourceSelector *selector; }; /** @@ -175,11 +172,15 @@ struct _ECalPopupTargetAttachments { typedef struct _EPopupItem ECalPopupItem; +typedef struct _ECalPopup ECalPopup; +typedef struct _ECalPopupClass ECalPopupClass; +typedef struct _ECalPopupPrivate ECalPopupPrivate; + /* The object */ struct _ECalPopup { EPopup popup; - struct _ECalPopupPrivate *priv; + ECalPopupPrivate *priv; }; struct _ECalPopupClass { @@ -190,8 +191,8 @@ GType e_cal_popup_get_type(void); ECalPopup *e_cal_popup_new(const gchar *menuid); -ECalPopupTargetSelect *e_cal_popup_target_new_select(ECalPopup *eabp, struct _ECalModel *model, GPtrArray *events); -ECalPopupTargetSource *e_cal_popup_target_new_source(ECalPopup *eabp, struct _ESourceSelector *selector); +ECalPopupTargetSelect *e_cal_popup_target_new_select(ECalPopup *eabp, ECalModel *model, GPtrArray *events); +ECalPopupTargetSource *e_cal_popup_target_new_source(ECalPopup *eabp, ESourceSelector *selector); /* ********************************************************************** */ diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h index 453ec1ff52..57cc811ae7 100644 --- a/calendar/gui/e-calendar-view.h +++ b/calendar/gui/e-calendar-view.h @@ -171,8 +171,8 @@ void e_calendar_view_modify_and_send (ECalComponent *comp, CalObjModType mod, GtkWindow *toplevel, gboolean new); -void e_calendar_utils_show_error_silent (struct _GtkWidget *widget); -void e_calendar_utils_show_info_silent(struct _GtkWidget *widget); +void e_calendar_utils_show_error_silent (GtkWidget *widget); +void e_calendar_utils_show_info_silent(GtkWidget *widget); gboolean e_calendar_view_get_tooltips (ECalendarViewEventData *data); diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h index b0bbc8535b..978bad4c0b 100644 --- a/calendar/gui/gnome-cal.h +++ b/calendar/gui/gnome-cal.h @@ -32,15 +32,15 @@ #include #include #include +#include +#include "e-cal-menu.h" #include "e-calendar-table.h" G_BEGIN_DECLS -struct _EPopup; - #define GNOME_TYPE_CALENDAR (gnome_calendar_get_type ()) #define GNOME_CALENDAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_CALENDAR, GnomeCalendar)) #define GNOME_CALENDAR_CLASS(klass) (G_TYPE_CHECK_INSTANCE_CAST_CLASS ((klass), GNOME_TYPE_CALENDAR, \ @@ -140,14 +140,14 @@ GtkWidget *gnome_calendar_get_search_bar_widget (GnomeCalendar *gcal); GtkWidget *gnome_calendar_get_view_notebook_widget (GnomeCalendar *gcal); GtkWidget *gnome_calendar_get_tag (GnomeCalendar *gcal); -struct _ECalMenu *gnome_calendar_get_taskpad_menu (GnomeCalendar *gcal); -struct _ECalMenu *gnome_calendar_get_calendar_menu (GnomeCalendar *gcal); -struct _ECalMenu *gnome_calendar_get_memopad_menu (GnomeCalendar *gcal); +ECalMenu *gnome_calendar_get_taskpad_menu (GnomeCalendar *gcal); +ECalMenu *gnome_calendar_get_calendar_menu (GnomeCalendar *gcal); +ECalMenu *gnome_calendar_get_memopad_menu (GnomeCalendar *gcal); void gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic); void gnome_calendar_discard_view_menus (GnomeCalendar *gcal); -void gnome_calendar_view_popup_factory (GnomeCalendar *gcal, struct _EPopup *ep, const gchar *prefix); +void gnome_calendar_view_popup_factory (GnomeCalendar *gcal, EPopup *ep, const gchar *prefix); void gnome_calendar_set_selected_time_range (GnomeCalendar *gcal, time_t start_time, diff --git a/calendar/gui/migration.h b/calendar/gui/migration.h index d4bb33c448..78bc501599 100644 --- a/calendar/gui/migration.h +++ b/calendar/gui/migration.h @@ -29,9 +29,7 @@ #include "tasks-component.h" #include "memos-component.h" -struct _GError; - -gboolean migrate_calendars (CalendarComponent *component, gint major, gint minor, gint revision, struct _GError **err); -gboolean migrate_tasks (TasksComponent *component, gint major, gint minor, gint revision, struct _GError **err); -gboolean migrate_memos (MemosComponent *component, gint major, gint minor, gint revision, struct _GError **err); +gboolean migrate_calendars (CalendarComponent *component, gint major, gint minor, gint revision, GError **err); +gboolean migrate_tasks (TasksComponent *component, gint major, gint minor, gint revision, GError **err); +gboolean migrate_memos (MemosComponent *component, gint major, gint minor, gint revision, GError **err); #endif -- cgit v1.2.3