GNOME.org
 

gnumeric r16680 - in trunk: plugins/corba plugins/excel plugins/paradox plugins/qpro src src/tools src/widgets

Author: jody
Date: Sat Jun 28 21:31:24 2008
New Revision: 16680
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16680&view=rev

Log:
minor gcc -pedantic warnings

Modified:
   trunk/plugins/corba/corba-application.c
   trunk/plugins/corba/corba-sheet.c
   trunk/plugins/excel/ms-formula-read.c
   trunk/plugins/excel/ms-pivot.c
   trunk/plugins/excel/xlsx-read.c
   trunk/plugins/paradox/paradox.c
   trunk/plugins/qpro/qpro.h
   trunk/src/application.c
   trunk/src/clipboard.c
   trunk/src/commands.c
   trunk/src/complete-sheet.c
   trunk/src/complete.c
   trunk/src/dependent.c
   trunk/src/expr.c
   trunk/src/func.h
   trunk/src/gnm-graph-window.c
   trunk/src/gnm-pane.c
   trunk/src/gnm-so-filled.c
   trunk/src/gnm-so-line.c
   trunk/src/gnm-so-polygon.c
   trunk/src/gnumeric-simple-canvas.c
   trunk/src/graph.c
   trunk/src/gui-util.h
   trunk/src/item-acetate.c
   trunk/src/item-bar.c
   trunk/src/item-cursor.c
   trunk/src/item-edit.c
   trunk/src/item-grid.c
   trunk/src/mstyle.c
   trunk/src/preview-grid.c
   trunk/src/rendered-value.c
   trunk/src/sheet-control.c
   trunk/src/sheet-filter.c
   trunk/src/sheet-object-cell-comment.c
   trunk/src/sheet-object-graph.c
   trunk/src/sheet-object-image.c
   trunk/src/sheet-object-widget.c
   trunk/src/sheet-object.c
   trunk/src/sheet-style.c
   trunk/src/sheet-view.c
   trunk/src/sheet.c
   trunk/src/stf-export.c
   trunk/src/stf-parse.c
   trunk/src/style-color.c
   trunk/src/tools/analysis-tools.c
   trunk/src/tools/dao.c
   trunk/src/validation.c
   trunk/src/value-sheet.c
   trunk/src/widgets/gnumeric-dashed-canvas-line.c
   trunk/src/workbook-control.c
   trunk/src/workbook-view.c
   trunk/src/workbook.c
   trunk/src/xml-io.c
   trunk/src/xml-sax-read.c

Modified: trunk/plugins/corba/corba-application.c
==============================================================================
--- trunk/plugins/corba/corba-application.c	(original)
+++ trunk/plugins/corba/corba-application.c	Sat Jun 28 21:31:24 2008
@@ -108,7 +108,7 @@
 static BONOBO_TYPE_FUNC_FULL (CorbaApplication,
 		       GNOME_Gnumeric_Application,
 		       BONOBO_OBJECT_TYPE,
-		       capp);
+		       capp)
 
 /***************************************************************/
 static CorbaApplication *capp = NULL;

Modified: trunk/plugins/corba/corba-sheet.c
==============================================================================
--- trunk/plugins/corba/corba-sheet.c	(original)
+++ trunk/plugins/corba/corba-sheet.c	Sat Jun 28 21:31:24 2008
@@ -137,7 +137,7 @@
 BONOBO_TYPE_FUNC_FULL (CorbaSheet,
 		       GNOME_Gnumeric_Sheet,
 		       BONOBO_OBJECT_TYPE,
-		       csheet);
+		       csheet)
 
 /*************************************************************************/
 
@@ -170,7 +170,7 @@
 }
 
 GSF_CLASS (SheetControlCORBA, sheet_control_corba,
-	   scc_class_init, scc_init, SHEET_CONTROL_TYPE);
+	   scc_class_init, scc_init, SHEET_CONTROL_TYPE)
 
 SheetControl *
 sheet_control_corba_new (SheetView *sv)

Modified: trunk/plugins/excel/ms-formula-read.c
==============================================================================
--- trunk/plugins/excel/ms-formula-read.c	(original)
+++ trunk/plugins/excel/ms-formula-read.c	Sat Jun 28 21:31:24 2008
@@ -571,7 +571,7 @@
 static void
 parse_list_push (GnmExprList **list, GnmExpr const *pd)
 {
-	d (5, fprintf (stderr, "Push 0x%p\n", pd););
+	d (5, fprintf (stderr, "Push 0x%p\n", (void *)pd););
 	if (pd == NULL) {
 		g_warning ("FIXME: Pushing nothing onto excel function stack");
 		pd = xl_expr_err (NULL, -1, -1,
@@ -595,7 +595,7 @@
 	if (tmp != NULL) {
 		GnmExpr const *ans = tmp->data;
 		*list = g_slist_remove (*list, ans);
-		d (5, fprintf (stderr, "Pop 0x%p\n", ans););
+		d (5, fprintf (stderr, "Pop 0x%p\n", (void *)ans););
 		return ans;
 	}
 
@@ -1462,7 +1462,7 @@
 				} else
 				{
 					g_warning ("EXCEL: %x (of %x) UNKNOWN name %p.",
-						   name_idx, names ? names->len : 0xffffffff, container);
+						   name_idx, names ? names->len : 0xffffffff, (void *)container);
 					name = gnm_expr_new_constant (
 						value_new_error_NAME (NULL));
 				}
@@ -1595,7 +1595,7 @@
 			if (names == NULL || name_idx < 1 || names->len < name_idx ||
 			    (nexpr = g_ptr_array_index (names, name_idx-1)) == NULL) {
 				g_warning ("EXCEL: %x (of %x) UNKNOWN name %p.",
-					   name_idx, names ? names->len : 0xffffffff, container);
+					   name_idx, names ? names->len : 0xffffffff, (void *)container);
 				name = gnm_expr_new_constant (
 					value_new_error_REF (NULL));
 			} else {

Modified: trunk/plugins/excel/ms-pivot.c
==============================================================================
--- trunk/plugins/excel/ms-pivot.c	(original)
+++ trunk/plugins/excel/ms-pivot.c	Sat Jun 28 21:31:24 2008
@@ -162,7 +162,7 @@
 			d (4, gsf_mem_dump (q->data + 2, MIN (q->length, 0xc)););
 
 from OOo, but this seems like a crock.  My tests indicate something else
-// known data types
+/* known data types */
 const sal_uInt16 EXC_SXFIELD_DATA_NONE      = 0x0000;   /// Special state for groupings.
 const sal_uInt16 EXC_SXFIELD_DATA_STR       = 0x0480;   /// Only strings, nothing else.
 const sal_uInt16 EXC_SXFIELD_DATA_INT       = 0x0520;   /// Only integers, opt. with doubles.

Modified: trunk/plugins/excel/xlsx-read.c
==============================================================================
--- trunk/plugins/excel/xlsx-read.c	(original)
+++ trunk/plugins/excel/xlsx-read.c	Sat Jun 28 21:31:24 2008
@@ -1359,6 +1359,7 @@
 static void
 xlsx_draw_color_themed (GsfXMLIn *xin, xmlChar const **attrs)
 {
+#if 0
 	static EnumVal const colors[] = {
 		{ "bg1",	 0 }, /* Background Color 1 */
 		{ "tx1",	 1 }, /* Text Color 1 */
@@ -1379,6 +1380,7 @@
 		{ "lt2",	16 }, /* Light Color 2 */
 		{ NULL, 0 }
 	};
+#endif
 
 	XLSXReadState *state = (XLSXReadState *)xin->user_state;
 	gpointer val = NULL;

Modified: trunk/plugins/paradox/paradox.c
==============================================================================
--- trunk/plugins/paradox/paradox.c	(original)
+++ trunk/plugins/paradox/paradox.c	Sat Jun 28 21:31:24 2008
@@ -137,7 +137,7 @@
 					char *value;
 					if (0 < PX_get_data_alpha (pxdoc, &data[offset], pxf->px_flen, &value)) {
 						val = value_new_string_nocopy (value);
-//							value_set_fmt (val, field->fmt);
+/*							value_set_fmt (val, field->fmt); */
 					}
 					break;
 				}

Modified: trunk/plugins/qpro/qpro.h
==============================================================================
--- trunk/plugins/qpro/qpro.h	(original)
+++ trunk/plugins/qpro/qpro.h	Sat Jun 28 21:31:24 2008
@@ -189,7 +189,7 @@
 	QPRO_UNDOCUMENTED_1011			= 1011,
 
 	QPRO_LAST_SANE_ID			= 1999,
-	QPRO_UNKNOWN				= 0xdead,
+	QPRO_UNKNOWN				= 0xdead
 } QProRecord;
 
 typedef enum {

Modified: trunk/src/application.c
==============================================================================
--- trunk/src/application.c	(original)
+++ trunk/src/application.c	Sat Jun 28 21:31:24 2008
@@ -798,7 +798,7 @@
 
 GSF_CLASS (GnmApp, gnm_app,
 	   gnm_app_class_init, gnm_app_init,
-	   G_TYPE_OBJECT);
+	   G_TYPE_OBJECT)
 
 /**********************************************************************/
 static GSList *extra_uis = NULL;

