fix for #45797 - remove deprecated NS_IMPL_ISUPPORTS from mail

r=sspitzer
sr=mscott
iho=warren
This commit is contained in:
alecf%netscape.com 2000-12-06 22:24:41 +00:00
parent 3a801cb4e9
commit af0eb76d7c
73 changed files with 99 additions and 104 deletions

View File

@ -43,7 +43,7 @@ static NS_DEFINE_CID(kAddressBookDBCID, NS_ADDRDATABASE_CID);
static NS_DEFINE_CID(kMsgHeaderParserCID, NS_MSGHEADERPARSER_CID);
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
NS_IMPL_ISUPPORTS(nsAbAddressCollecter, NS_GET_IID(nsIAbAddressCollecter));
NS_IMPL_ISUPPORTS1(nsAbAddressCollecter, nsIAbAddressCollecter)
static const char *PREF_COLLECT_EMAIL_ADDRESS = "mail.collect_email_address";
static const char *PREF_COLLECT_EMAIL_ADDRESS_ENABLE_SIZE_LIMIT = "mail.collect_email_address_enable_size_limit";

View File

@ -407,23 +407,21 @@ nsresult nsAbAutoCompleteSession::SearchPreviousResults(const PRUnichar *searchS
for (i = 0, pos = 0; i < nbrOfItems; i ++, pos ++)
{
rv = array->QueryElementAt(pos, nsIAutoCompleteItem::GetIID(), getter_AddRefs(resultItem));
rv = array->QueryElementAt(pos, NS_GET_IID(nsIAutoCompleteItem),
getter_AddRefs(resultItem));
if (NS_FAILED(rv))
return NS_ERROR_FAILURE;
rv = resultItem->GetParam(getter_AddRefs(item));
if (NS_FAILED(rv) || !item)
return NS_ERROR_FAILURE;
rv = item->QueryInterface(nsAbAutoCompleteParam::GetIID(), (void **)&param);
if (NS_FAILED(rv) || !param)
return NS_ERROR_FAILURE;
param = (nsAbAutoCompleteParam *)(void *)item;
MatchType matchType;
if (CheckEntry(searchStr, searchStrLen, param->mNickName, param->mUserName, param->mEmailAddress, &matchType))
AddToResult(param->mNickName, param->mUserName, param->mEmailAddress, param->mNotes, param->mIsMailList, matchType, results);
NS_RELEASE(param);
}
return NS_OK;
}
@ -540,4 +538,4 @@ NS_IMETHODIMP nsAbAutoCompleteSession::SetDefaultDomain(const PRUnichar * aDefau
return NS_OK;
}
NS_IMPL_ISUPPORTS(nsAbAutoCompleteParam, nsAbAutoCompleteParam::GetIID());
NS_IMPL_ISUPPORTS1(nsAbAutoCompleteParam, nsISupports)

View File

@ -87,10 +87,14 @@ class nsAbAutoCompleteParam : public nsISupports
{
public:
NS_DECL_ISUPPORTS
NS_DEFINE_STATIC_IID_ACCESSOR(NS_ABAUTOCOMPLETEPARAM_IID)
// NS_DEFINE_STATIC_IID_ACCESSOR(NS_ABAUTOCOMPLETEPARAM_IID)
nsAbAutoCompleteParam(const PRUnichar* nickName, const PRUnichar* userName,const PRUnichar* emailAddress,
const PRUnichar* notes, PRBool isMailList, nsAbAutoCompleteSession::MatchType type)
nsAbAutoCompleteParam(const PRUnichar* nickName,
const PRUnichar* userName,
const PRUnichar* emailAddress,
const PRUnichar* notes,
PRBool isMailList,
nsAbAutoCompleteSession::MatchType type)
{
NS_INIT_REFCNT();
mNickName = nsCRT::strdup(nickName ? nickName : NS_STATIC_CAST(const PRUnichar*, NS_LITERAL_STRING("").get()));

View File

@ -184,7 +184,7 @@ nsresult nsAbRDFDataSource::Init()
return NS_OK;
}
NS_IMPL_ISUPPORTS(nsAbRDFDataSource, NS_GET_IID(nsIRDFDataSource));
NS_IMPL_ISUPPORTS1(nsAbRDFDataSource, nsIRDFDataSource)
// nsIRDFDataSource methods
NS_IMETHODIMP nsAbRDFDataSource::GetURI(char* *uri)

View File

@ -104,7 +104,7 @@ nsAddbookProtocolHandler::~nsAddbookProtocolHandler()
mReportColumns = nsnull;
}
NS_IMPL_ISUPPORTS(nsAddbookProtocolHandler, NS_GET_IID(nsIProtocolHandler));
NS_IMPL_ISUPPORTS1(nsAddbookProtocolHandler, nsIProtocolHandler)
NS_METHOD
nsAddbookProtocolHandler::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)

View File

@ -30,7 +30,7 @@
#include "nsXPIDLString.h"
NS_IMPL_THREADSAFE_ISUPPORTS(nsAddrBookSession, NS_GET_IID(nsIAddrBookSession));
NS_IMPL_THREADSAFE_ISUPPORTS1(nsAddrBookSession, nsIAddrBookSession)
nsAddrBookSession::nsAddrBookSession():
mRefCnt(0)

View File

