GNOME.org
 

[gnumeric] GOString: move to goffice.

commit 20338e7d1eb180371741321ff8241ec6e5cd2ed9
Author: Morten Welinder <terra gnome org>
Date:   Mon Jun 15 17:14:10 2009 -0400

    GOString: move to goffice.

 plugins/excel/ms-chart.c              |    1 -
 plugins/excel/ms-excel-read.c         |    1 -
 plugins/excel/ms-excel-write.c        |    1 -
 plugins/excel/ms-formula-read.c       |    1 -
 plugins/excel/ms-formula-write.c      |    1 -
 plugins/excel/xls-read-pivot.c        |    1 -
 plugins/excel/xls-write-pivot.c       |    1 -
 plugins/excel/xlsx-write.c            |    1 -
 plugins/fn-database/functions.c       |    1 -
 plugins/openoffice/openoffice-read.c  |    1 -
 plugins/openoffice/openoffice-write.c |    1 -
 plugins/python-loader/py-gnumeric.c   |    1 -
 plugins/sylk/sylk-write.c             |    1 -
 src/Makefile.am                       |    2 -
 src/cell.c                            |    1 -
 src/commands.c                        |    1 -
 src/complete-sheet.c                  |    1 -
 src/consolidate.c                     |    1 -
 src/dependent.c                       |    1 -
 src/dialogs/dialog-cell-format.c      |    1 -
 src/dialogs/dialog-define-names.c     |    1 -
 src/dialogs/dialog-function-select.c  |    1 -
 src/dialogs/dialog-goto-cell.c        |    1 -
 src/expr-name.c                       |    1 -
 src/expr.c                            |    1 -
 src/func.c                            |    1 -
 src/gnm-data-cache-source.c           |    1 -
 src/gnm-data-cache-source.h           |    1 -
 src/gnumeric.h                        |    1 -
 src/go-data-cache-field.c             |    1 -
 src/go-data-cache-impl.h              |    1 -
 src/go-data-slicer-field.h            |    1 -
 src/go-data-slicer-impl.h             |    2 +-
 src/go-string.c                       |  556 ---------------------------------
 src/go-string.h                       |   78 -----
 src/goffice-utils.h                   |   12 -
 src/graph.c                           |    1 -
 src/input-msg.c                       |    1 -
 src/libgnumeric.c                     |    3 -
 src/mstyle.c                          |    1 -
 src/parse-util.c                      |    1 -
 src/parser.y                          |    1 -
 src/sheet.c                           |    1 -
 src/ssconvert.c                       |    1 -
 src/ssgrep.c                          |    1 -
 src/ssindex.c                         |    1 -
 src/sstest.c                          |    1 -
 src/validation.c                      |    1 -
 src/value-sheet.c                     |    1 -
 src/value.c                           |    1 -
 src/xml-sax-write.c                   |    1 -
 51 files changed, 1 insertions(+), 697 deletions(-)
---
diff --git a/plugins/excel/ms-chart.c b/plugins/excel/ms-chart.c
index a87bc59..8c2f1a0 100644
--- a/plugins/excel/ms-chart.c
+++ b/plugins/excel/ms-chart.c
@@ -29,7 +29,6 @@
 #include <sheet-object-graph.h>
 #include <workbook-view.h>
 
-#include <go-string.h>
 #include <goffice/goffice.h>
 
 #include <gsf/gsf-utils.h>
diff --git a/plugins/excel/ms-excel-read.c b/plugins/excel/ms-excel-read.c
index 40c05e6..76e18cd 100644
--- a/plugins/excel/ms-excel-read.c
+++ b/plugins/excel/ms-excel-read.c
@@ -66,7 +66,6 @@
 #include <gnm-so-polygon.h>
 #include <sheet-object-graph.h>
 #include <sheet-object-image.h>
-#include <go-string.h>
 #include <goffice/goffice.h>
 
 #include <gsf/gsf-input.h>
