From 58badaae121f2d8fc80bd40b6b1e5b7b0856aeab Mon Sep 17 00:00:00 2001 From: "dbaron%fas.harvard.edu" Date: Sat, 23 Mar 2002 21:35:01 +0000 Subject: [PATCH] Convert users of nsAReadable[C]String and nsAWritable[C]String typedefs to [const] nsA[C]String. b=131899 r=scc sr=jag a=asa git-svn-id: svn://10.0.0.236/trunk@117340 18797224-902f-48f8-a5cc-f745e15eee43 --- .../browser/powerplant/source/UMacUnicode.cpp | 8 ++++---- .../browser/powerplant/source/UMacUnicode.h | 8 ++++---- .../browser/webBrowser/nsDocShellTreeOwner.cpp | 2 +- .../browser/webBrowser/nsDocShellTreeOwner.h | 2 +- .../commandhandler/src/nsCommandGroup.cpp | 2 +- .../commandhandler/src/nsCommandManager.h | 2 +- .../commandhandler/src/nsCommandParams.cpp | 4 ++-- .../commandhandler/src/nsCommandParams.h | 6 +++--- .../components/windowwatcher/src/nsPrompt.cpp | 1 + mozilla/gfx/src/freetype/nsFT2FontCatalog.cpp | 14 +++++++------- mozilla/gfx/src/freetype/nsFT2FontCatalog.h | 8 ++++---- mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp | 10 +++++----- mozilla/gfx/src/gtk/nsFontMetricsGTK.h | 2 +- mozilla/gfx/src/x11shared/nsFT2FontCatalog.cpp | 14 +++++++------- mozilla/gfx/src/x11shared/nsFT2FontCatalog.h | 8 ++++---- mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp | 10 +++++----- mozilla/gfx/src/xlib/nsFontMetricsXlib.h | 2 +- mozilla/netwerk/base/public/nsReadLine.h | 2 +- mozilla/netwerk/base/src/nsFileStreams.cpp | 2 +- mozilla/netwerk/cache/src/nsCache.cpp | 5 +++-- mozilla/netwerk/cache/src/nsCache.h | 6 +++--- mozilla/netwerk/cache/src/nsCacheEntry.cpp | 8 ++++---- mozilla/netwerk/cache/src/nsCacheEntry.h | 10 +++++----- .../netwerk/cache/src/nsCacheEntryDescriptor.cpp | 2 +- mozilla/netwerk/cache/src/nsCacheMetaData.cpp | 10 +++++----- mozilla/netwerk/cache/src/nsCacheMetaData.h | 8 ++++---- .../protocol/about/src/nsAboutRedirector.cpp | 2 +- .../streamconv/converters/nsFTPDirListingConv.cpp | 2 +- .../streamconv/converters/nsFTPDirListingConv.h | 2 +- 29 files changed, 82 insertions(+), 80 deletions(-) diff --git a/mozilla/embedding/browser/powerplant/source/UMacUnicode.cpp b/mozilla/embedding/browser/powerplant/source/UMacUnicode.cpp index 38f14d12933..787609f3a85 100644 --- a/mozilla/embedding/browser/powerplant/source/UMacUnicode.cpp +++ b/mozilla/embedding/browser/powerplant/source/UMacUnicode.cpp @@ -127,7 +127,7 @@ CPlatformUCSConversion::PrepareDecoder() NS_IMETHODIMP -CPlatformUCSConversion::UCSToPlatform(const nsAReadableString& aIn, nsAWritableCString& aOut) +CPlatformUCSConversion::UCSToPlatform(const nsAString& aIn, nsACString& aOut) { nsresult res; @@ -168,7 +168,7 @@ CPlatformUCSConversion::UCSToPlatform(const nsAReadableString& aIn, nsAWritableC NS_IMETHODIMP -CPlatformUCSConversion::UCSToPlatform(const nsAReadableString& aIn, Str255& aOut) +CPlatformUCSConversion::UCSToPlatform(const nsAString& aIn, Str255& aOut) { nsresult res; nsCAutoString cStr; @@ -187,7 +187,7 @@ CPlatformUCSConversion::UCSToPlatform(const nsAReadableString& aIn, Str255& aOut NS_IMETHODIMP -CPlatformUCSConversion::PlatformToUCS(const nsAReadableCString& aIn, nsAWritableString& aOut) +CPlatformUCSConversion::PlatformToUCS(const nsACString& aIn, nsAString& aOut) { nsresult res; @@ -227,7 +227,7 @@ CPlatformUCSConversion::PlatformToUCS(const nsAReadableCString& aIn, nsAWritable } NS_IMETHODIMP -CPlatformUCSConversion::PlatformToUCS(const Str255& aIn, nsAWritableString& aOut) +CPlatformUCSConversion::PlatformToUCS(const Str255& aIn, nsAString& aOut) { char charBuf[256]; diff --git a/mozilla/embedding/browser/powerplant/source/UMacUnicode.h b/mozilla/embedding/browser/powerplant/source/UMacUnicode.h index 8e2e99f04c2..39ac8e0b035 100644 --- a/mozilla/embedding/browser/powerplant/source/UMacUnicode.h +++ b/mozilla/embedding/browser/powerplant/source/UMacUnicode.h @@ -39,11 +39,11 @@ public: NS_IMETHOD SetCharsetSelector(nsPlatformCharsetSel aSel); - NS_IMETHOD UCSToPlatform(const nsAReadableString& aIn, nsAWritableCString& aOut); - NS_IMETHOD UCSToPlatform(const nsAReadableString& aIn, Str255& aOut); + NS_IMETHOD UCSToPlatform(const nsAString& aIn, nsACString& aOut); + NS_IMETHOD UCSToPlatform(const nsAString& aIn, Str255& aOut); - NS_IMETHOD PlatformToUCS(const nsAReadableCString& ain, nsAWritableString& aOut); - NS_IMETHOD PlatformToUCS(const Str255& aIn, nsAWritableString& aOut); + NS_IMETHOD PlatformToUCS(const nsACString& ain, nsAString& aOut); + NS_IMETHOD PlatformToUCS(const Str255& aIn, nsAString& aOut); private: static CPlatformUCSConversion *mgInstance; diff --git a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp index 45efd1eac6b..301ce8b3928 100644 --- a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp +++ b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp @@ -1198,7 +1198,7 @@ ChromeTooltipListener::MouseMove(nsIDOMEvent* aMouseEvent) // Tell the registered chrome that they should show the tooltip // NS_IMETHODIMP -ChromeTooltipListener :: ShowTooltip ( PRInt32 inXCoords, PRInt32 inYCoords, const nsAReadableString & inTipText ) +ChromeTooltipListener :: ShowTooltip ( PRInt32 inXCoords, PRInt32 inYCoords, const nsAString & inTipText ) { nsresult rv = NS_OK; diff --git a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.h b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.h index 8919d63757d..e6c15e7b692 100644 --- a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.h +++ b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.h @@ -192,7 +192,7 @@ private: NS_IMETHOD AddTooltipListener(); NS_IMETHOD RemoveTooltipListener(); - NS_IMETHOD ShowTooltip ( PRInt32 inXCoords, PRInt32 inYCoords, const nsAReadableString & inTipText ) ; + NS_IMETHOD ShowTooltip ( PRInt32 inXCoords, PRInt32 inYCoords, const nsAString & inTipText ) ; NS_IMETHOD HideTooltip ( ) ; nsWebBrowser* mWebBrowser; diff --git a/mozilla/embedding/components/commandhandler/src/nsCommandGroup.cpp b/mozilla/embedding/components/commandhandler/src/nsCommandGroup.cpp index 36d84e1de5d..3500b77a1c0 100644 --- a/mozilla/embedding/components/commandhandler/src/nsCommandGroup.cpp +++ b/mozilla/embedding/components/commandhandler/src/nsCommandGroup.cpp @@ -337,7 +337,7 @@ nsControllerCommandGroup::GetGroupsEnumerator(nsISimpleEnumerator **_retval) /* nsISimpleEnumerator getEnumeratorForGroup (in DOMString aGroup); */ NS_IMETHODIMP -nsControllerCommandGroup::GetEnumeratorForGroup(const nsAReadableString & aGroup, nsISimpleEnumerator **_retval) +nsControllerCommandGroup::GetEnumeratorForGroup(const nsAString & aGroup, nsISimpleEnumerator **_retval) { nsStringKey groupKey(aGroup); nsVoidArray* commandList = (nsVoidArray *)mGroupsHash.Get(&groupKey); // may be null diff --git a/mozilla/embedding/components/commandhandler/src/nsCommandManager.h b/mozilla/embedding/components/commandhandler/src/nsCommandManager.h index f4bc6cbfea0..cefd1aabcb6 100644 --- a/mozilla/embedding/components/commandhandler/src/nsCommandManager.h +++ b/mozilla/embedding/components/commandhandler/src/nsCommandManager.h @@ -73,7 +73,7 @@ public: protected: - nsresult GetControllerForCommand(const nsAReadableString& aCommand, nsIController** outController); + nsresult GetControllerForCommand(const nsAString& aCommand, nsIController** outController); protected: diff --git a/mozilla/embedding/components/commandhandler/src/nsCommandParams.cpp b/mozilla/embedding/components/commandhandler/src/nsCommandParams.cpp index a93114eb7ca..ce9ea8e1e75 100644 --- a/mozilla/embedding/components/commandhandler/src/nsCommandParams.cpp +++ b/mozilla/embedding/components/commandhandler/src/nsCommandParams.cpp @@ -148,7 +148,7 @@ NS_IMETHODIMP nsCommandParams::GetDoubleValue(const nsAString & name, double *_r } /* AString getStringValue (in AString name); */ -NS_IMETHODIMP nsCommandParams::GetStringValue(const nsAString & name, nsAWritableString & _retval) +NS_IMETHODIMP nsCommandParams::GetStringValue(const nsAString & name, nsAString & _retval) { _retval.Truncate(); HashEntry* foundEntry = GetNamedEntry(name); @@ -403,7 +403,7 @@ nsCommandParams::First() /* AString getNext (); */ NS_IMETHODIMP -nsCommandParams::GetNext(nsAWritableString & _retval) +nsCommandParams::GetNext(nsAString & _retval) { HashEntry* thisEntry = GetIndexedEntry(mCurEntry); if (!thisEntry) diff --git a/mozilla/embedding/components/commandhandler/src/nsCommandParams.h b/mozilla/embedding/components/commandhandler/src/nsCommandParams.h index 0e4cc7951ce..a88767edee5 100644 --- a/mozilla/embedding/components/commandhandler/src/nsCommandParams.h +++ b/mozilla/embedding/components/commandhandler/src/nsCommandParams.h @@ -82,7 +82,7 @@ protected: nsString* mString; nsCOMPtr mISupports; - HashEntry(PRUint8 inType, const nsAReadableString& inEntryName) + HashEntry(PRUint8 inType, const nsAString& inEntryName) : mEntryType(inType) , mEntryName(inEntryName) , mString(nsnull) @@ -138,11 +138,11 @@ protected: }; - HashEntry* GetNamedEntry(const nsAReadableString& name); + HashEntry* GetNamedEntry(const nsAString& name); HashEntry* GetIndexedEntry(PRInt32 index); PRUint32 GetNumEntries(); - nsresult GetOrMakeEntry(const nsAReadableString& name, PRUint8 entryType, HashEntry*& outEntry); + nsresult GetOrMakeEntry(const nsAString& name, PRUint8 entryType, HashEntry*& outEntry); protected: diff --git a/mozilla/embedding/components/windowwatcher/src/nsPrompt.cpp b/mozilla/embedding/components/windowwatcher/src/nsPrompt.cpp index 1bb4104f33b..49ce953ef78 100644 --- a/mozilla/embedding/components/windowwatcher/src/nsPrompt.cpp +++ b/mozilla/embedding/components/windowwatcher/src/nsPrompt.cpp @@ -40,6 +40,7 @@ #include "nsIAuthPromptWrapper.h" #include "nsPrompt.h" #include "nsReadableUtils.h" +#include "nsDependentString.h" nsresult diff --git a/mozilla/gfx/src/freetype/nsFT2FontCatalog.cpp b/mozilla/gfx/src/freetype/nsFT2FontCatalog.cpp index bc40d64266e..3c63689c850 100644 --- a/mozilla/gfx/src/freetype/nsFT2FontCatalog.cpp +++ b/mozilla/gfx/src/freetype/nsFT2FontCatalog.cpp @@ -888,10 +888,10 @@ cleanup_and_return: } PRBool -nsFT2FontCatalog::GetFontSummaryName(nsAReadableCString &aFontDirName, - nsAReadableCString &aFontSummariesDir, - nsAWritableCString &aFontSummaryFileName, - nsAWritableCString +nsFT2FontCatalog::GetFontSummaryName(const nsACString &aFontDirName, + const nsACString &aFontSummariesDir, + nsACString &aFontSummaryFileName, + nsACString &aFallbackFontSummaryFileName) { int error; @@ -1055,8 +1055,8 @@ nsFT2FontCatalog::GetRange2CharSetName(unsigned long aBit) PRBool nsFT2FontCatalog::HandleFontDir(FT_Library aFreeTypeLibrary, nsFontCatalog *aFontCatalog, - nsAReadableCString &aFontSummariesDir, - nsAReadableCString &aFontDirName) + const nsACString &aFontSummariesDir, + const nsACString &aFontDirName) { int i, status = -1; PRBool rslt, current; @@ -2405,7 +2405,7 @@ nsFT2FontCatalog::PrintPageBits(nsNameValuePairDB *aDB, PRUint16 *aCCMap, } PRBool -nsFT2FontCatalog::ReadFontDirSummary(nsAReadableCString& aFontSummaryFilename, +nsFT2FontCatalog::ReadFontDirSummary(const nsACString& aFontSummaryFilename, nsHashtable* aFontFileNamesHash) { nsNameValuePairDB fc; diff --git a/mozilla/gfx/src/freetype/nsFT2FontCatalog.h b/mozilla/gfx/src/freetype/nsFT2FontCatalog.h index 8ad1b451f79..fcbaeda29b9 100644 --- a/mozilla/gfx/src/freetype/nsFT2FontCatalog.h +++ b/mozilla/gfx/src/freetype/nsFT2FontCatalog.h @@ -186,13 +186,13 @@ protected: void doGetDirsPrefEnumCallback(const char* aName, void* aClosure); int GetFontCatalog(FT_LibraryRec_*, nsFontCatalog *, nsDirCatalog *); void doGetFontNames(const char* aPattern, nsFontNodeArray* aNodes); - PRBool GetFontSummaryName(nsAReadableCString &, nsAReadableCString &, - nsAWritableCString &, nsAWritableCString &); + PRBool GetFontSummaryName(const nsACString &, const nsACString &, + nsACString &, nsACString &); const char* GetFoundry(nsFontCatalogEntry *aFce); const char* GetRange1CharSetName(unsigned long aBit); const char* GetRange2CharSetName(unsigned long aBit); PRBool HandleFontDir(FT_LibraryRec_ *, nsFontCatalog *, - nsAReadableCString &, nsAReadableCString &); + const nsACString &, const nsACString &); void HandleFontFile(FT_LibraryRec_ *, nsFontCatalog *, const char*); PRBool doInitGlobals(FT_LibraryRec_ *); PRBool IsSpace(FT_Long); @@ -202,7 +202,7 @@ protected: nsFontCatalogEntry* NewFceFromFontFile(FT_LibraryRec_*, const char*,int,int*); nsFontCatalogEntry* NewFceFromSummary(nsNameValuePairDB *aDB); nsFontCatalog *NewFontCatalog(); - PRBool ReadFontDirSummary(nsAReadableCString&, nsHashtable*); + PRBool ReadFontDirSummary(const nsACString&, nsHashtable*); PRBool ParseCCMapLine(nsCompressedCharMap*,long,const char*); PRBool ParseXLFD(char *, char**, char**, char**, char**); void PrintCCMap(nsNameValuePairDB *aDB, PRUint16 *aCCMap); diff --git a/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp b/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp index 930edddb9d4..9622fed4e71 100644 --- a/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp +++ b/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp @@ -57,7 +57,7 @@ #include "nspr.h" #include "nsHashtable.h" #include "nsReadableUtils.h" -#include "nsAWritableString.h" +#include "nsAString.h" #include "nsXPIDLString.h" #include "nsFT2FontCatalog.h" #include "nsFreeType.h" @@ -4092,7 +4092,7 @@ nsFontMetricsGTK::FamilyExists(const nsString& aName) // convert a FFRE (Foundry-Family-Registry-Encoding) To XLFD Pattern // static void -FFREToXLFDPattern(nsAWritableCString &aFFREName, nsAWritableCString &oPattern) +FFREToXLFDPattern(nsACString &aFFREName, nsACString &oPattern) { oPattern.Append("-"); oPattern.Append(aFFREName); @@ -4106,7 +4106,7 @@ FFREToXLFDPattern(nsAWritableCString &aFFREName, nsAWritableCString &oPattern) // substitute the charset in a FFRE (Foundry-Family-Registry-Encoding) // static void -FFRESubstituteCharset(nsAWritableCString &aFFREName, +FFRESubstituteCharset(nsACString &aFFREName, const char *aReplacementCharset) { PRInt32 charsetHyphen = aFFREName.FindChar('-'); @@ -4119,7 +4119,7 @@ FFRESubstituteCharset(nsAWritableCString &aFFREName, // substitute the encoding in a FFRE (Foundry-Family-Registry-Encoding) // static void -FFRESubstituteEncoding(nsAWritableCString &aFFREName, +FFRESubstituteEncoding(nsACString &aFFREName, const char *aReplacementEncoding) { PRInt32 encodingHyphen = aFFREName.FindChar('-'); @@ -4130,7 +4130,7 @@ FFRESubstituteEncoding(nsAWritableCString &aFFREName, } nsFontGTK* -nsFontMetricsGTK::TryNodes(nsAWritableCString &aFFREName, PRUnichar aChar) +nsFontMetricsGTK::TryNodes(nsACString &aFFREName, PRUnichar aChar) { FIND_FONT_PRINTF((" TryNodes aFFREName = %s", PromiseFlatCString(aFFREName).get())); diff --git a/mozilla/gfx/src/gtk/nsFontMetricsGTK.h b/mozilla/gfx/src/gtk/nsFontMetricsGTK.h index f8756cf22cf..cdcdda5eea0 100644 --- a/mozilla/gfx/src/gtk/nsFontMetricsGTK.h +++ b/mozilla/gfx/src/gtk/nsFontMetricsGTK.h @@ -313,7 +313,7 @@ public: nsFontGTK* TryAliases(nsCString* aName, PRUnichar aChar); nsFontGTK* TryFamily(nsCString* aName, PRUnichar aChar); nsFontGTK* TryNode(nsCString* aName, PRUnichar aChar); - nsFontGTK* TryNodes(nsAWritableCString &aFFREName, PRUnichar aChar); + nsFontGTK* TryNodes(nsACString &aFFREName, PRUnichar aChar); nsFontGTK* TryLangGroup(nsIAtom* aLangGroup, nsCString* aName, PRUnichar aChar); nsFontGTK* AddToLoadedFontsList(nsFontGTK* aFont); diff --git a/mozilla/gfx/src/x11shared/nsFT2FontCatalog.cpp b/mozilla/gfx/src/x11shared/nsFT2FontCatalog.cpp index bc40d64266e..3c63689c850 100644 --- a/mozilla/gfx/src/x11shared/nsFT2FontCatalog.cpp +++ b/mozilla/gfx/src/x11shared/nsFT2FontCatalog.cpp @@ -888,10 +888,10 @@ cleanup_and_return: } PRBool -nsFT2FontCatalog::GetFontSummaryName(nsAReadableCString &aFontDirName, - nsAReadableCString &aFontSummariesDir, - nsAWritableCString &aFontSummaryFileName, - nsAWritableCString +nsFT2FontCatalog::GetFontSummaryName(const nsACString &aFontDirName, + const nsACString &aFontSummariesDir, + nsACString &aFontSummaryFileName, + nsACString &aFallbackFontSummaryFileName) { int error; @@ -1055,8 +1055,8 @@ nsFT2FontCatalog::GetRange2CharSetName(unsigned long aBit) PRBool nsFT2FontCatalog::HandleFontDir(FT_Library aFreeTypeLibrary, nsFontCatalog *aFontCatalog, - nsAReadableCString &aFontSummariesDir, - nsAReadableCString &aFontDirName) + const nsACString &aFontSummariesDir, + const nsACString &aFontDirName) { int i, status = -1; PRBool rslt, current; @@ -2405,7 +2405,7 @@ nsFT2FontCatalog::PrintPageBits(nsNameValuePairDB *aDB, PRUint16 *aCCMap, } PRBool -nsFT2FontCatalog::ReadFontDirSummary(nsAReadableCString& aFontSummaryFilename, +nsFT2FontCatalog::ReadFontDirSummary(const nsACString& aFontSummaryFilename, nsHashtable* aFontFileNamesHash) { nsNameValuePairDB fc; diff --git a/mozilla/gfx/src/x11shared/nsFT2FontCatalog.h b/mozilla/gfx/src/x11shared/nsFT2FontCatalog.h index 8ad1b451f79..fcbaeda29b9 100644 --- a/mozilla/gfx/src/x11shared/nsFT2FontCatalog.h +++ b/mozilla/gfx/src/x11shared/nsFT2FontCatalog.h @@ -186,13 +186,13 @@ protected: void doGetDirsPrefEnumCallback(const char* aName, void* aClosure); int GetFontCatalog(FT_LibraryRec_*, nsFontCatalog *, nsDirCatalog *); void doGetFontNames(const char* aPattern, nsFontNodeArray* aNodes); - PRBool GetFontSummaryName(nsAReadableCString &, nsAReadableCString &, - nsAWritableCString &, nsAWritableCString &); + PRBool GetFontSummaryName(const nsACString &, const nsACString &, + nsACString &, nsACString &); const char* GetFoundry(nsFontCatalogEntry *aFce); const char* GetRange1CharSetName(unsigned long aBit); const char* GetRange2CharSetName(unsigned long aBit); PRBool HandleFontDir(FT_LibraryRec_ *, nsFontCatalog *, - nsAReadableCString &, nsAReadableCString &); + const nsACString &, const nsACString &); void HandleFontFile(FT_LibraryRec_ *, nsFontCatalog *, const char*); PRBool doInitGlobals(FT_LibraryRec_ *); PRBool IsSpace(FT_Long); @@ -202,7 +202,7 @@ protected: nsFontCatalogEntry* NewFceFromFontFile(FT_LibraryRec_*, const char*,int,int*); nsFontCatalogEntry* NewFceFromSummary(nsNameValuePairDB *aDB); nsFontCatalog *NewFontCatalog(); - PRBool ReadFontDirSummary(nsAReadableCString&, nsHashtable*); + PRBool ReadFontDirSummary(const nsACString&, nsHashtable*); PRBool ParseCCMapLine(nsCompressedCharMap*,long,const char*); PRBool ParseXLFD(char *, char**, char**, char**, char**); void PrintCCMap(nsNameValuePairDB *aDB, PRUint16 *aCCMap); diff --git a/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp b/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp index ce56123b289..0ef8ae34744 100644 --- a/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp +++ b/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp @@ -60,7 +60,7 @@ #include "nspr.h" #include "nsHashtable.h" #include "nsReadableUtils.h" -#include "nsAWritableString.h" +#include "nsAString.h" #include "nsXPIDLString.h" #ifdef USE_FREETYPE #include "nsFT2FontCatalog.h" @@ -4433,7 +4433,7 @@ nsFontMetricsXlib::FamilyExists(nsIDeviceContext *aDevice, const nsString& aName // convert a FFRE (Foundry-Family-Registry-Encoding) To XLFD Pattern // static void -FFREToXLFDPattern(nsAWritableCString &aFFREName, nsAWritableCString &oPattern) +FFREToXLFDPattern(nsACString &aFFREName, nsACString &oPattern) { oPattern.Append("-"); oPattern.Append(aFFREName); @@ -4447,7 +4447,7 @@ FFREToXLFDPattern(nsAWritableCString &aFFREName, nsAWritableCString &oPattern) // substitute the charset in a FFRE (Foundry-Family-Registry-Encoding) // static void -FFRESubstituteCharset(nsAWritableCString &aFFREName, +FFRESubstituteCharset(nsACString &aFFREName, const char *aReplacementCharset) { PRInt32 charsetHyphen = aFFREName.FindChar('-'); @@ -4460,7 +4460,7 @@ FFRESubstituteCharset(nsAWritableCString &aFFREName, // substitute the encoding in a FFRE (Foundry-Family-Registry-Encoding) // static void -FFRESubstituteEncoding(nsAWritableCString &aFFREName, +FFRESubstituteEncoding(nsACString &aFFREName, const char *aReplacementEncoding) { PRInt32 encodingHyphen = aFFREName.FindChar('-'); @@ -4471,7 +4471,7 @@ FFRESubstituteEncoding(nsAWritableCString &aFFREName, } nsFontXlib* -nsFontMetricsXlib::TryNodes(nsAWritableCString &aFFREName, PRUnichar aChar) +nsFontMetricsXlib::TryNodes(nsACString &aFFREName, PRUnichar aChar) { FIND_FONT_PRINTF((" TryNodes aFFREName = %s", PromiseFlatCString(aFFREName).get())); diff --git a/mozilla/gfx/src/xlib/nsFontMetricsXlib.h b/mozilla/gfx/src/xlib/nsFontMetricsXlib.h index db37595e472..3811b6a7733 100644 --- a/mozilla/gfx/src/xlib/nsFontMetricsXlib.h +++ b/mozilla/gfx/src/xlib/nsFontMetricsXlib.h @@ -399,7 +399,7 @@ public: nsFontXlib* TryAliases(nsCString* aName, PRUnichar aChar); nsFontXlib* TryFamily(nsCString* aName, PRUnichar aChar); nsFontXlib* TryNode(nsCString* aName, PRUnichar aChar); - nsFontXlib* TryNodes(nsAWritableCString &aFFREName, PRUnichar aChar); + nsFontXlib* TryNodes(nsACString &aFFREName, PRUnichar aChar); nsFontXlib* TryLangGroup(nsIAtom* aLangGroup, nsCString* aName, PRUnichar aChar); nsFontXlib* AddToLoadedFontsList(nsFontXlib* aFont); diff --git a/mozilla/netwerk/base/public/nsReadLine.h b/mozilla/netwerk/base/public/nsReadLine.h index 394e245d1b9..a26813100b5 100644 --- a/mozilla/netwerk/base/public/nsReadLine.h +++ b/mozilla/netwerk/base/public/nsReadLine.h @@ -54,7 +54,7 @@ NS_InitLineBuffer (nsLineBuffer ** aBufferPtr) { static nsresult NS_ReadLine (nsIInputStream* aStream, nsLineBuffer * aBuffer, - nsAWritableString & aLine, PRBool *more) { + nsAString & aLine, PRBool *more) { nsresult rv = NS_OK; PRUint32 bytesRead; nsAutoString temp; diff --git a/mozilla/netwerk/base/src/nsFileStreams.cpp b/mozilla/netwerk/base/src/nsFileStreams.cpp index d286cc7e1a4..2578d06c4e6 100644 --- a/mozilla/netwerk/base/src/nsFileStreams.cpp +++ b/mozilla/netwerk/base/src/nsFileStreams.cpp @@ -586,7 +586,7 @@ nsFileInputStream::Read(char * buf, PRUint32 count, PRUint32 *result) } NS_IMETHODIMP -nsFileInputStream::ReadLine(nsAWritableString & aLine, PRBool *_retval) +nsFileInputStream::ReadLine(nsAString & aLine, PRBool *_retval) { if (!mLineBuffer) { nsresult rv = NS_InitLineBuffer(&mLineBuffer); diff --git a/mozilla/netwerk/cache/src/nsCache.cpp b/mozilla/netwerk/cache/src/nsCache.cpp index 8c8bc34ff3c..8586b032b06 100644 --- a/mozilla/netwerk/cache/src/nsCache.cpp +++ b/mozilla/netwerk/cache/src/nsCache.cpp @@ -25,6 +25,7 @@ #include "nsCache.h" #include "nsReadableUtils.h" +#include "nsDependentSubstring.h" /** @@ -70,7 +71,7 @@ PRTimeFromSeconds(PRUint32 seconds) nsresult -ClientIDFromCacheKey(const nsAReadableCString& key, char ** result) +ClientIDFromCacheKey(const nsACString& key, char ** result) { nsresult rv = NS_OK; *result = nsnull; @@ -96,7 +97,7 @@ ClientIDFromCacheKey(const nsAReadableCString& key, char ** result) nsresult -ClientKeyFromCacheKey(const nsAReadableCString& key, char ** result) +ClientKeyFromCacheKey(const nsACString& key, char ** result) { nsresult rv = NS_OK; *result = nsnull; diff --git a/mozilla/netwerk/cache/src/nsCache.h b/mozilla/netwerk/cache/src/nsCache.h index da0596031a9..fbe7a58d2ca 100644 --- a/mozilla/netwerk/cache/src/nsCache.h +++ b/mozilla/netwerk/cache/src/nsCache.h @@ -30,7 +30,7 @@ #ifndef _nsCache_h_ #define _nsCache_h_ -#include "nsAReadableString.h" +#include "nsAString.h" #include "prtime.h" #include "nsError.h" #include "prlog.h" @@ -57,7 +57,7 @@ extern PRUint32 SecondsFromPRTime(PRTime prTime); extern PRTime PRTimeFromSeconds(PRUint32 seconds); -extern nsresult ClientIDFromCacheKey(const nsAReadableCString& key, char ** result); -extern nsresult ClientKeyFromCacheKey(const nsAReadableCString& key, char ** result); +extern nsresult ClientIDFromCacheKey(const nsACString& key, char ** result); +extern nsresult ClientKeyFromCacheKey(const nsACString& key, char ** result); #endif // _nsCache_h diff --git a/mozilla/netwerk/cache/src/nsCacheEntry.cpp b/mozilla/netwerk/cache/src/nsCacheEntry.cpp index c62a1907e07..31ac1042def 100644 --- a/mozilla/netwerk/cache/src/nsCacheEntry.cpp +++ b/mozilla/netwerk/cache/src/nsCacheEntry.cpp @@ -133,8 +133,8 @@ nsCacheEntry::TouchData() nsresult -nsCacheEntry::GetMetaDataElement( const nsAReadableCString& key, - nsAReadableCString ** value) +nsCacheEntry::GetMetaDataElement( const nsACString& key, + const nsACString ** value) { *value = mMetaData ? mMetaData->GetElement(&key) : nsnull; return NS_OK; @@ -142,8 +142,8 @@ nsCacheEntry::GetMetaDataElement( const nsAReadableCString& key, nsresult -nsCacheEntry::SetMetaDataElement( const nsAReadableCString& key, - const nsAReadableCString& value) +nsCacheEntry::SetMetaDataElement( const nsACString& key, + const nsACString& value) { if (!mMetaData) { mMetaData = nsCacheMetaData::Create(); diff --git a/mozilla/netwerk/cache/src/nsCacheEntry.h b/mozilla/netwerk/cache/src/nsCacheEntry.h index a373b9adb51..cbd6efd0ed2 100644 --- a/mozilla/netwerk/cache/src/nsCacheEntry.h +++ b/mozilla/netwerk/cache/src/nsCacheEntry.h @@ -33,7 +33,7 @@ #include "nscore.h" #include "nsCOMPtr.h" #include "nsString.h" -#include "nsAReadableString.h" +#include "nsAString.h" class nsCacheDevice; class nsCacheMetaData; @@ -98,10 +98,10 @@ public: /** * Meta data accessors */ - nsresult GetMetaDataElement( const nsAReadableCString& key, - nsAReadableCString ** value); - nsresult SetMetaDataElement( const nsAReadableCString& key, - const nsAReadableCString& value); + nsresult GetMetaDataElement( const nsACString& key, + const nsACString ** value); + nsresult SetMetaDataElement( const nsACString& key, + const nsACString& value); nsresult VisitMetaDataElements( nsICacheMetaDataVisitor * visitor); diff --git a/mozilla/netwerk/cache/src/nsCacheEntryDescriptor.cpp b/mozilla/netwerk/cache/src/nsCacheEntryDescriptor.cpp index 630ab249fde..30e17d3a1cd 100644 --- a/mozilla/netwerk/cache/src/nsCacheEntryDescriptor.cpp +++ b/mozilla/netwerk/cache/src/nsCacheEntryDescriptor.cpp @@ -355,7 +355,7 @@ nsCacheEntryDescriptor::GetMetaDataElement(const char *key, char ** result) if (!mCacheEntry) return NS_ERROR_NOT_AVAILABLE; if (!key | !result) return NS_ERROR_NULL_POINTER; - nsAReadableCString *value; + const nsACString *value; *result = nsnull; // XXX not thread safe diff --git a/mozilla/netwerk/cache/src/nsCacheMetaData.cpp b/mozilla/netwerk/cache/src/nsCacheMetaData.cpp index 62cdabf48d8..6b1ede0577d 100644 --- a/mozilla/netwerk/cache/src/nsCacheMetaData.cpp +++ b/mozilla/netwerk/cache/src/nsCacheMetaData.cpp @@ -85,8 +85,8 @@ nsCacheMetaData::Create() } -nsAReadableCString * -nsCacheMetaData::GetElement(const nsAReadableCString * key) +const nsACString * +nsCacheMetaData::GetElement(const nsACString * key) { PLDHashEntryHdr * hashEntry; nsCString * result = nsnull; @@ -108,8 +108,8 @@ nsCacheMetaData::GetElement(const nsAReadableCString * key) nsresult -nsCacheMetaData::SetElement(const nsAReadableCString& key, - const nsAReadableCString& value) +nsCacheMetaData::SetElement(const nsACString& key, + const nsACString& value) { nsCacheMetaDataHashTableEntry * metaEntry; nsresult rv = NS_ERROR_OUT_OF_MEMORY; // presume the worst @@ -236,7 +236,7 @@ nsCacheMetaData::MatchEntry(PLDHashTable * /* table */, nsCString * entryKey = ((nsCacheMetaDataHashTableEntry *)hashEntry)->key; NS_ASSERTION(entryKey, "### hashEntry->key == nsnull"); - return entryKey->Equals(*NS_STATIC_CAST(const nsAReadableCString*,key)); + return entryKey->Equals(*NS_STATIC_CAST(const nsACString*,key)); } diff --git a/mozilla/netwerk/cache/src/nsCacheMetaData.h b/mozilla/netwerk/cache/src/nsCacheMetaData.h index 9e41548f9ed..2572d843139 100644 --- a/mozilla/netwerk/cache/src/nsCacheMetaData.h +++ b/mozilla/netwerk/cache/src/nsCacheMetaData.h @@ -29,7 +29,7 @@ #include "nscore.h" // #include "nsCOMPtr.h" #include "nsString.h" -// #include "nsAReadableString.h" +// #include "nsAString.h" class nsICacheMetaDataVisitor; @@ -56,10 +56,10 @@ public: nsresult Init(void); - nsAReadableCString * GetElement(const nsAReadableCString * key); + const nsACString * GetElement(const nsACString * key); - nsresult SetElement(const nsAReadableCString& key, - const nsAReadableCString& value); + nsresult SetElement(const nsACString& key, + const nsACString& value); PRUint32 Size(void); diff --git a/mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp b/mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp index 93aee971047..18d9165397d 100644 --- a/mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp +++ b/mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp @@ -43,7 +43,7 @@ #include "nsCOMPtr.h" #include "nsIURI.h" #include "nsXPIDLString.h" -#include "nsString2.h" +#include "nsString.h" #include "plstr.h" #include "nsIScriptSecurityManager.h" diff --git a/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp b/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp index 5be92969403..240e4b470ae 100644 --- a/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp +++ b/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp @@ -382,7 +382,7 @@ nsFTPDirListingConv::Init() { } nsresult -nsFTPDirListingConv::GetHeaders(nsAWritableCString& headers, +nsFTPDirListingConv::GetHeaders(nsACString& headers, nsIURI* uri) { nsresult rv = NS_OK; diff --git a/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.h b/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.h index ad59a5948f8..31023209d7f 100644 --- a/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.h +++ b/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.h @@ -151,7 +151,7 @@ public: private: // Get the application/http-index-format headers - nsresult GetHeaders(nsAWritableCString& str, nsIURI* uri); + nsresult GetHeaders(nsACString& str, nsIURI* uri); // util parsing methods PRInt8 MonthNumber(const char *aCStr);