part of scc's merge: change interface calls to IID() to GetIID(). (2378c3cf) · Commits · The Tor Project / Applications / Mullvad Browser

mailnews/compose/build/nsMsgCompFactory.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -82,9 +82,9 @@ nsresult nsMsgComposeFactory::QueryInterface(const nsIID &aIID, void **aResult)
		*aResult = NULL;

		// we support two interfaces....nsISupports and nsFactory.....
		if (aIID.Equals(::nsISupports::IID()))
		if (aIID.Equals(::nsISupports::GetIID()))
		aResult = (void )(nsISupports*)this;
		else if (aIID.Equals(nsIFactory::IID()))
		else if (aIID.Equals(nsIFactory::GetIID()))
		aResult = (void )(nsIFactory*)this;

		if (*aResult == NULL)
		@@ -189,7 +189,7 @@ extern "C" NS_EXPORT nsresult NSGetFactory(nsISupports* serviceMgr,
		*aFactory = new nsMsgComposeFactory(aClass);

		if (aFactory)
		return (aFactory)->QueryInterface(nsIFactory::IID(), (void*)aFactory); // they want a Factory Interface so give it to them
		return (aFactory)->QueryInterface(nsIFactory::GetIID(), (void*)aFactory); // they want a Factory Interface so give it to them
		else
		return NS_ERROR_OUT_OF_MEMORY;
		}

