From 181154f76c2c3ab0021e4dca48eca1461fea58e4 Mon Sep 17 00:00:00 2001
From: "scc%netscape.com"
 <scc%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 21 Apr 2000 06:59:14 +0000
Subject: [PATCH] there were a bunch of routines that returned references to
 this and were abused as much as they were used correctly.  now they return
 |void|

git-svn-id: svn://10.0.0.236/trunk@66667 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/string/obsolete/nsString.cpp        | 41 +++++++++---------
 mozilla/string/obsolete/nsString.h          | 22 +++++-----
 mozilla/string/obsolete/nsString2.cpp       | 46 ++++++++++-----------
 mozilla/string/obsolete/nsString2.h         | 26 ++++++------
 mozilla/xpcom/ds/nsString.cpp               | 41 +++++++++---------
 mozilla/xpcom/ds/nsString.h                 | 22 +++++-----
 mozilla/xpcom/ds/nsString2.cpp              | 46 ++++++++++-----------
 mozilla/xpcom/ds/nsString2.h                | 26 ++++++------
 mozilla/xpcom/string/obsolete/nsString.cpp  | 41 +++++++++---------
 mozilla/xpcom/string/obsolete/nsString.h    | 22 +++++-----
 mozilla/xpcom/string/obsolete/nsString2.cpp | 46 ++++++++++-----------
 mozilla/xpcom/string/obsolete/nsString2.h   | 26 ++++++------
 12 files changed, 201 insertions(+), 204 deletions(-)

diff --git a/mozilla/string/obsolete/nsString.cpp b/mozilla/string/obsolete/nsString.cpp
index 0f6aac52222..6e7fccfaa33 100644
--- a/mozilla/string/obsolete/nsString.cpp
+++ b/mozilla/string/obsolete/nsString.cpp
@@ -369,7 +369,8 @@ void nsCString::ToUpperCase(nsCString& aString) const {
  *  @param  aChar -- char to be stripped
  *  @return *this 
  */
-nsCString& nsCString::StripChar(PRUnichar aChar,PRInt32 anOffset){
+void
+nsCString::StripChar(PRUnichar aChar,PRInt32 anOffset){
   if(mLength && (anOffset<PRInt32(mLength))) {
     if(eOneByte==mCharSize) {
       char*  to   = mStr + anOffset;
@@ -400,7 +401,6 @@ nsCString& nsCString::StripChar(PRUnichar aChar,PRInt32 anOffset){
       mLength=to - mUStr;
     }
   }
-  return *this;
 }
 
 /**
@@ -411,9 +411,9 @@ nsCString& nsCString::StripChar(PRUnichar aChar,PRInt32 anOffset){
  *  @param  aSet -- characters to be cut from this
  *  @return *this 
  */
-nsCString& nsCString::StripChars(const char* aSet){
+void
+nsCString::StripChars(const char* aSet){
   nsStr::StripChars(*this,aSet);
-  return *this;
 }
 
 
@@ -423,8 +423,9 @@ nsCString& nsCString::StripChars(const char* aSet){
  *  @update  gess 01/04/99
  *  @return  this
  */
-nsCString& nsCString::StripWhitespace() {
-  return StripChars(kWhitespace);
+void
+nsCString::StripWhitespace() {
+  StripChars(kWhitespace);
 }
 
 /**
@@ -434,7 +435,8 @@ nsCString& nsCString::StripWhitespace() {
  *  @param  
  *  @return *this 
  */
-nsCString& nsCString::ReplaceChar(PRUnichar aOldChar, PRUnichar aNewChar) {
+void
+nsCString::ReplaceChar(PRUnichar aOldChar, PRUnichar aNewChar) {
   PRUint32 theIndex=0;
   
   if((aOldChar<256) && (aNewChar<256)){
@@ -445,7 +447,6 @@ nsCString& nsCString::ReplaceChar(PRUnichar aOldChar, PRUnichar aNewChar) {
       }//if
     }
   }
-  return *this;
 }
 
 /**
@@ -455,7 +456,8 @@ nsCString& nsCString::ReplaceChar(PRUnichar aOldChar, PRUnichar aNewChar) {
  *  @param  
  *  @return *this 
  */
-nsCString& nsCString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
+void
+nsCString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
   if(aSet && (aNewChar<256)){
       //only execute this if newchar is valid ascii, and aset isn't null.
 
@@ -465,7 +467,6 @@ nsCString& nsCString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
       theIndex=FindCharInSet(aSet,theIndex+1);
     }
   }
-  return *this;
 }
 
 /**
@@ -475,7 +476,8 @@ nsCString& nsCString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
  *  @param  
  *  @return *this 
  */
-nsCString& nsCString::ReplaceSubstring(const char* aTarget,const char* aNewValue){
+void
+nsCString::ReplaceSubstring(const char* aTarget,const char* aNewValue){
   if(aTarget && aNewValue) {
 
     PRInt32 len=strlen(aTarget);
@@ -492,7 +494,6 @@ nsCString& nsCString::ReplaceSubstring(const char* aTarget,const char* aNewValue
       }
     }
   }
-  return *this;
 }
 
 /**
@@ -503,7 +504,8 @@ nsCString& nsCString::ReplaceSubstring(const char* aTarget,const char* aNewValue
  *  @param aNewValue
  *  @return *this 
  */
-nsCString& nsCString::ReplaceSubstring(const nsCString& aTarget,const nsCString& aNewValue){
+void
+nsCString::ReplaceSubstring(const nsCString& aTarget,const nsCString& aNewValue){
 
 
   //WARNING: This is not working yet!!!!!
@@ -532,7 +534,6 @@ nsCString& nsCString::ReplaceSubstring(const nsCString& aTarget,const nsCString&
       }
     }
   }
-  return *this;
 }
 
 /**
@@ -563,7 +564,8 @@ PRInt32 nsCString::CountChar(PRUnichar aChar) {
  *           both ends
  *  @return  this
  */
-nsCString& nsCString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool aEliminateTrailing,PRBool aIgnoreQuotes){
+void
+nsCString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool aEliminateTrailing,PRBool aIgnoreQuotes){
 
   if(aTrimSet){
     
@@ -592,7 +594,6 @@ nsCString& nsCString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool
     }
 
   }
-  return *this;
 }
 
 /**
@@ -605,12 +606,12 @@ nsCString& nsCString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool
  *  @param   aEliminateTrailing controls stripping of trailing ws
  *  @return  this
  */
-nsCString& nsCString::CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading,PRBool aEliminateTrailing){
+void
+nsCString::CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading,PRBool aEliminateTrailing){
   if(aSet){
     ReplaceChar(aSet,aChar);
     nsStr::CompressSet(*this,aSet,aEliminateLeading,aEliminateTrailing);
   }
-  return *this;
 }
 
 /**
@@ -623,9 +624,9 @@ nsCString& nsCString::CompressSet(const char* aSet, PRUnichar aChar,PRBool aElim
  *  @param   aEliminateTrailing controls stripping of trailing ws
  *  @return  this
  */
