Clean up GalView and related classes.

1 files changed, 48 insertions, 33 deletions

diff --git a/widgets/menus/gal-view-etable.h b/widgets/menus/gal-view-etable.h
index 4ae1d3e9b0..cfccf1e15b 100644
--- a/widgets/menus/gal-view-etable.h
+++ b/widgets/menus/gal-view-etable.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef _GAL_VIEW_ETABLE_H_
-#define _GAL_VIEW_ETABLE_H_
+#ifndef GAL_VIEW_ETABLE_H
+#define GAL_VIEW_ETABLE_H
 
 #include <gtk/gtk.h>
 #include <menus/gal-view.h>
@@ -31,47 +31,62 @@
 #include <table/e-table.h>
 #include <table/e-tree.h>
 
+/* Standard GObject macros */
+#define GAL_TYPE_VIEW_ETABLE \
+	(gal_view_etable_get_type ())
+#define GAL_VIEW_ETABLE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), GAL_TYPE_VIEW_ETABLE, GalViewEtable))
+#define GAL_VIEW_ETABLE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), GAL_TYPE_VIEW_ETABLE, GalViewEtableClass))
+#define GAL_IS_VIEW_ETABLE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), GAL_TYPE_VIEW_ETABLE))
+#define GAL_IS_VIEW_ETABLE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), GAL_TYPE_VIEW_ETABLE))
+#define GAL_VIEW_ETABLE_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), GAL_TYPE_VIEW_ETABLE, GalViewEtableClass))
+
 G_BEGIN_DECLS
 
-#define GAL_VIEW_ETABLE_TYPE        (gal_view_etable_get_type ())
-#define GAL_VIEW_ETABLE(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_VIEW_ETABLE_TYPE, GalViewEtable))
-#define GAL_VIEW_ETABLE_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), GAL_VIEW_ETABLE_TYPE, GalViewEtableClass))
-#define GAL_IS_VIEW_ETABLE(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GAL_VIEW_ETABLE_TYPE))
-#define GAL_IS_VIEW_ETABLE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GAL_VIEW_ETABLE_TYPE))
+typedef struct _GalViewEtable GalViewEtable;
+typedef struct _GalViewEtableClass GalViewEtableClass;
 
-typedef struct {
-	GalView base;
+struct _GalViewEtable {
+	GalView parent;
 
 	ETableSpecification *spec;
-	ETableState         *state;
-	gchar                *title;
+	ETableState *state;
+	gchar *title;
 
-	ETable              *table;
-	guint                table_state_changed_id;
+	ETable *table;
+	guint table_state_changed_id;
 
-	ETree               *tree;
-	guint                tree_state_changed_id;
-} GalViewEtable;
+	ETree *tree;
+	guint tree_state_changed_id;
+};
 
-typedef struct {
+struct _GalViewEtableClass {
 	GalViewClass parent_class;
-} GalViewEtableClass;
+};
 
-/* Standard functions */
-GType    gal_view_etable_get_type      (void);
-GalView *gal_view_etable_new           (ETableSpecification *spec,
-					const gchar         *title);
-GalView *gal_view_etable_construct     (GalViewEtable       *view,
-					ETableSpecification *spec,
-					const gchar         *title);
-void     gal_view_etable_set_state     (GalViewEtable       *view,
-					ETableState         *state);
-void     gal_view_etable_attach_table  (GalViewEtable       *view,
-					ETable              *table);
-void     gal_view_etable_attach_tree   (GalViewEtable       *view,
-					ETree               *tree);
-void     gal_view_etable_detach        (GalViewEtable       *view);
+GType		gal_view_etable_get_type	(void);
+GalView *	gal_view_etable_new		(ETableSpecification *spec,
+						 const gchar *title);
+GalView *	gal_view_etable_construct	(GalViewEtable *view,
+						 ETableSpecification *spec,
+						 const gchar *title);
+void		gal_view_etable_set_state	(GalViewEtable *view,
+						 ETableState *state);
+void		gal_view_etable_attach_table	(GalViewEtable *view,
+						 ETable *table);
+void		gal_view_etable_attach_tree	(GalViewEtable *view,
+						 ETree *tree);
+void		gal_view_etable_detach		(GalViewEtable *view);
 
 G_END_DECLS
 
-#endif /* _GAL_VIEW_ETABLE_H_ */
+#endif /* GAL_VIEW_ETABLE_H */