Commit d531765d authored by Jody Goldberg's avatar Jody Goldberg

Rename gnumeric-utils.h gui-utils.h to be more accurate.

Clean out a bunch includes.
parent 33965bc9
......@@ -3,7 +3,7 @@ Working in Gnumeric
When writing Gnumeric our priorities are
1) Correct.
1) Correctness.
2) Maintainable & Documented
3) Modular and well designed
and a distant
......@@ -88,8 +88,7 @@ modular chunks (as detailed by Linus).
- Follow the Gnumeric commenting style, which is not the Gtk
style;
/*
* ie. use this for
/* ie. use this for
* multi-line comments
*/
......
......@@ -357,7 +357,6 @@ dnl ******************************
try_bonobo=true
bonobo=
bonobo_msg=no
using_oaf=no
bonobo_suffix=
have_bonobo=false
AC_ARG_WITH(bonobo,
......@@ -368,7 +367,7 @@ AC_ARG_WITH(bonobo,
)
if $try_bonobo; then
AC_MSG_CHECKING(for Bonobo >= 1.09 )
AC_MSG_CHECKING(for Bonobo >= 1.08 )
if gnome-config --libs bonobo > /dev/null 2>&1; then
verstxt=`gnome-config --modversion bonobo`
vers=`echo "$verstxt" | sed -e "s/^bonobo-//" | \
......@@ -378,25 +377,13 @@ if $try_bonobo; then
vers=0
fi
if test "$vers" -ge 1000009; then
if test "$vers" -ge 1000008; then
AC_MSG_RESULT($marker_ok found $verstxt)
AC_DEFINE(ENABLE_BONOBO)
have_bonobo=true
bonobo=bonobox_print
bonobo_msg=yes
bonobo_suffix=-bonobo
dnl Check if Bonobo is OAFized
AC_MSG_CHECKING(if Bonobo uses OAF)
if ( gnome-config --libs bonobo | grep ' -loaf ' ) > /dev/null 2>&1 ; then
using_oaf=yes
AC_DEFINE(USING_OAF)
fi
AC_MSG_RESULT($using_oaf)
AM_CONDITIONAL(USING_OAF, test x"$using_oaf" = "xyes")
else
if test "$vers" -eq 0; then
AC_MSG_RESULT($marker_no not found)
......
......@@ -46,11 +46,11 @@ stamp_gnumeric_graphs_idl : $(srcdir)/gnumeric-graphs.idl
$(GNUMERIC_GRAPHS_GENERATED): stamp_gnumeric_graphs_idl
if ENABLE_EVOLUTION
stamp_evolution :
stamp_evolution_idl :
$(ORBIT_IDL) $(IDL_FLAGS) `$(GNOME_CONFIG) --datadir`/idl/Evolution-Composer.idl
touch $@
$(EVOLUTION_GENERATED) : stamp_evolution
$(EVOLUTION_GENERATED) : stamp_evolution_idl
endif
......@@ -63,7 +63,7 @@ EXTRA_DIST = $(idl_DATA)
CLEANFILES += $(GNUMERIC_GENERATED) \
$(GNUMERIC_GRAPHS_GENERATED) \
$(EVOLUTION_GENERATED) \
stamp_gnumeric stamp_gnumeric_graphs stamp_evolution
stamp_gnumeric_idl stamp_gnumeric_graphs_idl stamp_evolution_idl
dist-hook :
cd $(distdir) && rm -f $(CLEANFILES)
2001-08-24 Jody Goldberg <jgoldberg@home.com>
* ms-excel-read.c : fix and prune includes.
* ms-excel-write.c : ditto.
* boot.c : ditto.
2001-08-23 Jody Goldberg <jgoldberg@home.com>
......
......@@ -12,7 +12,6 @@
#include <config.h>
#include <gnome.h>
#include "gnumeric.h"
#include "gnumeric-util.h"
#include "file.h"
#include "main.h"
#include "io-context.h"
......@@ -45,7 +44,7 @@ gint ms_excel_formula_debug = 0;
/* Enables debugging mesgs while reading excel colors & patterns */
gint ms_excel_color_debug = 0;
/* Enables debugging mesgs while reading excel charts */
gint ms_excel_chart_debug = 0;
gint ms_excel_chart_debug = 10;
/* Enables debugging mesgs while writing excel workbooks */
gint ms_excel_write_debug = 0;
/* Enables debugging mesgs while reading excel objects */
......
......@@ -18,6 +18,37 @@
* FIXME: Check for errors and propagate upward. We've only started.
*/
#include <config.h>
#include "ms-formula-write.h"
#include "boot.h"
#include "ms-biff.h"
#include "excel.h"
#include "ms-excel-write.h"
#include "ms-excel-xf.h"
#include <gnumeric.h>
#include <format.h>
#include <position.h>
#include <style-color.h>
#include <cell.h>
#include <sheet-object.h>
#include <sheet-object-cell-comment.h>
#include <application.h>
#include <style.h>
#include <sheet-style.h>
#include <format.h>
#include <main.h>
#include <value.h>
#include <parse-util.h>
#include <print-info.h>
#include <workbook-view.h>
#include <workbook.h>
#include <io-context.h>
#include <expr.h>
#include <gutils.h>
#include <str.h>
#include <libole2/ms-ole.h>
#include <stdio.h>
#include <unistd.h>
#include <sys/mman.h>
......@@ -30,37 +61,6 @@
#include <gnome.h>
#include "boot.h"
#include "gnumeric.h"
#include "gnumeric-util.h"
#include "format.h"
#include "position.h"
#include "style-color.h"
#include "cell.h"
#include "sheet-object.h"
#include "sheet-object-cell-comment.h"
#include "application.h"
#include "style.h"
#include "sheet-style.h"
#include "format.h"
#include "main.h"
#include "value.h"
#include "parse-util.h"
#include "print-info.h"
#include "workbook-view.h"
#include "workbook.h"
#include "io-context.h"
#include "expr.h"
#include "gutils.h"
#include "str.h"
#include <libole2/ms-ole.h>
#include "ms-biff.h"
#include "excel.h"
#include "ms-excel-write.h"
#include "ms-excel-xf.h"
#include "ms-formula-write.h"
#define N_ELEMENTS_BETWEEN_PROGRESS_UPDATES 20
static excel_iconv_t current_workbook_iconv = NULL;
......
2001-08-24 Jody Goldberg <jgoldberg@home.com>
* font.h : don't include a gui headerfile.
* boot.h : ditto.
* html.h : ditto.
* latex.h : ditto.
* roff.h : ditto.
2001-08-21 Zbigniew Chyla <cyba@gnome.pl>
* plugin.xml: Removed
......
......@@ -23,7 +23,6 @@
#define GNUMERIC_HTML_BOOT_H
#include "gnumeric.h"
#include "gnumeric-util.h"
#include "plugin.h"
#include "plugin-util.h"
......
......@@ -22,8 +22,7 @@
#ifndef G_PLUGIN_FONT_H_
#define G_PLUGIN_FONT_H_
#include "../../src/gnumeric.h"
#include "../../src/gnumeric-util.h"
#include <gnumeric.h>
int font_is_monospaced (MStyle *mstyle);
int font_is_helvetica (MStyle *mstyle);
......
......@@ -25,7 +25,6 @@
#include "gnumeric.h"
#include "file.h"
#include "error-info.h"
#include "gnumeric-util.h"
void html32_file_save (GnumFileSaver const *fs, IOContext *io_context, WorkbookView *wb_view, const char *filename);
void html40_file_save (GnumFileSaver const *fs, IOContext *io_context, WorkbookView *wb_view, const char *filename);
......
......@@ -23,7 +23,6 @@
#define GNUMERIC_PLUGIN_LATEX_H
#include "gnumeric.h"
#include "gnumeric-util.h"
void latex_file_save (GnumFileSaver const *fs, IOContext *io_context, WorkbookView *wb_view, const gchar *file_name);
void latex2e_file_save (GnumFileSaver const *fs, IOContext *io_context, WorkbookView *wb_view, const gchar *file_name);
......
......@@ -23,8 +23,6 @@
#define GNUMERIC_PLUGIN_ROFF_H
#include "gnumeric.h"
#include "io-context.h"
#include "gnumeric-util.h"
void roff_dvi_file_save (GnumFileSaver const *fs, IOContext *io_context, WorkbookView *wb_view, const char *filename);
void roff_pdf_file_save (GnumFileSaver const *fs, IOContext *io_context, WorkbookView *wb_view, const char *filename);
......
2001-08-24 Jody Goldberg <jgoldberg@home.com>
* lotus.[ch] : fix and prune includes.
* boot.c: fix and prune includes.
* lotus-formula.c: fix and prune includes.
2001-08-21 Zbigniew Chyla <cyba@gnome.pl>
......
......@@ -5,31 +5,18 @@
* See: README
* Michael Meeks <mmeeks@gnu.org>
**/
#include <stdio.h>
#include <unistd.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <fcntl.h>
#include <assert.h>
#include <config.h>
#include <stdio.h>
#include <ctype.h>
#include <gnome.h>
#include "gnumeric.h"
#include "io-context.h"
#include "workbook-view.h"
#include "workbook.h"
#include "gnumeric-util.h"
#include "main.h"
#include "sheet.h"
#include "file.h"
#include "lotus.h"
#include "lotus-types.h"
#include "plugin.h"
#include "plugin-util.h"
#include "module-plugin-defs.h"
#include <gnumeric.h>
#include <workbook-view.h>
#include <file.h>
#include <plugin.h>
#include <plugin-util.h>
#include <module-plugin-defs.h>
#include <stdio.h>
GNUMERIC_MODULE_PLUGIN_INFO_DECL;
......
......@@ -5,23 +5,17 @@
* See: README
* Michael Meeks <michael@imagiantor.com>
**/
#include <stdio.h>
#include <unistd.h>
#include <config.h>
#include <ctype.h>
#include "gnumeric.h"
#include "gnumeric-util.h"
#include "main.h"
#include "sheet.h"
#include "expr.h"
#include "func.h"
#include "value.h"
#include "gutils.h"
#include "lotus.h"
#include "lotus-types.h"
#include "lotus-formula.h"
#include <gnumeric.h>
#include <expr.h>
#include <value.h>
#include <gutils.h>
#include <func.h>
#define FORMULA_DEBUG 0
typedef struct {
......
2001-08-24 Jody Goldberg <jgolberg@home.com>
* boot.c : prune includes.
* oleo.h : add gnumeric.h
* oleo.c : prune includes.
2001-08-21 Zbigniew Chyla <cyba@gnome.pl>
* plugin.xml: Removed
......
......@@ -6,31 +6,14 @@
*
* (this file adapted from lotus-123/boot.c)
**/
#include <stdio.h>
#include <unistd.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <fcntl.h>
#include <assert.h>
#include <config.h>
#include <stdio.h>
#include <ctype.h>
#include <gnome.h>
#include "gnumeric.h"
#include "io-context.h"
#include "workbook-view.h"
#include "workbook.h"
#include "gnumeric-util.h"
#include "main.h"
#include "sheet.h"
#include "file.h"
#include "error-info.h"
#include "plugin.h"
#include "plugin-util.h"
#include "module-plugin-defs.h"
#include "oleo.h"
#include <workbook-view.h>
#include <plugin.h>
#include <plugin-util.h>
#include <module-plugin-defs.h>
GNUMERIC_MODULE_PLUGIN_INFO_DECL;
void oleo_file_open (GnumFileOpener const *fo, IOContext *io_context,
......
......@@ -6,35 +6,24 @@
*
* partially based on the Lotus-123 code,
* partially based on actual Oleo code.
*
*/
#include <config.h>
#include "gnumeric.h"
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <fcntl.h>
#include <assert.h>
#include <stdio.h>
#include <ctype.h>
#include <gnome.h>
#include "workbook.h"
#include "io-context.h"
#include "cell.h"
#include "gnumeric-util.h"
#include "main.h"
#include "sheet.h"
#include "value.h"
#include "file.h"
#include "parse-util.h"
#include "plugin-util.h"
#include "error-info.h"
#include "oleo.h"
#include <workbook.h>
#include <sheet.h>
#include <cell.h>
#include <value.h>
#include <parse-util.h>
#include <plugin-util.h>
#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
#define OLEO_DEBUG 0
static Sheet *
......
#ifndef OLEO_H
#define OLEO_H
#include <gnumeric.h>
void oleo_read (IOContext *io_context, Workbook *wb, const char *filename);
#endif
2001-08-24 Jody Goldberg <jgoldberg@home.com>
* boot.[ch] : fix the includes.
* xbase.[ch] : fix the includes.
2001-08-21 Zbigniew Chyla <cyba@gnome.pl>
* plugin.xml: Removed
......
......@@ -4,31 +4,20 @@
* Author:
* Sean Atkinson <sca20@cam.ac.uk>
**/
#include <stdio.h>
#include <unistd.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <fcntl.h>
#include <errno.h>
#include <config.h>
#include <stdio.h>
#include <ctype.h>
#include <gnome.h>
#include "gnumeric.h"
#include "io-context.h"
#include "workbook-view.h"
#include "workbook.h"
#include "gnumeric-util.h"
#include "main.h"
#include "value.h"
#include "cell.h"
#include "file.h"
#include "error-info.h"
#include "plugin.h"
#include "plugin-util.h"
#include "module-plugin-defs.h"
#include "xbase.h"
#include "sheet.h"
#include <workbook-view.h>
#include <workbook.h>
#include <cell.h>
#include <plugin.h>
#include <plugin-util.h>
#include <module-plugin-defs.h>
#include <sheet.h>
#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
GNUMERIC_MODULE_PLUGIN_INFO_DECL;
......
#include <stdio.h>
#include <unistd.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <fcntl.h>
#include <config.h>
#include <stdio.h>
#include <ctype.h>
#include <errno.h>
#include <gnome.h>
#include "gnumeric.h"
#include "gnumeric-util.h"
#include "format.h"
#include "gutils.h"
#include "io-context.h"
#include "xbase.h"
#define XBASE_DEBUG 0
#include <format.h>
#include <gutils.h>
#include <io-context.h>
#include <string.h>
#define XBASE_DEBUG 0
static const char *field_types = "CNLDMF?BGPYTI";
......
#ifndef GNUMERIC_PLUGIN_XBASE_XBASE_H
#define GNUMERIC_PLUGIN_XBASE_XBASE_H
#include "gnumeric.h"
#include <gnumeric.h>
#include <stdio.h>
#include <error-info.h>
typedef struct { /* field format */
guint8 name[11]; /* name, including terminating '\0' */
......
......@@ -93,13 +93,13 @@ GNUMERIC_BASE_SOURCES = \
gnumeric-canvas.h \
gnumeric-pane.c \
gnumeric-pane.h \
gnumeric-util.c \
gnumeric-util.h \
gnumeric.h \
gui-clipboard.c \
gui-clipboard.h \
gui-file.c \
gui-file.h \
gui-util.c \
gui-util.h \
gui-gnumeric.h \
gutils.c \
gutils.h \
......
......@@ -18,7 +18,6 @@
#include "rangefunc.h"
#include "numbers.h"
#include "gnumeric.h"
#include "gnumeric-util.h"
#include "dialogs.h"
#include "parse-util.h"
#include "tools.h"
......
......@@ -11,7 +11,6 @@
#include <string.h>
#include <ctype.h>
#include "clipboard.h"
#include "gnumeric-util.h"
#include "sheet.h"
#include "sheet-style.h"
#include "sheet-merge.h"
......
......@@ -24,7 +24,6 @@
*/
#include <config.h>
#include "commands.h"
#include "gnumeric-util.h"
#include "application.h"
#include "sheet.h"
#include "sheet-style.h"
......@@ -51,9 +50,10 @@
#include "sheet-autofill.h"
#include "mstyle.h"
#include "search.h"
#include "gutils.h"
#include "sheet-object-cell-comment.h"
#include "sheet-object.h"
#include "sheet-control-gui.h"
#include "sheet-control.h"
#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
......@@ -638,6 +638,7 @@ cmd_set_text (WorkbookControl *wbc,
return TRUE;
}
/* FIXME : abstract this */
/* From src/dialogs/dialog-autocorrect.c */
corrected_text = autocorrect_tool (new_text);
......
......@@ -12,7 +12,7 @@
#include "gnumeric.h"
#include "dialogs.h"
#include "workbook.h"
#include "gnumeric-util.h"
#include "gui-util.h"
#define ABOUT_KEY "about-dialog"
......
......@@ -17,7 +17,7 @@
#include "dialogs.h"
#include "ranges.h"
#include "func-util.h"
#include "gnumeric-util.h"
#include "gui-util.h"
#include "analysis-tools.h"
#define OK 0
......
......@@ -17,7 +17,7 @@
#include "workbook.h"
#include "workbook-control.h"
#include "workbook-view.h"
#include "gnumeric-util.h"
#include "gui-util.h"
#include "utils-dialog.h"
#include "dialogs.h"
#include "parse-util.h"
......
......@@ -14,7 +14,7 @@
#include <glade/glade.h>
#include <ctype.h>
#include "gnumeric.h"
#include "gnumeric-util.h"
#include "gui-util.h"
#include "dialogs.h"
#include "commands.h"
#include "workbook.h"
......
......@@ -34,7 +34,7 @@
#include <stdlib.h>
#include "gnumeric.h"
#include "gnumeric-util.h"
#include "gui-util.h"
#include "mstyle.h"
#include "style-border.h"
#include "value.h"
......
......@@ -11,7 +11,7 @@
#include "gnumeric.h"
#include "workbook.h"
#include "workbook-control-gui-priv.h"
#include "gnumeric-util.h"
#include "gui-util.h"
#include "dialogs.h"
#include <libgnome/gnome-defs.h>
......
......@@ -10,7 +10,7 @@
#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include "gnumeric.h"
#include "gnumeric-util.h"
#include "gui-util.h"
#include "dialogs.h"
#include "sheet.h"
#include "cell.h"
......
......@@ -21,7 +21,7 @@
#include "utils-dialog.h"
#include "widgets/widget-font-selector.h"
#include "widgets/gnumeric-dashed-canvas-line.h"
#include "gnumeric-util.h"
#include "gui-util.h"
#include "selection.h"
#include "ranges.h"
#include "cell.h"
......
......@@ -15,7 +15,7 @@
#include <ctype.h>
#include "gnumeric.h"
#include "workbook-view.h"
#include "gnumeric-util.h"
#include "gui-util.h"
#include "dialogs.h"
#include "cell.h"
#include "expr.h"
......
......@@ -28,7 +28,7 @@
#include "consolidate.h"
#include "func.h"
#include "gnumeric.h"
#include "gnumeric-util.h"
#include "gui-util.h"
#include "ranges.h"
#include "selection.h"
#include "widgets/gnumeric-expr-entry.h"
......
......@@ -21,7 +21,7 @@
#include "workbook.h"
#include "workbook-control.h"
#include "workbook-edit.h"
#include "gnumeric-util.h"
#include "gui-util.h"
#include "parse-util.h"
#include "widgets/gnumeric-expr-entry.h"
......
......@@ -10,7 +10,7 @@
#include <libgnome/gnome-i18n.h>
#include <glade/glade.h>
#include "gnumeric.h"
#include "gnumeric-util.h"
#include "gui-util.h"
#include "selection.h"
#include "dialogs.h"
#include "workbook.h"
......
......@@ -27,7 +27,7 @@
#include <gdk/gdkkeysyms.h>
#include "gnumeric.h"
#include "parse-util.h"
#include "gnumeric-util.h"
#include "gui-util.h"
#include "dialogs.h"
#include "workbook.h"
#include "sheet.h"
......
......@@ -9,7 +9,7 @@
#include <ctype.h>
#include <glade/glade.h>
#include "gnumeric.h"
#include "gnumeric-util.h"
#include "gui-util.h"
#include "func.h"
#include "dialogs.h"
#include "workbook.h"
......
......@@ -27,7 +27,7 @@
#include <gdk/gdkkeysyms.h>
#include "gnumeric.h"
#include "parse-util.h"
#include "gnumeric-util.h"
#include "gui-util.h"
#include "dialogs.h"
#include "workbook.h"
#include "sheet.h"
......
......@@ -12,7 +12,7 @@
#include <libgnome/gnome-i18n.h>
#include <math.h>
#include "gnumeric.h"
#include "gnumeric-util.h" <