Modified: trunk/src/clipboard.c
==============================================================================
--- trunk/src/clipboard.c	(original)
+++ trunk/src/clipboard.c	Sat Jun 28 21:31:24 2008
@@ -1038,7 +1038,7 @@
 cb_cell_copy_pool_leak (gpointer data, G_GNUC_UNUSED gpointer user)
 {
 	GnmCellCopy const *cc = data;
-	g_printerr ("Leaking cell copy at %p.\n", cc);
+	g_printerr ("Leaking cell copy at %p.\n", (void *)cc);
 }
 #endif
 

Modified: trunk/src/commands.c
==============================================================================
--- trunk/src/commands.c	(original)
+++ trunk/src/commands.c	Sat Jun 28 21:31:24 2008
@@ -151,7 +151,7 @@
 
 static GSF_CLASS (GnmCommand, gnm_command,
 		  NULL, NULL,
-		  G_TYPE_OBJECT);
+		  G_TYPE_OBJECT)
 
 /* Store the real GObject dtor pointer */
 static void (* g_object_dtor) (GObject *object) = NULL;
@@ -190,7 +190,7 @@
 }									\
 typedef GnmCommandClass type ## Class;					\
 static GSF_CLASS (type, func,						\
-		  func ## _class_init, NULL, GNM_COMMAND_TYPE);
+		  func ## _class_init, NULL, GNM_COMMAND_TYPE)
 
 /******************************************************************/
 
@@ -802,7 +802,7 @@
 		orig->text, orig->markup);
 #warning validation from workbook-edit
 }
-MAKE_GNM_COMMAND (CmdSetText, cmd_set_text, cmd_set_text_repeat);
+MAKE_GNM_COMMAND (CmdSetText, cmd_set_text, cmd_set_text_repeat)
 
 static gboolean
 cmd_set_text_undo (GnmCommand *cmd, WorkbookControl *wbc)
@@ -1053,7 +1053,7 @@
 	cmd_area_set_text (wbc, sv,
 		orig->text, orig->as_array);
 }
-MAKE_GNM_COMMAND (CmdAreaSetText, cmd_area_set_text, cmd_area_set_text_repeat);
+MAKE_GNM_COMMAND (CmdAreaSetText, cmd_area_set_text, cmd_area_set_text_repeat)
 
 static gboolean
 cmd_area_set_text_undo (GnmCommand *cmd, WorkbookControl *wbc)
@@ -1291,7 +1291,7 @@
 	}
 }
 
-MAKE_GNM_COMMAND (CmdInsDelColRow, cmd_ins_del_colrow, cmd_ins_del_colrow_repeat);
+MAKE_GNM_COMMAND (CmdInsDelColRow, cmd_ins_del_colrow, cmd_ins_del_colrow_repeat)
 
 static gboolean
 cmd_ins_del_colrow_undo (GnmCommand *cmd, WorkbookControl *wbc)
@@ -1519,7 +1519,7 @@
 	CmdClear const *orig = (CmdClear const *) cmd;
 	cmd_selection_clear (wbc, orig->clear_flags);
 }
-MAKE_GNM_COMMAND (CmdClear, cmd_clear, cmd_clear_repeat);
+MAKE_GNM_COMMAND (CmdClear, cmd_clear, cmd_clear_repeat)
 
 static gboolean
 cmd_clear_undo (GnmCommand *cmd, WorkbookControl *wbc)
@@ -1712,7 +1712,7 @@
 
 	cmd_selection_format (wbc, orig->new_style, orig->borders, NULL);
 }
-MAKE_GNM_COMMAND (CmdFormat, cmd_format, cmd_format_repeat);
+MAKE_GNM_COMMAND (CmdFormat, cmd_format, cmd_format_repeat)
 
 static gboolean
 cmd_format_undo (GnmCommand *cmd,
@@ -1928,7 +1928,7 @@
 	int		 new_size;
 } CmdResizeColRow;
 
-MAKE_GNM_COMMAND (CmdResizeColRow, cmd_resize_colrow, NULL);
+MAKE_GNM_COMMAND (CmdResizeColRow, cmd_resize_colrow, NULL)
 
 static gboolean
 cmd_resize_colrow_undo (GnmCommand *cmd,
@@ -2058,7 +2058,7 @@
 	GnmCellRegion *old_contents;
 } CmdSort;
 
-MAKE_GNM_COMMAND (CmdSort, cmd_sort, NULL);
+MAKE_GNM_COMMAND (CmdSort, cmd_sort, NULL)
 
 static void
 cmd_sort_finalize (GObject *cmd)
@@ -2158,7 +2158,7 @@
 	CmdColRowHide const *orig = (CmdColRowHide const *) cmd;
 	cmd_selection_colrow_hide (wbc, orig->is_cols, orig->show != NULL);
 }
