GNOME.org
 

gnumeric r17309 - in trunk: . component plugins/corba plugins/excel plugins/perl-loader plugins/python-loader src src/dialogs src/tools src/widgets

Author: emmanuel
Date: Tue Apr  7 09:29:50 2009
New Revision: 17309
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17309&view=rev

Log:
2009-04-06  Emmanuel Pacaud <emmanuel pacaud lapp in2p3 fr>

	Adapt to the naming consistency fix in goffice.

	/\bGO_([A-Z,_)*]_TYPE\b/GO_TYPE_$1/
	/\bGOG_([A-Z,_)*]_TYPE\b/GOG_TYPE_$1/
	/\bGo([A-Z])/GO$1/
	/\bIS_GO_/GO_IS_/
	/\bIS_GOG_/GOG_IS_/

Modified:
   trunk/ChangeLog
   trunk/component/gnumeric.c
   trunk/plugins/corba/corba-workbook.c
   trunk/plugins/excel/ms-chart.c
   trunk/plugins/excel/ms-excel-write.c
   trunk/plugins/excel/xlsx-read.c
   trunk/plugins/perl-loader/perl-loader.c
   trunk/plugins/python-loader/gnm-py-interpreter.c
   trunk/plugins/python-loader/gnm-python.c
   trunk/plugins/python-loader/python-loader.c
   trunk/src/command-context-stderr.c
   trunk/src/command-context.c
   trunk/src/commands.c
   trunk/src/dialogs/dialog-about.c
   trunk/src/dialogs/dialog-preferences.c
   trunk/src/dialogs/dialog-quit.c
   trunk/src/gnm-graph-window.c
   trunk/src/gnm-plugin.c
   trunk/src/gnm-so-filled.c
   trunk/src/gnm-so-line.c
   trunk/src/gnm-so-polygon.c
   trunk/src/gnumeric-gconf.c
   trunk/src/graph.c
   trunk/src/gui-file.c
   trunk/src/io-context-gtk.c
   trunk/src/search.c
   trunk/src/search.h
   trunk/src/sheet-object-graph.c
   trunk/src/tools/analysis-exp-smoothing.c
   trunk/src/tools/analysis-frequency.c
   trunk/src/tools/analysis-histogram.c
   trunk/src/tools/analysis-kaplan-meier.c
   trunk/src/tools/analysis-tools.c
   trunk/src/wbc-gtk.c
   trunk/src/widgets/gnm-format-sel.c
   trunk/src/workbook-control.c
   trunk/src/workbook-view.c
   trunk/src/workbook.c

Modified: trunk/component/gnumeric.c
==============================================================================
--- trunk/component/gnumeric.c	(original)
+++ trunk/component/gnumeric.c	Tue Apr  7 09:29:50 2009
@@ -77,9 +77,9 @@
 
 typedef GOComponentClass GOGnmComponentClass;
 
-#define GO_GNM_COMPONENT_TYPE	(go_gnm_component_get_type ())
-#define GO_GNM_COMPONENT(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GO_GNM_COMPONENT_TYPE, GOGnmComponent))
-#define GO_IS_GNM_COMPONENT(o)	(G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_GNM_COMPONENT_TYPE))
+#define GO_TYPE_GNM_COMPONENT	(go_gnm_component_get_type ())
+#define GO_GNM_COMPONENT(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_GNM_COMPONENT, GOGnmComponent))
+#define GO_IS_GNM_COMPONENT(o)	(G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_GNM_COMPONENT))
 
 GType go_gnm_component_get_type (void);
 
@@ -257,7 +257,7 @@
 
 GSF_DYNAMIC_CLASS (GOGnmComponent, go_gnm_component,
 	go_gnm_component_class_init, go_gnm_component_init,
-	GO_COMPONENT_TYPE)
+	GO_TYPE_COMPONENT)
 
 /*************************************************************************************/
 

