diff --git a/mozilla/string/obsolete/nsString.cpp b/mozilla/string/obsolete/nsString.cpp
index ef07dc930f7..31ee0d55634 100644
--- a/mozilla/string/obsolete/nsString.cpp
+++ b/mozilla/string/obsolete/nsString.cpp
@@ -85,7 +85,7 @@ nsCString::nsCString(const char* aCString,PRInt32 aLength) {
   Assign(aCString,aLength);
 }
 
-#ifndef NEW_STRING_APIS
+#if 0
 /**
  * This constructor accepts a unicode string
  * @update  gess 1/4/99
@@ -981,6 +981,7 @@ nsCString& nsCString::Append(const nsCString& aString,PRInt32 aCount) {
   return *this;
 }
 
+#if 0
 /**
  * append given string to this string; 
  * @update  gess 01/04/99
@@ -997,6 +998,7 @@ nsCString& nsCString::Append(const nsStr& aString,PRInt32 aCount) {
     StrAppend(*this,aString,0,aCount);
   return *this;
 }
+#endif
 
 /**
  * append given c-string to this string
@@ -1216,10 +1218,9 @@ void nsCString::do_InsertFromReadable( const nsAReadableCString& aReadable, PRUi
  *  @param  aCount -- number of chars to be copied from aCopy
  *  @return this
  */