-nsCString& nsCString::CompressWhitespace( PRBool aEliminateLeading,PRBool aEliminateTrailing){
+void
+nsCString::CompressWhitespace( PRBool aEliminateLeading,PRBool aEliminateTrailing){
   CompressSet(kWhitespace,' ',aEliminateLeading,aEliminateTrailing);
-  return *this;
 }
 
 /**********************************************************************
diff --git a/mozilla/string/obsolete/nsString.h b/mozilla/string/obsolete/nsString.h
index b9bd339ef1e..78001e67721 100644
--- a/mozilla/string/obsolete/nsString.h
+++ b/mozilla/string/obsolete/nsString.h
@@ -275,27 +275,27 @@ public:
    *  @param  aSet -- characters to be cut from this
    *  @return *this 
    */
-  nsCString& StripChars(const char* aSet);
-  nsCString& StripChar(PRUnichar aChar,PRInt32 anOffset=0);
-  nsCString& StripChar(char aChar,PRInt32 anOffset=0) { return StripChar((PRUnichar) (unsigned char)aChar,anOffset); }
+  void StripChars(const char* aSet);
+  void StripChar(PRUnichar aChar,PRInt32 anOffset=0);
+  void StripChar(char aChar,PRInt32 anOffset=0) { return StripChar((PRUnichar) (unsigned char)aChar,anOffset); }
 
   /**
    *  This method strips whitespace throughout the string
    *  
    *  @return  this
    */
-  nsCString& StripWhitespace();
+  void StripWhitespace();
 
   /**
    *  swaps occurence of 1 string for another
    *  
    *  @return  this
    */
-  nsCString& ReplaceChar(PRUnichar aOldChar,PRUnichar aNewChar);
-  nsCString& ReplaceChar(const char* aSet,PRUnichar aNewChar);
+  void ReplaceChar(PRUnichar aOldChar,PRUnichar aNewChar);
+  void ReplaceChar(const char* aSet,PRUnichar aNewChar);
 
-  nsCString& ReplaceSubstring(const nsCString& aTarget,const nsCString& aNewValue);
-  nsCString& ReplaceSubstring(const char* aTarget,const char* aNewValue);
+  void ReplaceSubstring(const nsCString& aTarget,const nsCString& aNewValue);
+  void ReplaceSubstring(const char* aTarget,const char* aNewValue);
 
   PRInt32 CountChar(PRUnichar aChar);
 
@@ -310,7 +310,7 @@ public:
    *  @param   aIgnoreQuotes
    *  @return  this
    */
-  nsCString& Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE,PRBool aIgnoreQuotes=PR_FALSE);
+  void Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE,PRBool aIgnoreQuotes=PR_FALSE);
 
   /**
    *  This method strips whitespace from string.
@@ -321,7 +321,7 @@ public:
    *  @param   aEliminateTrailing controls stripping of trailing ws
    *  @return  this
    */
-  nsCString& CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+  void CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
 
   /**
    *  This method strips whitespace from string.
@@ -332,7 +332,7 @@ public:
    *  @param   aEliminateTrailing controls stripping of trailing ws
    *  @return  this
    */
-  nsCString& CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+  void CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
 
   /**********************************************************************
     string conversion methods...
diff --git a/mozilla/string/obsolete/nsString2.cpp b/mozilla/string/obsolete/nsString2.cpp
index c9b90fab3fb..b1b4d34283f 100644
--- a/mozilla/string/obsolete/nsString2.cpp
+++ b/mozilla/string/obsolete/nsString2.cpp
@@ -430,7 +430,8 @@ void nsString::ToUpperCase(nsString& aString) const {
  *  @param  anOffset -- where in this string to start stripping chars
  *  @return *this 
  */
-nsString& nsString::StripChar(PRUnichar aChar,PRInt32 anOffset){
+void
+nsString::StripChar(PRUnichar aChar,PRInt32 anOffset){
   if(mLength && (anOffset<PRInt32(mLength))) {
     if(eOneByte==mCharSize) {
       char*  to   = mStr + anOffset;
@@ -461,7 +462,6 @@ nsString& nsString::StripChar(PRUnichar aChar,PRInt32 anOffset){
       mLength=to - mUStr;
     }
   }
-  return *this;
 }
 
 /**
@@ -472,9 +472,9 @@ nsString& nsString::StripChar(PRUnichar aChar,PRInt32 anOffset){
  *  @param  aSet -- characters to be cut from this
  *  @return *this 
  */
-nsString& nsString::StripChars(const char* aSet){
+void
+nsString::StripChars(const char* aSet){
   nsStr::StripChars(*this,aSet);
-  return *this;
 }
 
 
@@ -484,8 +484,9 @@ nsString& nsString::StripChars(const char* aSet){
  *  @update  gess 01/04/99
  *  @return  this
  */
-nsString& nsString::StripWhitespace() {
-  return StripChars(kWhitespace);
+void
+nsString::StripWhitespace() {
+  StripChars(kWhitespace);
 }
 
 /**
@@ -495,7 +496,8 @@ nsString& nsString::StripWhitespace() {
  *  @param  
  *  @return *this 
  */
-nsString& nsString::ReplaceChar(PRUnichar aSourceChar, PRUnichar aDestChar) {
+void
+nsString::ReplaceChar(PRUnichar aSourceChar, PRUnichar aDestChar) {
   PRUint32 theIndex=0;
   if(eTwoByte==mCharSize){
     for(theIndex=0;theIndex<mLength;theIndex++){
@@ -511,7 +513,6 @@ nsString& nsString::ReplaceChar(PRUnichar aSourceChar, PRUnichar aDestChar) {
       }//if
     }
   }
-  return *this;
 }
 
 /**
@@ -521,7 +522,8 @@ nsString& nsString::ReplaceChar(PRUnichar aSourceChar, PRUnichar aDestChar) {
  *  @param  
  *  @return *this 
  */
-nsString& nsString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
+void
+nsString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
   if(aSet){
     PRInt32 theIndex=FindCharInSet(aSet,0);
     while(kNotFound<theIndex) {
@@ -531,7 +533,6 @@ nsString& nsString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
       theIndex=FindCharInSet(aSet,theIndex+1);
     }
   }
-  return *this;
 }
 
 /**
@@ -541,7 +542,8 @@ nsString& nsString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
  *  @param  
  *  @return *this 
  */
-nsString& nsString::ReplaceSubstring(const PRUnichar* aTarget,const PRUnichar* aNewValue){
+void
+nsString::ReplaceSubstring(const PRUnichar* aTarget,const PRUnichar* aNewValue){
   if(aTarget && aNewValue) {
 
     PRInt32 len=nsCRT::strlen(aTarget);
@@ -558,7 +560,7 @@ nsString& nsString::ReplaceSubstring(const PRUnichar* aTarget,const PRUnichar* a
       }
     }
   }
-  return *this;}
+}
 
 /**
  *  This method is used to replace all occurances of the
@@ -568,7 +570,8 @@ nsString& nsString::ReplaceSubstring(const PRUnichar* aTarget,const PRUnichar* a
  *  @param aNewValue
  *  @return *this 
  */
-nsString& nsString::ReplaceSubstring(const nsString& aTarget,const nsString& aNewValue){
+void
+nsString::ReplaceSubstring(const nsString& aTarget,const nsString& aNewValue){
 
 
   //WARNING: This is not working yet!!!!!
@@ -597,7 +600,6 @@ nsString& nsString::ReplaceSubstring(const nsString& aTarget,const nsString& aNe
       }
     }
   }
-  return *this;
 }
 
 /**
@@ -628,7 +630,8 @@ PRInt32 nsString::CountChar(PRUnichar aChar) {
  *           both ends
  *  @return  this
  */
-nsString& nsString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool aEliminateTrailing,PRBool aIgnoreQuotes){
+void
+nsString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool aEliminateTrailing,PRBool aIgnoreQuotes){
 
   if(aTrimSet){
     
@@ -657,7 +660,6 @@ nsString& nsString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool a
     }
 
   }
-  return *this;
 }
 
 /**
@@ -670,15 +672,12 @@ nsString& nsString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool a
  *  @param   aEliminateTrailing controls stripping of trailing ws
  *  @return  this
  */
-nsString& nsString::CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading,PRBool aEliminateTrailing){
+void
+nsString::CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading,PRBool aEliminateTrailing){
   if(aSet){
     ReplaceChar(aSet,aChar);
     nsStr::CompressSet(*this,aSet,aEliminateLeading,aEliminateTrailing);
   }
-
-
-
-  return *this;
 }
 
 /**
@@ -691,10 +690,9 @@ nsString& nsString::CompressSet(const char* aSet, PRUnichar aChar,PRBool aElimin
  *  @param   aEliminateTrailing controls stripping of trailing ws
  *  @return  this
  */