@ -3447,7 +3447,7 @@ nsAddrDBEnumerator::~nsAddrDBEnumerator()
mRowCursor->CutStrongRef(mDB->GetEnv());
}
NS_IMPL_ISUPPORTS(nsAddrDBEnumerator, NS_GET_IID(nsIEnumerator))
NS_IMPL_ISUPPORTS1(nsAddrDBEnumerator, nsIEnumerator)
NS_IMETHODIMP nsAddrDBEnumerator::First(void)
{
@ -3575,7 +3575,7 @@ nsListAddressEnumerator::~nsListAddressEnumerator()
mListRow->CutStrongRef(mDB->GetEnv());
}
NS_IMPL_ISUPPORTS(nsListAddressEnumerator, NS_GET_IID(nsIEnumerator))
NS_IMPL_ISUPPORTS1(nsListAddressEnumerator, nsIEnumerator)
NS_IMETHODIMP nsListAddressEnumerator::First(void)
{

View File

@ -31,7 +31,7 @@
NS_IMPL_ISUPPORTS(nsMessageView, NS_GET_IID(nsIMessageView))
NS_IMPL_ISUPPORTS1(nsMessageView, nsIMessageView)
nsMessageView::nsMessageView()
{

View File

@ -603,7 +603,7 @@ nsMessageViewDataSource::createMessageNode(nsIMessage *message,
////////////////////////// nsMessageViewMessageEnumerator //////////////////
NS_IMPL_ISUPPORTS(nsMessageViewMessageEnumerator, NS_GET_IID(nsISimpleEnumerator))
NS_IMPL_ISUPPORTS1(nsMessageViewMessageEnumerator, nsISimpleEnumerator)
nsMessageViewMessageEnumerator::nsMessageViewMessageEnumerator(nsISimpleEnumerator *srcEnumerator,
PRUint32 showStatus)
@ -719,7 +719,7 @@ nsresult nsMessageViewMessageEnumerator::MeetsCriteria(nsIMessage *message, PRBo
////////////////////////// nsMessageViewThreadEnumerator //////////////////
NS_IMPL_ISUPPORTS(nsMessageViewThreadEnumerator, NS_GET_IID(nsISimpleEnumerator))
NS_IMPL_ISUPPORTS1(nsMessageViewThreadEnumerator, nsISimpleEnumerator)
nsMessageViewThreadEnumerator::nsMessageViewThreadEnumerator(nsISimpleEnumerator *threads,
nsIMsgFolder *srcFolder)

View File

@ -255,7 +255,7 @@ nsMessenger::~nsMessenger()
}
NS_IMPL_ISUPPORTS(nsMessenger, NS_GET_IID(nsIMessenger))
NS_IMPL_ISUPPORTS1(nsMessenger, nsIMessenger)
NS_IMETHODIMP
nsMessenger::SetWindow(nsIDOMWindowInternal *aWin, nsIMsgWindow *aMsgWindow)
@ -1344,7 +1344,7 @@ public:
NS_IMETHOD OnStopSending(nsresult aStatus, const PRUnichar *aMsg, PRUint32 aTotalTried, PRUint32 aSuccessful);
};
NS_IMPL_ISUPPORTS(SendLaterListener, NS_GET_IID(nsIMsgSendLaterListener));
NS_IMPL_ISUPPORTS1(SendLaterListener, nsIMsgSendLaterListener)
SendLaterListener::SendLaterListener()
{

View File

@ -42,7 +42,7 @@
static NS_DEFINE_CID(kMsgIdentityCID, NS_MSGIDENTITY_CID);
static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
NS_IMPL_ISUPPORTS(nsMsgAccount, NS_GET_IID(nsIMsgAccount));
NS_IMPL_ISUPPORTS1(nsMsgAccount, nsIMsgAccount)
nsMsgAccount::nsMsgAccount():
m_prefs(0),

View File

@ -274,7 +274,7 @@ nsMsgCopyService::FindRequest(nsISupports* aSupport,
return copyRequest;
}
NS_IMPL_THREADSAFE_ISUPPORTS(nsMsgCopyService, NS_GET_IID(nsIMsgCopyService))
NS_IMPL_THREADSAFE_ISUPPORTS1(nsMsgCopyService, nsIMsgCopyService)
NS_IMETHODIMP
nsMsgCopyService::CopyMessages(nsIMsgFolder* srcFolder, /* UI src folder */

View File

@ -40,7 +40,7 @@ nsMsgFolderCacheElement::~nsMsgFolderCacheElement()
}
NS_IMPL_ISUPPORTS(nsMsgFolderCacheElement, GetIID());
NS_IMPL_ISUPPORTS1(nsMsgFolderCacheElement, nsIMsgFolderCacheElement)
NS_IMPL_GETTER_STR(nsMsgFolderCacheElement::GetKey, m_folderKey)
NS_IMPL_SETTER_STR(nsMsgFolderCacheElement::SetKey, m_folderKey)

View File

@ -84,7 +84,7 @@ nsSubscribableServer::~nsSubscribableServer(void)
NS_ASSERTION(NS_SUCCEEDED(rv),"failed to free tree");
}
NS_IMPL_THREADSAFE_ISUPPORTS(nsSubscribableServer, NS_GET_IID(nsISubscribableServer));
NS_IMPL_THREADSAFE_ISUPPORTS1(nsSubscribableServer, nsISubscribableServer)
NS_IMETHODIMP
nsSubscribableServer::SetIncomingServer(nsIMsgIncomingServer *aServer)

View File

@ -52,7 +52,7 @@ void nsUrlListenerManager::ReleaseListeners()
}
}
NS_IMPL_THREADSAFE_ISUPPORTS(nsUrlListenerManager, NS_GET_IID(nsIUrlListenerManager));
NS_IMPL_THREADSAFE_ISUPPORTS1(nsUrlListenerManager, nsIUrlListenerManager)
nsresult nsUrlListenerManager::RegisterListener(nsIUrlListener * aUrlListener)
{

View File

@ -142,7 +142,7 @@ nsresult CreateStartupUrl(char *uri, nsIURI** aUrl)
}
NS_IMPL_ISUPPORTS(nsMessageFromMsgHdrEnumerator, NS_GET_IID(nsISimpleEnumerator))
NS_IMPL_ISUPPORTS1(nsMessageFromMsgHdrEnumerator, nsISimpleEnumerator)
nsMessageFromMsgHdrEnumerator::nsMessageFromMsgHdrEnumerator(nsISimpleEnumerator *srcEnumerator,
nsIMsgFolder *folder)

