Bug 1326433 - Port bug 1323683 to mailnews: Remove nsIURIWithQuery and implement {Get|Set}FilePath and {Get|Set}Query. r=jorgk CLOSED TREE

Base was patch from :Paenglab.

ldap/xpcom/src/nsLDAPURL.cpp

@@ -723,3 +723,27 @@ nsLDAPURL::GetHasRef(bool *result)
 {
   return mBaseURL->GetHasRef(result);
 }
+
+NS_IMETHODIMP
+nsLDAPURL::GetFilePath(nsACString &aFilePath)
+{
+  return mBaseURL->GetFilePath(aFilePath);
+}
+
+NS_IMETHODIMP
+nsLDAPURL::SetFilePath(const nsACString &aFilePath)
+{
+  return mBaseURL->SetFilePath(aFilePath);
+}
+
+NS_IMETHODIMP
+nsLDAPURL::GetQuery(nsACString &aQuery)
+{
+  return mBaseURL->GetQuery(aQuery);
+}
+
+NS_IMETHODIMP
+nsLDAPURL::SetQuery(const nsACString &aQuery)
+{
+  return mBaseURL->SetQuery(aQuery);
+}

mailnews/addrbook/src/nsAddbookUrl.cpp

@@ -248,6 +248,30 @@ nsAddbookUrl::SetRef(const nsACString &aRef)
   return ParseUrl();
 }
 
+NS_IMETHODIMP
+nsAddbookUrl::GetFilePath(nsACString &aFilePath)
+{
+  return m_baseURL->GetFilePath(aFilePath);
+}
+
+NS_IMETHODIMP
+nsAddbookUrl::SetFilePath(const nsACString &aFilePath)
+{
+  return m_baseURL->SetFilePath(aFilePath);
+}
+
+NS_IMETHODIMP
+nsAddbookUrl::GetQuery(nsACString &aQuery)
+{
+  return m_baseURL->GetQuery(aQuery);
+}
+
+NS_IMETHODIMP
+nsAddbookUrl::SetQuery(const nsACString &aQuery)
+{
+  return m_baseURL->SetQuery(aQuery);
+}
+
 NS_IMETHODIMP nsAddbookUrl::EqualsExceptRef(nsIURI *other, bool *_retval)
 {
   // The passed-in URI might be an nsMailtoUrl. Pass our inner URL to its

mailnews/base/util/nsMsgMailNewsUrl.cpp

@@ -53,7 +53,7 @@ nsMsgMailNewsUrl::~nsMsgMailNewsUrl()
   PR_FREEIF(m_errorMessage);
 }
   
-NS_IMPL_ISUPPORTS(nsMsgMailNewsUrl, nsIMsgMailNewsUrl, nsIURL, nsIURIWithQuery, nsIURI)
+NS_IMPL_ISUPPORTS(nsMsgMailNewsUrl, nsIMsgMailNewsUrl, nsIURL, nsIURI)
 
 ////////////////////////////////////////////////////////////////////////////////////
 // Begin nsIMsgMailNewsUrl specific support

mailnews/base/util/nsMsgMailNewsUrl.h

@@ -44,7 +44,6 @@ public:
     NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSIMSGMAILNEWSURL
     NS_DECL_NSIURI
-    NS_DECL_NSIURIWITHQUERY
     NS_DECL_NSIURL
 
 protected:

mailnews/compose/src/nsSmtpUrl.cpp

@@ -602,6 +602,30 @@ nsMailtoUrl::GetHasRef(bool *result)
   return m_baseURL->GetHasRef(result);
 }
 