-nsString& nsString::CompressWhitespace( PRBool aEliminateLeading,PRBool aEliminateTrailing){
+void
+nsString::CompressWhitespace( PRBool aEliminateLeading,PRBool aEliminateTrailing){
   CompressSet(kWhitespace,' ',aEliminateLeading,aEliminateTrailing);
-
-  return *this;
 }
 
 /**********************************************************************
diff --git a/mozilla/string/obsolete/nsString2.h b/mozilla/string/obsolete/nsString2.h
index bafcb690f3e..1537f556105 100644
--- a/mozilla/string/obsolete/nsString2.h
+++ b/mozilla/string/obsolete/nsString2.h
@@ -306,30 +306,30 @@ public:
    *  @param  aSet -- characters to be cut from this
    *  @return *this 
    */
-  nsString& StripChars(const char* aSet);
-  nsString& StripChar(PRUnichar aChar,PRInt32 anOffset=0);
-  nsString& StripChar(char aChar,PRInt32 anOffset=0) {return StripChar((PRUnichar) (unsigned char)aChar,anOffset); }
-  nsString& StripChar(PRInt32 anInt,PRInt32 anOffset=0) {return StripChar((PRUnichar)anInt,anOffset); }
+  void StripChars( const char* aSet );
+  void StripChar( PRUnichar aChar, PRInt32 anOffset=0 );
+  void StripChar( char aChar, PRInt32 anOffset=0 )       { StripChar((PRUnichar) (unsigned char)aChar,anOffset); }
+  void StripChar( PRInt32 anInt, PRInt32 anOffset=0 )    { StripChar((PRUnichar)anInt,anOffset); }
 
   /**
    *  This method strips whitespace throughout the string
    *  
    *  @return  this
    */
-  nsString& StripWhitespace();
+  void StripWhitespace();
 
   /**
    *  swaps occurence of 1 string for another
    *  
    *  @return  this
    */
-  nsString& ReplaceChar(PRUnichar anOldChar,PRUnichar aNewChar);
-  nsString& ReplaceChar(const char* aSet,PRUnichar aNewChar);
+  void ReplaceChar( PRUnichar anOldChar, PRUnichar aNewChar );
+  void ReplaceChar( const char* aSet, PRUnichar aNewChar );
 
-  nsString& ReplaceSubstring(const nsString& aTarget,const nsString& aNewValue);
-  nsString& ReplaceSubstring(const PRUnichar* aTarget,const PRUnichar* aNewValue);
+  void ReplaceSubstring( const nsString& aTarget, const nsString& aNewValue );
+  void ReplaceSubstring( const PRUnichar* aTarget, const PRUnichar* aNewValue );
 
-  PRInt32 CountChar(PRUnichar aChar);
+  PRInt32 CountChar( PRUnichar aChar );
 
   /**
    *  This method trims characters found in aTrimSet from
@@ -342,7 +342,7 @@ public:
    *  @param   aIgnoreQuotes
    *  @return  this
    */
-  nsString& Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE,PRBool aIgnoreQuotes=PR_FALSE);
+  void Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE,PRBool aIgnoreQuotes=PR_FALSE);
 
   /**
    *  This method strips whitespace from string.
@@ -353,7 +353,7 @@ public:
    *  @param   aEliminateTrailing controls stripping of trailing ws
    *  @return  this
    */
-  nsString& CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+  void CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
 
   /**
    *  This method strips whitespace from string.
@@ -364,7 +364,7 @@ public:
    *  @param   aEliminateTrailing controls stripping of trailing ws
    *  @return  this
    */
-  nsString& CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+  void CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
 
   /**********************************************************************
     string conversion methods...
diff --git a/mozilla/xpcom/ds/nsString.cpp b/mozilla/xpcom/ds/nsString.cpp
index 0f6aac52222..6e7fccfaa33 100644
--- a/mozilla/xpcom/ds/nsString.cpp
+++ b/mozilla/xpcom/ds/nsString.cpp
@@ -369,7 +369,8 @@ void nsCString::ToUpperCase(nsCString& aString) const {
  *  @param  aChar -- char to be stripped
  *  @return *this 
  */