mailnews/compose/src/nsMsgCompFields.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ nsresult NS_NewMsgCompFields(nsIMsgCompFields** aInstancePtrResult)
		{
		nsMsgCompFields* pCompFields = new nsMsgCompFields();
		if (pCompFields)
		return pCompFields->QueryInterface(nsIMsgCompFields::IID(), (void**) aInstancePtrResult);
		return pCompFields->QueryInterface(nsIMsgCompFields::GetIID(), (void**) aInstancePtrResult);
		else
		return NS_ERROR_OUT_OF_MEMORY; /* we couldn't allocate the object */
		}
		@@ -46,7 +46,7 @@ nsresult NS_NewMsgCompFields(nsIMsgCompFields** aInstancePtrResult)
		}

		/* the following macro actually implement addref, release and query interface for our component. */
		NS_IMPL_ISUPPORTS(nsMsgCompFields, nsIMsgCompFields::IID());
		NS_IMPL_ISUPPORTS(nsMsgCompFields, nsIMsgCompFields::GetIID());

		nsMsgCompFields::nsMsgCompFields()
		{

mailnews/compose/src/nsMsgCompose.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -134,7 +134,7 @@ nsresult NS_NewMsgCompose(nsIMsgCompose** aInstancePtrResult)
		{
		nsMsgCompose* pCompose = new nsMsgCompose();
		if (pCompose)
		return pCompose->QueryInterface(nsIMsgCompose::IID(), (void**) aInstancePtrResult);
		return pCompose->QueryInterface(nsIMsgCompose::GetIID(), (void**) aInstancePtrResult);
		else
		return NS_ERROR_OUT_OF_MEMORY; /* we couldn't allocate the object */
		}
		@@ -396,7 +396,7 @@ nsMsgCompose::~nsMsgCompose()
		}

		/* the following macro actually implement addref, release and query interface for our component. */
		NS_IMPL_ISUPPORTS(nsMsgCompose, nsIMsgCompose::IID());
		NS_IMPL_ISUPPORTS(nsMsgCompose, nsIMsgCompose::GetIID());

		#if 0 //JFD
		nsMsgCompose::MSG_CompositionPaneCreate(MWContext* context,

mailnews/compose/src/nsMsgSend.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -341,7 +341,7 @@ nsMsgSendMimeDeliveryState::~nsMsgSendMimeDeliveryState()
		}

		/* the following macro actually implement addref, release and query interface for our component. */
		NS_IMPL_ISUPPORTS(nsMsgSendMimeDeliveryState, nsIMsgSend::IID());
		NS_IMPL_ISUPPORTS(nsMsgSendMimeDeliveryState, nsIMsgSend::GetIID());

		nsresult nsMsgSendMimeDeliveryState::SendMessage(const nsIMsgCompFields fields, const char smtp)
		{
		@@ -1620,7 +1620,7 @@ static char * mime_fix_header_1 (const char *string, PRBool addr_p, PRBool news_
		nsIMsgRFC822Parser * pRfc822;
		nsresult rv = nsRepository::CreateInstance(kMsgRFC822ParserCID,
		NULL,
		nsIMsgRFC822Parser::IID(),
		nsIMsgRFC822Parser::GetIID(),
		(void **) &pRfc822);
		if (NS_SUCCEEDED(rv)) {
		char *n;
		@@ -3155,7 +3155,7 @@ static char * mime_generate_headers (nsMsgCompFields *fields,

		nsINetService * pNetService;
		nsRepository::RegisterComponent(kNetServiceCID, NULL, NULL, "netlib.dll", PR_FALSE, PR_FALSE); /JFD - Should go away when netlib will register itself! /
		nsresult rv = nsServiceManager::GetService(kNetServiceCID, nsINetService::IID(), (nsISupports **)&pNetService);
		nsresult rv = nsServiceManager::GetService(kNetServiceCID, nsINetService::GetIID(), (nsISupports **)&pNetService);
		if (NS_SUCCEEDED(rv) && pNetService)
		{
		nsString aNSStr;
		@@ -4883,7 +4883,7 @@ void nsMsgSendMimeDeliveryState::DeliverFileAsMail ()
		nsISmtpService * smtpService = nsnull;
		nsFilePath filePath (m_msg_file_name ? m_msg_file_name : "");

		nsresult rv = nsServiceManager::GetService(kSmtpServiceCID, nsISmtpService::IID(), (nsISupports **)&smtpService);
		nsresult rv = nsServiceManager::GetService(kSmtpServiceCID, nsISmtpService::GetIID(), (nsISupports **)&smtpService);
		if (NS_SUCCEEDED(rv) && smtpService)
		{
		if (pSmtpServer)

mailnews/compose/src/nsSmtpProtocol.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -202,7 +202,7 @@ esmtp_value_encode(char *addr)
		/* the following macros actually implement addref, release and query interface for our component. */
		NS_IMPL_ADDREF(nsSmtpProtocol)
		NS_IMPL_RELEASE(nsSmtpProtocol)
		NS_IMPL_QUERY_INTERFACE(nsSmtpProtocol, nsIStreamListener::IID()); /* we need to pass in the interface ID of this interface */
		NS_IMPL_QUERY_INTERFACE(nsSmtpProtocol, nsIStreamListener::GetIID()); /* we need to pass in the interface ID of this interface */

		nsSmtpProtocol::nsSmtpProtocol(nsIURL * aURL, nsITransport * transportLayer)
		{
		@@ -245,7 +245,7 @@ void nsSmtpProtocol::Initialize(nsIURL * aURL, nsITransport * transportLayer)

		if (aURL)
		{
		nsresult rv = aURL->QueryInterface(nsISmtpUrl::IID(), (void **)&m_runningURL);
		nsresult rv = aURL->QueryInterface(nsISmtpUrl::GetIID(), (void **)&m_runningURL);
		if (NS_SUCCEEDED(rv) && m_runningURL)
		{
		// okay, now fill in our event sinks...Note that each getter ref counts before
		@@ -425,7 +425,7 @@ PRInt32 nsSmtpProtocol::SendData(const char * dataBuffer)
		// notify the consumer that data has arrived
		// HACK ALERT: this should really be m_runningURL once we have NNTP url support...
		nsIInputStream *inputStream = NULL;
		m_outputStream->QueryInterface(nsIInputStream::IID() , (void **) &inputStream);
		m_outputStream->QueryInterface(nsIInputStream::GetIID() , (void **) &inputStream);
		if (inputStream)
		{
		m_outputConsumer->OnDataAvailable(m_runningURL, inputStream, writeCount);
		@@ -1255,7 +1255,7 @@ PRInt32 nsSmtpProtocol::LoadURL(nsIURL * aURL)

		if (aURL)
		{
		rv = aURL->QueryInterface(nsISmtpUrl::IID(), (void **) &smtpUrl);
		rv = aURL->QueryInterface(nsISmtpUrl::GetIID(), (void **) &smtpUrl);
		if (NS_SUCCEEDED(rv) && smtpUrl)
		{
		m_runningURL = smtpUrl;