Bug 1463266 - Change nsPromiseFlat[C]String to PromiseFlat[C]String for consistency. r=aceman
authorJorg K <jorgk@jorgk.com>
Thu, 20 Sep 2018 00:06:14 +0200
changeset 33189 ca9d4cde9481d4d89454c785ea3af152692e9076
parent 33188 91c8e34b5a1003a80f57c8936695b8281983fa31
child 33190 2b3c6469285638ef9d38db2e2fad7033029b8c23
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersaceman
bugs1463266
Bug 1463266 - Change nsPromiseFlat[C]String to PromiseFlat[C]String for consistency. r=aceman
mailnews/base/util/nsMsgProtocol.cpp
mailnews/base/util/nsMsgUtils.cpp
--- a/mailnews/base/util/nsMsgProtocol.cpp
+++ b/mailnews/base/util/nsMsgProtocol.cpp
@@ -953,17 +953,17 @@ nsresult nsMsgProtocol::DoNtlmStep1(cons
     nsresult rv;
 
     m_authModule = do_CreateInstance(NS_AUTH_MODULE_CONTRACTID_PREFIX "ntlm", &rv);
     // if this fails, then it means that we cannot do NTLM auth.
     if (NS_FAILED(rv) || !m_authModule)
         return rv;
 
     m_authModule->Init(nullptr, 0, nullptr, NS_ConvertUTF8toUTF16(username).get(),
-                       nsPromiseFlatString(password).get());
+                       PromiseFlatString(password).get());
 
     void *outBuf;
     uint32_t outBufLen;
     rv = m_authModule->GetNextToken((void *)nullptr, 0, &outBuf, &outBufLen);
     if (NS_SUCCEEDED(rv) && outBuf)
     {
         char *base64Str = PL_Base64Encode((char *)outBuf, outBufLen, nullptr);
         if (base64Str)
--- a/mailnews/base/util/nsMsgUtils.cpp
+++ b/mailnews/base/util/nsMsgUtils.cpp
@@ -2042,17 +2042,17 @@ NS_MSG_BASE nsMsgKey msgKeyFromInt(uint6
   NS_ASSERTION(aValue <= PR_UINT32_MAX, "Msg key value too big!");
   return aValue;
 }
 
 // Helper function to extract a query qualifier.
 nsCString MsgExtractQueryPart(const nsACString& spec, const char* queryToExtract)
 {
   nsCString queryPart;
-  int32_t queryIndex = nsPromiseFlatCString(spec).Find(queryToExtract);
+  int32_t queryIndex = PromiseFlatCString(spec).Find(queryToExtract);
   if (queryIndex == kNotFound)
     return queryPart;
 
   int32_t queryEnd = spec.FindChar('&', queryIndex + 1);
   if (queryEnd == kNotFound)
     queryEnd = spec.FindChar('?', queryIndex + 1);
   if (queryEnd == kNotFound) {
     // Nothing follows, so return from where the query qualifier started.