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

Conversion of ::GetIID() to NS_GET_IID(). Bug #20232, r=scc@netscape.com

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@59703 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pp%ludusdesign.com 2000-02-04 00:39:15 +00:00
parent 265915815a
commit 637edb15e8
100 changed files with 402 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/intl/uconv/src/nsCharsetMenu.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsIComponentManager.h"
@ -242,7 +243,7 @@ nsMenuItem::~nsMenuItem()
//----------------------------------------------------------------------------
// Class nsCharsetMenu [implementation]
NS_IMPL_ISUPPORTS(nsCharsetMenu, nsIRDFDataSource::GetIID());
NS_IMPL_ISUPPORTS(nsCharsetMenu, NS_GET_IID(nsIRDFDataSource));
nsIRDFDataSource * nsCharsetMenu::mInner = NULL;
nsIRDFResource * nsCharsetMenu::kNC_BrowserCharsetMenuRoot = NULL;
@ -699,7 +700,7 @@ nsresult nsCharsetMenu::GetCollation(nsICollation ** aCollation)
if (NS_FAILED(res)) return res;
res = nsComponentManager::CreateInstance(kCollationFactoryCID, NULL,
nsICollationFactory::GetIID(), (void**) &collationFactory);
NS_GET_IID(nsICollationFactory), (void**) &collationFactory);
if (NS_FAILED(res)) return res;
res = collationFactory->CreateCollation(locale, aCollation);
@ -714,7 +715,7 @@ nsresult nsCharsetMenu::NewRDFContainer(nsIRDFDataSource * aDataSource,
nsresult res;
res = nsComponentManager::CreateInstance(kRDFContainerCID, NULL,
nsIRDFContainer::GetIID(), (void**)aResult);
NS_GET_IID(nsIRDFContainer), (void**)aResult);
if (NS_FAILED(res)) return res;
res = (*aResult)->Init(aDataSource, aResource);