-nsCString& nsCString::StripChar(PRUnichar aChar,PRInt32 anOffset){
+void
+nsCString::StripChar(PRUnichar aChar,PRInt32 anOffset){
   if(mLength && (anOffset<PRInt32(mLength))) {
     if(eOneByte==mCharSize) {
       char*  to   = mStr + anOffset;
@@ -400,7 +401,6 @@ nsCString& nsCString::StripChar(PRUnichar aChar,PRInt32 anOffset){
       mLength=to - mUStr;
     }
   }
-  return *this;
 }
 
 /**
@@ -411,9 +411,9 @@ nsCString& nsCString::StripChar(PRUnichar aChar,PRInt32 anOffset){
  *  @param  aSet -- characters to be cut from this
  *  @return *this 
  */
-nsCString& nsCString::StripChars(const char* aSet){
+void
+nsCString::StripChars(const char* aSet){
   nsStr::StripChars(*this,aSet);
-  return *this;
 }
 
 
@@ -423,8 +423,9 @@ nsCString& nsCString::StripChars(const char* aSet){
  *  @update  gess 01/04/99
  *  @return  this
  */
-nsCString& nsCString::StripWhitespace() {
-  return StripChars(kWhitespace);
+void
+nsCString::StripWhitespace() {
+  StripChars(kWhitespace);
 }
 
 /**
@@ -434,7 +435,8 @@ nsCString& nsCString::StripWhitespace() {
  *  @param  
  *  @return *this 
  */
-nsCString& nsCString::ReplaceChar(PRUnichar aOldChar, PRUnichar aNewChar) {
+void
+nsCString::ReplaceChar(PRUnichar aOldChar, PRUnichar aNewChar) {
   PRUint32 theIndex=0;
   
   if((aOldChar<256) && (aNewChar<256)){
@@ -445,7 +447,6 @@ nsCString& nsCString::ReplaceChar(PRUnichar aOldChar, PRUnichar aNewChar) {
       }//if
     }
   }
-  return *this;
 }
 
 /**
@@ -455,7 +456,8 @@ nsCString& nsCString::ReplaceChar(PRUnichar aOldChar, PRUnichar aNewChar) {
  *  @param  
  *  @return *this 
  */
-nsCString& nsCString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
+void
+nsCString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
   if(aSet && (aNewChar<256)){
       //only execute this if newchar is valid ascii, and aset isn't null.
 
@@ -465,7 +467,6 @@ nsCString& nsCString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
       theIndex=FindCharInSet(aSet,theIndex+1);
     }
   }
-  return *this;
 }
 
 /**
@@ -475,7 +476,8 @@ nsCString& nsCString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
  *  @param  
  *  @return *this 
  */
-nsCString& nsCString::ReplaceSubstring(const char* aTarget,const char* aNewValue){
+void
+nsCString::ReplaceSubstring(const char* aTarget,const char* aNewValue){
   if(aTarget && aNewValue) {
 
     PRInt32 len=strlen(aTarget);
@@ -492,7 +494,6 @@ nsCString& nsCString::ReplaceSubstring(const char* aTarget,const char* aNewValue
       }
     }
   }
-  return *this;
 }
 
 /**
@@ -503,7 +504,8 @@ nsCString& nsCString::ReplaceSubstring(const char* aTarget,const char* aNewValue
  *  @param aNewValue
  *  @return *this 
  */
-nsCString& nsCString::ReplaceSubstring(const nsCString& aTarget,const nsCString& aNewValue){
+void
+nsCString::ReplaceSubstring(const nsCString& aTarget,const nsCString& aNewValue){
 
 
   //WARNING: This is not working yet!!!!!
@@ -532,7 +534,6 @@ nsCString& nsCString::ReplaceSubstring(const nsCString& aTarget,const nsCString&
       }
     }
   }
-  return *this;
 }
 
 /**
@@ -563,7 +564,8 @@ PRInt32 nsCString::CountChar(PRUnichar aChar) {
  *           both ends
  *  @return  this
  */
-nsCString& nsCString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool aEliminateTrailing,PRBool aIgnoreQuotes){
+void
+nsCString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool aEliminateTrailing,PRBool aIgnoreQuotes){
 
   if(aTrimSet){
     
@@ -592,7 +594,6 @@ nsCString& nsCString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool
     }
 
   }
-  return *this;
 }
 
 /**
@@ -605,12 +606,12 @@ nsCString& nsCString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool
  *  @param   aEliminateTrailing controls stripping of trailing ws
  *  @return  this
  */
-nsCString& nsCString::CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading,PRBool aEliminateTrailing){
+void
+nsCString::CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading,PRBool aEliminateTrailing){
   if(aSet){
     ReplaceChar(aSet,aChar);
     nsStr::CompressSet(*this,aSet,aEliminateLeading,aEliminateTrailing);
   }
-  return *this;
 }
 
 /**
@@ -623,9 +624,9 @@ nsCString& nsCString::CompressSet(const char* aSet, PRUnichar aChar,PRBool aElim
  *  @param   aEliminateTrailing controls stripping of trailing ws
  *  @return  this
  */
-nsCString& nsCString::CompressWhitespace( PRBool aEliminateLeading,PRBool aEliminateTrailing){
+void
+nsCString::CompressWhitespace( PRBool aEliminateLeading,PRBool aEliminateTrailing){
   CompressSet(kWhitespace,' ',aEliminateLeading,aEliminateTrailing);
-  return *this;
 }
 
 /**********************************************************************
diff --git a/mozilla/xpcom/ds/nsString.h b/mozilla/xpcom/ds/nsString.h
index b9bd339ef1e..78001e67721 100644
--- a/mozilla/xpcom/ds/nsString.h
+++ b/mozilla/xpcom/ds/nsString.h
@@ -275,27 +275,27 @@ public:
    *  @param  aSet -- characters to be cut from this
    *  @return *this 
    */
-  nsCString& StripChars(const char* aSet);
-  nsCString& StripChar(PRUnichar aChar,PRInt32 anOffset=0);
-  nsCString& StripChar(char aChar,PRInt32 anOffset=0) { return StripChar((PRUnichar) (unsigned char)aChar,anOffset); }
+  void StripChars(const char* aSet);
+  void StripChar(PRUnichar aChar,PRInt32 anOffset=0);
+  void StripChar(char aChar,PRInt32 anOffset=0) { return StripChar((PRUnichar) (unsigned char)aChar,anOffset); }
 
   /**
    *  This method strips whitespace throughout the string
    *  
    *  @return  this
    */
-  nsCString& StripWhitespace();
+  void StripWhitespace();
 
   /**
    *  swaps occurence of 1 string for another
    *  
    *  @return  this
    */
-  nsCString& ReplaceChar(PRUnichar aOldChar,PRUnichar aNewChar);
-  nsCString& ReplaceChar(const char* aSet,PRUnichar aNewChar);
+  void ReplaceChar(PRUnichar aOldChar,PRUnichar aNewChar);
+  void ReplaceChar(const char* aSet,PRUnichar aNewChar);
 
-  nsCString& ReplaceSubstring(const nsCString& aTarget,const nsCString& aNewValue);
-  nsCString& ReplaceSubstring(const char* aTarget,const char* aNewValue);
+  void ReplaceSubstring(const nsCString& aTarget,const nsCString& aNewValue);
+  void ReplaceSubstring(const char* aTarget,const char* aNewValue);
 
   PRInt32 CountChar(PRUnichar aChar);
 
@@ -310,7 +310,7 @@ public:
    *  @param   aIgnoreQuotes
    *  @return  this
    */
-  nsCString& Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE,PRBool aIgnoreQuotes=PR_FALSE);
+  void Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE,PRBool aIgnoreQuotes=PR_FALSE);
 
   /**
    *  This method strips whitespace from string.
@@ -321,7 +321,7 @@ public:
    *  @param   aEliminateTrailing controls stripping of trailing ws
    *  @return  this
    */
