GNOME.org
 

[goffice] Compilation: grand renaming, part 2.

commit f5d74afdba9c1b9c2eea71200022349f0be1dfb1
Author: Morten Welinder <terra gnome org>
Date:   Wed Aug 19 20:08:58 2009 -0400

    Compilation: grand renaming, part 2.

 goffice/app/file-priv.h               |    4 +-
 goffice/app/file.c                    |   18 +++---
 goffice/app/file.h                    |   10 ++--
 goffice/app/go-doc.h                  |   10 ++--
 goffice/app/go-plugin-loader-module.c |    8 +-
 goffice/app/go-plugin-service.c       |   12 ++--
 goffice/app/go-plugin-service.h       |    4 +-
 goffice/app/goffice-app.h             |    2 +-
 goffice/app/io-context-priv.h         |   10 ++--
 goffice/app/io-context.c              |  122 ++++++++++++++++----------------
 goffice/app/io-context.h              |   60 ++++++++--------
 11 files changed, 130 insertions(+), 130 deletions(-)
---
diff --git a/goffice/app/file-priv.h b/goffice/app/file-priv.h
index b294689..76f72f6 100644
--- a/goffice/app/file-priv.h
+++ b/goffice/app/file-priv.h
@@ -24,7 +24,7 @@ struct _GOFileOpenerClass {
 	                    FileProbeLevel pl);
 	void      (*open)  (GOFileOpener const *fo,
 			    gchar const *opt_enc,
-	                    IOContext *io_context,
+	                    GOIOContext *io_context,
 	                    gpointer  fixme_fixme_workbook_view,
 	                    GsfInput *input);
 };
