Bug 1494742 - Port bug 1493276: Fix static assert errors 'don't use CallQueryInterface for compile-time-determinable casts'. r=mccr8

calendar/base/backend/libical/calICSService.cpp

@@ -1009,7 +1009,9 @@ calIcalComponent::SerializeToICSStream(nsIInputStream **aStreamResult)
     // it's one of libical's ring buffers
     rv = aStringStream->SetData(icalstr, -1);
     NS_ENSURE_SUCCESS(rv, rv);
-    return CallQueryInterface(aStringStream, aStreamResult);
+
+    aStringStream.forget(aStreamResult);
+    return NS_OK;
 }
 
 nsresult

mailnews/compose/src/nsSmtpService.cpp

@@ -228,7 +228,8 @@ nsresult NS_MsgLoadSmtpUrl(nsIURI * aUrl, nsISupports * aConsumer, nsIRequest **
   rv = smtpProtocol->LoadUrl(aUrl, aConsumer);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  return CallQueryInterface(smtpProtocol.get(), aRequest);
+  smtpProtocol.forget(aRequest);
+  return NS_OK;
 }
 
 NS_IMETHODIMP nsSmtpService::VerifyLogon(nsISmtpServer *aServer,

mailnews/db/msgdb/src/nsMsgDatabase.cpp

@@ -3031,7 +3031,9 @@ nsMsgDatabase::GetFilterEnumerator(nsIArray *searchTerms, bool aReverse,
   NS_ENSURE_TRUE(e, NS_ERROR_OUT_OF_MEMORY);
   nsresult rv = e->InitSearchSession(searchTerms, m_folder);
   NS_ENSURE_SUCCESS(rv, rv);
-  return CallQueryInterface(e.get(), aResult);
+
+  e.forget(aResult);
+  return NS_OK;
 }
 
 NS_IMETHODIMP

mailnews/local/src/nsMailboxService.cpp

@@ -607,7 +607,8 @@ NS_IMETHODIMP nsMailboxService::NewChannel2(nsIURI *aURI,
   rv = protocol->SetLoadInfo(aLoadInfo);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  return CallQueryInterface(protocol, _retval);
+  protocol.forget(_retval);
+  return NS_OK;
 }
 
 nsresult nsMailboxService::DisplayMessageForPrinting(const char* aMessageURI,

mailnews/local/src/nsPop3Service.cpp

@@ -518,7 +518,8 @@ NS_IMETHODIMP nsPop3Service::NewChannel2(nsIURI *aURI,
 
   protocol->SetUsername(realUserName.get());
 
-  return CallQueryInterface(protocol, _retval);
+  protocol.forget(_retval);
+  return NS_OK;
 }
 
 

mailnews/mime/src/nsSimpleMimeConverterStub.cpp

@@ -205,5 +205,6 @@ MIME_NewSimpleMimeConverterStub(const char *aContentType,
     RefPtr<nsSimpleMimeConverterStub> inst = new nsSimpleMimeConverterStub(aContentType);
     NS_ENSURE_TRUE(inst, NS_ERROR_OUT_OF_MEMORY);
 
-    return CallQueryInterface(inst.get(), aResult);
+    inst.forget(aResult);
+    return NS_OK;
 }