diff --git a/plugins/excel/ms-excel-write.c b/plugins/excel/ms-excel-write.c
index 8345a32..db859c0 100644
--- a/plugins/excel/ms-excel-write.c
+++ b/plugins/excel/ms-excel-write.c
@@ -64,7 +64,6 @@
 #include <expr-name.h>
 #include <mathfunc.h>
 
-#include <go-string.h>
 #include <go-data-slicer.h>
 #include <gsf/gsf-utils.h>
 #include <gsf/gsf-output.h>
diff --git a/plugins/excel/ms-formula-read.c b/plugins/excel/ms-formula-read.c
index dc20085..68929c6 100644
--- a/plugins/excel/ms-formula-read.c
+++ b/plugins/excel/ms-formula-read.c
@@ -25,7 +25,6 @@
 #include <parse-util.h>
 #include <sheet.h>
 #include <workbook.h>
-#include <go-string.h>
 #include <goffice/goffice.h>
 #include <gsf/gsf-utils.h>
 
diff --git a/plugins/excel/ms-formula-write.c b/plugins/excel/ms-formula-write.c
index d5d351d..df17e0c 100644
--- a/plugins/excel/ms-formula-write.c
+++ b/plugins/excel/ms-formula-write.c
@@ -30,7 +30,6 @@
 #include <expr-impl.h>
 #include <expr-name.h>
 #include <parse-util.h>
-#include <go-string.h>
 #include <goffice/goffice.h>
 
 #include <gsf/gsf-utils.h>
diff --git a/plugins/excel/xls-read-pivot.c b/plugins/excel/xls-read-pivot.c
index afde687..56a0085 100644
--- a/plugins/excel/xls-read-pivot.c
+++ b/plugins/excel/xls-read-pivot.c
@@ -34,7 +34,6 @@
 #include <gnm-data-cache-source.h>
 #include <gnm-sheet-slicer.h>
 
-#include <go-string.h>
 #include <go-data-cache.h>
 #include <go-data-cache-field.h>
 #include <go-data-slicer-field.h>
diff --git a/plugins/excel/xls-write-pivot.c b/plugins/excel/xls-write-pivot.c
index 6eb9345..59b8ad1 100644
--- a/plugins/excel/xls-write-pivot.c
+++ b/plugins/excel/xls-write-pivot.c
@@ -26,7 +26,6 @@
 #include "gnm-datetime.h"
 #include "workbook.h"
 #include "go-val.h"
-#include "go-string.h"
 #include "go-data-cache.h"
 #include "go-data-cache-field.h"
 
diff --git a/plugins/excel/xlsx-write.c b/plugins/excel/xlsx-write.c
index 81c2634..b59689a 100644
--- a/plugins/excel/xlsx-write.c
+++ b/plugins/excel/xlsx-write.c
@@ -51,7 +51,6 @@
 
 #include "go-val.h"
 
-#include <go-string.h>
 #include <goffice/goffice.h>
 
 #include <gsf/gsf-output.h>
diff --git a/plugins/fn-database/functions.c b/plugins/fn-database/functions.c
index a1983e1..96c628c 100644
--- a/plugins/fn-database/functions.c
+++ b/plugins/fn-database/functions.c
@@ -34,7 +34,6 @@
 #include <rangefunc.h>
 #include <gnm-i18n.h>
 
-#include <go-string.h>
 #include <goffice/goffice.h>
 #include <gnm-plugin.h>
 
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 0401165..02b9a78 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -48,7 +48,6 @@
 #include <gutils.h>
 #include <xml-io.h>
 
-#include <go-string.h>
 #include <goffice/goffice.h>
 
 #include <gsf/gsf-libxml.h>
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index fda4fbf..de060c4 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -63,7 +63,6 @@
 #include <gutils.h>
 #include <xml-io.h>
 
-#include <go-string.h>
 
 #include <gsf/gsf-libxml.h>
 #include <gsf/gsf-output.h>