-MAKE_GNM_COMMAND (CmdColRowHide, cmd_colrow_hide, cmd_colrow_hide_repeat);
+MAKE_GNM_COMMAND (CmdColRowHide, cmd_colrow_hide, cmd_colrow_hide_repeat)
 
 /**
  * cmd_colrow_hide_correct_selection :
@@ -2390,7 +2390,7 @@
 	CmdGroup const *orig = (CmdGroup const *) cmd;
 	cmd_selection_group (wbc, orig->is_cols, orig->group);
 }
-MAKE_GNM_COMMAND (CmdGroup, cmd_group, cmd_group_repeat);
+MAKE_GNM_COMMAND (CmdGroup, cmd_group, cmd_group_repeat)
 
 static gboolean
 cmd_group_undo (GnmCommand *cmd,
@@ -2499,7 +2499,7 @@
 	GnmCellRegion *deleted_sheet_contents;
 } CmdPasteCut;
 
-MAKE_GNM_COMMAND (CmdPasteCut, cmd_paste_cut, NULL);
+MAKE_GNM_COMMAND (CmdPasteCut, cmd_paste_cut, NULL)
 
 typedef struct {
 	GnmPasteTarget pt;
@@ -2813,7 +2813,7 @@
 	cmd_paste_copy (wbc, &new_dst,
 		clipboard_copy_range (orig->dst.sheet, &orig->dst.range));
 }
-MAKE_GNM_COMMAND (CmdPasteCopy, cmd_paste_copy, cmd_paste_copy_repeat);
+MAKE_GNM_COMMAND (CmdPasteCopy, cmd_paste_copy, cmd_paste_copy_repeat)
 
 static int
 by_addr (gconstpointer a, gconstpointer b)
@@ -3097,7 +3097,7 @@
 	      r->start.row + (orig->end_row - orig->base_row),
 	      orig->inverse_autofill);
 }
-MAKE_GNM_COMMAND (CmdAutofill, cmd_autofill, cmd_autofill_repeat);
+MAKE_GNM_COMMAND (CmdAutofill, cmd_autofill, cmd_autofill_repeat)
 
 static gboolean
 cmd_autofill_undo (GnmCommand *cmd, WorkbookControl *wbc)
@@ -3290,7 +3290,7 @@
 	CmdCopyRel const *orig = (CmdCopyRel const *) cmd;
 	cmd_copyrel (wbc, orig->dx, orig->dy, orig->name);
 }
-MAKE_GNM_COMMAND (CmdCopyRel, cmd_copyrel, cmd_copyrel_repeat);
+MAKE_GNM_COMMAND (CmdCopyRel, cmd_copyrel, cmd_copyrel_repeat)
 
 static gboolean
 cmd_copyrel_undo (GnmCommand *cmd, WorkbookControl *wbc)
@@ -3443,7 +3443,7 @@
 	CmdAutoFormat const *orig = (CmdAutoFormat const *) cmd;
 	cmd_selection_autoformat (wbc, format_template_clone (orig->ft));
 }
-MAKE_GNM_COMMAND (CmdAutoFormat, cmd_autoformat, cmd_autoformat_repeat);
+MAKE_GNM_COMMAND (CmdAutoFormat, cmd_autoformat, cmd_autoformat_repeat)
 
 static gboolean
 cmd_autoformat_undo (GnmCommand *cmd,
@@ -3592,7 +3592,7 @@
 	cmd_unmerge_cells (wbc, sv_sheet (sv), range_list);
 	range_fragment_free (range_list);
 }
-MAKE_GNM_COMMAND (CmdUnmergeCells, cmd_unmerge_cells, cmd_unmerge_cells_repeat);
+MAKE_GNM_COMMAND (CmdUnmergeCells, cmd_unmerge_cells, cmd_unmerge_cells_repeat)
 
 static gboolean
 cmd_unmerge_cells_undo (GnmCommand *cmd, WorkbookControl *wbc)
@@ -3715,7 +3715,7 @@
 static void
 cmd_merge_cells_repeat (GnmCommand const *cmd, WorkbookControl *wbc);
 
-MAKE_GNM_COMMAND (CmdMergeCells, cmd_merge_cells, cmd_merge_cells_repeat);
+MAKE_GNM_COMMAND (CmdMergeCells, cmd_merge_cells, cmd_merge_cells_repeat)
 
 static void
 cmd_merge_cells_repeat (GnmCommand const *cmd, WorkbookControl *wbc)
@@ -3886,7 +3886,7 @@
 	GList *cells;
 } CmdSearchReplace;
 
-MAKE_GNM_COMMAND (CmdSearchReplace, cmd_search_replace, NULL);
+MAKE_GNM_COMMAND (CmdSearchReplace, cmd_search_replace, NULL)
 
 typedef enum { SRI_text, SRI_comment } SearchReplaceItemType;
 
@@ -4261,7 +4261,7 @@
 	double           old_default;
 } CmdColRowStdSize;
 
-MAKE_GNM_COMMAND (CmdColRowStdSize, cmd_colrow_std_size, NULL);
+MAKE_GNM_COMMAND (CmdColRowStdSize, cmd_colrow_std_size, NULL)
 
 static gboolean
 cmd_colrow_std_size_undo (GnmCommand *cmd,
@@ -4344,7 +4344,7 @@
 	double          *old_factors;
 } CmdZoom;
 
-MAKE_GNM_COMMAND (CmdZoom, cmd_zoom, NULL);
+MAKE_GNM_COMMAND (CmdZoom, cmd_zoom, NULL)
 
 static gboolean
 cmd_zoom_undo (GnmCommand *cmd,
@@ -4453,7 +4453,7 @@
 	GArray *location;
 } CmdObjectsDelete;
 
-MAKE_GNM_COMMAND (CmdObjectsDelete, cmd_objects_delete, NULL);
+MAKE_GNM_COMMAND (CmdObjectsDelete, cmd_objects_delete, NULL)
 
 static gboolean
 cmd_objects_delete_redo (GnmCommand *cmd,
@@ -4547,7 +4547,7 @@
 	gboolean objects_created, first_time;
 } CmdObjectsMove;
 
-MAKE_GNM_COMMAND (CmdObjectsMove, cmd_objects_move, NULL);
+MAKE_GNM_COMMAND (CmdObjectsMove, cmd_objects_move, NULL)
 
 static gboolean
 cmd_objects_move_redo (GnmCommand *cmd,
@@ -4632,7 +4632,7 @@
 	gboolean  first_time;
 } CmdObjectFormat;
 
-MAKE_GNM_COMMAND (CmdObjectFormat, cmd_object_format, NULL);
+MAKE_GNM_COMMAND (CmdObjectFormat, cmd_object_format, NULL)
 
 static gboolean
 cmd_object_format_redo (GnmCommand *cmd, G_GNUC_UNUSED WorkbookControl *wbc)
@@ -4705,7 +4705,7 @@
 	Sheet *redo_sheet;
 } CmdReorganizeSheets;
 
-MAKE_GNM_COMMAND (CmdReorganizeSheets, cmd_reorganize_sheets, NULL);
+MAKE_GNM_COMMAND (CmdReorganizeSheets, cmd_reorganize_sheets, NULL)
 
 static gboolean
 cmd_reorganize_sheets_undo (GnmCommand *cmd, WorkbookControl *wbc)
@@ -4825,7 +4825,7 @@
 	gchar		*old_text;
 } CmdSetComment;
 
-MAKE_GNM_COMMAND (CmdSetComment, cmd_set_comment, NULL);
+MAKE_GNM_COMMAND (CmdSetComment, cmd_set_comment, NULL)
 
 static gboolean
 cmd_set_comment_apply (Sheet *sheet, GnmCellPos *pos, char const *text)
@@ -4946,7 +4946,7 @@
 	GnmCellRegion              *old_contents;
 } CmdAnalysis_Tool;
 
-MAKE_GNM_COMMAND (CmdAnalysis_Tool, cmd_analysis_tool, NULL);
+MAKE_GNM_COMMAND (CmdAnalysis_Tool, cmd_analysis_tool, NULL)
 
 static gboolean
 cmd_analysis_tool_undo (GnmCommand *cmd, WorkbookControl *wbc)
@@ -5145,7 +5145,7 @@
 	gint n;
 } CmdMergeData;
 
-MAKE_GNM_COMMAND (CmdMergeData, cmd_merge_data, NULL);
+MAKE_GNM_COMMAND (CmdMergeData, cmd_merge_data, NULL)
 
 static void
 cmd_merge_data_delete_sheets (gpointer data, gpointer success)
@@ -5313,7 +5313,7 @@
 	GSList *removed_names;
 } CmdChangeMetaData;
 
-MAKE_GNM_COMMAND (CmdChangeMetaData, cmd_change_summary, NULL);
+MAKE_GNM_COMMAND (CmdChangeMetaData, cmd_change_summary, NULL)
 
 static gboolean
 cmd_change_summary_undo (GnmCommand *cmd, WorkbookControl *wbc)
@@ -5394,7 +5394,7 @@
 	gint        changed_positions;
 } CmdObjectRaise;
 
-MAKE_GNM_COMMAND (CmdObjectRaise, cmd_object_raise, NULL);
+MAKE_GNM_COMMAND (CmdObjectRaise, cmd_object_raise, NULL)
 
 static gboolean
 cmd_object_raise_redo (GnmCommand *cmd,
@@ -5482,7 +5482,7 @@
 	PrintInformation *new_pi;
 } CmdPrintSetup;
 
-MAKE_GNM_COMMAND (CmdPrintSetup, cmd_print_setup, NULL);
+MAKE_GNM_COMMAND (CmdPrintSetup, cmd_print_setup, NULL)
 
 static gboolean
 cmd_print_setup_undo (GnmCommand *cmd, WorkbookControl *wbc)
@@ -5598,7 +5598,7 @@
 	gboolean	 placeholder;
 } CmdDefineName;
 
-MAKE_GNM_COMMAND (CmdDefineName, cmd_define_name, NULL);
+MAKE_GNM_COMMAND (CmdDefineName, cmd_define_name, NULL)
 
 static gboolean
 cmd_define_name_undo (GnmCommand *cmd,
@@ -5757,7 +5757,7 @@
 	const GnmExprTop *texpr;
 } CmdRemoveName;
 
-MAKE_GNM_COMMAND (CmdRemoveName, cmd_remove_name, NULL);
+MAKE_GNM_COMMAND (CmdRemoveName, cmd_remove_name, NULL)
 
 static gboolean
 cmd_remove_name_undo (GnmCommand *cmd,
@@ -5844,7 +5844,7 @@
 	scenario_t     *scenario;
 } CmdScenarioAdd;
 
-MAKE_GNM_COMMAND (CmdScenarioAdd, cmd_scenario_add, NULL);
+MAKE_GNM_COMMAND (CmdScenarioAdd, cmd_scenario_add, NULL)
 
 static gboolean
 cmd_scenario_add_redo (GnmCommand *cmd, WorkbookControl *wbc)
@@ -5906,7 +5906,7 @@
 	scenario_cmd_t  *sc;
 } CmdScenarioMngr;
 
-MAKE_GNM_COMMAND (CmdScenarioMngr, cmd_scenario_mngr, NULL);
+MAKE_GNM_COMMAND (CmdScenarioMngr, cmd_scenario_mngr, NULL)
 
 static gboolean
 cmd_scenario_mngr_redo (GnmCommand *cmd, WorkbookControl *wbc)
@@ -5983,7 +5983,7 @@
 	data_shuffling_t *ds;
 } CmdDataShuffle;
 
-MAKE_GNM_COMMAND (CmdDataShuffle, cmd_data_shuffle, NULL);
+MAKE_GNM_COMMAND (CmdDataShuffle, cmd_data_shuffle, NULL)
 
 static gboolean
 cmd_data_shuffle_redo (GnmCommand *cmd, WorkbookControl *wbc)
@@ -6046,7 +6046,7 @@
 	ColRowStateList *saved_sizes;
 } CmdTextToColumns;
 
-MAKE_GNM_COMMAND (CmdTextToColumns, cmd_text_to_columns, NULL);
+MAKE_GNM_COMMAND (CmdTextToColumns, cmd_text_to_columns, NULL)
 
 static gboolean
 cmd_text_to_columns_impl (GnmCommand *cmd, WorkbookControl *wbc,
@@ -6167,7 +6167,7 @@
 	GSList	  *nv;
 } CmdSolver;
 
-MAKE_GNM_COMMAND (CmdSolver, cmd_solver, NULL);
+MAKE_GNM_COMMAND (CmdSolver, cmd_solver, NULL)
 
 static gboolean
 cmd_solver_impl (GSList *cell_stack, GSList *value_stack)
@@ -6297,7 +6297,7 @@
 	GnmValue  *nv;
 } CmdGoalSeek;
 
-MAKE_GNM_COMMAND (CmdGoalSeek, cmd_goal_seek, NULL);
+MAKE_GNM_COMMAND (CmdGoalSeek, cmd_goal_seek, NULL)
 
 static gboolean
 cmd_goal_seek_impl (GnmCell *cell, GnmValue *value)
@@ -6379,7 +6379,7 @@
 	GnmCellPos	   pos;
 } CmdFreezePanes;
 
-MAKE_GNM_COMMAND (CmdFreezePanes, cmd_freeze_panes, NULL);
+MAKE_GNM_COMMAND (CmdFreezePanes, cmd_freeze_panes, NULL)
 
 static gboolean
 cmd_freeze_panes_undo (GnmCommand *cmd, WorkbookControl *wbc)
@@ -6446,7 +6446,7 @@
 	GnmTabulateInfo *data;
 } CmdTabulate;
 
-MAKE_GNM_COMMAND (CmdTabulate, cmd_tabulate, NULL);
+MAKE_GNM_COMMAND (CmdTabulate, cmd_tabulate, NULL)
 
 static gint
 cmd_reorganize_sheets_delete_cmp_f (gconstpointer a,
@@ -6537,7 +6537,7 @@
 	GogGraph *old_graph;
 } CmdSOGraphConfig;
 
-MAKE_GNM_COMMAND (CmdSOGraphConfig, cmd_so_graph_config, NULL);
+MAKE_GNM_COMMAND (CmdSOGraphConfig, cmd_so_graph_config, NULL)
 
 static gboolean
 cmd_so_graph_config_redo (GnmCommand *cmd,
@@ -6604,7 +6604,7 @@
 
 typedef GnmCommand CmdToggleRTL;
 
-MAKE_GNM_COMMAND (CmdToggleRTL, cmd_toggle_rtl, NULL);
+MAKE_GNM_COMMAND (CmdToggleRTL, cmd_toggle_rtl, NULL)
 
 static gboolean
 cmd_toggle_rtl_redo (GnmCommand *cmd, G_GNUC_UNUSED WorkbookControl *wbc)
@@ -6653,7 +6653,7 @@
 	GOUndo *undo;
 } CmdSOSetValue;
 
-MAKE_GNM_COMMAND (CmdSOSetValue, cmd_so_set_value, NULL);
+MAKE_GNM_COMMAND (CmdSOSetValue, cmd_so_set_value, NULL)
 
 static gboolean
 cmd_so_set_value_redo (GnmCommand *cmd, G_GNUC_UNUSED WorkbookControl *wbc)

Modified: trunk/src/complete-sheet.c
==============================================================================
--- trunk/src/complete-sheet.c	(original)
+++ trunk/src/complete-sheet.c	Sat Jun 28 21:31:24 2008
@@ -140,4 +140,4 @@
 }
 
 GSF_CLASS (CompleteSheet, complete_sheet,
-	   complete_sheet_class_init, NULL, PARENT_TYPE);
+	   complete_sheet_class_init, NULL, PARENT_TYPE)

Modified: trunk/src/complete.c
==============================================================================
--- trunk/src/complete.c	(original)
+++ trunk/src/complete.c	Sat Jun 28 21:31:24 2008
@@ -109,4 +109,4 @@
 }
 
 GSF_CLASS (Complete, complete,
-	   &complete_class_init, NULL, PARENT_TYPE);
+	   &complete_class_init, NULL, PARENT_TYPE)

Modified: trunk/src/dependent.c
==============================================================================
--- trunk/src/dependent.c	(original)
+++ trunk/src/dependent.c	Sat Jun 28 21:31:24 2008
@@ -1236,7 +1236,7 @@
 static void
 name_dep_debug_name (GnmDependent const *dep, GString *target)
 {
-	g_string_append_printf (target, "Name%p", dep);
+	g_string_append_printf (target, "Name%p", (void *)dep);
 }
 
 static void
@@ -1247,7 +1247,7 @@
 static void
 dynamic_dep_debug_name (GnmDependent const *dep, GString *target)
 {
-	g_string_append_printf (target, "DynamicDep%p", dep);
+	g_string_append_printf (target, "DynamicDep%p", (void *)dep);
 }
 
 void
@@ -2815,7 +2815,6 @@
 gnm_dep_container_dump (GnmDepContainer const *deps)
 {
 	int i;
-	Sheet *sheet = NULL;
 
 	g_return_if_fail (deps != NULL);
 
@@ -2862,26 +2861,26 @@
 	GHashTable *seenb4;
 
 	if (deps->head && !deps->tail)
-		g_warning ("Dependency container %p has head, but no tail.", deps);
+		g_warning ("Dependency container %p has head, but no tail.", (void *)deps);
 	if (deps->tail && !deps->head)
-		g_warning ("Dependency container %p has tail, but no head.", deps);
+		g_warning ("Dependency container %p has tail, but no head.", (void *)deps);
 	if (deps->head && deps->head->prev_dep)
-		g_warning ("Dependency container %p has head, but not at the beginning.", deps);
+		g_warning ("Dependency container %p has head, but not at the beginning.", (void *)deps);
 	if (deps->tail && deps->tail->next_dep)
-		g_warning ("Dependency container %p has tail, but not at the end.", deps);
+		g_warning ("Dependency container %p has tail, but not at the end.", (void *)deps);
 
 	seenb4 = g_hash_table_new (g_direct_hash, g_direct_equal);
 	for (dep = deps->head; dep; dep = dep->next_dep) {
 		if (dep->prev_dep && (dep->prev_dep->next_dep != dep))
-			g_warning ("Dependency container %p has left double-link failure at %p.", deps, dep);
+			g_warning ("Dependency container %p has left double-link failure at %p.", (void *)deps, (void *)dep);
 		if (dep->next_dep && (dep->next_dep->prev_dep != dep))
-			g_warning ("Dependency container %p has right double-link failure at %p.", deps, dep);
+			g_warning ("Dependency container %p has right double-link failure at %p.", (void *)deps, (void *)dep);
 		if (!dep->next_dep && dep != deps->tail)
-			g_warning ("Dependency container %p ends before its tail.", deps);
+			g_warning ("Dependency container %p ends before its tail.", (void *)deps);
 		if (!dependent_is_linked (dep))
-			g_warning ("Dependency container %p contains unlinked dependency %p.", deps, dep);
+			g_warning ("Dependency container %p contains unlinked dependency %p.", (void *)deps, (void *)dep);
 		if (g_hash_table_lookup (seenb4, dep)) {
-			g_warning ("Dependency container %p is circular.", deps);
+			g_warning ("Dependency container %p is circular.", (void *)deps);
 			break;
 		}
 		g_hash_table_insert (seenb4, (gpointer)dep, (gpointer)dep);

Modified: trunk/src/expr.c
==============================================================================
--- trunk/src/expr.c	(original)
+++ trunk/src/expr.c	Sat Jun 28 21:31:24 2008
@@ -3035,7 +3035,7 @@
 	pp.sheet = NULL;
 	pp.wb = NULL;
 	s = gnm_expr_as_string (expr, &pp, gnm_conventions_default);
-	g_printerr ("Leaking expression at %p: %s.\n", expr, s);
+	g_printerr ("Leaking expression at %p: %s.\n", (void *)expr, s);
 	g_free (s);
 }
 #endif

Modified: trunk/src/func.h
==============================================================================
--- trunk/src/func.h	(original)
+++ trunk/src/func.h	Sat Jun 28 21:31:24 2008
@@ -203,14 +203,14 @@
 char const *gnm_func_get_name	     (GnmFunc const *fn_def);
 gpointer    gnm_func_get_user_data   (GnmFunc const *func);
 void        gnm_func_set_user_data   (GnmFunc *func, gpointer user_data);
-GnmFunc	   *gnm_func_lookup	     (char const *name, Workbook *scope);	// change scope one day
+GnmFunc	   *gnm_func_lookup	     (char const *name, Workbook *scope);	/* change scope one day */
 GnmFunc    *gnm_func_add	     (GnmFuncGroup *group,
 				      GnmFuncDescriptor const *descriptor);
 GnmFunc    *gnm_func_add_stub	     (GnmFuncGroup *group,
 				      char const *name,
 				      GnmFuncLoadDesc  load_desc,
 				      GnmFuncRefNotify opt_ref_notify);
