GNOME.org
 

[goffice] Compilation: grand rename, part 4.

commit cabf8aa31ed5e35957e8557cfefeddb94540ae87
Author: Morten Welinder <terra gnome org>
Date:   Sat Aug 22 12:00:52 2009 -0400

    Compilation: grand rename, part 4.

 docs/reference/tmpl/go-font.sgml    |   14 -----
 docs/reference/tmpl/gog-object.sgml |   22 ++++----
 goffice/goffice.c                   |    4 +-
 goffice/graph/gog-axis.c            |   14 ++--
 goffice/gtk/go-format-sel.c         |   12 ++--
 goffice/utils/datetime.c            |  108 +++++++++++++++++-----------------
 goffice/utils/datetime.h            |   58 +++++++++---------
 goffice/utils/formats.c             |    4 +-
 goffice/utils/go-font.c             |    4 +-
 goffice/utils/go-font.h             |    4 +-
 goffice/utils/go-format.c           |   18 +++---
 goffice/utils/go-format.h           |    6 +-
 12 files changed, 127 insertions(+), 141 deletions(-)
---
diff --git a/docs/reference/tmpl/go-font.sgml b/docs/reference/tmpl/go-font.sgml
index a223e05..d8f649d 100644
--- a/docs/reference/tmpl/go-font.sgml
+++ b/docs/reference/tmpl/go-font.sgml
@@ -161,17 +161,3 @@ Fonts
 @callback: 
 
 
-<!-- ##### FUNCTION go_fonts_init ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION go_fonts_shutdown ##### -->
-<para>
-
-</para>
-
-
-
diff --git a/docs/reference/tmpl/gog-object.sgml b/docs/reference/tmpl/gog-object.sgml
index 69a0b86..dc3cd3e 100644
--- a/docs/reference/tmpl/gog-object.sgml
+++ b/docs/reference/tmpl/gog-object.sgml
@@ -54,53 +54,53 @@ Base class for all objects of graph model
 
 </para>
 
- gogobject: the object which received the signal.
- arg1: 
+@: 
+@: 
 
 <!-- ##### SIGNAL GogObject::child-added ##### -->
 <para>
 
 </para>
 
- gogobject: the object which received the signal.
- arg1: 
+@: 
+@: 
 
 <!-- ##### SIGNAL GogObject::child-name-changed ##### -->
 <para>
 
 </para>
 
- gogobject: the object which received the signal.
- arg1: 
+@: 
+@: 
 
 <!-- ##### SIGNAL GogObject::child-removed ##### -->
 <para>
 
 </para>
 
- gogobject: the object which received the signal.
- arg1: 
+@: 
+@: 
 
 <!-- ##### SIGNAL GogObject::children-reordered ##### -->
 <para>
 
 </para>
 
- gogobject: the object which received the signal.
+@: 
 
 <!-- ##### SIGNAL GogObject::name-changed ##### -->
 <para>
 
 </para>
 
- gogobject: the object which received the signal.
+@: 
 
 <!-- ##### SIGNAL GogObject::update-editor ##### -->
 <para>
 
 </para>
 
- gogobject: the object which received the signal.
+@: 
 
 <!-- ##### ARG GogObject:alignment ##### -->
 <para>
diff --git a/goffice/goffice.c b/goffice/goffice.c
index 3d014fb..aa7082a 100644
--- a/goffice/goffice.c
+++ b/goffice/goffice.c
@@ -123,7 +123,7 @@ libgoffice_init (void)
 	g_type_init ();
 	_go_string_init ();
 	go_conf_init ();
-	go_fonts_init ();
+	_go_fonts_init ();
 	go_math_init ();
 	gsf_init ();
 
@@ -164,7 +164,7 @@ void
 libgoffice_shutdown (void)
 {
 	gog_themes_shutdown ();
-	go_fonts_shutdown ();
+	_go_fonts_shutdown ();
 	go_conf_shutdown ();
 #ifdef GOFFICE_WITH_GTK
 	goc_plugin_services_shutdown ();
diff --git a/goffice/graph/gog-axis.c b/goffice/graph/gog-axis.c
index 42768ad..47eeee1 100644
--- a/goffice/graph/gog-axis.c
+++ b/goffice/graph/gog-axis.c
@@ -134,7 +134,7 @@ split_date (GogAxis *axis, double val, GDate *date)
 		return TRUE;
 	}
 