-nsCString& nsCString::Insert(const nsCString& aString,PRUint32 anOffset,PRInt32 aCount) {
+void nsCString::Insert(const nsCString& aString,PRUint32 anOffset,PRInt32 aCount) {
 
   StrInsert(*this,anOffset,aString,0,aCount);
-  return *this;
 }
 
 /**
@@ -1231,7 +1232,7 @@ nsCString& nsCString::Insert(const nsCString& aString,PRUint32 anOffset,PRInt32
  * @param   aCounttells us how many chars to insert
  * @return  this
  */
-nsCString& nsCString::Insert(const char* aCString,PRUint32 anOffset,PRInt32 aCount){
+void nsCString::Insert(const char* aCString,PRUint32 anOffset,PRInt32 aCount){
   if(aCString){
     nsStr temp;
     nsStr::Initialize(temp,eOneByte);
@@ -1256,7 +1257,6 @@ nsCString& nsCString::Insert(const char* aCString,PRUint32 anOffset,PRInt32 aCou
       StrInsert(*this,anOffset,temp,0,aCount);
     }
   }
-  return *this;  
 }
 
 
@@ -1269,7 +1269,7 @@ nsCString& nsCString::Insert(const char* aCString,PRUint32 anOffset,PRInt32 aCou
  * @param   anOffset is insert pos in str 
  * @return  this
  */
-nsCString& nsCString::Insert(char aChar,PRUint32 anOffset){
+void nsCString::Insert(char aChar,PRUint32 anOffset){
   char theBuffer[2]={0,0};
   theBuffer[0]=aChar;
   nsStr temp;
@@ -1277,7 +1277,6 @@ nsCString& nsCString::Insert(char aChar,PRUint32 anOffset){
   temp.mStr=theBuffer;
   temp.mLength=1;
   StrInsert(*this,anOffset,temp,0,1);
-  return *this;
 }
 #endif
 
@@ -1292,11 +1291,10 @@ nsCString& nsCString::Insert(char aChar,PRUint32 anOffset){
  *  @return *this
  */
 #ifndef NEW_STRING_APIS
-nsCString& nsCString::Cut(PRUint32 anOffset, PRInt32 aCount) {
+void nsCString::Cut(PRUint32 anOffset, PRInt32 aCount) {
   if(0<aCount) {
     nsStr::Delete(*this,anOffset,aCount);
   }
-  return *this;
 }
 #endif
 
@@ -1623,27 +1621,27 @@ PRInt32 nsCString::Compare(const nsStr& aString,PRBool aIgnoreCase,PRInt32 aCoun
  */
 PRBool nsCString::operator==(const nsStr& S) const {return Equals(S);}      
 PRBool nsCString::operator==(const char* s) const {return Equals(s);}
-PRBool nsCString::operator==(const PRUnichar* s) const {return Equals(s);}
+//PRBool nsCString::operator==(const PRUnichar* s) const {return Equals(s);}
 
 PRBool nsCString::operator!=(const nsStr& S) const {return PRBool(Compare(S)!=0);}
-PRBool nsCString::operator!=(const char* s) const {return PRBool(Compare(s)!=0);}
-PRBool nsCString::operator!=(const PRUnichar* s) const {return PRBool(Compare(s)!=0);}
+PRBool nsCString::operator!=(const char* s) const {return PRBool(Compare(nsCAutoString(s))!=0);}
+//PRBool nsCString::operator!=(const PRUnichar* s) const {return PRBool(Compare(s)!=0);}
 
 PRBool nsCString::operator<(const nsStr& S) const {return PRBool(Compare(S)<0);}
-PRBool nsCString::operator<(const char* s) const {return PRBool(Compare(s)<0);}
-PRBool nsCString::operator<(const PRUnichar* s) const {return PRBool(Compare(s)<0);}
+PRBool nsCString::operator<(const char* s) const {return PRBool(Compare(nsCAutoString(s))<0);}
+//PRBool nsCString::operator<(const PRUnichar* s) const {return PRBool(Compare(s)<0);}
 
 PRBool nsCString::operator>(const nsStr& S) const {return PRBool(Compare(S)>0);}
-PRBool nsCString::operator>(const char* s) const {return PRBool(Compare(s)>0);}
-PRBool nsCString::operator>(const PRUnichar* s) const {return PRBool(Compare(s)>0);}
+PRBool nsCString::operator>(const char* s) const {return PRBool(Compare(nsCAutoString(s))>0);}
+//PRBool nsCString::operator>(const PRUnichar* s) const {return PRBool(Compare(s)>0);}
 
 PRBool nsCString::operator<=(const nsStr& S) const {return PRBool(Compare(S)<=0);}
-PRBool nsCString::operator<=(const char* s) const {return PRBool(Compare(s)<=0);}
-PRBool nsCString::operator<=(const PRUnichar* s) const {return PRBool(Compare(s)<=0);}
+PRBool nsCString::operator<=(const char* s) const {return PRBool(Compare(nsCAutoString(s))<=0);}
+//PRBool nsCString::operator<=(const PRUnichar* s) const {return PRBool(Compare(s)<=0);}
 
 PRBool nsCString::operator>=(const nsStr& S) const {return PRBool(Compare(S)>=0);}
-PRBool nsCString::operator>=(const char* s) const {return PRBool(Compare(s)>=0);}
-PRBool nsCString::operator>=(const PRUnichar* s) const {return PRBool(Compare(s)>=0);}
+PRBool nsCString::operator>=(const char* s) const {return PRBool(Compare(nsCAutoString(s))>=0);}
+//PRBool nsCString::operator>=(const PRUnichar* s) const {return PRBool(Compare(s)>=0);}
 #endif
 
 #ifndef NEW_STRING_APIS
@@ -1911,7 +1909,7 @@ nsCAutoString::nsCAutoString(const CBufDescriptor& aBuffer) : nsCString() {
     AddNullTerminator(*this); //this isn't really needed, but it guarantees that folks don't pass string constants.
 }
 
-#ifndef NEW_STRING_APIS
+#if 0
 /**
  * Copy construct from uni-string
  * @param   aString is a ptr to a unistr
diff --git a/mozilla/string/obsolete/nsString.h b/mozilla/string/obsolete/nsString.h
index df7da3cbb42..5b3127043ba 100644
--- a/mozilla/string/obsolete/nsString.h
+++ b/mozilla/string/obsolete/nsString.h
@@ -113,13 +113,13 @@ public:
    * This constructor accepts a unichar string
    * @param   aCString is a ptr to a 2-byte cstr
    */
-  nsCString(const PRUnichar* aString,PRInt32 aLength=-1);
+//nsCString(const PRUnichar* aString,PRInt32 aLength=-1);
 
   /**
    * This is a copy constructor that accepts an nsStr
    * @param   reference to another nsCString
    */
-  nsCString(const nsStr&);
+//nsCString(const nsStr&);
 #endif
 
   /**
@@ -414,27 +414,20 @@ public:
   nsCString& Assign(char aChar);
 
   nsCString& Assign(const nsStr& aString,PRInt32 aCount=-1);
-  nsCString& Assign(const PRUnichar* aString,PRInt32 aCount=-1) { AssignWithConversion(aString, aCount); return *this; }
-  nsCString& Assign(PRUnichar aChar)                            { AssignWithConversion(aChar); return *this; }
-
-  /**
-   * Functionally equivalent to assign or operator=
-   * 
-   */
-  nsCString& SetString(const char* aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
-  nsCString& SetString(const nsStr& aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+//nsCString& Assign(const PRUnichar* aString,PRInt32 aCount=-1) { AssignWithConversion(aString, aCount); return *this; }
+//nsCString& Assign(PRUnichar aChar)                            { AssignWithConversion(aChar); return *this; }
 
   /**
    * here come a bunch of assignment operators...
    * @param   aString: string to be added to this
    * @return  this
    */
-  nsCString& operator=(PRUnichar aChar)           {AssignWithConversion(aChar); return *this;}
+//nsCString& operator=(PRUnichar aChar)           {AssignWithConversion(aChar); return *this;}
   nsCString& operator=(char aChar)                {return Assign(aChar);}
-  nsCString& operator=(const PRUnichar* aString)  {AssignWithConversion(aString); return *this;}
+//nsCString& operator=(const PRUnichar* aString)  {AssignWithConversion(aString); return *this;}
 
   nsCString& operator=(const nsCString& aString)  {return Assign(aString);}
-  nsCString& operator=(const nsStr& aString)      {return Assign(aString);}
+//nsCString& operator=(const nsStr& aString)      {return Assign(aString);}
   nsCString& operator=(const char* aCString)      {return Assign(aCString);}
 
     // Yes, I know this makes assignment from a |nsSubsumeString| not do the special thing
@@ -468,15 +461,15 @@ public:
 #endif
 
 #ifndef NEW_STRING_APIS
-  nsCString& Append(const nsStr& aString,PRInt32 aCount=-1);
+//nsCString& Append(const nsStr& aString,PRInt32 aCount=-1);
   nsCString& Append(const nsCString& aString,PRInt32 aCount);
   nsCString& Append(const nsCString& aString)           {return Append(aString,(PRInt32)aString.mLength);}
   nsCString& Append(const char* aString,PRInt32 aCount=-1);
   nsCString& Append(char aChar);
 
-  nsCString& Append(PRUnichar aChar)                    {AppendWithConversion(aChar); return *this;}
-  nsCString& Append(PRInt32 aInteger,PRInt32 aRadix=10) {AppendInt(aInteger,aRadix); return *this;}
-  nsCString& Append(float aFloat)                       {AppendFloat(aFloat); return *this;}
+//nsCString& Append(PRUnichar aChar)                    {AppendWithConversion(aChar); return *this;}
+//nsCString& Append(PRInt32 aInteger,PRInt32 aRadix=10) {AppendInt(aInteger,aRadix); return *this;}
+//nsCString& Append(float aFloat)                       {AppendFloat(aFloat); return *this;}
 
   /**
    * Here's a bunch of methods that append varying types...
@@ -486,9 +479,9 @@ public:
   nsCString& operator+=(const nsCString& aString) {return Append(aString,(PRInt32)aString.mLength);}
   nsCString& operator+=(const char* aCString)     {return Append(aCString);}
 
-  nsCString& operator+=(const PRUnichar aChar)    {return Append(aChar);}
+//nsCString& operator+=(const PRUnichar aChar)    {return Append(aChar);}
   nsCString& operator+=(const char aChar)         {return Append(aChar);}
-  nsCString& operator+=(const int anInt)          {return Append(anInt,10);}
+//nsCString& operator+=(const int anInt)          {return Append(anInt,10);}
 #endif
              
   /*
@@ -544,7 +537,7 @@ public:
    *
    *  @return number of chars inserted into this.
    */
-  nsCString& Insert(const nsCString& aCopy,PRUint32 anOffset,PRInt32 aCount=-1);
+  void Insert(const nsCString& aCopy,PRUint32 anOffset,PRInt32 aCount=-1);
 
   /**
    * Insert a given string into this string at
@@ -554,7 +547,7 @@ public:
    * @param   anOffset is insert pos in str 
    * @return  the number of chars inserted into this string
    */
-  nsCString& Insert(const char* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
+  void Insert(const char* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
 
   /**
    * Insert a single char into this string at
@@ -564,8 +557,8 @@ public:
    * @param   anOffset is insert pos in str 
    * @return  the number of chars inserted into this string
    */
-  nsCString& Insert(PRUnichar aChar,PRUint32 anOffset)  {InsertWithConversion(aChar,anOffset); return *this;}
-  nsCString& Insert(char aChar,PRUint32 anOffset);
+//void Insert(PRUnichar aChar,PRUint32 anOffset)  {InsertWithConversion(aChar,anOffset);}
+  void Insert(char aChar,PRUint32 anOffset);
 #endif
 
   /*
@@ -577,7 +570,7 @@ public:
    *  @return *this
    */
 #ifndef NEW_STRING_APIS
-  nsCString& Cut(PRUint32 anOffset,PRInt32 aCount);
+  void Cut(PRUint32 anOffset,PRInt32 aCount);
 #endif
 
 
@@ -680,12 +673,12 @@ public:
   PRBool  EqualsIgnoreCase(const PRUnichar* aString,PRInt32 aCount=-1) const;
 
 #ifndef NEW_STRING_APIS
-  virtual PRInt32 Compare(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return CompareWithConversion(aString,aIgnoreCase,aCount);
-  }
-  virtual PRInt32 Compare(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return CompareWithConversion(aString,aIgnoreCase,aCount);
-  }
+//virtual PRInt32 Compare(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return CompareWithConversion(aString,aIgnoreCase,aCount);
+//}
+//virtual PRInt32 Compare(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return CompareWithConversion(aString,aIgnoreCase,aCount);
+//}
 
   virtual PRInt32 Compare(const nsStr &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
 
@@ -707,9 +700,9 @@ public:
     return EqualsWithConversion(aString,aIgnoreCase,aCount);
   }
 
-  PRBool  Equals(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return EqualsWithConversion(aString,aIgnoreCase,aCount);
-  }
+//PRBool  Equals(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return EqualsWithConversion(aString,aIgnoreCase,aCount);
+//}
 
   PRBool  Equals(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
 
@@ -722,7 +715,7 @@ public:
    */
   PRBool  operator==(const nsStr &aString) const;
   PRBool  operator==(const char* aString) const;
-  PRBool  operator==(const PRUnichar* aString) const;
+//PRBool  operator==(const PRUnichar* aString) const;
 
   /**
    * These methods perform a !compare of a given string type to this 
@@ -731,7 +724,7 @@ public:
    */
   PRBool  operator!=(const nsStr &aString) const;
   PRBool  operator!=(const char* aString) const;
-  PRBool  operator!=(const PRUnichar* aString) const;
+//PRBool  operator!=(const PRUnichar* aString) const;
 
   /**
    * These methods test if a given string is < than this
@@ -740,7 +733,7 @@ public:
    */
   PRBool  operator<(const nsStr &aString) const;
   PRBool  operator<(const char* aString) const;
-  PRBool  operator<(const PRUnichar* aString) const;
+//PRBool  operator<(const PRUnichar* aString) const;
 
   /**
    * These methods test if a given string is > than this
@@ -749,7 +742,7 @@ public:
    */
   PRBool  operator>(const nsStr &S) const;
   PRBool  operator>(const char* aString) const;
-  PRBool  operator>(const PRUnichar* aString) const;
+//PRBool  operator>(const PRUnichar* aString) const;
 
   /**
    * These methods test if a given string is <= than this
@@ -758,7 +751,7 @@ public:
    */
   PRBool  operator<=(const nsStr &S) const;
   PRBool  operator<=(const char* aString) const;
-  PRBool  operator<=(const PRUnichar* aString) const;
+//PRBool  operator<=(const PRUnichar* aString) const;
 
   /**
    * These methods test if a given string is >= than this
@@ -767,7 +760,7 @@ public:
    */
   PRBool  operator>=(const nsStr &S) const;
   PRBool  operator>=(const char* aString) const;
-  PRBool  operator>=(const PRUnichar* aString) const;
+//PRBool  operator>=(const PRUnichar* aString) const;
 #endif // !defined(NEW_STRING_APIS)
 
   void    DebugDump(void) const;
@@ -815,9 +808,9 @@ public:
     nsCAutoString(const CBufDescriptor& aBuffer);
 
 #ifndef NEW_STRING_APIS
-    nsCAutoString(const PRUnichar* aString,PRInt32 aLength=-1);
-    nsCAutoString(const nsStr& aString);
-    nsCAutoString(PRUnichar aChar);
+//  nsCAutoString(const PRUnichar* aString,PRInt32 aLength=-1);
+//  nsCAutoString(const nsStr& aString);
+//  nsCAutoString(PRUnichar aChar);
 #endif
 
 #ifdef AIX
@@ -831,8 +824,8 @@ public:
     nsCAutoString& operator=(const nsCAutoString& aString) {nsCString::Assign(aString); return *this;}
     nsCAutoString& operator=(const nsCString& aString) {nsCString::Assign(aString); return *this;}
     nsCAutoString& operator=(const char* aCString) {nsCString::Assign(aCString); return *this;}
-    nsCAutoString& operator=(const PRUnichar* aString) {nsCString::Assign(aString); return *this;}
-    nsCAutoString& operator=(PRUnichar aChar) {nsCString::Assign(aChar); return *this;}
+//  nsCAutoString& operator=(const PRUnichar* aString) {nsCString::Assign(aString); return *this;}
+//  nsCAutoString& operator=(PRUnichar aChar) {nsCString::Assign(aChar); return *this;}
     nsCAutoString& operator=(char aChar) {nsCString::Assign(aChar); return *this;}
 #endif
 
diff --git a/mozilla/string/obsolete/nsString2.cpp b/mozilla/string/obsolete/nsString2.cpp
index 954f0f8d008..13692a61a71 100644
--- a/mozilla/string/obsolete/nsString2.cpp
+++ b/mozilla/string/obsolete/nsString2.cpp
@@ -66,7 +66,7 @@ nsString::nsString() {
   Initialize(*this,eTwoByte);
 }
 
-#ifndef NEW_STRING_APIS
+#if 0
 /**
  * This constructor accepts an ascii string
  * @update  gess 1/4/99
@@ -97,7 +97,7 @@ nsString::nsString(const PRUnichar* aString,PRInt32 aCount) {
   Assign(aString,aCount);
 }
 
-#ifndef NEW_STRING_APIS
+#if 0
 /**
  * This constructor works for all other nsSTr derivatives
  * @update  gess 1/4/99
@@ -336,7 +336,7 @@ nsSubsumeStr nsString::operator+(const nsString& aString){
  */
 nsSubsumeStr nsString::operator+(const char* aCString) {
   nsString temp(*this);
-  temp.Append(aCString); 
+  temp.AppendWithConversion(aCString); 
   return nsSubsumeStr(temp);
 }
 
@@ -1207,6 +1207,7 @@ void nsString::AppendFloat(double aFloat){
  * @param   aString : string to be appended to this
  * @return  this
  */
+#if 0
 nsString& nsString::Append(const nsStr& aString,PRInt32 aCount) {
 
   if(aCount<0)
@@ -1217,7 +1218,7 @@ nsString& nsString::Append(const nsStr& aString,PRInt32 aCount) {
     StrAppend(*this,aString,0,aCount);
   return *this;
 }
-
+#endif
 
 /**
  * append given string to this string
@@ -1390,9 +1391,8 @@ void nsString::InsertWithConversion(const char* aCString,PRUint32 anOffset,PRInt
  *  @param  aCount -- number of chars to be copied from aCopy
  *  @return this
  */
-nsString& nsString::Insert(const nsString& aCopy,PRUint32 anOffset,PRInt32 aCount) {
+void nsString::Insert(const nsString& aCopy,PRUint32 anOffset,PRInt32 aCount) {
   StrInsert(*this,anOffset,aCopy,0,aCount);
-  return *this;
 }
 
 
@@ -1407,7 +1407,7 @@ nsString& nsString::Insert(const nsString& aCopy,PRUint32 anOffset,PRInt32 aCoun
  *
  * @return  this
  */
-nsString& nsString::Insert(const PRUnichar* aString,PRUint32 anOffset,PRInt32 aCount){
+void nsString::Insert(const PRUnichar* aString,PRUint32 anOffset,PRInt32 aCount){
   if(aString && aCount){
     nsStr temp;
     nsStr::Initialize(temp,eTwoByte);
@@ -1432,7 +1432,6 @@ nsString& nsString::Insert(const PRUnichar* aString,PRUint32 anOffset,PRInt32 aC
       StrInsert(*this,anOffset,temp,0,aCount);
     }
   }
-  return *this;  
 }
 
 
@@ -1445,7 +1444,7 @@ nsString& nsString::Insert(const PRUnichar* aString,PRUint32 anOffset,PRInt32 aC
  * @param   anOffset is insert pos in str 
  * @return  this
  */
-nsString& nsString::Insert(PRUnichar aChar,PRUint32 anOffset){
+void nsString::Insert(PRUnichar aChar,PRUint32 anOffset){
   PRUnichar theBuffer[2]={0,0};
   theBuffer[0]=aChar;
   nsStr temp;
@@ -1453,7 +1452,6 @@ nsString& nsString::Insert(PRUnichar aChar,PRUint32 anOffset){
   temp.mUStr=theBuffer;
   temp.mLength=1;
   StrInsert(*this,anOffset,temp,0,1);
-  return *this;
 }
 #endif
 
@@ -1467,11 +1465,10 @@ nsString& nsString::Insert(PRUnichar aChar,PRUint32 anOffset){
  *  @return *this
  */
 #ifndef NEW_STRING_APIS
-nsString& nsString::Cut(PRUint32 anOffset, PRInt32 aCount) {
+void nsString::Cut(PRUint32 anOffset, PRInt32 aCount) {
   if(0<aCount) {
     nsStr::Delete(*this,anOffset,aCount);
   }
-  return *this;
 }
 #endif
 
@@ -1877,34 +1874,34 @@ PRInt32 nsString::Compare(const nsStr& aString,PRBool aIgnoreCase,PRInt32 aCount
  */
 
 PRBool nsString::operator==(const nsString& S) const {return Equals(S);}      
-PRBool nsString::operator==(const nsStr& S) const {return Equals(S);}      
-PRBool nsString::operator==(const char* s) const {return Equals(s);}
-PRBool nsString::operator==(const PRUnichar* s) const {return Equals(s);}
+//PRBool nsString::operator==(const nsStr& S) const {return Equals(S);}      
+//PRBool nsString::operator==(const char* s) const {return Equals(s);}
+PRBool nsString::operator==(const PRUnichar* s) const {return Equals(nsAutoString(s));}
 
 PRBool nsString::operator!=(const nsString& S) const {return PRBool(Compare(S)!=0);}
-PRBool nsString::operator!=(const nsStr& S) const {return PRBool(Compare(S)!=0);}
-PRBool nsString::operator!=(const char* s) const {return PRBool(Compare(s)!=0);}
-PRBool nsString::operator!=(const PRUnichar* s) const {return PRBool(Compare(s)!=0);}
+//PRBool nsString::operator!=(const nsStr& S) const {return PRBool(Compare(S)!=0);}
+//PRBool nsString::operator!=(const char* s) const {return PRBool(Compare(s)!=0);}
+PRBool nsString::operator!=(const PRUnichar* s) const {return PRBool(Compare(nsAutoString(s))!=0);}
 
 PRBool nsString::operator<(const nsString& S) const {return PRBool(Compare(S)<0);}
-PRBool nsString::operator<(const nsStr& S) const {return PRBool(Compare(S)<0);}
-PRBool nsString::operator<(const char* s) const {return PRBool(Compare(s)<0);}
-PRBool nsString::operator<(const PRUnichar* s) const {return PRBool(Compare(s)<0);}
+//PRBool nsString::operator<(const nsStr& S) const {return PRBool(Compare(S)<0);}
+//PRBool nsString::operator<(const char* s) const {return PRBool(Compare(s)<0);}
+PRBool nsString::operator<(const PRUnichar* s) const {return PRBool(Compare(nsAutoString(s))<0);}
 
 PRBool nsString::operator>(const nsString& S) const {return PRBool(Compare(S)>0);}
-PRBool nsString::operator>(const nsStr& S) const {return PRBool(Compare(S)>0);}
-PRBool nsString::operator>(const char* s) const {return PRBool(Compare(s)>0);}
-PRBool nsString::operator>(const PRUnichar* s) const {return PRBool(Compare(s)>0);}
+//PRBool nsString::operator>(const nsStr& S) const {return PRBool(Compare(S)>0);}
+//PRBool nsString::operator>(const char* s) const {return PRBool(Compare(s)>0);}
+PRBool nsString::operator>(const PRUnichar* s) const {return PRBool(Compare(nsAutoString(s))>0);}
 
 PRBool nsString::operator<=(const nsString& S) const {return PRBool(Compare(S)<=0);}
-PRBool nsString::operator<=(const nsStr& S) const {return PRBool(Compare(S)<=0);}
-PRBool nsString::operator<=(const char* s) const {return PRBool(Compare(s)<=0);}
-PRBool nsString::operator<=(const PRUnichar* s) const {return PRBool(Compare(s)<=0);}
+//PRBool nsString::operator<=(const nsStr& S) const {return PRBool(Compare(S)<=0);}
+//PRBool nsString::operator<=(const char* s) const {return PRBool(Compare(s)<=0);}
+PRBool nsString::operator<=(const PRUnichar* s) const {return PRBool(Compare(nsAutoString(s))<=0);}
 
 PRBool nsString::operator>=(const nsString& S) const {return PRBool(Compare(S)>=0);}
-PRBool nsString::operator>=(const nsStr& S) const {return PRBool(Compare(S)>=0);}
-PRBool nsString::operator>=(const char* s) const {return PRBool(Compare(s)>=0);}
-PRBool nsString::operator>=(const PRUnichar* s) const {return PRBool(Compare(s)>=0);}
+//PRBool nsString::operator>=(const nsStr& S) const {return PRBool(Compare(S)>=0);}
+//PRBool nsString::operator>=(const char* s) const {return PRBool(Compare(s)>=0);}
+PRBool nsString::operator>=(const PRUnichar* s) const {return PRBool(Compare(nsAutoString(s))>=0);}
 #endif // !defined(NEW_STRING_APIS)
 
 PRBool nsString::EqualsIgnoreCase(const nsString& aString) const {
@@ -2345,7 +2342,7 @@ NS_ConvertASCIItoUCS2::NS_ConvertASCIItoUCS2( const nsCString& )
 #endif
 #endif
 
-#ifndef NEW_STRING_APIS
+#if 0
 /**
  * Copy construct from ascii c-string
  * @param   aCString is a ptr to a 1-byte cstr
diff --git a/mozilla/string/obsolete/nsString2.h b/mozilla/string/obsolete/nsString2.h
index e586a9f0d8b..fc71b6ed2ea 100644
--- a/mozilla/string/obsolete/nsString2.h
+++ b/mozilla/string/obsolete/nsString2.h
@@ -110,13 +110,13 @@ public:
    * This constructor accepts an isolatin string
    * @param   aCString is a ptr to a 1-byte cstr
    */
-  nsString(const char* aCString,PRInt32 aCount=-1);
+//nsString(const char* aCString,PRInt32 aCount=-1);
 
   /**
    * This is a copy constructor that accepts an nsStr
    * @param   reference to another nsString
    */
-  nsString(const nsStr&);
+//nsString(const nsStr&);
 #endif
 
 
@@ -450,16 +450,8 @@ public:
   nsString& Assign(PRUnichar aChar);
 
   nsString& Assign(const nsStr& aString,PRInt32 aCount=-1);
-  nsString& Assign(const char* aString,PRInt32 aCount=-1)       { AssignWithConversion(aString, aCount); return *this; }
-  nsString& Assign(char aChar)                                  { AssignWithConversion(aChar); return *this; }
-
-  /**
-   * Functionally equivalent to assign or operator=
-   * 
-   */
-  nsString& SetString(const char* aString,PRInt32 aLength=-1)       {AssignWithConversion(aString, aLength); return *this;}
-  nsString& SetString(const nsString& aString,PRInt32 aLength=-1)   {return Assign(aString, aLength);}
-  nsString& SetString(const PRUnichar* aString,PRInt32 aLength=-1)  {return Assign(aString, aLength);}
+//nsString& Assign(const char* aString,PRInt32 aCount=-1)       { AssignWithConversion(aString, aCount); return *this; }
+//nsString& Assign(char aChar)                                  { AssignWithConversion(aChar); return *this; }
 
   /**
    * here come a bunch of assignment operators...
@@ -467,11 +459,11 @@ public:
    * @return  this
    */
   nsString& operator=(PRUnichar aChar)          {Assign(aChar); return *this;}
-  nsString& operator=(char aChar)               {AssignWithConversion(aChar); return *this;}
-  nsString& operator=(const char* aCString)     {AssignWithConversion(aCString); return *this;}
+//nsString& operator=(char aChar)               {AssignWithConversion(aChar); return *this;}
+//nsString& operator=(const char* aCString)     {AssignWithConversion(aCString); return *this;}
 
   nsString& operator=(const nsString& aString)  {return Assign(aString);}
-  nsString& operator=(const nsStr& aString)     {return Assign(aString);}
+//nsString& operator=(const nsStr& aString)     {return Assign(aString);}
   nsString& operator=(const PRUnichar* aString) {return Assign(aString);}
 
     // Yes, I know this makes assignment from a |nsSubsumeString| not do the special thing
@@ -506,30 +498,30 @@ public:
    *  NOTE:    IFF you pass -1 as aCount, then your buffer must be null terminated.
    *  @return  number of chars copied
    */
-  nsString& Append(const nsStr& aString,PRInt32 aCount);
-  nsString& Append(const nsStr& aString)                    {return Append(aString,(PRInt32)aString.mLength);}
+//nsString& Append(const nsStr& aString,PRInt32 aCount);
+//nsString& Append(const nsStr& aString)                    {return Append(aString,(PRInt32)aString.mLength);}
   nsString& Append(const nsString& aString,PRInt32 aCount);
   nsString& Append(const nsString& aString)                 {return Append(aString,(PRInt32)aString.mLength);}
  
   nsString& Append(const PRUnichar* aString,PRInt32 aCount=-1);
   nsString& Append(PRUnichar aChar);
 
-  nsString& Append(const char* aString,PRInt32 aCount=-1)   { AppendWithConversion(aString,aCount); return *this; }
-  nsString& Append(char aChar)                              { AppendWithConversion(aChar); return *this; }
-  nsString& Append(PRInt32 aInteger,PRInt32 aRadix=10)      { AppendInt(aInteger,aRadix); return *this; }
-  nsString& Append(float aFloat)                            { AppendFloat(aFloat); return *this; }
+//nsString& Append(const char* aString,PRInt32 aCount=-1)   { AppendWithConversion(aString,aCount); return *this; }
+//nsString& Append(char aChar)                              { AppendWithConversion(aChar); return *this; }
+//nsString& Append(PRInt32 aInteger,PRInt32 aRadix=10)      { AppendInt(aInteger,aRadix); return *this; }
+//nsString& Append(float aFloat)                            { AppendFloat(aFloat); return *this; }
 
   /**
    * Here's a bunch of methods that append varying types...
    * @param   various...
    * @return  this
    */
-  nsString& operator+=(const char* aCString)        {return Append(aCString);}
-  nsString& operator+=(const char aChar)            {return Append((PRUnichar) (unsigned char)aChar);}
+//nsString& operator+=(const char* aCString)        {return Append(aCString);}
+//nsString& operator+=(const char aChar)            {return Append((PRUnichar) (unsigned char)aChar);}
   nsString& operator+=(const PRUnichar aChar)       {return Append(aChar);}
-  nsString& operator+=(const int anInt)             {return Append(anInt,10);}
+//nsString& operator+=(const int anInt)             {return Append(anInt,10);}
 
-  nsString& operator+=(const nsStr& aString)        {return Append(aString,(PRInt32)aString.mLength);}
+//nsString& operator+=(const nsStr& aString)        {return Append(aString,(PRInt32)aString.mLength);}
   nsString& operator+=(const nsString& aString)     {return Append(aString,(PRInt32)aString.mLength);}
   nsString& operator+=(const PRUnichar* aUCString)  {return Append(aUCString);}
 #endif
@@ -583,7 +575,7 @@ public:
    *
    *  @return number of chars inserted into this.
    */
-  nsString& Insert(const nsString& aCopy,PRUint32 anOffset,PRInt32 aCount=-1);
+  void Insert(const nsString& aCopy,PRUint32 anOffset,PRInt32 aCount=-1);
 
   /**
    * Insert a given string into this string at
@@ -593,8 +585,8 @@ public:
    * @param   anOffset is insert pos in str 
    * @return  the number of chars inserted into this string
    */
-  nsString& Insert(const char* aChar,PRUint32 anOffset,PRInt32 aCount=-1) {InsertWithConversion(aChar, anOffset, aCount); return *this;}
-  nsString& Insert(const PRUnichar* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
+//nsString& Insert(const char* aChar,PRUint32 anOffset,PRInt32 aCount=-1) {InsertWithConversion(aChar, anOffset, aCount); return *this;}
+  void Insert(const PRUnichar* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
 
   /**
    * Insert a single char into this string at
@@ -605,7 +597,7 @@ public:
    * @return  the number of chars inserted into this string
    */
 //nsString& Insert(char aChar,PRUint32 anOffset)        {InsertWithConversion(aChar,anOffset); return *this;}
-  nsString& Insert(PRUnichar aChar,PRUint32 anOffset);
+  void Insert(PRUnichar aChar,PRUint32 anOffset);
 #endif
 
 
@@ -618,7 +610,7 @@ public:
    *  @param  aCount -- number of chars to be cut
    *  @return *this
    */
-  nsString& Cut(PRUint32 anOffset,PRInt32 aCount);
+  void Cut(PRUint32 anOffset,PRInt32 aCount);
 #endif
 
 
@@ -730,17 +722,17 @@ public:
   PRBool  EqualsIgnoreCase(/*FIX: const */nsIAtom *aAtom) const;
 
 #ifndef NEW_STRING_APIS
-  virtual PRInt32 Compare(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return CompareWithConversion(aString,aIgnoreCase,aCount);
-  }
+//virtual PRInt32 Compare(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return CompareWithConversion(aString,aIgnoreCase,aCount);
+//}
 
-  virtual PRInt32 Compare(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return CompareWithConversion(aString,aIgnoreCase,aCount);
-  }
+//virtual PRInt32 Compare(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return CompareWithConversion(aString,aIgnoreCase,aCount);
+//}
 
-  virtual PRInt32 Compare(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return CompareWithConversion(aString,aIgnoreCase,aCount);
-  }
+//virtual PRInt32 Compare(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return CompareWithConversion(aString,aIgnoreCase,aCount);
+//}
 
   virtual PRInt32 Compare(const nsStr &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
 
@@ -755,19 +747,19 @@ public:
    * @param  aCount  -- number of chars to be compared.
    * @return TRUE if equal
    */
-  PRBool  Equals(const nsString &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return EqualsWithConversion(aString,aIgnoreCase,aCount);
-  }
+//PRBool  Equals(const nsString &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return EqualsWithConversion(aString,aIgnoreCase,aCount);
+//}
 
-  PRBool  Equals(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return EqualsWithConversion(aString,aIgnoreCase,aCount);
-  }
+//PRBool  Equals(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return EqualsWithConversion(aString,aIgnoreCase,aCount);
+//}
 
-  PRBool  Equals(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return EqualsWithConversion(aString,aIgnoreCase,aCount);
-  }
+//PRBool  Equals(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return EqualsWithConversion(aString,aIgnoreCase,aCount);
+//}
 
-  PRBool  Equals(/*FIX: const */nsIAtom* anAtom,PRBool aIgnoreCase) const { return EqualsAtom(anAtom, aIgnoreCase); }
+//PRBool  Equals(/*FIX: const */nsIAtom* anAtom,PRBool aIgnoreCase) const { return EqualsAtom(anAtom, aIgnoreCase); }
   PRBool  Equals(const PRUnichar* s1, const PRUnichar* s2,PRBool aIgnoreCase=PR_FALSE) const;
   PRBool  Equals(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
 
@@ -779,8 +771,8 @@ public:
    * @return  TRUE or FALSE
    */
   PRBool  operator==(const nsString &aString) const;
-  PRBool  operator==(const nsStr &aString) const;
-  PRBool  operator==(const char *aString) const;
+//PRBool  operator==(const nsStr &aString) const;
+//PRBool  operator==(const char *aString) const;
   PRBool  operator==(const PRUnichar* aString) const;
 
   /**
@@ -789,8 +781,8 @@ public:
    * @return  TRUE 
    */
   PRBool  operator!=(const nsString &aString) const;
-  PRBool  operator!=(const nsStr &aString) const;
-  PRBool  operator!=(const char* aString) const;
+//PRBool  operator!=(const nsStr &aString) const;
+//PRBool  operator!=(const char* aString) const;
   PRBool  operator!=(const PRUnichar* aString) const;
 
   /**
@@ -799,8 +791,8 @@ public:
    * @return  TRUE or FALSE
    */
   PRBool  operator<(const nsString &aString) const;
-  PRBool  operator<(const nsStr &aString) const;
-  PRBool  operator<(const char* aString) const;
+//PRBool  operator<(const nsStr &aString) const;
+//PRBool  operator<(const char* aString) const;
   PRBool  operator<(const PRUnichar* aString) const;
 
   /**
@@ -809,8 +801,8 @@ public:
    * @return  TRUE or FALSE
    */
   PRBool  operator>(const nsString &aString) const;
-  PRBool  operator>(const nsStr &S) const;
-  PRBool  operator>(const char* aString) const;
+//PRBool  operator>(const nsStr &S) const;
+//PRBool  operator>(const char* aString) const;
   PRBool  operator>(const PRUnichar* aString) const;
 
   /**
@@ -819,8 +811,8 @@ public:
    * @return  TRUE or FALSE
    */
   PRBool  operator<=(const nsString &aString) const;
-  PRBool  operator<=(const nsStr &S) const;
-  PRBool  operator<=(const char* aString) const;
+//PRBool  operator<=(const nsStr &S) const;
+//PRBool  operator<=(const char* aString) const;
   PRBool  operator<=(const PRUnichar* aString) const;
 
   /**
@@ -829,8 +821,8 @@ public:
    * @return  TRUE or FALSE
    */
   PRBool  operator>=(const nsString &aString) const;
-  PRBool  operator>=(const nsStr &S) const;
-  PRBool  operator>=(const char* aString) const;
+//PRBool  operator>=(const nsStr &S) const;
+//PRBool  operator>=(const char* aString) const;
   PRBool  operator>=(const PRUnichar* aString) const;
 #endif // !defined(NEW_STRING_APIS)
 
@@ -908,8 +900,8 @@ public:
     nsAutoString(const CBufDescriptor& aBuffer);    
 
 #ifndef NEW_STRING_APIS
-    nsAutoString(const char* aCString,PRInt32 aLength=-1);
-    nsAutoString(const nsStr& aString);
+//  nsAutoString(const char* aCString,PRInt32 aLength=-1);
+//  nsAutoString(const nsStr& aString);
 #endif
 
 #ifdef AIX
@@ -922,8 +914,8 @@ public:
 #ifndef NEW_STRING_APIS
     nsAutoString& operator=(const nsStr& aString) {nsString::Assign(aString); return *this;}
     nsAutoString& operator=(const nsAutoString& aString) {nsString::Assign(aString); return *this;}
-    nsAutoString& operator=(const char* aCString) {nsString::Assign(aCString); return *this;}
-    nsAutoString& operator=(char aChar) {nsString::Assign(aChar); return *this;}
+//  nsAutoString& operator=(const char* aCString) {nsString::Assign(aCString); return *this;}
+//  nsAutoString& operator=(char aChar) {nsString::Assign(aChar); return *this;}
     nsAutoString& operator=(const PRUnichar* aBuffer) {nsString::Assign(aBuffer); return *this;}
     nsAutoString& operator=(PRUnichar aChar) {nsString::Assign(aChar); return *this;}
 #endif
diff --git a/mozilla/xpcom/ds/nsString.cpp b/mozilla/xpcom/ds/nsString.cpp
index ef07dc930f7..31ee0d55634 100644
--- a/mozilla/xpcom/ds/nsString.cpp
+++ b/mozilla/xpcom/ds/nsString.cpp
@@ -85,7 +85,7 @@ nsCString::nsCString(const char* aCString,PRInt32 aLength) {
   Assign(aCString,aLength);
 }
 
-#ifndef NEW_STRING_APIS
+#if 0
 /**
  * This constructor accepts a unicode string
  * @update  gess 1/4/99
@@ -981,6 +981,7 @@ nsCString& nsCString::Append(const nsCString& aString,PRInt32 aCount) {
   return *this;
 }
 
+#if 0
 /**
  * append given string to this string; 
  * @update  gess 01/04/99
@@ -997,6 +998,7 @@ nsCString& nsCString::Append(const nsStr& aString,PRInt32 aCount) {
     StrAppend(*this,aString,0,aCount);
   return *this;
 }
+#endif
 
 /**
  * append given c-string to this string
@@ -1216,10 +1218,9 @@ void nsCString::do_InsertFromReadable( const nsAReadableCString& aReadable, PRUi
  *  @param  aCount -- number of chars to be copied from aCopy
  *  @return this
  */
-nsCString& nsCString::Insert(const nsCString& aString,PRUint32 anOffset,PRInt32 aCount) {
+void nsCString::Insert(const nsCString& aString,PRUint32 anOffset,PRInt32 aCount) {
 
   StrInsert(*this,anOffset,aString,0,aCount);
-  return *this;
 }
 
 /**
@@ -1231,7 +1232,7 @@ nsCString& nsCString::Insert(const nsCString& aString,PRUint32 anOffset,PRInt32
  * @param   aCounttells us how many chars to insert
  * @return  this
  */
-nsCString& nsCString::Insert(const char* aCString,PRUint32 anOffset,PRInt32 aCount){
+void nsCString::Insert(const char* aCString,PRUint32 anOffset,PRInt32 aCount){
   if(aCString){
     nsStr temp;
     nsStr::Initialize(temp,eOneByte);
@@ -1256,7 +1257,6 @@ nsCString& nsCString::Insert(const char* aCString,PRUint32 anOffset,PRInt32 aCou
       StrInsert(*this,anOffset,temp,0,aCount);
     }
   }
-  return *this;  
 }
 
 
@@ -1269,7 +1269,7 @@ nsCString& nsCString::Insert(const char* aCString,PRUint32 anOffset,PRInt32 aCou
  * @param   anOffset is insert pos in str 
  * @return  this
  */
-nsCString& nsCString::Insert(char aChar,PRUint32 anOffset){
+void nsCString::Insert(char aChar,PRUint32 anOffset){
   char theBuffer[2]={0,0};
   theBuffer[0]=aChar;
   nsStr temp;
@@ -1277,7 +1277,6 @@ nsCString& nsCString::Insert(char aChar,PRUint32 anOffset){
   temp.mStr=theBuffer;
   temp.mLength=1;
   StrInsert(*this,anOffset,temp,0,1);
-  return *this;
 }
 #endif
 
@@ -1292,11 +1291,10 @@ nsCString& nsCString::Insert(char aChar,PRUint32 anOffset){
  *  @return *this
  */
 #ifndef NEW_STRING_APIS
-nsCString& nsCString::Cut(PRUint32 anOffset, PRInt32 aCount) {
+void nsCString::Cut(PRUint32 anOffset, PRInt32 aCount) {
   if(0<aCount) {
     nsStr::Delete(*this,anOffset,aCount);
   }
-  return *this;
 }
 #endif
 
@@ -1623,27 +1621,27 @@ PRInt32 nsCString::Compare(const nsStr& aString,PRBool aIgnoreCase,PRInt32 aCoun
  */
 PRBool nsCString::operator==(const nsStr& S) const {return Equals(S);}      
 PRBool nsCString::operator==(const char* s) const {return Equals(s);}
-PRBool nsCString::operator==(const PRUnichar* s) const {return Equals(s);}
+//PRBool nsCString::operator==(const PRUnichar* s) const {return Equals(s);}
 
 PRBool nsCString::operator!=(const nsStr& S) const {return PRBool(Compare(S)!=0);}
-PRBool nsCString::operator!=(const char* s) const {return PRBool(Compare(s)!=0);}
-PRBool nsCString::operator!=(const PRUnichar* s) const {return PRBool(Compare(s)!=0);}
+PRBool nsCString::operator!=(const char* s) const {return PRBool(Compare(nsCAutoString(s))!=0);}
+//PRBool nsCString::operator!=(const PRUnichar* s) const {return PRBool(Compare(s)!=0);}
 
 PRBool nsCString::operator<(const nsStr& S) const {return PRBool(Compare(S)<0);}
-PRBool nsCString::operator<(const char* s) const {return PRBool(Compare(s)<0);}
-PRBool nsCString::operator<(const PRUnichar* s) const {return PRBool(Compare(s)<0);}
+PRBool nsCString::operator<(const char* s) const {return PRBool(Compare(nsCAutoString(s))<0);}
+//PRBool nsCString::operator<(const PRUnichar* s) const {return PRBool(Compare(s)<0);}
 
 PRBool nsCString::operator>(const nsStr& S) const {return PRBool(Compare(S)>0);}
-PRBool nsCString::operator>(const char* s) const {return PRBool(Compare(s)>0);}
-PRBool nsCString::operator>(const PRUnichar* s) const {return PRBool(Compare(s)>0);}
+PRBool nsCString::operator>(const char* s) const {return PRBool(Compare(nsCAutoString(s))>0);}
+//PRBool nsCString::operator>(const PRUnichar* s) const {return PRBool(Compare(s)>0);}
 
 PRBool nsCString::operator<=(const nsStr& S) const {return PRBool(Compare(S)<=0);}
-PRBool nsCString::operator<=(const char* s) const {return PRBool(Compare(s)<=0);}
-PRBool nsCString::operator<=(const PRUnichar* s) const {return PRBool(Compare(s)<=0);}
+PRBool nsCString::operator<=(const char* s) const {return PRBool(Compare(nsCAutoString(s))<=0);}
+//PRBool nsCString::operator<=(const PRUnichar* s) const {return PRBool(Compare(s)<=0);}
 
 PRBool nsCString::operator>=(const nsStr& S) const {return PRBool(Compare(S)>=0);}
-PRBool nsCString::operator>=(const char* s) const {return PRBool(Compare(s)>=0);}
-PRBool nsCString::operator>=(const PRUnichar* s) const {return PRBool(Compare(s)>=0);}
+PRBool nsCString::operator>=(const char* s) const {return PRBool(Compare(nsCAutoString(s))>=0);}
+//PRBool nsCString::operator>=(const PRUnichar* s) const {return PRBool(Compare(s)>=0);}
 #endif
 
 #ifndef NEW_STRING_APIS
@@ -1911,7 +1909,7 @@ nsCAutoString::nsCAutoString(const CBufDescriptor& aBuffer) : nsCString() {
     AddNullTerminator(*this); //this isn't really needed, but it guarantees that folks don't pass string constants.
 }
 
-#ifndef NEW_STRING_APIS
+#if 0
 /**
  * Copy construct from uni-string
  * @param   aString is a ptr to a unistr
diff --git a/mozilla/xpcom/ds/nsString.h b/mozilla/xpcom/ds/nsString.h
index df7da3cbb42..5b3127043ba 100644
--- a/mozilla/xpcom/ds/nsString.h
+++ b/mozilla/xpcom/ds/nsString.h
@@ -113,13 +113,13 @@ public:
    * This constructor accepts a unichar string
    * @param   aCString is a ptr to a 2-byte cstr
    */
-  nsCString(const PRUnichar* aString,PRInt32 aLength=-1);
+//nsCString(const PRUnichar* aString,PRInt32 aLength=-1);
 
   /**
    * This is a copy constructor that accepts an nsStr
    * @param   reference to another nsCString
    */
-  nsCString(const nsStr&);
+//nsCString(const nsStr&);
 #endif
 
   /**
@@ -414,27 +414,20 @@ public:
   nsCString& Assign(char aChar);
 
   nsCString& Assign(const nsStr& aString,PRInt32 aCount=-1);
-  nsCString& Assign(const PRUnichar* aString,PRInt32 aCount=-1) { AssignWithConversion(aString, aCount); return *this; }
-  nsCString& Assign(PRUnichar aChar)                            { AssignWithConversion(aChar); return *this; }
-
-  /**
-   * Functionally equivalent to assign or operator=
-   * 
-   */
-  nsCString& SetString(const char* aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
-  nsCString& SetString(const nsStr& aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+//nsCString& Assign(const PRUnichar* aString,PRInt32 aCount=-1) { AssignWithConversion(aString, aCount); return *this; }
+//nsCString& Assign(PRUnichar aChar)                            { AssignWithConversion(aChar); return *this; }
 
   /**
    * here come a bunch of assignment operators...
    * @param   aString: string to be added to this
    * @return  this
    */
-  nsCString& operator=(PRUnichar aChar)           {AssignWithConversion(aChar); return *this;}
+//nsCString& operator=(PRUnichar aChar)           {AssignWithConversion(aChar); return *this;}
   nsCString& operator=(char aChar)                {return Assign(aChar);}
-  nsCString& operator=(const PRUnichar* aString)  {AssignWithConversion(aString); return *this;}
+//nsCString& operator=(const PRUnichar* aString)  {AssignWithConversion(aString); return *this;}
 
   nsCString& operator=(const nsCString& aString)  {return Assign(aString);}
-  nsCString& operator=(const nsStr& aString)      {return Assign(aString);}
+//nsCString& operator=(const nsStr& aString)      {return Assign(aString);}
   nsCString& operator=(const char* aCString)      {return Assign(aCString);}
 
     // Yes, I know this makes assignment from a |nsSubsumeString| not do the special thing
@@ -468,15 +461,15 @@ public:
 #endif
 
 #ifndef NEW_STRING_APIS
-  nsCString& Append(const nsStr& aString,PRInt32 aCount=-1);
+//nsCString& Append(const nsStr& aString,PRInt32 aCount=-1);
   nsCString& Append(const nsCString& aString,PRInt32 aCount);
   nsCString& Append(const nsCString& aString)           {return Append(aString,(PRInt32)aString.mLength);}
   nsCString& Append(const char* aString,PRInt32 aCount=-1);
   nsCString& Append(char aChar);
 
-  nsCString& Append(PRUnichar aChar)                    {AppendWithConversion(aChar); return *this;}
-  nsCString& Append(PRInt32 aInteger,PRInt32 aRadix=10) {AppendInt(aInteger,aRadix); return *this;}
-  nsCString& Append(float aFloat)                       {AppendFloat(aFloat); return *this;}
+//nsCString& Append(PRUnichar aChar)                    {AppendWithConversion(aChar); return *this;}
+//nsCString& Append(PRInt32 aInteger,PRInt32 aRadix=10) {AppendInt(aInteger,aRadix); return *this;}
+//nsCString& Append(float aFloat)                       {AppendFloat(aFloat); return *this;}
 
   /**
    * Here's a bunch of methods that append varying types...
@@ -486,9 +479,9 @@ public:
   nsCString& operator+=(const nsCString& aString) {return Append(aString,(PRInt32)aString.mLength);}
   nsCString& operator+=(const char* aCString)     {return Append(aCString);}
 
-  nsCString& operator+=(const PRUnichar aChar)    {return Append(aChar);}
+//nsCString& operator+=(const PRUnichar aChar)    {return Append(aChar);}
   nsCString& operator+=(const char aChar)         {return Append(aChar);}
-  nsCString& operator+=(const int anInt)          {return Append(anInt,10);}
+//nsCString& operator+=(const int anInt)          {return Append(anInt,10);}
 #endif
              
   /*
@@ -544,7 +537,7 @@ public:
    *
    *  @return number of chars inserted into this.
    */
-  nsCString& Insert(const nsCString& aCopy,PRUint32 anOffset,PRInt32 aCount=-1);
+  void Insert(const nsCString& aCopy,PRUint32 anOffset,PRInt32 aCount=-1);
 
   /**
    * Insert a given string into this string at
@@ -554,7 +547,7 @@ public:
    * @param   anOffset is insert pos in str 
    * @return  the number of chars inserted into this string
    */
-  nsCString& Insert(const char* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
+  void Insert(const char* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
 
   /**
    * Insert a single char into this string at
@@ -564,8 +557,8 @@ public:
    * @param   anOffset is insert pos in str 
    * @return  the number of chars inserted into this string
    */
-  nsCString& Insert(PRUnichar aChar,PRUint32 anOffset)  {InsertWithConversion(aChar,anOffset); return *this;}
-  nsCString& Insert(char aChar,PRUint32 anOffset);
+//void Insert(PRUnichar aChar,PRUint32 anOffset)  {InsertWithConversion(aChar,anOffset);}
+  void Insert(char aChar,PRUint32 anOffset);
 #endif
 
   /*
@@ -577,7 +570,7 @@ public:
    *  @return *this
    */
 #ifndef NEW_STRING_APIS
-  nsCString& Cut(PRUint32 anOffset,PRInt32 aCount);
+  void Cut(PRUint32 anOffset,PRInt32 aCount);
 #endif
 
 
@@ -680,12 +673,12 @@ public:
   PRBool  EqualsIgnoreCase(const PRUnichar* aString,PRInt32 aCount=-1) const;
 
 #ifndef NEW_STRING_APIS
-  virtual PRInt32 Compare(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return CompareWithConversion(aString,aIgnoreCase,aCount);
-  }
-  virtual PRInt32 Compare(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return CompareWithConversion(aString,aIgnoreCase,aCount);
-  }
+//virtual PRInt32 Compare(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return CompareWithConversion(aString,aIgnoreCase,aCount);
+//}
+//virtual PRInt32 Compare(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return CompareWithConversion(aString,aIgnoreCase,aCount);
+//}
 
   virtual PRInt32 Compare(const nsStr &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
 
@@ -707,9 +700,9 @@ public:
     return EqualsWithConversion(aString,aIgnoreCase,aCount);
   }
 
-  PRBool  Equals(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return EqualsWithConversion(aString,aIgnoreCase,aCount);
-  }
+//PRBool  Equals(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return EqualsWithConversion(aString,aIgnoreCase,aCount);
+//}
 
   PRBool  Equals(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
 
@@ -722,7 +715,7 @@ public:
    */
   PRBool  operator==(const nsStr &aString) const;
   PRBool  operator==(const char* aString) const;
-  PRBool  operator==(const PRUnichar* aString) const;
+//PRBool  operator==(const PRUnichar* aString) const;
 
   /**
    * These methods perform a !compare of a given string type to this 
@@ -731,7 +724,7 @@ public:
    */
   PRBool  operator!=(const nsStr &aString) const;
   PRBool  operator!=(const char* aString) const;
-  PRBool  operator!=(const PRUnichar* aString) const;
+//PRBool  operator!=(const PRUnichar* aString) const;
 
   /**
    * These methods test if a given string is < than this
@@ -740,7 +733,7 @@ public:
    */
   PRBool  operator<(const nsStr &aString) const;
   PRBool  operator<(const char* aString) const;
-  PRBool  operator<(const PRUnichar* aString) const;
+//PRBool  operator<(const PRUnichar* aString) const;
 
   /**
    * These methods test if a given string is > than this
@@ -749,7 +742,7 @@ public:
    */
   PRBool  operator>(const nsStr &S) const;
   PRBool  operator>(const char* aString) const;
-  PRBool  operator>(const PRUnichar* aString) const;
+//PRBool  operator>(const PRUnichar* aString) const;
 
   /**
    * These methods test if a given string is <= than this
@@ -758,7 +751,7 @@ public:
    */
   PRBool  operator<=(const nsStr &S) const;
   PRBool  operator<=(const char* aString) const;
-  PRBool  operator<=(const PRUnichar* aString) const;
+//PRBool  operator<=(const PRUnichar* aString) const;
 
   /**
    * These methods test if a given string is >= than this
@@ -767,7 +760,7 @@ public:
    */
   PRBool  operator>=(const nsStr &S) const;
   PRBool  operator>=(const char* aString) const;
-  PRBool  operator>=(const PRUnichar* aString) const;
+//PRBool  operator>=(const PRUnichar* aString) const;
 #endif // !defined(NEW_STRING_APIS)
 
   void    DebugDump(void) const;
@@ -815,9 +808,9 @@ public:
     nsCAutoString(const CBufDescriptor& aBuffer);
 
 #ifndef NEW_STRING_APIS
-    nsCAutoString(const PRUnichar* aString,PRInt32 aLength=-1);
-    nsCAutoString(const nsStr& aString);
-    nsCAutoString(PRUnichar aChar);
+//  nsCAutoString(const PRUnichar* aString,PRInt32 aLength=-1);
+//  nsCAutoString(const nsStr& aString);
+//  nsCAutoString(PRUnichar aChar);
 #endif
 
 #ifdef AIX
@@ -831,8 +824,8 @@ public:
     nsCAutoString& operator=(const nsCAutoString& aString) {nsCString::Assign(aString); return *this;}
     nsCAutoString& operator=(const nsCString& aString) {nsCString::Assign(aString); return *this;}
     nsCAutoString& operator=(const char* aCString) {nsCString::Assign(aCString); return *this;}
-    nsCAutoString& operator=(const PRUnichar* aString) {nsCString::Assign(aString); return *this;}
-    nsCAutoString& operator=(PRUnichar aChar) {nsCString::Assign(aChar); return *this;}
+//  nsCAutoString& operator=(const PRUnichar* aString) {nsCString::Assign(aString); return *this;}
+//  nsCAutoString& operator=(PRUnichar aChar) {nsCString::Assign(aChar); return *this;}
     nsCAutoString& operator=(char aChar) {nsCString::Assign(aChar); return *this;}
 #endif
 
diff --git a/mozilla/xpcom/ds/nsString2.cpp b/mozilla/xpcom/ds/nsString2.cpp
index 954f0f8d008..13692a61a71 100644
--- a/mozilla/xpcom/ds/nsString2.cpp
+++ b/mozilla/xpcom/ds/nsString2.cpp
@@ -66,7 +66,7 @@ nsString::nsString() {
   Initialize(*this,eTwoByte);
 }
 
-#ifndef NEW_STRING_APIS
+#if 0
 /**
  * This constructor accepts an ascii string
  * @update  gess 1/4/99
@@ -97,7 +97,7 @@ nsString::nsString(const PRUnichar* aString,PRInt32 aCount) {
   Assign(aString,aCount);
 }
 
-#ifndef NEW_STRING_APIS
+#if 0
 /**
  * This constructor works for all other nsSTr derivatives
  * @update  gess 1/4/99
@@ -336,7 +336,7 @@ nsSubsumeStr nsString::operator+(const nsString& aString){
  */
 nsSubsumeStr nsString::operator+(const char* aCString) {
   nsString temp(*this);
-  temp.Append(aCString); 
+  temp.AppendWithConversion(aCString); 
   return nsSubsumeStr(temp);
 }
 
@@ -1207,6 +1207,7 @@ void nsString::AppendFloat(double aFloat){
  * @param   aString : string to be appended to this
  * @return  this
  */
+#if 0
 nsString& nsString::Append(const nsStr& aString,PRInt32 aCount) {
 
   if(aCount<0)
@@ -1217,7 +1218,7 @@ nsString& nsString::Append(const nsStr& aString,PRInt32 aCount) {
     StrAppend(*this,aString,0,aCount);
   return *this;
 }
-
+#endif
 
 /**
  * append given string to this string
@@ -1390,9 +1391,8 @@ void nsString::InsertWithConversion(const char* aCString,PRUint32 anOffset,PRInt
  *  @param  aCount -- number of chars to be copied from aCopy
  *  @return this
  */
-nsString& nsString::Insert(const nsString& aCopy,PRUint32 anOffset,PRInt32 aCount) {
+void nsString::Insert(const nsString& aCopy,PRUint32 anOffset,PRInt32 aCount) {
   StrInsert(*this,anOffset,aCopy,0,aCount);
-  return *this;
 }
 
 
@@ -1407,7 +1407,7 @@ nsString& nsString::Insert(const nsString& aCopy,PRUint32 anOffset,PRInt32 aCoun
  *
  * @return  this
  */
-nsString& nsString::Insert(const PRUnichar* aString,PRUint32 anOffset,PRInt32 aCount){
+void nsString::Insert(const PRUnichar* aString,PRUint32 anOffset,PRInt32 aCount){
   if(aString && aCount){
     nsStr temp;
     nsStr::Initialize(temp,eTwoByte);
@@ -1432,7 +1432,6 @@ nsString& nsString::Insert(const PRUnichar* aString,PRUint32 anOffset,PRInt32 aC
       StrInsert(*this,anOffset,temp,0,aCount);
     }
   }
-  return *this;  
 }
 
 
@@ -1445,7 +1444,7 @@ nsString& nsString::Insert(const PRUnichar* aString,PRUint32 anOffset,PRInt32 aC
  * @param   anOffset is insert pos in str 
  * @return  this
  */
-nsString& nsString::Insert(PRUnichar aChar,PRUint32 anOffset){
+void nsString::Insert(PRUnichar aChar,PRUint32 anOffset){
   PRUnichar theBuffer[2]={0,0};
   theBuffer[0]=aChar;
   nsStr temp;
@@ -1453,7 +1452,6 @@ nsString& nsString::Insert(PRUnichar aChar,PRUint32 anOffset){
   temp.mUStr=theBuffer;
   temp.mLength=1;
   StrInsert(*this,anOffset,temp,0,1);
-  return *this;
 }
 #endif
 
@@ -1467,11 +1465,10 @@ nsString& nsString::Insert(PRUnichar aChar,PRUint32 anOffset){
  *  @return *this
  */
 #ifndef NEW_STRING_APIS
-nsString& nsString::Cut(PRUint32 anOffset, PRInt32 aCount) {
+void nsString::Cut(PRUint32 anOffset, PRInt32 aCount) {
   if(0<aCount) {
     nsStr::Delete(*this,anOffset,aCount);
   }
-  return *this;
 }
 #endif
 
@@ -1877,34 +1874,34 @@ PRInt32 nsString::Compare(const nsStr& aString,PRBool aIgnoreCase,PRInt32 aCount
  */
 
 PRBool nsString::operator==(const nsString& S) const {return Equals(S);}      
-PRBool nsString::operator==(const nsStr& S) const {return Equals(S);}      
-PRBool nsString::operator==(const char* s) const {return Equals(s);}
-PRBool nsString::operator==(const PRUnichar* s) const {return Equals(s);}
+//PRBool nsString::operator==(const nsStr& S) const {return Equals(S);}      
+//PRBool nsString::operator==(const char* s) const {return Equals(s);}
+PRBool nsString::operator==(const PRUnichar* s) const {return Equals(nsAutoString(s));}
 
 PRBool nsString::operator!=(const nsString& S) const {return PRBool(Compare(S)!=0);}
-PRBool nsString::operator!=(const nsStr& S) const {return PRBool(Compare(S)!=0);}
-PRBool nsString::operator!=(const char* s) const {return PRBool(Compare(s)!=0);}
-PRBool nsString::operator!=(const PRUnichar* s) const {return PRBool(Compare(s)!=0);}
+//PRBool nsString::operator!=(const nsStr& S) const {return PRBool(Compare(S)!=0);}
+//PRBool nsString::operator!=(const char* s) const {return PRBool(Compare(s)!=0);}
+PRBool nsString::operator!=(const PRUnichar* s) const {return PRBool(Compare(nsAutoString(s))!=0);}
 
 PRBool nsString::operator<(const nsString& S) const {return PRBool(Compare(S)<0);}
-PRBool nsString::operator<(const nsStr& S) const {return PRBool(Compare(S)<0);}
-PRBool nsString::operator<(const char* s) const {return PRBool(Compare(s)<0);}
-PRBool nsString::operator<(const PRUnichar* s) const {return PRBool(Compare(s)<0);}
+//PRBool nsString::operator<(const nsStr& S) const {return PRBool(Compare(S)<0);}
+//PRBool nsString::operator<(const char* s) const {return PRBool(Compare(s)<0);}
+PRBool nsString::operator<(const PRUnichar* s) const {return PRBool(Compare(nsAutoString(s))<0);}
 
 PRBool nsString::operator>(const nsString& S) const {return PRBool(Compare(S)>0);}
-PRBool nsString::operator>(const nsStr& S) const {return PRBool(Compare(S)>0);}
-PRBool nsString::operator>(const char* s) const {return PRBool(Compare(s)>0);}
-PRBool nsString::operator>(const PRUnichar* s) const {return PRBool(Compare(s)>0);}
+//PRBool nsString::operator>(const nsStr& S) const {return PRBool(Compare(S)>0);}
+//PRBool nsString::operator>(const char* s) const {return PRBool(Compare(s)>0);}
+PRBool nsString::operator>(const PRUnichar* s) const {return PRBool(Compare(nsAutoString(s))>0);}
 
 PRBool nsString::operator<=(const nsString& S) const {return PRBool(Compare(S)<=0);}
-PRBool nsString::operator<=(const nsStr& S) const {return PRBool(Compare(S)<=0);}
-PRBool nsString::operator<=(const char* s) const {return PRBool(Compare(s)<=0);}
-PRBool nsString::operator<=(const PRUnichar* s) const {return PRBool(Compare(s)<=0);}
+//PRBool nsString::operator<=(const nsStr& S) const {return PRBool(Compare(S)<=0);}
+//PRBool nsString::operator<=(const char* s) const {return PRBool(Compare(s)<=0);}
+PRBool nsString::operator<=(const PRUnichar* s) const {return PRBool(Compare(nsAutoString(s))<=0);}
 
 PRBool nsString::operator>=(const nsString& S) const {return PRBool(Compare(S)>=0);}
-PRBool nsString::operator>=(const nsStr& S) const {return PRBool(Compare(S)>=0);}
-PRBool nsString::operator>=(const char* s) const {return PRBool(Compare(s)>=0);}
-PRBool nsString::operator>=(const PRUnichar* s) const {return PRBool(Compare(s)>=0);}
+//PRBool nsString::operator>=(const nsStr& S) const {return PRBool(Compare(S)>=0);}
+//PRBool nsString::operator>=(const char* s) const {return PRBool(Compare(s)>=0);}
+PRBool nsString::operator>=(const PRUnichar* s) const {return PRBool(Compare(nsAutoString(s))>=0);}
 #endif // !defined(NEW_STRING_APIS)
 
 PRBool nsString::EqualsIgnoreCase(const nsString& aString) const {
@@ -2345,7 +2342,7 @@ NS_ConvertASCIItoUCS2::NS_ConvertASCIItoUCS2( const nsCString& )
 #endif
 #endif
 
-#ifndef NEW_STRING_APIS
+#if 0
 /**
  * Copy construct from ascii c-string
  * @param   aCString is a ptr to a 1-byte cstr
diff --git a/mozilla/xpcom/ds/nsString2.h b/mozilla/xpcom/ds/nsString2.h
index e586a9f0d8b..fc71b6ed2ea 100644
--- a/mozilla/xpcom/ds/nsString2.h
+++ b/mozilla/xpcom/ds/nsString2.h
@@ -110,13 +110,13 @@ public:
    * This constructor accepts an isolatin string
    * @param   aCString is a ptr to a 1-byte cstr
    */
-  nsString(const char* aCString,PRInt32 aCount=-1);
+//nsString(const char* aCString,PRInt32 aCount=-1);
 
   /**
    * This is a copy constructor that accepts an nsStr
    * @param   reference to another nsString
    */
-  nsString(const nsStr&);
+//nsString(const nsStr&);
 #endif
 
 
@@ -450,16 +450,8 @@ public:
   nsString& Assign(PRUnichar aChar);
 
   nsString& Assign(const nsStr& aString,PRInt32 aCount=-1);
-  nsString& Assign(const char* aString,PRInt32 aCount=-1)       { AssignWithConversion(aString, aCount); return *this; }
-  nsString& Assign(char aChar)                                  { AssignWithConversion(aChar); return *this; }
-
-  /**
-   * Functionally equivalent to assign or operator=
-   * 
-   */
-  nsString& SetString(const char* aString,PRInt32 aLength=-1)       {AssignWithConversion(aString, aLength); return *this;}
-  nsString& SetString(const nsString& aString,PRInt32 aLength=-1)   {return Assign(aString, aLength);}
-  nsString& SetString(const PRUnichar* aString,PRInt32 aLength=-1)  {return Assign(aString, aLength);}
+//nsString& Assign(const char* aString,PRInt32 aCount=-1)       { AssignWithConversion(aString, aCount); return *this; }
+//nsString& Assign(char aChar)                                  { AssignWithConversion(aChar); return *this; }
 
   /**
    * here come a bunch of assignment operators...
@@ -467,11 +459,11 @@ public:
    * @return  this
    */
   nsString& operator=(PRUnichar aChar)          {Assign(aChar); return *this;}
-  nsString& operator=(char aChar)               {AssignWithConversion(aChar); return *this;}
-  nsString& operator=(const char* aCString)     {AssignWithConversion(aCString); return *this;}
+//nsString& operator=(char aChar)               {AssignWithConversion(aChar); return *this;}
+//nsString& operator=(const char* aCString)     {AssignWithConversion(aCString); return *this;}
 
   nsString& operator=(const nsString& aString)  {return Assign(aString);}
-  nsString& operator=(const nsStr& aString)     {return Assign(aString);}
+//nsString& operator=(const nsStr& aString)     {return Assign(aString);}
   nsString& operator=(const PRUnichar* aString) {return Assign(aString);}
 
     // Yes, I know this makes assignment from a |nsSubsumeString| not do the special thing
@@ -506,30 +498,30 @@ public:
    *  NOTE:    IFF you pass -1 as aCount, then your buffer must be null terminated.
    *  @return  number of chars copied
    */
-  nsString& Append(const nsStr& aString,PRInt32 aCount);
-  nsString& Append(const nsStr& aString)                    {return Append(aString,(PRInt32)aString.mLength);}
+//nsString& Append(const nsStr& aString,PRInt32 aCount);
+//nsString& Append(const nsStr& aString)                    {return Append(aString,(PRInt32)aString.mLength);}
   nsString& Append(const nsString& aString,PRInt32 aCount);
   nsString& Append(const nsString& aString)                 {return Append(aString,(PRInt32)aString.mLength);}
  
   nsString& Append(const PRUnichar* aString,PRInt32 aCount=-1);
   nsString& Append(PRUnichar aChar);
 
-  nsString& Append(const char* aString,PRInt32 aCount=-1)   { AppendWithConversion(aString,aCount); return *this; }
-  nsString& Append(char aChar)                              { AppendWithConversion(aChar); return *this; }
-  nsString& Append(PRInt32 aInteger,PRInt32 aRadix=10)      { AppendInt(aInteger,aRadix); return *this; }
-  nsString& Append(float aFloat)                            { AppendFloat(aFloat); return *this; }
+//nsString& Append(const char* aString,PRInt32 aCount=-1)   { AppendWithConversion(aString,aCount); return *this; }
+//nsString& Append(char aChar)                              { AppendWithConversion(aChar); return *this; }
+//nsString& Append(PRInt32 aInteger,PRInt32 aRadix=10)      { AppendInt(aInteger,aRadix); return *this; }
+//nsString& Append(float aFloat)                            { AppendFloat(aFloat); return *this; }
 
   /**
    * Here's a bunch of methods that append varying types...
    * @param   various...
    * @return  this
    */
-  nsString& operator+=(const char* aCString)        {return Append(aCString);}
-  nsString& operator+=(const char aChar)            {return Append((PRUnichar) (unsigned char)aChar);}
+//nsString& operator+=(const char* aCString)        {return Append(aCString);}
+//nsString& operator+=(const char aChar)            {return Append((PRUnichar) (unsigned char)aChar);}
   nsString& operator+=(const PRUnichar aChar)       {return Append(aChar);}
-  nsString& operator+=(const int anInt)             {return Append(anInt,10);}
+//nsString& operator+=(const int anInt)             {return Append(anInt,10);}
 
-  nsString& operator+=(const nsStr& aString)        {return Append(aString,(PRInt32)aString.mLength);}
+//nsString& operator+=(const nsStr& aString)        {return Append(aString,(PRInt32)aString.mLength);}
   nsString& operator+=(const nsString& aString)     {return Append(aString,(PRInt32)aString.mLength);}
   nsString& operator+=(const PRUnichar* aUCString)  {return Append(aUCString);}
 #endif
@@ -583,7 +575,7 @@ public:
    *
    *  @return number of chars inserted into this.
    */
-  nsString& Insert(const nsString& aCopy,PRUint32 anOffset,PRInt32 aCount=-1);
+  void Insert(const nsString& aCopy,PRUint32 anOffset,PRInt32 aCount=-1);
 
   /**
    * Insert a given string into this string at
@@ -593,8 +585,8 @@ public:
    * @param   anOffset is insert pos in str 
    * @return  the number of chars inserted into this string
    */
-  nsString& Insert(const char* aChar,PRUint32 anOffset,PRInt32 aCount=-1) {InsertWithConversion(aChar, anOffset, aCount); return *this;}
-  nsString& Insert(const PRUnichar* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
+//nsString& Insert(const char* aChar,PRUint32 anOffset,PRInt32 aCount=-1) {InsertWithConversion(aChar, anOffset, aCount); return *this;}
+  void Insert(const PRUnichar* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
 
   /**
    * Insert a single char into this string at
@@ -605,7 +597,7 @@ public:
    * @return  the number of chars inserted into this string
    */
 //nsString& Insert(char aChar,PRUint32 anOffset)        {InsertWithConversion(aChar,anOffset); return *this;}
-  nsString& Insert(PRUnichar aChar,PRUint32 anOffset);
+  void Insert(PRUnichar aChar,PRUint32 anOffset);
 #endif
 
 
@@ -618,7 +610,7 @@ public:
    *  @param  aCount -- number of chars to be cut
    *  @return *this
    */
-  nsString& Cut(PRUint32 anOffset,PRInt32 aCount);
+  void Cut(PRUint32 anOffset,PRInt32 aCount);
 #endif
 
 
@@ -730,17 +722,17 @@ public:
   PRBool  EqualsIgnoreCase(/*FIX: const */nsIAtom *aAtom) const;
 
 #ifndef NEW_STRING_APIS
-  virtual PRInt32 Compare(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return CompareWithConversion(aString,aIgnoreCase,aCount);
-  }
+//virtual PRInt32 Compare(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return CompareWithConversion(aString,aIgnoreCase,aCount);
+//}
 
-  virtual PRInt32 Compare(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return CompareWithConversion(aString,aIgnoreCase,aCount);
-  }
+//virtual PRInt32 Compare(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return CompareWithConversion(aString,aIgnoreCase,aCount);
+//}
 
-  virtual PRInt32 Compare(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return CompareWithConversion(aString,aIgnoreCase,aCount);
-  }
+//virtual PRInt32 Compare(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return CompareWithConversion(aString,aIgnoreCase,aCount);
+//}
 
   virtual PRInt32 Compare(const nsStr &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
 
@@ -755,19 +747,19 @@ public:
    * @param  aCount  -- number of chars to be compared.
    * @return TRUE if equal
    */
-  PRBool  Equals(const nsString &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return EqualsWithConversion(aString,aIgnoreCase,aCount);
-  }
+//PRBool  Equals(const nsString &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return EqualsWithConversion(aString,aIgnoreCase,aCount);
+//}
 
-  PRBool  Equals(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return EqualsWithConversion(aString,aIgnoreCase,aCount);
-  }
+//PRBool  Equals(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return EqualsWithConversion(aString,aIgnoreCase,aCount);
+//}
 
-  PRBool  Equals(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return EqualsWithConversion(aString,aIgnoreCase,aCount);
-  }
+//PRBool  Equals(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return EqualsWithConversion(aString,aIgnoreCase,aCount);
+//}
 
-  PRBool  Equals(/*FIX: const */nsIAtom* anAtom,PRBool aIgnoreCase) const { return EqualsAtom(anAtom, aIgnoreCase); }
+//PRBool  Equals(/*FIX: const */nsIAtom* anAtom,PRBool aIgnoreCase) const { return EqualsAtom(anAtom, aIgnoreCase); }
   PRBool  Equals(const PRUnichar* s1, const PRUnichar* s2,PRBool aIgnoreCase=PR_FALSE) const;
   PRBool  Equals(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
 
@@ -779,8 +771,8 @@ public:
    * @return  TRUE or FALSE
    */
   PRBool  operator==(const nsString &aString) const;
-  PRBool  operator==(const nsStr &aString) const;
-  PRBool  operator==(const char *aString) const;
+//PRBool  operator==(const nsStr &aString) const;
+//PRBool  operator==(const char *aString) const;
   PRBool  operator==(const PRUnichar* aString) const;
 
   /**
@@ -789,8 +781,8 @@ public:
    * @return  TRUE 
    */
   PRBool  operator!=(const nsString &aString) const;
-  PRBool  operator!=(const nsStr &aString) const;
-  PRBool  operator!=(const char* aString) const;
+//PRBool  operator!=(const nsStr &aString) const;
+//PRBool  operator!=(const char* aString) const;
   PRBool  operator!=(const PRUnichar* aString) const;
 
   /**
@@ -799,8 +791,8 @@ public:
    * @return  TRUE or FALSE
    */
   PRBool  operator<(const nsString &aString) const;
-  PRBool  operator<(const nsStr &aString) const;
-  PRBool  operator<(const char* aString) const;
+//PRBool  operator<(const nsStr &aString) const;
+//PRBool  operator<(const char* aString) const;
   PRBool  operator<(const PRUnichar* aString) const;
 
   /**
@@ -809,8 +801,8 @@ public:
    * @return  TRUE or FALSE
    */
   PRBool  operator>(const nsString &aString) const;
-  PRBool  operator>(const nsStr &S) const;
-  PRBool  operator>(const char* aString) const;
+//PRBool  operator>(const nsStr &S) const;
+//PRBool  operator>(const char* aString) const;
   PRBool  operator>(const PRUnichar* aString) const;
 
   /**
@@ -819,8 +811,8 @@ public:
    * @return  TRUE or FALSE
    */
   PRBool  operator<=(const nsString &aString) const;
-  PRBool  operator<=(const nsStr &S) const;
-  PRBool  operator<=(const char* aString) const;
+//PRBool  operator<=(const nsStr &S) const;
+//PRBool  operator<=(const char* aString) const;
   PRBool  operator<=(const PRUnichar* aString) const;
 
   /**
@@ -829,8 +821,8 @@ public:
    * @return  TRUE or FALSE
    */
   PRBool  operator>=(const nsString &aString) const;
-  PRBool  operator>=(const nsStr &S) const;
-  PRBool  operator>=(const char* aString) const;
+//PRBool  operator>=(const nsStr &S) const;
+//PRBool  operator>=(const char* aString) const;
   PRBool  operator>=(const PRUnichar* aString) const;
 #endif // !defined(NEW_STRING_APIS)
 
@@ -908,8 +900,8 @@ public:
     nsAutoString(const CBufDescriptor& aBuffer);    
 
 #ifndef NEW_STRING_APIS
-    nsAutoString(const char* aCString,PRInt32 aLength=-1);
-    nsAutoString(const nsStr& aString);
+//  nsAutoString(const char* aCString,PRInt32 aLength=-1);
+//  nsAutoString(const nsStr& aString);
 #endif
 
 #ifdef AIX
@@ -922,8 +914,8 @@ public:
 #ifndef NEW_STRING_APIS
     nsAutoString& operator=(const nsStr& aString) {nsString::Assign(aString); return *this;}
     nsAutoString& operator=(const nsAutoString& aString) {nsString::Assign(aString); return *this;}
-    nsAutoString& operator=(const char* aCString) {nsString::Assign(aCString); return *this;}
-    nsAutoString& operator=(char aChar) {nsString::Assign(aChar); return *this;}
+//  nsAutoString& operator=(const char* aCString) {nsString::Assign(aCString); return *this;}
+//  nsAutoString& operator=(char aChar) {nsString::Assign(aChar); return *this;}
     nsAutoString& operator=(const PRUnichar* aBuffer) {nsString::Assign(aBuffer); return *this;}
     nsAutoString& operator=(PRUnichar aChar) {nsString::Assign(aChar); return *this;}
 #endif
diff --git a/mozilla/xpcom/string/obsolete/nsString.cpp b/mozilla/xpcom/string/obsolete/nsString.cpp
index ef07dc930f7..31ee0d55634 100644
--- a/mozilla/xpcom/string/obsolete/nsString.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString.cpp
@@ -85,7 +85,7 @@ nsCString::nsCString(const char* aCString,PRInt32 aLength) {
   Assign(aCString,aLength);
 }
 
-#ifndef NEW_STRING_APIS
+#if 0
 /**
  * This constructor accepts a unicode string
  * @update  gess 1/4/99
@@ -981,6 +981,7 @@ nsCString& nsCString::Append(const nsCString& aString,PRInt32 aCount) {
   return *this;
 }
 
+#if 0
 /**
  * append given string to this string; 
  * @update  gess 01/04/99
@@ -997,6 +998,7 @@ nsCString& nsCString::Append(const nsStr& aString,PRInt32 aCount) {
     StrAppend(*this,aString,0,aCount);
   return *this;
 }
+#endif
 
 /**
  * append given c-string to this string
@@ -1216,10 +1218,9 @@ void nsCString::do_InsertFromReadable( const nsAReadableCString& aReadable, PRUi
  *  @param  aCount -- number of chars to be copied from aCopy
  *  @return this
  */
-nsCString& nsCString::Insert(const nsCString& aString,PRUint32 anOffset,PRInt32 aCount) {
+void nsCString::Insert(const nsCString& aString,PRUint32 anOffset,PRInt32 aCount) {
 
   StrInsert(*this,anOffset,aString,0,aCount);
-  return *this;
 }
 
 /**
@@ -1231,7 +1232,7 @@ nsCString& nsCString::Insert(const nsCString& aString,PRUint32 anOffset,PRInt32
  * @param   aCounttells us how many chars to insert
  * @return  this
  */
-nsCString& nsCString::Insert(const char* aCString,PRUint32 anOffset,PRInt32 aCount){
+void nsCString::Insert(const char* aCString,PRUint32 anOffset,PRInt32 aCount){
   if(aCString){
     nsStr temp;
     nsStr::Initialize(temp,eOneByte);
@@ -1256,7 +1257,6 @@ nsCString& nsCString::Insert(const char* aCString,PRUint32 anOffset,PRInt32 aCou
       StrInsert(*this,anOffset,temp,0,aCount);
     }
   }
-  return *this;  
 }
 
 
@@ -1269,7 +1269,7 @@ nsCString& nsCString::Insert(const char* aCString,PRUint32 anOffset,PRInt32 aCou
  * @param   anOffset is insert pos in str 
  * @return  this
  */
-nsCString& nsCString::Insert(char aChar,PRUint32 anOffset){
+void nsCString::Insert(char aChar,PRUint32 anOffset){
   char theBuffer[2]={0,0};
   theBuffer[0]=aChar;
   nsStr temp;
@@ -1277,7 +1277,6 @@ nsCString& nsCString::Insert(char aChar,PRUint32 anOffset){
   temp.mStr=theBuffer;
   temp.mLength=1;
   StrInsert(*this,anOffset,temp,0,1);
-  return *this;
 }
 #endif
 
@@ -1292,11 +1291,10 @@ nsCString& nsCString::Insert(char aChar,PRUint32 anOffset){
  *  @return *this
  */
 #ifndef NEW_STRING_APIS
-nsCString& nsCString::Cut(PRUint32 anOffset, PRInt32 aCount) {
+void nsCString::Cut(PRUint32 anOffset, PRInt32 aCount) {
   if(0<aCount) {
     nsStr::Delete(*this,anOffset,aCount);
   }
-  return *this;
 }
 #endif
 
@@ -1623,27 +1621,27 @@ PRInt32 nsCString::Compare(const nsStr& aString,PRBool aIgnoreCase,PRInt32 aCoun
  */
 PRBool nsCString::operator==(const nsStr& S) const {return Equals(S);}      
 PRBool nsCString::operator==(const char* s) const {return Equals(s);}
-PRBool nsCString::operator==(const PRUnichar* s) const {return Equals(s);}
+//PRBool nsCString::operator==(const PRUnichar* s) const {return Equals(s);}
 
 PRBool nsCString::operator!=(const nsStr& S) const {return PRBool(Compare(S)!=0);}
-PRBool nsCString::operator!=(const char* s) const {return PRBool(Compare(s)!=0);}
-PRBool nsCString::operator!=(const PRUnichar* s) const {return PRBool(Compare(s)!=0);}
+PRBool nsCString::operator!=(const char* s) const {return PRBool(Compare(nsCAutoString(s))!=0);}
+//PRBool nsCString::operator!=(const PRUnichar* s) const {return PRBool(Compare(s)!=0);}
 
 PRBool nsCString::operator<(const nsStr& S) const {return PRBool(Compare(S)<0);}
-PRBool nsCString::operator<(const char* s) const {return PRBool(Compare(s)<0);}
-PRBool nsCString::operator<(const PRUnichar* s) const {return PRBool(Compare(s)<0);}
+PRBool nsCString::operator<(const char* s) const {return PRBool(Compare(nsCAutoString(s))<0);}
+//PRBool nsCString::operator<(const PRUnichar* s) const {return PRBool(Compare(s)<0);}
 
 PRBool nsCString::operator>(const nsStr& S) const {return PRBool(Compare(S)>0);}
-PRBool nsCString::operator>(const char* s) const {return PRBool(Compare(s)>0);}
-PRBool nsCString::operator>(const PRUnichar* s) const {return PRBool(Compare(s)>0);}
+PRBool nsCString::operator>(const char* s) const {return PRBool(Compare(nsCAutoString(s))>0);}
+//PRBool nsCString::operator>(const PRUnichar* s) const {return PRBool(Compare(s)>0);}
 
 PRBool nsCString::operator<=(const nsStr& S) const {return PRBool(Compare(S)<=0);}
-PRBool nsCString::operator<=(const char* s) const {return PRBool(Compare(s)<=0);}
-PRBool nsCString::operator<=(const PRUnichar* s) const {return PRBool(Compare(s)<=0);}
+PRBool nsCString::operator<=(const char* s) const {return PRBool(Compare(nsCAutoString(s))<=0);}
+//PRBool nsCString::operator<=(const PRUnichar* s) const {return PRBool(Compare(s)<=0);}
 
 PRBool nsCString::operator>=(const nsStr& S) const {return PRBool(Compare(S)>=0);}
-PRBool nsCString::operator>=(const char* s) const {return PRBool(Compare(s)>=0);}
-PRBool nsCString::operator>=(const PRUnichar* s) const {return PRBool(Compare(s)>=0);}
+PRBool nsCString::operator>=(const char* s) const {return PRBool(Compare(nsCAutoString(s))>=0);}
+//PRBool nsCString::operator>=(const PRUnichar* s) const {return PRBool(Compare(s)>=0);}
 #endif
 
 #ifndef NEW_STRING_APIS
@@ -1911,7 +1909,7 @@ nsCAutoString::nsCAutoString(const CBufDescriptor& aBuffer) : nsCString() {
     AddNullTerminator(*this); //this isn't really needed, but it guarantees that folks don't pass string constants.
 }
 
-#ifndef NEW_STRING_APIS
+#if 0
 /**
  * Copy construct from uni-string
  * @param   aString is a ptr to a unistr
diff --git a/mozilla/xpcom/string/obsolete/nsString.h b/mozilla/xpcom/string/obsolete/nsString.h
index df7da3cbb42..5b3127043ba 100644
--- a/mozilla/xpcom/string/obsolete/nsString.h
+++ b/mozilla/xpcom/string/obsolete/nsString.h
@@ -113,13 +113,13 @@ public:
    * This constructor accepts a unichar string
    * @param   aCString is a ptr to a 2-byte cstr
    */
-  nsCString(const PRUnichar* aString,PRInt32 aLength=-1);
+//nsCString(const PRUnichar* aString,PRInt32 aLength=-1);
 
   /**
    * This is a copy constructor that accepts an nsStr
    * @param   reference to another nsCString
    */
-  nsCString(const nsStr&);
+//nsCString(const nsStr&);
 #endif
 
   /**
@@ -414,27 +414,20 @@ public:
   nsCString& Assign(char aChar);
 
   nsCString& Assign(const nsStr& aString,PRInt32 aCount=-1);
-  nsCString& Assign(const PRUnichar* aString,PRInt32 aCount=-1) { AssignWithConversion(aString, aCount); return *this; }
-  nsCString& Assign(PRUnichar aChar)                            { AssignWithConversion(aChar); return *this; }
-
-  /**
-   * Functionally equivalent to assign or operator=
-   * 
-   */
-  nsCString& SetString(const char* aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
-  nsCString& SetString(const nsStr& aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+//nsCString& Assign(const PRUnichar* aString,PRInt32 aCount=-1) { AssignWithConversion(aString, aCount); return *this; }
+//nsCString& Assign(PRUnichar aChar)                            { AssignWithConversion(aChar); return *this; }
 
   /**
    * here come a bunch of assignment operators...
    * @param   aString: string to be added to this
    * @return  this
    */
-  nsCString& operator=(PRUnichar aChar)           {AssignWithConversion(aChar); return *this;}
+//nsCString& operator=(PRUnichar aChar)           {AssignWithConversion(aChar); return *this;}
   nsCString& operator=(char aChar)                {return Assign(aChar);}
-  nsCString& operator=(const PRUnichar* aString)  {AssignWithConversion(aString); return *this;}
+//nsCString& operator=(const PRUnichar* aString)  {AssignWithConversion(aString); return *this;}
 
   nsCString& operator=(const nsCString& aString)  {return Assign(aString);}
-  nsCString& operator=(const nsStr& aString)      {return Assign(aString);}
+//nsCString& operator=(const nsStr& aString)      {return Assign(aString);}
   nsCString& operator=(const char* aCString)      {return Assign(aCString);}
 
     // Yes, I know this makes assignment from a |nsSubsumeString| not do the special thing
@@ -468,15 +461,15 @@ public:
 #endif
 
 #ifndef NEW_STRING_APIS
-  nsCString& Append(const nsStr& aString,PRInt32 aCount=-1);
+//nsCString& Append(const nsStr& aString,PRInt32 aCount=-1);
   nsCString& Append(const nsCString& aString,PRInt32 aCount);
   nsCString& Append(const nsCString& aString)           {return Append(aString,(PRInt32)aString.mLength);}
   nsCString& Append(const char* aString,PRInt32 aCount=-1);
   nsCString& Append(char aChar);
 
-  nsCString& Append(PRUnichar aChar)                    {AppendWithConversion(aChar); return *this;}
-  nsCString& Append(PRInt32 aInteger,PRInt32 aRadix=10) {AppendInt(aInteger,aRadix); return *this;}
-  nsCString& Append(float aFloat)                       {AppendFloat(aFloat); return *this;}
+//nsCString& Append(PRUnichar aChar)                    {AppendWithConversion(aChar); return *this;}
+//nsCString& Append(PRInt32 aInteger,PRInt32 aRadix=10) {AppendInt(aInteger,aRadix); return *this;}
+//nsCString& Append(float aFloat)                       {AppendFloat(aFloat); return *this;}
 
   /**
    * Here's a bunch of methods that append varying types...
@@ -486,9 +479,9 @@ public:
   nsCString& operator+=(const nsCString& aString) {return Append(aString,(PRInt32)aString.mLength);}
   nsCString& operator+=(const char* aCString)     {return Append(aCString);}
 
-  nsCString& operator+=(const PRUnichar aChar)    {return Append(aChar);}
+//nsCString& operator+=(const PRUnichar aChar)    {return Append(aChar);}
   nsCString& operator+=(const char aChar)         {return Append(aChar);}
-  nsCString& operator+=(const int anInt)          {return Append(anInt,10);}
+//nsCString& operator+=(const int anInt)          {return Append(anInt,10);}
 #endif
              
   /*
@@ -544,7 +537,7 @@ public:
    *
    *  @return number of chars inserted into this.
    */
-  nsCString& Insert(const nsCString& aCopy,PRUint32 anOffset,PRInt32 aCount=-1);
+  void Insert(const nsCString& aCopy,PRUint32 anOffset,PRInt32 aCount=-1);
 
   /**
    * Insert a given string into this string at
@@ -554,7 +547,7 @@ public:
    * @param   anOffset is insert pos in str 
    * @return  the number of chars inserted into this string
    */
-  nsCString& Insert(const char* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
+  void Insert(const char* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
 
   /**
    * Insert a single char into this string at
@@ -564,8 +557,8 @@ public:
    * @param   anOffset is insert pos in str 
    * @return  the number of chars inserted into this string
    */
-  nsCString& Insert(PRUnichar aChar,PRUint32 anOffset)  {InsertWithConversion(aChar,anOffset); return *this;}
-  nsCString& Insert(char aChar,PRUint32 anOffset);
+//void Insert(PRUnichar aChar,PRUint32 anOffset)  {InsertWithConversion(aChar,anOffset);}
+  void Insert(char aChar,PRUint32 anOffset);
 #endif
 
   /*
@@ -577,7 +570,7 @@ public:
    *  @return *this
    */
 #ifndef NEW_STRING_APIS
-  nsCString& Cut(PRUint32 anOffset,PRInt32 aCount);
+  void Cut(PRUint32 anOffset,PRInt32 aCount);
 #endif
 
 
@@ -680,12 +673,12 @@ public:
   PRBool  EqualsIgnoreCase(const PRUnichar* aString,PRInt32 aCount=-1) const;
 
 #ifndef NEW_STRING_APIS
-  virtual PRInt32 Compare(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return CompareWithConversion(aString,aIgnoreCase,aCount);
-  }
-  virtual PRInt32 Compare(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return CompareWithConversion(aString,aIgnoreCase,aCount);
-  }
+//virtual PRInt32 Compare(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return CompareWithConversion(aString,aIgnoreCase,aCount);
+//}
+//virtual PRInt32 Compare(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return CompareWithConversion(aString,aIgnoreCase,aCount);
+//}
 
   virtual PRInt32 Compare(const nsStr &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
 
@@ -707,9 +700,9 @@ public:
     return EqualsWithConversion(aString,aIgnoreCase,aCount);
   }
 
-  PRBool  Equals(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return EqualsWithConversion(aString,aIgnoreCase,aCount);
-  }
+//PRBool  Equals(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return EqualsWithConversion(aString,aIgnoreCase,aCount);
+//}
 
   PRBool  Equals(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
 
@@ -722,7 +715,7 @@ public:
    */
   PRBool  operator==(const nsStr &aString) const;
   PRBool  operator==(const char* aString) const;
-  PRBool  operator==(const PRUnichar* aString) const;
+//PRBool  operator==(const PRUnichar* aString) const;
 
   /**
    * These methods perform a !compare of a given string type to this 
@@ -731,7 +724,7 @@ public:
    */
   PRBool  operator!=(const nsStr &aString) const;
   PRBool  operator!=(const char* aString) const;
-  PRBool  operator!=(const PRUnichar* aString) const;
+//PRBool  operator!=(const PRUnichar* aString) const;
 
   /**
    * These methods test if a given string is < than this
@@ -740,7 +733,7 @@ public:
    */
   PRBool  operator<(const nsStr &aString) const;
   PRBool  operator<(const char* aString) const;
-  PRBool  operator<(const PRUnichar* aString) const;
+//PRBool  operator<(const PRUnichar* aString) const;
 
   /**
    * These methods test if a given string is > than this
@@ -749,7 +742,7 @@ public:
    */
   PRBool  operator>(const nsStr &S) const;
   PRBool  operator>(const char* aString) const;
-  PRBool  operator>(const PRUnichar* aString) const;
+//PRBool  operator>(const PRUnichar* aString) const;
 
   /**
    * These methods test if a given string is <= than this
@@ -758,7 +751,7 @@ public:
    */
   PRBool  operator<=(const nsStr &S) const;
   PRBool  operator<=(const char* aString) const;
-  PRBool  operator<=(const PRUnichar* aString) const;
+//PRBool  operator<=(const PRUnichar* aString) const;
 
   /**
    * These methods test if a given string is >= than this
@@ -767,7 +760,7 @@ public:
    */
   PRBool  operator>=(const nsStr &S) const;
   PRBool  operator>=(const char* aString) const;
-  PRBool  operator>=(const PRUnichar* aString) const;
+//PRBool  operator>=(const PRUnichar* aString) const;
 #endif // !defined(NEW_STRING_APIS)
 
   void    DebugDump(void) const;
@@ -815,9 +808,9 @@ public:
     nsCAutoString(const CBufDescriptor& aBuffer);
 
 #ifndef NEW_STRING_APIS
-    nsCAutoString(const PRUnichar* aString,PRInt32 aLength=-1);
-    nsCAutoString(const nsStr& aString);
-    nsCAutoString(PRUnichar aChar);
+//  nsCAutoString(const PRUnichar* aString,PRInt32 aLength=-1);
+//  nsCAutoString(const nsStr& aString);
+//  nsCAutoString(PRUnichar aChar);
 #endif
 
 #ifdef AIX
@@ -831,8 +824,8 @@ public:
     nsCAutoString& operator=(const nsCAutoString& aString) {nsCString::Assign(aString); return *this;}
     nsCAutoString& operator=(const nsCString& aString) {nsCString::Assign(aString); return *this;}
     nsCAutoString& operator=(const char* aCString) {nsCString::Assign(aCString); return *this;}
-    nsCAutoString& operator=(const PRUnichar* aString) {nsCString::Assign(aString); return *this;}
-    nsCAutoString& operator=(PRUnichar aChar) {nsCString::Assign(aChar); return *this;}
+//  nsCAutoString& operator=(const PRUnichar* aString) {nsCString::Assign(aString); return *this;}
+//  nsCAutoString& operator=(PRUnichar aChar) {nsCString::Assign(aChar); return *this;}
     nsCAutoString& operator=(char aChar) {nsCString::Assign(aChar); return *this;}
 #endif
 
diff --git a/mozilla/xpcom/string/obsolete/nsString2.cpp b/mozilla/xpcom/string/obsolete/nsString2.cpp
index 954f0f8d008..13692a61a71 100644
--- a/mozilla/xpcom/string/obsolete/nsString2.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString2.cpp
@@ -66,7 +66,7 @@ nsString::nsString() {
   Initialize(*this,eTwoByte);
 }
 
-#ifndef NEW_STRING_APIS
+#if 0
 /**
  * This constructor accepts an ascii string
  * @update  gess 1/4/99
@@ -97,7 +97,7 @@ nsString::nsString(const PRUnichar* aString,PRInt32 aCount) {
   Assign(aString,aCount);
 }
 
-#ifndef NEW_STRING_APIS
+#if 0
 /**
  * This constructor works for all other nsSTr derivatives
  * @update  gess 1/4/99
@@ -336,7 +336,7 @@ nsSubsumeStr nsString::operator+(const nsString& aString){
  */
 nsSubsumeStr nsString::operator+(const char* aCString) {
   nsString temp(*this);
-  temp.Append(aCString); 
+  temp.AppendWithConversion(aCString); 
   return nsSubsumeStr(temp);
 }
 
@@ -1207,6 +1207,7 @@ void nsString::AppendFloat(double aFloat){
  * @param   aString : string to be appended to this
  * @return  this
  */
+#if 0
 nsString& nsString::Append(const nsStr& aString,PRInt32 aCount) {
 
   if(aCount<0)
@@ -1217,7 +1218,7 @@ nsString& nsString::Append(const nsStr& aString,PRInt32 aCount) {
     StrAppend(*this,aString,0,aCount);
   return *this;
 }
-
+#endif
 
 /**
  * append given string to this string
@@ -1390,9 +1391,8 @@ void nsString::InsertWithConversion(const char* aCString,PRUint32 anOffset,PRInt
  *  @param  aCount -- number of chars to be copied from aCopy
  *  @return this
  */
-nsString& nsString::Insert(const nsString& aCopy,PRUint32 anOffset,PRInt32 aCount) {
+void nsString::Insert(const nsString& aCopy,PRUint32 anOffset,PRInt32 aCount) {
   StrInsert(*this,anOffset,aCopy,0,aCount);
-  return *this;
 }
 
 
@@ -1407,7 +1407,7 @@ nsString& nsString::Insert(const nsString& aCopy,PRUint32 anOffset,PRInt32 aCoun
  *
  * @return  this
  */
-nsString& nsString::Insert(const PRUnichar* aString,PRUint32 anOffset,PRInt32 aCount){
+void nsString::Insert(const PRUnichar* aString,PRUint32 anOffset,PRInt32 aCount){
   if(aString && aCount){
     nsStr temp;
     nsStr::Initialize(temp,eTwoByte);
@@ -1432,7 +1432,6 @@ nsString& nsString::Insert(const PRUnichar* aString,PRUint32 anOffset,PRInt32 aC
       StrInsert(*this,anOffset,temp,0,aCount);
     }
   }
-  return *this;  
 }
 
 
@@ -1445,7 +1444,7 @@ nsString& nsString::Insert(const PRUnichar* aString,PRUint32 anOffset,PRInt32 aC
  * @param   anOffset is insert pos in str 
  * @return  this
  */
-nsString& nsString::Insert(PRUnichar aChar,PRUint32 anOffset){
+void nsString::Insert(PRUnichar aChar,PRUint32 anOffset){
   PRUnichar theBuffer[2]={0,0};
   theBuffer[0]=aChar;
   nsStr temp;
@@ -1453,7 +1452,6 @@ nsString& nsString::Insert(PRUnichar aChar,PRUint32 anOffset){
   temp.mUStr=theBuffer;
   temp.mLength=1;
   StrInsert(*this,anOffset,temp,0,1);
-  return *this;
 }
 #endif
 
@@ -1467,11 +1465,10 @@ nsString& nsString::Insert(PRUnichar aChar,PRUint32 anOffset){
  *  @return *this
  */
 #ifndef NEW_STRING_APIS
-nsString& nsString::Cut(PRUint32 anOffset, PRInt32 aCount) {
+void nsString::Cut(PRUint32 anOffset, PRInt32 aCount) {
   if(0<aCount) {
     nsStr::Delete(*this,anOffset,aCount);
   }
-  return *this;
 }
 #endif
 
@@ -1877,34 +1874,34 @@ PRInt32 nsString::Compare(const nsStr& aString,PRBool aIgnoreCase,PRInt32 aCount
  */
 
 PRBool nsString::operator==(const nsString& S) const {return Equals(S);}      
-PRBool nsString::operator==(const nsStr& S) const {return Equals(S);}      
-PRBool nsString::operator==(const char* s) const {return Equals(s);}
-PRBool nsString::operator==(const PRUnichar* s) const {return Equals(s);}
+//PRBool nsString::operator==(const nsStr& S) const {return Equals(S);}      
+//PRBool nsString::operator==(const char* s) const {return Equals(s);}
+PRBool nsString::operator==(const PRUnichar* s) const {return Equals(nsAutoString(s));}
 
 PRBool nsString::operator!=(const nsString& S) const {return PRBool(Compare(S)!=0);}
-PRBool nsString::operator!=(const nsStr& S) const {return PRBool(Compare(S)!=0);}
-PRBool nsString::operator!=(const char* s) const {return PRBool(Compare(s)!=0);}
-PRBool nsString::operator!=(const PRUnichar* s) const {return PRBool(Compare(s)!=0);}
+//PRBool nsString::operator!=(const nsStr& S) const {return PRBool(Compare(S)!=0);}
+//PRBool nsString::operator!=(const char* s) const {return PRBool(Compare(s)!=0);}
+PRBool nsString::operator!=(const PRUnichar* s) const {return PRBool(Compare(nsAutoString(s))!=0);}
 
 PRBool nsString::operator<(const nsString& S) const {return PRBool(Compare(S)<0);}
-PRBool nsString::operator<(const nsStr& S) const {return PRBool(Compare(S)<0);}
-PRBool nsString::operator<(const char* s) const {return PRBool(Compare(s)<0);}
-PRBool nsString::operator<(const PRUnichar* s) const {return PRBool(Compare(s)<0);}
+//PRBool nsString::operator<(const nsStr& S) const {return PRBool(Compare(S)<0);}
+//PRBool nsString::operator<(const char* s) const {return PRBool(Compare(s)<0);}
+PRBool nsString::operator<(const PRUnichar* s) const {return PRBool(Compare(nsAutoString(s))<0);}
 
 PRBool nsString::operator>(const nsString& S) const {return PRBool(Compare(S)>0);}
-PRBool nsString::operator>(const nsStr& S) const {return PRBool(Compare(S)>0);}
-PRBool nsString::operator>(const char* s) const {return PRBool(Compare(s)>0);}
-PRBool nsString::operator>(const PRUnichar* s) const {return PRBool(Compare(s)>0);}
+//PRBool nsString::operator>(const nsStr& S) const {return PRBool(Compare(S)>0);}
+//PRBool nsString::operator>(const char* s) const {return PRBool(Compare(s)>0);}
+PRBool nsString::operator>(const PRUnichar* s) const {return PRBool(Compare(nsAutoString(s))>0);}
 
 PRBool nsString::operator<=(const nsString& S) const {return PRBool(Compare(S)<=0);}
-PRBool nsString::operator<=(const nsStr& S) const {return PRBool(Compare(S)<=0);}
-PRBool nsString::operator<=(const char* s) const {return PRBool(Compare(s)<=0);}
-PRBool nsString::operator<=(const PRUnichar* s) const {return PRBool(Compare(s)<=0);}
+//PRBool nsString::operator<=(const nsStr& S) const {return PRBool(Compare(S)<=0);}
+//PRBool nsString::operator<=(const char* s) const {return PRBool(Compare(s)<=0);}
+PRBool nsString::operator<=(const PRUnichar* s) const {return PRBool(Compare(nsAutoString(s))<=0);}
 
 PRBool nsString::operator>=(const nsString& S) const {return PRBool(Compare(S)>=0);}
-PRBool nsString::operator>=(const nsStr& S) const {return PRBool(Compare(S)>=0);}
-PRBool nsString::operator>=(const char* s) const {return PRBool(Compare(s)>=0);}
-PRBool nsString::operator>=(const PRUnichar* s) const {return PRBool(Compare(s)>=0);}
+//PRBool nsString::operator>=(const nsStr& S) const {return PRBool(Compare(S)>=0);}
+//PRBool nsString::operator>=(const char* s) const {return PRBool(Compare(s)>=0);}
+PRBool nsString::operator>=(const PRUnichar* s) const {return PRBool(Compare(nsAutoString(s))>=0);}
 #endif // !defined(NEW_STRING_APIS)
 
 PRBool nsString::EqualsIgnoreCase(const nsString& aString) const {
@@ -2345,7 +2342,7 @@ NS_ConvertASCIItoUCS2::NS_ConvertASCIItoUCS2( const nsCString& )
 #endif
 #endif
 
-#ifndef NEW_STRING_APIS
+#if 0
 /**
  * Copy construct from ascii c-string
  * @param   aCString is a ptr to a 1-byte cstr
diff --git a/mozilla/xpcom/string/obsolete/nsString2.h b/mozilla/xpcom/string/obsolete/nsString2.h
index e586a9f0d8b..fc71b6ed2ea 100644
--- a/mozilla/xpcom/string/obsolete/nsString2.h
+++ b/mozilla/xpcom/string/obsolete/nsString2.h
@@ -110,13 +110,13 @@ public:
    * This constructor accepts an isolatin string
    * @param   aCString is a ptr to a 1-byte cstr
    */
-  nsString(const char* aCString,PRInt32 aCount=-1);
+//nsString(const char* aCString,PRInt32 aCount=-1);
 
   /**
    * This is a copy constructor that accepts an nsStr
    * @param   reference to another nsString
    */
-  nsString(const nsStr&);
+//nsString(const nsStr&);
 #endif
 
 
@@ -450,16 +450,8 @@ public:
   nsString& Assign(PRUnichar aChar);
 
   nsString& Assign(const nsStr& aString,PRInt32 aCount=-1);
-  nsString& Assign(const char* aString,PRInt32 aCount=-1)       { AssignWithConversion(aString, aCount); return *this; }
-  nsString& Assign(char aChar)                                  { AssignWithConversion(aChar); return *this; }
-
-  /**
-   * Functionally equivalent to assign or operator=
-   * 
-   */
-  nsString& SetString(const char* aString,PRInt32 aLength=-1)       {AssignWithConversion(aString, aLength); return *this;}
-  nsString& SetString(const nsString& aString,PRInt32 aLength=-1)   {return Assign(aString, aLength);}
-  nsString& SetString(const PRUnichar* aString,PRInt32 aLength=-1)  {return Assign(aString, aLength);}
+//nsString& Assign(const char* aString,PRInt32 aCount=-1)       { AssignWithConversion(aString, aCount); return *this; }
+//nsString& Assign(char aChar)                                  { AssignWithConversion(aChar); return *this; }
 
   /**
    * here come a bunch of assignment operators...
@@ -467,11 +459,11 @@ public:
    * @return  this
    */
   nsString& operator=(PRUnichar aChar)          {Assign(aChar); return *this;}
-  nsString& operator=(char aChar)               {AssignWithConversion(aChar); return *this;}
-  nsString& operator=(const char* aCString)     {AssignWithConversion(aCString); return *this;}
+//nsString& operator=(char aChar)               {AssignWithConversion(aChar); return *this;}
+//nsString& operator=(const char* aCString)     {AssignWithConversion(aCString); return *this;}
 
   nsString& operator=(const nsString& aString)  {return Assign(aString);}
-  nsString& operator=(const nsStr& aString)     {return Assign(aString);}
+//nsString& operator=(const nsStr& aString)     {return Assign(aString);}
   nsString& operator=(const PRUnichar* aString) {return Assign(aString);}
 
     // Yes, I know this makes assignment from a |nsSubsumeString| not do the special thing
@@ -506,30 +498,30 @@ public:
    *  NOTE:    IFF you pass -1 as aCount, then your buffer must be null terminated.
    *  @return  number of chars copied
    */
-  nsString& Append(const nsStr& aString,PRInt32 aCount);
-  nsString& Append(const nsStr& aString)                    {return Append(aString,(PRInt32)aString.mLength);}
+//nsString& Append(const nsStr& aString,PRInt32 aCount);
+//nsString& Append(const nsStr& aString)                    {return Append(aString,(PRInt32)aString.mLength);}
   nsString& Append(const nsString& aString,PRInt32 aCount);
   nsString& Append(const nsString& aString)                 {return Append(aString,(PRInt32)aString.mLength);}
  
   nsString& Append(const PRUnichar* aString,PRInt32 aCount=-1);
   nsString& Append(PRUnichar aChar);
 
-  nsString& Append(const char* aString,PRInt32 aCount=-1)   { AppendWithConversion(aString,aCount); return *this; }
-  nsString& Append(char aChar)                              { AppendWithConversion(aChar); return *this; }
-  nsString& Append(PRInt32 aInteger,PRInt32 aRadix=10)      { AppendInt(aInteger,aRadix); return *this; }
-  nsString& Append(float aFloat)                            { AppendFloat(aFloat); return *this; }
+//nsString& Append(const char* aString,PRInt32 aCount=-1)   { AppendWithConversion(aString,aCount); return *this; }
+//nsString& Append(char aChar)                              { AppendWithConversion(aChar); return *this; }
+//nsString& Append(PRInt32 aInteger,PRInt32 aRadix=10)      { AppendInt(aInteger,aRadix); return *this; }
+//nsString& Append(float aFloat)                            { AppendFloat(aFloat); return *this; }
 
   /**
    * Here's a bunch of methods that append varying types...
    * @param   various...
    * @return  this
    */
-  nsString& operator+=(const char* aCString)        {return Append(aCString);}
-  nsString& operator+=(const char aChar)            {return Append((PRUnichar) (unsigned char)aChar);}
+//nsString& operator+=(const char* aCString)        {return Append(aCString);}
+//nsString& operator+=(const char aChar)            {return Append((PRUnichar) (unsigned char)aChar);}
   nsString& operator+=(const PRUnichar aChar)       {return Append(aChar);}
-  nsString& operator+=(const int anInt)             {return Append(anInt,10);}
+//nsString& operator+=(const int anInt)             {return Append(anInt,10);}
 
-  nsString& operator+=(const nsStr& aString)        {return Append(aString,(PRInt32)aString.mLength);}
+//nsString& operator+=(const nsStr& aString)        {return Append(aString,(PRInt32)aString.mLength);}
   nsString& operator+=(const nsString& aString)     {return Append(aString,(PRInt32)aString.mLength);}
   nsString& operator+=(const PRUnichar* aUCString)  {return Append(aUCString);}
 #endif
@@ -583,7 +575,7 @@ public:
    *
    *  @return number of chars inserted into this.
    */
-  nsString& Insert(const nsString& aCopy,PRUint32 anOffset,PRInt32 aCount=-1);
+  void Insert(const nsString& aCopy,PRUint32 anOffset,PRInt32 aCount=-1);
 
   /**
    * Insert a given string into this string at
@@ -593,8 +585,8 @@ public:
    * @param   anOffset is insert pos in str 
    * @return  the number of chars inserted into this string
    */
-  nsString& Insert(const char* aChar,PRUint32 anOffset,PRInt32 aCount=-1) {InsertWithConversion(aChar, anOffset, aCount); return *this;}
-  nsString& Insert(const PRUnichar* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
+//nsString& Insert(const char* aChar,PRUint32 anOffset,PRInt32 aCount=-1) {InsertWithConversion(aChar, anOffset, aCount); return *this;}
+  void Insert(const PRUnichar* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
 
   /**
    * Insert a single char into this string at
@@ -605,7 +597,7 @@ public:
    * @return  the number of chars inserted into this string
    */
 //nsString& Insert(char aChar,PRUint32 anOffset)        {InsertWithConversion(aChar,anOffset); return *this;}
-  nsString& Insert(PRUnichar aChar,PRUint32 anOffset);
+  void Insert(PRUnichar aChar,PRUint32 anOffset);
 #endif
 
 
@@ -618,7 +610,7 @@ public:
    *  @param  aCount -- number of chars to be cut
    *  @return *this
    */
-  nsString& Cut(PRUint32 anOffset,PRInt32 aCount);
+  void Cut(PRUint32 anOffset,PRInt32 aCount);
 #endif
 
 
@@ -730,17 +722,17 @@ public:
   PRBool  EqualsIgnoreCase(/*FIX: const */nsIAtom *aAtom) const;
 
 #ifndef NEW_STRING_APIS
-  virtual PRInt32 Compare(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return CompareWithConversion(aString,aIgnoreCase,aCount);
-  }
+//virtual PRInt32 Compare(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return CompareWithConversion(aString,aIgnoreCase,aCount);
+//}
 
-  virtual PRInt32 Compare(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return CompareWithConversion(aString,aIgnoreCase,aCount);
-  }
+//virtual PRInt32 Compare(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return CompareWithConversion(aString,aIgnoreCase,aCount);
+//}
 
-  virtual PRInt32 Compare(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return CompareWithConversion(aString,aIgnoreCase,aCount);
-  }
+//virtual PRInt32 Compare(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return CompareWithConversion(aString,aIgnoreCase,aCount);
+//}
 
   virtual PRInt32 Compare(const nsStr &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
 
@@ -755,19 +747,19 @@ public:
    * @param  aCount  -- number of chars to be compared.
    * @return TRUE if equal
    */
-  PRBool  Equals(const nsString &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return EqualsWithConversion(aString,aIgnoreCase,aCount);
-  }
+//PRBool  Equals(const nsString &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return EqualsWithConversion(aString,aIgnoreCase,aCount);
+//}
 
-  PRBool  Equals(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return EqualsWithConversion(aString,aIgnoreCase,aCount);
-  }
+//PRBool  Equals(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return EqualsWithConversion(aString,aIgnoreCase,aCount);
+//}
 
-  PRBool  Equals(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
-    return EqualsWithConversion(aString,aIgnoreCase,aCount);
-  }
+//PRBool  Equals(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const {
+//  return EqualsWithConversion(aString,aIgnoreCase,aCount);
+//}
 
-  PRBool  Equals(/*FIX: const */nsIAtom* anAtom,PRBool aIgnoreCase) const { return EqualsAtom(anAtom, aIgnoreCase); }
+//PRBool  Equals(/*FIX: const */nsIAtom* anAtom,PRBool aIgnoreCase) const { return EqualsAtom(anAtom, aIgnoreCase); }
   PRBool  Equals(const PRUnichar* s1, const PRUnichar* s2,PRBool aIgnoreCase=PR_FALSE) const;
   PRBool  Equals(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
 
@@ -779,8 +771,8 @@ public:
    * @return  TRUE or FALSE
    */
   PRBool  operator==(const nsString &aString) const;
-  PRBool  operator==(const nsStr &aString) const;
-  PRBool  operator==(const char *aString) const;
+//PRBool  operator==(const nsStr &aString) const;
+//PRBool  operator==(const char *aString) const;
   PRBool  operator==(const PRUnichar* aString) const;
 
   /**
@@ -789,8 +781,8 @@ public:
    * @return  TRUE 
    */
   PRBool  operator!=(const nsString &aString) const;
-  PRBool  operator!=(const nsStr &aString) const;
-  PRBool  operator!=(const char* aString) const;
+//PRBool  operator!=(const nsStr &aString) const;
+//PRBool  operator!=(const char* aString) const;
   PRBool  operator!=(const PRUnichar* aString) const;
 
   /**
@@ -799,8 +791,8 @@ public:
    * @return  TRUE or FALSE
    */
   PRBool  operator<(const nsString &aString) const;
-  PRBool  operator<(const nsStr &aString) const;
-  PRBool  operator<(const char* aString) const;
+//PRBool  operator<(const nsStr &aString) const;
+//PRBool  operator<(const char* aString) const;
   PRBool  operator<(const PRUnichar* aString) const;
 
   /**
@@ -809,8 +801,8 @@ public:
    * @return  TRUE or FALSE
    */
   PRBool  operator>(const nsString &aString) const;
-  PRBool  operator>(const nsStr &S) const;
-  PRBool  operator>(const char* aString) const;
+//PRBool  operator>(const nsStr &S) const;
+//PRBool  operator>(const char* aString) const;
   PRBool  operator>(const PRUnichar* aString) const;
 
   /**
@@ -819,8 +811,8 @@ public:
    * @return  TRUE or FALSE
    */
   PRBool  operator<=(const nsString &aString) const;
-  PRBool  operator<=(const nsStr &S) const;
-  PRBool  operator<=(const char* aString) const;
+//PRBool  operator<=(const nsStr &S) const;
+//PRBool  operator<=(const char* aString) const;
   PRBool  operator<=(const PRUnichar* aString) const;
 
   /**
@@ -829,8 +821,8 @@ public:
    * @return  TRUE or FALSE
    */
   PRBool  operator>=(const nsString &aString) const;
-  PRBool  operator>=(const nsStr &S) const;
-  PRBool  operator>=(const char* aString) const;
+//PRBool  operator>=(const nsStr &S) const;
+//PRBool  operator>=(const char* aString) const;
   PRBool  operator>=(const PRUnichar* aString) const;
 #endif // !defined(NEW_STRING_APIS)
 
@@ -908,8 +900,8 @@ public:
     nsAutoString(const CBufDescriptor& aBuffer);    
 
 #ifndef NEW_STRING_APIS
-    nsAutoString(const char* aCString,PRInt32 aLength=-1);
-    nsAutoString(const nsStr& aString);
+//  nsAutoString(const char* aCString,PRInt32 aLength=-1);
+//  nsAutoString(const nsStr& aString);
 #endif
 
 #ifdef AIX
@@ -922,8 +914,8 @@ public:
 #ifndef NEW_STRING_APIS
     nsAutoString& operator=(const nsStr& aString) {nsString::Assign(aString); return *this;}
     nsAutoString& operator=(const nsAutoString& aString) {nsString::Assign(aString); return *this;}
-    nsAutoString& operator=(const char* aCString) {nsString::Assign(aCString); return *this;}
-    nsAutoString& operator=(char aChar) {nsString::Assign(aChar); return *this;}
+//  nsAutoString& operator=(const char* aCString) {nsString::Assign(aCString); return *this;}
+//  nsAutoString& operator=(char aChar) {nsString::Assign(aChar); return *this;}
     nsAutoString& operator=(const PRUnichar* aBuffer) {nsString::Assign(aBuffer); return *this;}
     nsAutoString& operator=(PRUnichar aChar) {nsString::Assign(aChar); return *this;}
 #endif