GNOME.org
 

[goffice] renamed GPS_*

commit 98c1620226a1ec5155bff162c0727adfad250804
Author: Jean Brefort <jean brefort normalesup org>
Date:   Tue Sep 1 18:22:09 2009 +0200

    renamed GPS_*

 ChangeLog                                |    7 +++++++
 goffice/app/go-plugin-service-impl.h     |    8 ++++----
 goffice/app/go-plugin-service.c          |   26 +++++++++++++-------------
 goffice/component/go-component-factory.c |    4 ++--
 goffice/graph/gog-plot-engine.c          |    8 ++++----
 5 files changed, 30 insertions(+), 23 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 74c1952..ed7073b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-09-01  Jean Brefort  <jean brefort normalesup org>
 
+	* goffice/app/go-plugin-service-impl.h: renamed GPS to GO_PLUGIN_SERVICE
+	* goffice/app/go-plugin-service.c: ditto.
+	* goffice/component/go-component-factory.c: ditto.
+	* goffice/graph/gog-plot-engine.c: ditto.
+
+2009-09-01  Jean Brefort  <jean brefort normalesup org>
+
 	* goffice/utils/go-color.h: prefixed all macros with GO_
 	* all files: use renamed go-color.h macros.
 
diff --git a/goffice/app/go-plugin-service-impl.h b/goffice/app/go-plugin-service-impl.h
index ed0355c..7dcf098 100644
--- a/goffice/app/go-plugin-service-impl.h
+++ b/goffice/app/go-plugin-service-impl.h
@@ -53,8 +53,8 @@ typedef struct{
 	char *(*get_description) (GOPluginService *service);
 } GOPluginServiceClass;
 
