--- parser3/src/classes/xnode.C	2003/09/22 07:05:53	1.57
+++ parser3/src/classes/xnode.C	2003/09/25 09:15:02	1.59
@@ -7,7 +7,7 @@
 #include "classes.h"
 #ifdef XML
 
-static const char* IDENT_XNODE_C="$Date: 2003/09/22 07:05:53 $";
+static const char* IDENT_XNODE_C="$Date: 2003/09/25 09:15:02 $";
 
 #include "pa_vmethod_frame.h"
 
@@ -327,7 +327,7 @@ static void _getElementsByTagName(Reques
 		gulong length=gdome_nl_length(nodes, &exc);
 		for(gulong i=0; i<length; i++)
 			result.hash().put(
-				StringBody::Format(i), 
+				String::Body::Format(i), 
 				new VXnode(&r.charsets, gdome_nl_item(nodes, i, &exc)));
 	} else if(exc)
 		throw Exception(
@@ -340,7 +340,7 @@ static void _getElementsByTagName(Reques
 
 // DOM 2
 
-// DOMString getAttributeNS(in DOMString name);
+// DOMString getAttributeNS(in DOMString namespaceURI, in DOMString localName);
 static void _getAttributeNS(Request& r, MethodParams& params) {
 	GdomeElement* element=get_self_element(r);
 	
@@ -356,7 +356,7 @@ static void _getAttributeNS(Request& r,
 	r.write_no_lang(r.transcode(attribute_value));
 }
 
-// void setAttributeNS(in DOMString name, in DOMString value) raises(DOMException);
+// void setAttributeNS(in DOMString namespaceURI, in DOMString qualifiedName, in DOMString value) raises(DOMException);
 static void _setAttributeNS(Request& r, MethodParams& params) {
 	GdomeElement* element=get_self_element(r);
 	const String& namespaceURI=params.as_string(0, "namespaceURI must be string");
@@ -373,7 +373,7 @@ static void _setAttributeNS(Request& r,
 		throw Exception(0, exc);
 }
 
-// void removeAttributeNS(in DOMString name) raises(DOMException);
+// void removeAttributeNS(in DOMString namespaceURI, in DOMString localName) raises(DOMException);
 static void _removeAttributeNS(Request& r, MethodParams& params) {
 	GdomeElement* element=get_self_element(r);
 	const String& namespaceURI=params.as_string(0, "namespaceURI must be string");
@@ -388,7 +388,7 @@ static void _removeAttributeNS(Request&
 		throw Exception(0, exc);
 }
 
-// Attr getAttributeNodeNS(in DOMString name);
+// Attr getAttributeNodeNS(in DOMString namespaceURI, in DOMString localName);
 static void _getAttributeNodeNS(Request& r, MethodParams& params) {
 	GdomeElement* element=get_self_element(r);
 	const String& namespaceURI=params.as_string(0, "namespaceURI must be string");
@@ -420,7 +420,7 @@ static void _setAttributeNodeNS(Request&
 			exc);
 }
 
-// boolean hasAttribute();
+// boolean hasAttribute(in DOMString name) raises(DOMException);
 static void _hasAttribute(Request& r, MethodParams& params) {
 	GdomeElement* element=get_self_element(r);
 
@@ -434,7 +434,7 @@ static void _hasAttribute(Request& r, Me
 	r.write_no_lang(*new VBool(result));
 }
 
-// boolean hasAttributeNS();
+// boolean hasAttributeNS(n DOMString namespaceURI, in DOMString localName) raises(DOMException);
 static void _hasAttributeNS(Request& r, MethodParams& params) {
 	GdomeElement* element=get_self_element(r);
 
@@ -468,7 +468,7 @@ static void _getElementsByTagNameNS(Requ
 		gulong length=gdome_nl_length(nodes, &exc);
 		for(gulong i=0; i<length; i++)
 			result.hash().put(
-				StringBody::Format(i), 
+				String::Body::Format(i), 
 				new VXnode(&r.charsets, gdome_nl_item(nodes, i, &exc)));
 	}
 
@@ -537,7 +537,7 @@ static void selectNodesHandler(Request&
 				HashStringValue& hash=vhash.hash();
 				for(int i=0; i<size; i++)
 					hash.put(
-						StringBody::Format(i), 
+						String::Body::Format(i), 
 						new VXnode(
 							&r.charsets, 
 							gdome_xml_n_mkref(res->nodesetval->nodeTab[i])));
@@ -719,19 +719,19 @@ MXnode::MXnode(const char* aname, VState
 
 	/// DOM2 element
 
-	// DOMString getAttributeNS(in DOMString name);
+	// DOMString getAttributeNS(in DOMString namespaceURI, in DOMString localName);
 	add_native_method("getAttributeNS", Method::CT_DYNAMIC, _getAttributeNS, 2, 2);
-	// void setAttributeNS(in DOMString name, in DOMString value) raises(DOMException);
+	// void setAttributeNS(in DOMString namespaceURI, in DOMString qualifiedName, in DOMString value) raises(DOMException);
 	add_native_method("setAttributeNS", Method::CT_DYNAMIC, _setAttributeNS, 3, 3);
-	// void removeAttributeNS(in DOMString name) raises(DOMException);
+	// void removeAttributeNS(in DOMString namespaceURI, in DOMString localName) raises(DOMException);
 	add_native_method("removeAttributeNS", Method::CT_DYNAMIC, _removeAttributeNS, 2, 2);
-	// Attr getAttributeNodeNS(in DOMString name);
+	// Attr getAttributeNodeNS(in DOMString namespaceURI, in DOMString localName);
 	add_native_method("getAttributeNodeNS", Method::CT_DYNAMIC, _getAttributeNodeNS, 2, 2);
 	// Attr setAttributeNodeNS(in Attr newAttr) raises(DOMException);
 	add_native_method("setAttributeNodeNS", Method::CT_DYNAMIC, _setAttributeNodeNS, 1, 1);
-	// boolean hasAttribute(in Attr newAttr) raises(DOMException);
+	// boolean hasAttribute(in DOMString name) raises(DOMException);
 	add_native_method("hasAttribute", Method::CT_DYNAMIC, _hasAttribute, 1, 1);
-	// boolean hasAttributeNS(in Attr newAttr) raises(DOMException);
+	// boolean hasAttributeNS(in DOMString namespaceURI, in DOMString localName) raises(DOMException);
 	add_native_method("hasAttributeNS", Method::CT_DYNAMIC, _hasAttributeNS, 2, 2);
 
 	/// parser
@@ -750,7 +750,7 @@ MXnode::MXnode(const char* aname, VState
 	// consts
 
 #define CONST(name) \
-	consts.put(StringBody(#name), new VInt(GDOME_##name))
+	consts.put(String::Body(#name), new VInt(GDOME_##name))
 
 	CONST(ELEMENT_NODE);
 	CONST(ATTRIBUTE_NODE);