diff --git a/plugins/python-loader/py-gnumeric.c b/plugins/python-loader/py-gnumeric.c
index 664c8bb..2845152 100644
--- a/plugins/python-loader/py-gnumeric.c
+++ b/plugins/python-loader/py-gnumeric.c
@@ -22,7 +22,6 @@
 #include "gnm-py-interpreter.h"
 #include "py-gnumeric.h"
 
-#include <go-string.h>
 #include <goffice/goffice.h>
 
 #include <glib/gi18n-lib.h>
diff --git a/plugins/sylk/sylk-write.c b/plugins/sylk/sylk-write.c
index f28768e..385a09f 100644
--- a/plugins/sylk/sylk-write.c
+++ b/plugins/sylk/sylk-write.c
@@ -32,7 +32,6 @@
 #include "gutils.h"
 #include "parse-util.h"
 
-#include <go-string.h>
 #include <goffice/goffice.h>
 
 #include <gsf/gsf-output.h>
diff --git a/src/Makefile.am b/src/Makefile.am
index db5385d..05d07c2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -58,8 +58,6 @@ libspreadsheet_la_LIBADD = 			\
 libspreadsheet_la_SOURCES =			\
 	go-val.h			\
 	go-val.c			\
-	go-string.h			\
-	go-string.c			\
 	\
 	goffice-data.h 			\
 	go-data-cache-source.c 		\
diff --git a/src/cell.c b/src/cell.c
index fecf9a8..a90400d 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -26,7 +26,6 @@
 #include "sheet-style.h"
 #include "parse-util.h"
 
-#include <go-string.h>
 #include <goffice/goffice.h>
 
 /**
diff --git a/src/commands.c b/src/commands.c
index ac90ed0..8183191 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -72,7 +72,6 @@
 #include "data-shuffling.h"
 #include "tools/tabulate.h"
 
-#include <go-string.h>
 #include <goffice/goffice.h>
 #include <gsf/gsf-doc-meta-data.h>
 #include <string.h>
diff --git a/src/complete-sheet.c b/src/complete-sheet.c
index 8132f43..7e07bea 100644
--- a/src/complete-sheet.c
+++ b/src/complete-sheet.c
@@ -19,7 +19,6 @@
 #include "value.h"
 #include "parse-util.h"
 
-#include <go-string.h>
 #include <gsf/gsf-impl-utils.h>
 #include <string.h>
 
diff --git a/src/consolidate.c b/src/consolidate.c
index 0d64458..abc9a54 100644
--- a/src/consolidate.c
+++ b/src/consolidate.c
@@ -36,7 +36,6 @@
 #include "workbook.h"
 #include "workbook-control.h"
 
-#include <go-string.h>
 
 /**********************************************************************************
  * UTILITY ROUTINES
diff --git a/src/dependent.c b/src/dependent.c
index 69a718c..d8b11b8 100644
--- a/src/dependent.c
+++ b/src/dependent.c
@@ -37,7 +37,6 @@
 #include "gutils.h"
 #include "sheet-view.h"
 
-#include <go-string.h>
 #include <goffice/goffice.h>
 #include <string.h>
 
diff --git a/src/dialogs/dialog-cell-format.c b/src/dialogs/dialog-cell-format.c
index 1dbb37b..bcb202a 100644
--- a/src/dialogs/dialog-cell-format.c
+++ b/src/dialogs/dialog-cell-format.c
@@ -53,7 +53,6 @@
 #include <widgets/gnumeric-dashed-canvas-line.h>
 #include <widgets/gnm-format-sel.h>
 
-#include <go-string.h>
 #include <goffice/goffice.h>
 #include <goffice/cut-n-paste/foocanvas/foo-canvas-util.h>
 #include <goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h>
diff --git a/src/dialogs/dialog-define-names.c b/src/dialogs/dialog-define-names.c
index 67cbe4c..531be90 100644
--- a/src/dialogs/dialog-define-names.c
+++ b/src/dialogs/dialog-define-names.c
@@ -42,7 +42,6 @@
 #include <commands.h>
 #include <widgets/gnumeric-expr-entry.h>
 
-#include <go-string.h>
 #include <glade/glade.h>
 #include <gtk/gtk.h>
 #include <string.h>
diff --git a/src/dialogs/dialog-function-select.c b/src/dialogs/dialog-function-select.c
index d6d01fc..12dbd64 100644
--- a/src/dialogs/dialog-function-select.c
+++ b/src/dialogs/dialog-function-select.c
@@ -36,7 +36,6 @@
 #include <application.h>
 #include <gnumeric-gconf.h>
 
-#include <go-string.h>
 #include <gsf/gsf-impl-utils.h>
 #include <glade/glade.h>
 #include <gtk/gtk.h>
diff --git a/src/dialogs/dialog-goto-cell.c b/src/dialogs/dialog-goto-cell.c
index 3543709..45dd9b7 100644
--- a/src/dialogs/dialog-goto-cell.c
+++ b/src/dialogs/dialog-goto-cell.c
@@ -39,7 +39,6 @@
 
 #include <wbc-gtk.h>
 
-#include <go-string.h>
 #include <gtk/gtk.h>
 
 #define GOTO_KEY "goto-dialog"
diff --git a/src/expr-name.c b/src/expr-name.c
index f0063ae..5b44160 100644
--- a/src/expr-name.c
+++ b/src/expr-name.c
@@ -25,7 +25,6 @@
 #include "gutils.h"
 #include "sheet-style.h"
 
-#include <go-string.h>
 #include <goffice/goffice.h>
 
 /**
diff --git a/src/expr.c b/src/expr.c
index 4da4c5e..97bb65c 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -41,7 +41,6 @@
 #include "parse-util.h"
 #include "mathfunc.h"
 
-#include <go-string.h>
 #include <goffice/goffice.h>
 #include <math.h>
 #include <string.h>
diff --git a/src/func.c b/src/func.c
index 4984b5c..7fd6d82 100644
--- a/src/func.c
+++ b/src/func.c
@@ -28,7 +28,6 @@
 #include "number-match.h"
 #include "func-builtin.h"
 
-#include <go-string.h>
 #include <goffice/goffice.h>
 #include <glib.h>
 #include <string.h>
diff --git a/src/gnm-data-cache-source.c b/src/gnm-data-cache-source.c
index 6e9c06d..6b920a3 100644
--- a/src/gnm-data-cache-source.c
+++ b/src/gnm-data-cache-source.c
@@ -24,7 +24,6 @@
 #include "go-data-cache-source.h"
 #include "go-data-cache.h"
 
-#include "go-string.h"
 
 #include <gnumeric.h>
 #include <ranges.h>
diff --git a/src/gnm-data-cache-source.h b/src/gnm-data-cache-source.h
index c5f7afb..f5a88b8 100644
--- a/src/gnm-data-cache-source.h
+++ b/src/gnm-data-cache-source.h
@@ -26,7 +26,6 @@
 
 #include <gnumeric.h>
 #include "goffice-data.h"
-#include "goffice-utils.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gnumeric.h b/src/gnumeric.h
index a4819e8..0e8484d 100644
--- a/src/gnumeric.h
+++ b/src/gnumeric.h
@@ -4,7 +4,6 @@
 
 #include <glib.h>
 #include <goffice/goffice.h>
-#include "goffice-utils.h" /* merge into real file when go-string moves */
 
 G_BEGIN_DECLS
 
diff --git a/src/go-data-cache-field.c b/src/go-data-cache-field.c
index 67b9bed..d77f632 100644
--- a/src/go-data-cache-field.c
+++ b/src/go-data-cache-field.c
@@ -25,7 +25,6 @@
 #include "go-data-cache-field-impl.h"
 #include "go-data-cache.h"
 
-#include <go-string.h>
 #include <go-val.h>
 
 #include <gsf/gsf-impl-utils.h>
