From 9e0dc2526a5a2befb5cfdfe99e368822ac09f028 Mon Sep 17 00:00:00 2001 From: "scc%mozilla.org" Date: Fri, 9 Mar 2001 06:25:44 +0000 Subject: [PATCH] make include the new headers instead of old git-svn-id: svn://10.0.0.236/branches/STRING_081_BRANCH@89101 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/string/obsolete/nsString.cpp | 10 ++++----- mozilla/string/obsolete/nsString.h | 24 +++++++++++----------- mozilla/xpcom/string/obsolete/nsString.cpp | 10 ++++----- mozilla/xpcom/string/obsolete/nsString.h | 24 +++++++++++----------- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/mozilla/string/obsolete/nsString.cpp b/mozilla/string/obsolete/nsString.cpp index 616dc8041cb..4f50d9f2df3 100644 --- a/mozilla/string/obsolete/nsString.cpp +++ b/mozilla/string/obsolete/nsString.cpp @@ -165,7 +165,7 @@ char* nsCString::GetWritableFragment( nsWritableFragment& aFragment, nsFra } } -nsCString::nsCString( const nsAReadableCString& aReadable ) { +nsCString::nsCString( const nsACString& aReadable ) { Initialize(*this,eOneByte); Assign(aReadable); } @@ -774,7 +774,7 @@ void nsCString::AssignWithConversion( const nsString& aString ) { AssignWithConversion(aString.GetUnicode(), aString.Length()); } -void nsCString::AssignWithConversion( const nsAReadableString& aString ) { +void nsCString::AssignWithConversion( const nsAString& aString ) { nsStr::StrTruncate(*this,0); PRInt32 count = aString.Length(); @@ -798,7 +798,7 @@ void nsCString::AssignWithConversion( const nsAReadableString& aString ) { } } -void nsCString::AppendWithConversion( const nsAReadableString& aString ) { +void nsCString::AppendWithConversion( const nsAString& aString ) { PRInt32 count = aString.Length(); if(count){ @@ -1366,7 +1366,7 @@ void nsCString::DebugDump(void) const { //---------------------------------------------------------------------- -NS_ConvertUCS2toUTF8::NS_ConvertUCS2toUTF8( const nsAReadableString& aString ) +NS_ConvertUCS2toUTF8::NS_ConvertUCS2toUTF8( const nsAString& aString ) { nsReadingIterator start; aString.BeginReading(start); nsReadingIterator end; aString.EndReading(end); @@ -1495,7 +1495,7 @@ nsCAutoString::nsCAutoString( const nsCString& aString ) : nsCString(){ Append(aString); } -nsCAutoString::nsCAutoString( const nsAReadableCString& aString ) : nsCString(){ +nsCAutoString::nsCAutoString( const nsACString& aString ) : nsCString(){ Initialize(*this,mBuffer,sizeof(mBuffer)-1,0,eOneByte,PR_FALSE); AddNullTerminator(*this); Append(aString); diff --git a/mozilla/string/obsolete/nsString.h b/mozilla/string/obsolete/nsString.h index 4e0c889fdda..0c9fba9c42b 100644 --- a/mozilla/string/obsolete/nsString.h +++ b/mozilla/string/obsolete/nsString.h @@ -50,8 +50,8 @@ #include "nsStr.h" #include "nsIAtom.h" -#include "nsAWritableString.h" -#include "nsLiteralString.h" +#include "nsAString.h" +#include "nsLocalString.h" class NS_COM nsSubsumeCStr; @@ -79,7 +79,7 @@ public: */ nsCString(const nsCString& aString); - explicit nsCString( const nsAReadableCString& ); + explicit nsCString( const nsACString& ); explicit nsCString(const char*); nsCString(const char*, PRInt32); @@ -305,14 +305,14 @@ public: */ nsCString& operator=( const nsCString& aString ) { Assign(aString); return *this; } - nsCString& operator=( const nsAReadableCString& aReadable ) { Assign(aReadable); return *this; } + nsCString& operator=( const nsACString& aReadable ) { Assign(aReadable); return *this; } //nsCString& operator=( const nsPromiseReadable& aReadable ) { Assign(aReadable); return *this; } nsCString& operator=( const char* aPtr ) { Assign(aPtr); return *this; } nsCString& operator=( char aChar ) { Assign(aChar); return *this; } void AssignWithConversion(const PRUnichar*,PRInt32=-1); void AssignWithConversion( const nsString& aString ); - void AssignWithConversion( const nsAReadableString& aString ); + void AssignWithConversion( const nsAString& aString ); void AssignWithConversion(PRUnichar); /* @@ -327,7 +327,7 @@ public: void AppendWithConversion(const nsString&, PRInt32=-1); void AppendWithConversion(PRUnichar aChar); - void AppendWithConversion( const nsAReadableString& aString ); + void AppendWithConversion( const nsAString& aString ); void AppendWithConversion(const PRUnichar*, PRInt32=-1); // Why no |AppendWithConversion(const PRUnichar*, PRInt32)|? --- now I know, because implicit construction hid the need for this routine void AppendInt(PRInt32 aInteger,PRInt32 aRadix=10); //radix=8,10 or 16 @@ -338,8 +338,8 @@ public: // Why no |InsertWithConversion(PRUnichar*)|? #if 0 - virtual void do_AppendFromReadable( const nsAReadableCString& ); - virtual void do_InsertFromReadable( const nsAReadableCString&, PRUint32 ); + virtual void do_AppendFromReadable( const nsACString& ); + virtual void do_InsertFromReadable( const nsACString&, PRUint32 ); #endif @@ -475,7 +475,7 @@ public: nsCAutoString(); explicit nsCAutoString(const nsCString& ); - explicit nsCAutoString(const nsAReadableCString& aString); + explicit nsCAutoString(const nsACString& aString); explicit nsCAutoString(const char* aString); nsCAutoString(const char* aString,PRInt32 aLength); explicit nsCAutoString(const CBufDescriptor& aBuffer); @@ -491,7 +491,7 @@ public: private: void operator=( PRUnichar ); // NOT TO BE IMPLEMENTED public: - nsCAutoString& operator=( const nsAReadableCString& aReadable ) { Assign(aReadable); return *this; } + nsCAutoString& operator=( const nsACString& aReadable ) { Assign(aReadable); return *this; } // nsCAutoString& operator=( const nsPromiseReadable& aReadable ) { Assign(aReadable); return *this; } nsCAutoString& operator=( const char* aPtr ) { Assign(aPtr); return *this; } nsCAutoString& operator=( char aChar ) { Assign(aChar); return *this; } @@ -534,7 +534,7 @@ class NS_COM NS_ConvertUCS2toUTF8 Append( &aChar, 1 ); } - explicit NS_ConvertUCS2toUTF8( const nsAReadableString& aString ); + explicit NS_ConvertUCS2toUTF8( const nsAString& aString ); const char* get() const { @@ -575,7 +575,7 @@ public: nsSubsumeCStr(char* aString,PRBool assumeOwnership,PRInt32 aLength=-1); nsSubsumeCStr& operator=( const nsSubsumeCStr& aString ) { Assign(aString); return *this; } - nsSubsumeCStr& operator=( const nsAReadableCString& aReadable ) { Assign(aReadable); return *this; } + nsSubsumeCStr& operator=( const nsACString& aReadable ) { Assign(aReadable); return *this; } //nsSubsumeCStr& operator=( const nsPromiseReadable& aReadable ) { Assign(aReadable); return *this; } nsSubsumeCStr& operator=( const char* aPtr ) { Assign(aPtr); return *this; } nsSubsumeCStr& operator=( char aChar ) { Assign(aChar); return *this; } diff --git a/mozilla/xpcom/string/obsolete/nsString.cpp b/mozilla/xpcom/string/obsolete/nsString.cpp index 616dc8041cb..4f50d9f2df3 100644 --- a/mozilla/xpcom/string/obsolete/nsString.cpp +++ b/mozilla/xpcom/string/obsolete/nsString.cpp @@ -165,7 +165,7 @@ char* nsCString::GetWritableFragment( nsWritableFragment& aFragment, nsFra } } -nsCString::nsCString( const nsAReadableCString& aReadable ) { +nsCString::nsCString( const nsACString& aReadable ) { Initialize(*this,eOneByte); Assign(aReadable); } @@ -774,7 +774,7 @@ void nsCString::AssignWithConversion( const nsString& aString ) { AssignWithConversion(aString.GetUnicode(), aString.Length()); } -void nsCString::AssignWithConversion( const nsAReadableString& aString ) { +void nsCString::AssignWithConversion( const nsAString& aString ) { nsStr::StrTruncate(*this,0); PRInt32 count = aString.Length(); @@ -798,7 +798,7 @@ void nsCString::AssignWithConversion( const nsAReadableString& aString ) { } } -void nsCString::AppendWithConversion( const nsAReadableString& aString ) { +void nsCString::AppendWithConversion( const nsAString& aString ) { PRInt32 count = aString.Length(); if(count){ @@ -1366,7 +1366,7 @@ void nsCString::DebugDump(void) const { //---------------------------------------------------------------------- -NS_ConvertUCS2toUTF8::NS_ConvertUCS2toUTF8( const nsAReadableString& aString ) +NS_ConvertUCS2toUTF8::NS_ConvertUCS2toUTF8( const nsAString& aString ) { nsReadingIterator start; aString.BeginReading(start); nsReadingIterator end; aString.EndReading(end); @@ -1495,7 +1495,7 @@ nsCAutoString::nsCAutoString( const nsCString& aString ) : nsCString(){ Append(aString); } -nsCAutoString::nsCAutoString( const nsAReadableCString& aString ) : nsCString(){ +nsCAutoString::nsCAutoString( const nsACString& aString ) : nsCString(){ Initialize(*this,mBuffer,sizeof(mBuffer)-1,0,eOneByte,PR_FALSE); AddNullTerminator(*this); Append(aString); diff --git a/mozilla/xpcom/string/obsolete/nsString.h b/mozilla/xpcom/string/obsolete/nsString.h index 4e0c889fdda..0c9fba9c42b 100644 --- a/mozilla/xpcom/string/obsolete/nsString.h +++ b/mozilla/xpcom/string/obsolete/nsString.h @@ -50,8 +50,8 @@ #include "nsStr.h" #include "nsIAtom.h" -#include "nsAWritableString.h" -#include "nsLiteralString.h" +#include "nsAString.h" +#include "nsLocalString.h" class NS_COM nsSubsumeCStr; @@ -79,7 +79,7 @@ public: */ nsCString(const nsCString& aString); - explicit nsCString( const nsAReadableCString& ); + explicit nsCString( const nsACString& ); explicit nsCString(const char*); nsCString(const char*, PRInt32); @@ -305,14 +305,14 @@ public: */ nsCString& operator=( const nsCString& aString ) { Assign(aString); return *this; } - nsCString& operator=( const nsAReadableCString& aReadable ) { Assign(aReadable); return *this; } + nsCString& operator=( const nsACString& aReadable ) { Assign(aReadable); return *this; } //nsCString& operator=( const nsPromiseReadable& aReadable ) { Assign(aReadable); return *this; } nsCString& operator=( const char* aPtr ) { Assign(aPtr); return *this; } nsCString& operator=( char aChar ) { Assign(aChar); return *this; } void AssignWithConversion(const PRUnichar*,PRInt32=-1); void AssignWithConversion( const nsString& aString ); - void AssignWithConversion( const nsAReadableString& aString ); + void AssignWithConversion( const nsAString& aString ); void AssignWithConversion(PRUnichar); /* @@ -327,7 +327,7 @@ public: void AppendWithConversion(const nsString&, PRInt32=-1); void AppendWithConversion(PRUnichar aChar); - void AppendWithConversion( const nsAReadableString& aString ); + void AppendWithConversion( const nsAString& aString ); void AppendWithConversion(const PRUnichar*, PRInt32=-1); // Why no |AppendWithConversion(const PRUnichar*, PRInt32)|? --- now I know, because implicit construction hid the need for this routine void AppendInt(PRInt32 aInteger,PRInt32 aRadix=10); //radix=8,10 or 16 @@ -338,8 +338,8 @@ public: // Why no |InsertWithConversion(PRUnichar*)|? #if 0 - virtual void do_AppendFromReadable( const nsAReadableCString& ); - virtual void do_InsertFromReadable( const nsAReadableCString&, PRUint32 ); + virtual void do_AppendFromReadable( const nsACString& ); + virtual void do_InsertFromReadable( const nsACString&, PRUint32 ); #endif @@ -475,7 +475,7 @@ public: nsCAutoString(); explicit nsCAutoString(const nsCString& ); - explicit nsCAutoString(const nsAReadableCString& aString); + explicit nsCAutoString(const nsACString& aString); explicit nsCAutoString(const char* aString); nsCAutoString(const char* aString,PRInt32 aLength); explicit nsCAutoString(const CBufDescriptor& aBuffer); @@ -491,7 +491,7 @@ public: private: void operator=( PRUnichar ); // NOT TO BE IMPLEMENTED public: - nsCAutoString& operator=( const nsAReadableCString& aReadable ) { Assign(aReadable); return *this; } + nsCAutoString& operator=( const nsACString& aReadable ) { Assign(aReadable); return *this; } // nsCAutoString& operator=( const nsPromiseReadable& aReadable ) { Assign(aReadable); return *this; } nsCAutoString& operator=( const char* aPtr ) { Assign(aPtr); return *this; } nsCAutoString& operator=( char aChar ) { Assign(aChar); return *this; } @@ -534,7 +534,7 @@ class NS_COM NS_ConvertUCS2toUTF8 Append( &aChar, 1 ); } - explicit NS_ConvertUCS2toUTF8( const nsAReadableString& aString ); + explicit NS_ConvertUCS2toUTF8( const nsAString& aString ); const char* get() const { @@ -575,7 +575,7 @@ public: nsSubsumeCStr(char* aString,PRBool assumeOwnership,PRInt32 aLength=-1); nsSubsumeCStr& operator=( const nsSubsumeCStr& aString ) { Assign(aString); return *this; } - nsSubsumeCStr& operator=( const nsAReadableCString& aReadable ) { Assign(aReadable); return *this; } + nsSubsumeCStr& operator=( const nsACString& aReadable ) { Assign(aReadable); return *this; } //nsSubsumeCStr& operator=( const nsPromiseReadable& aReadable ) { Assign(aReadable); return *this; } nsSubsumeCStr& operator=( const char* aPtr ) { Assign(aPtr); return *this; } nsSubsumeCStr& operator=( char aChar ) { Assign(aChar); return *this; }