-  nsCString& CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+  void CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
 
   /**
    *  This method strips whitespace from string.
@@ -332,7 +332,7 @@ public:
    *  @param   aEliminateTrailing controls stripping of trailing ws
    *  @return  this
    */
-  nsCString& CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+  void CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
 
   /**********************************************************************
     string conversion methods...
diff --git a/mozilla/xpcom/ds/nsString2.cpp b/mozilla/xpcom/ds/nsString2.cpp
index c9b90fab3fb..b1b4d34283f 100644
--- a/mozilla/xpcom/ds/nsString2.cpp
+++ b/mozilla/xpcom/ds/nsString2.cpp
@@ -430,7 +430,8 @@ void nsString::ToUpperCase(nsString& aString) const {
  *  @param  anOffset -- where in this string to start stripping chars
  *  @return *this 
  */
-nsString& nsString::StripChar(PRUnichar aChar,PRInt32 anOffset){
+void
+nsString::StripChar(PRUnichar aChar,PRInt32 anOffset){
   if(mLength && (anOffset<PRInt32(mLength))) {
     if(eOneByte==mCharSize) {
       char*  to   = mStr + anOffset;
@@ -461,7 +462,6 @@ nsString& nsString::StripChar(PRUnichar aChar,PRInt32 anOffset){
       mLength=to - mUStr;
     }
   }
-  return *this;
 }
 
 /**
@@ -472,9 +472,9 @@ nsString& nsString::StripChar(PRUnichar aChar,PRInt32 anOffset){
  *  @param  aSet -- characters to be cut from this
  *  @return *this 
  */
-nsString& nsString::StripChars(const char* aSet){
+void
+nsString::StripChars(const char* aSet){
   nsStr::StripChars(*this,aSet);
-  return *this;
 }
 
 
@@ -484,8 +484,9 @@ nsString& nsString::StripChars(const char* aSet){
  *  @update  gess 01/04/99
  *  @return  this
  */
-nsString& nsString::StripWhitespace() {
-  return StripChars(kWhitespace);
+void
+nsString::StripWhitespace() {
+  StripChars(kWhitespace);
 }
 
 /**
@@ -495,7 +496,8 @@ nsString& nsString::StripWhitespace() {
  *  @param  
  *  @return *this 
  */
-nsString& nsString::ReplaceChar(PRUnichar aSourceChar, PRUnichar aDestChar) {
+void
+nsString::ReplaceChar(PRUnichar aSourceChar, PRUnichar aDestChar) {
   PRUint32 theIndex=0;
   if(eTwoByte==mCharSize){
     for(theIndex=0;theIndex<mLength;theIndex++){
@@ -511,7 +513,6 @@ nsString& nsString::ReplaceChar(PRUnichar aSourceChar, PRUnichar aDestChar) {
       }//if
     }
   }
-  return *this;
 }
 
 /**
@@ -521,7 +522,8 @@ nsString& nsString::ReplaceChar(PRUnichar aSourceChar, PRUnichar aDestChar) {
  *  @param  
  *  @return *this 
  */
-nsString& nsString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
+void
+nsString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
   if(aSet){
     PRInt32 theIndex=FindCharInSet(aSet,0);
     while(kNotFound<theIndex) {
@@ -531,7 +533,6 @@ nsString& nsString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
       theIndex=FindCharInSet(aSet,theIndex+1);
     }
   }
-  return *this;
 }
 
 /**
@@ -541,7 +542,8 @@ nsString& nsString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
  *  @param  
  *  @return *this 
  */
-nsString& nsString::ReplaceSubstring(const PRUnichar* aTarget,const PRUnichar* aNewValue){
+void
+nsString::ReplaceSubstring(const PRUnichar* aTarget,const PRUnichar* aNewValue){
   if(aTarget && aNewValue) {
 
     PRInt32 len=nsCRT::strlen(aTarget);
@@ -558,7 +560,7 @@ nsString& nsString::ReplaceSubstring(const PRUnichar* aTarget,const PRUnichar* a
       }
     }
   }
-  return *this;}
+}
 
 /**
  *  This method is used to replace all occurances of the
@@ -568,7 +570,8 @@ nsString& nsString::ReplaceSubstring(const PRUnichar* aTarget,const PRUnichar* a
  *  @param aNewValue
  *  @return *this 
  */
-nsString& nsString::ReplaceSubstring(const nsString& aTarget,const nsString& aNewValue){
+void
+nsString::ReplaceSubstring(const nsString& aTarget,const nsString& aNewValue){
 
 
   //WARNING: This is not working yet!!!!!
@@ -597,7 +600,6 @@ nsString& nsString::ReplaceSubstring(const nsString& aTarget,const nsString& aNe
       }
     }
   }
-  return *this;
 }
 
 /**
@@ -628,7 +630,8 @@ PRInt32 nsString::CountChar(PRUnichar aChar) {
  *           both ends
  *  @return  this
  */
-nsString& nsString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool aEliminateTrailing,PRBool aIgnoreQuotes){
+void
+nsString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool aEliminateTrailing,PRBool aIgnoreQuotes){
 
   if(aTrimSet){
     
@@ -657,7 +660,6 @@ nsString& nsString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool a
     }
 
   }
-  return *this;
 }
 
 /**
@@ -670,15 +672,12 @@ nsString& nsString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool a
  *  @param   aEliminateTrailing controls stripping of trailing ws
  *  @return  this
  */
-nsString& nsString::CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading,PRBool aEliminateTrailing){
+void
+nsString::CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading,PRBool aEliminateTrailing){
   if(aSet){
     ReplaceChar(aSet,aChar);
     nsStr::CompressSet(*this,aSet,aEliminateLeading,aEliminateTrailing);
   }
-
-
-
-  return *this;
 }
 
 /**
@@ -691,10 +690,9 @@ nsString& nsString::CompressSet(const char* aSet, PRUnichar aChar,PRBool aElimin
  *  @param   aEliminateTrailing controls stripping of trailing ws
  *  @return  this
  */
