Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use nsCOMTypeInfo

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@37588 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
putterman%netscape.com 1999-07-01 00:07:42 +00:00
parent 19f8e2d3b8
commit f7d74c9b83
18 changed files with 65 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/mailnews/base/src/nsCopyMessageStreamListener.cpp
View File

@ -47,11 +47,11 @@ NS_IMETHODIMP nsCopyMessageStreamListener::QueryInterface(REFNSIID aIID, void**
{
if (!aInstancePtr) return NS_ERROR_NULL_POINTER;
*aInstancePtr = nsnull;
if (aIID.Equals(nsIStreamListener::GetIID()) || aIID.Equals(kISupportsIID))
if (aIID.Equals(nsCOMTypeInfo<nsIStreamListener>::GetIID()) || aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID()))
{
*aInstancePtr = NS_STATIC_CAST(nsIStreamListener*, this);
}
else if(aIID.Equals(nsICopyMessageStreamListener::GetIID()))
else if(aIID.Equals(nsCOMTypeInfo<nsICopyMessageStreamListener>::GetIID()))
{
*aInstancePtr = NS_STATIC_CAST(nsICopyMessageStreamListener*, this);
}
@ -89,7 +89,7 @@ static nsresult GetMessage(nsIURI *aURL, nsIMessage **message)
nsCOMPtr<nsIRDFResource> messageResource;
if(NS_SUCCEEDED(rdfService->GetResource(uri, getter_AddRefs(messageResource))))
{
messageResource->QueryInterface(nsIMessage::GetIID(), (void**)message);
messageResource->QueryInterface(nsCOMTypeInfo<nsIMessage>::GetIID(), (void**)message);
}
}
delete[] uri;

20
mozilla/mailnews/base/src/nsMessageViewDataSource.cpp
View File