-GnmFunc    *gnm_func_add_placeholder (Workbook *optional_scope,			// change scope one day
+GnmFunc    *gnm_func_add_placeholder (Workbook *optional_scope,			/* change scope one day */
 				      char const *name,
 				      char const *type,
 				      gboolean copy_name);

Modified: trunk/src/gnm-graph-window.c
==============================================================================
--- trunk/src/gnm-graph-window.c	(original)
+++ trunk/src/gnm-graph-window.c	Sat Jun 28 21:31:24 2008
@@ -65,10 +65,10 @@
 	CHART_SIZE_150,
 	CHART_SIZE_200,
 	CHART_SIZE_300,
-	CHART_SIZE_500,
+	CHART_SIZE_500
 } ChartSize;
 
-G_DEFINE_TYPE (GnmGraphWindow, gnm_graph_window, GTK_TYPE_WINDOW);
+G_DEFINE_TYPE (GnmGraphWindow, gnm_graph_window, GTK_TYPE_WINDOW)
 #define parent_class gnm_graph_window_parent_class
 
 static void

Modified: trunk/src/gnm-pane.c
==============================================================================
--- trunk/src/gnm-pane.c	(original)
+++ trunk/src/gnm-pane.c	Sat Jun 28 21:31:24 2008
@@ -948,7 +948,7 @@
 
 GSF_CLASS (GnmPane, gnm_pane,
 	   gnm_pane_class_init, gnm_pane_init,
-	   GNM_SIMPLE_CANVAS_TYPE);
+	   GNM_SIMPLE_CANVAS_TYPE)
 
 static void
 cb_gnm_pane_header_realized (GtkWidget *widget)