-nsString& nsString::CompressWhitespace( PRBool aEliminateLeading,PRBool aEliminateTrailing){
+void
+nsString::CompressWhitespace( PRBool aEliminateLeading,PRBool aEliminateTrailing){
   CompressSet(kWhitespace,' ',aEliminateLeading,aEliminateTrailing);
-
-  return *this;
 }
 
 /**********************************************************************
diff --git a/mozilla/xpcom/ds/nsString2.h b/mozilla/xpcom/ds/nsString2.h
index bafcb690f3e..1537f556105 100644
--- a/mozilla/xpcom/ds/nsString2.h
+++ b/mozilla/xpcom/ds/nsString2.h
@@ -306,30 +306,30 @@ public:
    *  @param  aSet -- characters to be cut from this
    *  @return *this 
    */
-  nsString& StripChars(const char* aSet);
-  nsString& StripChar(PRUnichar aChar,PRInt32 anOffset=0);
-  nsString& StripChar(char aChar,PRInt32 anOffset=0) {return StripChar((PRUnichar) (unsigned char)aChar,anOffset); }
-  nsString& StripChar(PRInt32 anInt,PRInt32 anOffset=0) {return StripChar((PRUnichar)anInt,anOffset); }
+  void StripChars( const char* aSet );
+  void StripChar( PRUnichar aChar, PRInt32 anOffset=0 );
+  void StripChar( char aChar, PRInt32 anOffset=0 )       { StripChar((PRUnichar) (unsigned char)aChar,anOffset); }
+  void StripChar( PRInt32 anInt, PRInt32 anOffset=0 )    { StripChar((PRUnichar)anInt,anOffset); }
 
   /**
    *  This method strips whitespace throughout the string
    *  
    *  @return  this
    */
-  nsString& StripWhitespace();
+  void StripWhitespace();
 
   /**
    *  swaps occurence of 1 string for another
    *  
    *  @return  this
    */
-  nsString& ReplaceChar(PRUnichar anOldChar,PRUnichar aNewChar);
-  nsString& ReplaceChar(const char* aSet,PRUnichar aNewChar);
+  void ReplaceChar( PRUnichar anOldChar, PRUnichar aNewChar );
+  void ReplaceChar( const char* aSet, PRUnichar aNewChar );
 
-  nsString& ReplaceSubstring(const nsString& aTarget,const nsString& aNewValue);
-  nsString& ReplaceSubstring(const PRUnichar* aTarget,const PRUnichar* aNewValue);
+  void ReplaceSubstring( const nsString& aTarget, const nsString& aNewValue );
+  void ReplaceSubstring( const PRUnichar* aTarget, const PRUnichar* aNewValue );
 
-  PRInt32 CountChar(PRUnichar aChar);
+  PRInt32 CountChar( PRUnichar aChar );
 
   /**
    *  This method trims characters found in aTrimSet from
@@ -342,7 +342,7 @@ public:
    *  @param   aIgnoreQuotes
    *  @return  this
    */
-  nsString& Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE,PRBool aIgnoreQuotes=PR_FALSE);
+  void Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE,PRBool aIgnoreQuotes=PR_FALSE);
 
   /**
    *  This method strips whitespace from string.
@@ -353,7 +353,7 @@ public:
    *  @param   aEliminateTrailing controls stripping of trailing ws
    *  @return  this
    */
-  nsString& CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+  void CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
 
   /**
    *  This method strips whitespace from string.
@@ -364,7 +364,7 @@ public:
    *  @param   aEliminateTrailing controls stripping of trailing ws
    *  @return  this
    */
-  nsString& CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+  void CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
 
   /**********************************************************************
     string conversion methods...
diff --git a/mozilla/xpcom/string/obsolete/nsString.cpp b/mozilla/xpcom/string/obsolete/nsString.cpp
index 0f6aac52222..6e7fccfaa33 100644
--- a/mozilla/xpcom/string/obsolete/nsString.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString.cpp
@@ -369,7 +369,8 @@ void nsCString::ToUpperCase(nsCString& aString) const {
  *  @param  aChar -- char to be stripped
  *  @return *this 
  */
-nsCString& nsCString::StripChar(PRUnichar aChar,PRInt32 anOffset){
+void
+nsCString::StripChar(PRUnichar aChar,PRInt32 anOffset){
   if(mLength && (anOffset<PRInt32(mLength))) {
     if(eOneByte==mCharSize) {
       char*  to   = mStr + anOffset;
@@ -400,7 +401,6 @@ nsCString& nsCString::StripChar(PRUnichar aChar,PRInt32 anOffset){
       mLength=to - mUStr;
     }
   }
-  return *this;
 }
 
 /**
@@ -411,9 +411,9 @@ nsCString& nsCString::StripChar(PRUnichar aChar,PRInt32 anOffset){
  *  @param  aSet -- characters to be cut from this
  *  @return *this 
  */
-nsCString& nsCString::StripChars(const char* aSet){
+void
+nsCString::StripChars(const char* aSet){
   nsStr::StripChars(*this,aSet);
-  return *this;
 }
 
 
@@ -423,8 +423,9 @@ nsCString& nsCString::StripChars(const char* aSet){
  *  @update  gess 01/04/99
  *  @return  this
  */
-nsCString& nsCString::StripWhitespace() {
-  return StripChars(kWhitespace);
+void
+nsCString::StripWhitespace() {
+  StripChars(kWhitespace);
 }
 
 /**
@@ -434,7 +435,8 @@ nsCString& nsCString::StripWhitespace() {
  *  @param  
  *  @return *this 
  */
-nsCString& nsCString::ReplaceChar(PRUnichar aOldChar, PRUnichar aNewChar) {
+void
+nsCString::ReplaceChar(PRUnichar aOldChar, PRUnichar aNewChar) {
   PRUint32 theIndex=0;
   
   if((aOldChar<256) && (aNewChar<256)){
@@ -445,7 +447,6 @@ nsCString& nsCString::ReplaceChar(PRUnichar aOldChar, PRUnichar aNewChar) {
       }//if
     }
   }
-  return *this;
 }
 
 /**
@@ -455,7 +456,8 @@ nsCString& nsCString::ReplaceChar(PRUnichar aOldChar, PRUnichar aNewChar) {
  *  @param  
  *  @return *this 
  */
-nsCString& nsCString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
+void
+nsCString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
   if(aSet && (aNewChar<256)){
       //only execute this if newchar is valid ascii, and aset isn't null.
 
@@ -465,7 +467,6 @@ nsCString& nsCString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
       theIndex=FindCharInSet(aSet,theIndex+1);
     }
   }
-  return *this;
 }
 
 /**
@@ -475,7 +476,8 @@ nsCString& nsCString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
  *  @param  
  *  @return *this 
  */
-nsCString& nsCString::ReplaceSubstring(const char* aTarget,const char* aNewValue){
+void
+nsCString::ReplaceSubstring(const char* aTarget,const char* aNewValue){
   if(aTarget && aNewValue) {
 
     PRInt32 len=strlen(aTarget);
@@ -492,7 +494,6 @@ nsCString& nsCString::ReplaceSubstring(const char* aTarget,const char* aNewValue
       }
     }
   }
-  return *this;
 }
 
 /**
@@ -503,7 +504,8 @@ nsCString& nsCString::ReplaceSubstring(const char* aTarget,const char* aNewValue
  *  @param aNewValue
  *  @return *this 
  */
-nsCString& nsCString::ReplaceSubstring(const nsCString& aTarget,const nsCString& aNewValue){
+void
+nsCString::ReplaceSubstring(const nsCString& aTarget,const nsCString& aNewValue){
 
 
   //WARNING: This is not working yet!!!!!
@@ -532,7 +534,6 @@ nsCString& nsCString::ReplaceSubstring(const nsCString& aTarget,const nsCString&
       }
     }
   }
-  return *this;
 }
 
 /**
@@ -563,7 +564,8 @@ PRInt32 nsCString::CountChar(PRUnichar aChar) {
  *           both ends
  *  @return  this
  */
-nsCString& nsCString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool aEliminateTrailing,PRBool aIgnoreQuotes){
+void
+nsCString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool aEliminateTrailing,PRBool aIgnoreQuotes){
 
   if(aTrimSet){
     
@@ -592,7 +594,6 @@ nsCString& nsCString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool
     }
 
   }
-  return *this;
 }
 
 /**
@@ -605,12 +606,12 @@ nsCString& nsCString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool
  *  @param   aEliminateTrailing controls stripping of trailing ws
  *  @return  this
  */
