diff --git a/mailnews/absync/src/nsAbSyncPostEngine.cpp b/mailnews/absync/src/nsAbSyncPostEngine.cpp index 06b7c59dd07a..c179a9dc4fb9 100644 --- a/mailnews/absync/src/nsAbSyncPostEngine.cpp +++ b/mailnews/absync/src/nsAbSyncPostEngine.cpp @@ -49,8 +49,8 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); -static NS_DEFINE_IID(kCookieServiceCID, NS_COOKIESERVICE_CID); -static NS_DEFINE_IID(kCAbSyncMojoCID, NS_AB_SYNC_MOJO_CID); +static NS_DEFINE_CID(kCookieServiceCID, NS_COOKIESERVICE_CID); +static NS_DEFINE_CID(kCAbSyncMojoCID, NS_AB_SYNC_MOJO_CID); static NS_DEFINE_CID(kAbSync, NS_ABSYNC_SERVICE_CID); /* diff --git a/mailnews/addrbook/src/nsAddrDatabase.cpp b/mailnews/addrbook/src/nsAddrDatabase.cpp index e3defc01fa95..e3b5a024a908 100644 --- a/mailnews/addrbook/src/nsAddrDatabase.cpp +++ b/mailnews/addrbook/src/nsAddrDatabase.cpp @@ -58,9 +58,8 @@ static NS_DEFINE_CID(kCMorkFactory, NS_MORK_CID); static NS_DEFINE_CID(kAddrBookSessionCID, NS_ADDRBOOKSESSION_CID); static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID); static NS_DEFINE_CID(kCollationFactoryCID, NS_COLLATIONFACTORY_CID); -static NS_DEFINE_IID(kICollationFactoryIID, NS_ICOLLATIONFACTORY_IID); static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); -static NS_DEFINE_IID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); +static NS_DEFINE_CID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); /* The definition is nsAddressBook.cpp */ extern const char *kCardDataSourceRoot; @@ -3939,7 +3938,7 @@ nsresult nsAddrDatabase::GetCollationKeyGenerator() nsCOMPtr factory; rv = nsComponentManager::CreateInstance(kCollationFactoryCID, NULL, - kICollationFactoryIID, getter_AddRefs(factory)); + NS_GET_IID(nsICollationFactory), getter_AddRefs(factory)); if (NS_SUCCEEDED(rv) && factory) { rv = factory->CreateCollation(locale, getter_AddRefs(m_collationKeyGenerator)); diff --git a/mailnews/addrbook/src/nsAddressBook.cpp b/mailnews/addrbook/src/nsAddressBook.cpp index ab74a6a1c1e9..17b935b6bb31 100644 --- a/mailnews/addrbook/src/nsAddressBook.cpp +++ b/mailnews/addrbook/src/nsAddressBook.cpp @@ -56,7 +56,7 @@ static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); -static NS_DEFINE_IID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID); +static NS_DEFINE_CID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID); static NS_DEFINE_CID(kAddressBookDBCID, NS_ADDRDATABASE_CID); static NS_DEFINE_CID(kAddrBookSessionCID, NS_ADDRBOOKSESSION_CID); static NS_DEFINE_CID(kAbDirectoryCID, NS_ABDIRECTORY_CID); diff --git a/mailnews/base/src/nsMessenger.cpp b/mailnews/base/src/nsMessenger.cpp index 485c8153285d..31b91fcee798 100644 --- a/mailnews/base/src/nsMessenger.cpp +++ b/mailnews/base/src/nsMessenger.cpp @@ -115,6 +115,7 @@ static NS_DEFINE_CID(kMsgCopyServiceCID, NS_MSGCOPYSERVICE_CID); static NS_DEFINE_CID(kMsgPrintEngineCID, NS_MSG_PRINTENGINE_CID); static NS_DEFINE_CID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID); + /* This is the next generation string retrieval call */ static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); @@ -133,6 +134,8 @@ static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); #include "nsIContentSink.h" #include "nsIHTMLToTextSink.h" +static NS_DEFINE_CID(kCParserCID, NS_PARSER_IID); + static nsresult ConvertBufToPlainText(nsString &aConBuf) { @@ -143,11 +146,8 @@ ConvertBufToPlainText(nsString &aConBuf) if (aConBuf.IsEmpty()) return NS_OK; - static NS_DEFINE_IID(kCParserIID, NS_IPARSER_IID); - static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID); - rv = nsComponentManager::CreateInstance(kCParserCID, nsnull, - kCParserIID, getter_AddRefs(parser)); + NS_GET_IID(nsIParser), getter_AddRefs(parser)); if (NS_SUCCEEDED(rv) && parser) { nsCOMPtr sink; diff --git a/mailnews/base/src/nsStatusBarBiffManager.cpp b/mailnews/base/src/nsStatusBarBiffManager.cpp index af725c7ba3e3..1342b1089934 100644 --- a/mailnews/base/src/nsStatusBarBiffManager.cpp +++ b/mailnews/base/src/nsStatusBarBiffManager.cpp @@ -37,7 +37,6 @@ #include "nsIMsgFolder.h" // TO include biffState enum. Change to bool later... static NS_DEFINE_CID(kMsgAccountManagerCID, NS_MSGACCOUNTMANAGER_CID); -static NS_DEFINE_IID(kIWindowMediatorIID, NS_IWINDOWMEDIATOR_IID); static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID); static NS_DEFINE_CID(kMsgMailSessionCID, NS_MSGMAILSESSION_CID); diff --git a/mailnews/base/util/nsMsgTxn.cpp b/mailnews/base/util/nsMsgTxn.cpp index a06253f4b144..08b128d196e2 100644 --- a/mailnews/base/util/nsMsgTxn.cpp +++ b/mailnews/base/util/nsMsgTxn.cpp @@ -22,7 +22,6 @@ #include "nsMsgTxn.h" static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kITransactionIID, NS_ITRANSACTION_IID); NS_IMPL_THREADSAFE_ADDREF(nsMsgTxn) NS_IMPL_THREADSAFE_RELEASE(nsMsgTxn) diff --git a/mailnews/compose/src/nsMsgCompUtils.cpp b/mailnews/compose/src/nsMsgCompUtils.cpp index 96aab1f0c13f..1627a97a5a07 100644 --- a/mailnews/compose/src/nsMsgCompUtils.cpp +++ b/mailnews/compose/src/nsMsgCompUtils.cpp @@ -1960,6 +1960,8 @@ ERROR_OUT: #include "nsIContentSink.h" #include "nsICharsetConverterManager.h" +static NS_DEFINE_CID(kCParserCID, NS_PARSER_IID); + /** * Converts a buffer to plain text. Some conversions may * or may not work with certain end charsets which is why we @@ -1976,11 +1978,8 @@ ConvertBufToPlainText(nsString &aConBuf, PRBool formatflowed /* = PR_FALSE */) if (aConBuf.IsEmpty()) return NS_OK; - static NS_DEFINE_IID(kCParserIID, NS_IPARSER_IID); - static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID); - rv = nsComponentManager::CreateInstance(kCParserCID, nsnull, - kCParserIID, getter_AddRefs(parser)); + NS_GET_IID(nsIParser), getter_AddRefs(parser)); if (NS_SUCCEEDED(rv) && parser) { PRUint32 converterFlags = 0; diff --git a/mailnews/compose/src/nsMsgSendLater.cpp b/mailnews/compose/src/nsMsgSendLater.cpp index 10f5138605cc..6e2d6ba2fcaf 100644 --- a/mailnews/compose/src/nsMsgSendLater.cpp +++ b/mailnews/compose/src/nsMsgSendLater.cpp @@ -57,7 +57,6 @@ static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); static NS_DEFINE_CID(kCMsgMailSessionCID, NS_MSGMAILSESSION_CID); static NS_DEFINE_CID(kSmtpServiceCID, NS_SMTPSERVICE_CID); -static NS_DEFINE_IID(kIMsgSendLater, NS_IMSGSENDLATER_IID); static NS_DEFINE_CID(kMsgCompFieldsCID, NS_MSGCOMPFIELDS_CID); static NS_DEFINE_CID(kMsgSendCID, NS_MSGSEND_CID); static NS_DEFINE_CID(kISupportsArrayCID, NS_SUPPORTSARRAY_CID); @@ -74,7 +73,7 @@ nsresult NS_NewMsgSendLater(const nsIID &aIID, void ** aInstancePtrResult) { nsMsgSendLater *pSendLater = new nsMsgSendLater(); if (pSendLater) - return pSendLater->QueryInterface(kIMsgSendLater, aInstancePtrResult); + return pSendLater->QueryInterface(NS_GET_IID(nsIMsgSendLater), aInstancePtrResult); else return NS_ERROR_OUT_OF_MEMORY; /* we couldn't allocate the object */ } diff --git a/mailnews/compose/tests/compose/test.cpp b/mailnews/compose/tests/compose/test.cpp index 55fb37d6e7da..4c0766ce53d3 100644 --- a/mailnews/compose/tests/compose/test.cpp +++ b/mailnews/compose/tests/compose/test.cpp @@ -101,7 +101,7 @@ static NS_DEFINE_CID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID); static NS_DEFINE_CID(kGenericFactoryCID, NS_GENERICFACTORY_CID); static NS_DEFINE_CID(kMemoryCID, NS_MEMORY_CID); static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); -static NS_DEFINE_IID(kICharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_IID); +static NS_DEFINE_CID(kICharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_IID); static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); PRBool keepOnRunning = PR_TRUE; diff --git a/mailnews/compose/tests/compose2/test2.cpp b/mailnews/compose/tests/compose2/test2.cpp index 590d9931919e..dcc1edbfb9a6 100644 --- a/mailnews/compose/tests/compose2/test2.cpp +++ b/mailnews/compose/tests/compose2/test2.cpp @@ -86,9 +86,7 @@ static NS_DEFINE_CID(kSmtpServiceCID, NS_SMTPSERVICE_CID); static NS_DEFINE_CID(kFileLocatorCID, NS_FILELOCATOR_CID); static NS_DEFINE_CID(kEventQueueCID, NS_EVENTQUEUE_CID); static NS_DEFINE_CID(kMsgComposeCID, NS_MSGCOMPOSE_CID); -static NS_DEFINE_IID(kIMsgCompFieldsIID, NS_IMSGCOMPFIELDS_IID); static NS_DEFINE_CID(kMsgCompFieldsCID, NS_MSGCOMPFIELDS_CID); -static NS_DEFINE_IID(kIMsgSendIID, NS_IMSGSEND_IID); static NS_DEFINE_CID(kMsgSendCID, NS_MSGSEND_CID); static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); @@ -411,11 +409,11 @@ int main(int argc, char *argv[]) if (!mailIFile) return NS_ERROR_FAILURE; - rv = nsComponentManager::CreateInstance(kMsgSendCID, NULL, kIMsgSendIID, (void **) &pMsgSend); + rv = nsComponentManager::CreateInstance(kMsgSendCID, NULL, NS_GET_IID(nsIMsgSend), (void **) &pMsgSend); if (NS_SUCCEEDED(rv) && pMsgSend) { printf("We succesfully obtained a nsIMsgSend interface....\n"); - rv = nsComponentManager::CreateInstance(kMsgCompFieldsCID, NULL, kIMsgCompFieldsIID, + rv = nsComponentManager::CreateInstance(kMsgCompFieldsCID, NULL, NS_GET_IID(nsIMsgCompFields), (void **) &pMsgCompFields); if (NS_SUCCEEDED(rv) && pMsgCompFields) { diff --git a/mailnews/compose/tests/geturl/geturl.cpp b/mailnews/compose/tests/geturl/geturl.cpp index 84ef5d6b70f2..c836dfdd9869 100644 --- a/mailnews/compose/tests/geturl/geturl.cpp +++ b/mailnews/compose/tests/geturl/geturl.cpp @@ -88,7 +88,6 @@ static NS_DEFINE_CID(kGenericFactoryCID, NS_GENERICFACTORY_CID); // netlib definitions.... static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); -static NS_DEFINE_IID(kICharsetConverterManagerIID, NS_ICHARSETCONVERTERMANAGER_IID); nsICharsetConverterManager *ccMan = nsnull; diff --git a/mailnews/compose/tests/sendlater/test.cpp b/mailnews/compose/tests/sendlater/test.cpp index a763aa915172..0e8ac7ad0481 100644 --- a/mailnews/compose/tests/sendlater/test.cpp +++ b/mailnews/compose/tests/sendlater/test.cpp @@ -81,7 +81,6 @@ static NS_DEFINE_CID(kFileLocatorCID, NS_FILELOCATOR_CID); static NS_DEFINE_CID(kEventQueueCID, NS_EVENTQUEUE_CID); static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); static NS_DEFINE_CID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID); -static NS_DEFINE_IID(kIMsgSendLaterIID, NS_IMSGSENDLATER_IID); static NS_DEFINE_CID(kMsgSendLaterCID, NS_MSGSENDLATER_CID); @@ -153,7 +152,7 @@ int main(int argc, char *argv[]) } nsCOMPtr pMsgSendLater; - rv = nsComponentManager::CreateInstance(kMsgSendLaterCID, NULL, kIMsgSendLaterIID, + rv = nsComponentManager::CreateInstance(kMsgSendLaterCID, NULL, NS_GET_IID(nsIMsgSendLater), (void **) getter_AddRefs(pMsgSendLater)); if (NS_SUCCEEDED(rv) && pMsgSendLater) { diff --git a/mailnews/compose/tests/smtp/smtpTest.cpp b/mailnews/compose/tests/smtp/smtpTest.cpp index d4767371965e..ac38e76680ad 100644 --- a/mailnews/compose/tests/smtp/smtpTest.cpp +++ b/mailnews/compose/tests/smtp/smtpTest.cpp @@ -76,8 +76,8 @@ static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_CID(kSmtpServiceCID, NS_SMTPSERVICE_CID); static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); -static NS_DEFINE_IID(kFileLocatorCID, NS_FILELOCATOR_CID); -static NS_DEFINE_IID(kEventQueueCID, NS_EVENTQUEUE_CID); +static NS_DEFINE_CID(kFileLocatorCID, NS_FILELOCATOR_CID); +static NS_DEFINE_CID(kEventQueueCID, NS_EVENTQUEUE_CID); ///////////////////////////////////////////////////////////////////////////////// // Define default values to be used to drive the test diff --git a/mailnews/db/msgdb/src/nsMsgDatabase.cpp b/mailnews/db/msgdb/src/nsMsgDatabase.cpp index 68fa525ea5d8..b836b57f1131 100644 --- a/mailnews/db/msgdb/src/nsMsgDatabase.cpp +++ b/mailnews/db/msgdb/src/nsMsgDatabase.cpp @@ -70,12 +70,9 @@ static NS_DEFINE_CID(kCMorkFactory, NS_MORK_CID); #include #endif /* ENABLE_TESTING_HACK */ -static NS_DEFINE_IID(kIPrefIID, NS_IPREF_IID); static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID); static NS_DEFINE_CID(kCollationFactoryCID, NS_COLLATIONFACTORY_CID); -static NS_DEFINE_IID(kICollationIID, NS_ICOLLATION_IID); -static NS_DEFINE_IID(kICollationFactoryIID, NS_ICOLLATIONFACTORY_IID); static NS_DEFINE_CID(kMsgHeaderParserCID, NS_MSGHEADERPARSER_CID); #define MSG_HASH_SIZE 512 @@ -2627,7 +2624,7 @@ nsresult nsMsgDatabase::GetCollationKeyGenerator() nsCOMPtr f; err = nsComponentManager::CreateInstance(kCollationFactoryCID, NULL, - kICollationFactoryIID, getter_AddRefs(f)); + NS_GET_IID(nsICollationFactory), getter_AddRefs(f)); if (NS_SUCCEEDED(err) && f) { // get a collation interface instance diff --git a/mailnews/imap/src/nsImapProxyEvent.cpp b/mailnews/imap/src/nsImapProxyEvent.cpp index 656f9a2dc8be..28814d892ef1 100644 --- a/mailnews/imap/src/nsImapProxyEvent.cpp +++ b/mailnews/imap/src/nsImapProxyEvent.cpp @@ -122,8 +122,7 @@ nsImapExtensionSinkProxy::~nsImapExtensionSinkProxy() NS_IF_RELEASE (m_realImapExtensionSink); } -static NS_DEFINE_IID(kIImapExtensionSinkIID, NS_IIMAPEXTENSIONSINK_IID); -NS_IMPL_THREADSAFE_ISUPPORTS(nsImapExtensionSinkProxy, kIImapExtensionSinkIID); +NS_IMPL_THREADSAFE_ISUPPORTS(nsImapExtensionSinkProxy, NS_GET_IID(nsIImapExtensionSink)); NS_IMETHODIMP nsImapExtensionSinkProxy::ClearFolderRights(nsIImapProtocol* aProtocol, @@ -353,8 +352,7 @@ nsImapMiscellaneousSinkProxy::~nsImapMiscellaneousSinkProxy() NS_IF_RELEASE (m_realImapMiscellaneousSink); } -static NS_DEFINE_IID(kIImapMiscellaneousSinkIID, NS_IIMAPMISCELLANEOUSSINK_IID); -NS_IMPL_THREADSAFE_ISUPPORTS(nsImapMiscellaneousSinkProxy, kIImapMiscellaneousSinkIID); +NS_IMPL_THREADSAFE_ISUPPORTS(nsImapMiscellaneousSinkProxy, NS_GET_IID(nsIImapMiscellaneousSink)); NS_IMETHODIMP nsImapMiscellaneousSinkProxy::GetArbitraryHeaders(nsIImapProtocol* aProtocol, diff --git a/mailnews/imap/tests/harness/imapProtocolTest.cpp b/mailnews/imap/tests/harness/imapProtocolTest.cpp index 76db32d02528..ffd1dc60e18f 100644 --- a/mailnews/imap/tests/harness/imapProtocolTest.cpp +++ b/mailnews/imap/tests/harness/imapProtocolTest.cpp @@ -113,11 +113,11 @@ static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_IID(kEventQueueCID, NS_EVENTQUEUE_CID); +static NS_DEFINE_CID(kEventQueueCID, NS_EVENTQUEUE_CID); static NS_DEFINE_CID(kImapUrlCID, NS_IMAPURL_CID); static NS_DEFINE_CID(kImapProtocolCID, NS_IMAPPROTOCOL_CID); static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); -static NS_DEFINE_IID(kFileLocatorCID, NS_FILELOCATOR_CID); +static NS_DEFINE_CID(kFileLocatorCID, NS_FILELOCATOR_CID); static NS_DEFINE_CID(kCImapService, NS_IMAPSERVICE_CID); static NS_DEFINE_CID(kCImapDB, NS_IMAPDB_CID); diff --git a/mailnews/import/eudora/src/nsEudoraCompose.cpp b/mailnews/import/eudora/src/nsEudoraCompose.cpp index 7b9192fe0739..514e2aa4e0ac 100644 --- a/mailnews/import/eudora/src/nsEudoraCompose.cpp +++ b/mailnews/import/eudora/src/nsEudoraCompose.cpp @@ -50,7 +50,7 @@ static NS_DEFINE_CID( kMsgCompFieldsCID, NS_MSGCOMPFIELDS_CID); static NS_DEFINE_CID( kMsgMailSessionCID, NS_MSGMAILSESSION_CID); static NS_DEFINE_CID( kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_CID( kMsgAccountMgrCID, NS_MSGACCOUNTMANAGER_CID); -static NS_DEFINE_IID( kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); +static NS_DEFINE_CID( kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); static NS_DEFINE_CID( kImportServiceCID, NS_IMPORTSERVICE_CID); diff --git a/mailnews/import/eudora/src/nsEudoraStringBundle.cpp b/mailnews/import/eudora/src/nsEudoraStringBundle.cpp index 368daa5593be..282f90f72f57 100644 --- a/mailnews/import/eudora/src/nsEudoraStringBundle.cpp +++ b/mailnews/import/eudora/src/nsEudoraStringBundle.cpp @@ -27,7 +27,7 @@ /* This is the next generation string retrieval call */ static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); -static NS_DEFINE_IID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); +static NS_DEFINE_CID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); #define EUDORA_MSGS_URL "chrome://messenger/locale/eudoraImportMsgs.properties" diff --git a/mailnews/import/oexpress/nsOEStringBundle.cpp b/mailnews/import/oexpress/nsOEStringBundle.cpp index 3fb1c46b69d2..c878a4d86491 100644 --- a/mailnews/import/oexpress/nsOEStringBundle.cpp +++ b/mailnews/import/oexpress/nsOEStringBundle.cpp @@ -30,7 +30,7 @@ /* This is the next generation string retrieval call */ static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); -static NS_DEFINE_IID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); +static NS_DEFINE_CID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); #define OE_MSGS_URL "chrome://messenger/locale/oeImportMsgs.properties" diff --git a/mailnews/import/outlook/src/nsOutlookCompose.cpp b/mailnews/import/outlook/src/nsOutlookCompose.cpp index c739ed4fa330..d46a46770f12 100644 --- a/mailnews/import/outlook/src/nsOutlookCompose.cpp +++ b/mailnews/import/outlook/src/nsOutlookCompose.cpp @@ -49,7 +49,7 @@ static NS_DEFINE_CID( kMsgCompFieldsCID, NS_MSGCOMPFIELDS_CID); static NS_DEFINE_CID( kMsgMailSessionCID, NS_MSGMAILSESSION_CID); static NS_DEFINE_CID( kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_CID( kMsgAccountMgrCID, NS_MSGACCOUNTMANAGER_CID); -static NS_DEFINE_IID( kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); +static NS_DEFINE_CID( kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); // We need to do some calculations to set these numbers to something reasonable! diff --git a/mailnews/import/outlook/src/nsOutlookStringBundle.cpp b/mailnews/import/outlook/src/nsOutlookStringBundle.cpp index 45e4e787ca91..39cab8581104 100644 --- a/mailnews/import/outlook/src/nsOutlookStringBundle.cpp +++ b/mailnews/import/outlook/src/nsOutlookStringBundle.cpp @@ -30,7 +30,7 @@ /* This is the next generation string retrieval call */ static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); -static NS_DEFINE_IID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); +static NS_DEFINE_CID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); #define OUTLOOK_MSGS_URL "chrome://messenger/locale/outlookImportMsgs.properties" diff --git a/mailnews/import/src/nsImportAddressBooks.cpp b/mailnews/import/src/nsImportAddressBooks.cpp index 17d5bc60007d..354deb38cfed 100644 --- a/mailnews/import/src/nsImportAddressBooks.cpp +++ b/mailnews/import/src/nsImportAddressBooks.cpp @@ -57,13 +57,10 @@ static NS_DEFINE_CID(kAddressBookDBCID, NS_ADDRDATABASE_CID); static NS_DEFINE_CID(kProfileCID, NS_PROFILE_CID); static NS_DEFINE_CID(kAbDirectoryCID, NS_ABDIRECTORY_CID); static NS_DEFINE_CID(kStandardUrlCID, NS_STANDARDURL_CID); -static NS_DEFINE_IID(kIStandardUrlIID, NS_IURL_IID); static NS_DEFINE_CID(kAddrBookSessionCID, NS_ADDRBOOKSESSION_CID); static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); -static NS_DEFINE_IID(kIImportFieldMapIID, NS_IIMPORTFIELDMAP_IID); static NS_DEFINE_CID(kSupportsWStringCID, NS_SUPPORTS_WSTRING_CID); -static NS_DEFINE_IID(kISupportsWStringIID, NS_ISUPPORTSWSTRING_IID); -static NS_DEFINE_IID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); +static NS_DEFINE_CID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); static const char *kDirectoryDataSourceRoot = "abdirectory://"; @@ -255,7 +252,7 @@ NS_IMETHODIMP nsImportGenericAddressBooks::GetData(const char *dataId, nsISuppor if (!nsCRT::strcasecmp( dataId, "addressDestination")) { if (m_pDestinationUri) { nsCOMPtr url; - rv = nsComponentManager::CreateInstance( kStandardUrlCID, nsnull, kIStandardUrlIID, getter_AddRefs( url)); + rv = nsComponentManager::CreateInstance( kStandardUrlCID, nsnull, NS_GET_IID(nsIURL), getter_AddRefs( url)); if (NS_SUCCEEDED( rv)) { url->SetSpec( m_pDestinationUri); *_retval = url; @@ -296,7 +293,7 @@ NS_IMETHODIMP nsImportGenericAddressBooks::GetData(const char *dataId, nsISuppor IMPORT_LOG1( "Requesting sample data #: %ld\n", (long)rNum); if (m_pInterface) { nsCOMPtr data; - rv = nsComponentManager::CreateInstance( kSupportsWStringCID, nsnull, kISupportsWStringIID, getter_AddRefs( data)); + rv = nsComponentManager::CreateInstance( kSupportsWStringCID, nsnull, NS_GET_IID(nsISupportsWString), getter_AddRefs( data)); if (NS_FAILED( rv)) return( rv); PRUnichar * pData = nsnull; @@ -345,7 +342,7 @@ NS_IMETHODIMP nsImportGenericAddressBooks::SetData( const char *dataId, nsISuppo if (!nsCRT::strcasecmp( dataId, "addressDestination")) { if (item) { nsCOMPtr url; - item->QueryInterface( kIStandardUrlIID, getter_AddRefs( url)); + item->QueryInterface( NS_GET_IID(nsIURL), getter_AddRefs( url)); if (url) { if (m_pDestinationUri) nsCRT::free( m_pDestinationUri); diff --git a/mailnews/import/src/nsImportMail.cpp b/mailnews/import/src/nsImportMail.cpp index cb5949ee57a9..94db4bcb5e4e 100644 --- a/mailnews/import/src/nsImportMail.cpp +++ b/mailnews/import/src/nsImportMail.cpp @@ -55,10 +55,9 @@ static NS_DEFINE_CID(kMsgAccountCID, NS_MSGACCOUNT_CID); static NS_DEFINE_CID(kMsgIdentityCID, NS_MSGIDENTITY_CID); static NS_DEFINE_CID(kMsgBiffManagerCID, NS_MSGBIFFMANAGER_CID); static NS_DEFINE_CID(kProfileCID, NS_PROFILE_CID); -static NS_DEFINE_IID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); +static NS_DEFINE_CID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); static NS_DEFINE_CID(kMsgAccountMgrCID, NS_MSGACCOUNTMANAGER_CID); static NS_DEFINE_CID(kSupportsWStringCID, NS_SUPPORTS_WSTRING_CID); -static NS_DEFINE_IID(kISupportsWStringIID, NS_ISUPPORTSWSTRING_IID); //////////////////////////////////////////////////////////////////////// @@ -257,7 +256,7 @@ NS_IMETHODIMP nsImportGenericMail::GetData(const char *dataId, nsISupports **_re // create an nsISupportsWString, get the current mailbox // name being imported and put it in the string nsCOMPtr data; - rv = nsComponentManager::CreateInstance( kSupportsWStringCID, nsnull, kISupportsWStringIID, getter_AddRefs( data)); + rv = nsComponentManager::CreateInstance( kSupportsWStringCID, nsnull, NS_GET_IID(nsISupportsWString), getter_AddRefs( data)); if (NS_FAILED( rv)) return( rv); if (m_pThreadData) { diff --git a/mailnews/import/src/nsImportService.cpp b/mailnews/import/src/nsImportService.cpp index ca2865cf958c..3ab69faa4f82 100644 --- a/mailnews/import/src/nsImportService.cpp +++ b/mailnews/import/src/nsImportService.cpp @@ -51,7 +51,6 @@ static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID); static NS_DEFINE_CID(kImportServiceCID, NS_IMPORTSERVICE_CID); -static NS_DEFINE_IID(kImportModuleIID, NS_IIMPORTMODULE_IID); static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); @@ -582,7 +581,7 @@ nsresult nsImportService::LoadModuleInfo( const char *pClsId, const char *pSuppo nsCID clsId; clsId.Parse( pClsId); nsIImportModule * module; - rv = compMgr->CreateInstance( clsId, nsnull, kImportModuleIID, (void **) &module); + rv = compMgr->CreateInstance( clsId, nsnull, NS_GET_IID(nsIImportModule), (void **) &module); if (NS_FAILED(rv)) return rv; nsString theTitle; @@ -624,7 +623,7 @@ nsIImportModule *ImportModuleDesc::GetModule( PRBool keepLoaded) NS_WITH_SERVICE( nsIComponentManager, compMgr, kComponentManagerCID, &rv); if (NS_FAILED(rv)) return nsnull; - rv = compMgr->CreateInstance( m_cid, nsnull, kImportModuleIID, (void **) &m_pModule); + rv = compMgr->CreateInstance( m_cid, nsnull, NS_GET_IID(nsIImportModule), (void **) &m_pModule); if (NS_FAILED(rv)) { m_pModule = nsnull; return nsnull; diff --git a/mailnews/import/src/nsImportStringBundle.cpp b/mailnews/import/src/nsImportStringBundle.cpp index 41402b0803ec..9a7276283b2c 100644 --- a/mailnews/import/src/nsImportStringBundle.cpp +++ b/mailnews/import/src/nsImportStringBundle.cpp @@ -30,7 +30,7 @@ /* This is the next generation string retrieval call */ static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); -static NS_DEFINE_IID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); +static NS_DEFINE_CID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); #define IMPORT_MSGS_URL "chrome://messenger/locale/importMsgs.properties" diff --git a/mailnews/import/text/src/nsTextImport.cpp b/mailnews/import/text/src/nsTextImport.cpp index d2b47ead1502..f74b73bac417 100644 --- a/mailnews/import/text/src/nsTextImport.cpp +++ b/mailnews/import/text/src/nsTextImport.cpp @@ -51,7 +51,6 @@ static NS_DEFINE_CID(kImportServiceCID, NS_IMPORTSERVICE_CID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kISupportsArrayIID, NS_ISUPPORTSARRAY_IID); static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); @@ -383,7 +382,7 @@ NS_IMETHODIMP ImportAddressImpl::FindAddressBooks(nsIFileSpec *pLoc, nsISupports IMPORT_LOG0( "*** Error creating address book descriptor for text import\n"); } else { - rv = array->QueryInterface( kISupportsArrayIID, (void **) ppArray); + rv = array->QueryInterface( NS_GET_IID(nsISupportsArray), (void **) ppArray); } return( rv); diff --git a/mailnews/import/text/src/nsTextStringBundle.cpp b/mailnews/import/text/src/nsTextStringBundle.cpp index 3d3882e75c8a..657c135fbba1 100644 --- a/mailnews/import/text/src/nsTextStringBundle.cpp +++ b/mailnews/import/text/src/nsTextStringBundle.cpp @@ -27,7 +27,7 @@ /* This is the next generation string retrieval call */ static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); -static NS_DEFINE_IID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); +static NS_DEFINE_CID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); nsIStringBundle * nsTextStringBundle::m_pBundle = nsnull; diff --git a/mailnews/local/src/nsMovemailService.cpp b/mailnews/local/src/nsMovemailService.cpp index 44dae5bfcde1..0defec581447 100644 --- a/mailnews/local/src/nsMovemailService.cpp +++ b/mailnews/local/src/nsMovemailService.cpp @@ -60,7 +60,6 @@ static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); static NS_DEFINE_CID(kMsgMailSessionCID, NS_MSGMAILSESSION_CID); -static NS_DEFINE_IID(kIFileLocatorIID, NS_IFILELOCATOR_IID); static NS_DEFINE_CID(kFileLocatorCID, NS_FILELOCATOR_CID); nsMovemailService::nsMovemailService() diff --git a/mailnews/local/tests/mailbox/mailboxTest.cpp b/mailnews/local/tests/mailbox/mailboxTest.cpp index 1fc15f0eb1c0..7f55654942af 100644 --- a/mailnews/local/tests/mailbox/mailboxTest.cpp +++ b/mailnews/local/tests/mailbox/mailboxTest.cpp @@ -108,11 +108,10 @@ static NS_DEFINE_CID(kCUrlListenerManagerCID, NS_URLLISTENERMANAGER_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_CID(kCMailboxServiceCID, NS_MAILBOXSERVICE_CID); -static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID); static NS_DEFINE_CID(kCMailboxParser, NS_MAILBOXPARSER_CID); static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); -static NS_DEFINE_IID(kFileLocatorCID, NS_FILELOCATOR_CID); +static NS_DEFINE_CID(kFileLocatorCID, NS_FILELOCATOR_CID); static NS_DEFINE_CID(kCMailDB, NS_MAILDB_CID); ///////////////////////////////////////////////////////////////////////////////// diff --git a/mailnews/local/tests/mailbox/nsMsgMailboxParserStub.cpp b/mailnews/local/tests/mailbox/nsMsgMailboxParserStub.cpp index 58cad4c11699..8a9f5c66bc59 100644 --- a/mailnews/local/tests/mailbox/nsMsgMailboxParserStub.cpp +++ b/mailnews/local/tests/mailbox/nsMsgMailboxParserStub.cpp @@ -66,8 +66,7 @@ nsMsgMailboxParserStub::nsMsgMailboxParserStub() nsMsgMailboxParserStub::~nsMsgMailboxParserStub() {} -NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID); -NS_IMPL_ISUPPORTS(nsMsgMailboxParserStub,kIStreamListenerIID); +NS_IMPL_ISUPPORTS(nsMsgMailboxParserStub,NS_GET_IID(nsIStreamListener)); NS_IMETHODIMP nsMsgMailboxParserStub::GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* info) { @@ -150,7 +149,7 @@ nsresult NS_NewMsgParser(nsIStreamListener ** aInstancePtr) { nsMsgMailboxParserStub * parser = new nsMsgMailboxParserStub(); if (parser) - rv =parser->QueryInterface(kIStreamListenerIID, (void **) aInstancePtr); + rv =parser->QueryInterface(NS_GET_IID(nsIStreamListener), (void **) aInstancePtr); } return rv; diff --git a/mailnews/local/tests/mboxParser/mboxParserTest.cpp b/mailnews/local/tests/mboxParser/mboxParserTest.cpp index 27e6bc29a5bf..8d7fc30c2f64 100644 --- a/mailnews/local/tests/mboxParser/mboxParserTest.cpp +++ b/mailnews/local/tests/mboxParser/mboxParserTest.cpp @@ -64,10 +64,9 @@ ///////////////////////////////////////////////////////////////////////////////// // Define keys for all of the interfaces we are going to require for this test ///////////////////////////////////////////////////////////////////////////////// -static NS_DEFINE_IID(kNetServiceCID, NS_NETSERVICE_CID); -static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); +static NS_DEFINE_CID(kNetServiceCID, NS_NETSERVICE_CID); +static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_IID(kIInputStreamIID, NS_IINPUTSTREAM_IID); ///////////////////////////////////////////////////////////////////////////////// // Define default values to be used to drive the test diff --git a/mailnews/local/tests/pop3/pop3Test.cpp b/mailnews/local/tests/pop3/pop3Test.cpp index 49ca58e9f15b..53fb16ad484d 100644 --- a/mailnews/local/tests/pop3/pop3Test.cpp +++ b/mailnews/local/tests/pop3/pop3Test.cpp @@ -77,8 +77,8 @@ static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_CID(kPop3ServiceCID, NS_POP3SERVICE_CID); static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); -static NS_DEFINE_IID(kFileLocatorCID, NS_FILELOCATOR_CID); -static NS_DEFINE_IID(kEventQueueCID, NS_EVENTQUEUE_CID); +static NS_DEFINE_CID(kFileLocatorCID, NS_FILELOCATOR_CID); +static NS_DEFINE_CID(kEventQueueCID, NS_EVENTQUEUE_CID); ///////////////////////////////////////////////////////////////////////////////// // Define default values to be used to drive the test diff --git a/mailnews/mime/cthandlers/vcard/mimevcrd.cpp b/mailnews/mime/cthandlers/vcard/mimevcrd.cpp index 5699f42eb223..796a95356afb 100644 --- a/mailnews/mime/cthandlers/vcard/mimevcrd.cpp +++ b/mailnews/mime/cthandlers/vcard/mimevcrd.cpp @@ -93,9 +93,8 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); /* This is the next generation string retrieval call */ -static NS_DEFINE_IID(kIPrefIID, NS_IPREF_IID); static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); -static NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); +static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); #define VCARD_URL "chrome://messenger/locale/vcard.properties" diff --git a/mailnews/mime/src/mimei.cpp b/mailnews/mime/src/mimei.cpp index d744d3ad364c..59a8baa4f0b3 100644 --- a/mailnews/mime/src/mimei.cpp +++ b/mailnews/mime/src/mimei.cpp @@ -82,7 +82,6 @@ #include "nsMimeTypes.h" static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); -static NS_DEFINE_IID(kIMimeContentTypeHandlerIID, NS_IMIME_CONTENT_TYPE_HANDLER_IID); /* ========================================================================== Allocation and destruction @@ -202,7 +201,7 @@ mime_locate_external_content_handler(const char *content_type, if (nsComponentManager::ContractIDToClassID(lookupID, &classID) != NS_OK) return NULL; - rv = nsComponentManager::CreateInstance(classID, (nsISupports *)nsnull, kIMimeContentTypeHandlerIID, + rv = nsComponentManager::CreateInstance(classID, (nsISupports *)nsnull, NS_GET_IID(nsIMimeContentTypeHandler), (void **) getter_AddRefs(ctHandler)); if (NS_FAILED(rv) || !ctHandler) return nsnull; diff --git a/mailnews/mime/src/mimemoz2.cpp b/mailnews/mime/src/mimemoz2.cpp index 6e4797131418..171c39c1ecac 100644 --- a/mailnews/mime/src/mimemoz2.cpp +++ b/mailnews/mime/src/mimemoz2.cpp @@ -73,7 +73,6 @@ #include "mimeebod.h" -static NS_DEFINE_IID(kIPrefIID, NS_IPREF_IID); static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); @@ -1459,7 +1458,7 @@ mime_bridge_create_display_stream( // memset(msd->options, 0, sizeof(*msd->options)); msd->options->format_out = format_out; // output format - rv = nsServiceManager::GetService(kPrefCID, kIPrefIID, (nsISupports**)&(msd->options->prefs)); + rv = nsServiceManager::GetService(kPrefCID, NS_GET_IID(nsIPref), (nsISupports**)&(msd->options->prefs)); if (! (msd->options->prefs && NS_SUCCEEDED(rv))) { PR_FREEIF(msd); @@ -1896,7 +1895,7 @@ mimeSetNewURL(nsMIMESession *stream, char *url) } /* This is the next generation string retrieval call */ -static NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); +static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); #define MIME_URL "chrome://messenger/locale/mime.properties" diff --git a/mailnews/mime/tests/mimetest/mimetest.cpp b/mailnews/mime/tests/mimetest/mimetest.cpp index ec591d6e52ab..9424308c8747 100644 --- a/mailnews/mime/tests/mimetest/mimetest.cpp +++ b/mailnews/mime/tests/mimetest/mimetest.cpp @@ -92,7 +92,6 @@ // I18N static NS_DEFINE_CID(charsetCID, CONV_CID); -NS_DEFINE_IID(kConvMeIID, CONV_IID); static NS_DEFINE_CID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID); // prefs @@ -126,7 +125,7 @@ SetupRegistry(void) // i18n nsComponentManager::RegisterComponent(charsetCID, NULL, NULL, UNICHAR_DLL, PR_FALSE, PR_FALSE); - nsresult res = nsServiceManager::GetService(charsetCID, kConvMeIID, (nsISupports **)&ccMan); + nsresult res = nsServiceManager::GetService(charsetCID, NS_GET_IID(nsIConvMe), (nsISupports **)&ccMan); if (NS_FAILED(res)) { printf("ERROR at GetService() code=0x%x.\n",res);