libetable cleanups.

1 files changed, 42 insertions, 30 deletions

diff --git a/widgets/table/e-table-memory.h b/widgets/table/e-table-memory.h
index 8de51b7c5e..853f378c9e 100644
--- a/widgets/table/e-table-memory.h
+++ b/widgets/table/e-table-memory.h
@@ -26,48 +26,60 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <table/e-table-model.h>
 
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define E_TYPE_TABLE_MEMORY \
+	(e_table_memory_get_type ())
+#define E_TABLE_MEMORY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_MEMORY, ETableMemory))
+#define E_TABLE_MEMORY_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_MEMORY, ETableMemoryClass))
+#define E_IS_TABLE_MEMORY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_MEMORY))
+#define E_IS_TABLE_MEMORY_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_MEMORY))
+#define E_TABLE_MEMORY_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_MEMORY, ETableMemoryClass))
 
-#define E_TABLE_MEMORY_TYPE        (e_table_memory_get_type ())
-#define E_TABLE_MEMORY(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_MEMORY_TYPE, ETableMemory))
-#define E_TABLE_MEMORY_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_MEMORY_TYPE, ETableMemoryClass))
-#define E_IS_TABLE_MEMORY(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_MEMORY_TYPE))
-#define E_IS_TABLE_MEMORY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_MEMORY_TYPE))
-#define E_TABLE_MEMORY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TABLE_MEMORY_TYPE, ETableMemoryClass))
+G_BEGIN_DECLS
 
-typedef struct ETableMemory ETableMemory;
-typedef struct ETableMemoryPriv ETableMemoryPriv;
-typedef struct ETableMemoryClass ETableMemoryClass;
+typedef struct _ETableMemory ETableMemory;
+typedef struct _ETableMemoryClass ETableMemoryClass;
+typedef struct _ETableMemoryPrivate ETableMemoryPrivate;
 
-struct ETableMemory {
-	ETableModel base;
-	ETableMemoryPriv *priv;
+struct _ETableMemory {
+	ETableModel parent;
+	ETableMemoryPrivate *priv;
 };
 
-struct ETableMemoryClass {
+struct _ETableMemoryClass {
 	ETableModelClass parent_class;
 };
 
-GType         e_table_memory_get_type     (void);
-void          e_table_memory_construct    (ETableMemory *etable);
-ETableMemory *e_table_memory_new          (void);
+GType		e_table_memory_get_type		(void) G_GNUC_CONST;
+ETableMemory *	e_table_memory_new		(void);
+void		e_table_memory_construct	(ETableMemory *etable);
 
 /* row operations */
-void          e_table_memory_insert  (ETableMemory *etable,
-				      gint           row,
-				      gpointer      data);
-gpointer      e_table_memory_remove  (ETableMemory *etable,
-				      gint           row);
-void          e_table_memory_clear   (ETableMemory *etable);
+void		e_table_memory_insert		(ETableMemory *etable,
+						 gint row,
+						 gpointer data);
+gpointer	e_table_memory_remove		(ETableMemory *etable,
+						 gint row);
+void		e_table_memory_clear		(ETableMemory *etable);
 
 /* Freeze and thaw */
-void          e_table_memory_freeze       (ETableMemory *etable);
-void          e_table_memory_thaw         (ETableMemory *etable);
-gpointer      e_table_memory_get_data     (ETableMemory *etm,
-					   gint           row);
-void          e_table_memory_set_data     (ETableMemory *etm,
-					   gint           row,
-					   gpointer      data);
+void		e_table_memory_freeze		(ETableMemory *etable);
+void		e_table_memory_thaw		(ETableMemory *etable);
+gpointer	e_table_memory_get_data		(ETableMemory *etm,
+						 gint row);
+void		e_table_memory_set_data		(ETableMemory *etm,
+						 gint row,
+						 gpointer data);
 
 G_END_DECLS