Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 229705 : CStringArray should accept |nsACString&| instead of |nsCString&|. r=mscott, sr=alecf (with darin, jst, dbaron helping)

Browse Source
This commit is contained in:
jshin%mailaps.org 2004-02-20 01:54:55 +00:00
parent 44ce35aebb
commit e5dab37fe0
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xpcom/ds/nsVoidArray.cpp
View File

@ -973,7 +973,7 @@ nsCStringArray::CStringAt(PRInt32 aIndex) const
}
PRInt32
nsCStringArray::IndexOf(const nsCString& aPossibleString) const
nsCStringArray::IndexOf(const nsACString& aPossibleString) const
{
if (mImpl)
{
@ -993,7 +993,7 @@ nsCStringArray::IndexOf(const nsCString& aPossibleString) const
}
PRInt32
nsCStringArray::IndexOfIgnoreCase(const nsCString& aPossibleString) const
nsCStringArray::IndexOfIgnoreCase(const nsACString& aPossibleString) const
{
if (mImpl)
{
@ -1002,7 +1002,7 @@ nsCStringArray::IndexOfIgnoreCase(const nsCString& aPossibleString) const
while (ap < end)
{
nsCString* string = NS_STATIC_CAST(nsCString*, *ap);
if (nsCRT::strcasecmp((*string).get(),aPossibleString.get())==0)
if (string->Equals(aPossibleString, nsCaseInsensitiveCStringComparator()))
{
return ap - mImpl->mArray;
}
@ -1013,7 +1013,7 @@ nsCStringArray::IndexOfIgnoreCase(const nsCString& aPossibleString) const
}
PRBool
nsCStringArray::InsertCStringAt(const nsCString& aCString, PRInt32 aIndex)
nsCStringArray::InsertCStringAt(const nsACString& aCString, PRInt32 aIndex)
{
nsCString* string = new nsCString(aCString);
if (nsVoidArray::InsertElementAt(string, aIndex))
@ -1025,7 +1025,7 @@ nsCStringArray::InsertCStringAt(const nsCString& aCString, PRInt32 aIndex)
}
PRBool
nsCStringArray::ReplaceCStringAt(const nsCString& aCString, PRInt32 aIndex)
nsCStringArray::ReplaceCStringAt(const nsACString& aCString, PRInt32 aIndex)
{
nsCString* string = NS_STATIC_CAST(nsCString*, nsVoidArray::ElementAt(aIndex));
if (nsnull != string)
@ -1037,7 +1037,7 @@ nsCStringArray::ReplaceCStringAt(const nsCString& aCString, PRInt32 aIndex)
}
PRBool
nsCStringArray::RemoveCString(const nsCString& aCString)
nsCStringArray::RemoveCString(const nsACString& aCString)
{
PRInt32 index = IndexOf(aCString);
if (-1 < index)
@ -1048,7 +1048,7 @@ nsCStringArray::RemoveCString(const nsCString& aCString)
}
PRBool
nsCStringArray::RemoveCStringIgnoreCase(const nsCString& aCString)
nsCStringArray::RemoveCStringIgnoreCase(const nsACString& aCString)
{
PRInt32 index = IndexOfIgnoreCase(aCString);
if (-1 < index)

14
xpcom/ds/nsVoidArray.h
View File

@ -275,19 +275,19 @@ public:
nsCString* CStringAt(PRInt32 aIndex) const;
nsCString* operator[](PRInt32 aIndex) const { return CStringAt(aIndex); }
PRInt32 IndexOf(const nsCString& aPossibleString) const;
PRInt32 IndexOfIgnoreCase(const nsCString& aPossibleString) const;
PRInt32 IndexOf(const nsACString& aPossibleString) const;
PRInt32 IndexOfIgnoreCase(const nsACString& aPossibleString) const;
PRBool InsertCStringAt(const nsCString& aCString, PRInt32 aIndex);
PRBool InsertCStringAt(const nsACString& aCString, PRInt32 aIndex);
PRBool ReplaceCStringAt(const nsCString& aCString, PRInt32 aIndex);
PRBool ReplaceCStringAt(const nsACString& aCString, PRInt32 aIndex);
PRBool AppendCString(const nsCString& aCString) {
PRBool AppendCString(const nsACString& aCString) {
return InsertCStringAt(aCString, Count());
}
PRBool RemoveCString(const nsCString& aCString);
PRBool RemoveCStringIgnoreCase(const nsCString& aCString);
PRBool RemoveCString(const nsACString& aCString);
PRBool RemoveCStringIgnoreCase(const nsACString& aCString);
PRBool RemoveCStringAt(PRInt32 aIndex);
void Clear(void);