From 09869f401ca134e10e99f964c59cd68d90ec5459 Mon Sep 17 00:00:00 2001 From: "dbaron@fas.harvard.edu" Date: Sat, 23 Mar 2002 21:42:00 +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 --- docshell/base/nsWebShell.cpp | 6 +++--- docshell/base/nsWebShell.h | 6 +++--- intl/chardet/src/nsMetaCharsetObserver.cpp | 2 +- intl/chardet/src/nsMetaCharsetObserver.h | 2 +- intl/strres/src/nsStringBundle.cpp | 4 ++-- intl/uconv/public/nsICharsetAlias.h | 4 ++-- intl/uconv/public/nsIPlatformCharset.h | 2 +- intl/uconv/src/nsCharsetAlias.h | 4 ++-- intl/uconv/src/nsCharsetAliasImp.cpp | 4 ++-- intl/uconv/src/nsMacCharset.cpp | 10 +++++----- intl/uconv/src/nsOS2Charset.cpp | 10 +++++----- intl/uconv/src/nsPlatformCharset.h | 10 +++++----- intl/uconv/src/nsUNIXCharset.cpp | 10 +++++----- intl/uconv/src/nsURLProperties.cpp | 2 +- intl/uconv/src/nsURLProperties.h | 2 +- intl/uconv/src/nsWinCharset.cpp | 10 +++++----- 16 files changed, 44 insertions(+), 44 deletions(-) diff --git a/docshell/base/nsWebShell.cpp b/docshell/base/nsWebShell.cpp index 17263affcf5e..9da0c2bf672b 100644 --- a/docshell/base/nsWebShell.cpp +++ b/docshell/base/nsWebShell.cpp @@ -1062,7 +1062,7 @@ nsresult nsWebShell::EndPageLoad(nsIWebProgress *aProgress, #endif nsresult -nsWebShell::GetControllerForCommand ( const nsAReadableString & inCommand, nsIController** outController ) +nsWebShell::GetControllerForCommand ( const nsAString & inCommand, nsIController** outController ) { NS_ENSURE_ARG_POINTER(outController); *outController = nsnull; @@ -1083,7 +1083,7 @@ nsWebShell::GetControllerForCommand ( const nsAReadableString & inCommand, nsICo nsresult -nsWebShell::IsCommandEnabled ( const nsAReadableString & inCommand, PRBool* outEnabled ) +nsWebShell::IsCommandEnabled ( const nsAString & inCommand, PRBool* outEnabled ) { NS_ENSURE_ARG_POINTER(outEnabled); *outEnabled = PR_FALSE; @@ -1100,7 +1100,7 @@ nsWebShell::IsCommandEnabled ( const nsAReadableString & inCommand, PRBool* outE nsresult -nsWebShell::DoCommand ( const nsAReadableString & inCommand ) +nsWebShell::DoCommand ( const nsAString & inCommand ) { nsresult rv = NS_ERROR_FAILURE; diff --git a/docshell/base/nsWebShell.h b/docshell/base/nsWebShell.h index 1e3cd8938c8f..d6c0ab54c8b3 100644 --- a/docshell/base/nsWebShell.h +++ b/docshell/base/nsWebShell.h @@ -99,9 +99,9 @@ protected: void InitFrameData(); // helpers for executing commands - virtual nsresult GetControllerForCommand ( const nsAReadableString & inCommand, nsIController** outController ); - virtual nsresult IsCommandEnabled ( const nsAReadableString & inCommand, PRBool* outEnabled ); - virtual nsresult DoCommand ( const nsAReadableString & inCommand ); + virtual nsresult GetControllerForCommand ( const nsAString & inCommand, nsIController** outController ); + virtual nsresult IsCommandEnabled ( const nsAString & inCommand, PRBool* outEnabled ); + virtual nsresult DoCommand ( const nsAString & inCommand ); nsresult EnsureCommandHandler(); // diff --git a/intl/chardet/src/nsMetaCharsetObserver.cpp b/intl/chardet/src/nsMetaCharsetObserver.cpp index 5e517a06562d..285de17d35a8 100644 --- a/intl/chardet/src/nsMetaCharsetObserver.cpp +++ b/intl/chardet/src/nsMetaCharsetObserver.cpp @@ -337,7 +337,7 @@ NS_IMETHODIMP nsMetaCharsetObserver::Notify( NS_IMETHODIMP nsMetaCharsetObserver::GetCharsetFromCompatibilityTag( const nsStringArray* keys, const nsStringArray* values, - nsAWritableString& aCharset) + nsAString& aCharset) { if (!mAlias) return NS_ERROR_ABORT; diff --git a/intl/chardet/src/nsMetaCharsetObserver.h b/intl/chardet/src/nsMetaCharsetObserver.h index e8b6ab76dd98..df7e9f5a627d 100644 --- a/intl/chardet/src/nsMetaCharsetObserver.h +++ b/intl/chardet/src/nsMetaCharsetObserver.h @@ -101,7 +101,7 @@ private: NS_IMETHOD GetCharsetFromCompatibilityTag(const nsStringArray* keys, const nsStringArray* values, - nsAWritableString& aCharset); + nsAString& aCharset); nsCOMPtr mAlias; diff --git a/intl/strres/src/nsStringBundle.cpp b/intl/strres/src/nsStringBundle.cpp index 912f9a1025d4..bc4e5c459503 100644 --- a/intl/strres/src/nsStringBundle.cpp +++ b/intl/strres/src/nsStringBundle.cpp @@ -110,7 +110,7 @@ protected: // functional decomposition of the funitions repeatively called // nsresult GetStringFromID(PRInt32 aID, nsAString& aResult); - nsresult GetStringFromName(const nsAReadableString& aName, nsAString& aResult); + nsresult GetStringFromName(const nsAString& aName, nsAString& aResult); private: nsCString mPropertiesURL; @@ -309,7 +309,7 @@ nsStringBundle::GetStringFromID(PRInt32 aID, nsAString& aResult) } nsresult -nsStringBundle::GetStringFromName(const nsAReadableString& aName, +nsStringBundle::GetStringFromName(const nsAString& aName, nsAString& aResult) { nsresult rv; diff --git a/intl/uconv/public/nsICharsetAlias.h b/intl/uconv/public/nsICharsetAlias.h index 51a438b32ef8..cbad54f864ea 100644 --- a/intl/uconv/public/nsICharsetAlias.h +++ b/intl/uconv/public/nsICharsetAlias.h @@ -64,11 +64,11 @@ class nsICharsetAlias : public nsISupports public: NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICHARSETALIAS_IID) - NS_IMETHOD GetPreferred(const nsAReadableString& aAlias, nsAWritableString& aResult) = 0; + NS_IMETHOD GetPreferred(const nsAString& aAlias, nsAString& aResult) = 0; NS_IMETHOD GetPreferred(const PRUnichar* aAlias, const PRUnichar** aResult) = 0; NS_IMETHOD GetPreferred(const char* aAlias, char* aResult, PRInt32 aBufLength) = 0; - NS_IMETHOD Equals(const nsAReadableString& aCharset1, const nsAReadableString& aCharset2, PRBool* aResult) = 0; + NS_IMETHOD Equals(const nsAString& aCharset1, const nsAString& aCharset2, PRBool* aResult) = 0; NS_IMETHOD Equals(const PRUnichar* aCharset1, const PRUnichar* aCharset2, PRBool* aResult) = 0; NS_IMETHOD Equals(const char* aCharset1, const char* aCharset2, PRBool* aResult) = 0; diff --git a/intl/uconv/public/nsIPlatformCharset.h b/intl/uconv/public/nsIPlatformCharset.h index ed5e1685e0b8..a3a4870cbfed 100644 --- a/intl/uconv/public/nsIPlatformCharset.h +++ b/intl/uconv/public/nsIPlatformCharset.h @@ -67,7 +67,7 @@ public: NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPLATFORMCHARSET_IID) - NS_IMETHOD GetCharset(nsPlatformCharsetSel selector, nsAWritableString& oResult) = 0; + NS_IMETHOD GetCharset(nsPlatformCharsetSel selector, nsAString& oResult) = 0; NS_IMETHOD GetDefaultCharsetForLocale(const PRUnichar* localeName, PRUnichar** _retValue) = 0; diff --git a/intl/uconv/src/nsCharsetAlias.h b/intl/uconv/src/nsCharsetAlias.h index bf68b89bb28e..e6b49269653f 100644 --- a/intl/uconv/src/nsCharsetAlias.h +++ b/intl/uconv/src/nsCharsetAlias.h @@ -51,11 +51,11 @@ public: nsCharsetAlias2(); virtual ~nsCharsetAlias2(); - NS_IMETHOD GetPreferred(const nsAReadableString& aAlias, nsAWritableString& oResult); + NS_IMETHOD GetPreferred(const nsAString& aAlias, nsAString& oResult); NS_IMETHOD GetPreferred(const PRUnichar* aAlias, const PRUnichar** oResult) ; NS_IMETHOD GetPreferred(const char* aAlias, char* oResult, PRInt32 aBufLength) ; - NS_IMETHOD Equals(const nsAReadableString& aCharset1, const nsAReadableString& aCharset2, PRBool* oResult) ; + NS_IMETHOD Equals(const nsAString& aCharset1, const nsAString& aCharset2, PRBool* oResult) ; NS_IMETHOD Equals(const PRUnichar* aCharset1, const PRUnichar* aCharset2, PRBool* oResult) ; NS_IMETHOD Equals(const char* aCharset1, const char* aCharset2, PRBool* oResult) ; diff --git a/intl/uconv/src/nsCharsetAliasImp.cpp b/intl/uconv/src/nsCharsetAliasImp.cpp index f5c22c080da3..25e5efd2796a 100644 --- a/intl/uconv/src/nsCharsetAliasImp.cpp +++ b/intl/uconv/src/nsCharsetAliasImp.cpp @@ -66,7 +66,7 @@ nsCharsetAlias2::~nsCharsetAlias2() delete mDelegate; } //-------------------------------------------------------------- -NS_IMETHODIMP nsCharsetAlias2::GetPreferred(const nsAReadableString& aAlias, nsAWritableString& oResult) +NS_IMETHODIMP nsCharsetAlias2::GetPreferred(const nsAString& aAlias, nsAString& oResult) { if (aAlias.IsEmpty()) return NS_ERROR_NULL_POINTER; NS_TIMELINE_START_TIMER("nsCharsetAlias2:GetPreferred"); @@ -120,7 +120,7 @@ NS_IMETHODIMP nsCharsetAlias2::GetPreferred(const char* aAlias, char* oResult, P return NS_ERROR_NOT_IMPLEMENTED; } //-------------------------------------------------------------- -NS_IMETHODIMP nsCharsetAlias2::Equals(const nsAReadableString& aCharset1, const nsAReadableString& aCharset2, PRBool* oResult) +NS_IMETHODIMP nsCharsetAlias2::Equals(const nsAString& aCharset1, const nsAString& aCharset2, PRBool* oResult) { nsresult res = NS_OK; diff --git a/intl/uconv/src/nsMacCharset.cpp b/intl/uconv/src/nsMacCharset.cpp index 3256a0e84f1d..c3ae1d812611 100644 --- a/intl/uconv/src/nsMacCharset.cpp +++ b/intl/uconv/src/nsMacCharset.cpp @@ -80,7 +80,7 @@ nsresult nsPlatformCharset::InitInfo() return NS_OK; } -nsresult nsPlatformCharset::MapToCharset(short script, short region, nsAWritableString& outCharset) +nsresult nsPlatformCharset::MapToCharset(short script, short region, nsAString& outCharset) { switch (region) { case verUS: @@ -116,7 +116,7 @@ nsresult nsPlatformCharset::MapToCharset(short script, short region, nsAWritable } NS_IMETHODIMP -nsPlatformCharset::GetCharset(nsPlatformCharsetSel selector, nsAWritableString& oResult) +nsPlatformCharset::GetCharset(nsPlatformCharsetSel selector, nsAString& oResult) { if (mCharset.IsEmpty()) { nsresult rv = MapToCharset((short)(0x0000FFFF & ::GetScriptManagerVariable(smSysScript)), @@ -157,19 +157,19 @@ nsPlatformCharset::Init() } nsresult -nsPlatformCharset::MapToCharset(nsString& inANSICodePage, nsAWritableString& outCharset) +nsPlatformCharset::MapToCharset(nsString& inANSICodePage, nsAString& outCharset) { return NS_OK; } nsresult -nsPlatformCharset::InitGetCharset(nsAWritableString &oString) +nsPlatformCharset::InitGetCharset(nsAString &oString) { return NS_OK; } nsresult -nsPlatformCharset::ConvertLocaleToCharsetUsingDeprecatedConfig(nsAutoString& locale, nsAWritableString& oResult) +nsPlatformCharset::ConvertLocaleToCharsetUsingDeprecatedConfig(nsAutoString& locale, nsAString& oResult) { return NS_OK; } diff --git a/intl/uconv/src/nsOS2Charset.cpp b/intl/uconv/src/nsOS2Charset.cpp index 4007255b51f7..5117f7fe4334 100644 --- a/intl/uconv/src/nsOS2Charset.cpp +++ b/intl/uconv/src/nsOS2Charset.cpp @@ -79,7 +79,7 @@ nsPlatformCharset::~nsPlatformCharset() } NS_IMETHODIMP -nsPlatformCharset::GetCharset(nsPlatformCharsetSel selector, nsAWritableString& oResult) +nsPlatformCharset::GetCharset(nsPlatformCharsetSel selector, nsAString& oResult) { if (selector == kPlatformCharsetSel_4xBookmarkFile) { if ((mCharset.Find("IBM850", IGNORE_CASE) != -1) || (mCharset.Find("IBM437", IGNORE_CASE) != -1)) @@ -112,25 +112,25 @@ nsPlatformCharset::Init() return NS_OK; } nsresult -nsPlatformCharset::MapToCharset(short script, short region, nsAWritableString& outCharset) +nsPlatformCharset::MapToCharset(short script, short region, nsAString& outCharset) { return NS_OK; } nsresult -nsPlatformCharset::MapToCharset(nsString& inANSICodePage, nsAWritableString& outCharset) +nsPlatformCharset::MapToCharset(nsString& inANSICodePage, nsAString& outCharset) { return NS_OK; } nsresult -nsPlatformCharset::InitGetCharset(nsAWritableString &oString) +nsPlatformCharset::InitGetCharset(nsAString &oString) { return NS_OK; } nsresult -nsPlatformCharset::ConvertLocaleToCharsetUsingDeprecatedConfig(nsAutoString& locale, nsAWritableString& oResult) +nsPlatformCharset::ConvertLocaleToCharsetUsingDeprecatedConfig(nsAutoString& locale, nsAString& oResult) { return NS_OK; } diff --git a/intl/uconv/src/nsPlatformCharset.h b/intl/uconv/src/nsPlatformCharset.h index 7621e0c283b7..3360c466382a 100644 --- a/intl/uconv/src/nsPlatformCharset.h +++ b/intl/uconv/src/nsPlatformCharset.h @@ -50,7 +50,7 @@ public: virtual ~nsPlatformCharset(); NS_IMETHOD Init(); - NS_IMETHOD GetCharset(nsPlatformCharsetSel selector, nsAWritableString& oResult); + NS_IMETHOD GetCharset(nsPlatformCharsetSel selector, nsAString& oResult); NS_IMETHOD GetDefaultCharsetForLocale(const PRUnichar* localeName, PRUnichar** _retValue); private: @@ -58,10 +58,10 @@ private: nsString mLocale; // remember the locale & charset nsresult InitInfo(); - nsresult MapToCharset(short script, short region, nsAWritableString& outCharset); - nsresult MapToCharset(nsString& inANSICodePage, nsAWritableString& outCharset); - nsresult InitGetCharset(nsAWritableString& oString); - nsresult ConvertLocaleToCharsetUsingDeprecatedConfig(nsAutoString& locale, nsAWritableString& oResult); + nsresult MapToCharset(short script, short region, nsAString& outCharset); + nsresult MapToCharset(nsString& inANSICodePage, nsAString& outCharset); + nsresult InitGetCharset(nsAString& oString); + nsresult ConvertLocaleToCharsetUsingDeprecatedConfig(nsAutoString& locale, nsAString& oResult); nsresult VerifyCharset(nsString &aCharset); }; diff --git a/intl/uconv/src/nsUNIXCharset.cpp b/intl/uconv/src/nsUNIXCharset.cpp index 8a4bc26ee6be..48a32df44628 100644 --- a/intl/uconv/src/nsUNIXCharset.cpp +++ b/intl/uconv/src/nsUNIXCharset.cpp @@ -90,7 +90,7 @@ nsPlatformCharset::nsPlatformCharset() } nsresult -nsPlatformCharset::ConvertLocaleToCharsetUsingDeprecatedConfig(nsAutoString& locale, nsAWritableString& oResult) +nsPlatformCharset::ConvertLocaleToCharsetUsingDeprecatedConfig(nsAutoString& locale, nsAString& oResult) { // locked for thread safety @@ -146,7 +146,7 @@ nsPlatformCharset::~nsPlatformCharset() } NS_IMETHODIMP -nsPlatformCharset::GetCharset(nsPlatformCharsetSel selector, nsAWritableString& oResult) +nsPlatformCharset::GetCharset(nsPlatformCharsetSel selector, nsAString& oResult) { oResult = mCharset; return NS_OK; @@ -201,7 +201,7 @@ nsPlatformCharset::GetDefaultCharsetForLocale(const PRUnichar* localeName, PRUni } nsresult -nsPlatformCharset::InitGetCharset(nsAWritableString &oString) +nsPlatformCharset::InitGetCharset(nsAString &oString) { char* nl_langinfo_codeset = nsnull; nsString aCharset; @@ -392,13 +392,13 @@ nsPlatformCharset::VerifyCharset(nsString &aCharset) } nsresult -nsPlatformCharset::MapToCharset(short script, short region, nsAWritableString& outCharset) +nsPlatformCharset::MapToCharset(short script, short region, nsAString& outCharset) { return NS_OK; } nsresult -nsPlatformCharset::MapToCharset(nsString& inANSICodePage, nsAWritableString& outCharset) +nsPlatformCharset::MapToCharset(nsString& inANSICodePage, nsAString& outCharset) { return NS_OK; } diff --git a/intl/uconv/src/nsURLProperties.cpp b/intl/uconv/src/nsURLProperties.cpp index 1ed36a7d4433..f589ca49be5c 100644 --- a/intl/uconv/src/nsURLProperties.cpp +++ b/intl/uconv/src/nsURLProperties.cpp @@ -100,7 +100,7 @@ nsURLProperties::~nsURLProperties() } } -NS_IMETHODIMP nsURLProperties::Get(const nsAReadableString& aKey, nsAWritableString& oValue) +NS_IMETHODIMP nsURLProperties::Get(const nsAString& aKey, nsAString& oValue) { if(mDelegate) return mDelegate->GetStringProperty(aKey, oValue); diff --git a/intl/uconv/src/nsURLProperties.h b/intl/uconv/src/nsURLProperties.h index f9ed79ca620b..c62ee072cb60 100644 --- a/intl/uconv/src/nsURLProperties.h +++ b/intl/uconv/src/nsURLProperties.h @@ -49,7 +49,7 @@ public: virtual ~nsURLProperties(); NS_IMETHOD DidLoad(PRBool&); - NS_IMETHOD Get( const nsAReadableString& aKey, nsAWritableString& value); + NS_IMETHOD Get( const nsAString& aKey, nsAString& value); private: static nsIIOService* gIOService; // to speed up creating URLs diff --git a/intl/uconv/src/nsWinCharset.cpp b/intl/uconv/src/nsWinCharset.cpp index 8638be1461ef..852af5fa588d 100644 --- a/intl/uconv/src/nsWinCharset.cpp +++ b/intl/uconv/src/nsWinCharset.cpp @@ -93,7 +93,7 @@ nsPlatformCharset::InitInfo() } nsresult -nsPlatformCharset::MapToCharset(nsString& inANSICodePage, nsAWritableString& outCharset) +nsPlatformCharset::MapToCharset(nsString& inANSICodePage, nsAString& outCharset) { //delay loading wincharset.properties bundle if possible if (inANSICodePage.Equals(NS_LITERAL_STRING("acp.1252"))) { @@ -122,7 +122,7 @@ nsPlatformCharset::MapToCharset(nsString& inANSICodePage, nsAWritableString& out } NS_IMETHODIMP -nsPlatformCharset::GetCharset(nsPlatformCharsetSel selector, nsAWritableString& oResult) +nsPlatformCharset::GetCharset(nsPlatformCharsetSel selector, nsAString& oResult) { oResult = mCharset; return NS_OK; @@ -166,19 +166,19 @@ nsPlatformCharset::Init() } nsresult -nsPlatformCharset::MapToCharset(short script, short region, nsAWritableString& outCharset) +nsPlatformCharset::MapToCharset(short script, short region, nsAString& outCharset) { return NS_OK; } nsresult -nsPlatformCharset::InitGetCharset(nsAWritableString &oString) +nsPlatformCharset::InitGetCharset(nsAString &oString) { return NS_OK; } nsresult -nsPlatformCharset::ConvertLocaleToCharsetUsingDeprecatedConfig(nsAutoString& locale, nsAWritableString& oResult) +nsPlatformCharset::ConvertLocaleToCharsetUsingDeprecatedConfig(nsAutoString& locale, nsAString& oResult) { return NS_OK; }