5
mozilla/mailnews/addrbook/src/nsAbAddressCollecter.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "msgCore.h" // for pre-compiled headers
@ -42,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, nsCOMTypeInfo<nsIAbAddressCollecter>::GetIID());
NS_IMPL_ISUPPORTS(nsAbAddressCollecter, NS_GET_IID(nsIAbAddressCollecter));
nsAbAddressCollecter::nsAbAddressCollecter()
{
@ -110,7 +111,7 @@ NS_IMETHODIMP nsAbAddressCollecter::CollectAddress(const char *address)
if (!existingCard)
{
nsCOMPtr<nsIAbCard> senderCard;
rv = nsComponentManager::CreateInstance(kAbCardPropertyCID, nsnull, nsCOMTypeInfo<nsIAbCard>::GetIID(), getter_AddRefs(senderCard));
rv = nsComponentManager::CreateInstance(kAbCardPropertyCID, nsnull, NS_GET_IID(nsIAbCard), getter_AddRefs(senderCard));
if (NS_SUCCEEDED(rv) && senderCard)
{
if (curName && nsCRT::strlen(curName) > 0)

5
mozilla/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "msgCore.h"
@ -43,7 +44,7 @@ nsresult NS_NewAbAutoCompleteSession(const nsIID &aIID, void ** aInstancePtrResu
{
nsAbAutoCompleteSession * abSession = new nsAbAutoCompleteSession();
if (abSession)
return abSession->QueryInterface(nsCOMTypeInfo<nsIAutoCompleteSession>::GetIID(), aInstancePtrResult);
return abSession->QueryInterface(NS_GET_IID(nsIAutoCompleteSession), aInstancePtrResult);
else
return NS_ERROR_OUT_OF_MEMORY; /* we couldn't allocate the object */
}
@ -51,7 +52,7 @@ nsresult NS_NewAbAutoCompleteSession(const nsIID &aIID, void ** aInstancePtrResu
return NS_ERROR_NULL_POINTER; /* aInstancePtrResult was NULL....*/
}
NS_IMPL_ISUPPORTS(nsAbAutoCompleteSession, nsCOMTypeInfo<nsIAutoCompleteSession>::GetIID())
NS_IMPL_ISUPPORTS(nsAbAutoCompleteSession, NS_GET_IID(nsIAutoCompleteSession))
nsAbAutoCompleteSession::nsAbAutoCompleteSession()
{

5
mozilla/mailnews/addrbook/src/nsCardDataSource.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsCardDataSource.h"
@ -156,7 +157,7 @@ nsresult nsAbCardDataSource::Init()
return NS_ERROR_ALREADY_INITIALIZED;
nsresult rv = nsServiceManager::GetService(kRDFServiceCID,
nsCOMTypeInfo<nsIRDFService>::GetIID(),
NS_GET_IID(nsIRDFService),
(nsISupports**) &mRDFService); // XXX probably need shutdown listener here
if (NS_FAILED(rv)) return rv;
@ -203,7 +204,7 @@ NS_IMETHODIMP nsAbCardDataSource::QueryInterface(REFNSIID iid, void** result)
return NS_ERROR_NULL_POINTER;
*result = nsnull;
if(iid.Equals(nsCOMTypeInfo<nsIAbListener>::GetIID()))
if(iid.Equals(NS_GET_IID(nsIAbListener)))
{
*result = NS_STATIC_CAST(nsIAbListener*, this);
NS_ADDREF(this);

17
mozilla/mailnews/addrbook/src/nsDirectoryDataSource.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsDirectoryDataSource.h"
@ -119,7 +120,7 @@ nsAbDirectoryDataSource::Init()
return NS_ERROR_ALREADY_INITIALIZED;
nsresult rv = nsServiceManager::GetService(kRDFServiceCID,
nsCOMTypeInfo<nsIRDFService>::GetIID(),
NS_GET_IID(nsIRDFService),
(nsISupports**) &mRDFService);
if (NS_FAILED(rv)) return rv;
@ -156,7 +157,7 @@ NS_IMETHODIMP nsAbDirectoryDataSource::QueryInterface(REFNSIID iid, void** resul
return NS_ERROR_NULL_POINTER;
*result = nsnull;
if(iid.Equals(nsCOMTypeInfo<nsIAbListener>::GetIID()))
if(iid.Equals(NS_GET_IID(nsIAbListener)))
{
*result = NS_STATIC_CAST(nsIAbListener*, this);
NS_ADDREF(this);
@ -438,10 +439,10 @@ NS_IMETHODIMP nsAbDirectoryDataSource::OnItemAdded(nsISupports *parentDirectory,
nsCOMPtr<nsIAbDirectory> directory;
nsCOMPtr<nsIRDFResource> parentResource;
if(NS_SUCCEEDED(parentDirectory->QueryInterface(nsCOMTypeInfo<nsIRDFResource>::GetIID(), getter_AddRefs(parentResource))))
if(NS_SUCCEEDED(parentDirectory->QueryInterface(NS_GET_IID(nsIRDFResource), getter_AddRefs(parentResource))))
{
//If we are adding a card
if(NS_SUCCEEDED(item->QueryInterface(nsCOMTypeInfo<nsIAbCard>::GetIID(), getter_AddRefs(card))))
if(NS_SUCCEEDED(item->QueryInterface(NS_GET_IID(nsIAbCard), getter_AddRefs(card))))
{
nsCOMPtr<nsIRDFNode> itemNode(do_QueryInterface(item, &rv));
if (NS_SUCCEEDED(rv))
@ -451,7 +452,7 @@ NS_IMETHODIMP nsAbDirectoryDataSource::OnItemAdded(nsISupports *parentDirectory,
}
}
//If we are adding a directory
else if(NS_SUCCEEDED(item->QueryInterface(nsCOMTypeInfo<nsIAbDirectory>::GetIID(), getter_AddRefs(directory))))
else if(NS_SUCCEEDED(item->QueryInterface(NS_GET_IID(nsIAbDirectory), getter_AddRefs(directory))))
{
nsCOMPtr<nsIRDFNode> itemNode(do_QueryInterface(item, &rv));
if(NS_SUCCEEDED(rv))
@ -472,10 +473,10 @@ NS_IMETHODIMP nsAbDirectoryDataSource::OnItemRemoved(nsISupports *parentDirector
nsCOMPtr<nsIAbDirectory> directory;
nsCOMPtr<nsIRDFResource> parentResource;
if(NS_SUCCEEDED(parentDirectory->QueryInterface(nsCOMTypeInfo<nsIRDFResource>::GetIID(), getter_AddRefs(parentResource))))
if(NS_SUCCEEDED(parentDirectory->QueryInterface(NS_GET_IID(nsIRDFResource), getter_AddRefs(parentResource))))
{
//If we are removing a card
if(NS_SUCCEEDED(item->QueryInterface(nsCOMTypeInfo<nsIAbCard>::GetIID(), getter_AddRefs(card))))
if(NS_SUCCEEDED(item->QueryInterface(NS_GET_IID(nsIAbCard), getter_AddRefs(card))))
{
nsCOMPtr<nsIRDFNode> itemNode(do_QueryInterface(item, &rv));
if(NS_SUCCEEDED(rv))
@ -485,7 +486,7 @@ NS_IMETHODIMP nsAbDirectoryDataSource::OnItemRemoved(nsISupports *parentDirector
}
}
//If we are removing a directory
else if(NS_SUCCEEDED(item->QueryInterface(nsCOMTypeInfo<nsIAbDirectory>::GetIID(), getter_AddRefs(directory))))
else if(NS_SUCCEEDED(item->QueryInterface(NS_GET_IID(nsIAbDirectory), getter_AddRefs(directory))))
{
nsCOMPtr<nsIRDFNode> itemNode(do_QueryInterface(item, &rv));
if(NS_SUCCEEDED(rv))

3
mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "msgCore.h" // for pre-compiled headers...
@ -229,7 +230,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr,
return NS_ERROR_OUT_OF_MEMORY;
// Increase refcnt and store away nsIModule interface to m in return_cobj
rv = module->QueryInterface(nsIModule::GetIID(), (void**)return_cobj);
rv = module->QueryInterface(NS_GET_IID(nsIModule), (void**)return_cobj);
if (NS_FAILED(rv))
{
delete module;

10
mozilla/mailnews/db/msgdb/src/nsDBFolderInfo.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "msgCore.h"
@ -49,11 +50,6 @@ static const char * kVersionColumnName = "version";
static const char * kCharacterSetColumnName = "charSet";
static const char * kLocaleColumnName = "locale";
// 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);
NS_IMPL_ADDREF(nsDBFolderInfo)
NS_IMPL_RELEASE(nsDBFolderInfo)
@ -64,8 +60,8 @@ nsDBFolderInfo::QueryInterface(REFNSIID iid, void** result)
return NS_ERROR_NULL_POINTER;
*result = nsnull;
if(iid.Equals(nsIDBFolderInfo::GetIID()) ||
iid.Equals(kISupportsIID)) {
if(iid.Equals(NS_GET_IID(nsIDBFolderInfo)) ||
iid.Equals(NS_GET_IID(nsISupports))) {
*result = NS_STATIC_CAST(nsIDBFolderInfo*, this);
AddRef();
return NS_OK;

15
mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
// this file implements the nsMsgDatabase interface using the MDB Interface.
@ -396,9 +397,9 @@ NS_IMETHODIMP nsMsgDatabase::QueryInterface(REFNSIID aIID, void** aResult)
if (aResult == NULL)
return NS_ERROR_NULL_POINTER;
if (aIID.Equals(nsIMsgDatabase::GetIID()) ||
aIID.Equals(nsIDBChangeAnnouncer::GetIID()) ||
aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIMsgDatabase)) ||
aIID.Equals(NS_GET_IID(nsIDBChangeAnnouncer)) ||
aIID.Equals(NS_GET_IID(nsISupports))) {
*aResult = NS_STATIC_CAST(nsIMsgDatabase*, this);
NS_ADDREF_THIS();
return NS_OK;
@ -1659,7 +1660,7 @@ nsMsgDBEnumerator::~nsMsgDBEnumerator()
NS_IF_RELEASE(mResultHdr);
}
NS_IMPL_ISUPPORTS(nsMsgDBEnumerator, nsISimpleEnumerator::GetIID())
NS_IMPL_ISUPPORTS(nsMsgDBEnumerator, NS_GET_IID(nsISimpleEnumerator))
nsresult nsMsgDBEnumerator::GetRowCursor()
{
@ -1839,7 +1840,7 @@ nsMsgDBThreadEnumerator::~nsMsgDBThreadEnumerator()
NS_RELEASE(mDB);
}
NS_IMPL_ISUPPORTS(nsMsgDBThreadEnumerator, nsISimpleEnumerator::GetIID())
NS_IMPL_ISUPPORTS(nsMsgDBThreadEnumerator, NS_GET_IID(nsISimpleEnumerator))
nsresult nsMsgDBThreadEnumerator::GetTableCursor(void)
{
@ -2150,7 +2151,7 @@ nsresult nsMsgDatabase::RowCellColumnToMime2DecodedString(nsIMdbRow *row, mdb_to
{
// apply mime decode
err = nsComponentManager::CreateInstance(kCMimeConverterCID, nsnull,
nsIMimeConverter::GetIID(), getter_AddRefs(m_mimeConverter));
NS_GET_IID(nsIMimeConverter), getter_AddRefs(m_mimeConverter));
}
if (NS_SUCCEEDED(err) && m_mimeConverter)
{
@ -2228,7 +2229,7 @@ nsIMsgHeaderParser *nsMsgDatabase::GetHeaderParser()
{
nsresult rv = nsComponentManager::CreateInstance(kMsgHeaderParserCID,
NULL,
nsIMsgHeaderParser::GetIID(),
NS_GET_IID(nsIMsgHeaderParser),
(void **) &m_HeaderParser);
if (!NS_SUCCEEDED(rv))
m_HeaderParser = nsnull;

5
mozilla/mailnews/db/msgdb/src/nsMsgHdr.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "msgCore.h"
@ -29,7 +30,7 @@
#include "nsIMimeConverter.h"
#include "nsXPIDLString.h"
NS_IMPL_ISUPPORTS(nsMsgHdr, nsIMsgDBHdr::GetIID())
NS_IMPL_ISUPPORTS(nsMsgHdr, NS_GET_IID(nsIMsgDBHdr))
static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID);
@ -607,7 +608,7 @@ NS_IMETHODIMP nsMsgHdr::GetAuthorCollationKey(nsString *resultAuthor)
// apply mime decode
nsIMimeConverter *converter;
ret = nsComponentManager::CreateInstance(kCMimeConverterCID, nsnull,
nsIMimeConverter::GetIID(), (void **)&converter);
NS_GET_IID(nsIMimeConverter), (void **)&converter);
if (NS_SUCCEEDED(ret) && nsnull != converter)
{

5
mozilla/mailnews/db/msgdb/src/nsMsgThread.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "msgCore.h"
@ -25,7 +26,7 @@
#include "nsMsgDatabase.h"
#include "nsCOMPtr.h"
NS_IMPL_ISUPPORTS(nsMsgThread, nsMsgThread::GetIID())
NS_IMPL_ISUPPORTS(nsMsgThread, NS_GET_IID(nsMsgThread))
nsMsgThread::nsMsgThread()
{
@ -655,7 +656,7 @@ nsMsgThreadEnumerator::~nsMsgThreadEnumerator()
NS_RELEASE(mThread);
}
NS_IMPL_ISUPPORTS(nsMsgThreadEnumerator, nsISimpleEnumerator::GetIID())
NS_IMPL_ISUPPORTS(nsMsgThreadEnumerator, NS_GET_IID(nsISimpleEnumerator))
PRInt32 nsMsgThreadEnumerator::MsgKeyFirstChildIndex(nsMsgKey inMsgKey)

3
mozilla/mailnews/db/msgdb/src/nsNewsDatabase.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "msgCore.h"
@ -62,7 +63,7 @@ NS_IMETHODIMP nsNewsDatabase::QueryInterface(REFNSIID aIID, void** aInstancePtr)
if (!aInstancePtr) return NS_ERROR_NULL_POINTER;
*aInstancePtr = nsnull;
if (aIID.Equals(nsINewsDatabase::GetIID()))
if (aIID.Equals(NS_GET_IID(nsINewsDatabase)))
{
*aInstancePtr = NS_STATIC_CAST(nsINewsDatabase *, this);
}

3
mozilla/mailnews/imap/build/nsImapFactory.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "msgCore.h" // for pre-compiled headers...
@ -301,7 +302,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr,
return NS_ERROR_OUT_OF_MEMORY;
// Increase refcnt and store away nsIModule interface to m in return_cobj
rv = module->QueryInterface(nsIModule::GetIID(), (void**)return_cobj);
rv = module->QueryInterface(NS_GET_IID(nsIModule), (void**)return_cobj);
if (NS_FAILED(rv))
{
delete module;

3
mozilla/mailnews/imap/src/nsIMAPHostSessionList.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "msgCore.h"
@ -78,7 +79,7 @@ NS_IMETHODIMP nsIMAPHostSessionList::QueryInterface(const nsIID &aIID, void** aI
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIsThreadsafeIID, NS_ISTHREADSAFE_IID);
if (aIID.Equals(nsIImapHostSessionList::GetIID()))
if (aIID.Equals(NS_GET_IID(nsIImapHostSessionList)))
{
*aInstancePtr = (nsIImapHostSessionList *) this;
NS_ADDREF_THIS();

3
mozilla/mailnews/imap/src/nsImapFlagAndUidState.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "msgCore.h" // for pre-compiled headers
@ -27,7 +28,7 @@
#include "prcmon.h"
#include "nspr.h"
NS_IMPL_ISUPPORTS(nsImapFlagAndUidState, nsIImapFlagAndUidState::GetIID())
NS_IMPL_ISUPPORTS(nsImapFlagAndUidState, NS_GET_IID(nsIImapFlagAndUidState))
NS_IMETHODIMP nsImapFlagAndUidState::GetNumberOfMessages(PRInt32 *result)
{

7
mozilla/mailnews/imap/src/nsImapIncomingServer.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "msgCore.h"
@ -64,11 +65,11 @@ NS_IMETHODIMP nsImapIncomingServer::QueryInterface(REFNSIID aIID, void** aInstan
if (!aInstancePtr) return NS_ERROR_NULL_POINTER;
*aInstancePtr = nsnull;
if (aIID.Equals(nsIImapServerSink::GetIID()))
if (aIID.Equals(NS_GET_IID(nsIImapServerSink)))
{
*aInstancePtr = NS_STATIC_CAST(nsIImapServerSink*, this);
}
else if(aIID.Equals(nsIImapIncomingServer::GetIID()))
else if(aIID.Equals(NS_GET_IID(nsIImapIncomingServer)))
{
*aInstancePtr = NS_STATIC_CAST(nsIImapIncomingServer*, this);
}
@ -452,7 +453,7 @@ nsImapIncomingServer::CreateImapConnection(nsIEventQueue *aEventQueue,
// condition where someone else goes through this code
nsIImapProtocol * protocolInstance = nsnull;
rv = nsComponentManager::CreateInstance(kImapProtocolCID, nsnull,
nsIImapProtocol::GetIID(),
NS_GET_IID(nsIImapProtocol),
(void **) &protocolInstance);
if (NS_SUCCEEDED(rv) && protocolInstance)
{

49
mozilla/mailnews/imap/src/nsImapMailFolder.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "msgCore.h"
@ -118,35 +119,35 @@ NS_IMETHODIMP nsImapMailFolder::QueryInterface(REFNSIID aIID, void** aInstancePt
if (!aInstancePtr) return NS_ERROR_NULL_POINTER;
*aInstancePtr = nsnull;
if (aIID.Equals(nsIMsgImapMailFolder::GetIID()))
if (aIID.Equals(NS_GET_IID(nsIMsgImapMailFolder)))
{
*aInstancePtr = NS_STATIC_CAST(nsIMsgImapMailFolder*, this);
}
else if(aIID.Equals(nsICopyMessageListener::GetIID()))
else if(aIID.Equals(NS_GET_IID(nsICopyMessageListener)))
{
*aInstancePtr = NS_STATIC_CAST(nsICopyMessageListener*, this);
}
else if (aIID.Equals(nsIImapMailFolderSink::GetIID()))
else if (aIID.Equals(NS_GET_IID(nsIImapMailFolderSink)))
{
*aInstancePtr = NS_STATIC_CAST(nsIImapMailFolderSink*, this);
}
else if (aIID.Equals(nsIImapMessageSink::GetIID()))
else if (aIID.Equals(NS_GET_IID(nsIImapMessageSink)))
{
*aInstancePtr = NS_STATIC_CAST(nsIImapMessageSink*, this);
}
else if (aIID.Equals(nsIImapExtensionSink::GetIID()))
else if (aIID.Equals(NS_GET_IID(nsIImapExtensionSink)))
{
*aInstancePtr = NS_STATIC_CAST(nsIImapExtensionSink*, this);
}
else if (aIID.Equals(nsIImapMiscellaneousSink::GetIID()))
else if (aIID.Equals(NS_GET_IID(nsIImapMiscellaneousSink)))
{
*aInstancePtr = NS_STATIC_CAST(nsIImapMiscellaneousSink*, this);
}
else if (aIID.Equals(nsIUrlListener::GetIID()))
else if (aIID.Equals(NS_GET_IID(nsIUrlListener)))
{
*aInstancePtr = NS_STATIC_CAST(nsIUrlListener *, this);
}
else if (aIID.Equals(nsIMsgFilterHitNotify::GetIID()))
else if (aIID.Equals(NS_GET_IID(nsIMsgFilterHitNotify)))
{
*aInstancePtr = NS_STATIC_CAST(nsIMsgFilterHitNotify *, this);
}
@ -387,7 +388,7 @@ nsresult nsImapMailFolder::GetDatabase(nsIMsgWindow *aMsgWindow)
nsCOMPtr<nsIMsgDatabase> mailDBFactory;
rv = nsComponentManager::CreateInstance(kCImapDB, nsnull, nsIMsgDatabase::GetIID(), (void **) getter_AddRefs(mailDBFactory));
rv = nsComponentManager::CreateInstance(kCImapDB, nsnull, NS_GET_IID(nsIMsgDatabase), (void **) getter_AddRefs(mailDBFactory));
if (NS_SUCCEEDED(rv) && mailDBFactory)
folderOpen = mailDBFactory->Open(pathSpec, PR_TRUE, PR_TRUE, getter_AddRefs(mDatabase));
@ -544,7 +545,7 @@ NS_IMETHODIMP nsImapMailFolder::CreateClientSubfolderInfo(const char *folderName
nsCOMPtr<nsIMsgDatabase> mailDBFactory;
nsCOMPtr<nsIMsgFolder> child;
rv = nsComponentManager::CreateInstance(kCMailDB, nsnull, nsIMsgDatabase::GetIID(), (void **) getter_AddRefs(mailDBFactory));
rv = nsComponentManager::CreateInstance(kCMailDB, nsnull, NS_GET_IID(nsIMsgDatabase), (void **) getter_AddRefs(mailDBFactory));
if (NS_SUCCEEDED(rv) && mailDBFactory)
{
nsCOMPtr<nsIMsgDatabase> unusedDB;
@ -594,7 +595,7 @@ NS_IMETHODIMP nsImapMailFolder::CreateClientSubfolderInfo(const char *folderName
{
nsCOMPtr<nsISupports> childSupports(do_QueryInterface(child));
nsCOMPtr<nsISupports> folderSupports;
rv = QueryInterface(nsCOMTypeInfo<nsISupports>::GetIID(), getter_AddRefs(folderSupports));
rv = QueryInterface(NS_GET_IID(nsISupports), getter_AddRefs(folderSupports));
if(childSupports && NS_SUCCEEDED(rv))
{
@ -1151,7 +1152,7 @@ nsresult nsImapMailFolder::GetDBFolderInfoAndDB(
nsCOMPtr<nsIMsgDatabase> mailDBFactory;
nsCOMPtr<nsIMsgDatabase> mailDB;
nsresult rv = nsComponentManager::CreateInstance(kCImapDB, nsnull, nsIMsgDatabase::GetIID(), getter_AddRefs(mailDBFactory));
nsresult rv = nsComponentManager::CreateInstance(kCImapDB, nsnull, NS_GET_IID(nsIMsgDatabase), getter_AddRefs(mailDBFactory));
if (NS_SUCCEEDED(rv) && mailDBFactory)
{
@ -1330,7 +1331,7 @@ NS_IMETHODIMP nsImapMailFolder::DeleteMessages(nsISupportsArray *messages,
PRUint32 count = 0;
rv = messages->Count(&count);
rv = QueryInterface(nsIMsgFolder::GetIID(),
rv = QueryInterface(NS_GET_IID(nsIMsgFolder),
getter_AddRefs(srcFolder));
rv = trashFolder->CopyMessages(srcFolder, messages, PR_TRUE, msgWindow, nsnull);
}
@ -1447,7 +1448,7 @@ NS_IMETHODIMP nsImapMailFolder::UpdateImapMailboxInfo(
if (NS_FAILED(rv)) return rv;
rv = nsComponentManager::CreateInstance(kCImapDB, nsnull,
nsIMsgDatabase::GetIID(),
NS_GET_IID(nsIMsgDatabase),
(void **) getter_AddRefs(mailDBFactory));
if (NS_FAILED(rv)) return rv;
@ -1695,7 +1696,7 @@ NS_IMETHODIMP nsImapMailFolder::SetupHeaderParseStream(
if (!m_msgParser)
{
rv = nsComponentManager::CreateInstance(kParseMailMsgStateCID, nsnull,
nsIMsgParseMailMsgState::GetIID(), (void **) getter_AddRefs(m_msgParser));
NS_GET_IID(nsIMsgParseMailMsgState), (void **) getter_AddRefs(m_msgParser));
if (NS_SUCCEEDED(rv))
m_msgParser->SetMailDB(mDatabase);
}
@ -1955,7 +1956,7 @@ NS_IMETHODIMP nsImapMailFolder::EndCopy(PRBool copySucceeded)
m_copyState->m_tmpFileSpec->CloseStream();
NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv);
if (NS_FAILED(rv)) return rv;
rv = QueryInterface(nsIUrlListener::GetIID(),
rv = QueryInterface(NS_GET_IID(nsIUrlListener),
getter_AddRefs(urlListener));
nsCOMPtr<nsISupports> copySupport;
if (m_copyState)
@ -3431,7 +3432,7 @@ nsImapMailFolder::CopyMessagesWithStream(nsIMsgFolder* srcFolder,
nsMsgKeyArray srcKeyArray;
nsCOMPtr<nsIUrlListener> urlListener;
rv = QueryInterface(nsIUrlListener::GetIID(), getter_AddRefs(urlListener));
rv = QueryInterface(NS_GET_IID(nsIUrlListener), getter_AddRefs(urlListener));
rv = BuildIdsAndKeyArray(messages, messageIds, srcKeyArray);
nsImapMoveCopyMsgTxn* undoMsgTxn = new nsImapMoveCopyMsgTxn(
@ -3439,7 +3440,7 @@ nsImapMailFolder::CopyMessagesWithStream(nsIMsgFolder* srcFolder,
PR_TRUE, isMove, m_eventQueue, urlListener);
rv = undoMsgTxn->QueryInterface(
nsCOMTypeInfo<nsImapMoveCopyMsgTxn>::GetIID(),
NS_GET_IID(nsImapMoveCopyMsgTxn),
getter_AddRefs(m_copyState->m_undoMsgTxn) );
nsCOMPtr<nsISupports> msgSupport;
@ -3508,7 +3509,7 @@ nsImapMailFolder::CopyMessages(nsIMsgFolder* srcFolder,
if(NS_FAILED(rv)) goto done;
srcSupport = do_QueryInterface(srcFolder);
rv = QueryInterface(nsIUrlListener::GetIID(), getter_AddRefs(urlListener));
rv = QueryInterface(NS_GET_IID(nsIUrlListener), getter_AddRefs(urlListener));
rv = InitCopyState(srcSupport, messages, isMove, PR_TRUE, listener);
if (NS_FAILED(rv)) goto done;
@ -3528,7 +3529,7 @@ nsImapMailFolder::CopyMessages(nsIMsgFolder* srcFolder,
srcFolder, &srcKeyArray, messageIds.GetBuffer(), this,
PR_TRUE, isMove, m_eventQueue, urlListener);
rv = undoMsgTxn->QueryInterface(
nsCOMTypeInfo<nsImapMoveCopyMsgTxn>::GetIID(),
NS_GET_IID(nsImapMoveCopyMsgTxn),
getter_AddRefs(m_copyState->m_undoMsgTxn) );
}
@ -3570,7 +3571,7 @@ nsImapMailFolder::CopyFileMessage(nsIFileSpec* fileSpec,
NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv);
if (NS_FAILED(rv)) return rv;
rv = QueryInterface(nsIUrlListener::GetIID(), getter_AddRefs(urlListener));
rv = QueryInterface(NS_GET_IID(nsIUrlListener), getter_AddRefs(urlListener));
if (msgToReplace)
{
@ -3606,7 +3607,7 @@ nsImapMailFolder::CopyStreamMessage(nsIMessage* message,
nsCOMPtr<nsICopyMessageStreamListener> copyStreamListener;
rv = nsComponentManager::CreateInstance(kCopyMessageStreamListenerCID,
NULL, nsICopyMessageStreamListener::GetIID(),
NULL, NS_GET_IID(nsICopyMessageStreamListener),
getter_AddRefs(copyStreamListener));
if(NS_FAILED(rv))
return rv;
@ -3690,13 +3691,13 @@ nsImapMailCopyState::QueryInterface(REFNSIID aIID, void** aInstancePtr)
*aInstancePtr = NULL;
static NS_DEFINE_IID(kClassIID, nsImapMailCopyState::GetIID());
static NS_DEFINE_IID(kClassIID, NS_GET_IID(nsImapMailCopyState));
if (aIID.Equals(kClassIID)) {
*aInstancePtr = (void*) this;
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsISupports))) {
*aInstancePtr = (void*) ((nsISupports*)this);
NS_ADDREF_THIS();
return NS_OK;

5
mozilla/mailnews/imap/src/nsImapMessage.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
@ -67,7 +68,7 @@ nsresult nsImapMessage::GetFolderFromURI(nsIMsgFolder **folder)
nsresult rv;
nsXPIDLCString uri;
nsIRDFResource *resource;
if(NS_SUCCEEDED( rv = QueryInterface(nsIRDFResource::GetIID(), (void**)&resource)))
if(NS_SUCCEEDED( rv = QueryInterface(NS_GET_IID(nsIRDFResource), (void**)&resource)))
{
resource->GetValue( getter_Copies(uri) );
nsCAutoString messageFolderURIStr;
@ -89,7 +90,7 @@ nsresult nsImapMessage::GetFolderFromURI(nsIMsgFolder **folder)
rv = rdfService->GetResource(folderURI, &folderResource);
if(NS_SUCCEEDED(rv))
{
rv = NS_SUCCEEDED(folderResource->QueryInterface(nsIMsgFolder::GetIID(), (void**)folder));
rv = NS_SUCCEEDED(folderResource->QueryInterface(NS_GET_IID(nsIMsgFolder), (void**)folder));
NS_RELEASE(folderResource);
}
}

15
mozilla/mailnews/imap/src/nsImapProtocol.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
// sorry, this has to be before the pre-compiled header
@ -156,21 +157,21 @@ NS_IMETHODIMP nsImapProtocol::QueryInterface(const nsIID &aIID, void** aInstance
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIsThreadsafeIID, NS_ISTHREADSAFE_IID);
if (aIID.Equals(nsCOMTypeInfo<nsIRunnable>::GetIID()))
if (aIID.Equals(NS_GET_IID(nsIRunnable)))
{
*aInstancePtr = (nsIRunnable *) this;
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(nsIStreamListener::GetIID()) ||
aIID.Equals(nsIStreamObserver::GetIID()))
if (aIID.Equals(NS_GET_IID(nsIStreamListener)) ||
aIID.Equals(NS_GET_IID(nsIStreamObserver)))
{
*aInstancePtr = (nsIStreamListener *) this;
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(nsIImapProtocol::GetIID()))
if (aIID.Equals(NS_GET_IID(nsIImapProtocol)))
{
*aInstancePtr = (nsIImapProtocol *) this;
NS_ADDREF_THIS();
@ -536,7 +537,7 @@ nsImapProtocol::SetupSinkProxy()
res = m_runningUrl->GetImapServerSink(getter_AddRefs(aImapServerSink));
if (NS_SUCCEEDED(res) && aImapServerSink)
res = proxyManager->GetProxyObject( m_sinkEventQueue,
nsCOMTypeInfo<nsIImapServerSink>::GetIID(),
NS_GET_IID(nsIImapServerSink),
aImapServerSink,
PROXY_SYNC | PROXY_ALWAYS,
getter_AddRefs(m_imapServerSink));
@ -1248,7 +1249,7 @@ NS_IMETHODIMP
nsImapProtocol::GetRunningUrl(nsIURI **result)
{
if (result && m_runningUrl)
return m_runningUrl->QueryInterface(nsIURI::GetIID(), (void**)
return m_runningUrl->QueryInterface(NS_GET_IID(nsIURI), (void**)
result);
else
return NS_ERROR_NULL_POINTER;
@ -1259,7 +1260,7 @@ NS_IMETHODIMP nsImapProtocol::GetRunningImapURL(nsIImapUrl **aImapUrl)
{
if (aImapUrl && m_runningUrl)
{
return m_runningUrl->QueryInterface(nsIImapUrl::GetIID(), (void**) aImapUrl);
return m_runningUrl->QueryInterface(NS_GET_IID(nsIImapUrl), (void**) aImapUrl);
}
else
return NS_ERROR_NULL_POINTER;

5
mozilla/mailnews/imap/src/nsImapServerResponseParser.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
// sorry, this has to be before the pre-compiled header
@ -875,7 +876,7 @@ void nsImapServerResponseParser::mailbox(nsImapMailboxSpec *boxSpec)
//if (boxSpec->connection && boxSpec->connection->GetCurrentUrl())
boxSpec->connection->GetCurrentUrl()->AllocateCanonicalPath(boxname, boxSpec->hierarchySeparator, &boxSpec->allocatedPathName);
nsIURI * aURL = nsnull;
boxSpec->connection->GetCurrentUrl()->QueryInterface(nsIURI::GetIID(), (void **) &aURL);
boxSpec->connection->GetCurrentUrl()->QueryInterface(NS_GET_IID(nsIURI), (void **) &aURL);
if (aURL)
aURL->GetHost(&boxSpec->hostName);
NS_IF_RELEASE(aURL);
@ -2305,7 +2306,7 @@ nsImapMailboxSpec *nsImapServerResponseParser::CreateCurrentMailboxSpec(const ch
{
nsIURI * aUrl = nsnull;
nsresult rv = NS_OK;
returnSpec->connection->GetCurrentUrl()->QueryInterface(nsIURI::GetIID(), (void **) &aUrl);
returnSpec->connection->GetCurrentUrl()->QueryInterface(NS_GET_IID(nsIURI), (void **) &aUrl);
if (NS_SUCCEEDED(rv) && aUrl)
aUrl->GetHost(&returnSpec->hostName);
NS_IF_RELEASE(aUrl);

13
mozilla/mailnews/imap/src/nsImapService.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "msgCore.h" // precompiled header...
@ -602,7 +603,7 @@ nsImapService::CreateStartOfImapUrl(nsIImapUrl ** imapUrl,
// now we need to create an imap url to load into the connection. The url
// needs to represent a select folder action.
rv = nsComponentManager::CreateInstance(kImapUrlCID, nsnull,
nsIImapUrl::GetIID(), (void **)
NS_GET_IID(nsIImapUrl), (void **)
imapUrl);
if (NS_SUCCEEDED(rv) && imapUrl)
{
@ -1096,34 +1097,34 @@ nsImapService::SetImapUrlSink(nsIMsgFolder* aMsgFolder,
if (imapServerSink)
aImapUrl->SetImapServerSink(imapServerSink);
}
rv = aMsgFolder->QueryInterface(nsIImapLog::GetIID(), (void**)&aInst);
rv = aMsgFolder->QueryInterface(NS_GET_IID(nsIImapLog), (void**)&aInst);
if (NS_SUCCEEDED(rv) && aInst)
aImapUrl->SetImapLog((nsIImapLog*) aInst);
NS_IF_RELEASE (aInst);
aInst = nsnull;
rv = aMsgFolder->QueryInterface(nsIImapMailFolderSink::GetIID(),
rv = aMsgFolder->QueryInterface(NS_GET_IID(nsIImapMailFolderSink),
(void**)&aInst);
if (NS_SUCCEEDED(rv) && aInst)
aImapUrl->SetImapMailFolderSink((nsIImapMailFolderSink*) aInst);
NS_IF_RELEASE (aInst);
aInst = nsnull;
rv = aMsgFolder->QueryInterface(nsIImapMessageSink::GetIID(),
rv = aMsgFolder->QueryInterface(NS_GET_IID(nsIImapMessageSink),
(void**)&aInst);
if (NS_SUCCEEDED(rv) && aInst)
aImapUrl->SetImapMessageSink((nsIImapMessageSink*) aInst);
NS_IF_RELEASE (aInst);
aInst = nsnull;
rv = aMsgFolder->QueryInterface(nsIImapExtensionSink::GetIID(),
rv = aMsgFolder->QueryInterface(NS_GET_IID(nsIImapExtensionSink),
(void**)&aInst);
if (NS_SUCCEEDED(rv) && aInst)
aImapUrl->SetImapExtensionSink((nsIImapExtensionSink*) aInst);
NS_IF_RELEASE (aInst);
aInst = nsnull;
rv = aMsgFolder->QueryInterface(nsIImapMiscellaneousSink::GetIID(),
rv = aMsgFolder->QueryInterface(NS_GET_IID(nsIImapMiscellaneousSink),
(void**)&aInst);
if (NS_SUCCEEDED(rv) && aInst)
aImapUrl->SetImapMiscellaneousSink((nsIImapMiscellaneousSink*) aInst);

3
mozilla/mailnews/imap/src/nsImapUndoTxn.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "msgCore.h" // for precompiled headers
@ -132,7 +133,7 @@ nsImapMoveCopyMsgTxn::QueryInterface(REFNSIID aIID, void** aInstancePtr)
*aInstancePtr = nsnull;
if (aIID.Equals(nsImapMoveCopyMsgTxn::GetIID()))
if (aIID.Equals(NS_GET_IID(nsImapMoveCopyMsgTxn)))
{
*aInstancePtr = NS_STATIC_CAST(nsImapMoveCopyMsgTxn*, this);
}

5
mozilla/mailnews/imap/src/nsImapUtils.cpp
View File

@ -18,7 +18,8 @@
* Rights Reserved.
*
* Contributor(s):
*/
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "msgCore.h"
#include "nsImapUtils.h"
@ -212,7 +213,7 @@ nsresult nsBuildImapMessageURI(const char *baseURI, PRUint32 key, char** uri)
// nsImapMailboxSpec stuff
NS_IMPL_ISUPPORTS(nsImapMailboxSpec, nsCOMTypeInfo<nsIMailboxSpec>::GetIID());
NS_IMPL_ISUPPORTS(nsImapMailboxSpec, NS_GET_IID(nsIMailboxSpec));
nsImapMailboxSpec::nsImapMailboxSpec()
{

13
mozilla/mailnews/imap/tests/harness/imapProtocolTest.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "msgCore.h"
@ -229,11 +230,11 @@ nsIMAP4TestDriver::QueryInterface(const nsIID& aIID, void** aInstancePtr)
*aInstancePtr = nsnull;
if (aIID.Equals(nsIUrlListener::GetIID()))
if (aIID.Equals(NS_GET_IID(nsIUrlListener)))
{
*aInstancePtr = (void*)(nsIUrlListener*)this;
}
else if (aIID.Equals(nsIImapLog::GetIID()))
else if (aIID.Equals(NS_GET_IID(nsIImapLog)))
{
*aInstancePtr = (void*)(nsIImapLog*)this;
}
@ -363,7 +364,7 @@ nsresult nsIMAP4TestDriver::OnStopRunningUrl(nsIURI * aUrl, nsresult aExitCode)
{
// query it for a mailnews interface for now....
nsIMsgMailNewsUrl * mailUrl = nsnull;
rv = aUrl->QueryInterface(nsIMsgMailNewsUrl::GetIID(), (void **) mailUrl);
rv = aUrl->QueryInterface(NS_GET_IID(nsIMsgMailNewsUrl), (void **) mailUrl);
if (NS_SUCCEEDED(rv))
{
// our url must be done so release it...
@ -437,7 +438,7 @@ nsIMAP4TestDriver::SetupInbox()
if (!m_inbox)
{
nsresult rv = nsComponentManager::CreateInstance( kCImapResource,
nsnull, nsIMsgFolder::GetIID(), (void**)&m_inbox);
nsnull, NS_GET_IID(nsIMsgFolder), (void**)&m_inbox);
if (NS_SUCCEEDED(rv) && m_inbox)
{
nsCOMPtr<nsIRDFResource>
@ -515,7 +516,7 @@ nsresult nsIMAP4TestDriver::OnRunIMAPCommand()
// create a url to process the request.
rv = nsComponentManager::CreateInstance(kImapUrlCID, nsnull,
nsIImapUrl::GetIID(), (void **)
NS_GET_IID(nsIImapUrl), (void **)
&m_url);
nsCOMPtr<nsIMsgMailNewsUrl> mailnewsurl = do_QueryInterface(m_url);
@ -640,7 +641,7 @@ nsresult nsIMAP4TestDriver::OnTestUrlParsing()
nsIImapUrl * imapUrl = nsnull;
nsComponentManager::CreateInstance(kImapUrlCID, nsnull /* progID */, nsIImapUrl::GetIID(), (void **) &imapUrl);
nsComponentManager::CreateInstance(kImapUrlCID, nsnull /* progID */, NS_GET_IID(nsIImapUrl), (void **) &imapUrl);
if (imapUrl)
{
char * urlSpec = nsnull;

3
mozilla/mailnews/local/build/nsMsgLocalFactory.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "msgCore.h" // for pre-compiled headers...
@ -360,7 +361,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr,
return NS_ERROR_OUT_OF_MEMORY;
// Increase refcnt and store away nsIModule interface to m in return_cobj
rv = module->QueryInterface(nsIModule::GetIID(), (void**)return_cobj);
rv = module->QueryInterface(NS_GET_IID(nsIModule), (void**)return_cobj);
if (NS_FAILED(rv))
{
delete module;

29
mozilla/mailnews/local/src/nsLocalMailFolder.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#define NS_IMPL_IDS
@ -122,11 +123,11 @@ NS_IMETHODIMP nsMsgLocalMailFolder::QueryInterface(REFNSIID aIID, void** aInstan
{
if (!aInstancePtr) return NS_ERROR_NULL_POINTER;
*aInstancePtr = nsnull;
if (aIID.Equals(nsIMsgLocalMailFolder::GetIID()))
if (aIID.Equals(NS_GET_IID(nsIMsgLocalMailFolder)))
{
*aInstancePtr = NS_STATIC_CAST(nsIMsgLocalMailFolder*, this);
}
else if(aIID.Equals(nsICopyMessageListener::GetIID()))
else if(aIID.Equals(NS_GET_IID(nsICopyMessageListener)))
{
*aInstancePtr = NS_STATIC_CAST(nsICopyMessageListener*, this);
}
@ -381,7 +382,7 @@ nsMsgLocalMailFolder::GetSubFolders(nsIEnumerator* *result)
if (NS_SUCCEEDED(rv) && server) {
nsCOMPtr<nsIPop3IncomingServer> popServer;
rv = server->QueryInterface(nsIPop3IncomingServer::GetIID(),
rv = server->QueryInterface(NS_GET_IID(nsIPop3IncomingServer),
(void **)&popServer);
if (NS_SUCCEEDED(rv)) {
nsCOMPtr<nsIFileSpec> spec;
@ -398,7 +399,7 @@ nsMsgLocalMailFolder::GetSubFolders(nsIEnumerator* *result)
if (NS_SUCCEEDED(rv) && server) {
nsCOMPtr<nsINoIncomingServer> noneServer;
rv = server->QueryInterface(nsINoIncomingServer::GetIID(),
rv = server->QueryInterface(NS_GET_IID(nsINoIncomingServer),
(void **)&noneServer);
if (NS_SUCCEEDED(rv)) {
nsCOMPtr<nsIFileSpec> spec;
@ -459,7 +460,7 @@ nsresult nsMsgLocalMailFolder::GetDatabase(nsIMsgWindow *aMsgWindow)
nsresult folderOpen = NS_OK;
nsCOMPtr<nsIMsgDatabase> mailDBFactory;
rv = nsComponentManager::CreateInstance(kCMailDB, nsnull, nsIMsgDatabase::GetIID(), getter_AddRefs(mailDBFactory));
rv = nsComponentManager::CreateInstance(kCMailDB, nsnull, NS_GET_IID(nsIMsgDatabase), getter_AddRefs(mailDBFactory));
if (NS_SUCCEEDED(rv) && mailDBFactory)
{
folderOpen = mailDBFactory->Open(pathSpec, PR_TRUE, PR_FALSE, getter_AddRefs(mDatabase));
@ -627,7 +628,7 @@ nsMsgLocalMailFolder::CreateSubfolder(const char *folderName)
// Create an empty database for this mail folder, set its name from the user
nsCOMPtr<nsIMsgDatabase> mailDBFactory;
rv = nsComponentManager::CreateInstance(kCMailDB, nsnull, nsIMsgDatabase::GetIID(), getter_AddRefs(mailDBFactory));
rv = nsComponentManager::CreateInstance(kCMailDB, nsnull, NS_GET_IID(nsIMsgDatabase), getter_AddRefs(mailDBFactory));
if (NS_SUCCEEDED(rv) && mailDBFactory)
{
nsIMsgDatabase *unusedDB = NULL;
@ -661,7 +662,7 @@ nsMsgLocalMailFolder::CreateSubfolder(const char *folderName)
{
nsCOMPtr<nsISupports> childSupports(do_QueryInterface(child));
nsCOMPtr<nsISupports> folderSupports;
rv = QueryInterface(nsCOMTypeInfo<nsISupports>::GetIID(), getter_AddRefs(folderSupports));
rv = QueryInterface(NS_GET_IID(nsISupports), getter_AddRefs(folderSupports));
if(childSupports && NS_SUCCEEDED(rv))
{
@ -873,7 +874,7 @@ nsresult nsMsgLocalMailFolder::GetDBFolderInfoAndDB(nsIDBFolderInfo **folderInf
nsCOMPtr<nsIMsgDatabase> mailDBFactory;
nsCOMPtr<nsIMsgDatabase> mailDB;
nsresult rv = nsComponentManager::CreateInstance(kCMailDB, nsnull, nsIMsgDatabase::GetIID(), getter_AddRefs(mailDBFactory));
nsresult rv = nsComponentManager::CreateInstance(kCMailDB, nsnull, NS_GET_IID(nsIMsgDatabase), getter_AddRefs(mailDBFactory));
if (NS_SUCCEEDED(rv) && mailDBFactory)
{
openErr = mailDBFactory->Open(mPath, PR_FALSE, PR_FALSE, (nsIMsgDatabase **) &mailDB);
@ -1285,7 +1286,7 @@ nsMsgLocalMailFolder::CopyMessages(nsIMsgFolder* srcFolder, nsISupportsArray*
if (msgTxn)
rv =
msgTxn->QueryInterface(nsCOMTypeInfo<nsLocalMoveCopyMsgTxn>::GetIID(),
msgTxn->QueryInterface(NS_GET_IID(nsLocalMoveCopyMsgTxn),
getter_AddRefs(mCopyState->m_undoMsgTxn));
else
rv = NS_ERROR_OUT_OF_MEMORY;
@ -1477,7 +1478,7 @@ NS_IMETHODIMP nsMsgLocalMailFolder::GetNewMessages(nsIMsgWindow *aWindow)
rv = GetServer(getter_AddRefs(server));
nsCOMPtr<nsIPop3IncomingServer> popServer;
rv = server->QueryInterface(nsIPop3IncomingServer::GetIID(),
rv = server->QueryInterface(NS_GET_IID(nsIPop3IncomingServer),
(void **)&popServer);
if (NS_SUCCEEDED(rv)) {
rv = pop3Service->GetNewMail(aWindow, nsnull,popServer,nsnull);
@ -1639,7 +1640,7 @@ NS_IMETHODIMP nsMsgLocalMailFolder::EndCopy(PRBool copySucceeded)
if (mCopyState->m_undoMsgTxn)
rv = mCopyState->m_undoMsgTxn->QueryInterface(
nsCOMTypeInfo<nsLocalMoveCopyMsgTxn>::GetIID(),
NS_GET_IID(nsLocalMoveCopyMsgTxn),
getter_AddRefs(localUndoTxn));
//Copy the header to the new database
@ -1767,7 +1768,7 @@ NS_IMETHODIMP nsMsgLocalMailFolder::EndMessage(nsMsgKey key)
if (mCopyState->m_undoMsgTxn)
rv = mCopyState->m_undoMsgTxn->QueryInterface(
nsCOMTypeInfo<nsLocalMoveCopyMsgTxn>::GetIID(),
NS_GET_IID(nsLocalMoveCopyMsgTxn),
getter_AddRefs(localUndoTxn));
// I think this is always true for online to offline copy
@ -1826,7 +1827,7 @@ nsresult nsMsgLocalMailFolder::CopyMessagesTo(nsISupportsArray *messages,
if (!mCopyState) return NS_ERROR_OUT_OF_MEMORY;
nsCOMPtr<nsICopyMessageStreamListener> copyStreamListener;
nsresult rv = nsComponentManager::CreateInstance(kCopyMessageStreamListenerCID, NULL,
nsICopyMessageStreamListener::GetIID(),
NS_GET_IID(nsICopyMessageStreamListener),
getter_AddRefs(copyStreamListener));
if(NS_FAILED(rv))
return rv;
@ -1904,7 +1905,7 @@ nsresult nsMsgLocalMailFolder::CopyMessageTo(nsIMessage *message,
nsCOMPtr<nsICopyMessageStreamListener> copyStreamListener;
rv = nsComponentManager::CreateInstance(kCopyMessageStreamListenerCID, NULL,
nsICopyMessageStreamListener::GetIID(),
NS_GET_IID(nsICopyMessageStreamListener),
getter_AddRefs(copyStreamListener));
if(NS_FAILED(rv))
return rv;

5
mozilla/mailnews/local/src/nsLocalMessage.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
@ -68,7 +69,7 @@ nsresult nsLocalMessage::GetFolderFromURI(nsIMsgFolder **folder)
nsresult rv;
nsXPIDLCString uri;
nsCOMPtr<nsIRDFResource> resource;
if(NS_SUCCEEDED( rv = QueryInterface(nsIRDFResource::GetIID(), getter_AddRefs(resource))))
if(NS_SUCCEEDED( rv = QueryInterface(NS_GET_IID(nsIRDFResource), getter_AddRefs(resource))))
{
resource->GetValue( getter_Copies(uri) );
nsCAutoString messageFolderURIStr;
@ -90,7 +91,7 @@ nsresult nsLocalMessage::GetFolderFromURI(nsIMsgFolder **folder)
rv = rdfService->GetResource(folderURI, getter_AddRefs(folderResource));
if(NS_SUCCEEDED(rv))
{
rv = NS_SUCCEEDED(folderResource->QueryInterface(nsIMsgFolder::GetIID(), (void**)folder));
rv = NS_SUCCEEDED(folderResource->QueryInterface(NS_GET_IID(nsIMsgFolder), (void**)folder));
}
}
}

13
mozilla/widget/src/beos/nsMenuBar.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsMenuBar.h"
@ -48,7 +49,7 @@ nsresult nsMenuBar::QueryInterface(REFNSIID aIID, void** aInstancePtr)
*aInstancePtr = NULL;
if (aIID.Equals(nsIMenuBar::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIMenuBar))) {
*aInstancePtr = (void*) ((nsIMenuBar*) this);
NS_ADDREF_THIS();
return NS_OK;
@ -60,7 +61,7 @@ nsresult nsMenuBar::QueryInterface(REFNSIID aIID, void** aInstancePtr)
return NS_OK;
}
if (aIID.Equals(nsIMenuListener::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIMenuListener))) {
*aInstancePtr = (void*) ((nsIMenuListener*)this);
NS_ADDREF_THIS();
return NS_OK;
@ -250,15 +251,15 @@ nsEventStatus nsMenuBar::MenuConstruct(
nsIMenuBar * pnsMenuBar = nsnull;
nsresult rv = nsComponentManager::CreateInstance(kMenuBarCID,
nsnull,
nsIMenuBar::GetIID(),
NS_GET_IID(nsIMenuBar),
(void**)&pnsMenuBar);
if (NS_OK == rv) {
if (nsnull != pnsMenuBar) {
pnsMenuBar->Create(aParentWindow);
// set pnsMenuBar as a nsMenuListener on aParentWindow
nsCOMPtr<nsIMenuListener> menuListener;
pnsMenuBar->QueryInterface(nsIMenuListener::GetIID(), getter_AddRefs(menuListener));
nsCOMPtr<nsIMenuListener> menuListener =
do_QueryInterface(pnsMenuBar);
aParentWindow->AddMenuListener(menuListener);
nsCOMPtr<nsIDOMNode> menuNode;
@ -275,7 +276,7 @@ nsEventStatus nsMenuBar::MenuConstruct(
// Create nsMenu
nsIMenu * pnsMenu = nsnull;
rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, nsIMenu::GetIID(), (void**)&pnsMenu);
rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, NS_GET_IID(nsIMenu), (void**)&pnsMenu);
if (NS_OK == rv) {
// Call Create
nsISupports * supports = nsnull;

3
mozilla/widget/src/beos/nsMenuItem.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsMenuItem.h"
@ -159,7 +160,7 @@ NS_METHOD nsMenuItem::Create(nsISupports *aParent,
if(aParent) {
nsIMenu * menu;
aParent->QueryInterface(nsIMenu::GetIID(), (void**) &menu);
aParent->QueryInterface(NS_GET_IID(nsIMenu), (void**) &menu);
mMenuParent = menu;
NS_RELEASE(menu);
}

3
mozilla/widget/src/beos/nsSound.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
@ -33,7 +34,7 @@
#include <Entry.h>
#include <Beep.h>
NS_IMPL_ISUPPORTS(nsSound, nsCOMTypeInfo<nsISound>::GetIID());
NS_IMPL_ISUPPORTS(nsSound, NS_GET_IID(nsISound));
////////////////////////////////////////////////////////////////////////
nsSound::nsSound()

27
mozilla/widget/src/gtk/nsContextMenu.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include <gtk/gtk.h>
@ -48,7 +49,7 @@ nsresult nsContextMenu::QueryInterface(REFNSIID aIID, void** aInstancePtr)
*aInstancePtr = NULL;
if (aIID.Equals(nsIMenu::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIMenu))) {
*aInstancePtr = (void*)(nsIMenu*) this;
NS_ADDREF_THIS();
return NS_OK;
@ -58,7 +59,7 @@ nsresult nsContextMenu::QueryInterface(REFNSIID aIID, void** aInstancePtr)
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(nsIMenuListener::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIMenuListener))) {
*aInstancePtr = (void*)(nsIMenuListener*)this;
NS_ADDREF_THIS();
return NS_OK;
@ -115,7 +116,7 @@ NS_METHOD nsContextMenu::Create(nsISupports *aParent,
if(aParent)
{
nsIWidget *parent = nsnull;
aParent->QueryInterface(nsIWidget::GetIID(), (void**) &parent);
aParent->QueryInterface(NS_GET_IID(nsIWidget), (void**) &parent);
if(parent)
{
mParent = parent;
@ -155,7 +156,7 @@ NS_METHOD nsContextMenu::AddItem(nsISupports * aItem)
if(aItem)
{
nsIMenuItem * menuitem = nsnull;
aItem->QueryInterface(nsIMenuItem::GetIID(),
aItem->QueryInterface(NS_GET_IID(nsIMenuItem),
(void**)&menuitem);
if(menuitem)
{
@ -165,7 +166,7 @@ NS_METHOD nsContextMenu::AddItem(nsISupports * aItem)
else
{
nsIMenu * menu = nsnull;
aItem->QueryInterface(nsIMenu::GetIID(),
aItem->QueryInterface(NS_GET_IID(nsIMenu),
(void**)&menu);
if(menu)
{
@ -217,7 +218,7 @@ NS_METHOD nsContextMenu::AddMenu(nsIMenu * aMenu)
nsIMenuItem * pnsMenuItem = nsnull;
nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID,
nsnull,
nsIMenuItem::GetIID(),
NS_GET_IID(nsIMenuItem),
(void**)&pnsMenuItem);
if (NS_OK == rv) {
nsISupports * supports = nsnull;
@ -252,7 +253,7 @@ NS_METHOD nsContextMenu::AddSeparator()
// Create nsMenuItem
nsIMenuItem * pnsMenuItem = nsnull;
nsresult rv = nsComponentManager::CreateInstance(
kMenuItemCID, nsnull, nsIMenuItem::GetIID(), (void**)&pnsMenuItem);
kMenuItemCID, nsnull, NS_GET_IID(nsIMenuItem), (void**)&pnsMenuItem);
if (NS_OK == rv) {
nsString tmp = "separator";
nsISupports * supports = nsnull;
@ -340,7 +341,7 @@ NS_METHOD nsContextMenu::RemoveAll()
if(nsnull != item)
{
if (NS_OK == item->QueryInterface(nsIMenuItem::GetIID(), (void**)&menuitem))
if (NS_OK == item->QueryInterface(NS_GET_IID(nsIMenuItem), (void**)&menuitem))
{
// we do this twice because we have to do it once for QueryInterface,
// then we want to get rid of it.
@ -348,7 +349,7 @@ NS_METHOD nsContextMenu::RemoveAll()
NS_RELEASE(menuitem);
NS_RELEASE(item);
menuitem = nsnull;
} else if (NS_OK == item->QueryInterface(nsIMenu::GetIID(), (void**)&menu)) {
} else if (NS_OK == item->QueryInterface(NS_GET_IID(nsIMenu), (void**)&menu)) {
#ifdef NOISY_MENUS
g_print("remove nsMenu\n");
#endif
@ -366,7 +367,7 @@ NS_METHOD nsContextMenu::RemoveAll()
for (int i = mMenuItemVoidArray.Count(); i > 0; i--) {
if(nsnull != mMenuItemVoidArray[i-1]) {
nsIMenuItem * menuitem = nsnull;
((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(nsIMenuItem::GetIID(),
((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(NS_GET_IID(nsIMenuItem),
(void**)&menuitem);
if(menuitem) {
void *gtkmenuitem = nsnull;
@ -384,7 +385,7 @@ NS_METHOD nsContextMenu::RemoveAll()
} else {
nsIMenu * menu= nsnull;
((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(nsIMenu::GetIID(),
((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(NS_GET_IID(nsIMenu),
(void**)&menu);
if(menu)
{
@ -575,7 +576,7 @@ void nsContextMenu::LoadMenuItem(nsIMenu *pParentMenu,
nsIMenuItem * pnsMenuItem = nsnull;
nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID,
nsnull,
nsIMenuItem::GetIID(),
NS_GET_IID(nsIMenuItem),
(void**)&pnsMenuItem);
if (NS_OK == rv) {
pnsMenuItem->Create(pParentMenu, menuitemName, PR_FALSE);
@ -629,7 +630,7 @@ void nsContextMenu::LoadSubMenu(nsIMenu *pParentMenu,
nsIMenu * pnsMenu = nsnull;
nsresult rv = nsComponentManager::CreateInstance(kMenuCID,
nsnull,
nsIMenu::GetIID(),
NS_GET_IID(nsIMenu),
(void**)&pnsMenu);
if (NS_OK == rv) {
// Call Create

3
mozilla/widget/src/gtk/nsFontSizeIterator.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsFontSizeIterator.h"
@ -28,7 +29,7 @@
NS_IMPL_ADDREF(nsFontSizeIterator)
NS_IMPL_RELEASE(nsFontSizeIterator)
NS_IMPL_QUERY_INTERFACE(nsFontSizeIterator, nsIFontSizeIterator::GetIID())
NS_IMPL_QUERY_INTERFACE(nsFontSizeIterator, NS_GET_IID(nsIFontSizeIterator))
//----------------------------------------------------------
nsFontSizeIterator::nsFontSizeIterator()

7
mozilla/widget/src/gtk/nsGtkEventHandler.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsWidget.h"
@ -471,7 +472,7 @@ void menu_item_activate_handler(GtkWidget *w, gpointer p)
// nsEventStatus status;
// mevent.widget->DispatchEvent((nsGUIEvent *)&mevent, status);
menuItem->QueryInterface(nsIMenuListener::GetIID(), (void**)&menuListener);
menuItem->QueryInterface(NS_GET_IID(nsIMenuListener), (void**)&menuListener);
if(menuListener) {
menuListener->MenuItemSelected(mevent);
NS_IF_RELEASE(menuListener);
@ -494,7 +495,7 @@ void menu_map_handler(GtkWidget *w, gpointer p)
mevent.time = PR_IntervalNow();
menu->QueryInterface(nsIMenuListener::GetIID(), (void**)&menuListener);
menu->QueryInterface(NS_GET_IID(nsIMenuListener), (void**)&menuListener);
if(menuListener) {
menuListener->MenuConstruct(
@ -522,7 +523,7 @@ void menu_unmap_handler(GtkWidget *w, gpointer p)
mevent.time = PR_IntervalNow();
menu->QueryInterface(nsIMenuListener::GetIID(), (void**)&menuListener);
menu->QueryInterface(NS_GET_IID(nsIMenuListener), (void**)&menuListener);
if(menuListener) {
menuListener->MenuDestruct(mevent);
NS_IF_RELEASE(menuListener);

5
mozilla/widget/src/gtk/nsGtkIMEHelper.cpp
View File

@ -18,7 +18,8 @@
* Rights Reserved.
*
* Contributor(s):
* Frank Tang <ftang@netsape.com>
* Frank Tang <ftang@netsape.com>
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsGtkIMEHelper.h"
#include "nsIUnicodeDecoder.h"
@ -71,7 +72,7 @@ void nsGtkIMEHelper::SetupUnicodeDecoder()
nsICharsetConverterManager* manager = nsnull;
nsresult res = nsServiceManager::
GetService(kCharsetConverterManagerCID,
nsCOMTypeInfo<nsICharsetConverterManager>::GetIID(),
NS_GET_IID(nsICharsetConverterManager),
(nsISupports**)&manager);
if (manager && NS_SUCCEEDED(res)) {
manager->GetUnicodeDecoder(&charset, &mDecoder);

29
mozilla/widget/src/gtk/nsMenu.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include <gtk/gtk.h>
@ -47,7 +48,7 @@ nsresult nsMenu::QueryInterface(REFNSIID aIID, void** aInstancePtr)
*aInstancePtr = NULL;
if (aIID.Equals(nsIMenu::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIMenu))) {
*aInstancePtr = (void*)(nsIMenu*) this;
NS_ADDREF_THIS();
return NS_OK;
@ -57,7 +58,7 @@ nsresult nsMenu::QueryInterface(REFNSIID aIID, void** aInstancePtr)
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(nsIMenuListener::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIMenuListener))) {
*aInstancePtr = (void*)(nsIMenuListener*)this;
NS_ADDREF_THIS();
return NS_OK;
@ -113,7 +114,7 @@ NS_METHOD nsMenu::Create(nsISupports *aParent, const nsString &aLabel)
if(aParent)
{
nsIMenuBar * menubar = nsnull;
aParent->QueryInterface(nsIMenuBar::GetIID(), (void**) &menubar);
aParent->QueryInterface(NS_GET_IID(nsIMenuBar), (void**) &menubar);
if(menubar)
{
mMenuBarParent = menubar;
@ -122,7 +123,7 @@ NS_METHOD nsMenu::Create(nsISupports *aParent, const nsString &aLabel)
else
{
nsIMenu * menu = nsnull;
aParent->QueryInterface(nsIMenu::GetIID(), (void**) &menu);
aParent->QueryInterface(NS_GET_IID(nsIMenu), (void**) &menu);
if(menu)
{
mMenuParent = menu;
@ -239,7 +240,7 @@ NS_METHOD nsMenu::AddItem(nsISupports * aItem)
if(aItem)
{
nsIMenuItem * menuitem = nsnull;
aItem->QueryInterface(nsIMenuItem::GetIID(),
aItem->QueryInterface(NS_GET_IID(nsIMenuItem),
(void**)&menuitem);
if(menuitem)
{
@ -249,7 +250,7 @@ NS_METHOD nsMenu::AddItem(nsISupports * aItem)
else
{
nsIMenu * menu = nsnull;
aItem->QueryInterface(nsIMenu::GetIID(),
aItem->QueryInterface(NS_GET_IID(nsIMenu),
(void**)&menu);
if(menu)
{
@ -301,7 +302,7 @@ NS_METHOD nsMenu::AddMenu(nsIMenu * aMenu)
nsIMenuItem * pnsMenuItem = nsnull;
nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID,
nsnull,
nsIMenuItem::GetIID(),
NS_GET_IID(nsIMenuItem),
(void**)&pnsMenuItem);
if (NS_OK == rv) {
nsISupports * supports = nsnull;
@ -334,7 +335,7 @@ NS_METHOD nsMenu::AddSeparator()
// Create nsMenuItem
nsIMenuItem * pnsMenuItem = nsnull;
nsresult rv = nsComponentManager::CreateInstance(
kMenuItemCID, nsnull, nsIMenuItem::GetIID(), (void**)&pnsMenuItem);
kMenuItemCID, nsnull, NS_GET_IID(nsIMenuItem), (void**)&pnsMenuItem);
if (NS_OK == rv) {
nsString tmp = "menuseparator";
nsISupports * supports = nsnull;
@ -416,14 +417,14 @@ NS_METHOD nsMenu::RemoveAll()
if(nsnull != item)
{
if (NS_OK == item->QueryInterface(nsIMenuItem::GetIID(), (void**)&menuitem)) {
if (NS_OK == item->QueryInterface(NS_GET_IID(nsIMenuItem), (void**)&menuitem)) {
// we do this twice because we have to do it once for QueryInterface,
// then we want to get rid of it.
// g_print("remove nsMenuItem\n");
NS_RELEASE(menuitem);
NS_RELEASE(item);
menuitem = nsnull;
} else if (NS_OK == item->QueryInterface(nsIMenu::GetIID(), (void**)&menu)) {
} else if (NS_OK == item->QueryInterface(NS_GET_IID(nsIMenu), (void**)&menu)) {
// g_print("remove nsMenu\n");
NS_RELEASE(menu);
NS_RELEASE(item);
@ -437,7 +438,7 @@ NS_METHOD nsMenu::RemoveAll()
for (int i = mMenuItemVoidArray.Count(); i > 0; i--) {
if(nsnull != mMenuItemVoidArray[i-1]) {
nsIMenuItem * menuitem = nsnull;
((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(nsIMenuItem::GetIID(),
((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(NS_GET_IID(nsIMenuItem),
(void**)&menuitem);
if(menuitem) {
void *gtkmenuitem = nsnull;
@ -451,7 +452,7 @@ NS_METHOD nsMenu::RemoveAll()
} else {
nsIMenu * menu= nsnull;
((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(nsIMenu::GetIID(),
((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(NS_GET_IID(nsIMenu),
(void**)&menu);
if(menu)
{
@ -683,7 +684,7 @@ void nsMenu::LoadMenuItem(nsIMenu * pParentMenu,
nsIMenuItem * pnsMenuItem = nsnull;
nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID,
nsnull,
nsIMenuItem::GetIID(),
NS_GET_IID(nsIMenuItem),
(void**)&pnsMenuItem);
if (NS_OK == rv) {
pnsMenuItem->Create(pParentMenu, menuitemName, PR_FALSE);
@ -737,7 +738,7 @@ void nsMenu::LoadSubMenu(nsIMenu * pParentMenu,
nsIMenu * pnsMenu = nsnull;
nsresult rv = nsComponentManager::CreateInstance(kMenuCID,
nsnull,
nsIMenu::GetIID(),
NS_GET_IID(nsIMenu),
(void**)&pnsMenu);
if (NS_OK == rv) {
// Call Create

13
mozilla/widget/src/gtk/nsMenuBar.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include <gtk/gtk.h>
@ -50,7 +51,7 @@ nsresult nsMenuBar::QueryInterface(REFNSIID aIID, void** aInstancePtr)
*aInstancePtr = NULL;
if (aIID.Equals(nsIMenuBar::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIMenuBar))) {
*aInstancePtr = (void*) ((nsIMenuBar*) this);
NS_ADDREF_THIS();
return NS_OK;
@ -62,7 +63,7 @@ nsresult nsMenuBar::QueryInterface(REFNSIID aIID, void** aInstancePtr)
return NS_OK;
}
if (aIID.Equals(nsIMenuListener::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIMenuListener))) {
*aInstancePtr = (void*) ((nsIMenuListener*)this);
NS_ADDREF_THIS();
return NS_OK;
@ -204,7 +205,7 @@ NS_METHOD nsMenuBar::RemoveAll()
for (int i = mMenusVoidArray.Count(); i > 0; i--) {
if(nsnull != mMenusVoidArray[i-1]) {
nsIMenu * menu = nsnull;
((nsISupports*)mMenusVoidArray[i-1])->QueryInterface(nsIMenu::GetIID(), (void**)&menu);
((nsISupports*)mMenusVoidArray[i-1])->QueryInterface(NS_GET_IID(nsIMenu), (void**)&menu);
if(menu) {
//void * gtkmenu= nsnull;
//menu->GetNativeData(&gtkmenu);
@ -278,7 +279,7 @@ nsEventStatus nsMenuBar::MenuConstruct(
nsIMenuBar * pnsMenuBar = nsnull;
nsresult rv = nsComponentManager::CreateInstance(kMenuBarCID,
nsnull,
nsIMenuBar::GetIID(),
NS_GET_IID(nsIMenuBar),
(void**)&pnsMenuBar);
if (NS_OK == rv) {
if (nsnull != pnsMenuBar) {
@ -286,7 +287,7 @@ nsEventStatus nsMenuBar::MenuConstruct(
// set pnsMenuBar as a nsMenuListener on aParentWindow
nsCOMPtr<nsIMenuListener> menuListener;
pnsMenuBar->QueryInterface(nsIMenuListener::GetIID(), getter_AddRefs(menuListener));
pnsMenuBar->QueryInterface(NS_GET_IID(nsIMenuListener), getter_AddRefs(menuListener));
aParentWindow->AddMenuListener(menuListener);
nsCOMPtr<nsIDOMNode> menuNode;
@ -305,7 +306,7 @@ nsEventStatus nsMenuBar::MenuConstruct(
// Create nsMenu
nsIMenu * pnsMenu = nsnull;
rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, nsIMenu::GetIID(), (void**)&pnsMenu);
rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, NS_GET_IID(nsIMenu), (void**)&pnsMenu);
if (NS_OK == rv) {
// Call Create
nsISupports * supports = nsnull;

13
mozilla/widget/src/gtk/nsMenuItem.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include <gtk/gtk.h>
@ -52,7 +53,7 @@ nsresult nsMenuItem::QueryInterface(REFNSIID aIID, void** aInstancePtr)
*aInstancePtr = NULL;
if (aIID.Equals(nsIMenuItem::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIMenuItem))) {
*aInstancePtr = (void*)(nsIMenuItem*)this;
NS_ADDREF_THIS();
return NS_OK;
@ -62,7 +63,7 @@ nsresult nsMenuItem::QueryInterface(REFNSIID aIID, void** aInstancePtr)
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(nsIMenuListener::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIMenuListener))) {
*aInstancePtr = (void*)(nsIMenuListener*)this;
NS_ADDREF_THIS();
return NS_OK;
@ -132,7 +133,7 @@ nsIWidget * nsMenuItem::GetMenuBarParent(nsISupports * aParent)
nsISupports * parent = aParent;
while(1) {
if (NS_OK == parent->QueryInterface(nsIMenu::GetIID(),(void**)&menu)) {
if (NS_OK == parent->QueryInterface(NS_GET_IID(nsIMenu),(void**)&menu)) {
NS_RELEASE(parent);
if (NS_OK != menu->GetParent(parent)) {
NS_RELEASE(menu);
@ -140,7 +141,7 @@ nsIWidget * nsMenuItem::GetMenuBarParent(nsISupports * aParent)
}
NS_RELEASE(menu);
} else if (NS_OK == parent->QueryInterface(nsIPopUpMenu::GetIID(),(void**)&popup)) {
} else if (NS_OK == parent->QueryInterface(NS_GET_IID(nsIPopUpMenu),(void**)&popup)) {
if (NS_OK != popup->GetParent(widget)) {
widget = nsnull;
}
@ -148,7 +149,7 @@ nsIWidget * nsMenuItem::GetMenuBarParent(nsISupports * aParent)
NS_RELEASE(parent);
return widget;
} else if (NS_OK == parent->QueryInterface(nsIMenuBar::GetIID(),(void**)&menuBar)) {
} else if (NS_OK == parent->QueryInterface(NS_GET_IID(nsIMenuBar),(void**)&menuBar)) {
if (NS_OK != menuBar->GetParent(widget)) {
widget = nsnull;
}
@ -242,7 +243,7 @@ NS_METHOD nsMenuItem::Create(nsISupports *aParent,
if(aParent) {
nsIMenu * menu;
aParent->QueryInterface(nsIMenu::GetIID(), (void**) &menu);
aParent->QueryInterface(NS_GET_IID(nsIMenu), (void**) &menu);
mMenuParent = menu;
NS_RELEASE(menu);
}

3
mozilla/widget/src/gtk/nsPopUpMenu.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsPopUpMenu.h"
#include "nsIMenu.h"
@ -26,7 +27,7 @@
#include "nsString.h"
#include "nsFileSpec.h" // XXX: For nsAutoCString
NS_IMPL_ISUPPORTS(nsPopUpMenu, nsIPopUpMenu::GetIID())
NS_IMPL_ISUPPORTS(nsPopUpMenu, NS_GET_IID(nsIPopUpMenu))
//-------------------------------------------------------------------------
//

3
mozilla/widget/src/gtk/nsRadioButton.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include <gtk/gtk.h>
@ -65,7 +66,7 @@ nsresult nsRadioButton::QueryInterface(const nsIID& aIID, void** aInstancePtr)
{
nsresult result = nsWidget::QueryInterface(aIID, aInstancePtr);
if (result == NS_NOINTERFACE && aIID.Equals(nsIRadioButton::GetIID())) {
if (result == NS_NOINTERFACE && aIID.Equals(NS_GET_IID(nsIRadioButton))) {
*aInstancePtr = (void*) ((nsIRadioButton*)this);
AddRef();
result = NS_OK;

5
mozilla/widget/src/mac/nsMacWindow.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsMacWindow.h"
@ -125,7 +126,7 @@ nsMacWindow :: DragTrackingHandler ( DragTrackingMessage theMessage, WindowPtr t
{
// get our drag service for the duration of the drag.
nsresult rv = nsServiceManager::GetService(kCDragServiceCID,
nsIDragService::GetIID(),
NS_GET_IID(nsIDragService),
(nsISupports **)&sDragService);
NS_ASSERTION ( sDragService, "Couldn't get a drag service, we're in biiig trouble" );
@ -226,7 +227,7 @@ nsMacWindow :: DragReceiveHandler (WindowPtr theWindow, void *handlerRefCon,
// drag session to see what we should return to the OS (drag accepted or not).
nsIDragService* dragService;
nsresult rv = nsServiceManager::GetService(kCDragServiceCID,
nsIDragService::GetIID(),
NS_GET_IID(nsIDragService),
(nsISupports **)&dragService);
if ( NS_SUCCEEDED(rv) && dragService ) {
nsCOMPtr<nsIDragSession> dragSession;

5
mozilla/widget/src/mac/nsSound.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nscore.h"
@ -31,7 +32,7 @@
#include <QuickTimeComponents.h>
NS_IMPL_ISUPPORTS(nsSound, nsCOMTypeInfo<nsISound>::GetIID());
NS_IMPL_ISUPPORTS(nsSound, NS_GET_IID(nsISound));
////////////////////////////////////////////////////////////////////////
nsSound::nsSound()
@ -193,4 +194,4 @@ bail: // gasp, a goto label
::DisposeMovie(movie);
return (err == noErr) ? NS_OK : NS_ERROR_FAILURE;
}
}

3
mozilla/widget/src/motif/app_context/nsMotifAppContextService.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsMotifAppContextService.h"
@ -33,7 +34,7 @@ nsMotifAppContextService::~nsMotifAppContextService()
NS_IMPL_ADDREF(nsMotifAppContextService)
NS_IMPL_RELEASE(nsMotifAppContextService)
NS_IMPL_QUERY_INTERFACE(nsMotifAppContextService, nsCOMTypeInfo<nsIMotifAppContextService>::GetIID())
NS_IMPL_QUERY_INTERFACE(nsMotifAppContextService, NS_GET_IID(nsIMotifAppContextService))
NS_IMETHODIMP
nsMotifAppContextService::SetAppContext(XtAppContext aAppContext)

5
mozilla/widget/src/motif/app_context/nsMotifAppContextServiceFactory.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsIMotifAppContextService.h"
@ -59,7 +60,7 @@ nsMotifAppContextServiceFactory::~nsMotifAppContextServiceFactory()
{
}
NS_IMPL_ISUPPORTS(nsMotifAppContextServiceFactory, nsIFactory::GetIID())
NS_IMPL_ISUPPORTS(nsMotifAppContextServiceFactory, NS_GET_IID(nsIFactory))
NS_IMETHODIMP
nsMotifAppContextServiceFactory::CreateInstance(nsISupports *aOuter,
@ -107,7 +108,7 @@ NSGetFactory(nsISupports *servMgr,
if (nsnull == aFactory) {
return NS_ERROR_OUT_OF_MEMORY;
}
return (*aFactory)->QueryInterface(nsIFactory::GetIID(),
return (*aFactory)->QueryInterface(NS_GET_IID(nsIFactory),
(void **)aFactory);
}

3
mozilla/widget/src/motif/nsAppShell.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsAppShell.h"
@ -298,7 +299,7 @@ nsAppShell::SetAppContext(XtAppContext aAppContext)
rv = nsComponentManager::CreateInstance(kCMotifAppContextServiceCID,
nsnull,
nsIMotifAppContextService::GetIID(),
NS_GET_IID(nsIMotifAppContextService),
(void **)& ac_service);
NS_ASSERTION(rv == NS_OK,"Cannot obtain app context service.");

13
mozilla/widget/src/motif/nsMenu.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsMenu.h"
@ -51,7 +52,7 @@ nsresult nsMenu::QueryInterface(REFNSIID aIID, void** aInstancePtr)
*aInstancePtr = NULL;
if (aIID.Equals(nsIMenu::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIMenu))) {
*aInstancePtr = (void*)(nsIMenu*) this;
NS_ADDREF_THIS();
return NS_OK;
@ -128,7 +129,7 @@ NS_METHOD nsMenu::Create(nsISupports * aParent, const nsString &aLabel)
if(aParent)
{
nsIMenuBar * menubar = nsnull;
aParent->QueryInterface(nsIMenuBar::GetIID(), (void**) &menubar);
aParent->QueryInterface(NS_GET_IID(nsIMenuBar), (void**) &menubar);
if(menubar)
{
mMenuBarParent = menubar;
@ -137,7 +138,7 @@ NS_METHOD nsMenu::Create(nsISupports * aParent, const nsString &aLabel)
else
{
nsIMenu * menu = nsnull;
aParent->QueryInterface(nsIMenu::GetIID(), (void**) &menu);
aParent->QueryInterface(NS_GET_IID(nsIMenu), (void**) &menu);
if(menu)
{
mMenuParent = menu;
@ -216,7 +217,7 @@ NS_METHOD nsMenu::AddItem(nsISupports * aItem)
if(aItem)
{
nsIMenuItem * menuitem = nsnull;
aItem->QueryInterface(nsIMenuItem::GetIID(),
aItem->QueryInterface(NS_GET_IID(nsIMenuItem),
(void**)&menuitem);
if(menuitem)
{
@ -226,7 +227,7 @@ NS_METHOD nsMenu::AddItem(nsISupports * aItem)
else
{
nsIMenu * menu = nsnull;
aItem->QueryInterface(nsIMenu::GetIID(),
aItem->QueryInterface(NS_GET_IID(nsIMenu),
(void**)&menu);
if(menu)
{
@ -363,7 +364,7 @@ void nsMenu::LoadSubMenu(nsIMenu * pParentMenu,
nsIMenu * pnsMenu = nsnull;
nsresult rv = nsComponentManager::CreateInstance(kMenuCID,
nsnull,
nsIMenu::GetIID(),
NS_GET_IID(nsIMenu),
(void**)&pnsMenu);
if (NS_OK == rv) {
// Call Create

13
mozilla/widget/src/motif/nsMenuBar.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include <Xm/RowColumn.h>
@ -48,7 +49,7 @@ nsresult nsMenuBar::QueryInterface(REFNSIID aIID, void** aInstancePtr)
*aInstancePtr = NULL;
if (aIID.Equals(nsIMenuBar::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIMenuBar))) {
*aInstancePtr = (void*) ((nsIMenuBar*) this);
NS_ADDREF_THIS();
return NS_OK;
@ -60,7 +61,7 @@ nsresult nsMenuBar::QueryInterface(REFNSIID aIID, void** aInstancePtr)
return NS_OK;
}
if (aIID.Equals(nsIMenuListener::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIMenuListener))) {
*aInstancePtr = (void*) ((nsIMenuListener*)this);
NS_ADDREF_THIS();
return NS_OK;
@ -166,7 +167,7 @@ NS_METHOD nsMenuBar::RemoveAll()
for (int i = mMenusVoidArray.Count(); i > 0; i--) {
if(nsnull != mMenusVoidArray[i-1]) {
nsIMenu * menu = nsnull;
((nsISupports*)mMenusVoidArray[i-1])->QueryInterface(nsIMenu::GetIID(), (void**)&menu);
((nsISupports*)mMenusVoidArray[i-1])->QueryInterface(NS_GET_IID(nsIMenu), (void**)&menu);
if(menu) {
//XXX:implement something here.
NS_RELEASE(menu);
@ -236,7 +237,7 @@ nsEventStatus nsMenuBar::MenuConstruct(
nsIMenuBar * pnsMenuBar = nsnull;
nsresult rv = nsComponentManager::CreateInstance(kMenuBarCID,
nsnull,
nsIMenuBar::GetIID(),
NS_GET_IID(nsIMenuBar),
(void**)&pnsMenuBar);
if (NS_OK == rv) {
if (nsnull != pnsMenuBar) {
@ -244,7 +245,7 @@ nsEventStatus nsMenuBar::MenuConstruct(
// set pnsMenuBar as a nsMenuListener on aParentWindow
nsCOMPtr<nsIMenuListener> menuListener;
pnsMenuBar->QueryInterface(nsIMenuListener::GetIID(), getter_AddRefs(menuListener));
pnsMenuBar->QueryInterface(NS_GET_IID(nsIMenuListener), getter_AddRefs(menuListener));
aParentWindow->AddMenuListener(menuListener);
nsCOMPtr<nsIDOMNode> menuNode;
@ -261,7 +262,7 @@ nsEventStatus nsMenuBar::MenuConstruct(
// Create nsMenu
nsIMenu * pnsMenu = nsnull;
rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, nsIMenu::GetIID(), (void**)&pnsMenu);
rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, NS_GET_IID(nsIMenu), (void**)&pnsMenu);
if (NS_OK == rv) {
// Call Create
nsISupports * supports = nsnull;

13
mozilla/widget/src/motif/nsMenuItem.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include <Xm/CascadeBG.h>
@ -54,7 +55,7 @@ nsresult nsMenuItem::QueryInterface(REFNSIID aIID, void** aInstancePtr)
*aInstancePtr = NULL;
if (aIID.Equals(nsIMenuItem::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIMenuItem))) {
*aInstancePtr = (void*)(nsIMenuItem*)this;
NS_ADDREF_THIS();
return NS_OK;
@ -64,7 +65,7 @@ nsresult nsMenuItem::QueryInterface(REFNSIID aIID, void** aInstancePtr)
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(nsIMenuListener::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIMenuListener))) {
*aInstancePtr = (void*)(nsIMenuListener*)this;
NS_ADDREF_THIS();
return NS_OK;
@ -134,7 +135,7 @@ nsIWidget * nsMenuItem::GetMenuBarParent(nsISupports * aParent)
// Bump the ref count on the parent, since it gets released unconditionally..
NS_ADDREF(parent);
while (1) {
if (NS_OK == parent->QueryInterface(nsIMenu::GetIID(),(void**)&menu)) {
if (NS_OK == parent->QueryInterface(NS_GET_IID(nsIMenu),(void**)&menu)) {
NS_RELEASE(parent);
if (NS_OK != menu->GetParent(parent)) {
NS_RELEASE(menu);
@ -142,7 +143,7 @@ nsIWidget * nsMenuItem::GetMenuBarParent(nsISupports * aParent)
}
NS_RELEASE(menu);
} else if (NS_OK == parent->QueryInterface(nsIPopUpMenu::GetIID(),(void**)&popup)) {
} else if (NS_OK == parent->QueryInterface(NS_GET_IID(nsIPopUpMenu),(void**)&popup)) {
if (NS_OK != popup->GetParent(widget)) {
widget = nsnull;
}
@ -150,7 +151,7 @@ nsIWidget * nsMenuItem::GetMenuBarParent(nsISupports * aParent)
NS_RELEASE(popup);
return widget;
} else if (NS_OK == parent->QueryInterface(nsIMenuBar::GetIID(),(void**)&menuBar)) {
} else if (NS_OK == parent->QueryInterface(NS_GET_IID(nsIMenuBar),(void**)&menuBar)) {
if (NS_OK != menuBar->GetParent(widget)) {
widget = nsnull;
}
@ -263,7 +264,7 @@ NS_METHOD nsMenuItem::Create(nsISupports *aParent,
if(aParent) {
nsIMenu * menu;
aParent->QueryInterface(nsIMenu::GetIID(), (void**) &menu);
aParent->QueryInterface(NS_GET_IID(nsIMenu), (void**) &menu);
mMenuParent = menu;
NS_RELEASE(menu);
}

3
mozilla/widget/src/motif/nsWindow.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include <X11/Xlib.h>
@ -1343,7 +1344,7 @@ PRBool nsWindow::OnPaint(nsPaintEvent &event)
static NS_DEFINE_CID(kRenderingContextCID, NS_RENDERING_CONTEXT_CID);
if (NS_OK == nsComponentManager::CreateInstance(kRenderingContextCID,
nsnull,
nsIRenderingContext::GetIID(),
NS_GET_IID(nsIRenderingContext),
(void **)&event.renderingContext))
{
event.renderingContext->Init(mContext, this);

4
mozilla/widget/src/os2/nsAppShell.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsAppShell.h"
@ -94,7 +94,7 @@ class nsAppshellManager
static nsAppshellManager *pManager = nsnull;
NS_IMPL_ISUPPORTS(nsAppShell, nsIAppShell::GetIID())
NS_IMPL_ISUPPORTS(nsAppShell, NS_GET_IID(nsIAppShell))
// nsAppShell constructor
nsAppShell::nsAppShell()

4
mozilla/widget/src/os2/nsCheckButton.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
// Check button control
@ -31,7 +31,7 @@ nsresult nsCheckButton::QueryInterface( const nsIID &aIID, void **aInstancePtr)
{
nsresult result = nsWindow::QueryInterface( aIID, aInstancePtr);
if( result == NS_NOINTERFACE && aIID.Equals( nsICheckButton::GetIID()))
if( result == NS_NOINTERFACE && aIID.Equals( NS_GET_IID(nsICheckButton)))
{
*aInstancePtr = (void*) ((nsICheckButton*)this);
NS_ADDREF_THIS();

6
mozilla/widget/src/os2/nsComboBox.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nscombobox.h"
@ -30,13 +30,13 @@ NS_IMPL_RELEASE(nsComboBox)
nsresult nsComboBox::QueryInterface( const nsIID &aIID, void **aInstancePtr)
{
if( aIID.Equals( nsIComboBox::GetIID()))
if( aIID.Equals( NS_GET_IID(nsIComboBox)))
{
*aInstancePtr = (void*) ((nsIComboBox*)this);
NS_ADDREF_THIS();
return NS_OK;
}
else if( aIID.Equals( nsIListWidget::GetIID()))
else if( aIID.Equals( NS_GET_IID(nsIListWidget)))
{
*aInstancePtr = (void*) ((nsIListWidget*)this);
NS_ADDREF_THIS();

6
mozilla/widget/src/os2/nsContextMenu.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
// popup context menu
@ -38,13 +38,13 @@ nsresult nsContextMenu::QueryInterface(REFNSIID aIID, void** aInstancePtr)
*aInstancePtr = 0;
if( aIID.Equals(nsIContextMenu::GetIID()))
if( aIID.Equals(NS_GET_IID(nsIContextMenu)))
{
*aInstancePtr = (void*) ((nsIContextMenu*) this);
NS_ADDREF_THIS();
return NS_OK;
}
if( aIID.Equals(nsIMenuListener::GetIID()))
if( aIID.Equals(NS_GET_IID(nsIMenuListener)))
{
*aInstancePtr = (void*) ((nsIMenuListener*)this);
NS_ADDREF_THIS();

4
mozilla/widget/src/os2/nsEntryField.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsEntryField.h"
@ -28,7 +28,7 @@ nsresult nsEntryField::QueryInterface( const nsIID &aIID, void **aInstancePtr)
{
nsresult result = nsWindow::QueryInterface( aIID, aInstancePtr);
if( result == NS_NOINTERFACE && aIID.Equals( nsITextWidget::GetIID()))
if( result == NS_NOINTERFACE && aIID.Equals( NS_GET_IID(nsITextWidget)))
{
*aInstancePtr = (void*) ((nsITextWidget*)this);
NS_ADDREF_THIS();

4
mozilla/widget/src/os2/nsFileDialog.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsWidgetDefs.h"
@ -45,7 +45,7 @@ nsFileDialog::~nsFileDialog()
free( mFileDlg.pszTitle);
}
NS_IMPL_ISUPPORTS(nsFileDialog,nsIFileWidget::GetIID())
NS_IMPL_ISUPPORTS(nsFileDialog,NS_GET_IID(nsIFileWidget))
nsresult nsFileDialog::Create( nsIWidget *aParent,
const nsString &aTitle,

8
mozilla/widget/src/os2/nsFontServices.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsWidgetDefs.h"
@ -221,7 +221,7 @@ class nsFontSizeIterator : public nsIFontSizeIterator
}
};
NS_IMPL_ISUPPORTS(nsFontSizeIterator, nsIFontSizeIterator::GetIID())
NS_IMPL_ISUPPORTS(nsFontSizeIterator, NS_GET_IID(nsIFontSizeIterator))
// Font-name iterator (xpcom)
class nsFontNameIterator : public nsIFontNameIterator
@ -269,10 +269,10 @@ class nsFontNameIterator : public nsIFontNameIterator
}
};
NS_IMPL_ISUPPORTS(nsFontNameIterator, nsIFontNameIterator::GetIID())
NS_IMPL_ISUPPORTS(nsFontNameIterator, NS_GET_IID(nsIFontNameIterator))
// font retriever service
NS_IMPL_ISUPPORTS(nsFontRetrieverService, nsIFontRetrieverService::GetIID())
NS_IMPL_ISUPPORTS(nsFontRetrieverService, NS_GET_IID(nsIFontRetrieverService))
nsFontRetrieverService::nsFontRetrieverService()
{

4
mozilla/widget/src/os2/nsLabel.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsLabel.h"
@ -29,7 +29,7 @@ nsresult nsLabel::QueryInterface( const nsIID &aIID, void **aInstancePtr)
{
nsresult result = nsWindow::QueryInterface( aIID, aInstancePtr);
if( result == NS_NOINTERFACE && aIID.Equals( nsILabel::GetIID()))
if( result == NS_NOINTERFACE && aIID.Equals( NS_GET_IID(nsILabel)))
{
*aInstancePtr = (void*) ((nsILabel*)this);
NS_ADDREF_THIS();

6
mozilla/widget/src/os2/nsListBox.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsListBox.h"
@ -32,13 +32,13 @@ nsresult nsListBox::QueryInterface( const nsIID &aIID, void **aInstancePtr)
if( result == NS_NOINTERFACE)
{
if( aIID.Equals( nsIListBox::GetIID()))
if( aIID.Equals( NS_GET_IID(nsIListBox)))
{
*aInstancePtr = (void*) ((nsIListBox*)this);
NS_ADDREF_THIS();
result = NS_OK;
}
else if( aIID.Equals( nsIListWidget::GetIID()))
else if( aIID.Equals( NS_GET_IID(nsIListWidget)))
{
*aInstancePtr = (void*) ((nsIListWidget*)this);
NS_ADDREF_THIS();

4
mozilla/widget/src/os2/nsLookAndFeel.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsLookAndFeel.h"
@ -26,7 +26,7 @@
#include <stdio.h>
// XPCom scaffolding
NS_IMPL_ISUPPORTS(nsLookAndFeel, nsILookAndFeel::GetIID())
NS_IMPL_ISUPPORTS(nsLookAndFeel, NS_GET_IID(nsILookAndFeel))
nsLookAndFeel::nsLookAndFeel()
{

12
mozilla/widget/src/os2/nsMenu.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
// normal menu
@ -42,13 +42,13 @@ nsresult nsMenu::QueryInterface(REFNSIID aIID, void** aInstancePtr)
*aInstancePtr = 0;
if( aIID.Equals(nsIMenu::GetIID()))
if( aIID.Equals(NS_GET_IID(nsIMenu)))
{
*aInstancePtr = (void*) ((nsIMenu*) this);
NS_ADDREF_THIS();
return NS_OK;
}
if( aIID.Equals(nsIMenuListener::GetIID()))
if( aIID.Equals(NS_GET_IID(nsIMenuListener)))
{
*aInstancePtr = (void*) ((nsIMenuListener*)this);
NS_ADDREF_THIS();
@ -83,19 +83,19 @@ nsresult nsMenu::Create( nsISupports *aThing, const nsString &aLabel)
nsIContextMenu *aPopup = nsnull;
nsIMenuBar *aBar = nsnull;
if( NS_SUCCEEDED( aThing->QueryInterface( nsIMenuBar::GetIID(),
if( NS_SUCCEEDED( aThing->QueryInterface( NS_GET_IID(nsIMenuBar),
(void**) &aBar)))
{
aBar->GetNativeData( pvHwnd);
NS_RELEASE(aBar);
}
else if( NS_SUCCEEDED( aThing->QueryInterface( nsIMenu::GetIID(),
else if( NS_SUCCEEDED( aThing->QueryInterface( NS_GET_IID(nsIMenu),
(void**) &aMenu)))
{
aMenu->GetNativeData( &pvHwnd);
NS_RELEASE(aMenu);
}
else if( NS_SUCCEEDED( aThing->QueryInterface( nsIContextMenu::GetIID(),
else if( NS_SUCCEEDED( aThing->QueryInterface( NS_GET_IID(nsIContextMenu),
(void**) &aPopup)))
{
aPopup->GetNativeData( &pvHwnd);

8
mozilla/widget/src/os2/nsMenuBar.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
// menu bar
@ -40,13 +40,13 @@ nsresult nsMenuBar::QueryInterface(REFNSIID aIID, void** aInstancePtr)
*aInstancePtr = 0;
if( aIID.Equals(nsIMenuBar::GetIID()))
if( aIID.Equals(NS_GET_IID(nsIMenuBar)))
{
*aInstancePtr = (void*) ((nsIMenuBar*) this);
NS_ADDREF_THIS();
return NS_OK;
}
if( aIID.Equals(nsIMenuListener::GetIID()))
if( aIID.Equals(NS_GET_IID(nsIMenuListener)))
{
*aInstancePtr = (void*) ((nsIMenuListener*)this);
NS_ADDREF_THIS();
@ -171,7 +171,7 @@ nsresult nsMenuBar::GetMenuAt( const PRUint32 aCount, nsIMenu *&aMenu)
nsMenuBase::GetItemAt( aCount, &mI);
nsISupports *aThing = (nsISupports*) mI.hItem;
rc = aThing->QueryInterface( nsIMenu::GetIID(), (void**) &aMenu);
rc = aThing->QueryInterface( NS_GET_IID(nsIMenu), (void**) &aMenu);
}
return rc;

6
mozilla/widget/src/os2/nsMenuBase.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsMenuBase.h"
@ -146,7 +146,7 @@ nsresult nsMenuBase::InsertItemAt( nsISupports *aThing, PRUint32 aPos)
{
mI.afStyle |= MIS_SEPARATOR;
}
else if( NS_SUCCEEDED( aThing->QueryInterface( nsIMenu::GetIID(),
else if( NS_SUCCEEDED( aThing->QueryInterface( NS_GET_IID(nsIMenu),
(void**) &pMenu)))
{
void *hwnd = nsnull;
@ -162,7 +162,7 @@ nsresult nsMenuBase::InsertItemAt( nsISupports *aThing, PRUint32 aPos)
NS_RELEASE(pMenu);
}
else if( NS_SUCCEEDED( aThing->QueryInterface( nsIMenuItem::GetIID(),
else if( NS_SUCCEEDED( aThing->QueryInterface( NS_GET_IID(nsIMenuItem),
(void**) &pItem)))
{
nsMenuItem *pPMItem = (nsMenuItem*) pItem; // XXX

18
mozilla/widget/src/os2/nsMenuItem.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
// menu item
@ -46,13 +46,13 @@ nsresult nsMenuItem::QueryInterface(REFNSIID aIID, void** aInstancePtr)
*aInstancePtr = nsnull;
if( aIID.Equals(nsIMenuItem::GetIID()))
if( aIID.Equals(NS_GET_IID(nsIMenuItem)))
{
*aInstancePtr = (void*) ((nsIMenuItem*) this);
NS_ADDREF_THIS();
return NS_OK;
}
if( aIID.Equals(nsIMenuListener::GetIID()))
if( aIID.Equals(NS_GET_IID(nsIMenuListener)))
{
*aInstancePtr = (void*) ((nsIMenuListener*)this);
NS_ADDREF_THIS();
@ -97,7 +97,7 @@ static nsIWidget *FindWidget( nsISupports *aParent)
NS_ADDREF(parent);
for( ;;)
{
if( NS_OK == parent->QueryInterface( nsIMenu::GetIID(), (void**) &menu))
if( NS_OK == parent->QueryInterface( NS_GET_IID(nsIMenu), (void**) &menu))
{
NS_RELEASE(parent);
if( NS_OK != menu->GetParent(parent))
@ -107,7 +107,7 @@ static nsIWidget *FindWidget( nsISupports *aParent)
}
NS_RELEASE(menu);
}
else if( NS_OK == parent->QueryInterface( nsIContextMenu::GetIID(),
else if( NS_OK == parent->QueryInterface( NS_GET_IID(nsIContextMenu),
(void**) &popup))
{
nsISupports *pThing = 0;
@ -115,12 +115,12 @@ static nsIWidget *FindWidget( nsISupports *aParent)
{
widget = nsnull;
}
pThing->QueryInterface( nsIWidget::GetIID(), (void**) &widget);
pThing->QueryInterface( NS_GET_IID(nsIWidget), (void**) &widget);
NS_RELEASE(parent);
NS_RELEASE(popup);
return widget;
}
else if( NS_OK == parent->QueryInterface( nsIMenuBar::GetIID(),
else if( NS_OK == parent->QueryInterface( NS_GET_IID(nsIMenuBar),
(void**) &menuBar))
{
if( NS_OK != menuBar->GetParent(widget))
@ -148,13 +148,13 @@ nsresult nsMenuItem::Create( nsISupports *aParent, const nsString &aLabel,
void *pvWnd = 0;
if( NS_SUCCEEDED( aParent->QueryInterface( nsIMenu::GetIID(),
if( NS_SUCCEEDED( aParent->QueryInterface( NS_GET_IID(nsIMenu),
(void**) &pMenu)))
{
pMenu->GetNativeData( &pvWnd);
NS_RELEASE(pMenu);
}
else if( NS_SUCCEEDED( aParent->QueryInterface( nsIContextMenu::GetIID(),
else if( NS_SUCCEEDED( aParent->QueryInterface( NS_GET_IID(nsIContextMenu),
(void**) &pPopup)))
{
pPopup->GetNativeData( &pvWnd);

4
mozilla/widget/src/os2/nsPopupMenu.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
// popup menu
@ -35,7 +35,7 @@ nsresult nsPopupMenu::QueryInterface(REFNSIID aIID, void** aInstancePtr)
*aInstancePtr = 0;
if( aIID.Equals(nsIPopupMenu::GetIID()))
if( aIID.Equals(NS_GET_IID(nsIPopupMenu)))
{
*aInstancePtr = (void*) ((nsIPopUpMenu*) this);
NS_ADDREF_THIS();

4
mozilla/widget/src/os2/nsPushButton.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
// Push button control; don't really come any simpler than this...
@ -31,7 +31,7 @@ nsresult nsPushButton::QueryInterface( const nsIID &aIID, void **aInstancePtr)
{
nsresult result = nsWindow::QueryInterface( aIID, aInstancePtr);
if( result == NS_NOINTERFACE && aIID.Equals( nsIButton::GetIID()))
if( result == NS_NOINTERFACE && aIID.Equals( NS_GET_IID(nsIButton)))
{
*aInstancePtr = (void*) ((nsIButton*)this);
NS_ADDREF_THIS();

4
mozilla/widget/src/os2/nsRadioButton.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
// Radio button control
@ -31,7 +31,7 @@ nsresult nsRadioButton::QueryInterface( const nsIID &aIID, void **aInstancePtr)
{
nsresult result = nsWindow::QueryInterface( aIID, aInstancePtr);
if( result == NS_NOINTERFACE && aIID.Equals( nsIRadioButton::GetIID()))
if( result == NS_NOINTERFACE && aIID.Equals( NS_GET_IID(nsIRadioButton)))
{
*aInstancePtr = (void*) ((nsIRadioButton*)this);
NS_ADDREF_THIS();

4
mozilla/widget/src/os2/nsScrollbar.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsScrollbar.h"
@ -30,7 +30,7 @@ nsresult nsScrollbar::QueryInterface( const nsIID &aIID, void **aInstancePtr)
{
nsresult result = nsWindow::QueryInterface( aIID, aInstancePtr);
if( result == NS_NOINTERFACE && aIID.Equals( nsIScrollbar::GetIID()))
if( result == NS_NOINTERFACE && aIID.Equals( NS_GET_IID(nsIScrollbar)))
{
*aInstancePtr = (void*) ((nsIScrollbar*)this);
NS_ADDREF_THIS();

6
mozilla/widget/src/os2/nsSound.cpp
View File

@ -16,13 +16,13 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsWidgetDefs.h"
#include "nsSound.h"
NS_IMPL_ISUPPORTS(nsSound,nsISound::GetIID())
NS_IMPL_ISUPPORTS(nsSound,NS_GET_IID(nsISound))
nsSound::nsSound()
{}
@ -46,6 +46,6 @@ nsresult NS_NewSound( nsISound** aSound)
return NS_ERROR_NULL_POINTER;
nsSound *pSound = new nsSound;
return pSound->QueryInterface( nsISound::GetIID(), (void**) aSound);
return pSound->QueryInterface( NS_GET_IID(nsISound), (void**) aSound);
}
#endif

4
mozilla/widget/src/os2/nsTabWidget.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
// C++ interface
@ -35,7 +35,7 @@ nsresult nsTabWidget::QueryInterface( const nsIID &aIID, void **aInstancePtr)
{
nsresult result = nsWindow::QueryInterface( aIID, aInstancePtr);
if( result == NS_NOINTERFACE && aIID.Equals( nsITabWidget::GetIID()))
if( result == NS_NOINTERFACE && aIID.Equals( NS_GET_IID(nsITabWidget)))
{
*aInstancePtr = (void*) ((nsITabWidget*)this);
NS_ADDREF_THIS();

4
mozilla/widget/src/os2/nsTextArea.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsTextArea.h"
@ -27,7 +27,7 @@ nsresult nsTextArea::QueryInterface( const nsIID &aIID, void **aInstancePtr)
{
nsresult result = nsWindow::QueryInterface( aIID, aInstancePtr);
if( result == NS_NOINTERFACE && aIID.Equals( nsITextAreaWidget::GetIID()))
if( result == NS_NOINTERFACE && aIID.Equals( NS_GET_IID(nsITextAreaWidget)))
{
*aInstancePtr = (void*) ((nsITextAreaWidget*)this);
NS_ADDREF_THIS();

6
mozilla/widget/src/os2/nsToolkit.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsToolkit.h"
@ -51,7 +51,7 @@ extern "C" void RunPump( void *arg)
static NS_DEFINE_IID(kAppShellCID, NS_APPSHELL_CID);
res = nsComponentManager::CreateInstance( kAppShellCID, nsnull,
nsIAppShell::GetIID(),
NS_GET_IID(nsIAppShell),
(void **) &pShell);
NS_ASSERTION( res == NS_OK, "Couldn't create new shell");
@ -106,7 +106,7 @@ nsToolkit::~nsToolkit()
}
// nsISupports implementation macro
NS_IMPL_ISUPPORTS(nsToolkit, nsIToolkit::GetIID())
NS_IMPL_ISUPPORTS(nsToolkit, NS_GET_IID(nsIToolkit))
static MRESULT EXPENTRY fnwpDispatch( HWND, ULONG, MPARAM, MPARAM);
#define UWC_DISPATCH "DispatchWndClass"

4
mozilla/widget/src/os2/nsTooltipWidget.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsTooltipWidget.h"
@ -30,7 +30,7 @@ nsresult nsTooltipWidget::QueryInterface( const nsIID &aIID, void **aInstancePtr
{
nsresult result = nsWindow::QueryInterface(aIID, aInstancePtr);
if( result == NS_NOINTERFACE && aIID.Equals( nsITooltipWidget::GetIID()))
if( result == NS_NOINTERFACE && aIID.Equals( NS_GET_IID(nsITooltipWidget)))
{
*aInstancePtr = (void*) ((nsITooltipWidget*)this);
NS_ADDREF_THIS();

8
mozilla/widget/src/os2/nsWindow.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsWindow.h"
@ -267,7 +267,7 @@ void nsWindow::RealDoCreate( HWND hwndP,
static NS_DEFINE_IID(kDeviceContextCID, NS_DEVICE_CONTEXT_CID);
rc = nsComponentManager::CreateInstance( kDeviceContextCID, nsnull,
nsIDeviceContext::GetIID(),
NS_GET_IID(nsIDeviceContext),
(void **)&mContext);
if( NS_SUCCEEDED(rc))
mContext->Init( (nsNativeWidget) mWnd);
@ -1025,7 +1025,7 @@ PRBool nsWindow::OnMenuClick( USHORT aCmd)
if( aThing)
#endif
{
aThing->QueryInterface( nsIMenuItem::GetIID(),
aThing->QueryInterface( NS_GET_IID(nsIMenuItem),
(void**) &aItem);
}
@ -1049,7 +1049,7 @@ PRBool nsWindow::OnMenuClick( USHORT aCmd)
if( aThing)
#endif
{
aThing->QueryInterface( nsIMenuListener::GetIID(),
aThing->QueryInterface( NS_GET_IID(nsIMenuListener),
(void**) &aListener);
result = ConvertStatus( aListener->MenuItemSelected( event));
}

3
mozilla/widget/src/photon/nsFontSizeIterator.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsFontSizeIterator.h"
@ -28,7 +29,7 @@
NS_IMPL_ADDREF(nsFontSizeIterator)
NS_IMPL_RELEASE(nsFontSizeIterator)
NS_IMPL_QUERY_INTERFACE(nsFontSizeIterator, nsIFontSizeIterator::GetIID())
NS_IMPL_QUERY_INTERFACE(nsFontSizeIterator, NS_GET_IID(nsIFontSizeIterator))
//----------------------------------------------------------
nsFontSizeIterator::nsFontSizeIterator()

3
mozilla/widget/src/photon/nsSound.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
@ -31,7 +32,7 @@
#include <Pt.h>
#include "nsPhWidgetLog.h"
NS_IMPL_ISUPPORTS(nsSound, nsCOMTypeInfo<nsISound>::GetIID());
NS_IMPL_ISUPPORTS(nsSound, NS_GET_IID(nsISound));
////////////////////////////////////////////////////////////////////////
nsSound::nsSound()

5
mozilla/widget/src/qt/nsAppShell.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsAppShell.h"
@ -74,7 +75,7 @@ nsAppShell::~nsAppShell()
// nsISupports implementation macro
//
//-------------------------------------------------------------------------
NS_IMPL_ISUPPORTS(nsAppShell, nsIAppShell::GetIID());
NS_IMPL_ISUPPORTS(nsAppShell, NS_GET_IID(nsIAppShell));
//-------------------------------------------------------------------------
NS_METHOD
@ -328,7 +329,7 @@ nsAppShell::GfxToolkit nsAppShell::GetGfxToolkit()
rv = nsComponentManager::CreateInstance(kCUnixToolkitServiceCID,
nsnull,
nsIUnixToolkitService::GetIID(),
NS_GET_IID(nsIUnixToolkitService),
(void **) &unixToolkitService);
NS_ASSERTION(NS_SUCCEEDED(rv),"Cannot obtain unix toolkit service.");

3
mozilla/widget/src/qt/nsDragService.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsDragService.h"
@ -75,7 +76,7 @@ nsresult nsDragService::QueryInterface(const nsIID& aIID, void** aInstancePtr)
nsresult rv = NS_NOINTERFACE;
if (aIID.Equals(nsIDragService::GetIID()))
if (aIID.Equals(NS_GET_IID(nsIDragService)))
{
*aInstancePtr = (void*) ((nsIDragService*)this);
NS_ADDREF_THIS();

3
mozilla/widget/src/qt/nsFileWidget.cpp
View File

@ -18,12 +18,13 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsFileWidget.h"
#include "nsWidget.h"
NS_IMPL_ISUPPORTS(nsFileWidget, nsIFileWidget::GetIID());
NS_IMPL_ISUPPORTS(nsFileWidget, NS_GET_IID(nsIFileWidget));
//-------------------------------------------------------------------------
//

3
mozilla/widget/src/unix_services/toolkit_service/nsUnixToolkitService.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsUnixToolkitService.h"
@ -64,7 +65,7 @@ nsUnixToolkitService::~nsUnixToolkitService()
NS_IMPL_ADDREF(nsUnixToolkitService)
NS_IMPL_RELEASE(nsUnixToolkitService)
NS_IMPL_QUERY_INTERFACE(nsUnixToolkitService, nsCOMTypeInfo<nsIUnixToolkitService>::GetIID())
NS_IMPL_QUERY_INTERFACE(nsUnixToolkitService, NS_GET_IID(nsIUnixToolkitService))
//////////////////////////////////////////////////////////////////////////
NS_IMETHODIMP

3
mozilla/widget/src/windows/nsClipboard.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsClipboard.h"
@ -443,7 +444,7 @@ nsresult nsClipboard::GetNativeDataOffClipboard(IDataObject * aDataObject, UINT
nsIImage * image;
nsresult rv = nsComponentManager::CreateInstance(kCImageCID, nsnull,
nsCOMTypeInfo<nsIImage>::GetIID(),
NS_GET_IID(nsIImage),
(void**) &image);
if (NS_OK == rv) {
// pull the size informat out of the BITMAPINFO header and

5
mozilla/widget/src/windows/nsComboBox.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsComboBox.h"
@ -185,12 +186,12 @@ nsComboBox::~nsComboBox()
nsresult nsComboBox::QueryInterface(const nsIID& aIID, void** aInstancePtr)
{
if (aIID.Equals(nsCOMTypeInfo<nsIComboBox>::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIComboBox))) {
*aInstancePtr = (void*) ((nsIComboBox*)this);
NS_ADDREF_THIS();
return NS_OK;
}
else if (aIID.Equals(nsCOMTypeInfo<nsIListWidget>::GetIID())) {
else if (aIID.Equals(NS_GET_IID(nsIListWidget))) {
*aInstancePtr = (void*) ((nsIListWidget*)this);
NS_ADDREF_THIS();
return NS_OK;

45
mozilla/widget/src/windows/nsContextMenu.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsContextMenu.h"
@ -58,17 +59,17 @@ nsresult nsContextMenu::QueryInterface(REFNSIID aIID, void** aInstancePtr)
*aInstancePtr = NULL;
if (aIID.Equals(nsCOMTypeInfo<nsIContextMenu>::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIContextMenu))) {
*aInstancePtr = (void*)(nsIContextMenu*) this;
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(nsCOMTypeInfo<nsIMenuListener>::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIMenuListener))) {
*aInstancePtr = (void*)(nsIMenuListener*)this;
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsISupports))) {
*aInstancePtr = (void*)(nsISupports*)(nsIContextMenu*)this;
NS_ADDREF_THIS();
return NS_OK;
@ -124,7 +125,7 @@ NS_METHOD nsContextMenu::Create(nsISupports *aParent, const nsString& anAlignmen
if(aParent)
{
nsIWidget * parent = nsnull;
aParent->QueryInterface(nsCOMTypeInfo<nsIWidget>::GetIID(), (void**) &parent); // This does the addref
aParent->QueryInterface(NS_GET_IID(nsIWidget), (void**) &parent); // This does the addref
if(parent)
{
mParentWindow = parent;
@ -142,7 +143,7 @@ NS_METHOD nsContextMenu::GetParent(nsISupports*& aParent)
{
aParent = nsnull;
if (nsnull != mParentWindow) {
return mParentWindow->QueryInterface(nsCOMTypeInfo<nsISupports>::GetIID(),(void**)&aParent);
return mParentWindow->QueryInterface(NS_GET_IID(nsISupports),(void**)&aParent);
}
return NS_ERROR_FAILURE;
@ -156,7 +157,7 @@ NS_METHOD nsContextMenu::AddItem(nsISupports * aItem)
{
// Figure out what we're adding
nsIMenuItem * menuitem = nsnull;
aItem->QueryInterface(nsCOMTypeInfo<nsIMenuItem>::GetIID(), (void**) &menuitem);
aItem->QueryInterface(NS_GET_IID(nsIMenuItem), (void**) &menuitem);
if(menuitem)
{
// case menuitem
@ -166,7 +167,7 @@ NS_METHOD nsContextMenu::AddItem(nsISupports * aItem)
else
{
nsIMenu * menu = nsnull;
aItem->QueryInterface(nsCOMTypeInfo<nsIMenu>::GetIID(), (void**) &menu);
aItem->QueryInterface(NS_GET_IID(nsIMenu), (void**) &menu);
if(menu)
{
// case menu
@ -293,7 +294,7 @@ NS_METHOD nsContextMenu::InsertItemAt(const PRUint32 aCount, nsISupports * aMenu
NS_METHOD nsContextMenu::InsertSeparator(const PRUint32 aCount)
{
nsISupports * supports = nsnull;
QueryInterface(nsCOMTypeInfo<nsISupports>::GetIID(), (void**) &supports);
QueryInterface(NS_GET_IID(nsISupports), (void**) &supports);
nsMenuItem * item = new nsMenuItem();
if(supports) {
item->Create(supports, "", PR_FALSE);
@ -476,12 +477,12 @@ nsEventStatus nsContextMenu::MenuSelected(const nsMenuEvent & aMenuEvent)
if (identifier > 0) {
// Dispatch to MenuItemSelected
nsIContextMenu * menu;
QueryInterface(nsCOMTypeInfo<nsIContextMenu>::GetIID(), (void**) &menu);
QueryInterface(NS_GET_IID(nsIContextMenu), (void**) &menu);
nsIMenuItem * menuItem = FindMenuItem(menu, identifier);
NS_RELEASE(menu);
if (menuItem) {
nsIMenuListener * listener;
if (NS_OK == menuItem->QueryInterface(nsCOMTypeInfo<nsIMenuListener>::GetIID(), (void **)&listener)) {
if (NS_OK == menuItem->QueryInterface(NS_GET_IID(nsIMenuListener), (void **)&listener)) {
listener->MenuItemSelected(aMenuEvent);
NS_RELEASE(listener);
}
@ -501,12 +502,12 @@ nsIMenuItem * nsContextMenu::FindMenuItem(nsIContextMenu * aMenu, PRUint32 aId)
nsIContextMenu * menu;
aMenu->GetItemAt(i, item);
if (NS_OK == item->QueryInterface(nsCOMTypeInfo<nsIMenuItem>::GetIID(), (void **)&menuItem)) {
if (NS_OK == item->QueryInterface(NS_GET_IID(nsIMenuItem), (void **)&menuItem)) {
if (((nsMenuItem *)menuItem)->GetCmdId() == (PRInt32)aId) {
NS_RELEASE(item);
return menuItem;
}
} else if (NS_OK == item->QueryInterface(nsCOMTypeInfo<nsIContextMenu>::GetIID(), (void **)&menu)) {
} else if (NS_OK == item->QueryInterface(nsIContextMenu), (void **)&menu)) {
nsIMenuItem * fndItem = FindMenuItem(menu, aId);
NS_RELEASE(menu);
if (nsnull != fndItem) {
@ -606,12 +607,12 @@ void nsContextMenu::LoadMenuItem(
menuitemElement->GetAttribute(nsAutoString("cmd"), menuitemCmd);
// Create nsMenuItem
nsIMenuItem * pnsMenuItem = nsnull;
nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID, nsnull, nsCOMTypeInfo<nsIMenuItem>::GetIID(), (void**)&pnsMenuItem);
nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID, nsnull, NS_GET_IID(nsIMenuItem), (void**)&pnsMenuItem);
if (NS_OK == rv) {
pnsMenuItem->Create(pParentMenu, menuitemName, 0);
nsISupports * supports = nsnull;
pnsMenuItem->QueryInterface(nsCOMTypeInfo<nsISupports>::GetIID(), (void**) &supports);
pnsMenuItem->QueryInterface(NS_GET_IID(nsISupports), (void**) &supports);
pParentMenu->AddItem(supports); // Parent should now own menu item
NS_RELEASE(supports);
@ -655,11 +656,11 @@ void nsContextMenu::LoadSubMenu(
// Create nsMenu
nsIMenu * pnsMenu = nsnull;
nsresult rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, nsCOMTypeInfo<nsIMenu>::GetIID(), (void**)&pnsMenu);
nsresult rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, NS_GET_IID(nsIMenu), (void**)&pnsMenu);
if (NS_OK == rv) {
// Call Create
nsISupports * supports = nsnull;
pParentMenu->QueryInterface(nsCOMTypeInfo<nsISupports>::GetIID(), (void**) &supports);
pParentMenu->QueryInterface(NS_GET_IID(nsISupports), (void**) &supports);
pnsMenu->Create(supports, menuName);
NS_RELEASE(supports); // Balance QI
@ -668,7 +669,7 @@ void nsContextMenu::LoadSubMenu(
// Make nsMenu a child of parent nsMenu. The parent takes ownership
supports = nsnull;
pnsMenu->QueryInterface(nsCOMTypeInfo<nsISupports>::GetIID(), (void**) &supports);
pnsMenu->QueryInterface(NS_GET_IID(nsISupports), (void**) &supports);
pParentMenu->AddItem(supports);
NS_RELEASE(supports);
@ -699,12 +700,12 @@ void nsContextMenu::LoadMenuItem(
menuitemElement->GetAttribute(nsAutoString("cmd"), menuitemCmd);
// Create nsMenuItem
nsIMenuItem * pnsMenuItem = nsnull;
nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID, nsnull, nsCOMTypeInfo<nsIMenuItem>::GetIID(), (void**)&pnsMenuItem);
nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID, nsnull, NS_GET_IID(nsIMenuItem), (void**)&pnsMenuItem);
if (NS_OK == rv) {
pnsMenuItem->Create(pParentMenu, menuitemName, 0);
nsISupports * supports = nsnull;
pnsMenuItem->QueryInterface(nsCOMTypeInfo<nsISupports>::GetIID(), (void**) &supports);
pnsMenuItem->QueryInterface(NS_GET_IID(nsISupports), (void**) &supports);
pParentMenu->AddItem(supports); // Parent should now own menu item
NS_RELEASE(supports);
@ -748,11 +749,11 @@ void nsContextMenu::LoadSubMenu(
// Create nsMenu
nsIMenu * pnsMenu = nsnull;
nsresult rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, nsCOMTypeInfo<nsIMenu>::GetIID(), (void**)&pnsMenu);
nsresult rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, NS_GET_IID(nsIMenu), (void**)&pnsMenu);
if (NS_OK == rv) {
// Call Create
nsISupports * supports = nsnull;
pParentMenu->QueryInterface(nsCOMTypeInfo<nsISupports>::GetIID(), (void**) &supports);
pParentMenu->QueryInterface(NS_GET_IID(nsISupports), (void**) &supports);
pnsMenu->Create(supports, menuName);
NS_RELEASE(supports); // Balance QI
@ -761,7 +762,7 @@ void nsContextMenu::LoadSubMenu(
// Make nsMenu a child of parent nsMenu. The parent takes ownership
supports = nsnull;
pnsMenu->QueryInterface(nsCOMTypeInfo<nsISupports>::GetIID(), (void**) &supports);
pnsMenu->QueryInterface(NS_GET_IID(nsISupports), (void**) &supports);
pParentMenu->AddItem(supports);
NS_RELEASE(supports);

3
mozilla/widget/src/windows/nsFileWidget.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
// Define so header files for openfilename are included
@ -82,7 +83,7 @@ nsresult nsFileWidget::QueryInterface(const nsIID& aIID, void** aInstancePtr)
nsresult rv = NS_NOINTERFACE;
if (aIID.Equals(nsCOMTypeInfo<nsIFileWidget>::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIFileWidget))) {
*aInstancePtr = (void*) ((nsIFileWidget*)this);
NS_ADDREF_THIS();
return NS_OK;

5
mozilla/widget/src/windows/nsFontRetrieverService.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsFontRetrieverService.h"
@ -73,13 +74,13 @@ nsresult nsFontRetrieverService::QueryInterface(const nsIID& aIID, void** aInsta
nsresult rv = NS_NOINTERFACE;
if (aIID.Equals(nsCOMTypeInfo<nsIFontRetrieverService>::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIFontRetrieverService))) {
*aInstancePtr = (void*) ((nsIFontRetrieverService*)this);
NS_ADDREF_THIS();
return NS_OK;
}
if (aIID.Equals(nsCOMTypeInfo<nsIFontNameIterator>::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIFontNameIterator))) {
*aInstancePtr = (void*) ((nsIFontNameIterator*)this);
NS_ADDREF_THIS();
return NS_OK;

3
mozilla/widget/src/windows/nsFontSizeIterator.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsFontSizeIterator.h"
@ -29,7 +30,7 @@
NS_IMPL_ADDREF(nsFontSizeIterator)
NS_IMPL_RELEASE(nsFontSizeIterator)
NS_IMPL_QUERY_INTERFACE(nsFontSizeIterator, nsCOMTypeInfo<nsIFontSizeIterator>::GetIID())
NS_IMPL_QUERY_INTERFACE(nsFontSizeIterator, NS_GET_IID(nsIFontSizeIterator))
//----------------------------------------------------------
nsFontSizeIterator::nsFontSizeIterator()

5
mozilla/widget/src/windows/nsListBox.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsListBox.h"
@ -256,12 +257,12 @@ nsresult nsListBox::QueryInterface(const nsIID& aIID, void** aInstancePtr)
nsresult result = nsWindow::QueryInterface(aIID, aInstancePtr);
if (result == NS_NOINTERFACE) {
if (aIID.Equals(nsCOMTypeInfo<nsIListBox>::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIListBox))) {
*aInstancePtr = (void*) ((nsIListBox*)this);
NS_ADDREF_THIS();
result = NS_OK;
}
else if (aIID.Equals(nsCOMTypeInfo<nsIListWidget>::GetIID())) {
else if (aIID.Equals(NS_GET_IID(nsIListWidget))) {
*aInstancePtr = (void*) ((nsIListWidget*)this);
NS_ADDREF_THIS();
result = NS_OK;

3
mozilla/widget/src/windows/nsSound.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nscore.h"
@ -32,7 +33,7 @@
#include "nsNetUtil.h"
#include "prmem.h"
NS_IMPL_ISUPPORTS(nsSound, nsCOMTypeInfo<nsISound>::GetIID());
NS_IMPL_ISUPPORTS(nsSound, NS_GET_IID(nsISound));
////////////////////////////////////////////////////////////////////////
nsSound::nsSound()

5
mozilla/widget/src/windows/nsTextAreaWidget.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsTextAreaWidget.h"
#include "nsToolkit.h"
@ -89,13 +90,13 @@ void nsTextAreaWidget::SetUpForPaint(HDC aHDC)
nsresult nsTextAreaWidget::QueryInterface(const nsIID& aIID, void** aInstancePtr)
{
if (aIID.Equals(nsCOMTypeInfo<nsITextAreaWidget>::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsITextAreaWidget))) {
nsITextAreaWidget* textArea = this;
*aInstancePtr = (void*) (textArea);
NS_ADDREF_THIS();
return NS_OK;
}
else if (aIID.Equals(nsCOMTypeInfo<nsIWidget>::GetIID()))
else if (aIID.Equals(NS_GET_IID(nsIWidget)))
{
nsIWidget* widget = this;
*aInstancePtr = (void*) (widget);

3
mozilla/widget/src/windows/nsTextWidget.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsTextWidget.h"
@ -71,7 +72,7 @@ nsresult nsTextWidget::QueryInterface(const nsIID& aIID, void** aInstancePtr)
{
nsresult result = nsWindow::QueryInterface(aIID, aInstancePtr);
if (result == NS_NOINTERFACE && aIID.Equals(nsCOMTypeInfo<nsITextWidget>::GetIID())) {
if (result == NS_NOINTERFACE && aIID.Equals(NS_GET_IID(nsITextWidget))) {
*aInstancePtr = (void*) ((nsITextWidget*)this);
NS_ADDREF_THIS();
result = NS_OK;

11
mozilla/widget/src/windows/nsWindow.cpp
View File

@ -18,7 +18,8 @@
* Rights Reserved.
*
* Contributor(s):
* Michael Lowe <michael.lowe@bigfoot.com>
* Michael Lowe <michael.lowe@bigfoot.com>
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#if defined(DEBUG_ftang)
@ -230,7 +231,7 @@ NS_IMETHODIMP nsWindow::QueryInterface(const nsIID& aIID, void** aInstancePtr)
return NS_ERROR_NULL_POINTER;
}
if (aIID.Equals(nsIKBStateControl::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIKBStateControl))) {
*aInstancePtr = (void*) ((nsIKBStateControl*)this);
NS_ADDREF((nsBaseWidget*)this);
// NS_ADDREF_THIS();
@ -2645,7 +2646,7 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM wParam, LPARAM lParam, LRESULT
case WM_DESTROYCLIPBOARD: {
nsIClipboard* clipboard;
nsresult rv = nsServiceManager::GetService(kCClipboardCID,
nsCOMTypeInfo<nsIClipboard>::GetIID(),
NS_GET_IID(nsIClipboard),
(nsISupports **)&clipboard);
clipboard->EmptyClipboard();
nsServiceManager::ReleaseService(kCClipboardCID, clipboard);
@ -2870,12 +2871,12 @@ PRBool nsWindow::OnPaint()
if (NS_OK == nsComponentManager::CreateInstance(kRenderingContextCID,
nsnull,
nsCOMTypeInfo<nsIRenderingContext>::GetIID(),
NS_GET_IID(nsIRenderingContext),
(void **)&event.renderingContext))
{
nsIRenderingContextWin *winrc;
if (NS_OK == event.renderingContext->QueryInterface(nsCOMTypeInfo<nsIRenderingContextWin>::GetIID(), (void **)&winrc))
if (NS_OK == event.renderingContext->QueryInterface(NS_GET_IID(nsIRenderingContextWin), (void **)&winrc))
{
nsDrawingSurface surf;

3
mozilla/widget/src/xlib/nsClipboard.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsClipboard.h"
@ -99,7 +100,7 @@ nsresult nsClipboard::QueryInterface(const nsIID& aIID, void** aInstancePtr)
nsresult rv = NS_NOINTERFACE;
if (aIID.Equals(nsIClipboard::GetIID())) {
if (aIID.Equals(NS_GET_IID(nsIClipboard))) {
*aInstancePtr = (void*) ((nsIClipboard*)this);
NS_ADDREF_THIS();
return NS_OK;

3
mozilla/widget/src/xlib/window_service/nsXlibWindowService.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsXlibWindowService.h"
@ -33,7 +34,7 @@ nsXlibWindowService::~nsXlibWindowService()
NS_IMPL_ADDREF(nsXlibWindowService)
NS_IMPL_RELEASE(nsXlibWindowService)
NS_IMPL_QUERY_INTERFACE(nsXlibWindowService, nsCOMTypeInfo<nsIXlibWindowService>::GetIID())
NS_IMPL_QUERY_INTERFACE(nsXlibWindowService, NS_GET_IID(nsIXlibWindowService))
nsXlibWindowCallback nsXlibWindowService::gsWindowCreateCallback = nsnull;
nsXlibWindowCallback nsXlibWindowService::gsWindowDestroyCallback = nsnull;

5
mozilla/widget/src/xlib/window_service/nsXlibWindowServiceFactory.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsIXlibWindowService.h"
@ -59,7 +60,7 @@ nsXlibWindowServiceFactory::~nsXlibWindowServiceFactory()
{
}
NS_IMPL_ISUPPORTS(nsXlibWindowServiceFactory, nsIFactory::GetIID())
NS_IMPL_ISUPPORTS(nsXlibWindowServiceFactory, NS_GET_IID(nsIFactory))
NS_IMETHODIMP
nsXlibWindowServiceFactory::CreateInstance(nsISupports *aOuter,
@ -107,7 +108,7 @@ NSGetFactory(nsISupports *servMgr,
if (nsnull == aFactory) {
return NS_ERROR_OUT_OF_MEMORY;
}
return (*aFactory)->QueryInterface(nsIFactory::GetIID(),
return (*aFactory)->QueryInterface(NS_GET_IID(nsIFactory),
(void **)aFactory);
}

9
mozilla/widget/src/xpwidgets/nsFileSpecWithUIImpl.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsFileSpecWithUIImpl.h"
@ -92,7 +93,7 @@ nsFileSpecWithUIImpl::nsFileSpecWithUIImpl()
nsresult rv = nsComponentManager::CreateInstance(
(const char*)NS_FILESPEC_PROGID,
(nsISupports*)nsnull,
(const nsID&)nsCOMTypeInfo<nsIFileSpec>::GetIID(),
(const nsID&)NS_GET_IID(nsIFileSpec),
(void**)getter_AddRefs(mBaseFileSpec));
NS_ASSERTION(NS_SUCCEEDED(rv), "ERROR: Could not make a file spec.");
}
@ -118,7 +119,7 @@ NS_IMETHODIMP nsFileSpecWithUIImpl::ChooseOutputFile(
nsresult rv = nsComponentManager::CreateInstance(
kCFileWidgetCID,
nsnull,
nsCOMTypeInfo<nsIFileWidget>::GetIID(),
NS_GET_IID(nsIFileWidget),
(void**)getter_AddRefs(fileWidget));
if (NS_FAILED(rv))
return rv;
@ -252,7 +253,7 @@ NS_IMETHODIMP nsFileSpecWithUIImpl::ChooseInputFile(
nsCOMPtr<nsIFileWidget> fileWidget;
rv = nsComponentManager::CreateInstance(kCFileWidgetCID,
nsnull,
nsCOMTypeInfo<nsIFileWidget>::GetIID(),
NS_GET_IID(nsIFileWidget),
(void**)getter_AddRefs(fileWidget));
if (NS_FAILED(rv))
return rv;
@ -279,7 +280,7 @@ NS_IMETHODIMP nsFileSpecWithUIImpl::ChooseDirectory(const char *title, char **_r
nsresult rv = nsComponentManager::CreateInstance(
kCFileWidgetCID,
nsnull,
nsCOMTypeInfo<nsIFileWidget>::GetIID(),
NS_GET_IID(nsIFileWidget),
(void**)getter_AddRefs(fileWidget));
if (NS_FAILED(rv))
return rv;

3
mozilla/widget/src/xpwidgets/nsXIFFormatConverter.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsString.h"
@ -391,7 +392,7 @@ nsXIFFormatConverter::ConvertFromXIFToHTML(const nsAutoString & aFromStr, nsAuto
nsCOMPtr<nsIParser> parser;
nsresult rv = nsComponentManager::CreateInstance(kCParserCID,
nsnull,
nsIParser::GetIID(),
NS_GET_IID(nsIParser),
getter_AddRefs(parser));
if ( !parser )
return rv;

5
mozilla/widget/timer/src/mac/nsTimer.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
//
@ -148,7 +149,7 @@ class TimerPeriodical : public Repeater
// TimerImpl implementation
//========================================================================================
NS_IMPL_ISUPPORTS(TimerImpl, nsITimer::GetIID())
NS_IMPL_ISUPPORTS(TimerImpl, NS_GET_IID(nsITimer))
//----------------------------------------------------------------------------------------
TimerImpl::TimerImpl()
@ -374,5 +375,5 @@ PR_PUBLIC_API(nsresult) NS_NewTimer(nsITimer** aInstancePtrResult)
return NS_ERROR_OUT_OF_MEMORY;
}
return timer->QueryInterface(nsITimer::GetIID(), (void **) aInstancePtrResult);
return timer->QueryInterface(NS_GET_IID(nsITimer), (void **) aInstancePtrResult);
}

6
mozilla/widget/timer/src/os2/nsTimerOS2.cpp
View File

@ -16,7 +16,7 @@
* Copyright (C) 1999 John Fairhurst. All Rights Reserved.
*
* Contributor(s):
*
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#define INCL_DOS
@ -62,7 +62,7 @@ static TID QueryCurrentTID();
// Timer object (funky 'release' method for recycler)
NS_IMPL_ADDREF(nsTimer)
NS_IMPL_QUERY_INTERFACE(nsTimer, nsITimer::GetIID())
NS_IMPL_QUERY_INTERFACE(nsTimer, NS_GET_IID(nsITimer))
nsrefcnt nsTimer::Release()
{
@ -591,7 +591,7 @@ nsresult NS_NewTimer( nsITimer **aInstance)
if( !timer)
return NS_ERROR_OUT_OF_MEMORY;
return timer->QueryInterface( nsITimer::GetIID(), (void **) aInstance);
return timer->QueryInterface( NS_GET_IID(nsITimer), (void **) aInstance);
}
TID QueryCurrentTID()

3
mozilla/widget/timer/src/unix/motif/nsTimerMotif.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsTimerMotif.h"
@ -150,7 +151,7 @@ nsTimerMotif::EnsureAppContext()
rv = nsComponentManager::CreateInstance(kCMotifAppContextServiceCID,
nsnull,
nsIMotifAppContextService::GetIID(),
NS_GET_IID(nsIMotifAppContextService),
(void **)& ac_service);
NS_ASSERTION(rv == NS_OK,"Cannot obtain app context service.");

5
mozilla/widget/timer/src/unix/motif/nsTimerMotifFactory.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
@ -62,7 +63,7 @@ nsTimerMotifFactory::~nsTimerMotifFactory()
{
}
NS_IMPL_ISUPPORTS(nsTimerMotifFactory, nsIFactory::GetIID())
NS_IMPL_ISUPPORTS(nsTimerMotifFactory, NS_GET_IID(nsIFactory))
NS_IMETHODIMP
@ -116,7 +117,7 @@ NSGetFactory(nsISupports* servMgr,
return NS_ERROR_OUT_OF_MEMORY;
}
return (*aFactory)->QueryInterface(nsIFactory::GetIID(), (void**)aFactory);
return (*aFactory)->QueryInterface(NS_GET_IID(nsIFactory), (void**)aFactory);
}

3
mozilla/widget/timer/src/unix/nsNewTimer.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#include "nsITimer.h"
#include "nsUnixTimerCIID.h"
@ -135,7 +136,7 @@ GetTimerCID()
nsresult rv =
nsComponentManager::CreateInstance(kCUnixToolkitServiceCID,
nsnull,
nsIUnixToolkitService::GetIID(),
NS_GET_IID(nsIUnixToolkitService),
(void **) &unixToolkitService);
NS_ASSERTION(rv == NS_OK,"Cannot obtain unix toolkit service.");

5
mozilla/widget/timer/src/unix/qt/nsTimerQtFactory.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
@ -62,7 +63,7 @@ nsTimerQtFactory::~nsTimerQtFactory()
{
}
NS_IMPL_ISUPPORTS(nsTimerQtFactory, nsIFactory::GetIID())
NS_IMPL_ISUPPORTS(nsTimerQtFactory, NS_GET_IID(nsIFactory))
NS_IMETHODIMP
@ -116,7 +117,7 @@ NSGetFactory(nsISupports* servMgr,
return NS_ERROR_OUT_OF_MEMORY;
}
return (*aFactory)->QueryInterface(nsIFactory::GetIID(), (void**)aFactory);
return (*aFactory)->QueryInterface(NS_GET_IID(nsIFactory), (void**)aFactory);
}

5
mozilla/widget/timer/src/unix/xlib/nsTimerXlibFactory.cpp
View File

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
@ -62,7 +63,7 @@ nsTimerXlibFactory::~nsTimerXlibFactory()
{
}
NS_IMPL_ISUPPORTS(nsTimerXlibFactory, nsIFactory::GetIID())
NS_IMPL_ISUPPORTS(nsTimerXlibFactory, NS_GET_IID(nsIFactory))
NS_IMETHODIMP
@ -116,7 +117,7 @@ NSGetFactory(nsISupports* servMgr,
return NS_ERROR_OUT_OF_MEMORY;
}
return (*aFactory)->QueryInterface(nsIFactory::GetIID(), (void**)aFactory);
return (*aFactory)->QueryInterface(NS_GET_IID(nsIFactory), (void**)aFactory);
}