Bug 1470046 - Port Bug 1448330: replace nsIURI.clone with mutator call. rs=bustage-fix CLOSED TREE

--HG--
extra : amend_source : f2513bfe61669670754fd3ea6a9b614cab58ccbe

ldap/xpcom/src/nsLDAPURL.cpp

@@ -391,7 +391,7 @@ nsLDAPURL::CloneInternal(RefHandlingEnum aRefHandlingMode,
 
   nsresult rv;
   if (aRefHandlingMode == eHonorRef) {
-    rv = mBaseURL->Clone(getter_AddRefs(clone->mBaseURL));
+    rv = NS_MutateURI(mBaseURL).Finalize(mBaseURL);
   } else if (aRefHandlingMode == eReplaceRef) {
     rv = mBaseURL->CloneWithNewRef(newRef, getter_AddRefs(clone->mBaseURL));
   } else {
@@ -403,7 +403,7 @@ nsLDAPURL::CloneInternal(RefHandlingEnum aRefHandlingMode,
   return NS_OK;
 }
 
-NS_IMETHODIMP
+nsresult
 nsLDAPURL::Clone(nsIURI** result)
 {
   return CloneInternal(eHonorRef, EmptyCString(), result);

ldap/xpcom/src/nsLDAPURL.h

@@ -40,6 +40,7 @@ public:
   nsLDAPURL();
 
 protected:
+  virtual nsresult Clone(nsIURI **_retval);
   virtual nsresult SetSpecInternal(const nsACString &aSpec);
   virtual nsresult SetScheme(const nsACString &aScheme);
   virtual nsresult SetUserPass(const nsACString &aUserPass);

mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp

@@ -19,6 +19,7 @@
 #include "nsAbLDAPDirectory.h"
 #include "nsAbLDAPListenerBase.h"
 #include "nsXPCOMCIDInternal.h"
+#include "nsIURIMutator.h"
 
 using namespace mozilla;
 
@@ -389,7 +390,7 @@ NS_IMETHODIMP nsAbLDAPDirectoryQuery::DoQuery(nsIAbDirectory *aDirectory,
   }
 
   nsCOMPtr<nsIURI> uri;
-  rv = mDirectoryUrl->Clone(getter_AddRefs(uri));
+  rv = NS_MutateURI(mDirectoryUrl).Finalize(uri);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsILDAPURL> url(do_QueryInterface(uri, &rv));

mailnews/addrbook/src/nsAddbookUrl.cpp

@@ -191,7 +191,7 @@ nsAddbookUrl::CloneInternal(RefHandlingEnum aRefHandlingMode,
 
   nsresult rv;
   if (aRefHandlingMode == eHonorRef) {
-    rv = m_baseURL->Clone(getter_AddRefs(clone->m_baseURL));
+    rv = NS_MutateURI(m_baseURL).Finalize(m_baseURL);
   } else if (aRefHandlingMode == eReplaceRef) {
     rv = m_baseURL->CloneWithNewRef(newRef, getter_AddRefs(clone->m_baseURL));
   } else {
@@ -203,7 +203,7 @@ nsAddbookUrl::CloneInternal(RefHandlingEnum aRefHandlingMode,
   return NS_OK;
 }
 
-NS_IMETHODIMP nsAddbookUrl::Clone(nsIURI **_retval)
+nsresult nsAddbookUrl::Clone(nsIURI **_retval)
 {
   return CloneInternal(eHonorRef, EmptyCString(), _retval);
 }

mailnews/addrbook/src/nsAddbookUrl.h

@@ -21,6 +21,7 @@ public:
     nsAddbookUrl();
 
 protected:
+  virtual nsresult Clone(nsIURI **_retval);
   virtual nsresult SetSpecInternal(const nsACString &aSpec);
   virtual nsresult SetScheme(const nsACString &aScheme);
   virtual nsresult SetUserPass(const nsACString &aUserPass);

mailnews/base/util/nsMsgMailNewsUrl.cpp

@@ -650,7 +650,7 @@ nsMsgMailNewsUrl::CloneInternal(uint32_t aRefHandlingMode,
   return rv;
 }
 
-NS_IMETHODIMP nsMsgMailNewsUrl::Clone(nsIURI **_retval)
+nsresult nsMsgMailNewsUrl::Clone(nsIURI **_retval)
 {
   return CloneInternal(nsIMsgMailNewsUrl::HONOR_REF, EmptyCString(), _retval);
 }

mailnews/base/util/nsMsgMailNewsUrl.h

@@ -51,6 +51,7 @@ public:
     NS_DECL_NSIURIWITHPRINCIPAL
 
 protected:
+  virtual nsresult Clone(nsIURI **_retval);
   virtual nsresult SetScheme(const nsACString &aScheme);
   virtual nsresult SetUserPass(const nsACString &aUserPass);
   virtual nsresult SetUsername(const nsACString &aUsername);

mailnews/compose/src/nsSmtpUrl.cpp

@@ -533,7 +533,7 @@ nsMailtoUrl::CloneInternal(RefHandlingEnum aRefHandlingMode,
 
   nsresult rv;
   if (aRefHandlingMode == eHonorRef) {
-    rv = m_baseURL->Clone(getter_AddRefs(clone->m_baseURL));
+    rv = NS_MutateURI(m_baseURL).Finalize(m_baseURL);
   } else if (aRefHandlingMode == eReplaceRef) {
     rv = m_baseURL->CloneWithNewRef(newRef, getter_AddRefs(clone->m_baseURL));
   } else {
@@ -545,7 +545,7 @@ nsMailtoUrl::CloneInternal(RefHandlingEnum aRefHandlingMode,
   return NS_OK;
 }
 
-NS_IMETHODIMP
+nsresult
 nsMailtoUrl::Clone(nsIURI **_retval)
 {
   return CloneInternal(eHonorRef, EmptyCString(), _retval);

mailnews/compose/src/nsSmtpUrl.h

@@ -28,6 +28,7 @@ public:
     nsMailtoUrl();
 
 protected:
+  virtual nsresult Clone(nsIURI **_retval);
   virtual nsresult SetSpecInternal(const nsACString &aSpec);
   virtual nsresult SetScheme(const nsACString &aScheme);
   virtual nsresult SetUserPass(const nsACString &aUserPass);