ETableSortInfo cleanups.

1 files changed, 27 insertions, 32 deletions

diff --git a/e-util/e-table-sort-info.h b/e-util/e-table-sort-info.h
index b369ff5057..583be6b6dc 100644
--- a/e-util/e-table-sort-info.h
+++ b/e-util/e-table-sort-info.h
@@ -1,4 +1,6 @@
 /*
+ * e-table-sort-info.h
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -6,30 +8,25 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * 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_SORT_INFO_H_
-#define _E_TABLE_SORT_INFO_H_
+#ifndef E_TABLE_SORT_INFO_H
+#define E_TABLE_SORT_INFO_H
 
 #include <glib-object.h>
 #include <libxml/tree.h>
 
+/* Standard GObject macros */
 #define E_TYPE_TABLE_SORT_INFO \
 	(e_table_sort_info_get_type ())
 #define E_TABLE_SORT_INFO(obj) \
@@ -68,62 +65,60 @@ struct _ETableSortInfo {
 	gint sort_count;
 	ETableSortColumn *sortings;
 
-	guint sort_info_changed : 1;
-	guint group_info_changed : 1;
+	gboolean sort_info_changed;
+	gboolean group_info_changed;
 
-	guint can_group : 1;
+	gboolean can_group;
 };
 
 struct _ETableSortInfoClass {
 	GObjectClass parent_class;
 
 	/* Signals */
-	void		(*sort_info_changed)	(ETableSortInfo *info);
-	void		(*group_info_changed)	(ETableSortInfo *info);
+	void		(*sort_info_changed)	(ETableSortInfo *sort_info);
+	void		(*group_info_changed)	(ETableSortInfo *sort_info);
 };
 
 GType		e_table_sort_info_get_type	(void) G_GNUC_CONST;
-
+ETableSortInfo *e_table_sort_info_new		(void);
+gboolean	e_table_sort_info_get_can_group (ETableSortInfo *sort_info);
+void		e_table_sort_info_set_can_group	(ETableSortInfo *sort_info,
+						 gboolean can_group);
 guint		e_table_sort_info_grouping_get_count
-						(ETableSortInfo *info);
+						(ETableSortInfo *sort_info);
 void		e_table_sort_info_grouping_truncate
-						(ETableSortInfo *info,
+						(ETableSortInfo *sort_info,
 						 gint length);
 ETableSortColumn
 		e_table_sort_info_grouping_get_nth
-						(ETableSortInfo *info,
+						(ETableSortInfo *sort_info,
 						 gint n);
 void		e_table_sort_info_grouping_set_nth
-						(ETableSortInfo *info,
+						(ETableSortInfo *sort_info,
 						 gint n,
 						 ETableSortColumn column);
 
 guint		e_table_sort_info_sorting_get_count
-						(ETableSortInfo *info);
+						(ETableSortInfo *sort_info);
 void		e_table_sort_info_sorting_truncate
-						(ETableSortInfo *info,
+						(ETableSortInfo *sort_info,
 						 gint length);
 ETableSortColumn
 		e_table_sort_info_sorting_get_nth
-						(ETableSortInfo *info,
+						(ETableSortInfo *sort_info,
 						 gint n);
 void		e_table_sort_info_sorting_set_nth
-						(ETableSortInfo *info,
+						(ETableSortInfo *sort_info,
 						 gint n,
 						 ETableSortColumn column);
-
-ETableSortInfo *e_table_sort_info_new		(void);
 void		e_table_sort_info_load_from_node
-						(ETableSortInfo *info,
+						(ETableSortInfo *sort_info,
 						 xmlNode *node,
 						 gdouble state_version);
-xmlNode *	e_table_sort_info_save_to_node	(ETableSortInfo *info,
+xmlNode *	e_table_sort_info_save_to_node	(ETableSortInfo *sort_info,
 						 xmlNode *parent);
-ETableSortInfo *e_table_sort_info_duplicate	(ETableSortInfo *info);
-void		e_table_sort_info_set_can_group	(ETableSortInfo *info,
-						 gboolean can_group);
-gboolean	e_table_sort_info_get_can_group (ETableSortInfo *info);
+ETableSortInfo *e_table_sort_info_duplicate	(ETableSortInfo *sort_info);
 
 G_END_DECLS
 
-#endif /* _E_TABLE_SORT_INFO_H_ */
+#endif /* E_TABLE_SORT_INFO_H */