@@ -2065,9 +2065,9 @@
 			"width-pixels", 1,
 			NULL);
 	else {
-		static char const dat [] = { 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88 };
+		static unsigned char const dat [] = { 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88 };
 		GdkBitmap *stipple = gdk_bitmap_create_from_data (
-			GTK_WIDGET (pane)->window, dat, 8, 8);
+			GTK_WIDGET (pane)->window, (const gchar *)dat, 8, 8);
 		foo_canvas_item_set (pane->size_guide.guide, "fill-stipple", stipple, NULL);
 		g_object_unref (stipple);
 	}

Modified: trunk/src/gnm-so-filled.c
==============================================================================
--- trunk/src/gnm-so-filled.c	(original)
+++ trunk/src/gnm-so-filled.c	Sat Jun 28 21:31:24 2008
@@ -519,4 +519,4 @@
 
 GSF_CLASS (GnmSOFilled, gnm_so_filled,
 	   gnm_so_filled_class_init, gnm_so_filled_init,
-	   SHEET_OBJECT_TYPE);
+	   SHEET_OBJECT_TYPE)

Modified: trunk/src/gnm-so-line.c
==============================================================================
--- trunk/src/gnm-so-line.c	(original)
+++ trunk/src/gnm-so-line.c	Sat Jun 28 21:31:24 2008
@@ -494,4 +494,4 @@
 
 GSF_CLASS (GnmSOLine, gnm_so_line,
 	   gnm_so_line_class_init, gnm_so_line_init,
-	   SHEET_OBJECT_TYPE);
+	   SHEET_OBJECT_TYPE)

Modified: trunk/src/gnm-so-polygon.c
==============================================================================
--- trunk/src/gnm-so-polygon.c	(original)
+++ trunk/src/gnm-so-polygon.c	Sat Jun 28 21:31:24 2008
@@ -223,7 +223,7 @@
 gnm_so_polygon_write_xml_sax (SheetObject const *so, GsfXMLOut *output)
 {
 	/* TODO */
-	return gnm_so_polygon_parent_class->write_xml_sax (so, output);
+	gnm_so_polygon_parent_class->write_xml_sax (so, output);
 }
 
 static void
@@ -351,4 +351,4 @@
 
 GSF_CLASS (GnmSOPolygon, gnm_so_polygon,
 	   gnm_so_polygon_class_init, gnm_so_polygon_init,
-	   SHEET_OBJECT_TYPE);
+	   SHEET_OBJECT_TYPE)

Modified: trunk/src/gnumeric-simple-canvas.c
==============================================================================
--- trunk/src/gnumeric-simple-canvas.c	(original)
+++ trunk/src/gnumeric-simple-canvas.c	Sat Jun 28 21:31:24 2008
@@ -37,7 +37,7 @@
 
 GSF_CLASS (GnmSimpleCanvas, gnm_simple_canvas,
 	   gnm_simple_canvas_class_init, NULL,
-	   FOO_TYPE_CANVAS);
+	   FOO_TYPE_CANVAS)
 
 FooCanvas *
 gnm_simple_canvas_new (SheetControlGUI *scg)

Modified: trunk/src/graph.c
==============================================================================
--- trunk/src/graph.c	(original)
+++ trunk/src/graph.c	Sat Jun 28 21:31:24 2008
@@ -291,7 +291,7 @@
 static void
 gnm_go_data_scalar_debug_name (GnmDependent const *dep, GString *target)
 {
-	g_string_append_printf (target, "GraphScalar%p", dep);
+	g_string_append_printf (target, "GraphScalar%p", (void *)dep);
 }
 
 static DEPENDENT_MAKE_TYPE (gnm_go_data_scalar, NULL)
@@ -679,7 +679,7 @@
 static void
 gnm_go_data_vector_debug_name (GnmDependent const *dep, GString *target)
 {
-	g_string_append_printf (target, "GraphVector%p", dep);
+	g_string_append_printf (target, "GraphVector%p", (void *)dep);
 }
 static DEPENDENT_MAKE_TYPE (gnm_go_data_vector, NULL)
 
@@ -1080,7 +1080,7 @@
 static void
 gnm_go_data_matrix_debug_name (GnmDependent const *dep, GString *target)
 {
-	g_string_append_printf (target, "GraphMatrix%p", dep);
+	g_string_append_printf (target, "GraphMatrix%p", (void *)dep);
 }
 static DEPENDENT_MAKE_TYPE (gnm_go_data_matrix, NULL)
 

Modified: trunk/src/gui-util.h
==============================================================================
--- trunk/src/gui-util.h	(original)
+++ trunk/src/gui-util.h	Sat Jun 28 21:31:24 2008
@@ -117,7 +117,7 @@
 	GNM_DIALOG_DESTROY_SHEET_RENAMED = 0x04,
 	GNM_DIALOG_DESTROY_SHEETS_REORDERED = 0x08,
 	GNM_DIALOG_DESTROY_CURRENT_SHEET_REMOVED = 0x100,
-	GNM_DIALOG_DESTROY_CURRENT_SHEET_RENAMED = 0x200,
+	GNM_DIALOG_DESTROY_CURRENT_SHEET_RENAMED = 0x200
 } GnmDialogDestroyOptions;
 
 void gnm_dialog_setup_destroy_handlers (GtkDialog *dialog,

Modified: trunk/src/item-acetate.c
==============================================================================
--- trunk/src/item-acetate.c	(original)
+++ trunk/src/item-acetate.c	Sat Jun 28 21:31:24 2008
@@ -41,4 +41,4 @@
 
 GSF_CLASS (ItemAcetate, item_acetate,
 	   item_acetate_class_init, NULL,
-	   FOO_TYPE_CANVAS_RECT);
+	   FOO_TYPE_CANVAS_RECT)

Modified: trunk/src/item-bar.c
==============================================================================
--- trunk/src/item-bar.c	(original)
+++ trunk/src/item-bar.c	Sat Jun 28 21:31:24 2008
@@ -1133,4 +1133,4 @@
 
 GSF_CLASS (ItemBar, item_bar,
 	   item_bar_class_init, item_bar_init,
-	   FOO_TYPE_CANVAS_ITEM);
+	   FOO_TYPE_CANVAS_ITEM)

Modified: trunk/src/item-cursor.c
==============================================================================
--- trunk/src/item-cursor.c	(original)
+++ trunk/src/item-cursor.c	Sat Jun 28 21:31:24 2008
@@ -147,8 +147,8 @@
 	}
 
 	if (ic->style == ITEM_CURSOR_DRAG || ic->style == ITEM_CURSOR_AUTOFILL) {
-		static char const stipple_data [] = { 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa };
-		ic->stipple = gdk_bitmap_create_from_data (window, stipple_data, 8, 8);
+		static unsigned char const stipple_data [] = { 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa };
+		ic->stipple = gdk_bitmap_create_from_data (window, (const gchar *)stipple_data, 8, 8);
 	}
 }
 
