Clean up GalView and related classes.

1 files changed, 56 insertions, 55 deletions

diff --git a/widgets/menus/gal-view.h b/widgets/menus/gal-view.h
index 099a92704c..84c26ba77f 100644
--- a/widgets/menus/gal-view.h
+++ b/widgets/menus/gal-view.h
@@ -21,73 +21,74 @@
  *
  */
 
-#ifndef _GAL_VIEW_H_
-#define _GAL_VIEW_H_
+#ifndef GAL_VIEW_H
+#define GAL_VIEW_H
 
 #include <gtk/gtk.h>
 #include <libxml/tree.h>
 
+/* Standard GObject macros */
+#define GAL_TYPE_VIEW \
+	(gal_view_get_type ())
+#define GAL_VIEW(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), GAL_TYPE_VIEW, GalView))
+#define GAL_VIEW_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), GAL_TYPE_VIEW, GalViewClass))
+#define GAL_IS_VIEW(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), GAL_TYPE_VIEW))
+#define GAL_IS_VIEW_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), GAL_TYPE_VIEW))
+#define GAL_VIEW_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), GAL_TYPE_VIEW, GalViewClass))
+
 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))
-#define GAL_VIEW_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), GAL_VIEW_TYPE, GalViewClass))
-#define GAL_IS_VIEW(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), GAL_VIEW_TYPE))
-#define GAL_IS_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GAL_VIEW_TYPE))
-#define GAL_VIEW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GAL_VIEW_TYPE, GalViewClass))
+typedef struct _GalView GalView;
+typedef struct _GalViewClass GalViewClass;
 
-typedef struct {
-	GObject base;
-} GalView;
+struct _GalView {
+	GObject parent;
+};
 
-typedef struct {
+struct _GalViewClass {
 	GObjectClass parent_class;
 
-	/*
-	 * Virtual methods
-	 */
-	void        (*edit)           (GalView    *view, GtkWindow *parent_window);
-	void        (*load)           (GalView    *view,
-				       const gchar *filename);
-	void        (*save)           (GalView    *view,
-				       const gchar *filename);
-	const gchar *(*get_title)      (GalView    *view);
-	void        (*set_title)      (GalView    *view,
-				       const gchar *title);
-	const gchar *(*get_type_code)  (GalView    *view);
-	GalView    *(*clone)          (GalView    *view);
+	/* Methods */
+	void		(*edit)			(GalView *view,
+						 GtkWindow *parent_window);
+	void		(*load)			(GalView *view,
+						 const gchar *filename);
+	void		(*save)			(GalView *view,
+						 const gchar *filename);
+	const gchar *	(*get_title)		(GalView *view);
+	void		(*set_title)		(GalView *view,
+						 const gchar *title);
+	const gchar *	(*get_type_code)	(GalView *view);
+	GalView *	(*clone)		(GalView *view);
 
 	/* Signals */
-	void        (*changed)        (GalView    *view);
-} GalViewClass;
-
-/* Standard functions */
-GType       gal_view_get_type       (void);
-
-/* Open an editor dialog for this view, modal/transient for the GtkWindow arg. */
-void        gal_view_edit           (GalView    *view,
-				     GtkWindow *parent);
-
-/* xml load and save functions */
-void        gal_view_load           (GalView    *view,
-				     const gchar *filename);
-void        gal_view_save           (GalView    *view,
-				     const gchar *filename);
-
-/* Title functions */
-const gchar *gal_view_get_title      (GalView    *view);
-void        gal_view_set_title      (GalView    *view,
-				     const gchar *title);
-
-/* View type. */
-const gchar *gal_view_get_type_code  (GalView    *view);
-
-/* Cloning the view */
-GalView    *gal_view_clone          (GalView    *view);
-
-/* Changed signal */
-void        gal_view_changed        (GalView    *view);
+	void		(*changed)		(GalView *view);
+};
+
+GType		gal_view_get_type		(void);
+void		gal_view_edit			(GalView *view,
+						 GtkWindow *parent);
+void		gal_view_load			(GalView *view,
+						 const gchar *filename);
+void		gal_view_save			(GalView *view,
+						 const gchar *filename);
+const gchar *	gal_view_get_title		(GalView *view);
+void		gal_view_set_title		(GalView *view,
+						 const gchar *title);
+const gchar *	gal_view_get_type_code		(GalView *view);
+GalView *	gal_view_clone			(GalView *view);
+void		gal_view_changed		(GalView *view);
 
 G_END_DECLS
 
-#endif /* _GAL_VIEW_H_ */
+#endif /* GAL_VIEW_H */