Bug 1439883 - Port Bug 1435671: NS_MutateURI::Apply() is no longer templated (take 2). r=aceman
authorJorg K <jorgk@jorgk.com>
Wed, 21 Feb 2018 15:32:34 +0100
changeset 31151 d2ebf88f37f15a4210df79b71f35a96216002696
parent 31150 30d95f2b12ff504202500db80310533effeac2d0
child 31152 af402e8367c3e1e2545e201ffa1d7c8d75b5c97d
push id383
push userclokep@gmail.com
push dateMon, 07 May 2018 21:52:48 +0000
reviewersaceman
bugs1439883, 1435671
Bug 1439883 - Port Bug 1435671: NS_MutateURI::Apply() is no longer templated (take 2). r=aceman
ldap/xpcom/src/nsLDAPURL.cpp
mailnews/compose/src/nsMsgSend.cpp
--- a/ldap/xpcom/src/nsLDAPURL.cpp
+++ b/ldap/xpcom/src/nsLDAPURL.cpp
@@ -33,20 +33,20 @@ nsLDAPURL::~nsLDAPURL()
 
 nsresult
 nsLDAPURL::Init(uint32_t aUrlType, int32_t aDefaultPort,
                 const nsACString &aSpec, const char* aOriginCharset,
                 nsIURI *aBaseURI)
 {
   nsresult rv;
   rv = NS_MutateURI(NS_STANDARDURLMUTATOR_CONTRACTID)
-         .Apply<nsIStandardURLMutator>(&nsIStandardURLMutator::Init,
-                                       nsIStandardURL::URLTYPE_STANDARD,
-                                       aDefaultPort, PromiseFlatCString(aSpec),
-                                       aOriginCharset, aBaseURI, nullptr)
+         .Apply(NS_MutatorMethod(&nsIStandardURLMutator::Init,
+                                 nsIStandardURL::URLTYPE_STANDARD,
+                                 aDefaultPort, PromiseFlatCString(aSpec),
+                                 aOriginCharset, aBaseURI, nullptr))
          .Finalize(mBaseURL);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Now get the spec from the mBaseURL in case it was a relative one
   nsCString spec;
   rv = mBaseURL->GetSpec(spec);
   NS_ENSURE_SUCCESS(rv, rv);
 
--- a/mailnews/compose/src/nsMsgSend.cpp
+++ b/mailnews/compose/src/nsMsgSend.cpp
@@ -2052,18 +2052,18 @@ nsMsgComposeAndSend::AddCompFieldLocalAt
           {
             nsresult  rv = NS_OK;
             nsCOMPtr<nsIMIMEService> mimeFinder (do_GetService(NS_MIMESERVICE_CONTRACTID, &rv));
             if (NS_SUCCEEDED(rv) && mimeFinder)
             {
               nsCOMPtr<nsIURL> fileUrl;
               rv = NS_MutateURI(NS_STANDARDURLMUTATOR_CONTRACTID)
                      .Apply(NS_MutatorMethod(&nsIURLMutator::SetFileName,
-                                           m_attachments[newLoc]->m_realName,
-                                           nullptr))
+                                             m_attachments[newLoc]->m_realName,
+                                             nullptr))
                      .Finalize(fileUrl);
               if (NS_SUCCEEDED(rv))
               {
                 nsAutoCString fileExt;
                 // First try using the real file name.
                 rv = fileUrl->GetFileExtension(fileExt);
                 if (NS_SUCCEEDED(rv) && !fileExt.IsEmpty()) {
                   nsAutoCString type;