diff --git a/mozilla/extensions/wallet/src/singsign.cpp b/mozilla/extensions/wallet/src/singsign.cpp index f31738c6953..22ed1d8a6f8 100644 --- a/mozilla/extensions/wallet/src/singsign.cpp +++ b/mozilla/extensions/wallet/src/singsign.cpp @@ -2855,7 +2855,7 @@ SI_FindValueInArgs(nsAutoString results, char* name) { return nsAutoString("").ToNewCString(); } start += PL_strlen(name); /* get passed the |name| part */ - length = results.Find('|', start) - start; + length = results.FindChar('|', PR_FALSE,start) - start; results.Mid(value, start, length); return value.ToNewCString(); } diff --git a/mozilla/mailnews/base/src/nsMsgRDFUtils.cpp b/mozilla/mailnews/base/src/nsMsgRDFUtils.cpp index 226f5d526c4..618eb2c7af0 100644 --- a/mozilla/mailnews/base/src/nsMsgRDFUtils.cpp +++ b/mozilla/mailnews/base/src/nsMsgRDFUtils.cpp @@ -41,7 +41,7 @@ peqWithParameter(nsIRDFResource *r1, nsIRDFResource *r2, PRBool *isParameter, co nsAllocator::Free(r1Str); //Look to see if there are any parameters - PRInt32 paramStart = r2nsStr.Find('?'); + PRInt32 paramStart = r2nsStr.FindChar('?'); //If not, then just return whether or not the strings are equal. if(paramStart == -1) { diff --git a/mozilla/mailnews/base/util/nsMsgUtils.cpp b/mozilla/mailnews/base/util/nsMsgUtils.cpp index f4bfbe70b88..2f475859db1 100644 --- a/mozilla/mailnews/base/util/nsMsgUtils.cpp +++ b/mozilla/mailnews/base/util/nsMsgUtils.cpp @@ -33,7 +33,7 @@ nsresult GetMessageServiceProgIDForURI(const char *uri, nsString &progID) nsresult rv = NS_OK; //Find protocol nsString uriStr = uri; - PRInt32 pos = uriStr.Find(':'); + PRInt32 pos = uriStr.FindChar(':'); if(pos == -1) return NS_ERROR_FAILURE; nsString protocol; diff --git a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp index f1bd7e1cff6..2352b6c3e0f 100644 --- a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp +++ b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp @@ -1292,7 +1292,7 @@ nsMsgLocalMailFolder::CopyMessages(nsIMsgFolder* srcFolder, nsISupportsArray* rv = srcFolder->GetURI(&uri); nsString2 protocolType(uri, eOneByte); PR_FREEIF(uri); - protocolType.SetLength(protocolType.Find(':')); + protocolType.SetLength(protocolType.FindChar(':')); if (!protocolType.EqualsIgnoreCase("mailbox")) { diff --git a/mozilla/mailnews/local/src/nsLocalUndoTxn.cpp b/mozilla/mailnews/local/src/nsLocalUndoTxn.cpp index 5a7f5f914c4..fd92ce3bbb2 100644 --- a/mozilla/mailnews/local/src/nsLocalUndoTxn.cpp +++ b/mozilla/mailnews/local/src/nsLocalUndoTxn.cpp @@ -131,7 +131,7 @@ nsLocalMoveCopyMsgTxn::UndoImapDeleteFlag(nsIMsgFolder* folder, rv = folder->GetURI(&uri); nsString2 protocolType(uri, eOneByte); PR_FREEIF(uri); - protocolType.SetLength(protocolType.Find(':')); + protocolType.SetLength(protocolType.FindChar(':')); if (protocolType.EqualsIgnoreCase("imap")) { NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); diff --git a/mozilla/mailnews/local/src/nsLocalUtils.cpp b/mozilla/mailnews/local/src/nsLocalUtils.cpp index 435c1dfe4f0..a60e727d98c 100644 --- a/mozilla/mailnews/local/src/nsLocalUtils.cpp +++ b/mozilla/mailnews/local/src/nsLocalUtils.cpp @@ -238,7 +238,7 @@ nsresult nsParseLocalMessageURI(const char* uri, return NS_ERROR_NULL_POINTER; nsAutoString uriStr = uri; - PRInt32 keySeparator = uriStr.Find('#'); + PRInt32 keySeparator = uriStr.FindChar('#'); if(keySeparator != -1) { nsAutoString folderPath; diff --git a/mozilla/mailnews/news/src/nsNNTPProtocol.cpp b/mozilla/mailnews/news/src/nsNNTPProtocol.cpp index c30c091c7bc..1a5e3e844c6 100644 --- a/mozilla/mailnews/news/src/nsNNTPProtocol.cpp +++ b/mozilla/mailnews/news/src/nsNNTPProtocol.cpp @@ -2282,7 +2282,7 @@ PRInt32 nsNNTPProtocol::ReadArticle(nsIInputStream * inputStream, PRUint32 lengt void nsNNTPProtocol::ParseHeaderForCancel(char *buf) { nsString header(buf, eOneByte); - PRInt32 colon = header.Find(':'); + PRInt32 colon = header.FindChar(':'); if (!colon) return; diff --git a/mozilla/mailnews/news/src/nsNewsFolder.cpp b/mozilla/mailnews/news/src/nsNewsFolder.cpp index cb036813b33..4c433885a93 100644 --- a/mozilla/mailnews/news/src/nsNewsFolder.cpp +++ b/mozilla/mailnews/news/src/nsNewsFolder.cpp @@ -780,7 +780,7 @@ nsresult nsMsgNewsFolder::AbbreviatePrettyName(PRUnichar ** prettyName, PRInt32 // get the total no. of words for (PRInt32 pos = 0; (pos++) != name.Length(); - pos = name.Find('.', pos)) + pos = name.FindChar('.', PR_FALSE,pos)) totalwords ++; // get the no. of words to abbreviate diff --git a/mozilla/mailnews/news/src/nsNewsUtils.cpp b/mozilla/mailnews/news/src/nsNewsUtils.cpp index 1c0c458200d..01ba7da32bc 100644 --- a/mozilla/mailnews/news/src/nsNewsUtils.cpp +++ b/mozilla/mailnews/news/src/nsNewsUtils.cpp @@ -116,7 +116,7 @@ nsNewsURI2Path(const char* rootURI, const char* uriStr, nsFileSpec& pathResult) // the server name is the first component of the path, so extract it out PRInt32 hostStart = 0; - hostStart = uri.Find('/'); + hostStart = uri.FindChar('/'); if (hostStart <= 0) return NS_ERROR_FAILURE; // skip past all // @@ -126,9 +126,9 @@ nsNewsURI2Path(const char* rootURI, const char* uriStr, nsFileSpec& pathResult) nsAutoString hostname (eOneByte); uri.Right(hostname, uri.Length() - hostStart); - PRInt32 hostEnd = hostname.Find('/'); + PRInt32 hostEnd = hostname.FindChar('/'); - PRInt32 atPos = hostname.Find('@'); + PRInt32 atPos = hostname.FindChar('@'); nsAutoString username(eOneByte); username = ""; @@ -140,7 +140,7 @@ nsNewsURI2Path(const char* rootURI, const char* uriStr, nsFileSpec& pathResult) username = ""; - hostEnd = hostname.Find('/'); + hostEnd = hostname.FindChar('/'); } // newsgroup comes after the hostname, after the '/' @@ -209,7 +209,7 @@ nsParseNewsMessageURI(const char* uri, nsString& messageUriWithoutKey, PRUint32 return NS_ERROR_NULL_POINTER; nsAutoString uriStr = uri; - PRInt32 keySeparator = uriStr.Find('#'); + PRInt32 keySeparator = uriStr.FindChar('#'); if(keySeparator != -1) { uriStr.Left(messageUriWithoutKey, keySeparator); diff --git a/mozilla/mailnews/news/src/nsNntpService.cpp b/mozilla/mailnews/news/src/nsNntpService.cpp index 3025a1e77f6..7643988298f 100644 --- a/mozilla/mailnews/news/src/nsNntpService.cpp +++ b/mozilla/mailnews/news/src/nsNntpService.cpp @@ -187,7 +187,7 @@ nsresult nsNntpService::ConvertNewsMessageURI2NewsURI(const char *messageURI, ns // take news.mcom.com/mcom.linux (in hostname) and put // "mcom.linux" into newsgroupName and truncate to leave // "news.mcom.com" in hostname - PRInt32 hostEnd = hostname.Find('/'); + PRInt32 hostEnd = hostname.FindChar('/'); if (hostEnd > 0) { hostname.Right(newsgroupName, hostname.Length() - hostEnd - 1); hostname.Truncate(hostEnd); @@ -379,7 +379,7 @@ nsresult nsNntpService::DetermineHostForPosting(nsString &host, const char *news #endif // theRest is "group" or "host/group" - PRInt32 slashpos = theRest.Find('/'); + PRInt32 slashpos = theRest.FindChar('/'); if (slashpos > 0 ) { // theRest is "host/group" theRest.Left(currentHost, slashpos); @@ -490,7 +490,7 @@ nsresult nsNntpService::ConvertNewsgroupsString(const char *newsgroupsNames, cha #endif // theRest is "group" or "host/group" - PRInt32 slashpos = theRest.Find('/'); + PRInt32 slashpos = theRest.FindChar('/'); if (slashpos > 0 ) { nsString currentGroup("",eOneByte); diff --git a/mozilla/xpfe/components/prefwindow/src/nsPrefWindow.cpp b/mozilla/xpfe/components/prefwindow/src/nsPrefWindow.cpp index 3bf49382d98..609d956f16e 100644 --- a/mozilla/xpfe/components/prefwindow/src/nsPrefWindow.cpp +++ b/mozilla/xpfe/components/prefwindow/src/nsPrefWindow.cpp @@ -235,7 +235,7 @@ static PRBool CheckAndStrip( static PRInt16 CheckOrdinalAndStrip(nsString& ioString, PRInt16& outOrdinal) //---------------------------------------------------------------------------------------- { - PRInt32 colonPos = ioString.Find(':'); + PRInt32 colonPos = ioString.FindChar(':'); if (colonPos <= 0) return PR_FALSE; char* intString = ioString.ToNewCString();