diff --git a/src/go-data-cache-impl.h b/src/go-data-cache-impl.h
index 3f9daac..9e7be49 100644
--- a/src/go-data-cache-impl.h
+++ b/src/go-data-cache-impl.h
@@ -23,7 +23,6 @@
 
 #include <go-data-cache.h>
 #include <glib-object.h>
-#include <go-string.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/go-data-slicer-field.h b/src/go-data-slicer-field.h
index 8d6850a..7bb7435 100644
--- a/src/go-data-slicer-field.h
+++ b/src/go-data-slicer-field.h
@@ -23,7 +23,6 @@
 
 #include "goffice-data.h"	/* remove after move to goffice */
 #include <goffice/goffice.h>
-#include <go-string.h>
 #include <glib-object.h>
 
 G_BEGIN_DECLS
diff --git a/src/go-data-slicer-impl.h b/src/go-data-slicer-impl.h
index 2372e22..41e17b9 100644
--- a/src/go-data-slicer-impl.h
+++ b/src/go-data-slicer-impl.h
@@ -21,9 +21,9 @@
 #ifndef GO_DATA_SLICER_IMPL_H
 #define GO_DATA_SLICER_IMPL_H
 
+#include <goffice/goffice.h>
 #include <go-data-slicer.h>
 #include <glib-object.h>
-#include <goffice-utils.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/graph.c b/src/graph.c
index 878e012..8fb7d6d 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -34,7 +34,6 @@
 #include "auto-format.h"
 #include "ranges.h"
 #include "parse-util.h"
-#include <go-string.h>
 #include <goffice/goffice.h>
 
 #include <gsf/gsf-impl-utils.h>
diff --git a/src/input-msg.c b/src/input-msg.c
index 3a836b3..7cff8da 100644
--- a/src/input-msg.c
+++ b/src/input-msg.c
@@ -24,7 +24,6 @@
 #include "gnumeric.h"
 #include "input-msg.h"
 
