moved char* conversion operators to nsCString

string/obsolete/nsString.h

@@ -320,6 +320,9 @@ nsCString& CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminat
   string conversion methods...
  *********************************************************************/
 
+    operator char*() {return mStr;}
+    operator const char*() const {return (const char*)mStr;}
+
 /**
  * This method constructs a new nsCString on the stack that is a copy
  * of this string.
@@ -764,9 +767,6 @@ public:
     nsCAutoString& operator=(const PRUnichar* aBuffer) {nsCString::operator=(aBuffer); return *this;}
     nsCAutoString& operator=(PRUnichar aChar) {nsCString::operator=(aChar); return *this;}
 
-    operator char*() {return mStr;}
-    operator const char*() {return (const char*)mStr;}
-
     /**
      * Retrieve the size of this string
      * @return string length

xpcom/ds/nsString.h

@@ -320,6 +320,9 @@ nsCString& CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminat
   string conversion methods...
  *********************************************************************/
 
+    operator char*() {return mStr;}
+    operator const char*() const {return (const char*)mStr;}
+
 /**
  * This method constructs a new nsCString on the stack that is a copy
  * of this string.
@@ -764,9 +767,6 @@ public:
     nsCAutoString& operator=(const PRUnichar* aBuffer) {nsCString::operator=(aBuffer); return *this;}
     nsCAutoString& operator=(PRUnichar aChar) {nsCString::operator=(aChar); return *this;}
 
-    operator char*() {return mStr;}
-    operator const char*() {return (const char*)mStr;}
-
     /**
      * Retrieve the size of this string
      * @return string length

xpcom/string/obsolete/nsString.h

@@ -320,6 +320,9 @@ nsCString& CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminat
   string conversion methods...
  *********************************************************************/
 
+    operator char*() {return mStr;}
+    operator const char*() const {return (const char*)mStr;}
+
 /**
  * This method constructs a new nsCString on the stack that is a copy
  * of this string.
@@ -764,9 +767,6 @@ public:
     nsCAutoString& operator=(const PRUnichar* aBuffer) {nsCString::operator=(aBuffer); return *this;}
     nsCAutoString& operator=(PRUnichar aChar) {nsCString::operator=(aChar); return *this;}
 
-    operator char*() {return mStr;}
-    operator const char*() {return (const char*)mStr;}
-
     /**
      * Retrieve the size of this string
      * @return string length