@ -32,8 +32,6 @@
#define VIEW_SHOW_UNREAD 0x4
#define VIEW_SHOW_WATCHED 0x8
static NS_DEFINE_IID(gISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
@ -78,15 +76,15 @@ nsMessageViewDataSource::QueryInterface(REFNSIID iid, void** result)
return NS_ERROR_NULL_POINTER;
*result = nsnull;
if (iid.Equals(nsIRDFCompositeDataSource::GetIID()) ||
iid.Equals(nsIRDFDataSource::GetIID()) ||
iid.Equals(gISupportsIID))
if (iid.Equals(nsCOMTypeInfo<nsIRDFCompositeDataSource>::GetIID()) ||
iid.Equals(nsCOMTypeInfo<nsIRDFDataSource>::GetIID()) ||
iid.Equals(nsCOMTypeInfo<nsISupports>::GetIID()))
{
*result = NS_STATIC_CAST(nsIRDFCompositeDataSource*, this);
NS_ADDREF(this);
return NS_OK;
}
else if(iid.Equals(nsIMessageView::GetIID()))
else if(iid.Equals(nsCOMTypeInfo<nsIMessageView>::GetIID()))
{
*result = NS_STATIC_CAST(nsIMessageView*, this);
NS_ADDREF(this);
@ -130,7 +128,7 @@ nsMessageViewDataSource::Init()
nsresult rv;
rv = nsServiceManager::GetService(kRDFServiceCID,
nsIRDFService::GetIID(),
nsCOMTypeInfo<nsIRDFService>::GetIID(),
(nsISupports**) &mRDFService); // XXX probably need shutdown listener here
if (NS_FAILED(rv)) return rv;
@ -243,7 +241,7 @@ NS_IMETHODIMP nsMessageViewDataSource::GetTargets(nsIRDFResource* source,
if(NS_SUCCEEDED(rv))
return rv;
}
else if (mShowThreads && NS_SUCCEEDED(source->QueryInterface(nsIMessage::GetIID(), getter_AddRefs(message))))
else if (mShowThreads && NS_SUCCEEDED(source->QueryInterface(nsCOMTypeInfo<nsIMessage>::GetIID(), getter_AddRefs(message))))
{
if(property == kNC_MessageChild)
{
@ -375,7 +373,7 @@ NS_IMETHODIMP nsMessageViewDataSource::ArcLabelsOut(nsIRDFResource* source,
{
nsCOMPtr<nsIMessage> message;
if(mShowThreads && NS_SUCCEEDED(source->QueryInterface(nsIMessage::GetIID(), getter_AddRefs(message))))
if(mShowThreads && NS_SUCCEEDED(source->QueryInterface(nsCOMTypeInfo<nsIMessage>::GetIID(), getter_AddRefs(message))))
{
nsresult rv;
nsCOMPtr<nsISupportsArray> arcs;
@ -603,7 +601,7 @@ NS_IMETHODIMP nsMessageViewDataSource::SetShowThreads(PRBool showThreads)
////////////////////////// nsMessageViewMessageEnumerator //////////////////
NS_IMPL_ISUPPORTS(nsMessageViewMessageEnumerator, nsIEnumerator::GetIID())
NS_IMPL_ISUPPORTS(nsMessageViewMessageEnumerator, nsCOMTypeInfo<nsIEnumerator>::GetIID())
nsMessageViewMessageEnumerator::nsMessageViewMessageEnumerator(nsIEnumerator *srcEnumerator,
PRUint32 showStatus)
@ -734,7 +732,7 @@ nsresult nsMessageViewMessageEnumerator::MeetsCriteria(nsIMessage *message, PRBo
////////////////////////// nsMessageViewThreadEnumerator //////////////////
NS_IMPL_ISUPPORTS(nsMessageViewThreadEnumerator, nsIEnumerator::GetIID())
NS_IMPL_ISUPPORTS(nsMessageViewThreadEnumerator, nsCOMTypeInfo<nsIEnumerator>::GetIID())
nsMessageViewThreadEnumerator::nsMessageViewThreadEnumerator(nsIEnumerator *threads,
nsIMsgFolder *srcFolder)

23
mozilla/mailnews/base/src/nsMessenger.cpp
View File

@ -84,11 +84,6 @@ static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
static NS_DEFINE_CID(kMsgSendLaterCID, NS_MSGSENDLATER_CID);
static NS_DEFINE_CID(kCopyMessageStreamListenerCID, NS_COPYMESSAGESTREAMLISTENER_CID);
// we need this because of an egcs 1.0 (and possibly gcc) compiler bug
// that doesn't allow you to call ::nsISupports::GetIID() inside of a class
// that multiply inherits from nsISupports
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
class nsMessenger : public nsIMessenger
{
@ -170,7 +165,7 @@ static nsresult ConvertDOMListToResourceArray(nsIDOMNodeList *nodeList, nsISuppo
if(NS_FAILED(nodeList->Item(i, &node)))
return rv;
if(NS_SUCCEEDED(rv = node->QueryInterface(nsIDOMXULElement::GetIID(), (void**)&xulElement)))
if(NS_SUCCEEDED(rv = node->QueryInterface(nsCOMTypeInfo<nsIDOMXULElement>::GetIID(), (void**)&xulElement)))
{
if(NS_SUCCEEDED(rv = xulElement->GetResource(&resource)))
{
@ -214,12 +209,12 @@ static nsresult AddView(nsIRDFCompositeDataSource *database, nsIMessageView **me
//add the datasource
//return the view as an nsIMessageView
nsIRDFCompositeDataSource *viewCompositeDataSource;
if(NS_SUCCEEDED(view->QueryInterface(nsIRDFCompositeDataSource::GetIID(), (void**)&viewCompositeDataSource)))
if(NS_SUCCEEDED(view->QueryInterface(nsCOMTypeInfo<nsIRDFCompositeDataSource>::GetIID(), (void**)&viewCompositeDataSource)))
{
viewCompositeDataSource->AddDataSource(datasource);
NS_IF_RELEASE(viewCompositeDataSource);
}
rv = view->QueryInterface(nsIMessageView::GetIID(), (void**)messageView);
rv = view->QueryInterface(nsCOMTypeInfo<nsIMessageView>::GetIID(), (void**)messageView);
NS_IF_RELEASE(view);
NS_IF_RELEASE(datasource);
@ -249,7 +244,7 @@ nsMessenger::~nsMessenger()
//
// nsISupports
//
NS_IMPL_ISUPPORTS(nsMessenger, nsIMessenger::GetIID())
NS_IMPL_ISUPPORTS(nsMessenger, nsCOMTypeInfo<nsIMessenger>::GetIID())
//
// nsIMsgAppCore
@ -411,7 +406,7 @@ void nsMessenger::InitializeFolderRoot()
if (NS_SUCCEEDED(rv))
{
rv = compMgr->CreateInstance(kTransactionManagerCID, nsnull,
nsITransactionManager::GetIID(),
nsCOMTypeInfo<nsITransactionManager>::GetIID(),
getter_AddRefs(mTxnMgr));
if (NS_SUCCEEDED(rv))
mTxnMgr->SetMaxTransactionCount(-1);
@ -635,7 +630,7 @@ nsMessenger::CopyMessages(nsIRDFCompositeDataSource *database, nsIDOMXULElement
firstMessage->GetValue(&uri);
nsCOMPtr<nsICopyMessageStreamListener> copyStreamListener;
rv = nsComponentManager::CreateInstance(kCopyMessageStreamListenerCID, NULL,
nsICopyMessageStreamListener::GetIID(),
nsCOMTypeInfo<nsICopyMessageStreamListener>::GetIID(),
getter_AddRefs(copyStreamListener));
if(NS_FAILED(rv))
return rv;
@ -687,7 +682,7 @@ nsMessenger::GetRDFResourceForMessage(nsIDOMXULTreeElement *tree,
{
rv = aEnumerator->CurrentItem(&aItem);
if (rv != NS_OK) break;
rv = aItem->QueryInterface(nsIMessage::GetIID(), (void**)aSupport);
rv = aItem->QueryInterface(nsCOMTypeInfo<nsIMessage>::GetIID(), (void**)aSupport);
aItem->Release();
if (rv == NS_OK && *aSupport) break;
rv = aEnumerator->Next();
@ -944,7 +939,7 @@ public:
NS_IMETHOD OnStopSending(nsresult aStatus, const PRUnichar *aMsg, PRUint32 aTotalTried, PRUint32 aSuccessful);
};
NS_IMPL_ISUPPORTS(SendLaterListener, nsIMsgSendLaterListener::GetIID());
NS_IMPL_ISUPPORTS(SendLaterListener, nsCOMTypeInfo<nsIMsgSendLaterListener>::GetIID());
SendLaterListener::SendLaterListener()
{
@ -991,7 +986,7 @@ nsMessenger::SendUnsentMessages()
{
nsresult rv;
nsCOMPtr<nsIMsgSendLater> pMsgSendLater;
rv = nsComponentManager::CreateInstance(kMsgSendLaterCID, NULL,nsIMsgSendLater::GetIID(),
rv = nsComponentManager::CreateInstance(kMsgSendLaterCID, NULL,nsCOMTypeInfo<nsIMsgSendLater>::GetIID(),
(void **)getter_AddRefs(pMsgSendLater));
if (NS_SUCCEEDED(rv) && pMsgSendLater)
{

2
mozilla/mailnews/base/src/nsMessengerBootstrap.cpp
View File

@ -34,7 +34,7 @@ public:
};
NS_IMPL_ISUPPORTS(nsMessengerBootstrap, nsIAppShellComponent::GetIID())
NS_IMPL_ISUPPORTS(nsMessengerBootstrap, nsCOMTypeInfo<nsIAppShellComponent>::GetIID())
nsMessengerBootstrap::nsMessengerBootstrap()
{

6
mozilla/mailnews/base/src/nsMsgAccount.cpp
View File

@ -149,7 +149,7 @@ nsMsgAccount::GetIncomingServer(nsIMsgIncomingServer * *aIncomingServer)
nsCOMPtr<nsIMsgIncomingServer> server;
rv = nsComponentManager::CreateInstance(serverTypeProgID,
nsnull,
nsIMsgIncomingServer::GetIID(),
nsCOMTypeInfo<nsIMsgIncomingServer>::GetIID(),
getter_AddRefs(server));
PR_FREEIF(serverTypeProgID);
@ -247,7 +247,7 @@ nsMsgAccount::SetKey(char *accountKey)
// need the prefs service to do anything
if (!m_prefs)
rv = nsServiceManager::GetService(kPrefServiceCID,
nsIPref::GetIID(),
nsCOMTypeInfo<nsIPref>::GetIID(),
(nsISupports**)&m_prefs);
if (NS_FAILED(rv)) return rv;
@ -274,7 +274,7 @@ nsMsgAccount::SetKey(char *accountKey)
nsIMsgIdentity *identity = nsnull;
rv = nsComponentManager::CreateInstance(kMsgIdentityCID,
nsnull,
nsIMsgIdentity::GetIID(),
nsCOMTypeInfo<nsIMsgIdentity>::GetIID(),
(void **)&identity);
if (NS_SUCCEEDED(rv))

2
mozilla/mailnews/base/src/nsMsgAccountDataSource.cpp
View File

@ -68,7 +68,7 @@ protected:
static inline nsresult getAccount(nsIRDFResource *resource,
nsIMsgAccount* *account)
{ return resource->QueryInterface(nsIMsgAccount::GetIID(),
{ return resource->QueryInterface(nsCOMTypeInfo<nsIMsgAccount>::GetIID(),
(void **)account); }
static nsIRDFResource* kNC_Child;

14
mozilla/mailnews/base/src/nsMsgAccountManager.cpp
View File

@ -235,7 +235,7 @@ nsMsgAccountManager::CreateAccountWithKey(nsIMsgIncomingServer *server,
rv = nsComponentManager::CreateInstance(kMsgAccountCID,
nsnull,
nsIMsgAccount::GetIID(),
nsCOMTypeInfo<nsIMsgAccount>::GetIID(),
(void **)getter_AddRefs(account));
if (NS_SUCCEEDED(rv)) {
@ -663,7 +663,7 @@ nsMsgAccountManager::LoadAccounts()
// get the prefs service
if (!m_prefs) {
rv = nsServiceManager::GetService(kPrefServiceCID,
nsIPref::GetIID(),
nsCOMTypeInfo<nsIPref>::GetIID(),
(nsISupports**)&m_prefs);
if (NS_FAILED(rv)) return rv;
}
@ -740,7 +740,7 @@ nsMsgAccountManager::LoadAccount(nsString& accountKey)
nsresult rv;
rv = nsComponentManager::CreateInstance(kMsgAccountCID,
nsnull,
nsIMsgAccount::GetIID(),
nsCOMTypeInfo<nsIMsgAccount>::GetIID(),
(void **)&account);
#ifdef DEBUG_alecf
if (NS_FAILED(rv)) printf("Could not create an account\n");
@ -763,12 +763,12 @@ nsMsgAccountManager::upgradePrefs()
rv = nsComponentManager::CreateInstance(kMsgAccountCID,
nsnull,
nsIMsgAccount::GetIID(),
nsCOMTypeInfo<nsIMsgAccount>::GetIID(),
(void **)&account);
rv = nsComponentManager::CreateInstance(kMsgIdentityCID,
nsnull,
nsIMsgIdentity::GetIID(),
nsCOMTypeInfo<nsIMsgIdentity>::GetIID(),
(void **)&identity);
const char* serverProgID;
@ -791,7 +791,7 @@ nsMsgAccountManager::upgradePrefs()
rv = nsComponentManager::CreateInstance(serverProgID,
nsnull,
nsIMsgIncomingServer::GetIID(),
nsCOMTypeInfo<nsIMsgIncomingServer>::GetIID(),
(void **)&server);
account->SetKey("account1");
server->SetKey("server1");
@ -1117,7 +1117,7 @@ nsMsgAccountManager::findServersForIdentity(nsHashKey *key,
if (!thisSupports) continue;
nsIMsgIdentity *thisIdentity;
rv = thisSupports->QueryInterface(nsIMsgIdentity::GetIID(),
rv = thisSupports->QueryInterface(nsCOMTypeInfo<nsIMsgIdentity>::GetIID(),
(void **)&thisIdentity);
NS_RELEASE(thisSupports);
if (NS_SUCCEEDED(rv)) {

10
mozilla/mailnews/base/src/nsMsgBiffManager.cpp
View File

@ -18,10 +18,6 @@
#include "nsMsgBiffManager.h"
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
//There's no GetIID for this.
static NS_DEFINE_IID(kITimerCallbackIID, NS_ITIMERCALLBACK_IID);
NS_BEGIN_EXTERN_C
nsresult
@ -45,13 +41,13 @@ nsMsgBiffManager::QueryInterface(REFNSIID iid, void** result)
return NS_ERROR_NULL_POINTER;
*result = nsnull;
if (iid.Equals(nsIMsgBiffManager::GetIID()) ||
iid.Equals(kISupportsIID)) {
if (iid.Equals(nsCOMTypeInfo<nsIMsgBiffManager>::GetIID()) ||
iid.Equals(nsCOMTypeInfo<nsISupports>::GetIID())) {
*result = NS_STATIC_CAST(nsIMsgBiffManager*, this);
NS_ADDREF_THIS();
return NS_OK;
}
else if(iid.Equals(kITimerCallbackIID))
else if(iid.Equals(nsCOMTypeInfo<nsITimerCallback>::GetIID()))
{
*result = NS_STATIC_CAST(nsITimerCallback*, this);
NS_ADDREF_THIS();

2
mozilla/mailnews/base/src/nsMsgCopyService.cpp
View File

@ -339,7 +339,7 @@ nsMsgCopyService::FindRequest(nsISupports* aSupport,
return copyRequest;
}
NS_IMPL_THREADSAFE_ISUPPORTS(nsMsgCopyService, nsIMsgCopyService::GetIID())
NS_IMPL_THREADSAFE_ISUPPORTS(nsMsgCopyService, nsCOMTypeInfo<nsIMsgCopyService>::GetIID())
NS_IMETHODIMP
nsMsgCopyService::CopyMessages(nsIMsgFolder* srcFolder, /* UI src foler */

24
mozilla/mailnews/base/src/nsMsgFolderDataSource.cpp
View File

@ -41,10 +41,6 @@
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
static NS_DEFINE_CID(kMsgMailSessionCID, NS_MSGMAILSESSION_CID);
static NS_DEFINE_CID(kMsgCopyServiceCID, NS_MSGCOPYSERVICE_CID);
// we need this because of an egcs 1.0 (and possibly gcc) compiler bug
// that doesn't allow you to call ::nsISupports::GetIID() inside of a class
// that multiply inherits from nsISupports
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
nsIRDFResource* nsMsgFolderDataSource::kNC_Child = nsnull;
nsIRDFResource* nsMsgFolderDataSource::kNC_MessageChild = nsnull;
@ -108,7 +104,7 @@ nsresult nsMsgFolderDataSource::Init()
return NS_ERROR_ALREADY_INITIALIZED;
nsresult rv = nsServiceManager::GetService(kRDFServiceCID,
nsIRDFService::GetIID(),
nsCOMTypeInfo<nsIRDFService>::GetIID(),
(nsISupports**) &mRDFService); // XXX probably need shutdown listener here
PR_ASSERT(NS_SUCCEEDED(rv));
@ -153,7 +149,7 @@ nsMsgFolderDataSource::QueryInterface(REFNSIID iid, void** result)
return NS_ERROR_NULL_POINTER;
*result = nsnull;
if(iid.Equals(nsIFolderListener::GetIID()))
if(iid.Equals(nsCOMTypeInfo<nsIFolderListener>::GetIID()))
{
*result = NS_STATIC_CAST(nsIFolderListener*, this);
NS_ADDREF(this);
@ -546,10 +542,10 @@ NS_IMETHODIMP nsMsgFolderDataSource::OnItemAdded(nsIFolder *parentFolder, nsISup
nsCOMPtr<nsIMsgFolder> folder;
nsCOMPtr<nsIRDFResource> parentResource;
if(NS_SUCCEEDED(parentFolder->QueryInterface(nsIRDFResource::GetIID(), getter_AddRefs(parentResource))))
if(NS_SUCCEEDED(parentFolder->QueryInterface(nsCOMTypeInfo<nsIRDFResource>::GetIID(), getter_AddRefs(parentResource))))
{
//If we are adding a message
if(NS_SUCCEEDED(item->QueryInterface(nsIMessage::GetIID(), getter_AddRefs(message))))
if(NS_SUCCEEDED(item->QueryInterface(nsCOMTypeInfo<nsIMessage>::GetIID(), getter_AddRefs(message))))
{
nsCOMPtr<nsIRDFNode> itemNode(do_QueryInterface(item, &rv));
if(NS_SUCCEEDED(rv))
@ -559,7 +555,7 @@ NS_IMETHODIMP nsMsgFolderDataSource::OnItemAdded(nsIFolder *parentFolder, nsISup
}
}
//If we are adding a folder
else if(NS_SUCCEEDED(item->QueryInterface(nsIMsgFolder::GetIID(), getter_AddRefs(folder))))
else if(NS_SUCCEEDED(item->QueryInterface(nsCOMTypeInfo<nsIMsgFolder>::GetIID(), getter_AddRefs(folder))))
{
nsCOMPtr<nsIRDFNode> itemNode(do_QueryInterface(item, &rv));
if(NS_SUCCEEDED(rv))
@ -579,10 +575,10 @@ NS_IMETHODIMP nsMsgFolderDataSource::OnItemRemoved(nsIFolder *parentFolder, nsIS
nsCOMPtr<nsIMsgFolder> folder;
nsCOMPtr<nsIRDFResource> parentResource;
if(NS_SUCCEEDED(parentFolder->QueryInterface(nsIRDFResource::GetIID(), getter_AddRefs(parentResource))))
if(NS_SUCCEEDED(parentFolder->QueryInterface(nsCOMTypeInfo<nsIRDFResource>::GetIID(), getter_AddRefs(parentResource))))
{
//If we are removing a message
if(NS_SUCCEEDED(item->QueryInterface(nsIMessage::GetIID(), getter_AddRefs(message))))
if(NS_SUCCEEDED(item->QueryInterface(nsCOMTypeInfo<nsIMessage>::GetIID(), getter_AddRefs(message))))
{
nsCOMPtr<nsIRDFNode> itemNode(do_QueryInterface(item, &rv));
if(NS_SUCCEEDED(rv))
@ -592,7 +588,7 @@ NS_IMETHODIMP nsMsgFolderDataSource::OnItemRemoved(nsIFolder *parentFolder, nsIS
}
}
//If we are removing a folder
else if(NS_SUCCEEDED(item->QueryInterface(nsIMsgFolder::GetIID(), getter_AddRefs(folder))))
else if(NS_SUCCEEDED(item->QueryInterface(nsCOMTypeInfo<nsIMsgFolder>::GetIID(), getter_AddRefs(folder))))
{
nsCOMPtr<nsIRDFNode> itemNode(do_QueryInterface(item, &rv));
if(NS_SUCCEEDED(rv))
@ -847,7 +843,7 @@ nsMsgFolderDataSource::createFolderChildNode(nsIMsgFolder *folder,
nsCOMPtr<nsISupports> firstFolder;
rv = subFolders->CurrentItem(getter_AddRefs(firstFolder));
if (NS_SUCCEEDED(rv)) {
firstFolder->QueryInterface(nsIRDFResource::GetIID(), (void**)target);
firstFolder->QueryInterface(nsCOMTypeInfo<nsIRDFResource>::GetIID(), (void**)target);
}
}
return NS_FAILED(rv) ? NS_RDF_NO_VALUE : rv;
@ -866,7 +862,7 @@ nsMsgFolderDataSource::createFolderMessageNode(nsIMsgFolder *folder,
nsCOMPtr<nsISupports> firstMessage;
rv = messages->CurrentItem(getter_AddRefs(firstMessage));
if (NS_SUCCEEDED(rv)) {
rv = firstMessage->QueryInterface(nsIRDFNode::GetIID(), (void**)target);
rv = firstMessage->QueryInterface(nsCOMTypeInfo<nsIRDFNode>::GetIID(), (void**)target);
}
}
}

2
mozilla/mailnews/base/src/nsMsgIdentityDataSource.cpp
View File

@ -70,7 +70,7 @@ protected:
static inline nsresult getIdentity(nsIRDFResource *resource,
nsIMsgIdentity **identity)
{ return resource->QueryInterface(nsIMsgIdentity::GetIID(),
{ return resource->QueryInterface(nsCOMTypeInfo<nsIMsgIdentity>::GetIID(),
(void **)identity); }

8
mozilla/mailnews/base/src/nsMsgImapMailFolder.cpp
View File

@ -23,10 +23,6 @@
#include "nsISupportsArray.h"
#include "prprf.h"
#include "nsMsgDBCID.h"
// we need this because of an egcs 1.0 (and possibly gcc) compiler bug
// that doesn't allow you to call ::nsISupports::GetIID() inside of a class
// that multiply inherits from nsISupports
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_CID(kCMailDB, NS_MAILDB_CID);
nsMsgImapMailFolder::nsMsgImapMailFolder(nsString& name)
@ -50,8 +46,8 @@ nsMsgImapMailFolder::QueryInterface(REFNSIID iid, void** result)
return NS_ERROR_NULL_POINTER;
*result = nsnull;
if (iid.Equals(nsIMsgImapMailFolder::GetIID()) ||
iid.Equals(kISupportsIID))
if (iid.Equals(nsCOMTypeInfo<nsIMsgImapMailFolder>::GetIID()) ||
iid.Equals(nsCOMTypeInfo<nsISupports>::GetIID()))
{
*result = NS_STATIC_CAST(nsIMsgImapMailFolder*, this);
AddRef();

4
mozilla/mailnews/base/src/nsMsgMailSession.cpp
View File

@ -25,7 +25,7 @@
#include "nsMsgBaseCID.h"
#include "nsCOMPtr.h"
NS_IMPL_ISUPPORTS(nsMsgMailSession, nsIMsgMailSession::GetIID());
NS_IMPL_ISUPPORTS(nsMsgMailSession, nsCOMTypeInfo<nsIMsgMailSession>::GetIID());
static NS_DEFINE_CID(kMsgAccountManagerCID, NS_MSGACCOUNTMANAGER_CID);
//static NS_DEFINE_CID(kMsgIdentityCID, NS_MSGIDENTITY_CID);
@ -43,7 +43,7 @@ nsMsgMailSession::nsMsgMailSession():
rv = nsComponentManager::CreateInstance(kMsgAccountManagerCID,
NULL,
nsIMsgAccountManager::GetIID(),
nsCOMTypeInfo<nsIMsgAccountManager>::GetIID(),
(void **)&m_accountManager);
if (NS_SUCCEEDED(rv))
m_accountManager->LoadAccounts();

15
mozilla/mailnews/base/src/nsMsgMessageDataSource.cpp
View File

@ -39,13 +39,6 @@ static NS_DEFINE_CID(kMsgHeaderParserCID, NS_MSGHEADERPARSER_CID);
static NS_DEFINE_CID(kMsgMailSessionCID, NS_MSGMAILSESSION_CID);
static NS_DEFINE_CID(kLocaleFactoryCID, NS_LOCALEFACTORY_CID);
static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID);
// we need this because of an egcs 1.0 (and possibly gcc) compiler bug
// that doesn't allow you to call ::nsISupports::GetIID() inside of a class
// that multiply inherits from nsISupports
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
//There's no GetIID for this.
static NS_DEFINE_IID(kIDateTimeFormatIID, NS_IDATETIMEFORMAT_IID);
nsIRDFResource* nsMsgMessageDataSource::kNC_Subject;
nsIRDFResource* nsMsgMessageDataSource::kNC_Sender;
@ -106,7 +99,7 @@ nsresult nsMsgMessageDataSource::Init()
nsresult rv = nsServiceManager::GetService(kRDFServiceCID,
nsIRDFService::GetIID(),
nsCOMTypeInfo<nsIRDFService>::GetIID(),
(nsISupports**) &mRDFService); // XXX probably need shutdown listener here
if(NS_FAILED(rv))
@ -115,7 +108,7 @@ nsresult nsMsgMessageDataSource::Init()
mRDFService->RegisterDataSource(this, PR_FALSE);
rv = nsComponentManager::CreateInstance(kMsgHeaderParserCID,
NULL,
nsIMsgHeaderParser::GetIID(),
nsCOMTypeInfo<nsIMsgHeaderParser>::GetIID(),
(void **) &mHeaderParser);
if(NS_FAILED(rv))
@ -134,7 +127,7 @@ nsresult nsMsgMessageDataSource::Init()
return rv;
rv = nsComponentManager::CreateInstance(kDateTimeFormatCID, NULL,
kIDateTimeFormatIID, getter_AddRefs(mDateTimeFormat));
nsCOMTypeInfo<nsIDateTimeFormat>::GetIID(), getter_AddRefs(mDateTimeFormat));
if(NS_FAILED(rv))
return rv;
@ -169,7 +162,7 @@ nsMsgMessageDataSource::QueryInterface(REFNSIID iid, void** result)
return NS_ERROR_NULL_POINTER;
*result = nsnull;
if(iid.Equals(nsIFolderListener::GetIID()))
if(iid.Equals(nsCOMTypeInfo<nsIFolderListener>::GetIID()))
{
*result = NS_STATIC_CAST(nsIFolderListener*, this);
NS_ADDREF(this);

6
mozilla/mailnews/base/src/nsMsgNotificationManager.cpp
View File

@ -103,11 +103,11 @@ nsMsgNotificationManager::QueryInterface(REFNSIID iid, void** result)
{
*result = NS_STATIC_CAST(nsISupports*, this);
}
else if(iid.Equals(nsIFolderListener::GetIID()))
else if(iid.Equals(nsCOMTypeInfo<nsIFolderListener>::GetIID()))
{
*result = NS_STATIC_CAST(nsIFolderListener*, this);
}
else if(iid.Equals(nsIRDFDataSource::GetIID()))
else if(iid.Equals(nsCOMTypeInfo<nsIRDFDataSource>::GetIID()))
{
*result = mInMemoryDataSource;
}
@ -140,7 +140,7 @@ nsresult nsMsgNotificationManager::Init()
rv = nsComponentManager::CreateInstance(kRDFInMemoryDataSourceCID,
this,
nsIRDFDataSource::GetIID(),
nsCOMTypeInfo<nsIRDFDataSource>::GetIID(),
getter_AddRefs(mInMemoryDataSource));
if(NS_FAILED(rv))

9
mozilla/mailnews/base/src/nsMsgRDFDataSource.cpp
View File

@ -24,7 +24,6 @@
#include "nsMsgRDFUtils.h"
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
static NS_DEFINE_CID(kISupportsIID, NS_ISUPPORTS_IID);
nsMsgRDFDataSource::nsMsgRDFDataSource():
mRDFService(nsnull)
@ -68,10 +67,10 @@ nsMsgRDFDataSource::QueryInterface(const nsIID& iid, void **result)
// because otherwise gcc/egcs complains about an ambiguous nsISupports
void *res=nsnull;
if (iid.Equals(nsIRDFDataSource::GetIID()) ||
iid.Equals(kISupportsIID))
if (iid.Equals(nsCOMTypeInfo<nsIRDFDataSource>::GetIID()) ||
iid.Equals(nsCOMTypeInfo<nsISupports>::GetIID()))
res = NS_STATIC_CAST(nsIRDFDataSource*, this);
else if(iid.Equals(nsIShutdownListener::GetIID()))
else if(iid.Equals(nsCOMTypeInfo<nsIShutdownListener>::GetIID()))
res = NS_STATIC_CAST(nsIShutdownListener*, this);
if (res) {
@ -269,7 +268,7 @@ nsMsgRDFDataSource::getRDFService()
nsresult rv;
rv = nsServiceManager::GetService(kRDFServiceCID,
nsIRDFService::GetIID(),
nsCOMTypeInfo<nsIRDFService>::GetIID(),
(nsISupports**) &mRDFService,
this);
if (NS_FAILED(rv)) return nsnull;

2
mozilla/mailnews/base/src/nsMsgServerDataSource.cpp
View File

@ -57,7 +57,7 @@ protected:
static inline nsresult getServer(nsIRDFResource *resource,
nsIMsgIncomingServer **server)
{ return resource->QueryInterface(nsIMsgIncomingServer::GetIID(),
{ return resource->QueryInterface(nsCOMTypeInfo<nsIMsgIncomingServer>::GetIID(),
(void **)server); }

2
mozilla/mailnews/base/src/nsUrlListenerManager.cpp
View File

@ -45,7 +45,7 @@ nsUrlListenerManager::~nsUrlListenerManager()
delete m_listeners;
}
NS_IMPL_THREADSAFE_ISUPPORTS(nsUrlListenerManager, nsIUrlListenerManager::GetIID());
NS_IMPL_THREADSAFE_ISUPPORTS(nsUrlListenerManager, nsCOMTypeInfo<nsIUrlListenerManager>::GetIID());
nsresult nsUrlListenerManager::RegisterListener(nsIUrlListener * aUrlListener)
{