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. --- e-util/e-config.c | 10 +++++----- e-util/e-config.h | 25 +++++++++++-------------- e-util/e-error.c | 6 +++--- e-util/e-error.h | 12 +++++------- e-util/e-import.c | 4 ++-- e-util/e-import.h | 11 ++++------- e-util/e-menu.h | 6 +++--- e-util/e-popup.h | 10 +++++----- e-util/e-profile-event.h | 3 --- e-util/e-util-labels.h | 6 ++---- 10 files changed, 40 insertions(+), 53 deletions(-) (limited to 'e-util') diff --git a/e-util/e-config.c b/e-util/e-config.c index 9336e778cd..412c00b649 100644 --- a/e-util/e-config.c +++ b/e-util/e-config.c @@ -65,8 +65,8 @@ struct _widget_node { struct _menu_node *context; EConfigItem *item; - struct _GtkWidget *widget; /* widget created by the factory, if any */ - struct _GtkWidget *frame; /* if created by us */ + GtkWidget *widget; /* widget created by the factory, if any */ + GtkWidget *frame; /* if created by us */ guint empty:1; /* set if empty (i.e. hidden) */ }; @@ -892,7 +892,7 @@ ec_dialog_response(GtkWidget *d, gint id, EConfig *ec) * Return value: The window widget. This is also stored in @emp.window. **/ GtkWidget * -e_config_create_window(EConfig *emp, struct _GtkWindow *parent, const gchar *title) +e_config_create_window(EConfig *emp, GtkWindow *parent, const gchar *title) { GtkWidget *w; @@ -1341,7 +1341,7 @@ emph_free_group(struct _EConfigHookGroup *group) g_free(group); } -static struct _GtkWidget * +static GtkWidget * ech_config_widget_factory(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { struct _EConfigHookGroup *group = data; @@ -1355,7 +1355,7 @@ ech_config_widget_factory(EConfig *ec, EConfigItem *item, GtkWidget *parent, Gtk hdata.parent = parent; hdata.old = old; - return (struct _GtkWidget *)e_plugin_invoke(group->hook->hook.plugin, (gchar *)item->user_data, &hdata); + return (GtkWidget *)e_plugin_invoke(group->hook->hook.plugin, (gchar *)item->user_data, &hdata); } else return NULL; } diff --git a/e-util/e-config.h b/e-util/e-config.h index 2f2e4a2a3b..e6ff495520 100644 --- a/e-util/e-config.h +++ b/e-util/e-config.h @@ -24,14 +24,11 @@ #ifndef __E_CONFIG_H__ #define __E_CONFIG_H__ -#include -#include "libedataserver/e-msgport.h" +#include +#include G_BEGIN_DECLS -struct _GtkWindow; -struct _GtkWidget; - /* This is a config window management/merging class. */ typedef struct _EConfig EConfig; @@ -47,7 +44,7 @@ typedef gboolean (*EConfigCheckFunc)(EConfig *ec, const gchar *pageid, gpointer typedef void (*EConfigItemsFunc)(EConfig *ec, GSList *items, gpointer data); -typedef struct _GtkWidget * (*EConfigItemFactoryFunc)(EConfig *ec, EConfigItem *, struct _GtkWidget *parent, struct _GtkWidget *old, gpointer data); +typedef GtkWidget * (*EConfigItemFactoryFunc)(EConfig *ec, EConfigItem *, GtkWidget *parent, GtkWidget *old, gpointer data); /* ok so this is all a bit bogussy we need to map to glade stuff instead */ @@ -161,7 +158,7 @@ struct _EConfigItem { **/ struct _EConfigTarget { struct _EConfig *config; - struct _GtkWidget *widget; /* used if you need a parent toplevel, if available */ + GtkWidget *widget; /* used if you need a parent toplevel, if available */ guint32 type; @@ -197,8 +194,8 @@ struct _EConfig { EConfigTarget *target; - struct _GtkWidget *widget; /* the generated internal */ - struct _GtkWidget *window; /* the window widget, GtkWindow or GtkDialog */ + GtkWidget *widget; /* the generated internal */ + GtkWidget *window; /* the window widget, GtkWindow or GtkDialog */ }; /** @@ -236,14 +233,14 @@ void e_config_add_items(EConfig *, GSList *items, EConfigItemsFunc commitfunc, E void e_config_add_page_check(EConfig *, const gchar *pageid, EConfigCheckFunc, gpointer data); void e_config_set_target(EConfig *emp, EConfigTarget *target); -struct _GtkWidget *e_config_create_widget(EConfig *); -struct _GtkWidget *e_config_create_window(EConfig *emp, struct _GtkWindow *parent, const gchar *title); +GtkWidget *e_config_create_widget(EConfig *); +GtkWidget *e_config_create_window(EConfig *emp, GtkWindow *parent, const gchar *title); void e_config_target_changed(EConfig *emp, e_config_target_change_t how); gboolean e_config_page_check(EConfig *, const gchar *); -struct _GtkWidget *e_config_page_get(EConfig *ec, const gchar *pageid); +GtkWidget *e_config_page_get(EConfig *ec, const gchar *pageid); const gchar *e_config_page_next(EConfig *ec, const gchar *pageid); const gchar *e_config_page_prev(EConfig *ec, const gchar *pageid); @@ -295,8 +292,8 @@ struct _EConfigHookItemFactoryData { EConfig *config; EConfigItem *item; EConfigTarget *target; - struct _GtkWidget *parent; - struct _GtkWidget *old; + GtkWidget *parent; + GtkWidget *old; }; /** diff --git a/e-util/e-error.c b/e-util/e-error.c index 4215bfe7de..c78083495e 100644 --- a/e-util/e-error.c +++ b/e-util/e-error.c @@ -580,8 +580,8 @@ e_error_newv(GtkWindow *parent, const gchar *tag, const gchar *arg0, va_list ap) * Return value: A GtkDialog which can be used for showing an error * dialog asynchronously. **/ -struct _GtkWidget * -e_error_new(struct _GtkWindow *parent, const gchar *tag, const gchar *arg0, ...) +GtkWidget * +e_error_new(GtkWindow *parent, const gchar *tag, const gchar *arg0, ...) { GtkWidget *w; va_list ap; @@ -683,7 +683,7 @@ remove_parent(GtkWidget *w, GtkWidget *parent) * destruction state. **/ void -e_error_default_parent(struct _GtkWindow *parent) +e_error_default_parent(GtkWindow *parent) { if (g_slist_find(ee_parent_list, parent) == NULL) { ee_parent_list = g_slist_prepend(ee_parent_list, parent); diff --git a/e-util/e-error.h b/e-util/e-error.h index 6b66a6da31..7b9685aca6 100644 --- a/e-util/e-error.h +++ b/e-util/e-error.h @@ -26,8 +26,6 @@ #include #include -struct _GtkWindow; - /* * Some standard errors, if these are altered or added to, * update devel-docs/misc/errors.txt @@ -50,14 +48,14 @@ struct _GtkWindow; #define E_ERROR_NO_LOAD_FILE "system:no-save-file" /* Note that all errors returned are standard GtkDialoge's */ -struct _GtkWidget *e_error_new(struct _GtkWindow *parent, const gchar *tag, const gchar *arg0, ...); -struct _GtkWidget *e_error_newv(struct _GtkWindow *parent, const gchar *tag, const gchar *arg0, va_list ap); +GtkWidget *e_error_new(GtkWindow *parent, const gchar *tag, const gchar *arg0, ...); +GtkWidget *e_error_newv(GtkWindow *parent, const gchar *tag, const gchar *arg0, va_list ap); -gint e_error_run(struct _GtkWindow *parent, const gchar *tag, const gchar *arg0, ...); -gint e_error_runv(struct _GtkWindow *parent, const gchar *tag, const gchar *arg0, va_list ap); +gint e_error_run(GtkWindow *parent, const gchar *tag, const gchar *arg0, ...); +gint e_error_runv(GtkWindow *parent, const gchar *tag, const gchar *arg0, va_list ap); guint e_error_count_buttons (GtkDialog *dialog); -void e_error_default_parent(struct _GtkWindow *parent); +void e_error_default_parent(GtkWindow *parent); #endif /* !_E_ERROR_H */ diff --git a/e-util/e-import.c b/e-util/e-import.c index 4e2cdc3302..6f4c5947b4 100644 --- a/e-util/e-import.c +++ b/e-util/e-import.c @@ -211,7 +211,7 @@ void e_import_cancel(EImport *ei, EImportTarget *t, EImportImporter *im) * Return value: NULL if the importer doesn't support/require * a destination. **/ -struct _GtkWidget * +GtkWidget * e_import_get_widget(EImport *ei, EImportTarget *target, EImportImporter *im) { g_return_val_if_fail(im != NULL, NULL); @@ -438,7 +438,7 @@ static gboolean eih_supported(EImport *ei, EImportTarget *target, EImportImporte return e_plugin_invoke(hook->hook.plugin, ihook->supported, target) != NULL; } -static struct _GtkWidget *eih_get_widget(EImport *ei, EImportTarget *target, EImportImporter *im) +static GtkWidget *eih_get_widget(EImport *ei, EImportTarget *target, EImportImporter *im) { struct _EImportHookImporter *ihook = (EImportHookImporter *)im; EImportHook *hook = im->user_data; diff --git a/e-util/e-import.h b/e-util/e-import.h index 4474db18da..84c5061132 100644 --- a/e-util/e-import.h +++ b/e-util/e-import.h @@ -24,14 +24,11 @@ #ifndef __E_IMPORT_H__ #define __E_IMPORT_H__ -#include -#include "libedataserver/e-msgport.h" +#include +#include G_BEGIN_DECLS -struct _GtkWindow; -struct _GtkWidget; - /* This is an importer function */ typedef struct _EImport EImport; @@ -47,7 +44,7 @@ typedef void (*EImportStatusFunc)(EImport *ei, const gchar *what, gint pc, gpoin typedef void (*EImportFactoryFunc)(EImport *ei, gpointer data); typedef void (*EImportImporterFunc)(EImportImporter *importer, gpointer data); typedef gboolean (*EImportSupportedFunc)(EImport *ei, EImportTarget *, EImportImporter *im); -typedef struct _GtkWidget *(*EImportWidgetFunc)(EImport *ei, EImportTarget *, EImportImporter *im); +typedef GtkWidget *(*EImportWidgetFunc)(EImport *ei, EImportTarget *, EImportImporter *im); typedef void (*EImportImportFunc)(EImport *ei, EImportTarget *, EImportImporter *im); /* The global target types, implementors may add additional ones */ @@ -180,7 +177,7 @@ EImport *e_import_construct(EImport *, const gchar *id); void e_import_import(EImport *ei, EImportTarget *, EImportImporter *, EImportStatusFunc status, EImportCompleteFunc done, gpointer data); void e_import_cancel(EImport *, EImportTarget *, EImportImporter *); -struct _GtkWidget *e_import_get_widget(EImport *ei, EImportTarget *, EImportImporter *); +GtkWidget *e_import_get_widget(EImport *ei, EImportTarget *, EImportImporter *); void e_import_status(EImport *, EImportTarget *, const gchar *what, gint pc); void e_import_complete(EImport *, EImportTarget *); diff --git a/e-util/e-menu.h b/e-util/e-menu.h index 7b8d6f5ce3..3b2416e46a 100644 --- a/e-util/e-menu.h +++ b/e-util/e-menu.h @@ -24,8 +24,8 @@ #ifndef __E_MENU_H__ #define __E_MENU_H__ -#include -#include "libedataserver/e-msgport.h" +#include +#include G_BEGIN_DECLS @@ -150,7 +150,7 @@ struct _EMenuUIFile { struct _EMenuTarget { struct _EMenu *menu; /* used for virtual methods */ - struct _GtkWidget *widget; /* used if you need a parent toplevel, if available */ + GtkWidget *widget; /* used if you need a parent toplevel, if available */ guint32 type; /* for implementors */ guint32 mask; /* enable/visible mask */ diff --git a/e-util/e-popup.h b/e-util/e-popup.h index 6ca872b186..257234dc81 100644 --- a/e-util/e-popup.h +++ b/e-util/e-popup.h @@ -24,8 +24,8 @@ #ifndef __E_POPUP_H__ #define __E_POPUP_H__ -#include -#include "libedataserver/e-msgport.h" +#include +#include G_BEGIN_DECLS @@ -141,7 +141,7 @@ struct _EPopupItem { struct _EPopupTarget { struct _EPopup *popup; /* used for virtual methods */ - struct _GtkWidget *widget; /* used if you need a parent toplevel, if available */ + GtkWidget *widget; /* used if you need a parent toplevel, if available */ guint32 type; /* targe type, for implementors */ guint32 mask; /* depends on type, visibility mask */ @@ -207,8 +207,8 @@ void e_popup_add_items(EPopup *, GSList *items, const gchar *domain, EPopupItems void e_popup_add_static_items(EPopup *emp, EPopupTarget *target); /* do not call e_popup_create_menu, it can leak structures if not used right */ -struct _GtkMenu *e_popup_create_menu(EPopup *, EPopupTarget *, guint32 mask); -struct _GtkMenu *e_popup_create_menu_once(EPopup *emp, EPopupTarget *, guint32 mask); +GtkMenu *e_popup_create_menu(EPopup *, EPopupTarget *, guint32 mask); +GtkMenu *e_popup_create_menu_once(EPopup *emp, EPopupTarget *, guint32 mask); gpointer e_popup_target_new(EPopup *, gint type, gsize size); void e_popup_target_free(EPopup *, gpointer ); diff --git a/e-util/e-profile-event.h b/e-util/e-profile-event.h index 256bec218a..59d39f5a3a 100644 --- a/e-util/e-profile-event.h +++ b/e-util/e-profile-event.h @@ -31,9 +31,6 @@ G_BEGIN_DECLS -struct _CamelFolder; -struct _CamelMimeMessage; - typedef struct _EProfileEvent EProfileEvent; typedef struct _EProfileEventClass EProfileEventClass; diff --git a/e-util/e-util-labels.h b/e-util/e-util-labels.h index 16d67f11ef..f0f3ae3bfe 100644 --- a/e-util/e-util-labels.h +++ b/e-util/e-util-labels.h @@ -22,9 +22,7 @@ #define _E_UTIL_LABELS_H #include - -struct _GtkWindow; -struct _GConfClient; +#include typedef struct { gchar *tag; @@ -38,7 +36,7 @@ GSList * e_util_labels_parse (struct _GConfClient *client); void e_util_labels_free (GSList *labels); gchar * e_util_labels_add (const gchar *name, const GdkColor *color); -gchar * e_util_labels_add_with_dlg (struct _GtkWindow *parent, const gchar *tag); +gchar * e_util_labels_add_with_dlg (GtkWindow *parent, const gchar *tag); gboolean e_util_labels_remove (const gchar *tag); gboolean e_util_labels_set_data (const gchar *tag, const gchar *name, const GdkColor *color); -- cgit v1.2.3