-	datetime_serial_to_g (date, (int)val, axis->date_conv);
+	go_date_serial_to_g (date, (int)val, axis->date_conv);
 	return !g_date_valid (date);
 }
 
@@ -535,14 +535,14 @@ map_date_auto_bound (GogAxis *axis, double minimum, double maximum, double *boun
 		minor_step = 1;
 	} else if (years < 2) {
 		g_date_set_day (&min_date, 1);
-		minimum = datetime_g_to_serial (&min_date, axis->date_conv);
+		minimum = go_date_g_to_serial (&min_date, axis->date_conv);
 
 		if (g_date_get_year (&max_date) < 9999 ||
 		    g_date_get_month (&max_date) < 12) {
 			g_date_set_day (&max_date, 1);
 			g_date_add_months (&max_date, 1);
 		}
-		maximum = datetime_g_to_serial (&max_date, axis->date_conv);
+		maximum = go_date_g_to_serial (&max_date, axis->date_conv);
 
 		step = 30;
 		minor_step = (range <= 180 ? 1 : step);
@@ -570,8 +570,8 @@ map_date_auto_bound (GogAxis *axis, double minimum, double maximum, double *boun
 		if (g_date_valid_dmy (1, 1, y))
 			g_date_set_dmy (&max_date, 1, 1, y);
 
-		minimum = datetime_g_to_serial (&min_date, axis->date_conv);
-		maximum = datetime_g_to_serial (&max_date, axis->date_conv);
+		minimum = go_date_g_to_serial (&min_date, axis->date_conv);
+		maximum = go_date_g_to_serial (&max_date, axis->date_conv);
 		range = maximum - minimum;
 		step = DAYS_IN_YEAR * N;
 		minor_step = step / (N == 1 ? 12 : 10);
@@ -842,7 +842,7 @@ map_date_calc_ticks (GogAxis *axis)
 
 		if (!add_months (&maj_d, maj_i * (int)maj_months))
 			break;
-		maj_pos = datetime_g_to_serial (&maj_d, axis->date_conv);
+		maj_pos = go_date_g_to_serial (&maj_d, axis->date_conv);
 		if (maj_pos > maximum)
 			break;
 
@@ -872,7 +872,7 @@ map_date_calc_ticks (GogAxis *axis)
 				if (!add_months (&min_d, min_i * (int)min_months))
 					break;
 			}
-			min_pos = datetime_g_to_serial (&min_d, axis->date_conv);
+			min_pos = go_date_g_to_serial (&min_d, axis->date_conv);
 			if (min_pos > maximum)
 				break;
 
diff --git a/goffice/gtk/go-format-sel.c b/goffice/gtk/go-format-sel.c
index 219df9d..e1b85e5 100644
--- a/goffice/gtk/go-format-sel.c
+++ b/goffice/gtk/go-format-sel.c
@@ -371,7 +371,7 @@ find_builtin (const char *fmtstr, int page, gboolean def)
 	if (page == GO_FORMAT_UNKNOWN)
 		return NULL;
 
-	candidates = go_format_builtins[page];
+	candidates = _go_format_builtins[page];
 	if (!candidates)
 		return NULL;
 
@@ -560,7 +560,7 @@ stays:
 			gtk_list_store_clear (gfs->format.formats.model);
 			for (; start <= end ; ++start)
 				fmt_dialog_init_fmt_list (gfs,
-					go_format_builtins[start], &select);
+					_go_format_builtins[start], &select);
 
 			/* If this is the custom page and the format has
 			* not been found append it */