View File

@ -52,7 +52,7 @@ nsresult NS_NewMsgCompFields(const nsIID &aIID, void ** aInstancePtrResult)
}
/* the following macro actually implement addref, release and query interface for our component. */
NS_IMPL_THREADSAFE_ISUPPORTS(nsMsgCompFields, NS_GET_IID(nsIMsgCompFields));
NS_IMPL_THREADSAFE_ISUPPORTS1(nsMsgCompFields, nsIMsgCompFields)
nsMsgCompFields::nsMsgCompFields()
{

View File

@ -151,7 +151,7 @@ nsMsgCompose::~nsMsgCompose()
}
/* the following macro actually implement addref, release and query interface for our component. */
NS_IMPL_ISUPPORTS(nsMsgCompose, NS_GET_IID(nsMsgCompose));
NS_IMPL_ISUPPORTS1(nsMsgCompose, nsMsgCompose)
//
// Once we are here, convert the data which we know to be UTF-8 to UTF-16
@ -1538,7 +1538,7 @@ QuotingOutputStreamListener::SetMimeHeaders(nsIMimeHeaders * headers)
}
NS_IMPL_ISUPPORTS(QuotingOutputStreamListener, NS_GET_IID(nsIStreamListener));
NS_IMPL_ISUPPORTS1(QuotingOutputStreamListener, nsIStreamListener)
////////////////////////////////////////////////////////////////////////////////////
// END OF QUOTING LISTENER
////////////////////////////////////////////////////////////////////////////////////
@ -1878,7 +1878,7 @@ nsMsgComposeSendListener::GetMessageId(nsCString* aMessageId)
// is ready before we do various quoting operations
////////////////////////////////////////////////////////////////////////////////////
NS_IMPL_ISUPPORTS(nsMsgDocumentStateListener, NS_GET_IID(nsIDocumentStateListener));
NS_IMPL_ISUPPORTS1(nsMsgDocumentStateListener, nsIDocumentStateListener)
nsMsgDocumentStateListener::nsMsgDocumentStateListener(void)
{

View File

@ -157,7 +157,7 @@ CopyListener::SetMsgComposeAndSendObject(nsMsgComposeAndSend *obj)
// to listen for message copy completion and eventually notify the caller
////////////////////////////////////////////////////////////////////////////////////
NS_IMPL_ISUPPORTS(nsMsgCopy, NS_GET_IID(nsIUrlListener))
NS_IMPL_ISUPPORTS1(nsMsgCopy, nsIUrlListener)
nsMsgCopy::nsMsgCopy()
{

View File

@ -87,7 +87,7 @@ nsMsgDraft::~nsMsgDraft()
}
/* the following macro actually implement addref, release and query interface for our component. */
NS_IMPL_ISUPPORTS(nsMsgDraft, NS_GET_IID(nsIMsgDraft));
NS_IMPL_ISUPPORTS1(nsMsgDraft, nsIMsgDraft)
/* this function will be used by the factory to generate an Message Compose Fields Object....*/
nsresult

View File

@ -26,7 +26,7 @@
#include "nsIMsgMailNewsUrl.h"
#include "nsMsgPrompts.h"
NS_IMPL_ISUPPORTS(nsMsgDeliveryListener, NS_GET_IID(nsIUrlListener))
NS_IMPL_ISUPPORTS1(nsMsgDeliveryListener, nsIUrlListener)
nsresult
nsMsgDeliveryListener::OnStartRunningUrl(nsIURI * aUrl)

View File

@ -128,7 +128,7 @@ nsMsgQuote::~nsMsgQuote()
}
/* the following macro actually implement addref, release and query interface for our component. */
NS_IMPL_ISUPPORTS(nsMsgQuote, NS_GET_IID(nsIMsgQuote));
NS_IMPL_ISUPPORTS1(nsMsgQuote, nsIMsgQuote)
NS_IMETHODIMP nsMsgQuote::GetStreamListener(nsIStreamListener ** aStreamListener)
{

View File

@ -37,7 +37,7 @@ nsMsgRecipientArray::~nsMsgRecipientArray()
}
/* the following macro actually implement addref, release and query interface for our class. */
NS_IMPL_ISUPPORTS(nsMsgRecipientArray, NS_GET_IID(nsMsgRecipientArray));
NS_IMPL_ISUPPORTS1(nsMsgRecipientArray, nsIMsgRecipientArray)
nsresult nsMsgRecipientArray::StringAt(PRInt32 idx, PRUnichar **_retval)
{

View File

@ -161,7 +161,7 @@ nsresult NS_NewMsgSend(const nsIID &aIID, void ** aInstancePtrResult)
}
/* the following macro actually implement addref, release and query interface for our component. */
NS_IMPL_ISUPPORTS(nsMsgComposeAndSend, NS_GET_IID(nsIMsgSend));
NS_IMPL_ISUPPORTS1(nsMsgComposeAndSend, nsIMsgSend)
nsMsgComposeAndSend::nsMsgComposeAndSend() :
m_messageKey(0xffffffff)

