зеркало из https://github.com/mozilla/pjs.git
making string conversions explicit
This commit is contained in:
Родитель
d2f413fe03
Коммит
db063bf443
|
@ -583,7 +583,7 @@ void nsEudoraAddress::ResolveEntries( nsCString& name, nsVoidArray& list, nsVoid
|
|||
for (i = 0; i < max; i++) {
|
||||
pData = (CAliasData *)list.ElementAt( i);
|
||||
// resolve the email to an existing alias!
|
||||
if (name.Compare( (const char *)pData->m_email, PR_TRUE) && ((pEntry = ResolveAlias( pData->m_email)) != nsnull)) {
|
||||
if (name.CompareWithConversion( (const char *)pData->m_email, PR_TRUE) && ((pEntry = ResolveAlias( pData->m_email)) != nsnull)) {
|
||||
// This new entry has all of the entries for this puppie.
|
||||
// Resolve all of it's entries!
|
||||
ResolveEntries( pEntry->m_name, pEntry->m_list, result);
|
||||
|
|
|
@ -985,7 +985,7 @@ PRBool nsEudoraMac::IsValidMailFolderName( nsCString& name)
|
|||
return( PR_TRUE);
|
||||
|
||||
for (int i = 0; i < kNumBadFolderNames; i++) {
|
||||
if (!name.Compare( cBadFolderNames[i], PR_TRUE))
|
||||
if (!name.CompareWithConversion( cBadFolderNames[i], PR_TRUE))
|
||||
return( PR_FALSE);
|
||||
}
|
||||
|
||||
|
@ -997,7 +997,7 @@ PRBool nsEudoraMac::IsValidMailboxName( nsCString& fName)
|
|||
{
|
||||
if (m_depth > 1)
|
||||
return( PR_TRUE);
|
||||
if (!fName.Compare( "Eudora Nicknames", PR_TRUE))
|
||||
if (!fName.CompareWithConversion( "Eudora Nicknames", PR_TRUE))
|
||||
return( PR_FALSE);
|
||||
return( PR_TRUE);
|
||||
}
|
||||
|
|
|
@ -575,7 +575,7 @@ PRInt32 nsImportFieldMap::FindFieldNum( const PRUnichar *pDesc)
|
|||
nsString * pStr;
|
||||
for (PRInt32 i = 0; i < m_mozFieldCount; i++) {
|
||||
pStr = (nsString *)m_descriptions.ElementAt( i);
|
||||
if (!pStr->Compare( pDesc))
|
||||
if (!pStr->Compare( nsAutoString(pDesc)))
|
||||
return( i);
|
||||
}
|
||||
|
||||
|
|
|
@ -1064,7 +1064,7 @@ void nsImportGenericMail::GetUniquePrettyName( nsIMsgAccountManager *pMgr, nsStr
|
|||
nsXPIDLString prettyName;
|
||||
rv = server->GetPrettyName( getter_Copies( prettyName));
|
||||
if (NS_SUCCEEDED( rv)) {
|
||||
if (!newName.Compare( prettyName, PR_TRUE))
|
||||
if (!newName.Compare( nsAutoString(prettyName), PR_TRUE))
|
||||
found = PR_TRUE;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -779,7 +779,7 @@ void ImportAddressImpl::SaveFieldMap( nsIImportFieldMap *pMap)
|
|||
nsXPIDLCString prefStr;
|
||||
rv = prefs->CopyCharPref( "mailnews.import.text.fieldmap", getter_Copies(prefStr));
|
||||
if (NS_SUCCEEDED( rv)) {
|
||||
if (!str.Compare( (const char *)prefStr))
|
||||
if (!str.Compare( nsCAutoString((const char *)prefStr)))
|
||||
done = PR_TRUE;
|
||||
}
|
||||
if (!done) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче