[Gnucash-changes] Add gchar* to xmlChar* casting of string constants to eliminate some

David Hampton hampton at cvs.gnucash.org
Sun Jul 24 21:10:46 EDT 2005


Log Message:
-----------
Add gchar* to xmlChar* casting of string constants to eliminate some
gcc4 warnings.

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash:
        ChangeLog
    gnucash/src/backend/file:
        gnc-account-xml-v2.c
        gnc-book-xml-v2.c
        gnc-commodity-xml-v2.c
        gnc-freqspec-xml-v2.c
        gnc-lot-xml-v2.c
        gnc-pricedb-xml-v2.c
        gnc-schedxaction-xml-v2.c
        gnc-transaction-xml-v2.c
        gnc-xml.h
        io-gncxml-v2.c
        sixtp-dom-generators.c
        sixtp-dom-parsers.c
    gnucash/src/backend/file/test:
        test-dom-converters1.c
    gnucash/src/backend/qsf:
        qsf-backend.c
        qsf-xml-map.c
        qsf-xml.c
    gnucash/src/business/business-core/file:
        gnc-address-xml-v2.c
        gnc-bill-term-xml-v2.c
        gnc-customer-xml-v2.c
        gnc-employee-xml-v2.c
        gnc-entry-xml-v2.c
        gnc-invoice-xml-v2.c
        gnc-job-xml-v2.c
        gnc-order-xml-v2.c
        gnc-owner-xml-v2.c
        gnc-tax-table-xml-v2.c
        gnc-vendor-xml-v2.c

Revision Data
-------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.250
retrieving revision 1.1487.2.251
diff -LChangeLog -LChangeLog -u -r1.1487.2.250 -r1.1487.2.251
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,12 @@
 2005-07-24  David Hampton  <hampton at employees.org>
 
+	* various src/backend and src/business/business-core: Add gchar*
+	to xmlChar* casting of string constants to eliminate some gcc4
+	warnings.
+	
+	* src/gnome-utils/print-session.c: Some gchar* to guchar* casting
+	to make gcc4 happy.
+
 	* src/gnome-utils/gw-gnome-utils-spec.scm: Remove references to
 	deleted data structures.  Gnucash now compiles against
 	g-wrap-1.9.6 as well as g-wrap-1.3.
Index: qsf-xml-map.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/qsf/Attic/qsf-xml-map.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -Lsrc/backend/qsf/qsf-xml-map.c -Lsrc/backend/qsf/qsf-xml-map.c -u -r1.1.2.4 -r1.1.2.5
--- src/backend/qsf/qsf-xml-map.c
+++ src/backend/qsf/qsf-xml-map.c
@@ -41,8 +41,8 @@
 	char date_as_string[QSF_DATE_LENGTH];
 
 	output_parent = xmlAddChild(parent_tag, xmlNewNode(ns,
-		xmlGetProp(import_node, QSF_OBJECT_TYPE)));
-	xmlNewProp(output_parent, QSF_OBJECT_TYPE, xmlGetProp(import_node, MAP_VALUE_ATTR));
+		xmlGetProp(import_node, BAD_CAST QSF_OBJECT_TYPE)));
+	xmlNewProp(output_parent, BAD_CAST QSF_OBJECT_TYPE, xmlGetProp(import_node, BAD_CAST MAP_VALUE_ATTR));
 	qsf_time = (time_t*)g_hash_table_lookup(qsf_default_hash, default_name);
 	strftime(date_as_string, QSF_DATE_LENGTH, QSF_XSD_TIME, gmtime(qsf_time));
 	xmlNodeAddContent(output_parent, date_as_string);
@@ -56,8 +56,8 @@
 	xmlChar *output;
 
 	node = xmlAddChild(parent_tag,
-		xmlNewNode(ns, xmlGetProp(import_node, QSF_OBJECT_TYPE)));
-	xmlNewProp(node, QSF_OBJECT_TYPE, xmlGetProp(import_node, MAP_VALUE_ATTR));
+		xmlNewNode(ns, xmlGetProp(import_node, BAD_CAST QSF_OBJECT_TYPE)));
+	xmlNewProp(node, BAD_CAST QSF_OBJECT_TYPE, xmlGetProp(import_node, BAD_CAST MAP_VALUE_ATTR));
 	output = (xmlChar *)g_hash_table_lookup(qsf_default_hash, default_name);
 	xmlNodeAddContent(node, output);
 }
@@ -71,7 +71,7 @@
 	xmlChar *match;
 
 	if (qsf_is_element(child, ns, MAP_DEFINITION_TAG)) {
-		qof_version = xmlGetProp(child, MAP_QOF_VERSION);
+		qof_version = xmlGetProp(child, BAD_CAST MAP_QOF_VERSION);
 		buff = g_string_new(" ");
 		g_string_printf(buff, "%i", QSF_QOF_VERSION);
 		if(xmlStrcmp(qof_version, buff->str) != 0)
@@ -84,7 +84,7 @@
 		{
 			if (qsf_is_element(child_node, ns, MAP_DEFINE_TAG)) {
 				g_hash_table_insert(valid->validation_table,
-					xmlGetProp(child_node, MAP_E_TYPE),
+					xmlGetProp(child_node, BAD_CAST MAP_E_TYPE),
 					xmlNodeGetContent(child_node));
 			}
 		}
@@ -92,7 +92,7 @@
 	if(qsf_is_element(child, ns, MAP_OBJECT_TAG)) {
 		match = NULL;
 		match = (xmlChar*) g_hash_table_lookup( valid->validation_table,
-			xmlGetProp(child, MAP_TYPE_ATTR));
+			xmlGetProp(child, BAD_CAST MAP_TYPE_ATTR));
 		if(match) {
 			valid->map_calculated_count++;
 		}
@@ -244,10 +244,10 @@
 	g_return_if_fail(params->qsf_define_hash != NULL);
 	if (qsf_is_element(child, ns, MAP_DEFINE_TAG)) {
 		if(NULL == g_hash_table_lookup(params->qsf_define_hash,
-			xmlGetProp(child, MAP_E_TYPE)))
+			xmlGetProp(child, BAD_CAST MAP_E_TYPE)))
 		{
 			g_hash_table_insert(params->qsf_define_hash,
-				xmlGetProp(child, MAP_E_TYPE), params->child_node);
+				xmlGetProp(child, BAD_CAST MAP_E_TYPE), params->child_node);
 		}
 		else {
 			qof_backend_set_error(params->be, ERR_QSF_BAD_MAP);
@@ -255,7 +255,7 @@
 		}
 	}
 	if(qsf_is_element(child, ns, MAP_DEFAULT_TAG)) {
-		if(qsf_strings_equal(xmlGetProp(child, MAP_TYPE_ATTR), MAP_ENUM_TYPE))
+		if(qsf_strings_equal(xmlGetProp(child, BAD_CAST MAP_TYPE_ATTR), MAP_ENUM_TYPE))
 		{
 			qsf_enum = xmlNodeGetContent(child);
 			/** Use content to discriminate enums in QOF */
@@ -277,14 +277,14 @@
 		/** Non-enum defaults */
 		else {
 			if(NULL == g_hash_table_lookup(params->qsf_default_hash,
-					xmlGetProp(child, MAP_NAME_ATTR)))
+					xmlGetProp(child, BAD_CAST MAP_NAME_ATTR)))
 			{
 				g_hash_table_insert(params->qsf_default_hash,
-					xmlGetProp(child, MAP_NAME_ATTR), child);
+					xmlGetProp(child, BAD_CAST MAP_NAME_ATTR), child);
 			}
 			else
 /*					if(0 != xmlHashAddEntry(params->default_map,
-				xmlGetProp(child_node, MAP_NAME_ATTR), child_node))*/
+				xmlGetProp(child_node, BAD_CAST MAP_NAME_ATTR), child_node))*/
 			{
 				qof_backend_set_error(params->be, ERR_QSF_BAD_MAP);
 				return;
@@ -305,7 +305,7 @@
 	if(!params->qsf_define_hash) return;
 	if(!params->qsf_default_hash) return;
 	if(qsf_is_element(child, ns, MAP_DEFINITION_TAG)) {
-		qof_version = xmlGetProp(child, MAP_QOF_VERSION);
+		qof_version = xmlGetProp(child, BAD_CAST MAP_QOF_VERSION);
 		buff = g_string_new(" ");
 		g_string_printf(buff, "%i", QSF_QOF_VERSION);
 		if(xmlStrcmp(qof_version, buff->str) != 0) {
@@ -349,12 +349,12 @@
 	{
 		if(qsf_is_element(cur_node, params->map_ns, QSF_CONDITIONAL_SET)) 
 		{
-			content = xmlGetProp(cur_node, QSF_OPTION);
-			if(qsf_strings_equal(xmlGetProp(cur_node, QSF_OPTION), "qsf_lookup_string")) 
+			content = xmlGetProp(cur_node, BAD_CAST QSF_OPTION);
+			if(qsf_strings_equal(xmlGetProp(cur_node, BAD_CAST QSF_OPTION), "qsf_lookup_string")) 
 			{
 				lookup_node = (xmlNodePtr) g_hash_table_lookup(default_hash, 
 					xmlNodeGetContent(cur_node));
-				content = xmlGetProp(lookup_node, MAP_VALUE_ATTR);
+				content = xmlGetProp(lookup_node, BAD_CAST MAP_VALUE_ATTR);
 				/** \todo FIXME: do the lookup. type is defined by output object. */
 				/* Find by name, get GUID, return GUID as string. */
 				g_message("Lookup %s in the receiving application\n", content );
@@ -364,14 +364,14 @@
 			{
 				lookup_node = (xmlNodePtr) g_hash_table_lookup(default_hash, 
 					xmlNodeGetContent(cur_node));
-				content = xmlGetProp(lookup_node, "value");
+				content = xmlGetProp(lookup_node, BAD_CAST "value");
 				return content;
 			}
-			content = xmlGetProp(parent, "boolean");
+			content = xmlGetProp(parent, BAD_CAST "boolean");
 			if(!content) {
 				/** \todo Check qsf_parameter_hash arguments */
 				lookup_node = (xmlNodePtr) g_hash_table_lookup(params->qsf_parameter_hash,
-					xmlGetProp(parent->parent, MAP_TYPE_ATTR));
+					xmlGetProp(parent->parent, BAD_CAST MAP_TYPE_ATTR));
 				if(lookup_node) { return xmlNodeGetContent(lookup_node); }
 				return xmlNodeGetContent(cur_node);
 			}
@@ -392,23 +392,23 @@
 			output_content = qsf_set_handler(param_node,
 				params->qsf_default_hash, output_content, params);
 			if(output_content == NULL) {
-				output_content = xmlGetProp(param_node, MAP_TYPE_ATTR);
+				output_content = xmlGetProp(param_node, BAD_CAST MAP_TYPE_ATTR);
 				object_data = qsf_else_set_value(param_node, params->qsf_default_hash,
 					output_content, params->map_ns);
 				output_content = xmlGetProp( (xmlNodePtr) g_hash_table_lookup(
-					params->qsf_default_hash, object_data), MAP_VALUE_ATTR);
+					params->qsf_default_hash, object_data), BAD_CAST MAP_VALUE_ATTR);
 			}
 			if(object_data != NULL) {
 				export_node =(xmlNodePtr) g_hash_table_lookup(
 					params->qsf_parameter_hash,
-					xmlGetProp(params->child_node, QSF_OBJECT_TYPE));
+					xmlGetProp(params->child_node, BAD_CAST QSF_OBJECT_TYPE));
 				object_data = xmlNodeGetContent(export_node);
 			}
 			if(output_content != NULL) { object_data = output_content; }
 			export_node = xmlAddChild(params->lister, xmlNewNode(params->qsf_ns,
-				xmlGetProp(child, QSF_OBJECT_TYPE)));
-			xmlNewProp(export_node, QSF_OBJECT_TYPE,
-				xmlGetProp(child, MAP_VALUE_ATTR));
+				xmlGetProp(child, BAD_CAST QSF_OBJECT_TYPE)));
+			xmlNewProp(export_node, BAD_CAST QSF_OBJECT_TYPE,
+				xmlGetProp(child, BAD_CAST MAP_VALUE_ATTR));
 			xmlNodeAddContent(export_node, object_data);
 			params->boolean_calculation_done = 1;
 		}
@@ -473,7 +473,7 @@
 	boolean_name = NULL;
 	for(cur_node = parent->children; cur_node != NULL; cur_node = cur_node->next) {
 		if(qsf_is_element(cur_node, map_ns, QSF_CONDITIONAL_SET)) {
-			boolean_name = xmlGetProp(cur_node, QSF_FORMATTING_OPTION);
+			boolean_name = xmlGetProp(cur_node, BAD_CAST QSF_FORMATTING_OPTION);
 			qsf_set_format_value(boolean_name, content, cur_node, params);
 		}
 	}
@@ -493,19 +493,19 @@
 		output_content = qsf_set_handler(param_node, params->qsf_default_hash, output_content, params);
 		/* If the 'if' contains a boolean that has a default value */
 		if(output_content == NULL) {
-			if(NULL != xmlGetProp(param_node, QSF_BOOLEAN_DEFAULT)) {
+			if(NULL != xmlGetProp(param_node, BAD_CAST QSF_BOOLEAN_DEFAULT)) {
 			output_content = xmlGetProp( (xmlNodePtr) g_hash_table_lookup(
-				params->qsf_default_hash, xmlGetProp(param_node, QSF_BOOLEAN_DEFAULT) ),
-					MAP_VALUE_ATTR);
+				params->qsf_default_hash, xmlGetProp(param_node, BAD_CAST QSF_BOOLEAN_DEFAULT) ),
+					BAD_CAST MAP_VALUE_ATTR);
 			}
 			/* Is the default set to true? */
 			if( 0 == qsf_compare_tag_strings(output_content, QSF_XML_BOOLEAN_TEST)) 
 			{
 				qsf_boolean_set_value(param_node, params, output_content, params->map_ns);
 				export_node = xmlAddChild(params->lister, xmlNewNode(params->qsf_ns,
-					xmlGetProp(child, QSF_OBJECT_TYPE)));
-				xmlNewProp(export_node, QSF_OBJECT_TYPE,
-					xmlGetProp(child, MAP_VALUE_ATTR));
+					xmlGetProp(child, BAD_CAST QSF_OBJECT_TYPE)));
+				xmlNewProp(export_node, BAD_CAST QSF_OBJECT_TYPE,
+					xmlGetProp(child, BAD_CAST MAP_VALUE_ATTR));
 				xmlNodeAddContent(export_node, output_content);
 				params->boolean_calculation_done = 1;
 				}
@@ -525,11 +525,11 @@
 	g_string_printf(str, "%i", count);
 	extra_node = NULL;
 	extra_node = xmlAddChild(params->output_node,
-		xmlNewNode(params->qsf_ns, QSF_OBJECT_TAG));
-	xmlNewProp(extra_node, QSF_OBJECT_TYPE,
-		xmlGetProp(params->cur_node, QSF_OBJECT_TYPE));
+		xmlNewNode(params->qsf_ns, BAD_CAST QSF_OBJECT_TAG));
+	xmlNewProp(extra_node, BAD_CAST QSF_OBJECT_TYPE,
+		xmlGetProp(params->cur_node, BAD_CAST QSF_OBJECT_TYPE));
 	property = xmlCharStrdup(str->str);
-	xmlNewProp(extra_node, QSF_OBJECT_COUNT, property);
+	xmlNewProp(extra_node, BAD_CAST QSF_OBJECT_COUNT, property);
 	return extra_node;
 }
 
@@ -582,12 +582,12 @@
 				output_content = xmlNodeGetContent(param_node);
 				if(output_content != NULL) {
 					output_content = xmlNodeGetContent((xmlNodePtr) g_hash_table_lookup(
-						params->qsf_parameter_hash, xmlGetProp(child, MAP_TYPE_ATTR)));
+						params->qsf_parameter_hash, xmlGetProp(child, BAD_CAST MAP_TYPE_ATTR)));
 					if(output_content != NULL) {
 						export_node = xmlAddChild(params->lister, xmlNewNode(qsf_ns,
-							xmlGetProp(child, QSF_OBJECT_TYPE)));
-						xmlNewProp(export_node, QSF_OBJECT_TYPE,
-							xmlGetProp(child, MAP_VALUE_ATTR));
+							xmlGetProp(child, BAD_CAST QSF_OBJECT_TYPE)));
+						xmlNewProp(export_node, BAD_CAST QSF_OBJECT_TYPE,
+							xmlGetProp(child, BAD_CAST MAP_VALUE_ATTR));
 						xmlNodeAddContent(export_node, output_content);
 						xmlFree(output_content);
 					}
Index: qsf-xml.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/qsf/Attic/qsf-xml.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -Lsrc/backend/qsf/qsf-xml.c -Lsrc/backend/qsf/qsf-xml.c -u -r1.1.2.4 -r1.1.2.5
--- src/backend/qsf/qsf-xml.c
+++ src/backend/qsf/qsf-xml.c
@@ -133,7 +133,7 @@
 		cur_node = cur_node->next)
 	{
 		if(qsf_is_element(cur_node, ns, QSF_OBJECT_TAG)) {
-			object_declaration = xmlGetProp(cur_node, QSF_OBJECT_TYPE);
+			object_declaration = xmlGetProp(cur_node, BAD_CAST QSF_OBJECT_TYPE);
 			count = g_hash_table_size(valid->validation_table);
 			g_hash_table_insert(valid->validation_table, object_declaration, xmlNodeGetContent(cur_node));
 			if((g_hash_table_size(valid->validation_table) > count) &&
@@ -285,7 +285,7 @@
 	if(qsf_is_element(params->param_node, params->qsf_ns, (char*)type))
 	{
 		g_hash_table_insert(params->qsf_parameter_hash,
-			xmlGetProp(params->param_node, QSF_OBJECT_TYPE), params->param_node);
+			xmlGetProp(params->param_node, BAD_CAST QSF_OBJECT_TYPE), params->param_node);
 	}
 }
 
@@ -316,8 +316,8 @@
 		object_set = g_new(qsf_objects, 1);
 		params->object_set = object_set;
 		object_set->parameters = g_hash_table_new(g_str_hash, g_str_equal);
-		object_set->object_type = g_strdup(xmlGetProp(child, QSF_OBJECT_TYPE));
-		object_count_s = g_strdup(xmlGetProp(child, QSF_OBJECT_COUNT));
+		object_set->object_type = g_strdup(xmlGetProp(child, BAD_CAST QSF_OBJECT_TYPE));
+		object_count_s = g_strdup(xmlGetProp(child, BAD_CAST QSF_OBJECT_COUNT));
 		c = (int)strtol(object_count_s, &tail, 0);
 		g_free(object_count_s);
 		params->qsf_object_list = g_list_prepend(params->qsf_object_list, object_set);
@@ -338,7 +338,7 @@
 	GUID book_guid;
 
 	if(qsf_is_element(child, ns, QSF_BOOK_TAG)) {
-		book_count_s = xmlGetProp(child,QSF_BOOK_COUNT);
+		book_count_s = xmlGetProp(child,BAD_CAST QSF_BOOK_COUNT);
 		if(book_count_s) {
 			book_count = (int)strtol(book_count_s, &tail, 0);
 			/* More than one book not currently supported. */
Index: qsf-backend.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/qsf/Attic/qsf-backend.c,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -Lsrc/backend/qsf/qsf-backend.c -Lsrc/backend/qsf/qsf-backend.c -u -r1.1.2.13 -r1.1.2.14
--- src/backend/qsf/qsf-backend.c
+++ src/backend/qsf/qsf-backend.c
@@ -327,58 +327,58 @@
 		case KVP_TYPE_STRING:
 			node = xmlAddChild(params->output_node, xmlNewNode(params->qsf_ns, qof_param->param_type));
 			xmlNodeAddContent(node, kvp_value_to_bare_string(content));
-			xmlNewProp(node, QSF_OBJECT_TYPE ,qof_param->param_name);
-			xmlNewProp(node, QSF_OBJECT_KVP, path);
-			xmlNewProp(node, QSF_OBJECT_VALUE, QOF_TYPE_STRING);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_TYPE ,qof_param->param_name);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_KVP, path);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_VALUE, BAD_CAST QOF_TYPE_STRING);
 			break;
 		case KVP_TYPE_GUID:
 			node = xmlAddChild(params->output_node, xmlNewNode(params->qsf_ns, qof_param->param_type));
 			xmlNodeAddContent(node, kvp_value_to_bare_string(content));
-			xmlNewProp(node, QSF_OBJECT_TYPE ,qof_param->param_name);
-			xmlNewProp(node, QSF_OBJECT_KVP, path);
-			xmlNewProp(node, QSF_OBJECT_VALUE, QOF_TYPE_GUID);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_TYPE ,qof_param->param_name);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_KVP, path);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_VALUE, BAD_CAST QOF_TYPE_GUID);
 			break;
 		case KVP_TYPE_BINARY:
 			node = xmlAddChild(params->output_node, xmlNewNode(params->qsf_ns, qof_param->param_type));
 			xmlNodeAddContent(node, kvp_value_to_bare_string(content));
-			xmlNewProp(node, QSF_OBJECT_TYPE ,qof_param->param_name);
-			xmlNewProp(node, QSF_OBJECT_KVP, path);
-			xmlNewProp(node, QSF_OBJECT_VALUE, QSF_TYPE_BINARY);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_TYPE ,qof_param->param_name);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_KVP, path);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_VALUE, BAD_CAST QSF_TYPE_BINARY);
 			break;
 		case KVP_TYPE_GLIST:
 			node = xmlAddChild(params->output_node, xmlNewNode(params->qsf_ns, qof_param->param_type));
 			xmlNodeAddContent(node, kvp_value_to_bare_string(content));
-			xmlNewProp(node, QSF_OBJECT_TYPE ,qof_param->param_name);
-			xmlNewProp(node, QSF_OBJECT_KVP, path);
-			xmlNewProp(node, QSF_OBJECT_VALUE, QSF_TYPE_GLIST);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_TYPE ,qof_param->param_name);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_KVP, path);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_VALUE, BAD_CAST QSF_TYPE_GLIST);
 			break;
 		case KVP_TYPE_FRAME:
 			node = xmlAddChild(params->output_node, xmlNewNode(params->qsf_ns, qof_param->param_type));
 			xmlNodeAddContent(node, kvp_value_to_bare_string(content));
-			xmlNewProp(node, QSF_OBJECT_TYPE ,qof_param->param_name);
-			xmlNewProp(node, QSF_OBJECT_KVP, path);
-			xmlNewProp(node, QSF_OBJECT_VALUE, QSF_TYPE_FRAME);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_TYPE ,qof_param->param_name);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_KVP, path);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_VALUE, BAD_CAST QSF_TYPE_FRAME);
 			break;
 		case KVP_TYPE_GINT64:
 			node = xmlAddChild(params->output_node, xmlNewNode(params->qsf_ns, qof_param->param_type));
 			xmlNodeAddContent(node, kvp_value_to_bare_string(content));
-			xmlNewProp(node, QSF_OBJECT_TYPE ,qof_param->param_name);
-			xmlNewProp(node, QSF_OBJECT_KVP, path);
-			xmlNewProp(node, QSF_OBJECT_VALUE, QOF_TYPE_INT64);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_TYPE ,qof_param->param_name);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_KVP, path);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_VALUE, BAD_CAST QOF_TYPE_INT64);
 			break;
 		case KVP_TYPE_DOUBLE:
 			node = xmlAddChild(params->output_node, xmlNewNode(params->qsf_ns, qof_param->param_type));
 			xmlNodeAddContent(node, kvp_value_to_bare_string(content));
-			xmlNewProp(node, QSF_OBJECT_TYPE ,qof_param->param_name);
-			xmlNewProp(node, QSF_OBJECT_KVP, path);
-			xmlNewProp(node, QSF_OBJECT_VALUE, QOF_TYPE_DOUBLE);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_TYPE ,qof_param->param_name);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_KVP, path);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_VALUE, BAD_CAST QOF_TYPE_DOUBLE);
 			break;
 		case KVP_TYPE_NUMERIC:
 			node = xmlAddChild(params->output_node, xmlNewNode(params->qsf_ns, qof_param->param_type));
 			xmlNodeAddContent(node, kvp_value_to_bare_string(content));
-			xmlNewProp(node, QSF_OBJECT_TYPE ,qof_param->param_name);
-			xmlNewProp(node, QSF_OBJECT_KVP, path);
-			xmlNewProp(node, QSF_OBJECT_VALUE, QOF_TYPE_NUMERIC);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_TYPE ,qof_param->param_name);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_KVP, path);
+			xmlNewProp(node, BAD_CAST QSF_OBJECT_VALUE, BAD_CAST QOF_TYPE_NUMERIC);
 			break;
 		default:
 		break;
@@ -399,7 +399,7 @@
 	node = xmlAddChild(params->output_node, xmlNewNode(params->qsf_ns, qof_param->param_type));
 	guid_to_string_buff(qof_entity_get_guid(ent), qsf_guid);
 	xmlNodeAddContent(node, qsf_guid);
-	xmlNewProp(node, QSF_OBJECT_TYPE ,qof_param->param_name);
+	xmlNewProp(node, BAD_CAST QSF_OBJECT_TYPE ,qof_param->param_name);
 }
 
 /******* reference handling ***********/
@@ -472,10 +472,10 @@
 			return;
 		}
 		ref_name = g_strdup(reference->param->param_name);
-		node = xmlAddChild(object_node, xmlNewNode(ns, QOF_TYPE_GUID));
+		node = xmlAddChild(object_node, xmlNewNode(ns, BAD_CAST QOF_TYPE_GUID));
 		guid_to_string_buff(reference->ref_guid, qsf_guid);
 		xmlNodeAddContent(node, qsf_guid);
-		xmlNewProp(node, QSF_OBJECT_TYPE ,ref_name);
+		xmlNewProp(node, BAD_CAST QSF_OBJECT_TYPE ,ref_name);
 		g_free(ref_name);
 	}
 }
@@ -507,11 +507,11 @@
 	param_count = ++params->count;
 	ns = params->qsf_ns;
 	own_guid = FALSE;
-	object_node = xmlNewChild(params->book_node, params->qsf_ns, QSF_OBJECT_TAG, NULL);
-	xmlNewProp(object_node, QSF_OBJECT_TYPE, ent->e_type); 
+	object_node = xmlNewChild(params->book_node, params->qsf_ns, BAD_CAST QSF_OBJECT_TAG, NULL);
+	xmlNewProp(object_node, BAD_CAST QSF_OBJECT_TYPE, ent->e_type); 
 	buffer = g_string_new(" ");
 	g_string_printf(buffer, "%i", param_count);
-	xmlNewProp(object_node, QSF_OBJECT_COUNT, buffer->str);
+	xmlNewProp(object_node, BAD_CAST QSF_OBJECT_COUNT, buffer->str);
 	param_list = g_slist_copy(params->qsf_sequence);
 	while(param_list != NULL) {
 		qof_param = param_list->data;
@@ -521,11 +521,11 @@
 			if(!own_guid)
 			{
 				cm_guid = qof_entity_get_guid(ent);
-				node = xmlAddChild(object_node, xmlNewNode(ns, QOF_TYPE_GUID));
+				node = xmlAddChild(object_node, xmlNewNode(ns, BAD_CAST QOF_TYPE_GUID));
 				guid_to_string_buff(cm_guid, cm_sa);
 				string_buffer = g_strdup(cm_sa);
 				xmlNodeAddContent(node, string_buffer);
-				xmlNewProp(node, QSF_OBJECT_TYPE , QOF_PARAM_GUID);
+				xmlNewProp(node, BAD_CAST QSF_OBJECT_TYPE , BAD_CAST QOF_PARAM_GUID);
 				own_guid = TRUE;
 			}
 			params->qsf_ent = ent;
@@ -560,7 +560,7 @@
 					node = xmlAddChild(object_node, xmlNewNode(ns, qof_param->param_type));
 					string_buffer = g_strdup(qof_book_merge_param_as_string(qof_param, ent));
 					xmlNodeAddContent(node, string_buffer);
-					xmlNewProp(node, QSF_OBJECT_TYPE ,qof_param->param_name);
+					xmlNewProp(node, BAD_CAST QSF_OBJECT_TYPE ,qof_param->param_name);
 				}
 			}
 		}