-nsCString& nsCString::CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading,PRBool aEliminateTrailing){
+void
+nsCString::CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading,PRBool aEliminateTrailing){
   if(aSet){
     ReplaceChar(aSet,aChar);
     nsStr::CompressSet(*this,aSet,aEliminateLeading,aEliminateTrailing);
   }
-  return *this;
 }
 
 /**
@@ -623,9 +624,9 @@ nsCString& nsCString::CompressSet(const char* aSet, PRUnichar aChar,PRBool aElim
  *  @param   aEliminateTrailing controls stripping of trailing ws
  *  @return  this
  */
-nsCString& nsCString::CompressWhitespace( PRBool aEliminateLeading,PRBool aEliminateTrailing){
+void
+nsCString::CompressWhitespace( PRBool aEliminateLeading,PRBool aEliminateTrailing){
   CompressSet(kWhitespace,' ',aEliminateLeading,aEliminateTrailing);
-  return *this;
 }
 
 /**********************************************************************
diff --git a/mozilla/xpcom/string/obsolete/nsString.h b/mozilla/xpcom/string/obsolete/nsString.h
index b9bd339ef1e..78001e67721 100644
--- a/mozilla/xpcom/string/obsolete/nsString.h
+++ b/mozilla/xpcom/string/obsolete/nsString.h
@@ -275,27 +275,27 @@ public:
    *  @param  aSet -- characters to be cut from this
    *  @return *this 
    */
-  nsCString& StripChars(const char* aSet);
-  nsCString& StripChar(PRUnichar aChar,PRInt32 anOffset=0);
-  nsCString& StripChar(char aChar,PRInt32 anOffset=0) { return StripChar((PRUnichar) (unsigned char)aChar,anOffset); }
+  void StripChars(const char* aSet);
+  void StripChar(PRUnichar aChar,PRInt32 anOffset=0);
+  void StripChar(char aChar,PRInt32 anOffset=0) { return StripChar((PRUnichar) (unsigned char)aChar,anOffset); }
 
   /**
    *  This method strips whitespace throughout the string
    *  
    *  @return  this
    */
-  nsCString& StripWhitespace();
+  void StripWhitespace();
 
   /**
    *  swaps occurence of 1 string for another
    *  
    *  @return  this
    */
-  nsCString& ReplaceChar(PRUnichar aOldChar,PRUnichar aNewChar);
-  nsCString& ReplaceChar(const char* aSet,PRUnichar aNewChar);
+  void ReplaceChar(PRUnichar aOldChar,PRUnichar aNewChar);
+  void ReplaceChar(const char* aSet,PRUnichar aNewChar);
 
-  nsCString& ReplaceSubstring(const nsCString& aTarget,const nsCString& aNewValue);
-  nsCString& ReplaceSubstring(const char* aTarget,const char* aNewValue);
+  void ReplaceSubstring(const nsCString& aTarget,const nsCString& aNewValue);
+  void ReplaceSubstring(const char* aTarget,const char* aNewValue);
 
   PRInt32 CountChar(PRUnichar aChar);
 
@@ -310,7 +310,7 @@ public:
    *  @param   aIgnoreQuotes
    *  @return  this
    */
-  nsCString& Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE,PRBool aIgnoreQuotes=PR_FALSE);
+  void Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE,PRBool aIgnoreQuotes=PR_FALSE);
 
   /**
    *  This method strips whitespace from string.
@@ -321,7 +321,7 @@ public:
    *  @param   aEliminateTrailing controls stripping of trailing ws
    *  @return  this
    */
-  nsCString& CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+  void CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
 
   /**
    *  This method strips whitespace from string.
@@ -332,7 +332,7 @@ public:
    *  @param   aEliminateTrailing controls stripping of trailing ws
    *  @return  this
    */
-  nsCString& CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+  void CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
 
   /**********************************************************************
     string conversion methods...
diff --git a/mozilla/xpcom/string/obsolete/nsString2.cpp b/mozilla/xpcom/string/obsolete/nsString2.cpp
index c9b90fab3fb..b1b4d34283f 100644
--- a/mozilla/xpcom/string/obsolete/nsString2.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString2.cpp
@@ -430,7 +430,8 @@ void nsString::ToUpperCase(nsString& aString) const {
  *  @param  anOffset -- where in this string to start stripping chars
  *  @return *this 
  */