@@ -750,8 +750,8 @@ cb_format_currency_select (G_GNUC_UNUSED GtkWidget *ct,
 	if (!gfs->enable_edit || new_text == NULL || *new_text == '\0')
 		return FALSE;
 
-	for (i = 0; go_format_currencies[i].symbol != NULL ; ++i) {
-		GOFormatCurrency const *ci = go_format_currencies + i;
+	for (i = 0; _go_format_currencies[i].symbol != NULL ; ++i) {
+		GOFormatCurrency const *ci = _go_format_currencies + i;
 		if (!strcmp (_(ci->description), new_text)) {
 			gfs->format.details.currency = ci;
 			break;
@@ -1088,8 +1088,8 @@ nfs_init (GOFormatSel *gfs)
 		GSList *ptr, *l = NULL;
 		const char *desc;
 
-		for (i = 0; go_format_currencies[i].symbol != NULL ; ++i)
-			l = g_slist_prepend (l, _((gchar *)go_format_currencies[i].description));
+		for (i = 0; _go_format_currencies[i].symbol != NULL ; ++i)
+			l = g_slist_prepend (l, _((gchar *)_go_format_currencies[i].description));
 		l = g_slist_sort (l, funny_currency_order);
 
 		for (ptr = l; ptr != NULL ; ptr = ptr->next)
diff --git a/goffice/utils/datetime.c b/goffice/utils/datetime.c
index c110c57..0580cb2 100644
--- a/goffice/utils/datetime.c
+++ b/goffice/utils/datetime.c
@@ -56,7 +56,7 @@ date_init (void)
 /* ------------------------------------------------------------------------- */
 
 int
-datetime_g_to_serial (GDate const *date, GODateConventions const *conv)
+go_date_g_to_serial (GDate const *date, GODateConventions const *conv)
 {
 	int day;
 
@@ -72,7 +72,7 @@ datetime_g_to_serial (GDate const *date, GODateConventions const *conv)
 /* ------------------------------------------------------------------------- */
 
 void
-datetime_serial_to_g (GDate *res, int serial, GODateConventions const *conv)
+go_date_serial_to_g (GDate *res, int serial, GODateConventions const *conv)
 {
 	if (!date_origin_1900)
 		date_init ();
@@ -95,7 +95,7 @@ datetime_serial_to_g (GDate *res, int serial, GODateConventions const *conv)
 /* ------------------------------------------------------------------------- */
 
 double
-datetime_timet_to_serial_raw (time_t t, GODateConventions const *conv)
+go_date_timet_to_serial_raw (time_t t, GODateConventions const *conv)
 {
 	struct tm *tm = localtime (&t);
 	int secs;
@@ -108,14 +108,14 @@ datetime_timet_to_serial_raw (time_t t, GODateConventions const *conv)
 	g_date_set_time (&date, t);
 #endif
 	secs = tm->tm_hour * 3600 + tm->tm_min * 60 + tm->tm_sec;
-	return datetime_g_to_serial (&date, conv) +
+	return go_date_g_to_serial (&date, conv) +
 		secs / (double)SECS_PER_DAY;
 }
 
 /* ------------------------------------------------------------------------- */
 
 int
-datetime_serial_raw_to_serial (double raw)
+go_date_serial_raw_to_serial (double raw)
 {
 	return (int) floor (raw + HALF_SEC);
 }
@@ -123,19 +123,19 @@ datetime_serial_raw_to_serial (double raw)
 /* ------------------------------------------------------------------------- */
 
 int
-datetime_timet_to_serial (time_t t, GODateConventions const *conv)
+go_date_timet_to_serial (time_t t, GODateConventions const *conv)
 {
-	return datetime_serial_raw_to_serial (datetime_timet_to_serial_raw (t, conv));
+	return go_date_serial_raw_to_serial (go_date_timet_to_serial_raw (t, conv));
 }
 
 /* ------------------------------------------------------------------------- */
 
 time_t
-datetime_serial_to_timet (int serial, GODateConventions const *conv)
+go_date_serial_to_timet (int serial, GODateConventions const *conv)
 {
 	GDate gd;
 
-	datetime_serial_to_g (&gd, serial, conv);
+	go_date_serial_to_g (&gd, serial, conv);
 	if (g_date_valid (&gd)) {
 		struct tm tm;
 		g_date_to_struct_tm (&gd, &tm);
@@ -149,7 +149,7 @@ datetime_serial_to_timet (int serial, GODateConventions const *conv)
 /* days with summer time ("daylight savings") changes.  */
 
 int
-datetime_serial_raw_to_seconds (double raw)
+go_date_serial_raw_to_seconds (double raw)
 {
 	raw += HALF_SEC;
 	return (raw - floor (raw)) * SECS_PER_DAY;
@@ -158,17 +158,17 @@ datetime_serial_raw_to_seconds (double raw)
 /* ------------------------------------------------------------------------- */
 
 int
-datetime_timet_to_seconds (time_t t)
+go_date_timet_to_seconds (time_t t)
 {
 	/* we just want the seconds, actual date does not matter. So we can ignore
 	 * the date convention (1900 vs 1904) */
-	return datetime_serial_raw_to_seconds (datetime_timet_to_serial_raw (t, NULL));
+	return go_date_serial_raw_to_seconds (go_date_timet_to_serial_raw (t, NULL));
 }
 
 /* ------------------------------------------------------------------------- */
 
 int
-datetime_g_months_between (GDate const *date1, GDate const *date2)
+go_date_g_months_between (GDate const *date1, GDate const *date2)
 {
 	g_return_val_if_fail (g_date_valid (date1), 0);
 	g_return_val_if_fail (g_date_valid (date2), 0);
@@ -183,21 +183,21 @@ datetime_g_months_between (GDate const *date1, GDate const *date2)
 /* ------------------------------------------------------------------------- */
 
 int
-datetime_g_years_between (GDate const *date1, GDate const *date2)
+go_date_g_years_between (GDate const *date1, GDate const *date2)
 {
 	int months;
 
 	g_return_val_if_fail (g_date_valid (date1), 0);
 	g_return_val_if_fail (g_date_valid (date2), 0);
 
-	months = datetime_g_months_between (date1, date2);
+	months = go_date_g_months_between (date1, date2);
 	return months > 0 ? months / 12 : -(-months / 12);
 }
 
 /* ------------------------------------------------------------------------- */
 
 /**
- * datetime_weeknum:
+ * go_date_weeknum:
  * @date:      date
  * @method:    week numbering method
  *
@@ -207,22 +207,22 @@ datetime_g_years_between (GDate const *date1, GDate const *date2)
  * 150: ISO 8601 week number. See datetime_isoweeknum.
  */
 int
-datetime_weeknum (GDate const *date, int method)
+go_date_weeknum (GDate const *date, int method)
 {
 	int res = -1;
 
 	g_return_val_if_fail (g_date_valid (date), -1);
-	g_return_val_if_fail (method == WEEKNUM_METHOD_SUNDAY ||
-			      method == WEEKNUM_METHOD_MONDAY ||
-			      method == WEEKNUM_METHOD_ISO,
+	g_return_val_if_fail (method == GO_WEEKNUM_METHOD_SUNDAY ||
+			      method == GO_WEEKNUM_METHOD_MONDAY ||
+			      method == GO_WEEKNUM_METHOD_ISO,
 			      -1);
 
 	switch (method) {
-	case WEEKNUM_METHOD_SUNDAY:
+	case GO_WEEKNUM_METHOD_SUNDAY:
 		res = g_date_get_sunday_week_of_year (date); break;
-	case WEEKNUM_METHOD_MONDAY:
+	case GO_WEEKNUM_METHOD_MONDAY:
 		res = g_date_get_monday_week_of_year (date); break;
-	case WEEKNUM_METHOD_ISO:
+	case GO_WEEKNUM_METHOD_ISO:
 		res = g_date_get_iso8601_week_of_year (date); break;
 	}
 
@@ -232,7 +232,7 @@ datetime_weeknum (GDate const *date, int method)
 /* ------------------------------------------------------------------------- */
 
 static gint32
-days_between_BASIS_MSRB_30_360 (GDate const *from, GDate const *to)
+days_between_GO_BASIS_MSRB_30_360 (GDate const *from, GDate const *to)
 {
 	int y1, m1, d1, y2, m2, d2;
 
@@ -254,7 +254,7 @@ days_between_BASIS_MSRB_30_360 (GDate const *from, GDate const *to)
 }
 
 static gint32
-days_between_BASIS_MSRB_30_360_SYM (GDate const *from, GDate const *to)
+days_between_GO_BASIS_MSRB_30_360_SYM (GDate const *from, GDate const *to)
 {
 	int y1, m1, d1, y2, m2, d2;
 
@@ -278,7 +278,7 @@ days_between_BASIS_MSRB_30_360_SYM (GDate const *from, GDate const *to)
 }
 
 static gint32
-days_between_BASIS_30E_360 (GDate const *from, GDate const *to)
+days_between_GO_BASIS_30E_360 (GDate const *from, GDate const *to)
 {
 	int y1, m1, d1, y2, m2, d2;
 
@@ -298,7 +298,7 @@ days_between_BASIS_30E_360 (GDate const *from, GDate const *to)
 }
 
 static gint32
-days_between_BASIS_30Ep_360 (GDate const *from, GDate const *to)
+days_between_GO_BASIS_30Ep_360 (GDate const *from, GDate const *to)
 {
 	int y1, m1, d1, y2, m2, d2;
 
@@ -321,11 +321,11 @@ days_between_BASIS_30Ep_360 (GDate const *from, GDate const *to)
 }
 
 /*
- * go_datetime_days_between_basis
+ * go_date_days_between_basis
  *
  * @from      : GDate *
  * @to        : GDate *
- * @basis     : basis_t
+ * @basis     : go_basis_t
  * see datetime.h and doc/fn-financial-basis.txt for details
  *
  * @in_order  : dates are considered in order
@@ -335,7 +335,7 @@ days_between_BASIS_30Ep_360 (GDate const *from, GDate const *to)
  */
 
 gint32
-go_datetime_days_between_basis (GDate const *from, GDate const *to, basis_t basis)
+go_date_days_between_basis (GDate const *from, GDate const *to, go_basis_t basis)
 {
 	int sign = 1;
 
@@ -347,19 +347,19 @@ go_datetime_days_between_basis (GDate const *from, GDate const *to, basis_t basi
 	}
 
 	switch (basis) {
-	case BASIS_ACT_ACT:
-	case BASIS_ACT_360:
-	case BASIS_ACT_365:
+	case GO_BASIS_ACT_ACT:
+	case GO_BASIS_ACT_360:
+	case GO_BASIS_ACT_365:
 		return sign * (g_date_get_julian (to) - g_date_get_julian (from));
-	case BASIS_30E_360:
-		return sign * days_between_BASIS_30E_360 (from, to);
-	case BASIS_30Ep_360:
-		return sign * days_between_BASIS_30Ep_360 (from, to);
-	case BASIS_MSRB_30_360_SYM:
-		return sign * days_between_BASIS_MSRB_30_360_SYM (from, to);
-	case BASIS_MSRB_30_360:
+	case GO_BASIS_30E_360:
+		return sign * days_between_GO_BASIS_30E_360 (from, to);
+	case GO_BASIS_30Ep_360:
+		return sign * days_between_GO_BASIS_30Ep_360 (from, to);
+	case GO_BASIS_MSRB_30_360_SYM:
+		return sign * days_between_GO_BASIS_MSRB_30_360_SYM (from, to);
+	case GO_BASIS_MSRB_30_360:
 	default:
-		return sign * days_between_BASIS_MSRB_30_360 (from, to);
+		return sign * days_between_GO_BASIS_MSRB_30_360 (from, to);
 	}
 }
 
@@ -434,23 +434,23 @@ go_coup_cd (GDate *result, GDate const *settlement, GDate const *maturity,
  **/
 double
 go_coupdays (GDate const *settlement, GDate const *maturity,
-	     GnmCouponConvention const *conv)
+	     GoCouponConvention const *conv)
 {
 	GDate prev, next;
 
         switch (conv->basis) {
-	case BASIS_MSRB_30_360:
-	case BASIS_ACT_360:
-        case BASIS_30E_360:
-        case BASIS_30Ep_360:
+	case GO_BASIS_MSRB_30_360:
+	case GO_BASIS_ACT_360:
+        case GO_BASIS_30E_360:
+        case GO_BASIS_30Ep_360:
 		return 360 / conv->freq;
-	case BASIS_ACT_365:
+	case GO_BASIS_ACT_365:
 		return 365.0 / conv->freq;
-	case BASIS_ACT_ACT:
+	case GO_BASIS_ACT_ACT:
 	default:
 		go_coup_cd (&next, settlement, maturity, conv->freq, conv->eom, TRUE);
 		go_coup_cd (&prev, settlement, maturity, conv->freq, conv->eom, FALSE);
-		return go_datetime_days_between_basis (&prev, &next, BASIS_ACT_ACT);
+		return go_date_days_between_basis (&prev, &next, GO_BASIS_ACT_ACT);
         }
 }
 
@@ -461,18 +461,18 @@ go_coupdays (GDate const *settlement, GDate const *maturity,
  * go_coupdaybs:
  * @settlement : #GDate
  * @maturity : #GDate
- * @conv : #GnmCouponConvention
+ * @conv : #GoCouponConvention
  *
  * Returns: the number of days from the beginning of the coupon period to the
  * 	settlement date.
  **/
 double
 go_coupdaybs (GDate const *settlement, GDate const *maturity,
-	      GnmCouponConvention const *conv)
+	      GoCouponConvention const *conv)
 {
 	GDate prev_coupon;
 	go_coup_cd (&prev_coupon, settlement, maturity, conv->freq, conv->eom, FALSE);
-	return go_datetime_days_between_basis (&prev_coupon, settlement, conv->basis);
+	return go_date_days_between_basis (&prev_coupon, settlement, conv->basis);
 }
 
 /**
@@ -485,11 +485,11 @@ go_coupdaybs (GDate const *settlement, GDate const *maturity,
  **/
 double
 go_coupdaysnc (GDate const *settlement, GDate const *maturity,
-	       GnmCouponConvention const *conv)
+	       GoCouponConvention const *conv)
 {
 	GDate next_coupon;
 	go_coup_cd (&next_coupon, settlement, maturity, conv->freq, conv->eom, TRUE);
-	return go_datetime_days_between_basis (settlement, &next_coupon, conv->basis);
+	return go_date_days_between_basis (settlement, &next_coupon, conv->basis);
 }
 
 int
diff --git a/goffice/utils/datetime.h b/goffice/utils/datetime.h
index 33c5e92..64f899f 100644
--- a/goffice/utils/datetime.h
+++ b/goffice/utils/datetime.h
@@ -25,67 +25,67 @@ struct _GODateConventions {
 /* 2:   Week starts on Monday. Days before first Monday are in week 0. */
 /* 150: ISO 8601 week number. */
 enum {
-	WEEKNUM_METHOD_SUNDAY = 1,
-	WEEKNUM_METHOD_MONDAY = 2,
-	WEEKNUM_METHOD_ISO = 150
+	GO_WEEKNUM_METHOD_SUNDAY = 1,
+	GO_WEEKNUM_METHOD_MONDAY = 2,
+	GO_WEEKNUM_METHOD_ISO = 150
 };
 
 /* These do not round and produces fractional values, i.e., includes time.  */
-double	datetime_timet_to_serial_raw  (time_t t, GODateConventions const *conv);
+double	go_date_timet_to_serial_raw  (time_t t, GODateConventions const *conv);
 
 /* These are date-only, no time.  */
-int	datetime_timet_to_serial      (time_t t, GODateConventions const *conv);
-int	datetime_g_to_serial	      (GDate const *date, GODateConventions const *conv);
-void	datetime_serial_to_g	      (GDate *res, int serial, GODateConventions const *conv);
-time_t	datetime_serial_to_timet      (int serial, GODateConventions const *conv);
-int	datetime_serial_raw_to_serial (double raw);
+int	go_date_timet_to_serial      (time_t t, GODateConventions const *conv);
+int	go_date_g_to_serial	      (GDate const *date, GODateConventions const *conv);
+void	go_date_serial_to_g	      (GDate *res, int serial, GODateConventions const *conv);
+time_t	go_date_serial_to_timet      (int serial, GODateConventions const *conv);
+int	go_date_serial_raw_to_serial (double raw);
 
 /* These are time-only assuming a 24h day.  It probably loses completely on */
 /* days with summer time ("daylight savings") changes.  */
-int datetime_timet_to_seconds (time_t t);
-int datetime_serial_raw_to_seconds (double raw);
+int go_date_timet_to_seconds (time_t t);
+int go_date_serial_raw_to_seconds (double raw);
 
 /* Number of full months between date1 and date2. */
 /* largest value s.t. g_date_add_months (date1, result) <= date2 */
 /* except that if the day is decreased in g_date_add_monts, treat
    that as > the date it is decreased to. */
-/* ( datetime_g_months_between ( March 31, April 30 ) == 0
+/* ( go_date_g_months_between ( March 31, April 30 ) == 0
      even though g_date_add_months ( Mar 31, 1 ) <= Apr 30.... */
-int datetime_g_months_between (GDate const *date1, GDate const *date2);
+int go_date_g_months_between (GDate const *date1, GDate const *date2);
 /* Number of full years between date1 and date2. */
 /* (g_date_add_years (date1, result) <= date2; largest such value. */
 /*  treat add_years (29-feb, x) > 28-feb ) */
-int datetime_g_years_between (GDate const *date1, GDate const *date2);
+int go_date_g_years_between (GDate const *date1, GDate const *date2);
 /* week number according to the given method. */
-int datetime_weeknum (GDate const *date, int method);
+int go_date_weeknum (GDate const *date, int method);
 
 typedef enum { /* see doc/fn-financial-basis.txt for details */
-	BASIS_MSRB_30_360     = 0,
-	BASIS_ACT_ACT         = 1,
-	BASIS_ACT_360         = 2,
-	BASIS_ACT_365         = 3,
-	BASIS_30E_360         = 4,
-	BASIS_30Ep_360        = 5,
-	BASIS_MSRB_30_360_SYM = 6         /* Gnumeric extension.  */
-} basis_t;
+	GO_BASIS_MSRB_30_360     = 0,
+	GO_BASIS_ACT_ACT         = 1,
+	GO_BASIS_ACT_360         = 2,
+	GO_BASIS_ACT_365         = 3,
+	GO_BASIS_30E_360         = 4,
+	GO_BASIS_30Ep_360        = 5,
+	GO_BASIS_MSRB_30_360_SYM = 6         /* Gnumeric extension.  */
+} go_basis_t;
 
-gint32  go_datetime_days_between_basis (GDate const *from, GDate const *to, basis_t basis);
+gint32  go_date_days_between_basis (GDate const *from, GDate const *to, go_basis_t basis);
 
 typedef struct {
 	int	 freq;
-	basis_t  basis;
+	go_basis_t  basis;
 	gboolean eom;
 	GODateConventions const *date_conv;
-} GnmCouponConvention;
+} GoCouponConvention;
 
 void   go_coup_cd    (GDate *res, GDate const *settle, GDate const *mat,
 		      int freq, gboolean eom, gboolean next);
 double go_coupdays   (GDate const *settlement, GDate const *maturity,
-		      GnmCouponConvention const *conv);
+		      GoCouponConvention const *conv);
 double go_coupdaybs  (GDate const *settlement, GDate const *maturity,
-		      GnmCouponConvention const *conv);
+		      GoCouponConvention const *conv);
 double go_coupdaysnc (GDate const *settlement, GDate const *maturity,
-		      GnmCouponConvention const *conv);
+		      GoCouponConvention const *conv);
 
 int go_date_convention_base (GODateConventions const *conv);
 
diff --git a/goffice/utils/formats.c b/goffice/utils/formats.c
index 2f3aa84..c2954dc 100644
--- a/goffice/utils/formats.c
+++ b/goffice/utils/formats.c
@@ -102,7 +102,7 @@ fmts_text [] = {
 
 /* Note: there is no entry for GO_FORMAT_UNKNOWN.  */
 char const * const * const
-go_format_builtins[] = {
+_go_format_builtins[] = {
 	fmts_general,
 	fmts_number,
 	fmts_currency,
@@ -343,7 +343,7 @@ go_currency_date_format_shutdown (void)
 	}
 }
 
-GOFormatCurrency const go_format_currencies[] =
+GOFormatCurrency const _go_format_currencies[] =
 {
  	{ "", N_("None"), TRUE, FALSE },	/* These first six elements */
  	{ "$", "$", TRUE, FALSE },		/* Must stay in this order */
diff --git a/goffice/utils/go-font.c b/goffice/utils/go-font.c
index 5f342e5..7529cfe 100644
--- a/goffice/utils/go-font.c
+++ b/goffice/utils/go-font.c
@@ -307,7 +307,7 @@ const GOFontMetrics *go_font_metrics_unit = &go_font_metrics_unit_var;
 
 /* private */
 void
-go_fonts_init (void)
+_go_fonts_init (void)
 {
 	int i;
 
@@ -335,7 +335,7 @@ go_fonts_init (void)
 }
 
 void
-go_fonts_shutdown (void)
+_go_fonts_shutdown (void)
 {
 	go_font_unref (font_default);
 	font_default = NULL;
diff --git a/goffice/utils/go-font.h b/goffice/utils/go-font.h
index 31b5db7..2b7cde7 100644
--- a/goffice/utils/go-font.h
+++ b/goffice/utils/go-font.h
@@ -75,8 +75,8 @@ void go_font_cache_register   (GClosure *callback);
 void go_font_cache_unregister (GClosure *callback);
 
 /* private */
-void go_fonts_init     (void);
-void go_fonts_shutdown (void);
+void _go_fonts_init     (void);
+void _go_fonts_shutdown (void);
 
 G_END_DECLS
 
diff --git a/goffice/utils/go-format.c b/goffice/utils/go-format.c
index c2b410c..27bb879 100644
--- a/goffice/utils/go-format.c
+++ b/goffice/utils/go-format.c
@@ -2562,7 +2562,7 @@ SUFFIX(go_format_execute) (PangoLayout *layout, GString *dst,
 
 		case OP_DATE_SPLIT: {
 			GDate date;
-			datetime_serial_to_g (&date,
+			go_date_serial_to_g (&date,
 					      (int)SUFFIX(floor)(valsecs / 86400),
 					      date_conv);
 			if (!g_date_valid (&date)) {
@@ -4896,7 +4896,7 @@ go_format_general (void)
 {
 	if (!default_general_fmt)
 		default_general_fmt = go_format_new_from_XL (
-			go_format_builtins[GO_FORMAT_GENERAL][0]);
+			_go_format_builtins[GO_FORMAT_GENERAL][0]);
 	return default_general_fmt;
 }
 #endif
@@ -4950,7 +4950,7 @@ go_format_default_percentage (void)
 {
 	if (!default_percentage_fmt)
 		default_percentage_fmt = go_format_new_from_XL (
-			go_format_builtins[GO_FORMAT_PERCENTAGE][1]);
+			_go_format_builtins[GO_FORMAT_PERCENTAGE][1]);
 	return default_percentage_fmt;
 }
 #endif
@@ -4961,7 +4961,7 @@ go_format_default_money (void)
 {
 	if (!default_money_fmt)
 		default_money_fmt = go_format_new_from_XL (
-			go_format_builtins[GO_FORMAT_CURRENCY][2]);
+			_go_format_builtins[GO_FORMAT_CURRENCY][2]);
 	return default_money_fmt;
 }
 #endif
@@ -4972,7 +4972,7 @@ go_format_default_accounting (void)
 {
 	if (!default_accounting_fmt)
 		default_accounting_fmt = go_format_new_from_XL (
-			go_format_builtins[GO_FORMAT_ACCOUNTING][2]);
+			_go_format_builtins[GO_FORMAT_ACCOUNTING][2]);
 	return default_accounting_fmt;
 }
 #endif
@@ -5090,7 +5090,7 @@ go_format_generate_accounting_str (GString *dst,
 	GOFormatCurrency const *currency = details->currency;
 
 	if (!currency)
-		currency = &go_format_currencies[0];
+		currency = &_go_format_currencies[0];
 
 	symstr = currency->symbol;
 	switch (g_utf8_get_char (symstr)) {
@@ -5160,7 +5160,7 @@ go_format_generate_currency_str (GString *dst,
 	GOFormatCurrency const *currency = details->currency;
 
 	if (!currency)
-		currency = &go_format_currencies[0];
+		currency = &_go_format_currencies[0];
 
 	extra_quotes = (details->force_quoted &&
 			currency->symbol[0] != '"' &&
@@ -5218,8 +5218,8 @@ find_currency (char const *ptr, gsize len, gboolean precedes)
 
 	quoted = len > 2 && ptr[0] == '\"' && ptr[len - 1] == '\"';
 
-	for (i = 1; go_format_currencies[i].symbol; i++) {
-		const GOFormatCurrency *ci = go_format_currencies + i;
+	for (i = 1; _go_format_currencies[i].symbol; i++) {
+		const GOFormatCurrency *ci = _go_format_currencies + i;
 
 		if (ci->precedes != precedes)
 			continue;
diff --git a/goffice/utils/go-format.h b/goffice/utils/go-format.h
index c1814b7..24deed9 100644
--- a/goffice/utils/go-format.h
+++ b/goffice/utils/go-format.h
@@ -26,7 +26,7 @@
 
 G_BEGIN_DECLS
 
-/* Keep these sequential, they are used as the index for go_format_builtins */
+/* Keep these sequential, they are used as the index for _go_format_builtins */
 typedef enum {
 	GO_FORMAT_UNKNOWN	= -1,
 
@@ -228,8 +228,8 @@ gboolean go_format_output_to_odf (GsfXMLOut *xout, GOFormat const *fmt,
 /*************************************************************************/
 
 /* Indexed by GOFormatFamily */
-GO_VAR_DECL char const * const * const go_format_builtins [];
-GO_VAR_DECL GOFormatCurrency     const go_format_currencies [];
+GO_VAR_DECL char const * const * const _go_format_builtins [];
+GO_VAR_DECL GOFormatCurrency     const _go_format_currencies [];
 
 GOFormatCurrency const *go_format_locale_currency (void);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]