-#include <go-string.h>
 #include <gsf/gsf-impl-utils.h>
 
 struct _GnmInputMsg {
diff --git a/src/libgnumeric.c b/src/libgnumeric.c
index bfb05cc..bc9288c 100644
--- a/src/libgnumeric.c
+++ b/src/libgnumeric.c
@@ -55,7 +55,6 @@
 #include "mathfunc.h"
 #include "hlink.h"
 #include "wbc-gtk-impl.h"
-#include <go-string.h>
 #include <goffice/goffice.h>
 #include <glade/glade.h>
 
@@ -250,7 +249,6 @@ gnm_init (gboolean fast)
 {
 	call_gnome_vfs_init ();
 
-	go_string_init ();
 	libgoffice_init ();
 	plugin_service_define ("function_group",
 		&plugin_service_function_group_get_type);
@@ -341,7 +339,6 @@ gnm_shutdown (void)
 	gnm_style_shutdown ();
 
 	libgoffice_shutdown ();
-	go_string_shutdown ();
 	plugin_services_shutdown ();
 	g_object_unref (gnm_app_get_app ());
 	gutils_shutdown ();
diff --git a/src/mstyle.c b/src/mstyle.c
index a689cb3..e55f6c2 100644
--- a/src/mstyle.c
+++ b/src/mstyle.c
@@ -18,7 +18,6 @@
 #include "application.h"
 #include "gutils.h"
 #include "gnumeric-gconf.h"
-#include <go-string.h>
 #include <goffice/goffice.h>
 
 #define DEBUG_STYLES
diff --git a/src/parse-util.c b/src/parse-util.c
index fc129bb..2b57c06 100644
--- a/src/parse-util.c
+++ b/src/parse-util.c
@@ -38,7 +38,6 @@
 /* For std_expr_name_handler: */
 #include "expr-impl.h"
 #include "gutils.h"
-#include <go-string.h>
 #include <goffice/goffice.h>
 
 #include <errno.h>
diff --git a/src/parser.y b/src/parser.y
index 8c3ec03..a1cfa39 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -27,7 +27,6 @@
 #include "gutils.h"
 #include "style.h"
 #include "value.h"
-#include <go-string.h>
 #include <goffice/goffice.h>
 
 #include <string.h>
diff --git a/src/sheet.c b/src/sheet.c
index 974b150..f01b402 100644
--- a/src/sheet.c
+++ b/src/sheet.c
@@ -62,7 +62,6 @@
 #include "gnm-sheet-slicer.h"
 #include "scenarios.h"
 #include "cell-draw.h"
-#include <go-string.h>
 #include <goffice/goffice.h>
 
 #include <glib/gi18n-lib.h>
diff --git a/src/ssconvert.c b/src/ssconvert.c
index 3cc275f..2d0b652 100644
--- a/src/ssconvert.c
+++ b/src/ssconvert.c
@@ -20,7 +20,6 @@
 #include "sheet.h"
 #include "dependent.h"
 #include "expr-name.h"
-#include <go-string.h>
 #include "libgnumeric.h"
 #include "gutils.h"
 #include "gnumeric-paths.h"
diff --git a/src/ssgrep.c b/src/ssgrep.c
index 8e95c0f..8ad3ea8 100644
--- a/src/ssgrep.c
+++ b/src/ssgrep.c
@@ -22,7 +22,6 @@
 #include "parse-util.h"
 #include "sheet-object-cell-comment.h"
 
-#include <go-string.h>
 #include <gsf/gsf-input-stdio.h>
 #include <gsf/gsf-input-textline.h>
 #include <glib/gi18n.h>
diff --git a/src/ssindex.c b/src/ssindex.c
index e1eac34..18425f6 100644
--- a/src/ssindex.c
+++ b/src/ssindex.c
@@ -25,7 +25,6 @@
 #include "sheet-style.h"
 #include "hlink.h"
 #include "validation.h"
-#include <go-string.h>
 #include "sheet-object-graph.h"
 #include "gnm-plugin.h"
 
diff --git a/src/sstest.c b/src/sstest.c
index 988d0fc..5f6d0ac 100644
--- a/src/sstest.c
+++ b/src/sstest.c
@@ -18,7 +18,6 @@
 #include "sheet.h"
 #include "cell.h"
 #include "value.h"
-#include "go-string.h"
 #include "func.h"
 #include "parse-util.h"
 #include "sheet-object-cell-comment.h"
diff --git a/src/validation.c b/src/validation.c
index 9ece5fc..29bc73a 100644
--- a/src/validation.c
+++ b/src/validation.c
@@ -40,7 +40,6 @@
 #include "sheet-object.h"
 #include "gnm-validation-combo-foo-view.h"
 #include "gnm-cell-combo-foo-view.h"
-#include <go-string.h>
 #include <gsf/gsf-impl-utils.h>
 
 #include <glib/gi18n-lib.h>
diff --git a/src/value-sheet.c b/src/value-sheet.c
index 621509e..4283d17 100644
--- a/src/value-sheet.c
+++ b/src/value-sheet.c
@@ -17,7 +17,6 @@
 #include "cell.h"
 #include "workbook.h"
 #include "parse-util.h"
-#include <go-string.h>
 #include <goffice/goffice.h>
 
 /* Debugging utility to print a GnmValue */
diff --git a/src/value.c b/src/value.c
index da453be..2fd372d 100644
--- a/src/value.c
+++ b/src/value.c
@@ -26,7 +26,6 @@
 #include <sheet.h>
 #include <cell.h>
 #include <number-match.h>
-#include <go-string.h>
 #include <goffice/goffice.h>
 
 #include <stdlib.h>
diff --git a/src/xml-sax-write.c b/src/xml-sax-write.c
index ecf043a..afb569c 100644
--- a/src/xml-sax-write.c
+++ b/src/xml-sax-write.c
@@ -56,7 +56,6 @@
 #include <tools/scenarios.h>
 #include <gnumeric-gconf.h>
 
-#include <go-string.h>
 #include <goffice/goffice.h>
 #include <gsf/gsf-libxml.h>
 #include <gsf/gsf-output-gzip.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]