@@ -608,17 +608,17 @@
 	qsf_param_init(params);
 	params->book = book;
 	params->referenceList = g_list_copy((GList*)qof_book_get_data(book, ENTITYREFERENCE));
-	doc = xmlNewDoc(QSF_XML_VERSION);
-	top_node = xmlNewNode(NULL, QSF_ROOT_TAG);
+	doc = xmlNewDoc(BAD_CAST QSF_XML_VERSION);
+	top_node = xmlNewNode(NULL, BAD_CAST QSF_ROOT_TAG);
 	xmlDocSetRootElement(doc, top_node);
-	xmlSetNs(top_node, xmlNewNs(top_node, QSF_DEFAULT_NS, NULL));
+	xmlSetNs(top_node, xmlNewNs(top_node, BAD_CAST QSF_DEFAULT_NS, NULL));
 	params->qsf_ns = top_node->ns;
-	node = xmlNewChild(top_node, params->qsf_ns, QSF_BOOK_TAG, NULL);
+	node = xmlNewChild(top_node, params->qsf_ns, BAD_CAST QSF_BOOK_TAG, NULL);
 	params->book_node = node;
-	xmlNewProp(node, QSF_BOOK_COUNT, "1");
+	xmlNewProp(node, BAD_CAST QSF_BOOK_COUNT, BAD_CAST "1");
 	book_guid = qof_book_get_guid(book);
 	guid_to_string_buff(book_guid, buffer);
-	xmlNewChild(params->book_node, params->qsf_ns, QSF_BOOK_GUID, buffer);
+	xmlNewChild(params->book_node, params->qsf_ns, BAD_CAST QSF_BOOK_GUID, buffer);
 	params->output_doc = doc;
 	params->book_node = node;
 	qof_object_foreach_type(qsf_foreach_obj_type, params);
@@ -832,7 +832,7 @@
 	qof_type = node->name;
 	qsf_ent = params->qsf_ent;
 	targetBook = params->book;
-	obj_type = xmlGetProp(node->parent, QSF_OBJECT_TYPE);
+	obj_type = xmlGetProp(node->parent, BAD_CAST QSF_OBJECT_TYPE);
 	if(0 == safe_strcasecmp(obj_type, parameter_name)) { return; }
 	cm_setter = qof_class_get_parameter_setter(obj_type, parameter_name);
 	cm_param = qof_class_get_parameter(obj_type, parameter_name);
@@ -862,7 +862,7 @@
 			LEAVE (" string to guid failed for %s", xmlNodeGetContent(node));
 			return;
 		}
-		reference_type = xmlGetProp(node, QSF_OBJECT_TYPE);
+		reference_type = xmlGetProp(node, BAD_CAST QSF_OBJECT_TYPE);
 		if(0 == safe_strcmp(QOF_PARAM_GUID, reference_type)) 
 		{
 			qof_entity_set_guid(qsf_ent, cm_guid);
@@ -909,11 +909,11 @@
 		if(boolean_setter != NULL) { boolean_setter(qsf_ent, cm_boolean); }
 	}
 	if(safe_strcmp(qof_type, QOF_TYPE_KVP) == 0) { 
-		cm_type = qsf_to_kvp_helper(xmlGetProp(node, QSF_OBJECT_VALUE));
+		cm_type = qsf_to_kvp_helper(xmlGetProp(node, BAD_CAST QSF_OBJECT_VALUE));
 		if(!cm_type) { return; }
 		cm_value = string_to_kvp_value(xmlNodeGetContent(node), cm_type);
 		cm_kvp = kvp_frame_copy(cm_param->param_getfcn(qsf_ent, cm_param));
-		cm_kvp = kvp_frame_set_value(cm_kvp, xmlGetProp(node, QSF_OBJECT_KVP), cm_value);
+		cm_kvp = kvp_frame_set_value(cm_kvp, xmlGetProp(node, BAD_CAST QSF_OBJECT_KVP), cm_value);
 		kvp_frame_setter = (void(*)(QofEntity*, KvpFrame*))cm_setter;
 		if(kvp_frame_setter != NULL) { kvp_frame_setter(qsf_ent, cm_kvp); }
 	}
Index: gnc-account-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/gnc-account-xml-v2.c,v
retrieving revision 1.13.4.2
retrieving revision 1.13.4.3
diff -Lsrc/backend/file/gnc-account-xml-v2.c -Lsrc/backend/file/gnc-account-xml-v2.c -u -r1.13.4.2 -r1.13.4.3
--- src/backend/file/gnc-account-xml-v2.c
+++ src/backend/file/gnc-account-xml-v2.c
@@ -82,8 +82,8 @@
 
     ENTER ("(account=%p)", act);
 
-    ret = xmlNewNode(NULL, gnc_account_string);
-    xmlSetProp(ret, "version", account_version_string);
+    ret = xmlNewNode(NULL, BAD_CAST gnc_account_string);
+    xmlSetProp(ret, BAD_CAST "version", BAD_CAST account_version_string);
 
     xmlAddChild(ret, text_to_dom_tree(act_name_string,
                                       xaccAccountGetName(act)));
@@ -101,7 +101,7 @@
                                      xaccAccountGetCommoditySCUi(act)));
     
     if (xaccAccountGetNonStdSCU(act))
-      xmlNewChild(ret, NULL, act_non_standard_scu_string, NULL);
+      xmlNewChild(ret, NULL, BAD_CAST act_non_standard_scu_string, NULL);
     
     str = xaccAccountGetCode(act);
     if (str && strlen(str) > 0)
@@ -134,22 +134,22 @@
 	      !gnc_commodity_is_iso(com) &&
 	      gnc_commodity_get_quote_flag(com)) {
 	    if (!kvpnode)
-	      kvpnode= xmlNewNode(NULL, act_slots_string);
+	      kvpnode= xmlNewNode(NULL, BAD_CAST act_slots_string);
 
-	    slot_node = xmlNewChild(kvpnode, NULL, "slot", NULL);
-	    xmlNewTextChild(slot_node, NULL, "slot:key", "old-price-source");
+	    slot_node = xmlNewChild(kvpnode, NULL, BAD_CAST "slot", NULL);
+	    xmlNewTextChild(slot_node, NULL, BAD_CAST "slot:key", BAD_CAST "old-price-source");
 
 	    source = gnc_commodity_get_quote_source(com);
-	    val_node = xmlNewTextChild(slot_node, NULL, "slot:value",
+	    val_node = xmlNewTextChild(slot_node, NULL, BAD_CAST "slot:value",
 				       gnc_quote_source_get_old_internal_name(source));
-	    xmlSetProp(val_node, "type", "string");
+	    xmlSetProp(val_node, BAD_CAST "type", BAD_CAST "string");
 
 	    tz = gnc_commodity_get_quote_tz(com);
 	    if (tz) {
-	      slot_node = xmlNewChild(kvpnode, NULL, "slot", NULL);
-	      xmlNewTextChild(slot_node, NULL, "slot:key", "old-quote-tz");
-	      val_node = xmlNewTextChild(slot_node, NULL, "slot:value", tz);
-	      xmlSetProp(val_node, "type", "string");
+	      slot_node = xmlNewChild(kvpnode, NULL, BAD_CAST "slot", NULL);
+	      xmlNewTextChild(slot_node, NULL, BAD_CAST "slot:key", BAD_CAST "old-quote-tz");
+	      val_node = xmlNewTextChild(slot_node, NULL, BAD_CAST "slot:value", tz);
+	      xmlSetProp(val_node, BAD_CAST "type", BAD_CAST "string");
 	    }
 	  }
 	}