View File

@ -325,7 +325,7 @@ nsMsgSendLater::OnStartRequest(nsIChannel *channel, nsISupports *ctxt)
// This is the listener class for the send operation. We have to create this class
// to listen for message send completion and eventually notify the caller
////////////////////////////////////////////////////////////////////////////////////
NS_IMPL_ISUPPORTS(SendOperationListener, NS_GET_IID(nsIMsgSendListener));
NS_IMPL_ISUPPORTS1(SendOperationListener, nsIMsgSendListener)
SendOperationListener::SendOperationListener(void)
{

View File

@ -142,7 +142,7 @@ public:
};
};
NS_IMPL_ISUPPORTS(SendOperationListener, NS_GET_IID(nsIMsgSendListener));
NS_IMPL_ISUPPORTS1(SendOperationListener, nsIMsgSendListener)
////////////////////////////////////////////////////////////////////////////////////
// This is the listener class for the send operation. We have to create this class
// to listen for message send completion and eventually notify the caller

View File

@ -219,7 +219,7 @@ private:
// This is the listener class for the send operation. We have to create this class
// to listen for message send completion and eventually notify the caller
////////////////////////////////////////////////////////////////////////////////////
NS_IMPL_ISUPPORTS(SendOperationListener, NS_GET_IID(nsIMsgSendListener));
NS_IMPL_ISUPPORTS1(SendOperationListener, nsIMsgSendListener)
SendOperationListener::SendOperationListener(void)
{

View File

@ -155,7 +155,7 @@ public:
return NS_OK;
}
};
NS_IMPL_ISUPPORTS(ConsoleOutputStreamImpl, NS_GET_IID(nsIOutputStream));
NS_IMPL_ISUPPORTS1(ConsoleOutputStreamImpl, nsIOutputStream)
////////////////////////////////////////////////////////////////////////////////////
// END OF CONSUMER STREAM
////////////////////////////////////////////////////////////////////////////////////

View File