-nsString& nsString::StripChar(PRUnichar aChar,PRInt32 anOffset){
+void
+nsString::StripChar(PRUnichar aChar,PRInt32 anOffset){
   if(mLength && (anOffset<PRInt32(mLength))) {
     if(eOneByte==mCharSize) {
       char*  to   = mStr + anOffset;
@@ -461,7 +462,6 @@ nsString& nsString::StripChar(PRUnichar aChar,PRInt32 anOffset){
       mLength=to - mUStr;
     }
   }
-  return *this;
 }
 
 /**
@@ -472,9 +472,9 @@ nsString& nsString::StripChar(PRUnichar aChar,PRInt32 anOffset){
  *  @param  aSet -- characters to be cut from this
  *  @return *this 
  */
-nsString& nsString::StripChars(const char* aSet){
+void
+nsString::StripChars(const char* aSet){
   nsStr::StripChars(*this,aSet);
-  return *this;
 }
 
 
@@ -484,8 +484,9 @@ nsString& nsString::StripChars(const char* aSet){
  *  @update  gess 01/04/99
  *  @return  this
  */
-nsString& nsString::StripWhitespace() {
-  return StripChars(kWhitespace);
+void
+nsString::StripWhitespace() {
+  StripChars(kWhitespace);
 }
 
 /**
@@ -495,7 +496,8 @@ nsString& nsString::StripWhitespace() {
  *  @param  
  *  @return *this 
  */
-nsString& nsString::ReplaceChar(PRUnichar aSourceChar, PRUnichar aDestChar) {
+void
+nsString::ReplaceChar(PRUnichar aSourceChar, PRUnichar aDestChar) {
   PRUint32 theIndex=0;
   if(eTwoByte==mCharSize){
     for(theIndex=0;theIndex<mLength;theIndex++){
@@ -511,7 +513,6 @@ nsString& nsString::ReplaceChar(PRUnichar aSourceChar, PRUnichar aDestChar) {
       }//if
     }
   }
-  return *this;
 }
 
 /**
@@ -521,7 +522,8 @@ nsString& nsString::ReplaceChar(PRUnichar aSourceChar, PRUnichar aDestChar) {
  *  @param  
  *  @return *this 
  */
-nsString& nsString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
+void
+nsString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
   if(aSet){
     PRInt32 theIndex=FindCharInSet(aSet,0);
     while(kNotFound<theIndex) {
@@ -531,7 +533,6 @@ nsString& nsString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
       theIndex=FindCharInSet(aSet,theIndex+1);
     }
   }
-  return *this;
 }
 
 /**
@@ -541,7 +542,8 @@ nsString& nsString::ReplaceChar(const char* aSet, PRUnichar aNewChar){
  *  @param  
  *  @return *this 
  */
-nsString& nsString::ReplaceSubstring(const PRUnichar* aTarget,const PRUnichar* aNewValue){
+void
+nsString::ReplaceSubstring(const PRUnichar* aTarget,const PRUnichar* aNewValue){
   if(aTarget && aNewValue) {
 
     PRInt32 len=nsCRT::strlen(aTarget);
@@ -558,7 +560,7 @@ nsString& nsString::ReplaceSubstring(const PRUnichar* aTarget,const PRUnichar* a
       }
     }
   }
-  return *this;}
+}
 
 /**
  *  This method is used to replace all occurances of the
@@ -568,7 +570,8 @@ nsString& nsString::ReplaceSubstring(const PRUnichar* aTarget,const PRUnichar* a
  *  @param aNewValue
  *  @return *this 
  */
-nsString& nsString::ReplaceSubstring(const nsString& aTarget,const nsString& aNewValue){
+void
+nsString::ReplaceSubstring(const nsString& aTarget,const nsString& aNewValue){
 
 
   //WARNING: This is not working yet!!!!!
@@ -597,7 +600,6 @@ nsString& nsString::ReplaceSubstring(const nsString& aTarget,const nsString& aNe
       }
     }
   }
-  return *this;
 }
 
 /**
@@ -628,7 +630,8 @@ PRInt32 nsString::CountChar(PRUnichar aChar) {
  *           both ends
  *  @return  this
  */
-nsString& nsString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool aEliminateTrailing,PRBool aIgnoreQuotes){
+void
+nsString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool aEliminateTrailing,PRBool aIgnoreQuotes){
 
   if(aTrimSet){
     
@@ -657,7 +660,6 @@ nsString& nsString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool a
     }
 
   }
-  return *this;
 }
 
 /**
@@ -670,15 +672,12 @@ nsString& nsString::Trim(const char* aTrimSet, PRBool aEliminateLeading,PRBool a
  *  @param   aEliminateTrailing controls stripping of trailing ws
  *  @return  this
  */
-nsString& nsString::CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading,PRBool aEliminateTrailing){
+void
+nsString::CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading,PRBool aEliminateTrailing){
   if(aSet){
     ReplaceChar(aSet,aChar);
     nsStr::CompressSet(*this,aSet,aEliminateLeading,aEliminateTrailing);
   }
-
-
-
-  return *this;
 }
 
 /**
@@ -691,10 +690,9 @@ nsString& nsString::CompressSet(const char* aSet, PRUnichar aChar,PRBool aElimin
  *  @param   aEliminateTrailing controls stripping of trailing ws
  *  @return  this
  */
-nsString& nsString::CompressWhitespace( PRBool aEliminateLeading,PRBool aEliminateTrailing){
+void
+nsString::CompressWhitespace( PRBool aEliminateLeading,PRBool aEliminateTrailing){
   CompressSet(kWhitespace,' ',aEliminateLeading,aEliminateTrailing);
-
-  return *this;
 }
 
 /**********************************************************************
diff --git a/mozilla/xpcom/string/obsolete/nsString2.h b/mozilla/xpcom/string/obsolete/nsString2.h
index bafcb690f3e..1537f556105 100644
--- a/mozilla/xpcom/string/obsolete/nsString2.h
+++ b/mozilla/xpcom/string/obsolete/nsString2.h
@@ -306,30 +306,30 @@ public:
    *  @param  aSet -- characters to be cut from this
    *  @return *this 
    */
-  nsString& StripChars(const char* aSet);
-  nsString& StripChar(PRUnichar aChar,PRInt32 anOffset=0);
-  nsString& StripChar(char aChar,PRInt32 anOffset=0) {return StripChar((PRUnichar) (unsigned char)aChar,anOffset); }
-  nsString& StripChar(PRInt32 anInt,PRInt32 anOffset=0) {return StripChar((PRUnichar)anInt,anOffset); }
+  void StripChars( const char* aSet );
+  void StripChar( PRUnichar aChar, PRInt32 anOffset=0 );
+  void StripChar( char aChar, PRInt32 anOffset=0 )       { StripChar((PRUnichar) (unsigned char)aChar,anOffset); }
+  void StripChar( PRInt32 anInt, PRInt32 anOffset=0 )    { StripChar((PRUnichar)anInt,anOffset); }
 
   /**
    *  This method strips whitespace throughout the string
    *  
    *  @return  this
    */
-  nsString& StripWhitespace();
+  void StripWhitespace();
 
   /**
    *  swaps occurence of 1 string for another
    *  
    *  @return  this
    */
-  nsString& ReplaceChar(PRUnichar anOldChar,PRUnichar aNewChar);
-  nsString& ReplaceChar(const char* aSet,PRUnichar aNewChar);
+  void ReplaceChar( PRUnichar anOldChar, PRUnichar aNewChar );
+  void ReplaceChar( const char* aSet, PRUnichar aNewChar );
 
-  nsString& ReplaceSubstring(const nsString& aTarget,const nsString& aNewValue);
-  nsString& ReplaceSubstring(const PRUnichar* aTarget,const PRUnichar* aNewValue);
+  void ReplaceSubstring( const nsString& aTarget, const nsString& aNewValue );
+  void ReplaceSubstring( const PRUnichar* aTarget, const PRUnichar* aNewValue );
 
-  PRInt32 CountChar(PRUnichar aChar);
+  PRInt32 CountChar( PRUnichar aChar );
 
   /**
    *  This method trims characters found in aTrimSet from
@@ -342,7 +342,7 @@ public:
    *  @param   aIgnoreQuotes
    *  @return  this
    */
-  nsString& Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE,PRBool aIgnoreQuotes=PR_FALSE);
+  void Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE,PRBool aIgnoreQuotes=PR_FALSE);
 
   /**
    *  This method strips whitespace from string.
@@ -353,7 +353,7 @@ public:
    *  @param   aEliminateTrailing controls stripping of trailing ws
    *  @return  this
    */
-  nsString& CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+  void CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
 
   /**
    *  This method strips whitespace from string.
@@ -364,7 +364,7 @@ public:
    *  @param   aEliminateTrailing controls stripping of trailing ws
    *  @return  this
    */
-  nsString& CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+  void CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
 
   /**********************************************************************
     string conversion methods...