diff --git a/mozilla/extensions/transformiix/source/xpath/BooleanResult.cpp b/mozilla/extensions/transformiix/source/xpath/BooleanResult.cpp
index dbf7f399eb9..76751720ecb 100644
--- a/mozilla/extensions/transformiix/source/xpath/BooleanResult.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/BooleanResult.cpp
@@ -21,13 +21,13 @@
  * Keith Visco, kvisco@ziplink.net
  *   -- original author.
  *    
- * $Id: BooleanResult.cpp,v 1.2 2000-04-07 22:57:06 Peter.VanderBeken%pandora.be Exp $
+ * $Id: BooleanResult.cpp,v 1.3 2000-04-12 10:59:28 kvisco%ziplink.net Exp $
  */
 
 /**
  * Boolean Expression result
  * @author <A href="mailto:kvisco@ziplink.net">Keith Visco</A>
- * @version $Revision: 1.2 $ $Date: 2000-04-07 22:57:06 $
+ * @version $Revision: 1.3 $ $Date: 2000-04-12 10:59:28 $
 **/
 
 #include "ExprResult.h"
@@ -83,7 +83,7 @@ short BooleanResult::getResultType() {
     return ExprResult::BOOLEAN;
 } //-- getResultType
 
-void BooleanResult::stringValue(DOMString& str)  {
+void BooleanResult::stringValue(String& str)  {
     if ( value ) str.append("true");
     else str.append("false");
 } //-- toString
diff --git a/mozilla/extensions/transformiix/source/xpath/ExprResult.h b/mozilla/extensions/transformiix/source/xpath/ExprResult.h
index 6eb463b0ee5..7e0b288fadd 100644
--- a/mozilla/extensions/transformiix/source/xpath/ExprResult.h
+++ b/mozilla/extensions/transformiix/source/xpath/ExprResult.h
@@ -23,7 +23,7 @@
  * Larry Fitzpatrick, OpenText, lef@opentext.com
  *   -- changed constant short result types to enum
  *
- * $Id: ExprResult.h,v 1.2 2000-04-07 22:57:17 Peter.VanderBeken%pandora.be Exp $
+ * $Id: ExprResult.h,v 1.3 2000-04-12 10:59:29 kvisco%ziplink.net Exp $
  */
 
 #include "MITREObject.h"
@@ -42,7 +42,7 @@
  * <BR/>
  * Note: for NodeSet, see NodeSet.h <BR />
  * @author <A HREF="mailto:kvisco@ziplink.net">Keith Visco</A>
- * @version $Revision: 1.2 $ $Date: 2000-04-07 22:57:17 $
+ * @version $Revision: 1.3 $ $Date: 2000-04-12 10:59:29 $
 */
 
 class ExprResult : public MITREObject {
@@ -50,7 +50,7 @@ class ExprResult : public MITREObject {
 public:
 
     //-- ResultTypes
-    enum _ResultType {
+    enum ResultType {
         NODESET  = 1,
         STRING,
         BOOLEAN,
@@ -69,7 +69,7 @@ public:
      * Creates a String representation of this ExprResult
      * @param str the destination string to append the String representation to.
     **/
-    virtual void stringValue(DOMString& str) = 0;
+    virtual void stringValue(String& str) = 0;
 
     /**
      * Converts this ExprResult to a Boolean (MBool) value
@@ -100,7 +100,7 @@ public:
     void setValue(const BooleanResult& boolResult);
 
     virtual short  getResultType();
-    virtual void   stringValue(DOMString& str);
+    virtual void   stringValue(String& str);
     virtual MBool  booleanValue();
     virtual double numberValue();
 
@@ -125,7 +125,7 @@ public:
     MBool isNaN() const;
 
     virtual short  getResultType();
-    virtual void   stringValue(DOMString& str);
+    virtual void   stringValue(String& str);
     virtual MBool  booleanValue();
     virtual double numberValue();
 
@@ -148,7 +148,7 @@ public:
     void setValue(const String& str);
 
     virtual short  getResultType();
-    virtual void   stringValue(DOMString& str);
+    virtual void   stringValue(String& str);
     virtual MBool  booleanValue();
     virtual double numberValue();
 
diff --git a/mozilla/extensions/transformiix/source/xpath/NumberResult.cpp b/mozilla/extensions/transformiix/source/xpath/NumberResult.cpp
index 88361d48a0f..bb2cb05e557 100644
--- a/mozilla/extensions/transformiix/source/xpath/NumberResult.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/NumberResult.cpp
@@ -21,14 +21,14 @@
  * Keith Visco, kvisco@ziplink.net
  *   -- original author.
  *    
- * $Id: NumberResult.cpp,v 1.2 2000-04-07 22:58:06 Peter.VanderBeken%pandora.be Exp $
+ * $Id: NumberResult.cpp,v 1.3 2000-04-12 10:59:29 kvisco%ziplink.net Exp $
  */
 
 /**
  * NumberResult
  * Represents the a number as the result of evaluating an Expr
  * @author <A HREF="mailto:kvisco@ziplink.net">Keith Visco</A>
- * @version $Revision: 1.2 $ $Date: 2000-04-07 22:58:06 $
+ * @version $Revision: 1.3 $ $Date: 2000-04-12 10:59:29 $
 **/
 
 #include "ExprResult.h"
@@ -90,7 +90,7 @@ short NumberResult::getResultType() {
     return ExprResult::NUMBER;
 } //-- getResultType
 
-void NumberResult::stringValue(DOMString& str)  {
+void NumberResult::stringValue(String& str)  {
     int intVal = (int)value;
     if (intVal == value) { //-- no fraction
         Integer::toString(intVal, str);
diff --git a/mozilla/extensions/transformiix/source/xpath/StringResult.cpp b/mozilla/extensions/transformiix/source/xpath/StringResult.cpp
index 3a64a5565e8..ec83baca5b8 100644
--- a/mozilla/extensions/transformiix/source/xpath/StringResult.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/StringResult.cpp
@@ -21,14 +21,14 @@
  * Keith Visco, kvisco@ziplink.net
  *   -- original author.
  *    
- * $Id: StringResult.cpp,v 1.2 2000-04-07 22:58:41 Peter.VanderBeken%pandora.be Exp $
+ * $Id: StringResult.cpp,v 1.3 2000-04-12 10:59:29 kvisco%ziplink.net Exp $
  */
 
 /**
  * StringResult
  * Represents a String as a Result of evaluating an Expr
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.2 $ $Date: 2000-04-07 22:58:41 $
+ * @version $Revision: 1.3 $ $Date: 2000-04-12 10:59:29 $
 **/
 #include "ExprResult.h"
 
@@ -81,7 +81,7 @@ short StringResult::getResultType() {
     return ExprResult::STRING;
 } //-- getResultType
 
-void StringResult::stringValue(DOMString& str)  {
+void StringResult::stringValue(String& str)  {
     str.append(this->value);
 } //-- stringValue