@@ -64,7 +64,7 @@ struct _GOFileSaverClass {
 
 	/* private */
 	void (*save) (GOFileSaver const *fs,
-	              IOContext *io_context,
+	              GOIOContext *io_context,
 	              gconstpointer wbv,
 	              GsfOutput *output);
 
diff --git a/goffice/app/file.c b/goffice/app/file.c
index cd05f6d..0d5d989 100644
--- a/goffice/app/file.c
+++ b/goffice/app/file.c
@@ -74,7 +74,7 @@ go_file_opener_probe_real (GOFileOpener const *fo, GsfInput *input,
 
 static void
 go_file_opener_open_real (GOFileOpener const *fo, gchar const *opt_enc,
-			  IOContext *io_context,
+			  GOIOContext *io_context,
 			  gpointer FIXME_workbook_view,
 			  GsfInput *input)
 {
@@ -87,7 +87,7 @@ go_file_opener_open_real (GOFileOpener const *fo, gchar const *opt_enc,
 			fo->open_func (fo, io_context,
 				       FIXME_workbook_view, input);
 	} else
-		gnumeric_io_error_unknown (io_context);
+		go_io_error_unknown (io_context);
 }
 
 static void
@@ -284,13 +284,13 @@ go_file_opener_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl
  *
  * Reads content of @file_name file into workbook @wbv is attached to.
  * Results are reported using @io_context object, use
- * gnumeric_io_error_occurred to find out if operation was successful.
+ * go_io_error_occurred to find out if operation was successful.
  * The state of @wbv and its workbook is undefined if operation fails, you
  * should destroy them in that case.
  */
 void
 go_file_opener_open (GOFileOpener const *fo, gchar const *opt_enc,
-		     IOContext *io_context,
+		     GOIOContext *io_context,
 		     gpointer FIXME_workbook_view, GsfInput *input)
 {
 	g_return_if_fail (GO_IS_FILE_OPENER (fo));
@@ -432,11 +432,11 @@ go_file_saver_get_property (GObject *object, guint property_id,
 }
 
 static void
-go_file_saver_save_real (GOFileSaver const *fs, IOContext *io_context,
+go_file_saver_save_real (GOFileSaver const *fs, GOIOContext *io_context,
 			 gconstpointer FIXME_workbook_view, GsfOutput *output)
 {
 	if (fs->save_func == NULL) {
-		gnumeric_io_error_unknown (io_context);
+		go_io_error_unknown (io_context);
 		return;
 	}
 
@@ -657,12 +657,12 @@ go_file_saver_set_export_options (GOFileSaver *fs,
  *
  * Saves @wbv and the workbook it is attached to into @output stream.
  * Results are reported using @io_context object, use
- * gnumeric_io_error_occurred to find out if operation was successful.
+ * go_io_error_occurred to find out if operation was successful.
  * It's possible that @file_name is created and contain some data if
  * operation fails, you should remove the file in that case.
  */
 void
-go_file_saver_save (GOFileSaver const *fs, IOContext *io_context,
+go_file_saver_save (GOFileSaver const *fs, GOIOContext *io_context,
 		    gconstpointer FIXME_workbook_view,
 		    GsfOutput *output)
 {
@@ -695,7 +695,7 @@ go_file_saver_save (GOFileSaver const *fs, IOContext *io_context,
 				msg,
 				go_error_info_new_str (
 					_("You can turn this safety feature off by editing appropriate plugin.xml file.")));
-			gnumeric_io_go_error_info_set (io_context, save_error);
+			go_io_error_info_set (io_context, save_error);
 			return;
 		}
 
diff --git a/goffice/app/file.h b/goffice/app/file.h
index 5687790..504bfb6 100644
--- a/goffice/app/file.h
+++ b/goffice/app/file.h
@@ -52,12 +52,12 @@ typedef gboolean (*GOFileOpenerProbeFunc) (GOFileOpener const *fo,
 					    GsfInput *input,
 					    FileProbeLevel pl);
 typedef void     (*GOFileOpenerOpenFunc) (GOFileOpener const *fo,
-					  IOContext *io_context,
+					  GOIOContext *io_context,
 					  gpointer FIXME_FIXME_workbook_view,
 					  GsfInput *input);
 typedef void     (*GOFileOpenerOpenFuncWithEnc) (GOFileOpener const *fo,
 						 gchar const *enc,
-						 IOContext *io_context,
+						 GOIOContext *io_context,
 						 gpointer FIXME_workbook_view,
 						 GsfInput *input);
 
@@ -81,7 +81,7 @@ GOFileOpener *go_file_opener_new_with_enc (char const *id,
 gboolean     go_file_opener_probe (GOFileOpener const *fo, GsfInput *input,
 				    FileProbeLevel pl);
 void         go_file_opener_open (GOFileOpener const *fo, gchar const *opt_enc,
-				  IOContext *io_context,
+				  GOIOContext *io_context,
 				  gpointer FIXME_workbook_view,
 				  GsfInput *input);
 
@@ -104,7 +104,7 @@ typedef struct _GOFileSaverClass GOFileSaverClass;
 #define GO_IS_FILE_SAVER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GO_FILE_SAVER))
 
 typedef void (*GOFileSaverSaveFunc) (GOFileSaver const *fs,
-				     IOContext *io_context,
+				     GOIOContext *io_context,
 				     gconstpointer FIXME_FIXME_workbook_view,
 				     GsfOutput *output);
 
@@ -125,7 +125,7 @@ gboolean     go_file_saver_set_export_options (GOFileSaver *fs,
 					       const char *options,
 					       GError **err);
 
-void         go_file_saver_save (GOFileSaver const *fs, IOContext *io_context,
+void         go_file_saver_save (GOFileSaver const *fs, GOIOContext *io_context,
 				 gconstpointer FIXME_workbook_view,
 				 GsfOutput *output);
 void         go_file_saver_set_overwrite_files	(GOFileSaver *fs,
diff --git a/goffice/app/go-doc.h b/goffice/app/go-doc.h
index 735fefd..0074cf3 100644
--- a/goffice/app/go-doc.h
+++ b/goffice/app/go-doc.h
@@ -47,16 +47,16 @@ void		 go_doc_update_meta_data (GODoc *doc);
 #if 0
 GODoc   *go_doc_new_from_input  (GsfInput *input,
 				 GODocImporter const *fmt,
-				 GOIOContext *context,
+				 XXXGOIOContext *context,
 				 gchar const *encoding);
 GODoc   *go_doc_new_from_uri	(char const *uri,
 				 GnmFileOpener const *fmt,
-				 GOIOContext *context, 
+				 XXXGOIOContext *context, 
 				 gchar const *encoding);
-gboolean go_doc_save		(GODoc *doc, GOIOContext *context);
+gboolean go_doc_save		(GODoc *doc, XXXGOIOContext *context);
 gboolean go_doc_save_as		(GODoc *doc, GODocExporter *fmt, char const *uri,
-				 GOIOContext *cc);
-gboolean go_doc_sendto		(GODoc *doc, GOIOContext *cc);
+				 XXXGOIOContext *cc);
+gboolean go_doc_sendto		(GODoc *doc, XXXGOIOContext *cc);
 #endif
 
 /* put into GODoc (as properties) */
diff --git a/goffice/app/go-plugin-loader-module.c b/goffice/app/go-plugin-loader-module.c
index d513b16..feb5851 100644
--- a/goffice/app/go-plugin-loader-module.c
+++ b/goffice/app/go-plugin-loader-module.c
@@ -206,7 +206,7 @@ GSF_CLASS_FULL (GOPluginLoaderModule, go_plugin_loader_module,
 typedef struct {
 	gboolean (*module_func_file_probe) (GOFileOpener const *fo, GsfInput *input,
 					    FileProbeLevel pl);
-	void (*module_func_file_open) (GOFileOpener const *fo, IOContext *io_context,
+	void (*module_func_file_open) (GOFileOpener const *fo, GOIOContext *io_context,
 				       gpointer FIXME_FIXME_workbook_view,
 				       GsfInput *input);
 } ServiceLoaderDataFileOpener;
@@ -226,7 +226,7 @@ go_plugin_loader_module_func_file_probe (GOFileOpener const *fo, GOPluginService
 
 static void
 go_plugin_loader_module_func_file_open (GOFileOpener const *fo, GOPluginService *service,
-					 IOContext *io_context,
+					 GOIOContext *io_context,
 					 gpointer   FIXME_FIXME_workbook_view,
 					 GsfInput  *input)
 {
@@ -303,14 +303,14 @@ go_plugin_loader_module_load_service_file_opener (GOPluginLoader *loader,
  */
 
 typedef struct {
-	void (*module_func_file_save) (GOFileSaver const *fs, IOContext *io_context,
+	void (*module_func_file_save) (GOFileSaver const *fs, GOIOContext *io_context,
 				       gconstpointer FIXME_FIXME_workbook_view,
 				       GsfOutput *output);
 } ServiceLoaderDataFileSaver;
 
 static void
 go_plugin_loader_module_func_file_save (GOFileSaver const *fs, GOPluginService *service,
-					 IOContext *io_context,
+					 GOIOContext *io_context,
 					 gconstpointer FIXME_FIXME_workbook_view,
 					 GsfOutput *output)
 {
diff --git a/goffice/app/go-plugin-service.c b/goffice/app/go-plugin-service.c
index 5a5f864..91c7ae0 100644
--- a/goffice/app/go-plugin-service.c
+++ b/goffice/app/go-plugin-service.c
@@ -453,7 +453,7 @@ go_plugin_file_opener_probe (GOFileOpener const *fo, GsfInput *input,
 
 static void
 go_plugin_file_opener_open (GOFileOpener const *fo, gchar const *unused_enc,
-			     IOContext *io_context,
+			     GOIOContext *io_context,
 			     gpointer FIXME_FIXME_workbook_view,
 			     GsfInput *input)
 
@@ -466,8 +466,8 @@ go_plugin_file_opener_open (GOFileOpener const *fo, gchar const *unused_enc,
 
 	plugin_service_load (pfo->service, &error);
 	if (error != NULL) {
-		gnumeric_io_go_error_info_set (io_context, error);
-		gnumeric_io_error_push (io_context, go_error_info_new_str (
+		go_io_error_info_set (io_context, error);
+		go_io_error_push (io_context, go_error_info_new_str (
 		                        _("Error while reading file.")));
 		return;
 	}
@@ -725,7 +725,7 @@ go_plugin_file_saver_init (GOPluginFileSaver *fs)
 }
 
 static void
-go_plugin_file_saver_save (GOFileSaver const *fs, IOContext *io_context,
+go_plugin_file_saver_save (GOFileSaver const *fs, GOIOContext *io_context,
 			    gconstpointer FIXME_FIXME_workbook_view,
 			    GsfOutput *output)
 {
@@ -737,8 +737,8 @@ go_plugin_file_saver_save (GOFileSaver const *fs, IOContext *io_context,
 
 	plugin_service_load (pfs->service, &error);
 	if (error != NULL) {
-		gnumeric_io_go_error_info_set (io_context, error);
-		gnumeric_io_error_push (io_context, go_error_info_new_str (
+		go_io_error_info_set (io_context, error);
+		go_io_error_push (io_context, go_error_info_new_str (
 		                        _("Error while loading plugin for saving.")));
 		if (!gsf_output_error (output))
 			gsf_output_set_error (output, 0, _("Failed to load plugin for saving"));
diff --git a/goffice/app/go-plugin-service.h b/goffice/app/go-plugin-service.h
index 8668b92..ea9115a 100644
--- a/goffice/app/go-plugin-service.h
+++ b/goffice/app/go-plugin-service.h
@@ -40,7 +40,7 @@ typedef struct {
 	         GsfInput *input, FileProbeLevel pl);
 	void     (*plugin_func_file_open) (
 	         GOFileOpener const *fo, GOPluginService *service,
-	         IOContext *io_context, gpointer fixme_workbook_view,
+	         GOIOContext *io_context, gpointer fixme_workbook_view,
 		 GsfInput *input);
 } PluginServiceFileOpenerCallbacks;
 
@@ -54,7 +54,7 @@ typedef struct _PluginServiceFileSaver PluginServiceFileSaver;
 typedef struct {
 	void  (*plugin_func_file_save) (
 	      GOFileSaver const *fs, GOPluginService *service,
-	      IOContext *io_context, gconstpointer fixme_workbook_view,
+	      GOIOContext *io_context, gconstpointer fixme_workbook_view,
 	      GsfOutput *output);
 } PluginServiceFileSaverCallbacks;
 
diff --git a/goffice/app/goffice-app.h b/goffice/app/goffice-app.h
index 428c9be..3448adf 100644
--- a/goffice/app/goffice-app.h
+++ b/goffice/app/goffice-app.h
@@ -39,7 +39,7 @@ typedef struct _GOPluginLoader	GOPluginLoader;
 typedef struct _GOErrorInfo		GOErrorInfo;
 typedef struct _GOFileSaver 		GOFileSaver;
 typedef struct _GOFileOpener		GOFileOpener;
-typedef struct _IOContext		IOContext;
+typedef struct _IOContext		GOIOContext;
 
 /*
  * File probe level tells file opener (its probe method to be exact), how
diff --git a/goffice/app/io-context-priv.h b/goffice/app/io-context-priv.h
index 4ebac1b..67e78b7 100644
--- a/goffice/app/io-context-priv.h
+++ b/goffice/app/io-context-priv.h
@@ -7,8 +7,8 @@
 
 G_BEGIN_DECLS
 
-#define IO_CONTEXT_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_IO_CONTEXT, IOContextClass))
-#define IS_IO_CONTEXT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_IO_CONTEXT))
+#define IO_CONTEXT_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GO_TYPE_IO_CONTEXT, GOIOContextClass))
+#define GO_IS_IO_CONTEXT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GO_TYPE_IO_CONTEXT))
 
 typedef enum {
 	GO_PROGRESS_HELPER_NONE,
@@ -59,10 +59,10 @@ struct _IOContext {
 	gboolean exec_main_loop;
 };
 
-struct _IOContextClass {
+struct _GOIOContextClass {
 	GObjectClass base;
-	void  (*set_num_files)   (IOContext *ioc, guint count);
-	void  (*processing_file) (IOContext *ioc, char const *name);
+	void  (*set_num_files)   (GOIOContext *ioc, guint count);
+	void  (*processing_file) (GOIOContext *ioc, char const *name);
 };
 
 G_END_DECLS
diff --git a/goffice/app/io-context.c b/goffice/app/io-context.c
index 13acf49..b609c96 100644
--- a/goffice/app/io-context.c
+++ b/goffice/app/io-context.c
@@ -33,7 +33,7 @@ enum {
 };
 
 static void
-io_context_init (IOContext *ioc)
+go_io_context_init (GOIOContext *ioc)
 {
 	ioc->impl = NULL;
 	ioc->info = NULL;
@@ -52,11 +52,11 @@ io_context_init (IOContext *ioc)
 static void
 ioc_finalize (GObject *obj)
 {
-	IOContext *ioc;
+	GOIOContext *ioc;
 
-	g_return_if_fail (IS_IO_CONTEXT (obj));
+	g_return_if_fail (GO_IS_IO_CONTEXT (obj));
 
-	ioc = IO_CONTEXT (obj);
+	ioc = GO_IO_CONTEXT (obj);
 	go_error_info_free (ioc->info);
 	if (ioc->impl) {
 		go_cmd_context_progress_set (ioc->impl, 0.0);
@@ -71,7 +71,7 @@ static void
 io_context_set_property (GObject *obj, guint param_id,
 		       GValue const *value, GParamSpec *pspec)
 {
-	IOContext *ioc = IO_CONTEXT (obj);
+	GOIOContext *ioc = GO_IO_CONTEXT (obj);
 
 	switch (param_id) {
 	case IOC_PROP_EXEC_LOOP:
@@ -86,7 +86,7 @@ static void
 io_context_get_property (GObject *obj, guint param_id,
 		       GValue *value, GParamSpec *pspec)
 {
-	IOContext *ioc = IO_CONTEXT (obj);
+	GOIOContext *ioc = GO_IO_CONTEXT (obj);
 
 	switch (param_id) {
 	case IOC_PROP_EXEC_LOOP:
@@ -100,7 +100,7 @@ io_context_get_property (GObject *obj, guint param_id,
 static char *
 ioc_get_password (GOCmdContext *cc, char const *filename)
 {
-	IOContext *ioc = (IOContext *)cc;
+	GOIOContext *ioc = (GOIOContext *)cc;
 	return go_cmd_context_get_password (ioc->impl, filename);
 }
 
@@ -113,7 +113,7 @@ ioc_set_sensitive (GOCmdContext *cc, gboolean sensitive)
 static void
 ioc_error_error (GOCmdContext *cc, GError *err)
 {
-	gnumeric_io_error_string (IO_CONTEXT (cc), err->message);
+	go_io_error_string (GO_IO_CONTEXT (cc), err->message);
 }
 
 static void
@@ -125,7 +125,7 @@ ioc_error_go_error_info_ (G_GNUC_UNUSED GOCmdContext *ctxt,
 }
 
 void
-gnumeric_io_error_string (IOContext *context, const gchar *str)
+go_io_error_string (GOIOContext *context, const gchar *str)
 {
 	GOErrorInfo *error;
 
@@ -133,11 +133,11 @@ gnumeric_io_error_string (IOContext *context, const gchar *str)
 	g_return_if_fail (str != NULL);
 
 	error = go_error_info_new_str (str);
-	gnumeric_io_go_error_info_set (context, error);
+	go_io_error_info_set (context, error);
 }
 
 static void
-io_context_gnm_cmd_context_init (GOCmdContextClass *cc_class)
+go_io_context_gnm_cmd_context_init (GOCmdContextClass *cc_class)
 {
 	cc_class->get_password	   = ioc_get_password;
 	cc_class->set_sensitive	   = ioc_set_sensitive;
@@ -146,7 +146,7 @@ io_context_gnm_cmd_context_init (GOCmdContextClass *cc_class)
 }
 
 static void
-io_context_class_init (GObjectClass *klass)
+go_io_context_class_init (GObjectClass *klass)
 {
 	klass->finalize = ioc_finalize;
 	klass->set_property = io_context_set_property;
@@ -157,19 +157,19 @@ io_context_class_init (GObjectClass *klass)
 			TRUE, G_PARAM_READWRITE));
 }
 
-GSF_CLASS_FULL (IOContext, io_context,
-		NULL, NULL, io_context_class_init, NULL,
-		io_context_init, G_TYPE_OBJECT, 0,
-		GSF_INTERFACE (io_context_gnm_cmd_context_init, GO_TYPE_CMD_CONTEXT))
+GSF_CLASS_FULL (GOIOContext, go_io_context,
+		NULL, NULL, go_io_context_class_init, NULL,
+		go_io_context_init, G_TYPE_OBJECT, 0,
+		GSF_INTERFACE (go_io_context_gnm_cmd_context_init, GO_TYPE_CMD_CONTEXT))
 
-IOContext *
-gnumeric_io_context_new (GOCmdContext *cc)
+GOIOContext *
+go_io_context_new (GOCmdContext *cc)
 {
-	IOContext *ioc;
+	GOIOContext *ioc;
 
 	g_return_val_if_fail (GO_IS_CMD_CONTEXT (cc), NULL);
 
-	ioc = g_object_new (TYPE_IO_CONTEXT, NULL);
+	ioc = g_object_new (GO_TYPE_IO_CONTEXT, NULL);
 	/* The cc is optional for subclasses, but mandatory in this class. */
 	ioc->impl = cc;
 	g_object_ref (G_OBJECT (ioc->impl));
@@ -178,7 +178,7 @@ gnumeric_io_context_new (GOCmdContext *cc)
 }
 
 void
-gnumeric_io_error_unknown (IOContext *context)
+go_io_error_unknown (GOIOContext *context)
 {
 	g_return_if_fail (context != NULL);
 
@@ -186,7 +186,7 @@ gnumeric_io_error_unknown (IOContext *context)
 }
 
 void
-gnumeric_io_go_error_info_set (IOContext *context, GOErrorInfo *error)
+go_io_error_info_set (GOIOContext *context, GOErrorInfo *error)
 {
 	g_return_if_fail (context != NULL);
 	g_return_if_fail (error != NULL);
@@ -198,7 +198,7 @@ gnumeric_io_go_error_info_set (IOContext *context, GOErrorInfo *error)
 }
 
 void
-gnumeric_io_error_push (IOContext *context, GOErrorInfo *error)
+go_io_error_push (GOIOContext *context, GOErrorInfo *error)
 {
 	g_return_if_fail (context != NULL);
 	g_return_if_fail (error != NULL);
@@ -208,7 +208,7 @@ gnumeric_io_error_push (IOContext *context, GOErrorInfo *error)
 }
 
 void
-gnumeric_io_error_display (IOContext *context)
+go_io_error_display (GOIOContext *context)
 {
 	GOCmdContext *cc;
 
@@ -223,9 +223,9 @@ gnumeric_io_error_display (IOContext *context)
 	}
 }
 
-/* TODO: Rename to gnumeric_io_info_clear */
+/* TODO: Rename to go_io_info_clear */
 void
-gnumeric_io_error_clear (IOContext *context)
+go_io_error_clear (GOIOContext *context)
 {
 	g_return_if_fail (context != NULL);
 
@@ -236,23 +236,23 @@ gnumeric_io_error_clear (IOContext *context)
 }
 
 gboolean
-gnumeric_io_error_occurred (IOContext *context)
+go_io_error_occurred (GOIOContext *context)
 {
 	return context->error_occurred;
 }
 
 gboolean
-gnumeric_io_warning_occurred (IOContext *context)
+go_io_warning_occurred (GOIOContext *context)
 {
 	return context->warning_occurred;
 }
 
 void
-io_progress_update (IOContext *ioc, gdouble f)
+io_progress_update (GOIOContext *ioc, gdouble f)
 {
 	gboolean at_end;
 
-	g_return_if_fail (IS_IO_CONTEXT (ioc));
+	g_return_if_fail (GO_IS_IO_CONTEXT (ioc));
 
 	if (ioc->progress_ranges != NULL) {
 		f = f * (ioc->progress_max - ioc->progress_min)
@@ -289,11 +289,11 @@ io_progress_update (IOContext *ioc, gdouble f)
 }
 
 void
-io_progress_message (IOContext *ioc, const gchar *msg)
+io_progress_message (GOIOContext *ioc, const gchar *msg)
 {
 	GOCmdContext *cc;
 
-	g_return_if_fail (IS_IO_CONTEXT (ioc));
+	g_return_if_fail (GO_IS_IO_CONTEXT (ioc));
 
 	if (ioc->impl)
 		cc = ioc->impl;
@@ -303,12 +303,12 @@ io_progress_message (IOContext *ioc, const gchar *msg)
 }
 
 void
-io_progress_range_push (IOContext *ioc, gdouble min, gdouble max)
+io_progress_range_push (GOIOContext *ioc, gdouble min, gdouble max)
 {
 	ProgressRange *r;
 	gdouble new_min, new_max;
 
-	g_return_if_fail (IS_IO_CONTEXT (ioc));
+	g_return_if_fail (GO_IS_IO_CONTEXT (ioc));
 
 	r = g_new (ProgressRange, 1);
 	r->min = min;
@@ -324,11 +324,11 @@ io_progress_range_push (IOContext *ioc, gdouble min, gdouble max)
 }
 
 void
-io_progress_range_pop (IOContext *ioc)
+io_progress_range_pop (GOIOContext *ioc)
 {
 	GList *l;
 
-	g_return_if_fail (IS_IO_CONTEXT (ioc));
+	g_return_if_fail (GO_IS_IO_CONTEXT (ioc));
 	g_return_if_fail (ioc->progress_ranges != NULL);
 
 	l = g_list_last (ioc->progress_ranges);
@@ -352,9 +352,9 @@ io_progress_range_pop (IOContext *ioc)
 }
 
 void
-value_io_progress_set (IOContext *ioc, gint total, gint step)
+value_io_progress_set (GOIOContext *ioc, gint total, gint step)
 {
-	g_return_if_fail (IS_IO_CONTEXT (ioc));
+	g_return_if_fail (GO_IS_IO_CONTEXT (ioc));
 	g_return_if_fail (total >= 0);
 
 	ioc->helper.helper_type = GO_PROGRESS_HELPER_VALUE;
@@ -364,12 +364,12 @@ value_io_progress_set (IOContext *ioc, gint total, gint step)
 }
 
 void
-value_io_progress_update (IOContext *ioc, gint value)
+value_io_progress_update (GOIOContext *ioc, gint value)
 {
 	gdouble complete;
 	gint step, total;
 
-	g_return_if_fail (IS_IO_CONTEXT (ioc));
+	g_return_if_fail (GO_IS_IO_CONTEXT (ioc));
 	g_return_if_fail (ioc->helper.helper_type == GO_PROGRESS_HELPER_VALUE);
 
 	total = ioc->helper.v.value.total;
@@ -386,9 +386,9 @@ value_io_progress_update (IOContext *ioc, gint value)
 }
 
 void
-count_io_progress_set (IOContext *ioc, gint total, gint step)
+count_io_progress_set (GOIOContext *ioc, gint total, gint step)
 {
-	g_return_if_fail (IS_IO_CONTEXT (ioc));
+	g_return_if_fail (GO_IS_IO_CONTEXT (ioc));
 	g_return_if_fail (total >= 0);
 
 	ioc->helper.helper_type = GO_PROGRESS_HELPER_COUNT;
@@ -399,12 +399,12 @@ count_io_progress_set (IOContext *ioc, gint total, gint step)
 }
 
 void
-count_io_progress_update (IOContext *ioc, gint inc)
+count_io_progress_update (GOIOContext *ioc, gint inc)
 {
 	gdouble complete;
 	gint current, step, total;
 
-	g_return_if_fail (IS_IO_CONTEXT (ioc));
+	g_return_if_fail (GO_IS_IO_CONTEXT (ioc));
 	g_return_if_fail (ioc->helper.helper_type == GO_PROGRESS_HELPER_COUNT);
 
 	current = (ioc->helper.v.count.current += inc);
@@ -421,32 +421,32 @@ count_io_progress_update (IOContext *ioc, gint inc)
 }
 
 void
-io_progress_unset (IOContext *ioc)
+io_progress_unset (GOIOContext *ioc)
 {
-	g_return_if_fail (IS_IO_CONTEXT (ioc));
+	g_return_if_fail (GO_IS_IO_CONTEXT (ioc));
 
 	ioc->helper.helper_type = GO_PROGRESS_HELPER_NONE;
 }
 
 void
-gnm_io_context_set_num_files (IOContext *ioc, guint count)
+go_io_context_set_num_files (GOIOContext *ioc, guint count)
 {
-	IOContextClass *klass = IOC_CLASS(ioc);
+	GOIOContextClass *klass = IOC_CLASS(ioc);
 	g_return_if_fail (klass != NULL);
 	if (klass->set_num_files != NULL)
 		klass->set_num_files (ioc, count);
 }
 
 /**
- * gnm_io_context_processing_file :
- * @ioc : #IOContext
+ * go_io_context_processing_file :
+ * @ioc : #GOIOContext
  * @uri : An escaped uri (eg foo%20bar)
  **/
 void
-gnm_io_context_processing_file (IOContext *ioc, char const *uri)
+go_io_context_processing_file (GOIOContext *ioc, char const *uri)
 {
 	char *basename;
-	IOContextClass *klass = IOC_CLASS(ioc);
+	GOIOContextClass *klass = IOC_CLASS(ioc);
 
 	g_return_if_fail (klass != NULL);
 
@@ -457,40 +457,40 @@ gnm_io_context_processing_file (IOContext *ioc, char const *uri)
 }
 
 void
-gnm_io_warning (G_GNUC_UNUSED IOContext *context,
+go_io_warning (G_GNUC_UNUSED GOIOContext *context,
 		char const *fmt, ...)
 {
 	va_list args;
 
 	va_start (args, fmt);
-	gnm_io_warning_varargs (context, fmt, args);
+	go_io_warning_varargs (context, fmt, args);
 	va_end (args);
 }
 
 void
-gnm_io_warning_varargs (IOContext *context, char const *fmt, va_list args)
+go_io_warning_varargs (GOIOContext *context, char const *fmt, va_list args)
 {
 	context->info = go_error_info_new_vprintf (GO_WARNING, fmt, args);
 	context->warning_occurred = TRUE;
 }
 
 void
-gnm_io_warning_unknown_font (IOContext *context,
+go_io_warning_unknown_font (GOIOContext *context,
 			     G_GNUC_UNUSED char const *font_name)
 {
-	g_return_if_fail (IS_IO_CONTEXT (context));
+	g_return_if_fail (GO_IS_IO_CONTEXT (context));
 }
 
 void
-gnm_io_warning_unknown_function	(IOContext *context,
+go_io_warning_unknown_function	(GOIOContext *context,
 				 G_GNUC_UNUSED char const *funct_name)
 {
-	g_return_if_fail (IS_IO_CONTEXT (context));
+	g_return_if_fail (GO_IS_IO_CONTEXT (context));
 }
 
 void
-gnm_io_warning_unsupported_feature (IOContext *context, char const *feature)
+go_io_warning_unsupported_feature (GOIOContext *context, char const *feature)
 {
-	g_return_if_fail (IS_IO_CONTEXT (context));
+	g_return_if_fail (GO_IS_IO_CONTEXT (context));
 	g_warning ("%s : are not supported yet", feature);
 }
diff --git a/goffice/app/io-context.h b/goffice/app/io-context.h
index 989bfc1..b7faac9 100644
--- a/goffice/app/io-context.h
+++ b/goffice/app/io-context.h
@@ -7,46 +7,46 @@
 
 G_BEGIN_DECLS
 
-typedef struct _IOContextClass IOContextClass;
+typedef struct _GOIOContextClass GOIOContextClass;
 
-#define TYPE_IO_CONTEXT    (io_context_get_type ())
-#define IO_CONTEXT(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_IO_CONTEXT, IOContext))
-#define IS_IO_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_IO_CONTEXT))
+#define GO_TYPE_IO_CONTEXT    (go_io_context_get_type ())
+#define GO_IO_CONTEXT(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GO_TYPE_IO_CONTEXT, GOIOContext))
+#define GO_IS_IO_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GO_TYPE_IO_CONTEXT))
 
-GType      io_context_get_type (void);
-IOContext *gnumeric_io_context_new        (GOCmdContext *cc);
+GType      go_io_context_get_type (void);
+GOIOContext *go_io_context_new        (GOCmdContext *cc);
 
-void       gnumeric_io_error_unknown      (IOContext *ioc);
+void       go_io_error_unknown      (GOIOContext *ioc);
 
-void       gnumeric_io_go_error_info_set     (IOContext *ioc, GOErrorInfo *error);
-void       gnumeric_io_error_string       (IOContext *ioc, const gchar *str);
-void       gnumeric_io_error_push         (IOContext *ioc, GOErrorInfo *error);
-void       gnumeric_io_error_clear        (IOContext *ioc);
-void       gnumeric_io_error_display      (IOContext *ioc);
+void       go_io_error_info_set     (GOIOContext *ioc, GOErrorInfo *error);
+void       go_io_error_string       (GOIOContext *ioc, const gchar *str);
+void       go_io_error_push         (GOIOContext *ioc, GOErrorInfo *error);
+void       go_io_error_clear        (GOIOContext *ioc);
+void       go_io_error_display      (GOIOContext *ioc);
 
-gboolean   gnumeric_io_error_occurred     (IOContext *ioc);
-gboolean   gnumeric_io_warning_occurred   (IOContext *ioc);
+gboolean   go_io_error_occurred     (GOIOContext *ioc);
+gboolean   go_io_warning_occurred   (GOIOContext *ioc);
 
-void       io_progress_message      (IOContext *io_context, const gchar *msg);
-void       io_progress_update       (IOContext *io_context, gdouble f);
-void       io_progress_range_push   (IOContext *io_context, gdouble min, gdouble max);
-void       io_progress_range_pop    (IOContext *io_context);
+void       io_progress_message      (GOIOContext *io_context, const gchar *msg);
+void       io_progress_update       (GOIOContext *io_context, gdouble f);
+void       io_progress_range_push   (GOIOContext *io_context, gdouble min, gdouble max);
+void       io_progress_range_pop    (GOIOContext *io_context);
 
-void       count_io_progress_set    (IOContext *io_context, gint total, gint step);
-void       count_io_progress_update (IOContext *io_context, gint inc);
+void       count_io_progress_set    (GOIOContext *io_context, gint total, gint step);
+void       count_io_progress_update (GOIOContext *io_context, gint inc);
 
-void       value_io_progress_set    (IOContext *io_context, gint total, gint step);
-void       value_io_progress_update (IOContext *io_context, gint value);
+void       value_io_progress_set    (GOIOContext *io_context, gint total, gint step);
+void       value_io_progress_update (GOIOContext *io_context, gint value);
 
-void       io_progress_unset      (IOContext *io_context);
+void       io_progress_unset      (GOIOContext *io_context);
 
-void gnm_io_context_set_num_files	(IOContext *ioc, guint count);
-void gnm_io_context_processing_file	(IOContext *ioc, char const *uri);
-void gnm_io_warning			(IOContext *ioc, char const *fmt, ...) G_GNUC_PRINTF (2, 3);
-void gnm_io_warning_varargs		(IOContext *ioc, char const *fmt, va_list args);
-void gnm_io_warning_unknown_font	(IOContext *ioc, char const *font_name);
-void gnm_io_warning_unknown_function	(IOContext *ioc, char const *funct_name);
-void gnm_io_warning_unsupported_feature	(IOContext *ioc, char const *feature);
+void go_io_context_set_num_files	(GOIOContext *ioc, guint count);
+void go_io_context_processing_file	(GOIOContext *ioc, char const *uri);
+void go_io_warning			(GOIOContext *ioc, char const *fmt, ...) G_GNUC_PRINTF (2, 3);
+void go_io_warning_varargs		(GOIOContext *ioc, char const *fmt, va_list args);
+void go_io_warning_unknown_font	(GOIOContext *ioc, char const *font_name);
+void go_io_warning_unknown_function	(GOIOContext *ioc, char const *funct_name);
+void go_io_warning_unsupported_feature	(GOIOContext *ioc, char const *feature);
 
 G_END_DECLS
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]