ETable-related cleanups.

1 files changed, 51 insertions, 59 deletions

diff --git a/e-util/e-table-model.h b/e-util/e-table-model.h
index 3ed188e11c..60fc11c53c 100644
--- a/e-util/e-table-model.h
+++ b/e-util/e-table-model.h
@@ -1,4 +1,5 @@
 /*
+ * e-table-model.h
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -13,20 +14,14 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
- *
- * Authors:
- *		Chris Lahey <clahey@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
  */
 
 #if !defined (__E_UTIL_H_INSIDE__) && !defined (LIBEUTIL_COMPILATION)
 #error "Only <e-util/e-util.h> should be included directly."
 #endif
 
-#ifndef _E_TABLE_MODEL_H_
-#define _E_TABLE_MODEL_H_
+#ifndef E_TABLE_MODEL_H
+#define E_TABLE_MODEL_H
 
 #include <glib-object.h>
 
@@ -61,49 +56,46 @@ struct _ETableModel {
 struct _ETableModelClass {
 	GObjectClass parent_class;
 
-	/*
-	 * Virtual methods
-	 */
-	gint		(*column_count)		(ETableModel *etm);
-	gint		(*row_count)		(ETableModel *etm);
-	void		(*append_row)		(ETableModel *etm,
+	gint		(*column_count)		(ETableModel *table_model);
+	gint		(*row_count)		(ETableModel *table_model);
+	void		(*append_row)		(ETableModel *table_model,
 						 ETableModel *source,
 						 gint row);
 
-	gpointer	(*value_at)		(ETableModel *etm,
+	gpointer	(*value_at)		(ETableModel *table_model,
 						 gint col,
 						 gint row);
-	void		(*set_value_at)		(ETableModel *etm,
+	void		(*set_value_at)		(ETableModel *table_model,
 						 gint col,
 						 gint row,
 						 gconstpointer value);
-	gboolean	(*is_cell_editable)	(ETableModel *etm,
+	gboolean	(*is_cell_editable)	(ETableModel *table_model,
 						 gint col,
 						 gint row);
 
-	gboolean	(*has_save_id)		(ETableModel *etm);
-	gchar *		(*get_save_id)		(ETableModel *etm,
+	gboolean	(*has_save_id)		(ETableModel *table_model);
+	gchar *		(*get_save_id)		(ETableModel *table_model,
 						 gint row);
 
-	gboolean	(*has_change_pending)	(ETableModel *etm);
+	gboolean	(*has_change_pending)	(ETableModel *table_model);
 
 	/* Allocate a copy of the given value. */
-	gpointer	(*duplicate_value)	(ETableModel *etm,
+	gpointer	(*duplicate_value)	(ETableModel *table_model,
 						 gint col,
 						 gconstpointer value);
 	/* Free an allocated value. */
-	void		(*free_value)		(ETableModel *etm,
+	void		(*free_value)		(ETableModel *table_model,
 						 gint col,
 						 gpointer value);
 	/* Return an allocated empty value. */
-	gpointer	(*initialize_value)	(ETableModel *etm,
+	gpointer	(*initialize_value)	(ETableModel *table_model,
 						 gint col);
 	/* Return TRUE if value is equivalent to an empty cell. */
-	gboolean	(*value_is_empty)	(ETableModel *etm,
+	gboolean	(*value_is_empty)	(ETableModel *table_model,
 						 gint col,
 						 gconstpointer value);
 	/* Return an allocated string. */
-	gchar *		(*value_to_string)	(ETableModel *etm,
+	gchar *		(*value_to_string)	(ETableModel *table_model,
 						 gint col,
 						 gconstpointer value);
 
@@ -120,19 +112,19 @@ struct _ETableModelClass {
 	 * A row inserted: row_inserted
 	 * A row deleted: row_deleted
 	 */
-	void		(*model_pre_change)	(ETableModel *etm);
+	void		(*model_pre_change)	(ETableModel *table_model);
 
-	void		(*model_no_change)	(ETableModel *etm);
-	void		(*model_changed)	(ETableModel *etm);
-	void		(*model_row_changed)	(ETableModel *etm,
+	void		(*model_no_change)	(ETableModel *table_model);
+	void		(*model_changed)	(ETableModel *table_model);
+	void		(*model_row_changed)	(ETableModel *table_model,
 						 gint row);
-	void		(*model_cell_changed)	(ETableModel *etm,
+	void		(*model_cell_changed)	(ETableModel *table_model,
 						 gint col,
 						 gint row);
-	void		(*model_rows_inserted)	(ETableModel *etm,
+	void		(*model_rows_inserted)	(ETableModel *table_model,
 						 gint row,
 						 gint count);
-	void		(*model_rows_deleted)	(ETableModel *etm,
+	void		(*model_rows_deleted)	(ETableModel *table_model,
 						 gint row,
 						 gint count);
 };
@@ -140,78 +132,78 @@ struct _ETableModelClass {
 GType		e_table_model_get_type		(void) G_GNUC_CONST;
 
 /**/
-gint		e_table_model_column_count	(ETableModel *e_table_model);
-const gchar *	e_table_model_column_name	(ETableModel *e_table_model,
+gint		e_table_model_column_count	(ETableModel *table_model);
+const gchar *	e_table_model_column_name	(ETableModel *table_model,
 						 gint col);
-gint		e_table_model_row_count		(ETableModel *e_table_model);
-void		e_table_model_append_row	(ETableModel *e_table_model,
+gint		e_table_model_row_count		(ETableModel *table_model);
+void		e_table_model_append_row	(ETableModel *table_model,
 						 ETableModel *source,
 						 gint row);
 
 /**/
-gpointer	e_table_model_value_at		(ETableModel *e_table_model,
+gpointer	e_table_model_value_at		(ETableModel *table_model,
 						 gint col,
 						 gint row);
-void		e_table_model_set_value_at	(ETableModel *e_table_model,
+void		e_table_model_set_value_at	(ETableModel *table_model,
 						 gint col,
 						 gint row,
 						 gconstpointer value);
-gboolean	e_table_model_is_cell_editable	(ETableModel *e_table_model,
+gboolean	e_table_model_is_cell_editable	(ETableModel *table_model,
 						gint col,
 						 gint row);
 
 /**/
-gboolean	e_table_model_has_save_id	(ETableModel *etm);
-gchar *		e_table_model_get_save_id	(ETableModel *etm,
+gboolean	e_table_model_has_save_id	(ETableModel *table_model);
+gchar *		e_table_model_get_save_id	(ETableModel *table_model,
 						 gint row);
 
 /**/
 gboolean	e_table_model_has_change_pending
-						(ETableModel *etm);
+						(ETableModel *table_model);
 
 /**/
-gpointer	e_table_model_duplicate_value	(ETableModel *e_table_model,
+gpointer	e_table_model_duplicate_value	(ETableModel *table_model,
 						 gint col,
 						 gconstpointer value);
-void		e_table_model_free_value	(ETableModel *e_table_model,
+void		e_table_model_free_value	(ETableModel *table_model,
 						 gint col,
 						 gpointer value);
-gpointer	e_table_model_initialize_value	(ETableModel *e_table_model,
+gpointer	e_table_model_initialize_value	(ETableModel *table_model,
 						 gint col);
-gboolean	e_table_model_value_is_empty	(ETableModel *e_table_model,
+gboolean	e_table_model_value_is_empty	(ETableModel *table_model,
 						 gint col,
 						 gconstpointer value);
-gchar *		e_table_model_value_to_string	(ETableModel *e_table_model,
+gchar *		e_table_model_value_to_string	(ETableModel *table_model,
 						 gint col,
 						 gconstpointer value);
 
 /*
  * Routines for emitting signals on the e_table
  */
-void		e_table_model_pre_change	(ETableModel *e_table_model);
-void		e_table_model_no_change		(ETableModel *e_table_model);
-void		e_table_model_changed		(ETableModel *e_table_model);
-void		e_table_model_row_changed	(ETableModel *e_table_model,
+void		e_table_model_pre_change	(ETableModel *table_model);
+void		e_table_model_no_change		(ETableModel *table_model);
+void		e_table_model_changed		(ETableModel *table_model);
+void		e_table_model_row_changed	(ETableModel *table_model,
 						 gint row);
-void		e_table_model_cell_changed	(ETableModel *e_table_model,
+void		e_table_model_cell_changed	(ETableModel *table_model,
 						 gint col,
 						 gint row);
-void		e_table_model_rows_inserted	(ETableModel *e_table_model,
+void		e_table_model_rows_inserted	(ETableModel *table_model,
 						 gint row,
 						 gint count);
-void		e_table_model_rows_deleted	(ETableModel *e_table_model,
+void		e_table_model_rows_deleted	(ETableModel *table_model,
 						 gint row,
 						 gint count);
 
 /**/
-void		e_table_model_row_inserted	(ETableModel *e_table_model,
+void		e_table_model_row_inserted	(ETableModel *table_model,
 						 gint row);
-void		e_table_model_row_deleted	(ETableModel *e_table_model,
+void		e_table_model_row_deleted	(ETableModel *table_model,
 						 gint row);
 
-void		e_table_model_freeze		(ETableModel *e_table_model);
-void		e_table_model_thaw		(ETableModel *e_table_model);
+void		e_table_model_freeze		(ETableModel *table_model);
+void		e_table_model_thaw		(ETableModel *table_model);
 
 G_END_DECLS
 
-#endif /* _E_TABLE_MODEL_H_ */
+#endif /* E_TABLE_MODEL_H */