@@ -1097,7 +1097,6 @@
 	int const w = (ic->pos.end.col - ic->pos.start.col);
 	int const h = (ic->pos.end.row - ic->pos.start.row);
 	GnmRange r;
-	Sheet *sheet = ((SheetControl *) (pane->simple.scg))->sheet;
 
 	r.start.col = info->col - ic->col_delta;
 	if (r.start.col < 0)
@@ -1446,4 +1445,4 @@
 
 GSF_CLASS (ItemCursor, item_cursor,
 	   item_cursor_class_init, item_cursor_init,
-	   FOO_TYPE_CANVAS_ITEM);
+	   FOO_TYPE_CANVAS_ITEM)

Modified: trunk/src/item-edit.c
==============================================================================
--- trunk/src/item-edit.c	(original)
+++ trunk/src/item-edit.c	Sat Jun 28 21:31:24 2008
@@ -552,4 +552,4 @@
 
 GSF_CLASS (ItemEdit, item_edit,
 	   item_edit_class_init, item_edit_init,
-	   FOO_TYPE_CANVAS_ITEM);
+	   FOO_TYPE_CANVAS_ITEM)

Modified: trunk/src/item-grid.c
==============================================================================
--- trunk/src/item-grid.c	(original)
+++ trunk/src/item-grid.c	Sat Jun 28 21:31:24 2008
@@ -1156,4 +1156,4 @@
 
 GSF_CLASS (ItemGrid, item_grid,
 	   item_grid_class_init, item_grid_init,
-	   FOO_TYPE_CANVAS_ITEM);
+	   FOO_TYPE_CANVAS_ITEM)

Modified: trunk/src/mstyle.c
==============================================================================
--- trunk/src/mstyle.c	(original)
+++ trunk/src/mstyle.c	Sat Jun 28 21:31:24 2008
@@ -1774,13 +1774,13 @@
 	if (elem_is_set (style, MSTYLE_CONTENTS_HIDDEN))
 		g_printerr ("\thidden %d\n", style->contents_hidden);
 	if (elem_is_set (style, MSTYLE_VALIDATION))
-		g_printerr ("\tvalidation %p\n", style->validation);
+		g_printerr ("\tvalidation %p\n", (void *)style->validation);
 	if (elem_is_set (style, MSTYLE_HLINK))
-		g_printerr ("\thlink %p\n", style->hlink);
+		g_printerr ("\thlink %p\n", (void *)style->hlink);
 	if (elem_is_set (style, MSTYLE_INPUT_MSG))
-		g_printerr ("\tinput msg %p\n", style->input_msg);
+		g_printerr ("\tinput msg %p\n", (void *)style->input_msg);
 	if (elem_is_set (style, MSTYLE_CONDITIONS))
-		g_printerr ("\tconditions %p\n", style->conditions);
+		g_printerr ("\tconditions %p\n", (void *)style->conditions);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1801,7 +1801,7 @@
 cb_gnm_style_pool_leak (gpointer data, gpointer user)
 {
 	GnmStyle *style = data;
-	g_printerr ("Leaking style at %p.\n", style);
+	g_printerr ("Leaking style at %p.\n", (void *)style);
 	gnm_style_dump (style);
 }
 #endif

Modified: trunk/src/preview-grid.c
==============================================================================
--- trunk/src/preview-grid.c	(original)
+++ trunk/src/preview-grid.c	Sat Jun 28 21:31:24 2008
@@ -499,4 +499,4 @@
 
 GSF_CLASS (PreviewGrid, preview_grid,
 	   preview_grid_class_init, preview_grid_init,
-	   FOO_TYPE_CANVAS_GROUP);
+	   FOO_TYPE_CANVAS_GROUP)

Modified: trunk/src/rendered-value.c
==============================================================================
--- trunk/src/rendered-value.c	(original)
+++ trunk/src/rendered-value.c	Sat Jun 28 21:31:24 2008
@@ -486,7 +486,7 @@
 	pango_layout_set_auto_dir (layout, pango_layout_get_auto_dir (olayout));
 	pango_layout_set_ellipsize (layout, pango_layout_get_ellipsize (olayout));
 	pango_layout_set_font_description (layout, pango_layout_get_font_description (olayout));
-	// ignore tabs
+	/* ignore tabs */
 
 	/*
 	 * We really want to keep the line breaks, but currently pango

Modified: trunk/src/sheet-control.c
==============================================================================
--- trunk/src/sheet-control.c	(original)
+++ trunk/src/sheet-control.c	Sat Jun 28 21:31:24 2008
@@ -60,7 +60,7 @@
 }
 
 GSF_CLASS (SheetControl, sheet_control,
-	   sc_class_init, NULL, G_TYPE_OBJECT);
+	   sc_class_init, NULL, G_TYPE_OBJECT)
 
 WorkbookControl *
 sc_wbc (SheetControl const *sc)
@@ -97,9 +97,9 @@
 SC_VIRTUAL (ant, (SheetControl *sc), (sc))
 SC_VIRTUAL (unant, (SheetControl *sc), (sc))
 
-SC_VIRTUAL (scrollbar_config, (SheetControl const *sc), (sc));
+SC_VIRTUAL (scrollbar_config, (SheetControl const *sc), (sc))
 
-SC_VIRTUAL (mode_edit, (SheetControl *sc), (sc));
+SC_VIRTUAL (mode_edit, (SheetControl *sc), (sc))
 
 SC_VIRTUAL (set_top_left,
 	    (SheetControl *sc, int col, int row),
@@ -109,11 +109,11 @@
 	    (sc, full_recompute))
 SC_VIRTUAL (make_cell_visible,
 	    (SheetControl *sc, int col, int row, gboolean couple_panes),
-	    (sc, col, row, couple_panes));
+	    (sc, col, row, couple_panes))
 
 SC_VIRTUAL (cursor_bound, (SheetControl *sc, GnmRange const *r), (sc, r))
 SC_VIRTUAL (set_panes, (SheetControl *sc), (sc))
 
-SC_VIRTUAL (object_create_view,	(SheetControl *sc, SheetObject *so), (sc, so));
+SC_VIRTUAL (object_create_view,	(SheetControl *sc, SheetObject *so), (sc, so))
 SC_VIRTUAL (scale_changed,	(SheetControl *sc), (sc))
 

Modified: trunk/src/sheet-filter.c
==============================================================================
--- trunk/src/sheet-filter.c	(original)
+++ trunk/src/sheet-filter.c	Sat Jun 28 21:31:24 2008
@@ -529,7 +529,7 @@
 
 GSF_CLASS (GnmFilterCombo, gnm_filter_combo,
 	   gnm_filter_combo_class_init, gnm_filter_combo_init,
-	   SHEET_OBJECT_TYPE);
+	   SHEET_OBJECT_TYPE)
 
 /*************************************************************************/
 

Modified: trunk/src/sheet-object-cell-comment.c
==============================================================================
--- trunk/src/sheet-object-cell-comment.c	(original)
+++ trunk/src/sheet-object-cell-comment.c	Sat Jun 28 21:31:24 2008
@@ -346,7 +346,7 @@
 }
 
 GSF_CLASS (GnmComment, cell_comment,
-	   cell_comment_class_init, cell_comment_init, SHEET_OBJECT_TYPE);
+	   cell_comment_class_init, cell_comment_init, SHEET_OBJECT_TYPE)
 
 char const  *
 cell_comment_author_get (GnmComment const *cc)

Modified: trunk/src/sheet-object-graph.c
==============================================================================
--- trunk/src/sheet-object-graph.c	(original)
+++ trunk/src/sheet-object-graph.c	Sat Jun 28 21:31:24 2008
@@ -541,7 +541,7 @@
 		NULL, NULL, gnm_sog_class_init,NULL,
 		gnm_sog_init, SHEET_OBJECT_TYPE, 0,
 		GSF_INTERFACE (sog_imageable_init, SHEET_OBJECT_IMAGEABLE_TYPE) \