Modified: trunk/plugins/corba/corba-workbook.c
==============================================================================
--- trunk/plugins/corba/corba-workbook.c	(original)
+++ trunk/plugins/corba/corba-workbook.c	Tue Apr  7 09:29:50 2009
@@ -316,7 +316,7 @@
 		NULL, NULL, wbcc_class_init, NULL,
 		wbcc_init,  WORKBOOK_CONTROL_TYPE, 0,
 		GSF_INTERFACE (wbcc_gnm_cmd_context_init,
-			       GO_CMD_CONTEXT_TYPE))
+			       GO_TYPE_CMD_CONTEXT))
 
 WorkbookControl *
 workbook_control_corba_new (WorkbookView *optional_view,

Modified: trunk/plugins/excel/ms-chart.c
==============================================================================
--- trunk/plugins/excel/ms-chart.c	(original)
+++ trunk/plugins/excel/ms-chart.c	Tue Apr  7 09:29:50 2009
@@ -667,7 +667,7 @@
 			}
 			break;
 		case 1: {
-			GogObject *GridLine = GOG_OBJECT (g_object_new (GOG_GRID_LINE_TYPE,
+			GogObject *GridLine = GOG_OBJECT (g_object_new (GOG_TYPE_GRID_LINE,
 							NULL));
 			gog_object_add_by_name (GOG_OBJECT (s->axis), "MajorGrid", GridLine);
 			if (check_style (s->style, "axis major grid"))
@@ -675,7 +675,7 @@
 			break;
 		}
 		case 2: {
-			GogObject *GridLine = GOG_OBJECT (g_object_new (GOG_GRID_LINE_TYPE,
+			GogObject *GridLine = GOG_OBJECT (g_object_new (GOG_TYPE_GRID_LINE,
 							NULL));
 			gog_object_add_by_name (GOG_OBJECT (s->axis), "MinorGrid", GridLine);
 			if (check_style (s->style, "axis minor grid"))
@@ -2595,7 +2595,7 @@
 				goto not_a_matrix;
 			eseries = g_ptr_array_index (s->series, 0);
 			style = eseries->style;
-			if (!IS_GO_DATA_VECTOR (eseries->data [GOG_MS_DIM_CATEGORIES].data))
+			if (!GO_IS_DATA_VECTOR (eseries->data [GOG_MS_DIM_CATEGORIES].data))
 				goto not_a_matrix;
 			cat_expr = gnm_go_data_get_expr (eseries->data [GOG_MS_DIM_CATEGORIES].data);
 			if (!gnm_expr_top_is_rangeref (cat_expr))
@@ -2628,7 +2628,7 @@
 				if (eseries->chart_group != s->plot_counter)
 					continue;
 				cur = eseries->data [GOG_MS_DIM_LABELS].data;
-				if (!cur || !IS_GO_DATA_SCALAR (cur)) {
+				if (!cur || !GO_IS_DATA_SCALAR (cur)) {
 					is_matrix = FALSE;
 					break;
 				}
@@ -2652,7 +2652,7 @@
 					break;
 				}
 				cur = eseries->data [GOG_MS_DIM_VALUES].data;
-				if (!cur || !IS_GO_DATA_VECTOR (cur)) {
+				if (!cur || !GO_IS_DATA_VECTOR (cur)) {
 					is_matrix = FALSE;
 					break;
 				}
@@ -2759,7 +2759,7 @@
 		 */
 		{
 			GogAxisSet axis_set = gog_chart_get_axis_set (s->chart);
-			GogAxisSet plot_axis_set = G_TYPE_INSTANCE_GET_CLASS ((s->plot), GOG_PLOT_TYPE, GogPlotClass)->axis_set;
+			GogAxisSet plot_axis_set = G_TYPE_INSTANCE_GET_CLASS ((s->plot), GOG_TYPE_PLOT, GogPlotClass)->axis_set;
 
 			if (axis_set != GOG_AXIS_SET_UNKNOWN &&
 			    (axis_set & GOG_AXIS_SET_FUNDAMENTAL & ~plot_axis_set)) {
@@ -3238,7 +3238,7 @@
 		break;
 	}
 	if (rc) {
-		if (IS_GOG_REG_CURVE (rc)) {
+		if (GOG_IS_REG_CURVE (rc)) {
 			sheet = ms_container_sheet (state->container.parent);
 			g_object_set (G_OBJECT (rc),
 				"affine", series->reg_intercept != 0.,
@@ -3322,7 +3322,7 @@
 			      prop_name, &error_bar,
 			      NULL);
 		if (!error_bar) {
-			error_bar = g_object_new (GOG_ERROR_BAR_TYPE, NULL);
+			error_bar = g_object_new (GOG_TYPE_ERROR_BAR, NULL);
 			error_bar->display = GOG_ERROR_BAR_DISPLAY_NONE;
 		}
 		error_bar->display |= (series->err_type & 1)
@@ -3731,7 +3731,7 @@
 
 				l1 = g_slist_copy ((GSList *) gog_axis_contributors (hidden));
 				for (cur1 = l1; cur1; cur1 = cur1->next) {
-					if (IS_GOG_PLOT (cur1->data))
+					if (GOG_IS_PLOT (cur1->data))
 						gog_plot_set_axis (GOG_PLOT (cur1->data), visible);
 				}
 				g_slist_free (l1);
@@ -4298,12 +4298,12 @@
 	if (dat == NULL) {
 		count = default_count;
 		type = 1; /* numeric */
-	} else if (IS_GO_DATA_SCALAR (dat)) {
+	} else if (GO_IS_DATA_SCALAR (dat)) {
 		/* cheesy test to see if the content is strings or numbers */
 		double tmp = go_data_scalar_get_value (GO_DATA_SCALAR (dat));
 		type = gnm_finite (tmp) ? 1 : 3;
 		count = 1;
-	} else if (IS_GO_DATA_VECTOR (dat)) {
+	} else if (GO_IS_DATA_VECTOR (dat)) {
 		count = go_data_vector_get_len (GO_DATA_VECTOR (dat));
 		if (count > 0) {
 			/* cheesy test to see if the content is strings or numbers */
@@ -4385,9 +4385,9 @@
 
 	if (bar->type == GOG_ERROR_BAR_TYPE_NONE)
 		return FALSE;
-	if (!IS_GO_DATA (vec))
+	if (!GO_IS_DATA (vec))
 		vec = GO_DATA_VECTOR (bar->series->values[bar->error_i].data);
-	if (!IS_GO_DATA (vec)) /* if still no data, do not save */
+	if (!GO_IS_DATA (vec)) /* if still no data, do not save */
 		return FALSE;
 	length = go_data_vector_get_len (vec);
 	if (length == 1)
@@ -4534,7 +4534,7 @@
 	data = ms_biff_put_len_next (s->bp, BIFF_CHART_serauxtrend, 28);
 	GSF_LE_SET_GUINT8  (data+0, type);
 	GSF_LE_SET_GUINT8  (data+1, (guint8) order);
-	if (IS_GOG_REG_CURVE (rc)) {
+	if (GOG_IS_REG_CURVE (rc)) {
 		g_object_get (G_OBJECT (rc), "affine", &affine,
 				"skip-invalid", &skip_invalid, NULL);
 		eqn = gog_object_get_child_by_name (GOG_OBJECT (rc), "Equation");
@@ -4552,7 +4552,7 @@
 	ms_biff_put_commit (s->bp);
 
 	/* now write our stuff */
-	if (IS_GOG_REG_CURVE (rc)) {
+	if (GOG_IS_REG_CURVE (rc)) {
 		/*
 			data+0 == min, #NA if not set
 			data+8 == max, #NA if not set
@@ -5468,7 +5468,7 @@
 
 	/* TODO : create a null renderer class for use in sizing things */
 	sheet_object_position_pts_get (so, pos);
-	renderer  = g_object_new (GOG_RENDERER_TYPE,
+	renderer  = g_object_new (GOG_TYPE_RENDERER,
 				  "model", state.graph,
 				  NULL);
 	gog_renderer_update (renderer, pos[2] - pos[0], pos[3] - pos[1]);

Modified: trunk/plugins/excel/ms-excel-write.c
==============================================================================
--- trunk/plugins/excel/ms-excel-write.c	(original)
+++ trunk/plugins/excel/ms-excel-write.c	Tue Apr  7 09:29:50 2009
@@ -5768,7 +5768,7 @@
 {
 	GSList *ptr = obj->children;
 
-	if (IS_GOG_STYLED_OBJECT (obj)) {
+	if (GOG_IS_STYLED_OBJECT (obj)) {
 		GogStyle const *style = GOG_STYLED_OBJECT (obj)->style;
 		if (style->interesting_fields & GOG_STYLE_OUTLINE)
 			put_color_go_color (ewb, style->outline.color);
@@ -5795,7 +5795,7 @@
 		if (style->interesting_fields & GOG_STYLE_FONT)
 			excel_font_from_go_font (ewb, style->font.font);
 	}
-	if (IS_GOG_AXIS (obj)) {
+	if (GOG_IS_AXIS (obj)) {
 		char *fmt_str;
 		g_object_get (G_OBJECT (obj), "assigned-format-string-XL", &fmt_str, NULL);
 		if (fmt_str != NULL) {

Modified: trunk/plugins/excel/xlsx-read.c
==============================================================================
--- trunk/plugins/excel/xlsx-read.c	(original)
+++ trunk/plugins/excel/xlsx-read.c	Tue Apr  7 09:29:50 2009
@@ -1041,7 +1041,7 @@
 xlsx_axis_start (GsfXMLIn *xin, xmlChar const **attrs)
 {
 	XLSXReadState *state = (XLSXReadState *)xin->user_state;
-	state->axis.obj	 = g_object_new (GOG_AXIS_TYPE, NULL);
+	state->axis.obj	 = g_object_new (GOG_TYPE_AXIS, NULL);
 	state->axis.type = xin->node->user_data.v_int;
 	state->axis.info = NULL;
 	xlsx_chart_push_obj (state, GOG_OBJECT (state->axis.obj));
@@ -1357,7 +1357,7 @@
 {
 	XLSXReadState *state = (XLSXReadState *)xin->user_state;
 	if (NULL != state->cur_obj &&
-	    IS_GOG_STYLED_OBJECT (state->cur_obj) &&
+	    GOG_IS_STYLED_OBJECT (state->cur_obj) &&
 	    NULL == state->marker) {
 		g_return_if_fail (state->cur_style == NULL);
 		state->cur_style = gog_style_dup (
@@ -1567,7 +1567,7 @@
 xlsx_chart_marker_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
 {
 	XLSXReadState *state = (XLSXReadState *)xin->user_state;
-	if (NULL != state->cur_obj && IS_GOG_STYLED_OBJECT (state->cur_obj)) {
+	if (NULL != state->cur_obj && GOG_IS_STYLED_OBJECT (state->cur_obj)) {
 		GogStyle *style = gog_styled_object_get_style (
 			GOG_STYLED_OBJECT (state->cur_obj));
 		if (state->marker_symbol != GO_MARKER_MAX) {
@@ -1984,7 +1984,7 @@
 
 			l1 = g_slist_copy ((GSList *) gog_axis_contributors (GOG_AXIS (axis)));
 			for (cur1 = l1; cur1; cur1 = cur1->next) {
-				if (IS_GOG_PLOT (cur1->data))
+				if (GOG_IS_PLOT (cur1->data))
 					gog_plot_set_axis (GOG_PLOT (cur1->data), visible);
 			}
 			g_slist_free (l1);
@@ -2013,7 +2013,7 @@
 	/* clean out axis that were auto created */
 	list = gog_object_get_children (GOG_OBJECT (state->chart), NULL);
 	for (ptr = list; ptr != NULL ; ptr = ptr->next)
-		if (IS_GOG_AXIS (ptr->data) &&
+		if (GOG_IS_AXIS (ptr->data) &&
 		    NULL == g_hash_table_lookup (state->axis.by_obj, ptr->data)) {
 			if (gog_object_is_deletable (GOG_OBJECT (ptr->data))) {
 				gog_object_clear_parent	(GOG_OBJECT (ptr->data));

Modified: trunk/plugins/perl-loader/perl-loader.c
==============================================================================
--- trunk/plugins/perl-loader/perl-loader.c	(original)
+++ trunk/plugins/perl-loader/perl-loader.c	Tue Apr  7 09:29:50 2009
@@ -299,4 +299,4 @@
 GSF_DYNAMIC_CLASS_FULL (GnmPerlPluginLoader, gnm_perl_plugin_loader,
 	NULL, NULL, gplp_class_init, NULL,
 	gplp_init, G_TYPE_OBJECT, 0,
-	GSF_INTERFACE_FULL (gnm_perl_plugin_loader_type, go_plugin_loader_init, GO_PLUGIN_LOADER_TYPE))
+	GSF_INTERFACE_FULL (gnm_perl_plugin_loader_type, go_plugin_loader_init, GO_TYPE_PLUGIN_LOADER))

Modified: trunk/plugins/python-loader/gnm-py-interpreter.c
==============================================================================
--- trunk/plugins/python-loader/gnm-py-interpreter.c	(original)
+++ trunk/plugins/python-loader/gnm-py-interpreter.c	Tue Apr  7 09:29:50 2009
@@ -87,7 +87,7 @@
 	GnmPyInterpreter *interpreter;
 	PyThreadState *py_thread_state;
 
-	g_return_val_if_fail (plugin == NULL || IS_GO_PLUGIN (plugin), NULL);
+	g_return_val_if_fail (plugin == NULL || GO_IS_PLUGIN (plugin), NULL);
 
 	if (plugin != NULL) {
 		py_thread_state = Py_NewInterpreter ();

Modified: trunk/plugins/python-loader/gnm-python.c
==============================================================================
--- trunk/plugins/python-loader/gnm-python.c	(original)
+++ trunk/plugins/python-loader/gnm-python.c	Tue Apr  7 09:29:50 2009
@@ -206,7 +206,7 @@
 	GnmPyInterpreter *interpreter;
 
 	g_return_val_if_fail (IS_GNM_PYTHON (gpy), NULL);
-	g_return_val_if_fail (IS_GO_PLUGIN (plugin), NULL);
+	g_return_val_if_fail (GO_IS_PLUGIN (plugin), NULL);
 
 	interpreter = gnm_py_interpreter_new (plugin);
 	GO_SLIST_PREPEND (gpy->interpreters, interpreter);

Modified: trunk/plugins/python-loader/python-loader.c
==============================================================================
--- trunk/plugins/python-loader/python-loader.c	(original)
+++ trunk/plugins/python-loader/python-loader.c	Tue Apr  7 09:29:50 2009
@@ -221,7 +221,7 @@
 	PyObject *input_wrapper;
 	gboolean result;
 
-	g_return_val_if_fail (IS_GO_PLUGIN_SERVICE_FILE_OPENER (service), FALSE);
+	g_return_val_if_fail (GO_IS_PLUGIN_SERVICE_FILE_OPENER (service), FALSE);
 	g_return_val_if_fail (input != NULL, FALSE);
 	g_return_val_if_fail (_PyGObject_API != NULL, FALSE);
 
@@ -264,7 +264,7 @@
 	PyObject *open_result = NULL;
 	PyObject *input_wrapper;
 
-	g_return_if_fail (IS_GO_PLUGIN_SERVICE_FILE_OPENER (service));
+	g_return_if_fail (GO_IS_PLUGIN_SERVICE_FILE_OPENER (service));
 	g_return_if_fail (input != NULL);
 	g_return_if_fail (_PyGObject_API != NULL);
 
@@ -304,7 +304,7 @@
 	gchar *func_name_file_probe, *func_name_file_open;
 	PyObject *python_func_file_probe, *python_func_file_open;
 
-	g_return_if_fail (IS_GO_PLUGIN_SERVICE_FILE_OPENER (service));
+	g_return_if_fail (GO_IS_PLUGIN_SERVICE_FILE_OPENER (service));
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
 	gnm_py_interpreter_switch_to (loader_python->py_interpreter_info);
@@ -373,7 +373,7 @@
 	PyObject *save_result = NULL;
 	PyObject *output_wrapper;
 
-	g_return_if_fail (IS_GO_PLUGIN_SERVICE_FILE_SAVER (service));
+	g_return_if_fail (GO_IS_PLUGIN_SERVICE_FILE_SAVER (service));
 	g_return_if_fail (output != NULL);
 	g_return_if_fail (_PyGObject_API != NULL);
 
@@ -406,7 +406,7 @@
 	gchar *func_name_file_save;
 	PyObject *python_func_file_save;
 
-	g_return_if_fail (IS_GO_PLUGIN_SERVICE_FILE_SAVER (service));
+	g_return_if_fail (GO_IS_PLUGIN_SERVICE_FILE_SAVER (service));
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
 	gnm_py_interpreter_switch_to (loader_python->py_interpreter_info);
@@ -849,4 +849,4 @@
 GSF_DYNAMIC_CLASS_FULL (GnmPythonPluginLoader, gnm_python_plugin_loader,
 	NULL, NULL, gplp_class_init, NULL,
 	gplp_init, G_TYPE_OBJECT, 0,
-	GSF_INTERFACE_FULL (gnm_python_plugin_loader_type, go_plugin_loader_init, GO_PLUGIN_LOADER_TYPE))
+	GSF_INTERFACE_FULL (gnm_python_plugin_loader_type, go_plugin_loader_init, GO_TYPE_PLUGIN_LOADER))

Modified: trunk/src/command-context-stderr.c
==============================================================================
--- trunk/src/command-context-stderr.c	(original)
+++ trunk/src/command-context-stderr.c	Tue Apr  7 09:29:50 2009
@@ -108,4 +108,4 @@
 GSF_CLASS_FULL (CmdContextStderr, cmd_context_stderr,
 		NULL, NULL, NULL, NULL,
 		ccs_init, G_TYPE_OBJECT, 0,
-		GSF_INTERFACE (ccs_gnm_cmd_context_init, GO_CMD_CONTEXT_TYPE))
+		GSF_INTERFACE (ccs_gnm_cmd_context_init, GO_TYPE_CMD_CONTEXT))

Modified: trunk/src/command-context.c
==============================================================================
--- trunk/src/command-context.c	(original)
+++ trunk/src/command-context.c	Tue Apr  7 09:29:50 2009
@@ -26,7 +26,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#define CC_CLASS(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), GO_CMD_CONTEXT_TYPE, GOCmdContextClass))
+#define CC_CLASS(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), GO_TYPE_CMD_CONTEXT, GOCmdContextClass))
 
 static GError *
 format_message (GQuark id, char const *message)

Modified: trunk/src/commands.c
==============================================================================
--- trunk/src/commands.c	(original)
+++ trunk/src/commands.c	Tue Apr  7 09:29:50 2009
@@ -6605,8 +6605,8 @@
 
 	g_return_val_if_fail (IS_WORKBOOK_CONTROL (wbc), TRUE);
 	g_return_val_if_fail (IS_SHEET_OBJECT_GRAPH (so), TRUE);
-	g_return_val_if_fail (IS_GOG_GRAPH (n_graph), TRUE);
-	g_return_val_if_fail (IS_GOG_GRAPH (o_graph), TRUE);
+	g_return_val_if_fail (GOG_IS_GRAPH (n_graph), TRUE);
+	g_return_val_if_fail (GOG_IS_GRAPH (o_graph), TRUE);
 
 	me = g_object_new (CMD_SO_GRAPH_CONFIG_TYPE, NULL);
 

Modified: trunk/src/dialogs/dialog-about.c
==============================================================================
--- trunk/src/dialogs/dialog-about.c	(original)
+++ trunk/src/dialogs/dialog-about.c	Tue Apr  7 09:29:50 2009
@@ -274,7 +274,7 @@
 	g_object_set_data_full (G_OBJECT (state->about),
 		"state", state, (GDestroyNotify)gnm_about_state_free);
 
-	state->graph = g_object_new (GOG_GRAPH_TYPE, NULL);
+	state->graph = g_object_new (GOG_TYPE_GRAPH, NULL);
 	gog_graph_set_size (GOG_GRAPH (state->graph), 4 * 72.0, 4 * 72.0);
 	GOG_STYLED_OBJECT (state->graph)->style->fill.type = GOG_FILL_STYLE_GRADIENT;
 	GOG_STYLED_OBJECT (state->graph)->style->fill.pattern.back = 0xFFFF99FF;
@@ -384,7 +384,7 @@
 	foo_canvas_scroll_to (FOO_CANVAS (state->canvas), 0, 0);
 
 	state->ctrl = foo_canvas_item_new (foo_canvas_root (FOO_CANVAS (state->canvas)),
-			GOG_CONTROL_FOOCANVAS_TYPE,
+			GOG_TYPE_CONTROL_FOOCANVAS,
 			"model", state->graph,
 			NULL);
 	g_object_connect (state->canvas,

Modified: trunk/src/dialogs/dialog-preferences.c
==============================================================================
--- trunk/src/dialogs/dialog-preferences.c	(original)
+++ trunk/src/dialogs/dialog-preferences.c	Tue Apr  7 09:29:50 2009
@@ -702,7 +702,7 @@
 	enum_pref_create_widget (state->root,
 				 GNM_CONF_GUI_DIR "/" GNM_CONF_GUI_ED_ENTER_MOVES_DIR,
 				 page, row++, 
-				 GO_DIRECTION_TYPE,
+				 GO_TYPE_DIRECTION,
 				 (enum_conf_setter_t) gnm_gconf_set_enter_moves_dir,
 				 _("Enter _Moves Selection"));
 	bool_pref_create_widget (state->root,

Modified: trunk/src/dialogs/dialog-quit.c
==============================================================================
--- trunk/src/dialogs/dialog-quit.c	(original)
+++ trunk/src/dialogs/dialog-quit.c	Tue Apr  7 09:29:50 2009
@@ -65,7 +65,7 @@
 	gtk_tree_model_get (model, iter,
 			    QUIT_COL_DOC, &doc,
 			    -1);
-	g_return_if_fail (IS_GO_DOC (doc));
+	g_return_if_fail (GO_IS_DOC (doc));
 
 	uri = go_doc_get_uri (doc);
 	filename = go_filename_from_uri (uri);

Modified: trunk/src/gnm-graph-window.c
==============================================================================
--- trunk/src/gnm-graph-window.c	(original)
+++ trunk/src/gnm-graph-window.c	Tue Apr  7 09:29:50 2009
@@ -84,7 +84,7 @@
 	GOGraphWidgetSizeMode size_mode;
 	ChartSize size;
 
-	g_assert (IS_GO_GRAPH_WIDGET (window->graph));
+	g_assert (GO_IS_GRAPH_WIDGET (window->graph));
 
 	obey_ratio = FALSE;
 
@@ -259,7 +259,7 @@
 
 	if (graph != NULL) {
 		graph = gog_graph_dup (graph);
-		window->graph = g_object_new (GO_GRAPH_WIDGET_TYPE,
+		window->graph = g_object_new (GO_TYPE_GRAPH_WIDGET,
 					      "graph", graph,
 					      "hres", gnm_app_display_dpi_get (TRUE),
 					      "vres", gnm_app_display_dpi_get (FALSE),
@@ -289,7 +289,7 @@
 {
 	GtkWidget *ret;
 
-	g_return_val_if_fail (IS_GOG_GRAPH (graph), NULL);
+	g_return_val_if_fail (GOG_IS_GRAPH (graph), NULL);
 
 	ret = g_object_new (gnm_graph_window_get_type (), NULL);
 	gnm_graph_window_set_graph (GNM_GRAPH_WINDOW (ret), graph, graph_width, graph_height);

Modified: trunk/src/gnm-plugin.c
==============================================================================
--- trunk/src/gnm-plugin.c	(original)
+++ trunk/src/gnm-plugin.c	Tue Apr  7 09:29:50 2009
@@ -49,7 +49,7 @@
 	go_slist_free_custom (service_function_group->function_name_list, g_free);
 	service_function_group->function_name_list = NULL;
 
-	parent_class = g_type_class_peek (GO_PLUGIN_SERVICE_TYPE);
+	parent_class = g_type_class_peek (GO_TYPE_PLUGIN_SERVICE);
 	parent_class->finalize (obj);
 }
 
@@ -245,7 +245,7 @@
 
 GSF_CLASS (PluginServiceFunctionGroup, plugin_service_function_group,
            plugin_service_function_group_class_init, plugin_service_function_group_init,
-           GO_PLUGIN_SERVICE_SIMPLE_TYPE)
+           GO_TYPE_PLUGIN_SERVICE_SIMPLE)
 
 /****************************************************************************/
 
@@ -284,7 +284,7 @@
 	go_slist_free_custom (service_ui->actions, (GFreeFunc)gnm_action_free);
 	service_ui->actions = NULL;
 
-	parent_class = g_type_class_peek (GO_PLUGIN_SERVICE_TYPE);
+	parent_class = g_type_class_peek (GO_TYPE_PLUGIN_SERVICE);
 	parent_class->finalize (obj);
 }
 
@@ -432,7 +432,7 @@
 
 GSF_CLASS (PluginServiceUI, plugin_service_ui,
            plugin_service_ui_class_init, plugin_service_ui_init,
-           GO_PLUGIN_SERVICE_TYPE)
+           GO_TYPE_PLUGIN_SERVICE)
 
 /****************************************************************************/
 
@@ -644,8 +644,8 @@
 
 GSF_CLASS_FULL (GnmPluginLoaderModule, gnm_plugin_loader_module,
            NULL, NULL, NULL, NULL,
-           NULL, GO_PLUGIN_LOADER_MODULE_TYPE, 0,
-	   GSF_INTERFACE (go_plugin_loader_module_iface_init, GO_PLUGIN_LOADER_TYPE))
+           NULL, GO_TYPE_PLUGIN_LOADER_MODULE, 0,
+	   GSF_INTERFACE (go_plugin_loader_module_iface_init, GO_TYPE_PLUGIN_LOADER))
 
 /****************************************************************************/
 

Modified: trunk/src/gnm-so-filled.c
==============================================================================
--- trunk/src/gnm-so-filled.c	(original)
+++ trunk/src/gnm-so-filled.c	Tue Apr  7 09:29:50 2009
@@ -493,7 +493,7 @@
 	so_class->draw_cairo	= gnm_so_filled_draw_cairo;
 
         g_object_class_install_property (gobject_class, SOF_PROP_STYLE,
-                 g_param_spec_object ("style", NULL, NULL, GOG_STYLE_TYPE,
+                 g_param_spec_object ("style", NULL, NULL, GOG_TYPE_STYLE,
 			GSF_PARAM_STATIC | G_PARAM_READWRITE));
         g_object_class_install_property (gobject_class, SOF_PROP_IS_OVAL,
                  g_param_spec_boolean ("is-oval", NULL, NULL, FALSE,

Modified: trunk/src/gnm-so-line.c
==============================================================================
--- trunk/src/gnm-so-line.c	(original)
+++ trunk/src/gnm-so-line.c	Tue Apr  7 09:29:50 2009
@@ -469,7 +469,7 @@
 #endif /* GNM_WITH_GTK */
 
         g_object_class_install_property (gobject_class, SOL_PROP_STYLE,
-                 g_param_spec_object ("style", NULL, NULL, GOG_STYLE_TYPE,
+                 g_param_spec_object ("style", NULL, NULL, GOG_TYPE_STYLE,
 			GSF_PARAM_STATIC | G_PARAM_READWRITE));
         g_object_class_install_property (gobject_class, SOL_PROP_START_ARROW,
                  g_param_spec_pointer ("start-arrow", NULL, NULL,

Modified: trunk/src/gnm-so-polygon.c
==============================================================================
--- trunk/src/gnm-so-polygon.c	(original)
+++ trunk/src/gnm-so-polygon.c	Tue Apr  7 09:29:50 2009
@@ -327,7 +327,7 @@
 	so_class->draw_cairo	= gnm_so_polygon_draw_cairo;
 
         g_object_class_install_property (gobject_class, SOP_PROP_STYLE,
-                 g_param_spec_object ("style", NULL, NULL, GOG_STYLE_TYPE,
+                 g_param_spec_object ("style", NULL, NULL, GOG_TYPE_STYLE,
 			GSF_PARAM_STATIC | G_PARAM_READWRITE));
         g_object_class_install_property (gobject_class, SOP_PROP_POINTS,
                  g_param_spec_pointer ("points", NULL, NULL,

Modified: trunk/src/gnumeric-gconf.c
==============================================================================
--- trunk/src/gnumeric-gconf.c	(original)
+++ trunk/src/gnumeric-gconf.c	Tue Apr  7 09:29:50 2009
@@ -198,7 +198,7 @@
 		  node, GNM_CONF_GUI_ZOOM, .1, 5., 1.);
 	prefs.enter_moves_dir = go_conf_load_enum (
 		  node, GNM_CONF_GUI_ED_ENTER_MOVES_DIR,
-		  GO_DIRECTION_TYPE, GO_DIRECTION_DOWN);
+		  GO_TYPE_DIRECTION, GO_DIRECTION_DOWN);
 	prefs.auto_complete = go_conf_load_bool (
 		  node, GNM_CONF_GUI_ED_AUTOCOMPLETE, TRUE);
 	prefs.live_scrolling = go_conf_load_bool (
@@ -1072,7 +1072,7 @@
 {
 	prefs.enter_moves_dir = val;
 	go_conf_set_enum (
-		root, GNM_CONF_GUI_DIR "/" GNM_CONF_GUI_ED_ENTER_MOVES_DIR, GO_DIRECTION_TYPE, val);
+		root, GNM_CONF_GUI_DIR "/" GNM_CONF_GUI_ED_ENTER_MOVES_DIR, GO_TYPE_DIRECTION, val);
 }
 
 void

Modified: trunk/src/graph.c
==============================================================================
--- trunk/src/graph.c	(original)
+++ trunk/src/graph.c	Tue Apr  7 09:29:50 2009
@@ -302,7 +302,7 @@
 
 GSF_CLASS (GnmGODataScalar, gnm_go_data_scalar,
 	   gnm_go_data_scalar_class_init, gnm_go_data_scalar_init,
-	   GO_DATA_SCALAR_TYPE)
+	   GO_TYPE_DATA_SCALAR)
 
 GOData *
 gnm_go_data_scalar_new_expr (Sheet *sheet, GnmExprTop const *texpr)
@@ -695,7 +695,7 @@
 
 GSF_CLASS (GnmGODataVector, gnm_go_data_vector,
 	   gnm_go_data_vector_class_init, gnm_go_data_vector_init,
-	   GO_DATA_VECTOR_TYPE)
+	   GO_TYPE_DATA_VECTOR)
 
 GOData *
 gnm_go_data_vector_new_expr (Sheet *sheet, GnmExprTop const *texpr)
@@ -1102,7 +1102,7 @@
 
 GSF_CLASS (GnmGODataMatrix, gnm_go_data_matrix,
 	   gnm_go_data_matrix_class_init, gnm_go_data_matrix_init,
-	   GO_DATA_MATRIX_TYPE)
+	   GO_TYPE_DATA_MATRIX)
 
 GOData *
 gnm_go_data_matrix_new_expr (Sheet *sheet, GnmExprTop const *texpr)

Modified: trunk/src/gui-file.c
==============================================================================
--- trunk/src/gui-file.c	(original)
+++ trunk/src/gui-file.c	Tue Apr  7 09:29:50 2009
@@ -78,7 +78,7 @@
 
 		if (!l->data)
 			descr = _("Automatically detected");
-		else if (IS_GO_FILE_OPENER (l->data))
+		else if (GO_IS_FILE_OPENER (l->data))
 			descr = go_file_opener_get_description (
 						GO_FILE_OPENER (l->data));
 		else
@@ -164,7 +164,7 @@
 		return 0;
 
 	for (l = openers; l != NULL; l = l->next, i++) {
-		if (IS_GO_FILE_OPENER (l->data) &&
+		if (GO_IS_FILE_OPENER (l->data) &&
 		    strcmp (id, go_file_opener_get_id(l->data)) == 0)
 			return i;
 	}

Modified: trunk/src/io-context-gtk.c
==============================================================================
--- trunk/src/io-context-gtk.c	(original)
+++ trunk/src/io-context-gtk.c	Tue Apr  7 09:29:50 2009
@@ -414,7 +414,7 @@
 GSF_CLASS_FULL (IOContextGtk, io_context_gtk,
 		NULL, NULL, icg_class_init, NULL,
 		icg_init, TYPE_IO_CONTEXT, 0,
-		GSF_INTERFACE (icg_gnm_cmd_context_init, GO_CMD_CONTEXT_TYPE))
+		GSF_INTERFACE (icg_gnm_cmd_context_init, GO_TYPE_CMD_CONTEXT))
 
 void
 icg_set_transient_for (IOContextGtk *icg, GtkWindow *parent_window)

Modified: trunk/src/search.c
==============================================================================
--- trunk/src/search.c	(original)
+++ trunk/src/search.c	Tue Apr  7 09:29:50 2009
@@ -26,7 +26,7 @@
 static GObjectClass *parent_class;
 
 typedef struct {
-	GoSearchReplaceClass base_class;
+	GOSearchReplaceClass base_class;
 } GnmSearchReplaceClass;
 
 enum {
@@ -719,4 +719,4 @@
 /* ------------------------------------------------------------------------- */
 
 GSF_CLASS (GnmSearchReplace, gnm_search_replace,
-	   gnm_search_replace_class_init, gnm_search_replace_init, GO_SEARCH_REPLACE_TYPE)
+	   gnm_search_replace_class_init, gnm_search_replace_init, GO_TYPE_SEARCH_REPLACE)

Modified: trunk/src/search.h
==============================================================================
--- trunk/src/search.h	(original)
+++ trunk/src/search.h	Tue Apr  7 09:29:50 2009
@@ -43,7 +43,7 @@
 typedef  int (*GnmSearchReplaceQueryFunc) (GnmSearchReplaceQuery q, GnmSearchReplace *sr, ...);
 
 struct _GnmSearchReplace {
-	GoSearchReplace base;
+	GOSearchReplace base;
 
 	GnmSearchReplaceScope scope;
 	char *range_text;

Modified: trunk/src/sheet-object-graph.c
==============================================================================
--- trunk/src/sheet-object-graph.c	(original)
+++ trunk/src/sheet-object-graph.c	Tue Apr  7 09:29:50 2009
@@ -100,7 +100,7 @@
 typedef GogControlFooCanvasClass	SOGraphFooViewClass;
 static GSF_CLASS_FULL (SOGraphFooView, so_graph_foo_view,
 	NULL, NULL, NULL, NULL,
-	NULL, GOG_CONTROL_FOOCANVAS_TYPE, 0,
+	NULL, GOG_TYPE_CONTROL_FOOCANVAS, 0,
 	GSF_INTERFACE (so_graph_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
 
 /****************************************************************************/
@@ -585,7 +585,7 @@
 
 		g_object_ref (G_OBJECT (graph));
 	} else
-		graph = g_object_new (GOG_GRAPH_TYPE, NULL);
+		graph = g_object_new (GOG_TYPE_GRAPH, NULL);
 
 	if (sog->graph != NULL) {
 		g_signal_handler_disconnect (sog->graph, sog->add_sig);

Modified: trunk/src/tools/analysis-exp-smoothing.c
==============================================================================
--- trunk/src/tools/analysis-exp-smoothing.c	(original)
+++ trunk/src/tools/analysis-exp-smoothing.c	Tue Apr  7 09:29:50 2009
@@ -64,7 +64,7 @@
 		GogGraph     *graph;
 		GogChart     *chart;
 		
-		graph = g_object_new (GOG_GRAPH_TYPE, NULL);
+		graph = g_object_new (GOG_TYPE_GRAPH, NULL);
 		chart = GOG_CHART (gog_object_add_by_name (GOG_OBJECT (graph), "Chart", NULL));
 		*plot = gog_plot_new_by_name ("GogLinePlot");
 		gog_object_add_by_name (GOG_OBJECT (chart), "Plot", GOG_OBJECT (*plot));

Modified: trunk/src/tools/analysis-frequency.c
==============================================================================
--- trunk/src/tools/analysis-frequency.c	(original)
+++ trunk/src/tools/analysis-frequency.c	Tue Apr  7 09:29:50 2009
@@ -216,7 +216,7 @@
 		GOData *values;
 		int ct;
 		
-		graph = g_object_new (GOG_GRAPH_TYPE, NULL);
+		graph = g_object_new (GOG_TYPE_GRAPH, NULL);
 		chart = GOG_CHART (gog_object_add_by_name (
 						   GOG_OBJECT (graph), "Chart", NULL));
 		plot = gog_plot_new_by_name ("GogBarColPlot");

Modified: trunk/src/tools/analysis-histogram.c
==============================================================================
--- trunk/src/tools/analysis-histogram.c	(original)
+++ trunk/src/tools/analysis-histogram.c	Tue Apr  7 09:29:50 2009
@@ -338,7 +338,7 @@
 		GOData *values;
 		int ct;
 		
-		graph = g_object_new (GOG_GRAPH_TYPE, NULL);
+		graph = g_object_new (GOG_TYPE_GRAPH, NULL);
 		chart = GOG_CHART (gog_object_add_by_name (
 						   GOG_OBJECT (graph), "Chart", NULL));
 

Modified: trunk/src/tools/analysis-kaplan-meier.c
==============================================================================
--- trunk/src/tools/analysis-kaplan-meier.c	(original)
+++ trunk/src/tools/analysis-kaplan-meier.c	Tue Apr  7 09:29:50 2009
@@ -112,7 +112,7 @@
 	if (info->chart) {
 		GogChart     *chart;
 		
-		graph = g_object_new (GOG_GRAPH_TYPE, NULL);
+		graph = g_object_new (GOG_TYPE_GRAPH, NULL);
 		chart = GOG_CHART (gog_object_add_by_name (
 						   GOG_OBJECT (graph), "Chart", NULL));
 

Modified: trunk/src/tools/analysis-tools.c
==============================================================================
--- trunk/src/tools/analysis-tools.c	(original)
+++ trunk/src/tools/analysis-tools.c	Tue Apr  7 09:29:50 2009
@@ -3553,7 +3553,7 @@
 		GogGraph     *graph;
 		GogChart     *chart;
 		
-		graph = g_object_new (GOG_GRAPH_TYPE, NULL);
+		graph = g_object_new (GOG_TYPE_GRAPH, NULL);
 		chart = GOG_CHART (gog_object_add_by_name (GOG_OBJECT (graph), "Chart", NULL));
 		plot = gog_plot_new_by_name ("GogLinePlot");
 		gog_object_add_by_name (GOG_OBJECT (chart), "Plot", GOG_OBJECT (plot));

Modified: trunk/src/wbc-gtk.c
==============================================================================
--- trunk/src/wbc-gtk.c	(original)
+++ trunk/src/wbc-gtk.c	Tue Apr  7 09:29:50 2009
@@ -4909,8 +4909,8 @@
 
 GSF_CLASS_FULL (WBCGtk, wbc_gtk, NULL, NULL, wbc_gtk_class_init, NULL,
 	wbc_gtk_init, WORKBOOK_CONTROL_TYPE, 0,
-	GSF_INTERFACE (wbcg_go_plot_data_allocator_init, GOG_DATA_ALLOCATOR_TYPE);
-	GSF_INTERFACE (wbcg_gnm_cmd_context_init, GO_CMD_CONTEXT_TYPE))
+	GSF_INTERFACE (wbcg_go_plot_data_allocator_init, GOG_TYPE_DATA_ALLOCATOR);
+	GSF_INTERFACE (wbcg_gnm_cmd_context_init, GO_TYPE_CMD_CONTEXT))
 
 /******************************************************************************/
 

Modified: trunk/src/widgets/gnm-format-sel.c
==============================================================================
--- trunk/src/widgets/gnm-format-sel.c	(original)
+++ trunk/src/widgets/gnm-format-sel.c	Tue Apr  7 09:29:50 2009
@@ -38,7 +38,7 @@
 GtkWidget *
 gnm_format_sel_new (void)
 {
-	GObject *w = g_object_new (GO_FORMAT_SEL_TYPE, NULL);
+	GObject *w = g_object_new (GO_TYPE_FORMAT_SEL, NULL);
 	g_signal_connect (w, "generate-preview",
 		G_CALLBACK (cb_generate_preview), NULL);
 	return GTK_WIDGET (w);
@@ -47,7 +47,7 @@
 void
 gnm_format_sel_set_value (GOFormatSel *gfs, GnmValue const *value)
 {
-  	g_return_if_fail (IS_GO_FORMAT_SEL (gfs));
+  	g_return_if_fail (GO_IS_FORMAT_SEL (gfs));
 	g_return_if_fail (value != NULL);
 
 	g_object_set_data_full (G_OBJECT (gfs),

Modified: trunk/src/workbook-control.c
==============================================================================
--- trunk/src/workbook-control.c	(original)
+++ trunk/src/workbook-control.c	Tue Apr  7 09:29:50 2009
@@ -399,7 +399,7 @@
 
 GSF_CLASS (WorkbookControl, workbook_control,
 	   workbook_control_class_init, workbook_control_init,
-	   GO_DOC_CONTROL_TYPE)
+	   GO_TYPE_DOC_CONTROL)
 
 void
 wb_control_set_view (WorkbookControl *wbc,

Modified: trunk/src/workbook-view.c
==============================================================================
--- trunk/src/workbook-view.c	(original)
+++ trunk/src/workbook-view.c	Tue Apr  7 09:29:50 2009
@@ -911,9 +911,9 @@
 	gboolean has_error, has_warning;
 
 	g_return_val_if_fail (IS_WORKBOOK_VIEW (wbv), FALSE);
-	g_return_val_if_fail (IS_GO_FILE_SAVER (fs), FALSE);
+	g_return_val_if_fail (GO_IS_FILE_SAVER (fs), FALSE);
 	g_return_val_if_fail (uri != NULL, FALSE);
-	g_return_val_if_fail (IS_GO_CMD_CONTEXT (context), FALSE);
+	g_return_val_if_fail (GO_IS_CMD_CONTEXT (context), FALSE);
 
 	wb = wb_view_get_workbook (wbv);
 	g_object_ref (wb);
@@ -959,7 +959,7 @@
 	gboolean has_error, has_warning;
 
 	g_return_val_if_fail (IS_WORKBOOK_VIEW (wbv), FALSE);
-	g_return_val_if_fail (IS_GO_CMD_CONTEXT (context), FALSE);
+	g_return_val_if_fail (GO_IS_CMD_CONTEXT (context), FALSE);
 
 	wb = wb_view_get_workbook (wbv);
 	g_object_ref (wb);
@@ -1000,7 +1000,7 @@
 
 	g_return_val_if_fail (GSF_IS_INPUT(input), NULL);
 	g_return_val_if_fail (optional_fmt == NULL ||
-			      IS_GO_FILE_OPENER (optional_fmt), NULL);
+			      GO_IS_FILE_OPENER (optional_fmt), NULL);
 
 	/* NOTE : we could support gzipped anything here if we wanted to
 	 * by adding a wrapper, but there is no framework for remembering that

Modified: trunk/src/workbook.c
==============================================================================
--- trunk/src/workbook.c	(original)
+++ trunk/src/workbook.c	Tue Apr  7 09:29:50 2009
@@ -62,7 +62,7 @@
 static void
 cb_saver_finalize (Workbook *wb, GOFileSaver *saver)
 {
-	g_return_if_fail (IS_GO_FILE_SAVER (saver));
+	g_return_if_fail (GO_IS_FILE_SAVER (saver));
 	g_return_if_fail (IS_WORKBOOK (wb));
 	g_return_if_fail (wb->file_saver == saver);
 	wb->file_saver = NULL;
@@ -1378,4 +1378,4 @@
 
 GSF_CLASS (Workbook, workbook,
 	   workbook_class_init, workbook_init,
-	   GO_DOC_TYPE)
+	   GO_TYPE_DOC)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]