@ -60,7 +60,7 @@ nsresult NS_NewURLFetcher(nsURLFetcher ** aInstancePtrResult)
// The following macros actually implement addref, release and
// query interface for our component.
NS_IMPL_ISUPPORTS(nsURLFetcher, NS_GET_IID(nsIStreamListener));
NS_IMPL_ISUPPORTS1(nsURLFetcher, nsIStreamListener)
/*
* Inherited methods for nsMimeConverter

View File

@ -75,7 +75,7 @@ nsMsgDBModule::~nsMsgDBModule()
Shutdown();
}
NS_IMPL_ISUPPORTS(nsMsgDBModule, NS_GET_IID(nsIModule))
NS_IMPL_ISUPPORTS1(nsMsgDBModule, nsIModule)
// Perform our one-time intialization for this module
nsresult nsMsgDBModule::Initialize()

View File

@ -2095,7 +2095,7 @@ nsMsgDBEnumerator::~nsMsgDBEnumerator()
NS_IF_RELEASE(mResultHdr);
}
NS_IMPL_ISUPPORTS(nsMsgDBEnumerator, NS_GET_IID(nsISimpleEnumerator))
NS_IMPL_ISUPPORTS1(nsMsgDBEnumerator, nsISimpleEnumerator)
nsresult nsMsgDBEnumerator::GetRowCursor()
{
@ -2288,7 +2288,7 @@ nsMsgDBThreadEnumerator::~nsMsgDBThreadEnumerator()
NS_RELEASE(mDB);
}
NS_IMPL_ISUPPORTS(nsMsgDBThreadEnumerator, NS_GET_IID(nsISimpleEnumerator))
NS_IMPL_ISUPPORTS1(nsMsgDBThreadEnumerator, nsISimpleEnumerator)
nsresult nsMsgDBThreadEnumerator::GetTableCursor(void)
{

View File

@ -30,7 +30,7 @@
#include "nsIMimeConverter.h"
#include "nsXPIDLString.h"
NS_IMPL_ISUPPORTS(nsMsgHdr, NS_GET_IID(nsIMsgDBHdr))
NS_IMPL_ISUPPORTS1(nsMsgHdr, nsIMsgDBHdr)
static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID);

View File

@ -26,7 +26,7 @@
#include "nsMsgDatabase.h"
#include "nsCOMPtr.h"
NS_IMPL_ISUPPORTS(nsMsgThread, NS_GET_IID(nsMsgThread))
NS_IMPL_ISUPPORTS1(nsMsgThread, nsMsgThread)
nsMsgThread::nsMsgThread()
{
@ -683,7 +683,7 @@ nsMsgThreadEnumerator::~nsMsgThreadEnumerator()
NS_RELEASE(mThread);
}
NS_IMPL_ISUPPORTS(nsMsgThreadEnumerator, NS_GET_IID(nsISimpleEnumerator))
NS_IMPL_ISUPPORTS1(nsMsgThreadEnumerator, nsISimpleEnumerator)
PRInt32 nsMsgThreadEnumerator::MsgKeyFirstChildIndex(nsMsgKey inMsgKey)

View File

@ -91,7 +91,7 @@ nsMsgImapModule::~nsMsgImapModule()
Shutdown();
}
NS_IMPL_ISUPPORTS(nsMsgImapModule, NS_GET_IID(nsIModule))
NS_IMPL_ISUPPORTS1(nsMsgImapModule, nsIModule)
// Perform our one-time intialization for this module
nsresult nsMsgImapModule::Initialize()

View File

@ -122,7 +122,7 @@ nsImapExtensionSinkProxy::~nsImapExtensionSinkProxy()
NS_IF_RELEASE (m_realImapExtensionSink);
}
NS_IMPL_THREADSAFE_ISUPPORTS(nsImapExtensionSinkProxy, NS_GET_IID(nsIImapExtensionSink));
NS_IMPL_THREADSAFE_ISUPPORTS1(nsImapExtensionSinkProxy, nsIImapExtensionSink);
NS_IMETHODIMP
nsImapExtensionSinkProxy::ClearFolderRights(nsIImapProtocol* aProtocol,
@ -352,7 +352,7 @@ nsImapMiscellaneousSinkProxy::~nsImapMiscellaneousSinkProxy()
NS_IF_RELEASE (m_realImapMiscellaneousSink);
}
NS_IMPL_THREADSAFE_ISUPPORTS(nsImapMiscellaneousSinkProxy, NS_GET_IID(nsIImapMiscellaneousSink));
NS_IMPL_THREADSAFE_ISUPPORTS1(nsImapMiscellaneousSinkProxy, nsIImapMiscellaneousSink)
NS_IMETHODIMP
nsImapMiscellaneousSinkProxy::GetArbitraryHeaders(nsIImapProtocol* aProtocol,

View File

@ -249,7 +249,7 @@ nsresult nsCreateImapBaseMessageURI(const char *baseURI, char **baseMessageURI)
// nsImapMailboxSpec stuff
NS_IMPL_ISUPPORTS(nsImapMailboxSpec, NS_GET_IID(nsIMailboxSpec));
NS_IMPL_ISUPPORTS1(nsImapMailboxSpec, nsIMailboxSpec)
nsImapMailboxSpec::nsImapMailboxSpec()
{

View File

@ -130,7 +130,7 @@ public:
};
NS_IMPL_ISUPPORTS( SendListener, nsCOMTypeInfo<nsIMsgSendListener>::GetIID())
NS_IMPL_ISUPPORTS1( SendListener, nsIMsgSendListener)
nsresult SendListener::CreateSendListener( nsIMsgSendListener **ppListener)
{

View File

@ -195,7 +195,7 @@ nsEudoraImport::~nsEudoraImport()
NS_IMPL_ISUPPORTS(nsEudoraImport, NS_GET_IID(nsIImportModule));
NS_IMPL_ISUPPORTS1(nsEudoraImport, nsIImportModule)
NS_IMETHODIMP nsEudoraImport::GetName( PRUnichar **name)
@ -339,7 +339,7 @@ ImportMailImpl::~ImportMailImpl()
NS_IMPL_THREADSAFE_ISUPPORTS(ImportMailImpl, NS_GET_IID(nsIImportMail));
NS_IMPL_THREADSAFE_ISUPPORTS1(ImportMailImpl, nsIImportMail)
NS_IMETHODIMP ImportMailImpl::GetDefaultLocation( nsIFileSpec **ppLoc, PRBool *found, PRBool *userVerify)
{
@ -557,7 +557,7 @@ ImportAddressImpl::~ImportAddressImpl()
NS_IMPL_THREADSAFE_ISUPPORTS(ImportAddressImpl, NS_GET_IID(nsIImportAddressBooks));
NS_IMPL_THREADSAFE_ISUPPORTS1(ImportAddressImpl, nsIImportAddressBooks)
NS_IMETHODIMP ImportAddressImpl::GetAutoFind(PRUnichar **description, PRBool *_retval)

View File

@ -65,7 +65,7 @@ nsEudoraSettings::~nsEudoraSettings()
NS_IF_RELEASE( m_pLocation);
}
NS_IMPL_ISUPPORTS(nsEudoraSettings, NS_GET_IID(nsIImportSettings));
NS_IMPL_ISUPPORTS1(nsEudoraSettings, nsIImportSettings)
NS_IMETHODIMP nsEudoraSettings::AutoLocate(PRUnichar **description, nsIFileSpec **location, PRBool *_retval)
{

View File

@ -176,7 +176,7 @@ nsOEImport::~nsOEImport()
NS_IMPL_ISUPPORTS(nsOEImport, NS_GET_IID(nsIImportModule));
NS_IMPL_ISUPPORTS1(nsOEImport, nsIImportModule)
NS_IMETHODIMP nsOEImport::GetName( PRUnichar **name)
@ -320,7 +320,7 @@ ImportMailImpl::~ImportMailImpl()
NS_IMPL_THREADSAFE_ISUPPORTS(ImportMailImpl, NS_GET_IID(nsIImportMail));
NS_IMPL_THREADSAFE_ISUPPORTS1(ImportMailImpl, nsIImportMail)
NS_IMETHODIMP ImportMailImpl::GetDefaultLocation( nsIFileSpec **ppLoc, PRBool *found, PRBool *userVerify)
{
@ -539,7 +539,7 @@ ImportAddressImpl::~ImportAddressImpl()
NS_IMPL_THREADSAFE_ISUPPORTS(ImportAddressImpl, NS_GET_IID(nsIImportAddressBooks));
NS_IMPL_THREADSAFE_ISUPPORTS1(ImportAddressImpl, nsIImportAddressBooks)
NS_IMETHODIMP ImportAddressImpl::GetAutoFind(PRUnichar **description, PRBool *_retval)

View File

@ -94,7 +94,7 @@ nsOESettings::~nsOESettings()
{
}
NS_IMPL_ISUPPORTS(nsOESettings, NS_GET_IID(nsIImportSettings));
NS_IMPL_ISUPPORTS1(nsOESettings, nsIImportSettings)
NS_IMETHODIMP nsOESettings::AutoLocate(PRUnichar **description, nsIFileSpec **location, PRBool *_retval)
{

View File

@ -128,7 +128,7 @@ public:
};
NS_IMPL_ISUPPORTS( SendListener, nsCOMTypeInfo<nsIMsgSendListener>::GetIID())
NS_IMPL_ISUPPORTS1( SendListener, nsIMsgSendListener)
nsresult SendListener::CreateSendListener( nsIMsgSendListener **ppListener)
{

View File

@ -179,7 +179,7 @@ nsOutlookImport::~nsOutlookImport()
NS_IMPL_ISUPPORTS(nsOutlookImport, NS_GET_IID(nsIImportModule));
NS_IMPL_ISUPPORTS1(nsOutlookImport, nsIImportModule)
NS_IMETHODIMP nsOutlookImport::GetName( PRUnichar **name)
@ -322,7 +322,7 @@ ImportMailImpl::~ImportMailImpl()
NS_IMPL_THREADSAFE_ISUPPORTS(ImportMailImpl, NS_GET_IID(nsIImportMail));
NS_IMPL_THREADSAFE_ISUPPORTS1(ImportMailImpl, nsIImportMail)
NS_IMETHODIMP ImportMailImpl::GetDefaultLocation( nsIFileSpec **ppLoc, PRBool *found, PRBool *userVerify)
{
@ -520,7 +520,7 @@ ImportAddressImpl::~ImportAddressImpl()
NS_IMPL_THREADSAFE_ISUPPORTS(ImportAddressImpl, NS_GET_IID(nsIImportAddressBooks));
NS_IMPL_THREADSAFE_ISUPPORTS1(ImportAddressImpl, nsIImportAddressBooks)
NS_IMETHODIMP ImportAddressImpl::GetAutoFind(PRUnichar **description, PRBool *_retval)

View File

@ -92,7 +92,7 @@ nsOutlookSettings::~nsOutlookSettings()
{
}
NS_IMPL_ISUPPORTS(nsOutlookSettings, NS_GET_IID(nsIImportSettings));
NS_IMPL_ISUPPORTS1(nsOutlookSettings, nsIImportSettings)
NS_IMETHODIMP nsOutlookSettings::AutoLocate(PRUnichar **description, nsIFileSpec **location, PRBool *_retval)
{

View File

@ -44,7 +44,7 @@ NS_METHOD nsImportABDescriptor::Create( nsISupports *aOuter, REFNSIID aIID, void
return rv;
}
NS_IMPL_THREADSAFE_ISUPPORTS(nsImportABDescriptor, NS_GET_IID(nsIImportABDescriptor));
NS_IMPL_THREADSAFE_ISUPPORTS1(nsImportABDescriptor, nsIImportABDescriptor)
nsImportABDescriptor::nsImportABDescriptor()
{

View File

@ -217,7 +217,7 @@ nsImportGenericAddressBooks::~nsImportGenericAddressBooks()
NS_IMPL_THREADSAFE_ISUPPORTS(nsImportGenericAddressBooks, NS_GET_IID(nsIImportGeneric));
NS_IMPL_THREADSAFE_ISUPPORTS1(nsImportGenericAddressBooks, nsIImportGeneric)
NS_IMETHODIMP nsImportGenericAddressBooks::GetData(const char *dataId, nsISupports **_retval)

View File

@ -50,7 +50,7 @@ NS_METHOD nsImportFieldMap::Create( nsISupports *aOuter, REFNSIID aIID, void **a
return rv;
}
NS_IMPL_THREADSAFE_ISUPPORTS(nsImportFieldMap, NS_GET_IID(nsIImportFieldMap));
NS_IMPL_THREADSAFE_ISUPPORTS1(nsImportFieldMap, nsIImportFieldMap)
nsImportFieldMap::nsImportFieldMap()
{

View File

@ -214,7 +214,7 @@ nsImportGenericMail::~nsImportGenericMail()
NS_IMPL_THREADSAFE_ISUPPORTS(nsImportGenericMail, NS_GET_IID(nsIImportGeneric));
NS_IMPL_THREADSAFE_ISUPPORTS1(nsImportGenericMail, nsIImportGeneric)
NS_IMETHODIMP nsImportGenericMail::GetData(const char *dataId, nsISupports **_retval)

View File

@ -44,7 +44,7 @@ NS_METHOD nsImportMailboxDescriptor::Create( nsISupports *aOuter, REFNSIID aIID,
return rv;
}
NS_IMPL_THREADSAFE_ISUPPORTS(nsImportMailboxDescriptor, NS_GET_IID(nsIImportMailboxDescriptor));
NS_IMPL_THREADSAFE_ISUPPORTS1(nsImportMailboxDescriptor, nsIImportMailboxDescriptor)
nsImportMailboxDescriptor::nsImportMailboxDescriptor()
{

View File

@ -404,7 +404,7 @@ NS_METHOD nsIImportMimeEncodeImpl::Create( nsISupports *aOuter, REFNSIID aIID, v
}
NS_IMPL_ISUPPORTS(nsIImportMimeEncodeImpl, NS_GET_IID(nsIImportMimeEncode));
NS_IMPL_ISUPPORTS1(nsIImportMimeEncodeImpl, nsIImportMimeEncode)
NS_METHOD nsIImportMimeEncodeImpl::EncodeFile(nsIFileSpec *inFile, nsIFileSpec *outFile, const char *fileName, const char *mimeType)
{

View File

@ -201,7 +201,7 @@ nsImportService::~nsImportService()
NS_IMPL_THREADSAFE_ISUPPORTS(nsImportService, NS_GET_IID(nsIImportService));
NS_IMPL_THREADSAFE_ISUPPORTS1(nsImportService, nsIImportService)
NS_IMETHODIMP nsImportService::DiscoverModules( void)

View File

@ -141,7 +141,7 @@ nsTextImport::~nsTextImport()
NS_IMPL_ISUPPORTS(nsTextImport, NS_GET_IID(nsIImportModule));
NS_IMPL_ISUPPORTS1(nsTextImport, nsIImportModule)
NS_IMETHODIMP nsTextImport::GetName( PRUnichar **name)
@ -263,7 +263,7 @@ ImportAddressImpl::~ImportAddressImpl()
NS_IMPL_THREADSAFE_ISUPPORTS(ImportAddressImpl, NS_GET_IID(nsIImportAddressBooks));
NS_IMPL_THREADSAFE_ISUPPORTS1(ImportAddressImpl, nsIImportAddressBooks)
NS_IMETHODIMP ImportAddressImpl::GetAutoFind(PRUnichar **addrDescription, PRBool *_retval)

View File

@ -129,7 +129,7 @@ nsMsgLocalModule::~nsMsgLocalModule()
Shutdown();
}
NS_IMPL_ISUPPORTS(nsMsgLocalModule, NS_GET_IID(nsIModule))
NS_IMPL_ISUPPORTS1(nsMsgLocalModule, nsIModule)
// Perform our one-time intialization for this module
nsresult nsMsgLocalModule::Initialize()

View File

@ -425,7 +425,7 @@ PRInt32 nsMsgMailboxParser::HandleLine(char *line, PRUint32 lineLength)
}
NS_IMPL_ISUPPORTS(nsParseMailMessageState, NS_GET_IID(nsIMsgParseMailMsgState));
NS_IMPL_ISUPPORTS1(nsParseMailMessageState, nsIMsgParseMailMsgState)
nsParseMailMessageState::nsParseMailMessageState()
{

View File

@ -35,7 +35,7 @@
#include "nsMsgLocalFolderHdrs.h"
#include "nsIMsgFolder.h" // TO include biffState enum. Change to bool later...
NS_IMPL_ISUPPORTS(nsPop3Sink, NS_GET_IID(nsIPop3Sink));
NS_IMPL_ISUPPORTS1(nsPop3Sink, nsIPop3Sink)
nsPop3Sink::nsPop3Sink()
{

View File

@ -134,7 +134,7 @@ protected:
PRBool m_runningURL; // are we currently running a url? this flag is set to false on exit...
};
NS_IMPL_ISUPPORTS(nsPop3TestDriver, NS_GET_IID(nsIUrlListener))
NS_IMPL_ISUPPORTS1(nsPop3TestDriver, nsIUrlListener)
nsPop3TestDriver::nsPop3TestDriver(nsIEventQueue *queue)
{

View File

@ -83,7 +83,7 @@ nsMimeModule::~nsMimeModule()
Shutdown();
}
NS_IMPL_ISUPPORTS(nsMimeModule, NS_GET_IID(nsIModule))
NS_IMPL_ISUPPORTS1(nsMimeModule, nsIModule)
// Perform our one-time intialization for this module
nsresult nsMimeModule::Initialize()

View File

@ -53,9 +53,7 @@ nsresult NS_NewMimeContentTypeHandler(nsIMimeContentTypeHandler ** aInstancePtrR
* The following macros actually implement addref, release and
* query interface for our component.
*/
NS_IMPL_ADDREF(nsMimeContentTypeHandler)
NS_IMPL_RELEASE(nsMimeContentTypeHandler)
NS_IMPL_QUERY_INTERFACE(nsMimeContentTypeHandler, NS_GET_IID(nsIMimeContentTypeHandler)); /* we need to pass in the interface ID of this interface */
NS_IMPL_ISUPPORTS1(nsMimeContentTypeHandler, nsIMimeContentTypeHandler)
/*
* nsIMimeEmitter definitions....

View File

@ -52,9 +52,7 @@ nsresult NS_NewMimeContentTypeHandler(nsIMimeContentTypeHandler ** aInstancePtrR
* The following macros actually implement addref, release and
* query interface for our component.
*/
NS_IMPL_ADDREF(nsMimeContentTypeHandler)
NS_IMPL_RELEASE(nsMimeContentTypeHandler)
NS_IMPL_QUERY_INTERFACE(nsMimeContentTypeHandler, NS_GET_IID(nsIMimeContentTypeHandler)); /* we need to pass in the interface ID of this interface */
NS_IMPL_ISUPPORTS1(nsMimeContentTypeHandler, nsIMimeContentTypeHandler)
/*
* nsIMimeEmitter definitions....

View File

@ -53,9 +53,7 @@ nsresult NS_NewMimeContentTypeHandler(nsIMimeContentTypeHandler ** aInstancePtrR
* The following macros actually implement addref, release and
* query interface for our component.
*/
NS_IMPL_ADDREF(nsMimeContentTypeHandler)
NS_IMPL_RELEASE(nsMimeContentTypeHandler)
NS_IMPL_QUERY_INTERFACE(nsMimeContentTypeHandler, NS_GET_IID(nsIMimeContentTypeHandler)); /* we need to pass in the interface ID of this interface */
NS_IMPL_ISUPPORTS1(nsMimeContentTypeHandler, nsIMimeContentTypeHandler)
/*
* nsIMimeEmitter definitions....

View File

@ -24,6 +24,7 @@
#define _MIMEMOZ_H_
#ifdef __cplusplus
#include "nsIFileSpec.h"
extern "C" {
#endif /* __cplusplus */