-		GSF_INTERFACE (sog_exportable_init, SHEET_OBJECT_EXPORTABLE_TYPE));
+		GSF_INTERFACE (sog_exportable_init, SHEET_OBJECT_EXPORTABLE_TYPE))
 
 /**
  * sheet_object_graph_new :

Modified: trunk/src/sheet-object-image.c
==============================================================================
--- trunk/src/sheet-object-image.c	(original)
+++ trunk/src/sheet-object-image.c	Sat Jun 28 21:31:24 2008
@@ -718,4 +718,4 @@
 GSF_CLASS_FULL (SheetObjectImage, sheet_object_image,
 	   NULL, NULL, gnm_soi_class_init, NULL,
 	   gnm_soi_init, SHEET_OBJECT_TYPE, 0,
-	   GSF_INTERFACE (soi_imageable_init, SHEET_OBJECT_IMAGEABLE_TYPE));
+	   GSF_INTERFACE (soi_imageable_init, SHEET_OBJECT_IMAGEABLE_TYPE))

Modified: trunk/src/sheet-object-widget.c
==============================================================================
--- trunk/src/sheet-object-widget.c	(original)
+++ trunk/src/sheet-object-widget.c	Sat Jun 28 21:31:24 2008
@@ -142,7 +142,7 @@
 GSF_CLASS (SheetWidget ## n2, sheet_widget_ ## n1,					\
 	   &sheet_widget_ ## n1 ## _class_init,						\
 	   &sheet_widget_ ## n1 ## _init,						\
-	   SHEET_OBJECT_WIDGET_TYPE);
+	   SHEET_OBJECT_WIDGET_TYPE)
 
 typedef SheetObject SheetObjectWidget;
 typedef struct {
@@ -217,7 +217,7 @@
 		"widget", view_widget,
 		"size_pixels", FALSE,
 		NULL);
-	/* g_warning ("%p is widget for so %p", view_widget, so);*/
+	/* g_warning ("%p is widget for so %p", (void *)view_widget, (void *)so);*/
 	gtk_widget_show_all (view_widget);
 	foo_canvas_item_hide (view_item);
 	gnm_pane_widget_register (so, view_widget, view_item);
@@ -250,7 +250,7 @@
 static GSF_CLASS (SheetObjectWidget, sheet_object_widget,
 		  sheet_object_widget_class_init,
 		  sheet_object_widget_init,
-		  SHEET_OBJECT_TYPE);
+		  SHEET_OBJECT_TYPE)
 
 static WorkbookControl *
 widget_wbc (GtkWidget *widget)
@@ -549,7 +549,7 @@
 static void
 sheet_widget_button_write_xml_sax (SheetObject const *so, GsfXMLOut *output)
 {
-	// FIXME: markup
+	/* FIXME: markup */
 	SheetWidgetButton *swb = SHEET_WIDGET_BUTTON (so);
 	gsf_xml_out_add_cstr (output, "Label", swb->label);
 }
@@ -735,7 +735,7 @@
 static void
 adjustment_debug_name (GnmDependent const *dep, GString *target)
 {
-	g_string_append_printf (target, "Adjustment%p", dep);
+	g_string_append_printf (target, "Adjustment%p", (void *)dep);
 }
 
 static DEPENDENT_MAKE_TYPE (adjustment, NULL)
@@ -1194,7 +1194,7 @@
 
 GSF_CLASS (SheetWidgetScrollbar, sheet_widget_scrollbar,
 	   &sheet_widget_scrollbar_class_init, NULL,
-	   SHEET_WIDGET_ADJUSTMENT_TYPE);
+	   SHEET_WIDGET_ADJUSTMENT_TYPE)
 
 /****************************************************************************/
 #define SHEET_WIDGET_SPINBUTTON_TYPE	(sheet_widget_spinbutton_get_type ())
@@ -1229,7 +1229,7 @@
 
 GSF_CLASS (SheetWidgetSpinbutton, sheet_widget_spinbutton,
 	   &sheet_widget_spinbutton_class_init, NULL,
-	   SHEET_WIDGET_ADJUSTMENT_TYPE);
+	   SHEET_WIDGET_ADJUSTMENT_TYPE)
 
 /****************************************************************************/
 #define SHEET_WIDGET_SLIDER_TYPE	(sheet_widget_slider_get_type ())
@@ -1272,7 +1272,7 @@
 
 GSF_CLASS (SheetWidgetSlider, sheet_widget_slider,
 	   &sheet_widget_slider_class_init, NULL,
-	   SHEET_WIDGET_ADJUSTMENT_TYPE);
+	   SHEET_WIDGET_ADJUSTMENT_TYPE)
 
 /****************************************************************************/
 #define SHEET_WIDGET_CHECKBOX_TYPE	(sheet_widget_checkbox_get_type ())
@@ -1376,7 +1376,7 @@
 static void
 checkbox_debug_name (GnmDependent const *dep, GString *target)
 {
-	g_string_append_printf (target, "Checkbox%p", dep);
+	g_string_append_printf (target, "Checkbox%p", (void *)dep);
 }
 
 static DEPENDENT_MAKE_TYPE (checkbox, NULL)
@@ -1805,7 +1805,8 @@
 
 GSF_CLASS (SheetWidgetToggleButton, sheet_widget_toggle_button,
 	   &sheet_widget_toggle_button_class_init, NULL,
-	   SHEET_WIDGET_CHECKBOX_TYPE);
+	   SHEET_WIDGET_CHECKBOX_TYPE)
+
 /****************************************************************************/
 
 #define SHEET_WIDGET_RADIO_BUTTON_TYPE	(sheet_widget_radio_button_get_type ())
@@ -1843,7 +1844,7 @@
 static void
 radio_button_debug_name (GnmDependent const *dep, GString *target)
 {
-	g_string_append_printf (target, "RadioButton%p", dep);
+	g_string_append_printf (target, "RadioButton%p", (void *)dep);
 }
 
 static DEPENDENT_MAKE_TYPE (radio_button, NULL)
@@ -2113,7 +2114,7 @@
 static void
 list_output_debug_name (GnmDependent const *dep, GString *target)
 {
-	g_string_append_printf (target, "ListOutput%p", dep);
+	g_string_append_printf (target, "ListOutput%p", (void *)dep);
 }
 
 static DEPENDENT_MAKE_TYPE (list_output, NULL)
@@ -2162,7 +2163,7 @@
 static void
 list_content_debug_name (GnmDependent const *dep, GString *target)
 {
-	g_string_append_printf (target, "ListContent%p", dep);
+	g_string_append_printf (target, "ListContent%p", (void *)dep);
 }
 
 static DEPENDENT_MAKE_TYPE (list_content, NULL)
@@ -2423,7 +2424,7 @@
 
 GSF_CLASS (SheetWidgetList, sheet_widget_list,
 	   &sheet_widget_list_class_init, NULL,
-	   SHEET_WIDGET_LIST_BASE_TYPE);
+	   SHEET_WIDGET_LIST_BASE_TYPE)
 
 /****************************************************************************/
 #define SHEET_WIDGET_COMBO_TYPE	(sheet_widget_combo_get_type ())
@@ -2498,7 +2499,8 @@
 
 GSF_CLASS (SheetWidgetCombo, sheet_widget_combo,
 	   &sheet_widget_combo_class_init, NULL,
-	   SHEET_WIDGET_LIST_BASE_TYPE);
+	   SHEET_WIDGET_LIST_BASE_TYPE)
+
 /**************************************************************************/
 
 /**

Modified: trunk/src/sheet-object.c
==============================================================================
--- trunk/src/sheet-object.c	(original)
+++ trunk/src/sheet-object.c	Sat Jun 28 21:31:24 2008
@@ -253,7 +253,7 @@
 
 GSF_CLASS (SheetObject, sheet_object,
 	   sheet_object_class_init, sheet_object_init,
-	   G_TYPE_OBJECT);
+	   G_TYPE_OBJECT)
 
 SheetObjectView *
 sheet_object_get_view (SheetObject const *so, SheetObjectViewContainer *container)

Modified: trunk/src/sheet-style.c
==============================================================================
--- trunk/src/sheet-style.c	(original)
+++ trunk/src/sheet-style.c	Sat Jun 28 21:31:24 2008
@@ -540,7 +540,7 @@
 cb_tile_pool_leak (gpointer data, gpointer user)
 {
 	CellTile *tile = data;
-	g_printerr ("Leaking tile at %p.\n", tile);
+	g_printerr ("Leaking tile at %p.\n", (void *)tile);
 }
 #endif
 

Modified: trunk/src/sheet-view.c
==============================================================================
--- trunk/src/sheet-view.c	(original)
+++ trunk/src/sheet-view.c	Sat Jun 28 21:31:24 2008
@@ -264,7 +264,7 @@
 
 GSF_CLASS (SheetView, sheet_view,
 	   sheet_view_class_init, sheet_view_init,
-	   G_TYPE_OBJECT);
+	   G_TYPE_OBJECT)
 
 SheetView *
 sheet_view_new (Sheet *sheet, WorkbookView *wbv)

Modified: trunk/src/sheet.c
==============================================================================
--- trunk/src/sheet.c	(original)
+++ trunk/src/sheet.c	Sat Jun 28 21:31:24 2008
@@ -3277,7 +3277,7 @@
 cb_cell_pool_leak (gpointer data, G_GNUC_UNUSED gpointer user)
 {
 	GnmCell const *cell = data;
-	g_printerr ("Leaking cell %p at %s\n", cell, cell_name (cell));
+	g_printerr ("Leaking cell %p at %s\n", (void *)cell, cell_name (cell));
 }
 #endif
 

Modified: trunk/src/stf-export.c
==============================================================================
--- trunk/src/stf-export.c	(original)
+++ trunk/src/stf-export.c	Sat Jun 28 21:31:24 2008
@@ -587,8 +587,8 @@
 	GnmStfExport *stfe = gnm_stf_get_stfe (G_OBJECT (wb));
 	GsfOutput *dummy_sink;
 
-	// TODO: move this GUI dependent code out of this
-	// filesaver into gui-file.c. After this, remove includes (see above).
+	/* TODO: move this GUI dependent code out of this
+	 * filesaver into gui-file.c. After this, remove includes (see above). */
 	if (IS_WBC_GTK (context->impl)) {
 		gboolean cancelled =
 			stf_export_dialog (WBC_GTK (context->impl), stfe, wb);

Modified: trunk/src/stf-parse.c
==============================================================================
--- trunk/src/stf-parse.c	(original)
+++ trunk/src/stf-parse.c	Sat Jun 28 21:31:24 2008
@@ -559,7 +559,7 @@
 	STF_CELL_EOF,
 	STF_CELL_EOL,
 	STF_CELL_FIELD_NO_SEP,
-	STF_CELL_FIELD_SEP,
+	STF_CELL_FIELD_SEP
 } StfParseCellRes;
 
 static StfParseCellRes