+NS_IMETHODIMP
+nsMailtoUrl::GetFilePath(nsACString &aFilePath)
+{
+  return m_baseURL->GetFilePath(aFilePath);
+}
+
+NS_IMETHODIMP
+nsMailtoUrl::SetFilePath(const nsACString &aFilePath)
+{
+  return m_baseURL->SetFilePath(aFilePath);
+}
+
+NS_IMETHODIMP
+nsMailtoUrl::GetQuery(nsACString &aQuery)
+{
+  return m_baseURL->GetQuery(aQuery);
+}
+
+NS_IMETHODIMP
+nsMailtoUrl::SetQuery(const nsACString &aQuery)
+{
+  return m_baseURL->SetQuery(aQuery);
+}
+
 /////////////////////////////////////////////////////////////////////////////////////
 // smtp url definition
 /////////////////////////////////////////////////////////////////////////////////////

mailnews/jsaccount/src/JaUrl.cpp

@@ -132,7 +132,6 @@ NS_IMPL_ISUPPORTS(JaCppUrlDelegator::Super,
                   nsIMsgMailNewsUrl,
                   nsIMsgMessageUrl,
                   nsIURI,
-                  nsIURIWithQuery,
                   nsIURL,
                   nsIInterfaceRequestor)
 
@@ -169,7 +168,6 @@ NS_IMETHODIMP JaCppUrlDelegator::SetJsDelegate(nsISupports *aJsDelegate)
   mJsISupports = aJsDelegate;
   mJsIMsgMailNewsUrl = do_QueryInterface(aJsDelegate);
   mJsIURI = do_QueryInterface(aJsDelegate);
-  mJsIURIWithQuery = do_QueryInterface(aJsDelegate);
   mJsIURL = do_QueryInterface(aJsDelegate);
   mJsIMsgMessageUrl = do_QueryInterface(aJsDelegate);
   mJsIInterfaceRequestor = do_QueryInterface(aJsDelegate);

mailnews/jsaccount/src/JaUrl.h

@@ -67,7 +67,6 @@ public:
 
   NS_FORWARD_NSIMSGMAILNEWSURL(DELEGATE_JS(nsIMsgMailNewsUrl, mJsIMsgMailNewsUrl)->)
   NS_FORWARD_NSIURI(DELEGATE_JS(nsIURI, mJsIURI)->)
-  NS_FORWARD_NSIURIWITHQUERY(DELEGATE_JS(nsIURIWithQuery, mJsIURIWithQuery)->)
   NS_FORWARD_NSIURL(DELEGATE_JS(nsIURL, mJsIURL)->)
   NS_FORWARD_NSIMSGMESSAGEURL(DELEGATE_JS(nsIMsgMessageUrl, mJsIMsgMessageUrl)->)
   NS_FORWARD_NSIINTERFACEREQUESTOR(DELEGATE_JS(nsIInterfaceRequestor, mJsIInterfaceRequestor)->)
@@ -83,7 +82,6 @@ public:
       NS_DECL_ISUPPORTS
       NS_FORWARD_NSIMSGMAILNEWSURL(mFakeThis->JaBaseCppUrl::)
       NS_FORWARD_NSIURI(mFakeThis->JaBaseCppUrl::)
-      NS_FORWARD_NSIURIWITHQUERY(mFakeThis->JaBaseCppUrl::)
       NS_FORWARD_NSIURL(mFakeThis->JaBaseCppUrl::)
       NS_FORWARD_NSIMSGMESSAGEURL(mFakeThis->JaBaseCppUrl::)
       NS_FORWARD_NSIINTERFACEREQUESTOR(mFakeThis->JaBaseCppUrl::)
@@ -99,7 +97,6 @@ private:
   // Interfaces that may be overridden by JS.
   nsCOMPtr<nsIMsgMailNewsUrl> mJsIMsgMailNewsUrl;
   nsCOMPtr<nsIURI> mJsIURI;
-  nsCOMPtr<nsIURIWithQuery> mJsIURIWithQuery;
   nsCOMPtr<nsIURL> mJsIURL;
   nsCOMPtr<nsIMsgMessageUrl> mJsIMsgMessageUrl;
   nsCOMPtr<nsIInterfaceRequestor> mJsIInterfaceRequestor;