Condition nsAutoString operator=() and some Assign() based on NEW_STRING_APIS. r=scc

git-svn-id: svn://10.0.0.236/trunk@63956 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
waterson%netscape.com
2000-03-24 00:40:47 +00:00
parent c16ef3cc46
commit 230de8a1d0
6 changed files with 45 additions and 12 deletions

View File

@@ -443,9 +443,15 @@ public:
* Functionally equivalent to assign or operator=
*
*/
nsString& SetString(const char* aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
nsString& SetString(const PRUnichar* aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
nsString& SetString(const nsString& aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
#ifdef NEW_STRING_APIS
nsString& SetString(const char* aString,PRInt32 aLength=-1) {Assign(aString); return *this;}
nsString& SetString(const PRUnichar* aString,PRInt32 aLength=-1) {Assign(aString); return *this;}
nsString& SetString(const nsString& aString,PRInt32 aLength=-1) {Assign(aString); return *this;}
#else
nsString& SetString(const char* aString,PRInt32 aLength=-1) {return Assign(aString, aLength);}
nsString& SetString(const PRUnichar* aString,PRInt32 aLength=-1) {return Assign(aString, aLength);}
nsString& SetString(const nsString& aString,PRInt32 aLength=-1) {return Assign(aString, aLength);}
#endif
/**
* assign given string to this string
@@ -455,7 +461,9 @@ public:
* @return this
*/
#ifndef NEW_STRING_APIS
nsString& Assign(const nsStr& aString,PRInt32 aCount=-1);
#endif
nsString& Assign(const char* aString,PRInt32 aCount=-1);
nsString& Assign(const PRUnichar* aString,PRInt32 aCount=-1);
nsString& Assign(char aChar);
@@ -875,12 +883,14 @@ public:
nsAutoString(PRUnichar aChar);
virtual ~nsAutoString();
#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 PRUnichar* aBuffer) {nsString::Assign(aBuffer); return *this;}
nsAutoString& operator=(PRUnichar aChar) {nsString::Assign(aChar); return *this;}
#endif
/**
* Retrieve the size of this string