Modified: trunk/src/style-color.c
==============================================================================
--- trunk/src/style-color.c	(original)
+++ trunk/src/style-color.c	Sat Jun 28 21:31:24 2008
@@ -266,7 +266,7 @@
 	GnmColor *color = value;
 
 	g_printerr ("Leaking style-color at %p [%04x:%04x:%04x].\n",
-		    color,
+		    (void *)color,
 		    color->gdk_color.red,
 		    color->gdk_color.green,
 		    color->gdk_color.blue);

Modified: trunk/src/tools/analysis-tools.c
==============================================================================
--- trunk/src/tools/analysis-tools.c	(original)
+++ trunk/src/tools/analysis-tools.c	Sat Jun 28 21:31:24 2008
@@ -3396,8 +3396,10 @@
 } rank_t;
 
 static gint
-rank_compare (const rank_t *a, const rank_t *b)
+cb_rank_compare (const void *va, const void *vb)
 {
+	rank_t const *a = va;
+	rank_t const *b = vb;
         if (a->x < b->x)
                 return 1;
         else if (a->x == b->x)
@@ -3449,7 +3451,7 @@
 		}
 
 		qsort (rank, this_data_set->data->len,
-		       sizeof (rank_t), (void *) &rank_compare);
+		       sizeof (rank_t), &cb_rank_compare);
 
 		dao_set_percent (dao, n_data * 4 + 3, 1,
 			     n_data * 4 + 3, this_data_set->data->len);

Modified: trunk/src/tools/dao.c
==============================================================================
--- trunk/src/tools/dao.c	(original)
+++ trunk/src/tools/dao.c	Sat Jun 28 21:31:24 2008
@@ -36,6 +36,7 @@
 #include "style.h"
 #include "sheet-style.h"
 #include "workbook.h"
+#include "workbook-view.h"
 #include "workbook-control.h"
 #include "command-context.h"
 #include "gnm-format.h"

Modified: trunk/src/validation.c
==============================================================================
--- trunk/src/validation.c	(original)
+++ trunk/src/validation.c	Sat Jun 28 21:31:24 2008
@@ -126,7 +126,7 @@
 typedef SheetObjectClass GnmValidationComboClass;
 GSF_CLASS (GnmValidationCombo, gnm_validation_combo,
 	   gnm_validation_combo_class_init, gnm_validation_combo_init,
-	   SHEET_OBJECT_TYPE);
+	   SHEET_OBJECT_TYPE)
 
 SheetObject *
 gnm_validation_combo_new (GnmValidation const *val, SheetView *sv)

Modified: trunk/src/value-sheet.c
==============================================================================
--- trunk/src/value-sheet.c	(original)
+++ trunk/src/value-sheet.c	Sat Jun 28 21:31:24 2008
@@ -67,7 +67,7 @@
 		if (sheet && sheet->name_unquoted)
 			g_print ("%s:", sheet->name_quoted);
 		else
-			g_print ("%p :", sheet);
+			g_print ("%p :", (void *)sheet);
 		g_print ("%s%s%s%s\n",
 			(c->col_relative ? "":"$"), col_name(c->col),
 			(c->row_relative ? "":"$"), row_name(c->row));
@@ -75,7 +75,7 @@
 		if (sheet && sheet->name_quoted)
 			g_print ("%s:", sheet->name_unquoted);
 		else
-			g_print ("%p :", sheet);
+			g_print ("%p :", (void *)sheet);
 		g_print ("%s%s%s%s\n",
 			(c->col_relative ? "":"$"), col_name(c->col),
 			(c->row_relative ? "":"$"), row_name(c->row));

Modified: trunk/src/widgets/gnumeric-dashed-canvas-line.c
==============================================================================
--- trunk/src/widgets/gnumeric-dashed-canvas-line.c	(original)
+++ trunk/src/widgets/gnumeric-dashed-canvas-line.c	Sat Jun 28 21:31:24 2008
@@ -13,8 +13,6 @@
 #include <gsf/gsf-impl-utils.h>
 #include <math.h>
 
-// 				  int x, int y, int width, int height)
-
 static void gnumeric_dashed_canvas_line_draw (FooCanvasItem *item,
 					      GdkDrawable *drawable,
 					      GdkEventExpose *event);

Modified: trunk/src/workbook-control.c
==============================================================================
--- trunk/src/workbook-control.c	(original)
+++ trunk/src/workbook-control.c	Sat Jun 28 21:31:24 2008
@@ -399,7 +399,7 @@
 
 GSF_CLASS (WorkbookControl, workbook_control,
 	   workbook_control_class_init, workbook_control_init,
-	   GO_DOC_CONTROL_TYPE);
+	   GO_DOC_CONTROL_TYPE)
 
 void
 wb_control_set_view (WorkbookControl *wbc,

Modified: trunk/src/workbook-view.c
==============================================================================
--- trunk/src/workbook-view.c	(original)
+++ trunk/src/workbook-view.c	Sat Jun 28 21:31:24 2008
@@ -782,7 +782,7 @@
 }
 
 GSF_CLASS (WorkbookView, workbook_view,
-	   workbook_view_class_init, NULL, G_TYPE_OBJECT);
+	   workbook_view_class_init, NULL, G_TYPE_OBJECT)
 
 WorkbookView *
 workbook_view_new (Workbook *wb)

Modified: trunk/src/workbook.c
==============================================================================
--- trunk/src/workbook.c	(original)
+++ trunk/src/workbook.c	Sat Jun 28 21:31:24 2008
@@ -56,7 +56,7 @@
 
 enum {
 	PROP_0,
-	RECALC_MODE,
+	RECALC_MODE
 };
 enum {
 	SHEET_ORDER_CHANGED,
@@ -1380,4 +1380,4 @@
 
 GSF_CLASS (Workbook, workbook,
 	   workbook_class_init, workbook_init,
-	   GO_DOC_TYPE);
+	   GO_DOC_TYPE)

Modified: trunk/src/xml-io.c
==============================================================================
--- trunk/src/xml-io.c	(original)
+++ trunk/src/xml-io.c	Sat Jun 28 21:31:24 2008
@@ -206,7 +206,7 @@
 {
 	GnmColor *res = NULL;
 	xmlChar *color;
-	int red, green, blue;
+	unsigned red, green, blue;
 
 	color = xmlGetProp (node, CC2XML (name));
 	if (color == NULL)

Modified: trunk/src/xml-sax-read.c
==============================================================================
--- trunk/src/xml-sax-read.c	(original)
+++ trunk/src/xml-sax-read.c	Sat Jun 28 21:31:24 2008
@@ -228,7 +228,7 @@
 static gboolean
 xml_sax_attr_color (xmlChar const * const *attrs, char const *name, GnmColor **res)
 {
-	int red, green, blue;
+	unsigned int red, green, blue;
 
 	g_return_val_if_fail (attrs != NULL, FALSE);
 	g_return_val_if_fail (attrs[0] != NULL, FALSE);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]