-#define GPS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GO_TYPE_PLUGIN_SERVICE, GOPluginServiceClass))
-#define GPS_GET_CLASS(o) GPS_CLASS (G_OBJECT_GET_CLASS (o))
+#define GO_PLUGIN_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GO_TYPE_PLUGIN_SERVICE, GOPluginServiceClass))
+#define GO_PLUGIN_SERVICE_GET_CLASS(o) GO_PLUGIN_SERVICE_CLASS (G_OBJECT_GET_CLASS (o))
 
 typedef struct{
 	GOPluginServiceClass plugin_service_class;
@@ -65,8 +65,8 @@ struct _GOPluginServiceGObjectLoader {
 	GOPluginService plugin_service;
 };
 
-#define GPS_GOBJECT_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GO_TYPE_PLUGIN_SERVICE, GOPluginServiceGObjectLoaderClass))
-#define GPS_GOBJECT_LOADER_GET_CLASS(o) GPS_GOBJECT_LOADER_CLASS (G_OBJECT_GET_CLASS (o))
+#define GO_PLUGIN_SERVICE_GOBJECT_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GO_TYPE_PLUGIN_SERVICE, GOPluginServiceGObjectLoaderClass))
+#define GO_PLUGIN_SERVICE_GOBJECT_LOADER_GET_CLASS(o) GO_PLUGIN_SERVICE_GOBJECT_LOADER_CLASS (G_OBJECT_GET_CLASS (o))
 
 typedef struct{
 	GOPluginServiceClass plugin_service_class;
diff --git a/goffice/app/go-plugin-service.c b/goffice/app/go-plugin-service.c
index 4aa6e4d..1e229f6 100644
--- a/goffice/app/go-plugin-service.c
+++ b/goffice/app/go-plugin-service.c
@@ -79,7 +79,7 @@ go_plugin_service_finalize (GObject *obj)
 static void
 go_plugin_service_class_init (GObjectClass *gobject_class)
 {
-	GOPluginServiceClass *plugin_service_class = GPS_CLASS (gobject_class);
+	GOPluginServiceClass *plugin_service_class = GO_PLUGIN_SERVICE_CLASS (gobject_class);
 
 	gobject_class->finalize = go_plugin_service_finalize;
 	plugin_service_class->read_xml = NULL;
@@ -171,7 +171,7 @@ go_plugin_service_general_get_description (GOPluginService *service)
 static void
 go_plugin_service_general_class_init (GObjectClass *gobject_class)
 {
-	GOPluginServiceClass *plugin_service_class = GPS_CLASS (gobject_class);
+	GOPluginServiceClass *plugin_service_class = GO_PLUGIN_SERVICE_CLASS (gobject_class);
 
 	plugin_service_class->activate = go_plugin_service_general_activate;
 	plugin_service_class->deactivate = go_plugin_service_general_deactivate;
@@ -356,7 +356,7 @@ go_plugin_service_file_opener_get_description (GOPluginService *service)
 static void
 go_plugin_service_file_opener_class_init (GObjectClass *gobject_class)
 {
-	GOPluginServiceClass *plugin_service_class = GPS_CLASS (gobject_class);
+	GOPluginServiceClass *plugin_service_class = GO_PLUGIN_SERVICE_CLASS (gobject_class);
 
 	gobject_class->finalize = go_plugin_service_file_opener_finalize;
 	plugin_service_class->read_xml = go_plugin_service_file_opener_read_xml;
@@ -688,7 +688,7 @@ go_plugin_service_file_saver_get_description (GOPluginService *service)
 static void
 go_plugin_service_file_saver_class_init (GObjectClass *gobject_class)
 {
-	GOPluginServiceClass *plugin_service_class = GPS_CLASS (gobject_class);
+	GOPluginServiceClass *plugin_service_class = GO_PLUGIN_SERVICE_CLASS (gobject_class);
 
 	gobject_class->finalize = go_plugin_service_file_saver_finalize;
 	plugin_service_class->read_xml = go_plugin_service_file_saver_read_xml;
@@ -875,7 +875,7 @@ go_plugin_service_plugin_loader_get_description (GOPluginService *service)
 static void
 go_plugin_service_plugin_loader_class_init (GObjectClass *gobject_class)
 {
-	GOPluginServiceClass *plugin_service_class = GPS_CLASS (gobject_class);
+	GOPluginServiceClass *plugin_service_class = GO_PLUGIN_SERVICE_CLASS (gobject_class);
 
 	plugin_service_class->activate = go_plugin_service_plugin_loader_activate;
 	plugin_service_class->deactivate = go_plugin_service_plugin_loader_deactivate;
@@ -902,7 +902,7 @@ go_plugin_service_gobject_loader_read_xml (GOPluginService *service,
 					G_GNUC_UNUSED xmlNode *tree,
 					G_GNUC_UNUSED GOErrorInfo **ret_error)
 {
-	GOPluginServiceGObjectLoaderClass *gobj_loader_class = GPS_GOBJECT_LOADER_GET_CLASS (service);
+	GOPluginServiceGObjectLoaderClass *gobj_loader_class = GO_PLUGIN_SERVICE_GOBJECT_LOADER_GET_CLASS (service);
 	g_return_if_fail (gobj_loader_class->pending != NULL);
 	g_hash_table_replace (gobj_loader_class->pending, service->id, service);
 }
@@ -910,7 +910,7 @@ go_plugin_service_gobject_loader_read_xml (GOPluginService *service,
 static void
 go_plugin_service_gobject_loader_class_init (GOPluginServiceGObjectLoaderClass *gobj_loader_class)
 {
-	GOPluginServiceClass *psc = GPS_CLASS (gobj_loader_class);
+	GOPluginServiceClass *psc = GO_PLUGIN_SERVICE_CLASS (gobj_loader_class);
 
 	psc->get_description	= go_plugin_service_gobject_loader_get_description;
 	psc->read_xml		= go_plugin_service_gobject_loader_read_xml;
@@ -940,7 +940,7 @@ go_plugin_service_simple_deactivate (GOPluginService *service, GOErrorInfo **ret
 static void
 go_plugin_service_simple_class_init (GObjectClass *gobject_class)
 {
-	GOPluginServiceClass *psc = GPS_CLASS (gobject_class);
+	GOPluginServiceClass *psc = GO_PLUGIN_SERVICE_CLASS (gobject_class);
 
 	psc->activate		= go_plugin_service_simple_activate;
 	psc->deactivate		= go_plugin_service_simple_deactivate;
@@ -1019,8 +1019,8 @@ go_plugin_service_new (GOPlugin *plugin, xmlNode *tree, GOErrorInfo **ret_error)
 	if (service->id == NULL)
 		service->id = g_strdup ("default");
 
-	if (GPS_GET_CLASS (service)->read_xml != NULL) {
-		GPS_GET_CLASS (service)->read_xml (service, tree, &service_error);
+	if (GO_PLUGIN_SERVICE_GET_CLASS (service)->read_xml != NULL) {
+		GO_PLUGIN_SERVICE_GET_CLASS (service)->read_xml (service, tree, &service_error);
 		if (service_error != NULL) {
 			*ret_error = go_error_info_new_str_with_details (
 				_("Error reading service information."), service_error);
@@ -1046,7 +1046,7 @@ go_plugin_service_get_description (GOPluginService *service)
 	g_return_val_if_fail (GO_IS_PLUGIN_SERVICE (service), NULL);
 
 	if (service->saved_description == NULL) {
-		service->saved_description = GPS_GET_CLASS (service)->get_description (service);
+		service->saved_description = GO_PLUGIN_SERVICE_GET_CLASS (service)->get_description (service);
 	}
 
 	return service->saved_description;
@@ -1091,7 +1091,7 @@ go_plugin_service_activate (GOPluginService *service, GOErrorInfo **ret_error)
 		}
 	}
 #endif
-	GPS_GET_CLASS (service)->activate (service, ret_error);
+	GO_PLUGIN_SERVICE_GET_CLASS (service)->activate (service, ret_error);
 }
 
 void
@@ -1103,7 +1103,7 @@ go_plugin_service_deactivate (GOPluginService *service, GOErrorInfo **ret_error)
 	if (!service->is_active) {
 		return;
 	}
-	GPS_GET_CLASS (service)->deactivate (service, ret_error);
+	GO_PLUGIN_SERVICE_GET_CLASS (service)->deactivate (service, ret_error);
 	if (*ret_error == NULL) {
 		GOErrorInfo *ignored_error = NULL;
 
diff --git a/goffice/component/go-component-factory.c b/goffice/component/go-component-factory.c
index e9a9b51..dc603f2 100644
--- a/goffice/component/go-component-factory.c
+++ b/goffice/component/go-component-factory.c
@@ -62,7 +62,7 @@ static void
 go_component_engine_service_class_init (GOPluginServiceGObjectLoaderClass *
 					gobj_loader_class)
 {
-	GOPluginServiceClass *ps_class = GPS_CLASS (gobj_loader_class);
+	GOPluginServiceClass *ps_class = GO_PLUGIN_SERVICE_CLASS (gobj_loader_class);
 
 	ps_class->get_description =
 		go_component_engine_service_get_description;
@@ -192,7 +192,7 @@ go_component_type_service_init (GObject * obj)
 static void
 go_component_type_service_class_init (GObjectClass * gobject_klass)
 {
-	GOPluginServiceClass *ps_class = GPS_CLASS (gobject_klass);
+	GOPluginServiceClass *ps_class = GO_PLUGIN_SERVICE_CLASS (gobject_klass);
 
 	component_type_parent_klass =
 		g_type_class_peek_parent (gobject_klass);
diff --git a/goffice/graph/gog-plot-engine.c b/goffice/graph/gog-plot-engine.c
index a2f29c9..f4c0eb5 100644
--- a/goffice/graph/gog-plot-engine.c
+++ b/goffice/graph/gog-plot-engine.c
@@ -59,7 +59,7 @@ gog_plot_engine_service_get_description (GOPluginService *service)
 static void
 gog_plot_engine_service_class_init (GOPluginServiceGObjectLoaderClass *gobj_loader_class)
 {
-	GOPluginServiceClass *ps_class = GPS_CLASS (gobj_loader_class);
+	GOPluginServiceClass *ps_class = GO_PLUGIN_SERVICE_CLASS (gobj_loader_class);
 
 	ps_class->get_description = gog_plot_engine_service_get_description;
 
@@ -339,7 +339,7 @@ gog_plot_type_service_init (GObject *obj)
 static void
 gog_plot_type_service_class_init (GObjectClass *gobject_klass)
 {
-	GOPluginServiceClass *ps_class = GPS_CLASS (gobject_klass);
+	GOPluginServiceClass *ps_class = GO_PLUGIN_SERVICE_CLASS (gobject_klass);
 
 	plot_type_parent_klass = g_type_class_peek_parent (gobject_klass);
 	gobject_klass->finalize		= gog_plot_type_service_finalize;
@@ -428,7 +428,7 @@ gog_trend_line_engine_service_get_description (GOPluginService *service)
 static void
 gog_trend_line_engine_service_class_init (GOPluginServiceGObjectLoaderClass *gobj_loader_class)
 {
-	GOPluginServiceClass *ps_class = GPS_CLASS (gobj_loader_class);
+	GOPluginServiceClass *ps_class = GO_PLUGIN_SERVICE_CLASS (gobj_loader_class);
 
 	ps_class->get_description = gog_trend_line_engine_service_get_description;
 
@@ -645,7 +645,7 @@ gog_trend_line_service_init (GObject *obj)
 static void
 gog_trend_line_service_class_init (GObjectClass *gobject_klass)
 {
-	GOPluginServiceClass *ps_class = GPS_CLASS (gobject_klass);
+	GOPluginServiceClass *ps_class = GO_PLUGIN_SERVICE_CLASS (gobject_klass);
 
 	gobject_klass->finalize	  = gog_trend_line_service_finalize;
 	ps_class->read_xml	  = gog_trend_line_service_read_xml;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]