View File

@ -29,7 +29,7 @@
#include "prmem.h"
#include "plstr.h"
NS_IMPL_ISUPPORTS(nsMimeConverter, NS_GET_IID(nsIMimeConverter));
NS_IMPL_ISUPPORTS1(nsMimeConverter, nsIMimeConverter)
/*
* nsMimeConverter definitions....

View File

@ -37,7 +37,7 @@ nsMimeHeaders::~nsMimeHeaders()
MimeHeaders_free(mHeaders);
}
NS_IMPL_ISUPPORTS(nsMimeHeaders, NS_GET_IID(nsIMimeHeaders))
NS_IMPL_ISUPPORTS1(nsMimeHeaders, nsIMimeHeaders)
nsresult nsMimeHeaders::Initialize(const char * aAllHeaders, PRInt32 allHeadersSize)
{

View File

@ -28,7 +28,7 @@
* The following macros actually implement addref, release and
* query interface for our component.
*/
NS_IMPL_ISUPPORTS(nsMimeObjectClassAccess, NS_GET_IID(nsIMimeObjectClassAccess));
NS_IMPL_ISUPPORTS1(nsMimeObjectClassAccess, nsIMimeObjectClassAccess)
/*
* nsMimeObjectClassAccess definitions....

View File

@ -235,7 +235,7 @@ nsMsgHeaderParser::~nsMsgHeaderParser()
delete m_USAsciiToUtf8CharsetConverter;
}
NS_IMPL_ISUPPORTS(nsMsgHeaderParser, NS_GET_IID(nsIMsgHeaderParser));
NS_IMPL_ISUPPORTS1(nsMsgHeaderParser, nsIMsgHeaderParser)
MimeCharsetConverterClass *nsMsgHeaderParser::GetUSAsciiToUtf8CharsetConverter()
{

View File

@ -28,7 +28,7 @@
#include "nsMsgKeySet.h"
#include "nsNNTPArticleList.h"
NS_IMPL_ISUPPORTS(nsNNTPArticleList, GetIID())
NS_IMPL_ISUPPORTS1(nsNNTPArticleList, nsINNTPArticleList)
nsNNTPArticleList::nsNNTPArticleList()
{

View File

@ -26,7 +26,7 @@
#include "nsNNTPCategoryContainer.h"
NS_IMPL_ISUPPORTS(nsNNTPCategoryContainer, NS_GET_IID(nsINNTPCategoryContainer));
NS_IMPL_ISUPPORTS1(nsNNTPCategoryContainer, nsINNTPCategoryContainer)
nsNNTPCategoryContainer::nsNNTPCategoryContainer()
{

View File

@ -33,15 +33,13 @@
#include "prmem.h"
//#include <stdio.h>
class nsNNTPCategoryContainer : public nsISupports {
class nsNNTPCategoryContainer : public nsINNTPCategoryContainer {
public:
nsNNTPCategoryContainer();
virtual ~nsNNTPCategoryContainer();
NS_DECL_ISUPPORTS
NS_IMETHOD GetRootCategory(nsINNTPNewsgroup * *aRootCategory);
NS_IMETHOD SetRootCategory(nsINNTPNewsgroup * aRootCategory);
NS_IMETHOD Initialize(nsINNTPNewsgroup * aRootCategory);
NS_DECL_NSINNTPCATEGORYCONTAINER
protected:
nsINNTPNewsgroup * m_newsgroup;

View File

@ -40,7 +40,7 @@ static const char LINEBREAK_START = '\015';
nsNNTPHost * nsNNTPHost::M_FileOwner = nsnull;
NS_IMPL_ISUPPORTS(nsNNTPHost, GetIID())
NS_IMPL_ISUPPORTS1(nsNNTPHost, nsINNTPHost)
nsNNTPHost::nsNNTPHost()

View File

@ -51,7 +51,7 @@ nsNNTPNewsgroup::~nsNNTPNewsgroup()
PR_FREEIF(m_prettyName);
}
NS_IMPL_ISUPPORTS(nsNNTPNewsgroup, NS_GET_IID(nsINNTPNewsgroup));
NS_IMPL_ISUPPORTS1(nsNNTPNewsgroup, nsINNTPNewsgroup)
nsresult nsNNTPNewsgroup::GetName(char ** aName)
{

View File

@ -114,7 +114,7 @@ nsNNTPNewsgroupList::~nsNNTPNewsgroupList()
CleanUp();
}
NS_IMPL_ISUPPORTS(nsNNTPNewsgroupList, NS_GET_IID(nsINNTPNewsgroupList));
NS_IMPL_ISUPPORTS1(nsNNTPNewsgroupList, nsINNTPNewsgroupList)
nsresult

View File

@ -56,7 +56,7 @@ const char* nsNNTPNewsgroupPost::m_headerName[HEADER_LAST+1]=
"Message-ID: ",
};
NS_IMPL_ISUPPORTS(nsNNTPNewsgroupPost, NS_GET_IID(nsINNTPNewsgroupPost));
NS_IMPL_ISUPPORTS1(nsNNTPNewsgroupPost, nsINNTPNewsgroupPost)
nsNNTPNewsgroupPost::nsNNTPNewsgroupPost()
{

View File

@ -39,7 +39,7 @@ nsNewsDownloadDialogArgs::~nsNewsDownloadDialogArgs()
{
}
NS_IMPL_ISUPPORTS(nsNewsDownloadDialogArgs, NS_GET_IID(nsINewsDownloadDialogArgs));
NS_IMPL_ISUPPORTS1(nsNewsDownloadDialogArgs, nsINewsDownloadDialogArgs)
NS_IMETHODIMP nsNewsDownloadDialogArgs::GetGroupName(char * *aGroupName)
{