@@ -171,7 +171,7 @@
     PINFO ("lot list=%p", n);
     if (n && !exporting)
     {
-       xmlNodePtr toaddto = xmlNewChild(ret, NULL, act_lots_string, NULL);
+       xmlNodePtr toaddto = xmlNewChild(ret, NULL, BAD_CAST act_lots_string, NULL);
 
        for (; n; n=n->next)
        {
Index: gnc-xml.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/gnc-xml.h,v
retrieving revision 1.8.4.1
retrieving revision 1.8.4.2
diff -Lsrc/backend/file/gnc-xml.h -Lsrc/backend/file/gnc-xml.h -u -r1.8.4.1 -r1.8.4.2
--- src/backend/file/gnc-xml.h
+++ src/backend/file/gnc-xml.h
@@ -58,9 +58,6 @@
 xmlNodePtr gnc_schedXaction_dom_tree_create( SchedXaction *sx );
 sixtp* gnc_schedXaction_sixtp_parser_create(void);
 
-xmlNodePtr split_to_dom_tree(const gchar *tag, Split *spl);
-Split* dom_tree_to_split(xmlNodePtr node, QofBook *book);
-
 xmlNodePtr gnc_transaction_dom_tree_create(Transaction *txn);
 sixtp* gnc_transaction_sixtp_parser_create(void);
 
Index: io-gncxml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/io-gncxml-v2.c,v
retrieving revision 1.24.4.6
retrieving revision 1.24.4.7
diff -Lsrc/backend/file/io-gncxml-v2.c -Lsrc/backend/file/io-gncxml-v2.c -u -r1.24.4.6 -r1.24.4.7
--- src/backend/file/io-gncxml-v2.c
+++ src/backend/file/io-gncxml-v2.c
@@ -354,7 +354,7 @@
     
     g_return_val_if_fail(tree, FALSE);
 
-    type = xmlGetProp(tree, "cd:type");
+    type = xmlGetProp(tree, BAD_CAST "cd:type");
     strval = dom_tree_to_text(tree);
     if(!string_to_gint64(strval, &val))
     {
@@ -765,8 +765,8 @@
         {
             val = g_strdup_printf("%d", amount);
 
-            node = xmlNewNode(NULL, COUNT_DATA_TAG);
-            xmlSetProp(node, "cd:type", type);
+            node = xmlNewNode(NULL, BAD_CAST COUNT_DATA_TAG);
+            xmlSetProp(node, BAD_CAST "cd:type", type);
             xmlNodeAddContent(node, val);
 
             xmlElemDump(out, NULL, node);
Index: sixtp-dom-generators.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/sixtp-dom-generators.c,v
retrieving revision 1.5.4.2
retrieving revision 1.5.4.3
diff -Lsrc/backend/file/sixtp-dom-generators.c -Lsrc/backend/file/sixtp-dom-generators.c -u -r1.5.4.2 -r1.5.4.3
--- src/backend/file/sixtp-dom-generators.c
+++ src/backend/file/sixtp-dom-generators.c
@@ -72,7 +72,7 @@
 
     ret = xmlNewNode(NULL, tag);
 
-    xmlSetProp(ret, "type", "guid");
+    xmlSetProp(ret, BAD_CAST "type", BAD_CAST "guid");
 
     if (!guid_to_string_buff(gid, guid_str))
     {
@@ -99,8 +99,8 @@
         return NULL;
     }
     
-    xmlNewTextChild(ret, NULL, "cmdty:space", gnc_commodity_get_namespace(c));
-    xmlNewTextChild(ret, NULL, "cmdty:id", gnc_commodity_get_mnemonic(c));
+    xmlNewTextChild(ret, NULL, BAD_CAST "cmdty:space", gnc_commodity_get_namespace(c));
+    xmlNewTextChild(ret, NULL, BAD_CAST "cmdty:id", gnc_commodity_get_mnemonic(c));
 
     return ret;
 }
@@ -144,12 +144,12 @@
     
 	ret = xmlNewNode(NULL, tag);
     
-	xmlNewTextChild(ret, NULL, "ts:date", date_str);
+	xmlNewTextChild(ret, NULL, BAD_CAST "ts:date", date_str);
 
 	if(spec->tv_nsec > 0){
 		ns_str = timespec_nsec_to_string(spec);
 		if(ns_str){
-			xmlNewTextChild(ret, NULL, "ts:ns", ns_str);
+			xmlNewTextChild(ret, NULL, BAD_CAST "ts:ns", ns_str);
 		}
 	}
 
@@ -174,7 +174,7 @@
 
 	ret = xmlNewNode(NULL, tag);
 
-	xmlNewTextChild(ret, NULL, "gdate", date_str);
+	xmlNewTextChild(ret, NULL, BAD_CAST "gdate", date_str);
 
 	g_free(date_str);
 
@@ -234,7 +234,7 @@
 static void
 add_text_to_node(xmlNodePtr node, gchar *type, gchar *val)
 {
-    xmlSetProp(node, "type", type);
+    xmlSetProp(node, BAD_CAST "type", type);
     xmlNodeSetContent(node, val);
     g_free(val);
 }
@@ -245,7 +245,7 @@
 add_kvp_slot(gpointer key, gpointer value, gpointer data);
 
 static void
-add_kvp_value_node(xmlNodePtr node, gchar *tag, kvp_value* val)
+add_kvp_value_node(xmlNodePtr node, const xmlChar *tag, kvp_value* val)
 {
     xmlNodePtr val_node;
     gchar *tmp_str1;
@@ -277,7 +277,7 @@
                          gnc_numeric_to_string(kvp_value_get_numeric(val)));
         break;
     case KVP_TYPE_STRING:
-        xmlSetProp(val_node, "type", "string");
+        xmlSetProp(val_node, BAD_CAST "type", BAD_CAST "string");
         break;
     case KVP_TYPE_GUID:
         add_text_to_node(val_node,"guid",
@@ -288,7 +288,7 @@
       Timespec ts = kvp_value_get_timespec (val);
 
       val_node = timespec_to_dom_tree (tag, &ts);
-      xmlSetProp (val_node, "type", "timespec");
+      xmlSetProp (val_node, BAD_CAST "type", BAD_CAST "timespec");
       xmlAddChild (node, val_node);
     }
     break;
@@ -296,7 +296,7 @@
     {
         guint64 size;
         void *binary_data = kvp_value_get_binary(val, &size);
-        xmlSetProp(val_node, "type", "binary");
+        xmlSetProp(val_node, BAD_CAST "type", BAD_CAST "binary");
         g_return_if_fail(binary_data);
         tmp_str1 = binary_to_string(binary_data, size);
         xmlNodeSetContent(val_node, tmp_str1);
@@ -307,11 +307,11 @@
     {
         GList *cursor;
         
-        xmlSetProp(val_node, "type", "list");
+        xmlSetProp(val_node, BAD_CAST "type", BAD_CAST "list");
         for(cursor = kvp_value_get_glist(val); cursor; cursor = cursor->next)
         {
             kvp_value *val = (kvp_value*)cursor->data;
-            add_kvp_value_node(val_node, "slot:value", val);
+            add_kvp_value_node(val_node, BAD_CAST "slot:value", val);
         }
     }
     
@@ -320,7 +320,7 @@
     {
         kvp_frame *frame;
 
-        xmlSetProp(val_node, "type", "frame");
+        xmlSetProp(val_node, BAD_CAST "type", BAD_CAST "frame");
 
         frame = kvp_value_get_frame (val);
         if (!frame || !kvp_frame_get_hash (frame))
@@ -342,11 +342,11 @@
     xmlNodePtr slot_node;
     xmlNodePtr node = (xmlNodePtr)data;
 
-    slot_node = xmlNewChild(node, NULL, "slot", NULL);
+    slot_node = xmlNewChild(node, NULL, BAD_CAST "slot", NULL);
 
-    xmlNewTextChild(slot_node, NULL, "slot:key", (gchar*)key);
+    xmlNewTextChild(slot_node, NULL, BAD_CAST "slot:key", (gchar*)key);
 
-    add_kvp_value_node(slot_node, "slot:value", (kvp_value*)value);
+    add_kvp_value_node(slot_node, BAD_CAST "slot:value", (kvp_value*)value);
 }
     
 xmlNodePtr
Index: gnc-pricedb-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/gnc-pricedb-xml-v2.c,v
retrieving revision 1.6.4.2
retrieving revision 1.6.4.3
diff -Lsrc/backend/file/gnc-pricedb-xml-v2.c -Lsrc/backend/file/gnc-pricedb-xml-v2.c -u -r1.6.4.2 -r1.6.4.3
--- src/backend/file/gnc-pricedb-xml-v2.c
+++ src/backend/file/gnc-pricedb-xml-v2.c
@@ -366,7 +366,7 @@
 }
 
 static xmlNodePtr
-gnc_price_to_dom_tree(const char *tag, GNCPrice *price)
+gnc_price_to_dom_tree(const xmlChar *tag, GNCPrice *price)
 {  
   xmlNodePtr price_xml;
   const gchar *typestr, *sourcestr;
@@ -424,7 +424,7 @@
   xmlNodePtr xml_node = (xmlNodePtr) data;
   
   if(p) {
-    xmlNodePtr price_xml = gnc_price_to_dom_tree("price", p);
+    xmlNodePtr price_xml = gnc_price_to_dom_tree(BAD_CAST "price", p);
     if(!price_xml) return FALSE;
     xmlAddChild(xml_node, price_xml);
     return TRUE;
@@ -434,7 +434,7 @@
 }
 
 static xmlNodePtr
-gnc_pricedb_to_dom_tree(const char *tag, GNCPriceDB *db)
+gnc_pricedb_to_dom_tree(const xmlChar *tag, GNCPriceDB *db)
 {
   xmlNodePtr db_xml = NULL;
 
@@ -443,7 +443,7 @@
   db_xml= xmlNewNode(NULL, tag);
   if(!db_xml) return NULL;
 
-  xmlSetProp(db_xml, "version", "1");
+  xmlSetProp(db_xml, BAD_CAST "version", BAD_CAST "1");
 
   if(!gnc_pricedb_foreach_price(db, xml_add_gnc_price_adapter, db_xml, TRUE))
   {
@@ -464,5 +464,5 @@
 xmlNodePtr
 gnc_pricedb_dom_tree_create(GNCPriceDB *db)
 {
-    return gnc_pricedb_to_dom_tree("gnc:pricedb", db);
+    return gnc_pricedb_to_dom_tree(BAD_CAST "gnc:pricedb", db);
 }
Index: gnc-commodity-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/gnc-commodity-xml-v2.c,v
retrieving revision 1.5.4.2
retrieving revision 1.5.4.3
diff -Lsrc/backend/file/gnc-commodity-xml-v2.c -Lsrc/backend/file/gnc-commodity-xml-v2.c -u -r1.5.4.2 -r1.5.4.3
--- src/backend/file/gnc-commodity-xml-v2.c
+++ src/backend/file/gnc-commodity-xml-v2.c
@@ -67,9 +67,9 @@
     const char *string;
     xmlNodePtr ret;
 
-    ret = xmlNewNode(NULL, gnc_commodity_string);
+    ret = xmlNewNode(NULL, BAD_CAST gnc_commodity_string);
 
-    xmlSetProp(ret, "version", commodity_version_string);
+    xmlSetProp(ret, BAD_CAST "version", BAD_CAST commodity_version_string);
     
     xmlAddChild(ret, text_to_dom_tree(cmdty_namespace,
                                       gnc_commodity_get_namespace(com)));
@@ -94,7 +94,7 @@
                                      gnc_commodity_get_fraction(com)));
 
     if (gnc_commodity_get_quote_flag(com)) {
-      xmlNewChild(ret, NULL, cmdty_get_quotes, NULL);
+      xmlNewChild(ret, NULL, BAD_CAST cmdty_get_quotes, NULL);
       source = gnc_commodity_get_quote_source(com);
       if (source)
 	xmlAddChild(ret, text_to_dom_tree(cmdty_quote_source,
Index: gnc-freqspec-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/gnc-freqspec-xml-v2.c,v
retrieving revision 1.6.4.3
retrieving revision 1.6.4.4
diff -Lsrc/backend/file/gnc-freqspec-xml-v2.c -Lsrc/backend/file/gnc-freqspec-xml-v2.c -u -r1.6.4.3 -r1.6.4.4
--- src/backend/file/gnc-freqspec-xml-v2.c
+++ src/backend/file/gnc-freqspec-xml-v2.c
@@ -154,8 +154,8 @@
         xmlNodePtr                ret;
         xmlNodePtr                xmlSub;
 
-        ret = xmlNewNode( NULL, "gnc:freqspec" );
-        xmlSetProp( ret, "version", freqspec_version_string );
+        ret = xmlNewNode( NULL, BAD_CAST "gnc:freqspec" );
+        xmlSetProp( ret, BAD_CAST "version", BAD_CAST freqspec_version_string );
 
         xmlAddChild( ret, guid_to_dom_tree( "fs:id", &fs->entity.guid ) );
 
@@ -166,11 +166,11 @@
         switch( fs->type ) {
 
         case INVALID: {
-                xmlSub = xmlNewNode( NULL, "fs:none" );
+                xmlSub = xmlNewNode( NULL, BAD_CAST "fs:none" );
         } break;
 
         case ONCE: {
-                xmlSub = xmlNewNode( NULL, "fs:once" );
+                xmlSub = xmlNewNode( NULL, BAD_CAST "fs:once" );
                 xmlAddChild( xmlSub, 
                              gdate_to_dom_tree( "fs:date", 
                                                 &fs->s.once.date ) );
@@ -178,7 +178,7 @@
         } break;
 
         case DAILY: {
-                        xmlSub = xmlNewNode( NULL, "fs:daily" );
+                        xmlSub = xmlNewNode( NULL, BAD_CAST "fs:daily" );
                         xmlAddChild( xmlSub, 
                                      guint_to_dom_tree(
                                              "fs:interval", 
@@ -193,7 +193,7 @@
         } break;
         
         case WEEKLY: {
-                xmlSub = xmlNewNode( NULL, "fs:weekly" );
+                xmlSub = xmlNewNode( NULL, BAD_CAST "fs:weekly" );
                 xmlAddChild( xmlSub, 
                              guint_to_dom_tree( 
                                      "fs:interval", 
@@ -208,7 +208,7 @@
         } break;
         
         case MONTHLY: {
-                xmlSub = xmlNewNode( NULL, "fs:monthly" );
+                xmlSub = xmlNewNode( NULL, BAD_CAST "fs:monthly" );
                 xmlAddChild( xmlSub, 
                              guint_to_dom_tree( 
                                      "fs:interval", 
@@ -228,7 +228,7 @@
         } break;
         
         case MONTH_RELATIVE: {
-                xmlSub = xmlNewNode( NULL, "fs:month_relative" );
+                xmlSub = xmlNewNode( NULL, BAD_CAST "fs:month_relative" );
                 xmlAddChild( xmlSub, 
                              guint_to_dom_tree( 
                                      "fs:interval", 
@@ -255,7 +255,7 @@
         case COMPOSITE: {
                 GList *subelts;
                 xmlNodePtr xmlComposites;
-                xmlComposites = xmlNewNode( NULL, "fs:composite" );
+                xmlComposites = xmlNewNode( NULL, BAD_CAST "fs:composite" );
                 subelts = fs->s.composites.subSpecs;
                 while( subelts ) {
                         xmlAddChild( xmlComposites,
Index: sixtp-dom-parsers.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/sixtp-dom-parsers.c,v
retrieving revision 1.12.4.6
retrieving revision 1.12.4.7
diff -Lsrc/backend/file/sixtp-dom-parsers.c -Lsrc/backend/file/sixtp-dom-parsers.c -u -r1.12.4.6 -r1.12.4.7
--- src/backend/file/sixtp-dom-parsers.c
+++ src/backend/file/sixtp-dom-parsers.c
@@ -335,7 +335,7 @@
     struct kvp_val_converter *mark;
     kvp_value *ret = NULL;
 
-    xml_type = xmlGetProp(node, "type");
+    xml_type = xmlGetProp(node, BAD_CAST "type");
     if(xml_type)
     {
         type = g_strdup (xml_type);
Index: gnc-book-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/gnc-book-xml-v2.c,v
retrieving revision 1.6.4.4
retrieving revision 1.6.4.5
diff -Lsrc/backend/file/gnc-book-xml-v2.c -Lsrc/backend/file/gnc-book-xml-v2.c -u -r1.6.4.4 -r1.6.4.5
--- src/backend/file/gnc-book-xml-v2.c
+++ src/backend/file/gnc-book-xml-v2.c
@@ -108,8 +108,8 @@
 {
     xmlNodePtr ret;
 
-    ret = xmlNewNode(NULL, gnc_book_string);
-    xmlSetProp(ret, "version", gnc_v2_book_version_string);
+    ret = xmlNewNode(NULL, BAD_CAST gnc_book_string);
+    xmlSetProp(ret, BAD_CAST "version", BAD_CAST gnc_v2_book_version_string);
 
     xmlAddChild(ret, guid_to_dom_tree(book_id_string, qof_book_get_guid(book)));
 
Index: gnc-lot-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/gnc-lot-xml-v2.c,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -Lsrc/backend/file/gnc-lot-xml-v2.c -Lsrc/backend/file/gnc-lot-xml-v2.c -u -r1.4.4.1 -r1.4.4.2
--- src/backend/file/gnc-lot-xml-v2.c
+++ src/backend/file/gnc-lot-xml-v2.c
@@ -63,8 +63,8 @@
     kvp_frame *kf;
 
 	 ENTER("(lot=%p)", lot);
-    ret = xmlNewNode(NULL, gnc_lot_string);
-    xmlSetProp(ret, "version", lot_version_string);
+    ret = xmlNewNode(NULL, BAD_CAST gnc_lot_string);
+    xmlSetProp(ret, BAD_CAST "version", BAD_CAST lot_version_string);
 
     xmlAddChild(ret, guid_to_dom_tree(lot_id_string, gnc_lot_get_guid(lot)));
 
Index: gnc-schedxaction-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/gnc-schedxaction-xml-v2.c,v
retrieving revision 1.18.4.3
retrieving revision 1.18.4.4
diff -Lsrc/backend/file/gnc-schedxaction-xml-v2.c -Lsrc/backend/file/gnc-schedxaction-xml-v2.c -u -r1.18.4.3 -r1.18.4.4
--- src/backend/file/gnc-schedxaction-xml-v2.c
+++ src/backend/file/gnc-schedxaction-xml-v2.c
@@ -155,20 +155,20 @@
     templ_acc_guid = xaccAccountGetGUID(sx->template_acct);
 
     /* FIXME: this should be the same as the def in io-gncxml-v2.c */
-    ret = xmlNewNode( NULL, GNC_SCHEDXACTION_TAG );
+    ret = xmlNewNode( NULL, BAD_CAST GNC_SCHEDXACTION_TAG );
 
-    xmlSetProp( ret, "version", schedxaction_version_string );
+    xmlSetProp( ret, BAD_CAST "version", BAD_CAST schedxaction_version_string );
 
     xmlAddChild( ret,
                  guid_to_dom_tree(SX_ID,
                                   xaccSchedXactionGetGUID(sx)) );
 
-    xmlNewTextChild( ret, NULL, SX_NAME, xaccSchedXactionGetName(sx) );
+    xmlNewTextChild( ret, NULL, BAD_CAST SX_NAME, xaccSchedXactionGetName(sx) );
 
-    xmlNewTextChild( ret, NULL, SX_AUTOCREATE,
-                     ( sx->autoCreateOption ? "y" : "n" ) );
-    xmlNewTextChild( ret, NULL, SX_AUTOCREATE_NOTIFY,
-                     ( sx->autoCreateNotify ? "y" : "n" ) );
+    xmlNewTextChild( ret, NULL, BAD_CAST SX_AUTOCREATE,
+                     BAD_CAST ( sx->autoCreateOption ? "y" : "n" ) );
+    xmlNewTextChild( ret, NULL, BAD_CAST SX_AUTOCREATE_NOTIFY,
+                     BAD_CAST ( sx->autoCreateNotify ? "y" : "n" ) );
     xmlAddChild(ret, int_to_dom_tree(SX_ADVANCE_CREATE_DAYS,
                                      sx->advanceCreateDays));
     xmlAddChild(ret, int_to_dom_tree(SX_ADVANCE_REMIND_DAYS,
@@ -206,7 +206,7 @@
 				  templ_acc_guid));
 				  
     /* output freq spec */
-    fsNode = xmlNewNode(NULL, SX_FREQSPEC);
+    fsNode = xmlNewNode(NULL, BAD_CAST SX_FREQSPEC);
     xmlAddChild( fsNode,
                  gnc_freqSpec_dom_tree_create(
                          xaccSchedXactionGetFreqSpec(sx)) );
@@ -221,7 +221,7 @@
             for ( l = gnc_sx_get_defer_instances( sx ); l; l = l->next ) {
                     tsd = (temporalStateData*)l->data;
 
-                    instNode = xmlNewNode( NULL, SX_DEFER_INSTANCE );
+                    instNode = xmlNewNode( NULL, BAD_CAST SX_DEFER_INSTANCE );
                     if ( g_date_valid( &tsd->last_date ) )
                     {
                       xmlAddChild( instNode, gdate_to_dom_tree( SX_LAST,
Index: gnc-transaction-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/gnc-transaction-xml-v2.c,v
retrieving revision 1.9.4.3
retrieving revision 1.9.4.4
diff -Lsrc/backend/file/gnc-transaction-xml-v2.c -Lsrc/backend/file/gnc-transaction-xml-v2.c -u -r1.9.4.3 -r1.9.4.4
--- src/backend/file/gnc-transaction-xml-v2.c
+++ src/backend/file/gnc-transaction-xml-v2.c
@@ -65,8 +65,8 @@
     }
 }
 
-xmlNodePtr
-split_to_dom_tree(const gchar *tag, Split *spl)
+static xmlNodePtr
+split_to_dom_tree(const xmlChar *tag, Split *spl)
 {
     xmlNodePtr ret;
 
@@ -79,7 +79,7 @@
 
         if(memo && safe_strcmp(memo, "") != 0)
         {
-            xmlNewTextChild(ret, NULL, "split:memo", memo);
+            xmlNewTextChild(ret, NULL, BAD_CAST "split:memo", memo);
         }
     }
 
@@ -88,7 +88,7 @@
 
         if(action && safe_strcmp(action, "") != 0)
         {
-            xmlNewTextChild(ret, NULL, "split:action", action);
+            xmlNewTextChild(ret, NULL, BAD_CAST "split:action", action);
         }
     }
 
@@ -98,7 +98,7 @@
         tmp[0] = xaccSplitGetReconcile(spl);
         tmp[1] = '\0';
 
-        xmlNewTextChild(ret, NULL, "split:reconciled-state", tmp);
+        xmlNewTextChild(ret, NULL, BAD_CAST "split:reconciled-state", tmp);
     }
 
     add_timespec(ret, "split:reconcile-date",
@@ -141,12 +141,12 @@
     GList *n;
     xmlNodePtr toaddto;
 
-    toaddto = xmlNewChild(node, NULL, "trn:splits", NULL);
+    toaddto = xmlNewChild(node, NULL, BAD_CAST "trn:splits", NULL);
     
     for (n=xaccTransGetSplitList(trn); n; n=n->next)
     {
         Split *s = n->data;
-        xmlAddChild(toaddto, split_to_dom_tree("trn:split", s));
+        xmlAddChild(toaddto, split_to_dom_tree(BAD_CAST "trn:split", s));
     }
 }
 
@@ -155,9 +155,9 @@
 {
     xmlNodePtr ret;
 
-    ret = xmlNewNode(NULL, "gnc:transaction");
+    ret = xmlNewNode(NULL, BAD_CAST "gnc:transaction");
 
-    xmlSetProp(ret, "version", transaction_version_string);
+    xmlSetProp(ret, BAD_CAST "version", BAD_CAST transaction_version_string);
 
     xmlAddChild(ret, guid_to_dom_tree("trn:id", xaccTransGetGUID(trn)));
 
@@ -166,7 +166,7 @@
 
     if(xaccTransGetNum(trn) && (safe_strcmp(xaccTransGetNum(trn), "") != 0))
     {
-        xmlNewTextChild(ret, NULL, "trn:num", xaccTransGetNum(trn));
+        xmlNewTextChild(ret, NULL, BAD_CAST "trn:num", xaccTransGetNum(trn));
     }
 
     add_timespec(ret, "trn:date-posted", xaccTransRetDatePostedTS(trn), TRUE);
@@ -176,7 +176,7 @@
 
     if(xaccTransGetDescription(trn))
     {
-        xmlNewTextChild(ret, NULL, "trn:description",
+        xmlNewTextChild(ret, NULL, BAD_CAST "trn:description",
                         xaccTransGetDescription(trn));
     }
     
@@ -379,7 +379,7 @@
     { NULL, NULL, 0, 0 },
 };
 
-Split*
+static Split*
 dom_tree_to_split(xmlNodePtr node, QofBook *book)
 {
     struct split_pdata pdata;
Index: test-dom-converters1.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/test-dom-converters1.c,v
retrieving revision 1.4.4.3
retrieving revision 1.4.4.4
diff -Lsrc/backend/file/test/test-dom-converters1.c -Lsrc/backend/file/test/test-dom-converters1.c -u -r1.4.4.3 -r1.4.4.4
--- src/backend/file/test/test-dom-converters1.c
+++ src/backend/file/test/test-dom-converters1.c
@@ -67,7 +67,7 @@
         gchar *test_string2;
         xmlNodePtr test_node;
 
-        test_node = xmlNewNode(NULL, "test-node");
+        test_node = xmlNewNode(NULL, BAD_CAST "test-node");
         test_string1 = get_random_string();
 
         xmlNodeAddContent(test_node, test_string1);
Index: gnc-job-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-job-xml-v2.c,v
retrieving revision 1.4.4.3
retrieving revision 1.4.4.4
diff -Lsrc/business/business-core/file/gnc-job-xml-v2.c -Lsrc/business/business-core/file/gnc-job-xml-v2.c -u -r1.4.4.3 -r1.4.4.4
--- src/business/business-core/file/gnc-job-xml-v2.c
+++ src/business/business-core/file/gnc-job-xml-v2.c
@@ -70,8 +70,8 @@
 {
     xmlNodePtr ret;
 
-    ret = xmlNewNode(NULL, gnc_job_string);
-    xmlSetProp(ret, "version", job_version_string);
+    ret = xmlNewNode(NULL, BAD_CAST gnc_job_string);
+    xmlSetProp(ret, BAD_CAST "version", BAD_CAST job_version_string);
 
     xmlAddChild(ret, guid_to_dom_tree(job_guid_string,
 				      qof_instance_get_guid (QOF_INSTANCE (job))));
Index: gnc-customer-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-customer-xml-v2.c,v
retrieving revision 1.10.4.3
retrieving revision 1.10.4.4
diff -Lsrc/business/business-core/file/gnc-customer-xml-v2.c -Lsrc/business/business-core/file/gnc-customer-xml-v2.c -u -r1.10.4.3 -r1.10.4.4
--- src/business/business-core/file/gnc-customer-xml-v2.c
+++ src/business/business-core/file/gnc-customer-xml-v2.c
@@ -85,8 +85,8 @@
     GncBillTerm *term;
     GncTaxTable *taxtable;
 
-    ret = xmlNewNode(NULL, gnc_customer_string);
-    xmlSetProp(ret, "version", customer_version_string);
+    ret = xmlNewNode(NULL, BAD_CAST gnc_customer_string);
+    xmlSetProp(ret, BAD_CAST "version", BAD_CAST customer_version_string);
 
     xmlAddChild(ret, guid_to_dom_tree(cust_guid_string,
 				      qof_instance_get_guid(QOF_INSTANCE(cust))));
Index: gnc-address-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-address-xml-v2.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Lsrc/business/business-core/file/gnc-address-xml-v2.c -Lsrc/business/business-core/file/gnc-address-xml-v2.c -u -r1.1.4.1 -r1.1.4.2
--- src/business/business-core/file/gnc-address-xml-v2.c
+++ src/business/business-core/file/gnc-address-xml-v2.c
@@ -73,7 +73,7 @@
     xmlNodePtr ret;
 
     ret = xmlNewNode(NULL, tag);
-    xmlSetProp(ret, "version", address_version_string);
+    xmlSetProp(ret, BAD_CAST "version", BAD_CAST address_version_string);
 
     maybe_add_string (ret, addr_name_string, gncAddressGetName (addr));
     
Index: gnc-owner-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-owner-xml-v2.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -Lsrc/business/business-core/file/gnc-owner-xml-v2.c -Lsrc/business/business-core/file/gnc-owner-xml-v2.c -u -r1.1.4.2 -r1.1.4.3
--- src/business/business-core/file/gnc-owner-xml-v2.c
+++ src/business/business-core/file/gnc-owner-xml-v2.c
@@ -83,8 +83,8 @@
       return NULL;
     }
 
-    ret = xmlNewNode(NULL, tag);
-    xmlSetProp(ret, "version", owner_version_string);
+    ret = xmlNewNode(NULL, BAD_CAST tag);
+    xmlSetProp(ret, BAD_CAST "version", BAD_CAST owner_version_string);
 
     xmlAddChild (ret, text_to_dom_tree (owner_type_string, type_str));
     xmlAddChild (ret, guid_to_dom_tree (owner_id_string,
Index: gnc-invoice-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-invoice-xml-v2.c,v
retrieving revision 1.12.4.3
retrieving revision 1.12.4.4
diff -Lsrc/business/business-core/file/gnc-invoice-xml-v2.c -Lsrc/business/business-core/file/gnc-invoice-xml-v2.c -u -r1.12.4.3 -r1.12.4.4
--- src/business/business-core/file/gnc-invoice-xml-v2.c
+++ src/business/business-core/file/gnc-invoice-xml-v2.c
@@ -101,8 +101,8 @@
     GncOwner *billto;
     gnc_numeric amt;
 
-    ret = xmlNewNode(NULL, gnc_invoice_string);
-    xmlSetProp(ret, "version", invoice_version_string);
+    ret = xmlNewNode(NULL, BAD_CAST gnc_invoice_string);
+    xmlSetProp(ret, BAD_CAST "version", BAD_CAST invoice_version_string);
 
     xmlAddChild(ret, guid_to_dom_tree(invoice_guid_string,
 				      qof_instance_get_guid(QOF_INSTANCE(invoice))));
Index: gnc-vendor-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-vendor-xml-v2.c,v
retrieving revision 1.11.4.3
retrieving revision 1.11.4.4
diff -Lsrc/business/business-core/file/gnc-vendor-xml-v2.c -Lsrc/business/business-core/file/gnc-vendor-xml-v2.c -u -r1.11.4.3 -r1.11.4.4
--- src/business/business-core/file/gnc-vendor-xml-v2.c
+++ src/business/business-core/file/gnc-vendor-xml-v2.c
@@ -81,8 +81,8 @@
     GncBillTerm *term;
     GncTaxTable *taxtable;
 
-    ret = xmlNewNode(NULL, gnc_vendor_string);
-    xmlSetProp(ret, "version", vendor_version_string);
+    ret = xmlNewNode(NULL, BAD_CAST gnc_vendor_string);
+    xmlSetProp(ret, BAD_CAST "version", BAD_CAST vendor_version_string);
 
     xmlAddChild(ret, guid_to_dom_tree(vendor_guid_string,
 				      qof_instance_get_guid (QOF_INSTANCE(vendor))));
Index: gnc-tax-table-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-tax-table-xml-v2.c,v
retrieving revision 1.3.4.3
retrieving revision 1.3.4.4
diff -Lsrc/business/business-core/file/gnc-tax-table-xml-v2.c -Lsrc/business/business-core/file/gnc-tax-table-xml-v2.c -u -r1.3.4.3 -r1.3.4.4
--- src/business/business-core/file/gnc-tax-table-xml-v2.c
+++ src/business/business-core/file/gnc-tax-table-xml-v2.c
@@ -86,7 +86,7 @@
   Account *account;
   gnc_numeric amount;
 
-  ret = xmlNewNode(NULL, gnc_taxtableentry_string);
+  ret = xmlNewNode(NULL, BAD_CAST gnc_taxtableentry_string);
 
   account = gncTaxTableEntryGetAccount (entry);
   if (account)
@@ -109,8 +109,8 @@
     xmlNodePtr ret, entries;
     GList *list;
 
-    ret = xmlNewNode(NULL, gnc_taxtable_string);
-    xmlSetProp(ret, "version", taxtable_version_string);
+    ret = xmlNewNode(NULL, BAD_CAST gnc_taxtable_string);
+    xmlSetProp(ret, BAD_CAST "version", BAD_CAST taxtable_version_string);
 
     maybe_add_guid(ret, taxtable_guid_string, table);
     xmlAddChild(ret, text_to_dom_tree (taxtable_name_string,
@@ -127,7 +127,7 @@
 
     maybe_add_guid(ret, taxtable_parent_string, gncTaxTableGetParent (table));
 
-    entries = xmlNewChild (ret, NULL, taxtable_entries_string, NULL);
+    entries = xmlNewChild (ret, NULL, BAD_CAST taxtable_entries_string, NULL);
     for (list = gncTaxTableGetEntries (table); list; list = list->next) {
       GncTaxTableEntry *entry = list->data;
       xmlAddChild(entries, ttentry_dom_tree_create (entry));
Index: gnc-bill-term-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-bill-term-xml-v2.c,v
retrieving revision 1.3.4.3
retrieving revision 1.3.4.4
diff -Lsrc/business/business-core/file/gnc-bill-term-xml-v2.c -Lsrc/business/business-core/file/gnc-bill-term-xml-v2.c -u -r1.3.4.3 -r1.3.4.4
--- src/business/business-core/file/gnc-bill-term-xml-v2.c
+++ src/business/business-core/file/gnc-bill-term-xml-v2.c
@@ -84,8 +84,8 @@
 {
     xmlNodePtr ret, data, kvpnode;
 
-    ret = xmlNewNode(NULL, gnc_billterm_string);
-    xmlSetProp(ret, "version", billterm_version_string);
+    ret = xmlNewNode(NULL, BAD_CAST gnc_billterm_string);
+    xmlSetProp(ret, BAD_CAST "version", BAD_CAST billterm_version_string);
 
     maybe_add_guid(ret, billterm_guid_string, QOF_INSTANCE(term));
     xmlAddChild(ret, text_to_dom_tree (billterm_name_string,
@@ -113,7 +113,7 @@
 
     switch (gncBillTermGetType (term)) {
     case GNC_TERM_TYPE_DAYS:
-      data = xmlNewChild (ret, NULL, gnc_daystype_string, NULL);
+      data = xmlNewChild (ret, NULL, BAD_CAST gnc_daystype_string, NULL);
       maybe_add_int (data, days_duedays_string, gncBillTermGetDueDays (term));
       maybe_add_int (data, days_discdays_string,
 		     gncBillTermGetDiscountDays (term));
@@ -122,7 +122,7 @@
       break;
 
     case GNC_TERM_TYPE_PROXIMO:
-      data = xmlNewChild (ret, NULL, gnc_proximotype_string, NULL);
+      data = xmlNewChild (ret, NULL, BAD_CAST gnc_proximotype_string, NULL);
       maybe_add_int (data, prox_dueday_string, gncBillTermGetDueDays (term));
       maybe_add_int (data, prox_discday_string,
 		     gncBillTermGetDiscountDays (term));
Index: gnc-entry-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-entry-xml-v2.c,v
retrieving revision 1.11.4.3
retrieving revision 1.11.4.4
diff -Lsrc/business/business-core/file/gnc-entry-xml-v2.c -Lsrc/business/business-core/file/gnc-entry-xml-v2.c -u -r1.11.4.3 -r1.11.4.4
--- src/business/business-core/file/gnc-entry-xml-v2.c
+++ src/business/business-core/file/gnc-entry-xml-v2.c
@@ -120,8 +120,8 @@
     GncOrder *order;
     GncInvoice *invoice;
 
-    ret = xmlNewNode(NULL, gnc_entry_string);
-    xmlSetProp(ret, "version", entry_version_string);
+    ret = xmlNewNode(NULL, BAD_CAST gnc_entry_string);
+    xmlSetProp(ret, BAD_CAST "version", BAD_CAST entry_version_string);
 
     xmlAddChild(ret, guid_to_dom_tree(entry_guid_string,
 				      qof_instance_get_guid(QOF_INSTANCE(entry))));
Index: gnc-employee-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-employee-xml-v2.c,v
retrieving revision 1.6.4.3
retrieving revision 1.6.4.4
diff -Lsrc/business/business-core/file/gnc-employee-xml-v2.c -Lsrc/business/business-core/file/gnc-employee-xml-v2.c -u -r1.6.4.3 -r1.6.4.4
--- src/business/business-core/file/gnc-employee-xml-v2.c
+++ src/business/business-core/file/gnc-employee-xml-v2.c
@@ -84,8 +84,8 @@
     gnc_numeric num;
     Account* ccard_acc;
 
-    ret = xmlNewNode(NULL, gnc_employee_string);
-    xmlSetProp(ret, "version", employee_version_string);
+    ret = xmlNewNode(NULL, BAD_CAST gnc_employee_string);
+    xmlSetProp(ret, BAD_CAST "version", BAD_CAST employee_version_string);
 
     xmlAddChild(ret, guid_to_dom_tree(employee_guid_string,
 				      qof_instance_get_guid(QOF_INSTANCE (employee))));
Index: gnc-order-xml-v2.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/gnc-order-xml-v2.c,v
retrieving revision 1.4.4.3
retrieving revision 1.4.4.4
diff -Lsrc/business/business-core/file/gnc-order-xml-v2.c -Lsrc/business/business-core/file/gnc-order-xml-v2.c -u -r1.4.4.3 -r1.4.4.4
--- src/business/business-core/file/gnc-order-xml-v2.c
+++ src/business/business-core/file/gnc-order-xml-v2.c
@@ -79,8 +79,8 @@
     xmlNodePtr ret;
     Timespec ts;
 
-    ret = xmlNewNode(NULL, gnc_order_string);
-    xmlSetProp(ret, "version", order_version_string);
+    ret = xmlNewNode(NULL, BAD_CAST gnc_order_string);
+    xmlSetProp(ret, BAD_CAST "version", BAD_CAST order_version_string);
 
     xmlAddChild(ret, guid_to_dom_tree(order_guid_string,
 				      qof_instance_get_guid(QOF_INSTANCE (order))));


More information about the gnucash-changes mailing list