mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 113243 Get rid of (Compare|Equals)WithConversion 

r+sr=roc
This commit is contained in:
cbiesinger%web.de 2004-07-21 20:18:39 +00:00
Родитель 832a0a496d
Коммит d5bd29aeda
8 изменённых файлов: 24 добавлений и 24 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
content/base/src/nsAttrValue.cpp
Просмотреть файл

@ -745,7 +745,7 @@ nsAttrValue::ParseEnumValue(const nsAString& aValue,
nsAutoString val(aValue);
while (aTable->tag) {
if (aCaseSensitive ? val.EqualsWithConversion(aTable->tag) :
if (aCaseSensitive ? val.EqualsASCII(aTable->tag) :
val.EqualsIgnoreCase(aTable->tag)) {
SetIntValueAndType(aTable->value, eEnum);

12
extensions/xmlterm/base/mozXMLTermSession.cpp
Просмотреть файл

@ -878,7 +878,7 @@ NS_IMETHODIMP mozXMLTermSession::ReadAll(mozILineTermAux* lineTermAux,
PRInt32 j;
for (j=NO_META_COMMAND+1; j<META_COMMAND_TYPES; j++) {
if (temString.EqualsWithConversion(metaCommandNames[j])) {
if (temString.EqualsASCII(metaCommandNames[j])) {
mMetaCommandType = (MetaCommandType) j;
break;
}
@ -1844,7 +1844,7 @@ NS_IMETHODIMP mozXMLTermSession::LimitOutputLines(PRBool deleteAllOld)
if (NS_FAILED(result))
return result;
if (!attValue.EqualsWithConversion(sessionElementNames[WARNING_ELEMENT])) {
if (!attValue.EqualsASCII(sessionElementNames[WARNING_ELEMENT])) {
// Create warning message element
nsCOMPtr<nsIDOMNode> divNode, textNode;
nsAutoString tagName(NS_LITERAL_STRING("div"));
@ -1892,7 +1892,7 @@ NS_IMETHODIMP mozXMLTermSession::LimitOutputLines(PRBool deleteAllOld)
} else {
if (attValue.EqualsWithConversion(sessionElementNames[MIXED_ELEMENT])) {
if (attValue.EqualsASCII(sessionElementNames[MIXED_ELEMENT])) {
// Delete single line containing mixed style output
deleteNode = 1;
decrementedLineCount = 1;
@ -1900,9 +1900,9 @@ NS_IMETHODIMP mozXMLTermSession::LimitOutputLines(PRBool deleteAllOld)
XMLT_LOG(mozXMLTermSession::LimitOutputLines,79,
("deleted mixed line\n"));
} else if ( (attValue.EqualsWithConversion(sessionElementNames[STDIN_ELEMENT])) ||
(attValue.EqualsWithConversion(sessionElementNames[STDOUT_ELEMENT])) ||
(attValue.EqualsWithConversion(sessionElementNames[STDERR_ELEMENT]))) {
} else if ( (attValue.EqualsASCII(sessionElementNames[STDIN_ELEMENT])) ||
(attValue.EqualsASCII(sessionElementNames[STDOUT_ELEMENT])) ||
(attValue.EqualsASCII(sessionElementNames[STDERR_ELEMENT]))) {
// Delete first line from STDIN/STDOUT/STDERR PRE output
nsCOMPtr<nsIDOMNode> textNode;

2
gfx/src/beos/nsDeviceContextSpecB.cpp
Просмотреть файл

@ -257,7 +257,7 @@ NS_IMETHODIMP nsDeviceContextSpecBeOS::Init(nsIPrintSettings* aPS)
#ifdef NOT_IMPLEMENTED_YET
if (mGlobalNumPrinters) {
for(int i = 0; (i < mGlobalNumPrinters) && !mQueue; i++) {
if (!(mGlobalPrinterList->StringAt(i)->CompareWithConversion(mPrData.printer, TRUE, -1)))
if (!(mGlobalPrinterList->StringAt(i)->EqualsIgnoreCase(mPrData.printer)))
mQueue = PrnDlg.SetPrinterQueue(i);
}
}

8
java/dom/jni/org_mozilla_dom_NodeImpl.cpp
Просмотреть файл

@ -690,8 +690,8 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getNodeValue
nsAutoString typeStr;
PRBool isChecked;
if (NS_SUCCEEDED(rv = input->GetType(typeStr))) {
if (0 == typeStr.CompareWithConversion("radio", PR_TRUE) ||
0 == typeStr.CompareWithConversion("checkbox", PR_TRUE)) {
if (0 == typeStr.LowerCaseEqualsLiteral("radio", PR_TRUE) ||
0 == typeStr.LowerCaseEqualsLiteral("checkbox", PR_TRUE)) {
if (NS_SUCCEEDED(rv = input->GetChecked(&isChecked))) {
if (isChecked) {
ret.AssignWithConversion("CHECKED");
@ -1024,8 +1024,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_NodeImpl_setNodeValue
nsString val;
if (NS_SUCCEEDED(rv = input->GetType(typeStr))) {
if (0 == typeStr.CompareWithConversion("radio", PR_TRUE) ||
0 == typeStr.CompareWithConversion("checkbox", PR_TRUE)) {
if (0 == typeStr.LowerCaseEqualsLiteral("radio", PR_TRUE) ||
0 == typeStr.LowerCaseEqualsLiteral("checkbox", PR_TRUE)) {
val = *value;
if (0 == val.Length()) {
input->SetChecked(PR_FALSE);

4
layout/base/nsPresShell.cpp
Просмотреть файл

@ -7502,7 +7502,7 @@ void ReflowCountMgr::Add(const char * aName, nsReflowReason aType, nsIFrame * aF
PL_HashTableAdd(mIndiFrameCounts, key, counter);
}
// this eliminates extra counts from super classes
if (counter != nsnull && counter->mName.EqualsWithConversion(aName)) {
if (counter != nsnull && counter->mName.EqualsASCII(aName)) {
counter->mCount++;
counter->mCounter.Add(aType, 1);
}
@ -7522,7 +7522,7 @@ void ReflowCountMgr::PaintCount(const char * aName,
char * key = new char[16];
sprintf(key, "%p", (void*)aFrame);
IndiReflowCounter * counter = (IndiReflowCounter *)PL_HashTableLookup(mIndiFrameCounts, key);
if (counter != nsnull && counter->mName.EqualsWithConversion(aName)) {
if (counter != nsnull && counter->mName.EqualsASCII(aName)) {
aRenderingContext->PushState();
nsFont font("Times", NS_FONT_STYLE_NORMAL,NS_FONT_VARIANT_NORMAL,
NS_FONT_WEIGHT_NORMAL,0,NSIntPointsToTwips(8));

4
layout/html/base/src/nsPresShell.cpp
Просмотреть файл

@ -7502,7 +7502,7 @@ void ReflowCountMgr::Add(const char * aName, nsReflowReason aType, nsIFrame * aF
PL_HashTableAdd(mIndiFrameCounts, key, counter);
}
// this eliminates extra counts from super classes
if (counter != nsnull && counter->mName.EqualsWithConversion(aName)) {
if (counter != nsnull && counter->mName.EqualsASCII(aName)) {
counter->mCount++;
counter->mCounter.Add(aType, 1);
}
@ -7522,7 +7522,7 @@ void ReflowCountMgr::PaintCount(const char * aName,
char * key = new char[16];
sprintf(key, "%p", (void*)aFrame);
IndiReflowCounter * counter = (IndiReflowCounter *)PL_HashTableLookup(mIndiFrameCounts, key);
if (counter != nsnull && counter->mName.EqualsWithConversion(aName)) {
if (counter != nsnull && counter->mName.EqualsASCII(aName)) {
aRenderingContext->PushState();
nsFont font("Times", NS_FONT_STYLE_NORMAL,NS_FONT_VARIANT_NORMAL,
NS_FONT_WEIGHT_NORMAL,0,NSIntPointsToTwips(8));

2
parser/htmlparser/src/nsHTMLEntities.cpp
Просмотреть файл

@ -264,7 +264,7 @@ public:
NS_ASSERTION(value == gEntityArray[i].mUnicode, "bad unicode value");
entity.AssignWithConversion(nsHTMLEntities::UnicodeToEntity(value));
NS_ASSERTION(entity.EqualsWithConversion(gEntityArray[i].mStr), "bad entity name");
NS_ASSERTION(entity.EqualsASCII(gEntityArray[i].mStr), "bad entity name");
}
// Make sure we don't find things that aren't there

14
xpfe/components/search/src/nsInternetSearchService.cpp
Просмотреть файл

@ -3622,9 +3622,9 @@ InternetSearchDataSource::MapEncoding(const nsString &numericEncoding,
if (!numericEncoding.IsEmpty()) {
for (PRUint32 i = 0; encodingList[i].numericEncoding != nsnull; i++)
{
if (numericEncoding.EqualsWithConversion(encodingList[i].numericEncoding))
if (numericEncoding.EqualsASCII(encodingList[i].numericEncoding))
{
stringEncoding.AssignWithConversion(encodingList[i].stringEncoding);
stringEncoding.AssignASCII(encodingList[i].stringEncoding);
return NS_OK;
}
}
@ -3935,9 +3935,9 @@ InternetSearchDataSource::DoSearch(nsIRDFResource *source, nsIRDFResource *engin
// construct post data to send
nsAutoString postStr;
postStr.AssignWithConversion(POSTHEADER_PREFIX);
postStr.AssignASCII(POSTHEADER_PREFIX);
postStr.AppendInt(input.Length(), 10);
postStr.AppendWithConversion(POSTHEADER_SUFFIX);
postStr.AppendASCII(POSTHEADER_SUFFIX);
postStr += input;
nsCOMPtr<nsIInputStream> postDataStream;
@ -4050,10 +4050,10 @@ InternetSearchDataSource::SaveEngineInfoIntoGraph(nsIFile *file, nsIFile *icon,
if (NS_FAILED(rv)) return rv;
nsAutoString searchURL;
searchURL.AssignWithConversion(kEngineProtocol);
searchURL.AssignASCII(kEngineProtocol);
char *uriCescaped = nsEscape(filePath.get(), url_Path);
if (!uriCescaped) return(NS_ERROR_NULL_POINTER);
searchURL.AppendWithConversion(uriCescaped);
searchURL.AppendASCII(uriCescaped);
nsCRT::free(uriCescaped);
if ((extensionOffset = searchURL.RFindChar(PRUnichar('.'))) > 0)
@ -4151,7 +4151,7 @@ InternetSearchDataSource::SaveEngineInfoIntoGraph(nsIFile *file, nsIFile *icon,
if (catURI)
{
nsAutoString catList;
catList.AssignWithConversion(kURINC_SearchCategoryPrefix);
catList.AssignASCII(kURINC_SearchCategoryPrefix);
catList.AppendWithConversion(catURI);
gRDFService->GetUnicodeResource(catList, getter_AddRefs(catRes));
}