Index: mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp =================================================================== RCS file: /cvsroot/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp,v retrieving revision 1.75 diff -pU0 -r1.75 mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp --- mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp +++ mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp @@ -188 +187,0 @@ static NS_DEFINE_CID(kRDFContainerUtilsC -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); @@ -192 +190,0 @@ static NS_DEFINE_CID(kPlatformCharsetCID -static NS_DEFINE_CID(kCacheServiceCID, NS_CACHESERVICE_CID); @@ -1684 +1682 @@ nsBookmarksService::Init() - mNetService = do_GetService(kIOServiceCID, &rv); + mNetService = do_GetService(NS_IOSERVICE_CONTRACTID, &rv); @@ -1688 +1686 @@ nsBookmarksService::Init() - mCacheService = do_GetService(kCacheServiceCID, &rv); + mCacheService = do_GetService(NS_CACHESERVICE_CONTRACTID, &rv); Index: mozilla/content/html/document/src/nsHTMLDocument.cpp =================================================================== RCS file: /cvsroot/mozilla/content/html/document/src/nsHTMLDocument.cpp,v retrieving revision 3.678 diff -pU0 -r3.678 mozilla/content/html/document/src/nsHTMLDocument.cpp --- mozilla/content/html/document/src/nsHTMLDocument.cpp +++ mozilla/content/html/document/src/nsHTMLDocument.cpp @@ -156 +155,0 @@ const PRInt32 kBackward = 1; -static NS_DEFINE_CID(kCookieServiceCID, NS_COOKIESERVICE_CID); @@ -1851 +1850 @@ nsHTMLDocument::GetCookie(nsAString& aCo - nsCOMPtr service = do_GetService(kCookieServiceCID); + nsCOMPtr service = do_GetService(NS_COOKIESERVICE_CONTRACTID); @@ -1877 +1876 @@ nsHTMLDocument::SetCookie(const nsAStrin - nsCOMPtr service = do_GetService(kCookieServiceCID); + nsCOMPtr service = do_GetService(NS_COOKIESERVICE_CONTRACTID); Index: mozilla/content/html/document/src/nsWyciwygProtocolHandler.cpp =================================================================== RCS file: /cvsroot/mozilla/content/html/document/src/nsWyciwygProtocolHandler.cpp,v retrieving revision 1.8 diff -pU0 -r1.8 mozilla/content/html/document/src/nsWyciwygProtocolHandler.cpp --- mozilla/content/html/document/src/nsWyciwygProtocolHandler.cpp +++ mozilla/content/html/document/src/nsWyciwygProtocolHandler.cpp @@ -46,2 +45,0 @@ -static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); - @@ -97 +95 @@ nsWyciwygProtocolHandler::NewURI(const n - nsCOMPtr url = do_CreateInstance(kSimpleURICID, &rv); + nsCOMPtr url = do_CreateInstance(NS_SIMPLEURI_CONTRACTID, &rv); Index: mozilla/docshell/base/nsDocShell.cpp =================================================================== RCS file: /cvsroot/mozilla/docshell/base/nsDocShell.cpp,v retrieving revision 1.792 diff -pU0 -r1.792 mozilla/docshell/base/nsDocShell.cpp --- mozilla/docshell/base/nsDocShell.cpp +++ mozilla/docshell/base/nsDocShell.cpp @@ -176 +175,0 @@ static NS_DEFINE_IID(kDeviceContextCID, -static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); @@ -853 +852 @@ nsDocShell::LoadStream(nsIInputStream *a - uri = do_CreateInstance(kSimpleURICID, &rv); + uri = do_CreateInstance(NS_SIMPLEURI_CONTRACTID, &rv); Index: mozilla/dom/src/base/nsGlobalWindow.cpp =================================================================== RCS file: /cvsroot/mozilla/dom/src/base/nsGlobalWindow.cpp,v retrieving revision 1.842 diff -pU0 -r1.842 mozilla/dom/src/base/nsGlobalWindow.cpp --- mozilla/dom/src/base/nsGlobalWindow.cpp +++ mozilla/dom/src/base/nsGlobalWindow.cpp @@ -288 +287,0 @@ static NS_DEFINE_CID(kJVMServiceCID, NS_ -static NS_DEFINE_CID(kHTTPHandlerCID, NS_HTTPPROTOCOLHANDLER_CID); @@ -7231 +7230 @@ nsNavigator::GetUserAgent(nsAString& aUs - service(do_GetService(kHTTPHandlerCID, &rv)); + service(do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &rv)); @@ -7246 +7245 @@ nsNavigator::GetAppCodeName(nsAString& a - service(do_GetService(kHTTPHandlerCID, &rv)); + service(do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &rv)); @@ -7271 +7270 @@ nsNavigator::GetAppVersion(nsAString& aA - service(do_GetService(kHTTPHandlerCID, &rv)); + service(do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &rv)); @@ -7322 +7321 @@ nsNavigator::GetLanguage(nsAString& aLan - service(do_GetService(kHTTPHandlerCID, &rv)); + service(do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &rv)); @@ -7347 +7346 @@ nsNavigator::GetPlatform(nsAString& aPla - service(do_GetService(kHTTPHandlerCID, &rv)); + service(do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &rv)); @@ -7378 +7377 @@ nsNavigator::GetOscpu(nsAString& aOSCPU) - service(do_GetService(kHTTPHandlerCID, &rv)); + service(do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &rv)); @@ -7393 +7392 @@ nsNavigator::GetVendor(nsAString& aVendo - service(do_GetService(kHTTPHandlerCID, &rv)); + service(do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &rv)); @@ -7409 +7408 @@ nsNavigator::GetVendorSub(nsAString& aVe - service(do_GetService(kHTTPHandlerCID, &rv)); + service(do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &rv)); @@ -7424 +7423 @@ nsNavigator::GetProduct(nsAString& aProd - service(do_GetService(kHTTPHandlerCID, &rv)); + service(do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &rv)); @@ -7439 +7438 @@ nsNavigator::GetProductSub(nsAString& aP - service(do_GetService(kHTTPHandlerCID, &rv)); + service(do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &rv)); Index: mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp =================================================================== RCS file: /cvsroot/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp,v retrieving revision 1.124 diff -pU0 -r1.124 mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp --- mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp +++ mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp @@ -74 +73,0 @@ -static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); @@ -818 +817 @@ nsJSProtocolHandler::NewURI(const nsACSt - rv = CallCreateInstance(kSimpleURICID, &url); + rv = CallCreateInstance(NS_SIMPLEURI_CONTRACTID, &url); Index: mozilla/embedding/tests/wxEmbed/GeckoProtocolHandler.cpp =================================================================== RCS file: /cvsroot/mozilla/embedding/tests/wxEmbed/GeckoProtocolHandler.cpp,v retrieving revision 1.11 diff -pU0 -r1.11 mozilla/embedding/tests/wxEmbed/GeckoProtocolHandler.cpp --- mozilla/embedding/tests/wxEmbed/GeckoProtocolHandler.cpp +++ mozilla/embedding/tests/wxEmbed/GeckoProtocolHandler.cpp @@ -184,2 +183,0 @@ GeckoProtocolChannel::~GeckoProtocolChan -static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); - @@ -232 +230 @@ NS_IMETHODIMP GeckoProtocolHandlerImpl:: - rv = CallCreateInstance(kSimpleURICID, &url); + rv = CallCreateInstance(NS_SIMPLEURI_CONTRACTID, &url); Index: mozilla/extensions/datetime/nsDateTimeChannel.cpp =================================================================== RCS file: /cvsroot/mozilla/extensions/datetime/nsDateTimeChannel.cpp,v retrieving revision 1.43 diff -pU0 -r1.43 mozilla/extensions/datetime/nsDateTimeChannel.cpp --- mozilla/extensions/datetime/nsDateTimeChannel.cpp +++ mozilla/extensions/datetime/nsDateTimeChannel.cpp @@ -58,3 +57,0 @@ -static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID); -static NS_DEFINE_CID(kStreamConverterServiceCID, NS_STREAMCONVERTERSERVICE_CID); - @@ -202 +199 @@ nsDateTimeChannel::AsyncOpen(nsIStreamLi - do_GetService(kSocketTransportServiceCID, &rv); + do_GetService(NS_SOCKETTRANSPORTSERVICE_CONTRACTID, &rv); @@ -216 +213 @@ nsDateTimeChannel::AsyncOpen(nsIStreamLi - do_GetService(kStreamConverterServiceCID, &rv); + do_GetService(NS_STREAMCONVERTERSERVICE_CONTRACTID, &rv); Index: mozilla/extensions/datetime/nsDateTimeHandler.cpp =================================================================== RCS file: /cvsroot/mozilla/extensions/datetime/nsDateTimeHandler.cpp,v retrieving revision 1.17 diff -pU0 -r1.17 mozilla/extensions/datetime/nsDateTimeHandler.cpp --- mozilla/extensions/datetime/nsDateTimeHandler.cpp +++ mozilla/extensions/datetime/nsDateTimeHandler.cpp @@ -50,2 +49,0 @@ -static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); - @@ -105 +103 @@ nsDateTimeHandler::NewURI(const nsACStri - rv = CallCreateInstance(kSimpleURICID, &url); + rv = CallCreateInstance(NS_SIMPLEURI_CONTRACTID, &url); Index: mozilla/extensions/finger/nsFingerChannel.cpp =================================================================== RCS file: /cvsroot/mozilla/extensions/finger/nsFingerChannel.cpp,v retrieving revision 1.57 diff -pU0 -r1.57 mozilla/extensions/finger/nsFingerChannel.cpp --- mozilla/extensions/finger/nsFingerChannel.cpp +++ mozilla/extensions/finger/nsFingerChannel.cpp @@ -59,3 +58,0 @@ -static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID); -static NS_DEFINE_CID(kStreamConverterServiceCID, NS_STREAMCONVERTERSERVICE_CID); - @@ -221 +218 @@ nsFingerChannel::AsyncOpen(nsIStreamList - do_GetService(kSocketTransportServiceCID, &rv); + do_GetService(NS_SOCKETTRANSPORTSERVICE_CONTRACTID, &rv); @@ -238 +235 @@ nsFingerChannel::AsyncOpen(nsIStreamList - do_GetService(kStreamConverterServiceCID, &rv); + do_GetService(NS_STREAMCONVERTERSERVICE_CONTRACTID, &rv); Index: mozilla/extensions/finger/nsFingerHandler.cpp =================================================================== RCS file: /cvsroot/mozilla/extensions/finger/nsFingerHandler.cpp,v retrieving revision 1.19 diff -pU0 -r1.19 mozilla/extensions/finger/nsFingerHandler.cpp --- mozilla/extensions/finger/nsFingerHandler.cpp +++ mozilla/extensions/finger/nsFingerHandler.cpp @@ -52,2 +51,0 @@ -static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); - @@ -107 +105 @@ nsFingerHandler::NewURI(const nsACString - rv = CallCreateInstance(kSimpleURICID, &url); + rv = CallCreateInstance(NS_SIMPLEURI_CONTRACTID, &url); Index: mozilla/extensions/jssh/nsJSSh.cpp =================================================================== RCS file: /cvsroot/mozilla/extensions/jssh/nsJSSh.cpp,v retrieving revision 1.4 diff -pU0 -r1.4 mozilla/extensions/jssh/nsJSSh.cpp --- mozilla/extensions/jssh/nsJSSh.cpp +++ mozilla/extensions/jssh/nsJSSh.cpp @@ -51,3 +50,0 @@ -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); - - @@ -731 +728 @@ PRBool nsJSSh::LoadURL(const char *url, - nsCOMPtr ioserv = do_GetService(kIOServiceCID); + nsCOMPtr ioserv = do_GetService(NS_IOSERVICE_CONTRACTID); Index: mozilla/extensions/jssh/nsJSShServer.cpp =================================================================== RCS file: /cvsroot/mozilla/extensions/jssh/nsJSShServer.cpp,v retrieving revision 1.4 diff -pU0 -r1.4 mozilla/extensions/jssh/nsJSShServer.cpp --- mozilla/extensions/jssh/nsJSShServer.cpp +++ mozilla/extensions/jssh/nsJSShServer.cpp @@ -48,2 +47,0 @@ -static NS_DEFINE_CID(kServerSocketCID, NS_SERVERSOCKET_CID); - @@ -171 +169 @@ nsJSShServer::StartServerSocket(PRUint32 - mServerSocket = do_CreateInstance(kServerSocketCID); + mServerSocket = do_CreateInstance(NS_SERVERSOCKET_CONTRACTID); Index: mozilla/extensions/sroaming/src/Stream.cpp =================================================================== RCS file: /cvsroot/mozilla/extensions/sroaming/src/Stream.cpp,v retrieving revision 1.2 diff -pU0 -r1.2 mozilla/extensions/sroaming/src/Stream.cpp --- mozilla/extensions/sroaming/src/Stream.cpp +++ mozilla/extensions/sroaming/src/Stream.cpp @@ -52,3 +51,0 @@ -// IID and CIDs of all the services needed -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); - @@ -114 +111 @@ nsresult Stream::Init(Core* aController) - nsCOMPtr ioserv = do_GetService(kIOServiceCID, &rv); + nsCOMPtr ioserv = do_GetService(NS_IOSERVICE_CONTRACTID, &rv); @@ -156 +153 @@ nsresult Stream::Init(Core* aController) - nsCOMPtr ioserv = do_GetService(kIOServiceCID, &rv); + nsCOMPtr ioserv = do_GetService(NS_IOSERVICE_CONTRACTID, &rv); Index: mozilla/extensions/webservices/security/src/nsWSAUtils.cpp =================================================================== RCS file: /cvsroot/mozilla/extensions/webservices/security/src/nsWSAUtils.cpp,v retrieving revision 1.9 diff -pU0 -r1.9 mozilla/extensions/webservices/security/src/nsWSAUtils.cpp Index: mozilla/extensions/xmlterm/base/mozXMLTermStream.cpp =================================================================== RCS file: /cvsroot/mozilla/extensions/xmlterm/base/mozXMLTermStream.cpp,v retrieving revision 1.45 diff -pU0 -r1.45 mozilla/extensions/xmlterm/base/mozXMLTermStream.cpp --- mozilla/extensions/xmlterm/base/mozXMLTermStream.cpp +++ mozilla/extensions/xmlterm/base/mozXMLTermStream.cpp @@ -69,2 +68,0 @@ -static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); - @@ -208 +206 @@ NS_IMETHODIMP mozXMLTermStream::Open(nsI - nsCOMPtr uri = do_CreateInstance(kSimpleURICID, &result); + nsCOMPtr uri = do_CreateInstance(NS_SIMPLEURI_CONTRACTID, &result); Index: mozilla/intl/uconv/src/nsTextToSubURI.cpp =================================================================== RCS file: /cvsroot/mozilla/intl/uconv/src/nsTextToSubURI.cpp,v retrieving revision 1.34 diff -pU0 -r1.34 mozilla/intl/uconv/src/nsTextToSubURI.cpp Index: mozilla/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp =================================================================== RCS file: /cvsroot/mozilla/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp,v retrieving revision 1.20 diff -pU0 -r1.20 mozilla/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp --- mozilla/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp +++ mozilla/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp @@ -58,2 +57,0 @@ -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); - @@ -275 +273 @@ mozJSSubScriptLoader::LoadSubScript (con - nsCOMPtr serv = do_GetService(kIOServiceCID); + nsCOMPtr serv = do_GetService(NS_IOSERVICE_CONTRACTID); Index: mozilla/layout/generic/nsImageFrame.cpp =================================================================== RCS file: /cvsroot/mozilla/layout/generic/nsImageFrame.cpp,v retrieving revision 1.385 diff -pU0 -r1.385 mozilla/layout/generic/nsImageFrame.cpp --- mozilla/layout/generic/nsImageFrame.cpp +++ mozilla/layout/generic/nsImageFrame.cpp @@ -1830,2 +1830 @@ nsImageFrame::LoadIcon(const nsAString& - static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); - rv = CallGetService(kIOServiceCID, &sIOService); + rv = CallGetService(NS_IOSERVICE_CONTRACTID, &sIOService); Index: mozilla/mailnews/base/src/nsMsgOfflineManager.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/base/src/nsMsgOfflineManager.cpp,v retrieving revision 1.26 diff -pU0 -r1.26 mozilla/mailnews/base/src/nsMsgOfflineManager.cpp --- mozilla/mailnews/base/src/nsMsgOfflineManager.cpp +++ mozilla/mailnews/base/src/nsMsgOfflineManager.cpp @@ -59 +58,0 @@ static NS_DEFINE_CID(kMsgSendLaterCID, N -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); @@ -360 +359 @@ nsresult nsMsgOfflineManager::SetOnlineS - nsCOMPtr netService(do_GetService(kIOServiceCID, &rv)); + nsCOMPtr netService(do_GetService(NS_IOSERVICE_CONTRACTID, &rv)); Index: mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp,v retrieving revision 1.106 diff -pU0 -r1.106 mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp --- mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp +++ mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp @@ -60,2 +59,0 @@ -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); - @@ -578 +576 @@ NS_IMETHODIMP nsMsgMailNewsUrl::Clone(ns - nsCOMPtr ioService = do_GetService(kIOServiceCID, &rv); + nsCOMPtr ioService = do_GetService(NS_IOSERVICE_CONTRACTID, &rv); Index: mozilla/mailnews/base/util/nsMsgProtocol.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/base/util/nsMsgProtocol.cpp,v retrieving revision 1.140 diff -pU0 -r1.140 mozilla/mailnews/base/util/nsMsgProtocol.cpp --- mozilla/mailnews/base/util/nsMsgProtocol.cpp +++ mozilla/mailnews/base/util/nsMsgProtocol.cpp @@ -66,3 +65,0 @@ -static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID); -static NS_DEFINE_CID(kStreamTransportServiceCID, NS_STREAMTRANSPORTSERVICE_CID); - @@ -129 +126 @@ nsMsgProtocol::OpenNetworkSocketWithInfo - nsCOMPtr socketService (do_GetService(kSocketTransportServiceCID)); + nsCOMPtr socketService (do_GetService(NS_SOCKETTRANSPORTSERVICE_CONTRACTID)); @@ -267 +264 @@ nsresult nsMsgProtocol::OpenFileSocket(n - do_GetService(kStreamTransportServiceCID, &rv); + do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID, &rv); Index: mozilla/mailnews/compose/src/nsMsgCompUtils.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp,v retrieving revision 1.179 diff -pU0 -r1.179 mozilla/mailnews/compose/src/nsMsgCompUtils.cpp --- mozilla/mailnews/compose/src/nsMsgCompUtils.cpp +++ mozilla/mailnews/compose/src/nsMsgCompUtils.cpp @@ -67,3 +66,0 @@ -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); -static NS_DEFINE_CID(kHTTPHandlerCID, NS_HTTPPROTOCOLHANDLER_CID); - @@ -470 +467 @@ RRT_HEADER: - nsCOMPtr pHTTPHandler = do_GetService(kHTTPHandlerCID, &rv); + nsCOMPtr pHTTPHandler = do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &rv); @@ -1762 +1759 @@ nsMsgNewURL(nsIURI** aInstancePtrResult, - nsCOMPtr pNetService(do_GetService(kIOServiceCID, &rv)); + nsCOMPtr pNetService(do_GetService(NS_IOSERVICE_CONTRACTID, &rv)); Index: mozilla/mailnews/compose/src/nsSmtpUrl.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/compose/src/nsSmtpUrl.cpp,v retrieving revision 1.76 diff -pU0 -r1.76 mozilla/mailnews/compose/src/nsSmtpUrl.cpp --- mozilla/mailnews/compose/src/nsSmtpUrl.cpp +++ mozilla/mailnews/compose/src/nsSmtpUrl.cpp @@ -51,2 +50,0 @@ -static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); - @@ -59 +57 @@ nsMailtoUrl::nsMailtoUrl() - m_baseURL = do_CreateInstance(kSimpleURICID); + m_baseURL = do_CreateInstance(NS_SIMPLEURI_CONTRACTID); Index: mozilla/mailnews/imap/src/nsImapIncomingServer.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp,v retrieving revision 1.355 diff -pU0 -r1.355 mozilla/mailnews/imap/src/nsImapIncomingServer.cpp Index: mozilla/mailnews/imap/src/nsImapProtocol.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/imap/src/nsImapProtocol.cpp,v retrieving revision 1.624 diff -pU0 -r1.624 mozilla/mailnews/imap/src/nsImapProtocol.cpp --- mozilla/mailnews/imap/src/nsImapProtocol.cpp +++ mozilla/mailnews/imap/src/nsImapProtocol.cpp @@ -114 +113,0 @@ PRLogModuleInfo *IMAP; -static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID); @@ -116 +114,0 @@ static NS_DEFINE_CID(kCharsetConverterMa -static NS_DEFINE_CID(kStreamListenerTeeCID, NS_STREAMLISTENERTEE_CID); @@ -757 +755 @@ nsresult nsImapProtocol::SetupWithUrl(ns - do_GetService(kSocketTransportServiceCID, &rv); + do_GetService(NS_SOCKETTRANSPORTSERVICE_CONTRACTID, &rv); @@ -8135 +8133 @@ nsImapMockChannel::OnCacheEntryAvailable - nsCOMPtr tee = do_CreateInstance(kStreamListenerTeeCID, &rv); + nsCOMPtr tee = do_CreateInstance(NS_STREAMLISTENERTEE_CONTRACTID, &rv); Index: mozilla/mailnews/import/eudora/src/nsEudoraCompose.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/import/eudora/src/nsEudoraCompose.cpp,v retrieving revision 1.64 diff -pU0 -r1.64 mozilla/mailnews/import/eudora/src/nsEudoraCompose.cpp --- mozilla/mailnews/import/eudora/src/nsEudoraCompose.cpp +++ mozilla/mailnews/import/eudora/src/nsEudoraCompose.cpp @@ -76,2 +75,0 @@ static NS_DEFINE_CID( kMsgCompFieldsCID, -static NS_DEFINE_CID( kIOServiceCID, NS_IOSERVICE_CID); - @@ -260 +258 @@ nsresult nsEudoraCompose::CreateComponen - NS_WITH_PROXIED_SERVICE(nsIIOService, service, kIOServiceCID, NS_PROXY_TO_MAIN_THREAD, &rv); + NS_WITH_PROXIED_SERVICE(nsIIOService, service, NS_IOSERVICE_CONTRACTID, NS_PROXY_TO_MAIN_THREAD, &rv); Index: mozilla/mailnews/import/outlook/src/nsOutlookCompose.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/import/outlook/src/nsOutlookCompose.cpp,v retrieving revision 1.53 diff -pU0 -r1.53 mozilla/mailnews/import/outlook/src/nsOutlookCompose.cpp --- mozilla/mailnews/import/outlook/src/nsOutlookCompose.cpp +++ mozilla/mailnews/import/outlook/src/nsOutlookCompose.cpp @@ -77,2 +76,0 @@ static NS_DEFINE_CID( kMsgCompFieldsCID, -static NS_DEFINE_CID( kIOServiceCID, NS_IOSERVICE_CID); - @@ -254 +252 @@ nsresult nsOutlookCompose::CreateCompone - NS_WITH_PROXIED_SERVICE(nsIIOService, service, kIOServiceCID, NS_PROXY_TO_MAIN_THREAD, &rv); + NS_WITH_PROXIED_SERVICE(nsIIOService, service, NS_IOSERVICE_CONTRACTID, NS_PROXY_TO_MAIN_THREAD, &rv); Index: mozilla/mailnews/local/src/nsMailboxProtocol.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/local/src/nsMailboxProtocol.cpp,v retrieving revision 1.123 diff -pU0 -r1.123 mozilla/mailnews/local/src/nsMailboxProtocol.cpp --- mozilla/mailnews/local/src/nsMailboxProtocol.cpp +++ mozilla/mailnews/local/src/nsMailboxProtocol.cpp @@ -131 +130,0 @@ nsresult nsMailboxProtocol::OpenMultiple - NS_DEFINE_CID(kStreamTransportServiceCID, NS_STREAMTRANSPORTSERVICE_CID); @@ -133 +132 @@ nsresult nsMailboxProtocol::OpenMultiple - do_GetService(kStreamTransportServiceCID, &rv); + do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID, &rv); Index: mozilla/mailnews/local/src/nsParseMailbox.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/local/src/nsParseMailbox.cpp,v retrieving revision 1.265 diff -pU0 -r1.265 mozilla/mailnews/local/src/nsParseMailbox.cpp --- mozilla/mailnews/local/src/nsParseMailbox.cpp +++ mozilla/mailnews/local/src/nsParseMailbox.cpp @@ -92 +91,0 @@ static NS_DEFINE_CID(kCMailDB, NS_MAILDB -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); @@ -121 +120 @@ NS_IMETHODIMP nsMsgMailboxParser::OnStar - nsCOMPtr ioServ(do_GetService(kIOServiceCID, &rv)); + nsCOMPtr ioServ(do_GetService(NS_IOSERVICE_CONTRACTID, &rv)); Index: mozilla/mailnews/mime/src/mimemoz2.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimemoz2.cpp,v retrieving revision 1.219 diff -pU0 -r1.219 mozilla/mailnews/mime/src/mimemoz2.cpp --- mozilla/mailnews/mime/src/mimemoz2.cpp +++ mozilla/mailnews/mime/src/mimemoz2.cpp @@ -103,2 +102,0 @@ - -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); @@ -674 +672 @@ nsMimeNewURI(nsIURI** aInstancePtrResult - nsCOMPtr pService(do_GetService(kIOServiceCID, &res)); + nsCOMPtr pService(do_GetService(NS_IOSERVICE_CONTRACTID, &res)); Index: mozilla/mailnews/news/src/nsNNTPProtocol.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/news/src/nsNNTPProtocol.cpp,v retrieving revision 1.375 diff -pU0 -r1.375 mozilla/mailnews/news/src/nsNNTPProtocol.cpp --- mozilla/mailnews/news/src/nsNNTPProtocol.cpp +++ mozilla/mailnews/news/src/nsNNTPProtocol.cpp @@ -140,2 +139,0 @@ -static NS_DEFINE_CID(kStreamListenerTeeCID, NS_STREAMLISTENERTEE_CID); - @@ -892 +890 @@ nsNNTPProtocol::OnCacheEntryAvailable(ns - nsCOMPtr tee = do_CreateInstance(kStreamListenerTeeCID, &rv); + nsCOMPtr tee = do_CreateInstance(NS_STREAMLISTENERTEE_CONTRACTID, &rv); Index: mozilla/mailnews/news/src/nsNntpService.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/news/src/nsNntpService.cpp,v retrieving revision 1.254 diff -pU0 -r1.254 mozilla/mailnews/news/src/nsNntpService.cpp --- mozilla/mailnews/news/src/nsNntpService.cpp +++ mozilla/mailnews/news/src/nsNntpService.cpp @@ -102,2 +101,0 @@ static NS_DEFINE_CID(kMessengerMigratorC -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); -static NS_DEFINE_CID(kCacheServiceCID, NS_CACHESERVICE_CID); @@ -1248 +1246 @@ PRBool nsNntpService::WeAreOffline() - nsCOMPtr netService(do_GetService(kIOServiceCID, &rv)); + nsCOMPtr netService(do_GetService(NS_IOSERVICE_CONTRACTID, &rv)); @@ -1843 +1841 @@ NS_IMETHODIMP nsNntpService::GetCacheSes - nsCOMPtr serv = do_GetService(kCacheServiceCID, &rv); + nsCOMPtr serv = do_GetService(NS_CACHESERVICE_CONTRACTID, &rv); Index: mozilla/modules/libjar/nsJARURI.cpp =================================================================== RCS file: /cvsroot/mozilla/modules/libjar/nsJARURI.cpp,v retrieving revision 1.53 diff -pU0 -r1.53 mozilla/modules/libjar/nsJARURI.cpp Index: mozilla/modules/libpr0n/decoders/icon/nsIconURI.cpp =================================================================== RCS file: /cvsroot/mozilla/modules/libpr0n/decoders/icon/nsIconURI.cpp,v retrieving revision 1.23 diff -pU0 -r1.23 mozilla/modules/libpr0n/decoders/icon/nsIconURI.cpp --- mozilla/modules/libpr0n/decoders/icon/nsIconURI.cpp +++ mozilla/modules/libpr0n/decoders/icon/nsIconURI.cpp @@ -50 +49,0 @@ -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); @@ -217 +216 @@ nsMozIconURI::SetSpec(const nsACString & - nsCOMPtr ioService (do_GetService(kIOServiceCID, &rv)); + nsCOMPtr ioService (do_GetService(NS_IOSERVICE_CONTRACTID, &rv)); Index: mozilla/modules/oji/src/nsJVMConfigManagerUnix.cpp =================================================================== RCS file: /cvsroot/mozilla/modules/oji/src/nsJVMConfigManagerUnix.cpp,v retrieving revision 1.10 diff -pU0 -r1.10 mozilla/modules/oji/src/nsJVMConfigManagerUnix.cpp --- mozilla/modules/oji/src/nsJVMConfigManagerUnix.cpp +++ mozilla/modules/oji/src/nsJVMConfigManagerUnix.cpp @@ -57,2 +56,0 @@ -static NS_DEFINE_CID(kHttpHandlerCID, NS_HTTPPROTOCOLHANDLER_CID); - @@ -397 +395 @@ nsJVMConfigManagerUnix::GetAgentVersion( - nsCOMPtr http = do_GetService(kHttpHandlerCID, &rv); + nsCOMPtr http = do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &rv); Index: mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp =================================================================== RCS file: /cvsroot/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp,v retrieving revision 1.555 diff -pU0 -r1.555 mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp --- mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -214,2 +213,0 @@ static NS_DEFINE_IID(kIPluginTagInfo2IID -static NS_DEFINE_CID(kProtocolProxyServiceCID, NS_PROTOCOLPROXYSERVICE_CID); -static NS_DEFINE_CID(kCookieServiceCID, NS_COOKIESERVICE_CID); @@ -217,3 +214,0 @@ static NS_DEFINE_IID(kISupportsIID, NS_I -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); -static NS_DEFINE_CID(kHttpHandlerCID, NS_HTTPPROTOCOLHANDLER_CID); -static NS_DEFINE_CID(kStreamConverterServiceCID, NS_STREAMCONVERTERSERVICE_CID); @@ -2732 +2727 @@ nsresult nsPluginHostImpl::UserAgent(con - nsCOMPtr http = do_GetService(kHttpHandlerCID, &res); + nsCOMPtr http = do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &res); @@ -3023 +3018 @@ NS_IMETHODIMP nsPluginHostImpl::FindProx - proxyService = do_GetService(kProtocolProxyServiceCID, &res); + proxyService = do_GetService(NS_PROTOCOLPROXYSERVICE_CONTRACTID, &res); @@ -3028 +3023 @@ NS_IMETHODIMP nsPluginHostImpl::FindProx - ioService = do_GetService(kIOServiceCID, &res); + ioService = do_GetService(NS_IOSERVICE_CONTRACTID, &res); @@ -6067 +6062 @@ NS_IMETHODIMP nsPluginHostImpl::GetCooki - nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); + nsCOMPtr ioService(do_GetService(NS_IOSERVICE_CONTRACTID, &rv)); @@ -6074 +6069 @@ NS_IMETHODIMP nsPluginHostImpl::GetCooki - do_GetService(kCookieServiceCID, &rv); + do_GetService(NS_COOKIESERVICE_CONTRACTID, &rv); @@ -6112 +6107 @@ NS_IMETHODIMP nsPluginHostImpl::SetCooki - nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); + nsCOMPtr ioService(do_GetService(NS_IOSERVICE_CONTRACTID, &rv)); @@ -6119 +6114 @@ NS_IMETHODIMP nsPluginHostImpl::SetCooki - do_GetService(kCookieServiceCID, &rv); + do_GetService(NS_COOKIESERVICE_CONTRACTID, &rv); @@ -6750 +6745 @@ nsPluginByteRangeStreamListener::OnStart - nsCOMPtr serv = do_GetService(kStreamConverterServiceCID, &rv); + nsCOMPtr serv = do_GetService(NS_STREAMCONVERTERSERVICE_CONTRACTID, &rv); Index: mozilla/parser/htmlparser/robot/nsDebugRobot.cpp =================================================================== RCS file: /cvsroot/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp,v retrieving revision 1.73 diff -pU0 -r1.73 mozilla/parser/htmlparser/robot/nsDebugRobot.cpp --- mozilla/parser/htmlparser/robot/nsDebugRobot.cpp +++ mozilla/parser/htmlparser/robot/nsDebugRobot.cpp @@ -59,2 +58,0 @@ -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); - @@ -256 +254 @@ extern "C" NS_EXPORT int DebugRobot( - nsCOMPtr service(do_GetService(kIOServiceCID, &rv)); + nsCOMPtr service(do_GetService(NS_IOSERVICE_CONTRACTID, &rv)); Index: mozilla/parser/htmlparser/robot/nsRobotSink.cpp =================================================================== RCS file: /cvsroot/mozilla/parser/htmlparser/robot/nsRobotSink.cpp,v retrieving revision 3.63 diff -pU0 -r3.63 mozilla/parser/htmlparser/robot/nsRobotSink.cpp --- mozilla/parser/htmlparser/robot/nsRobotSink.cpp +++ mozilla/parser/htmlparser/robot/nsRobotSink.cpp @@ -62 +61,0 @@ class nsIDocument; -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); @@ -292 +291 @@ void RobotSink::ProcessLink(const nsStri - nsCOMPtr service(do_GetService(kIOServiceCID, &rv)); + nsCOMPtr service(do_GetService(NS_IOSERVICE_CONTRACTID, &rv)); Index: mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp =================================================================== RCS file: /cvsroot/mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp,v retrieving revision 1.31 diff -pU0 -r1.31 mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp --- mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp +++ mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp @@ -49 +48,0 @@ -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); @@ -240 +239 @@ PageGrabber::Grab(const nsCString& aURL) - nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); + nsCOMPtr ioService(do_GetService(NS_IOSERVICE_CONTRACTID, &rv)); Index: mozilla/parser/htmlparser/tests/logparse/logparse.cpp =================================================================== RCS file: /cvsroot/mozilla/parser/htmlparser/tests/logparse/logparse.cpp,v retrieving revision 1.21 diff -pU0 -r1.21 mozilla/parser/htmlparser/tests/logparse/logparse.cpp --- mozilla/parser/htmlparser/tests/logparse/logparse.cpp +++ mozilla/parser/htmlparser/tests/logparse/logparse.cpp @@ -53 +52,0 @@ static NS_DEFINE_IID(kLoggingSinkCID, NS -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); @@ -89 +88 @@ nsresult GenerateBaselineFile(const char - nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); + nsCOMPtr ioService(do_GetService(NS_IOSERVICE_CONTRACTID, &rv)); Index: mozilla/rdf/chrome/src/nsChromeProtocolHandler.cpp =================================================================== RCS file: /cvsroot/mozilla/rdf/chrome/src/nsChromeProtocolHandler.cpp,v retrieving revision 1.111 diff -pU0 -r1.111 mozilla/rdf/chrome/src/nsChromeProtocolHandler.cpp --- mozilla/rdf/chrome/src/nsChromeProtocolHandler.cpp +++ mozilla/rdf/chrome/src/nsChromeProtocolHandler.cpp @@ -79,2 +78,0 @@ -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); -static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID); @@ -543 +541 @@ nsChromeProtocolHandler::NewURI(const ns - nsCOMPtr url(do_CreateInstance(kStandardURLCID, &rv)); + nsCOMPtr url(do_CreateInstance(NS_STANDARDURL_CONTRACTID, &rv)); Index: mozilla/uriloader/base/nsURILoader.cpp =================================================================== RCS file: /cvsroot/mozilla/uriloader/base/nsURILoader.cpp,v retrieving revision 1.141 diff -pU0 -r1.141 mozilla/uriloader/base/nsURILoader.cpp --- mozilla/uriloader/base/nsURILoader.cpp +++ mozilla/uriloader/base/nsURILoader.cpp @@ -82 +81,0 @@ -static NS_DEFINE_CID(kStreamConverterServiceCID, NS_STREAMCONVERTERSERVICE_CID); @@ -679 +678 @@ nsDocumentOpenInfo::ConvertData(nsIReque - do_GetService(kStreamConverterServiceCID, &rv); + do_GetService(NS_STREAMCONVERTERSERVICE_CONTRACTID, &rv); Index: mozilla/uriloader/exthandler/nsExternalProtocolHandler.cpp =================================================================== RCS file: /cvsroot/mozilla/uriloader/exthandler/nsExternalProtocolHandler.cpp,v retrieving revision 1.33 diff -pU0 -r1.33 mozilla/uriloader/exthandler/nsExternalProtocolHandler.cpp --- mozilla/uriloader/exthandler/nsExternalProtocolHandler.cpp +++ mozilla/uriloader/exthandler/nsExternalProtocolHandler.cpp @@ -60,4 +59,0 @@ -static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); - - - @@ -372 +368 @@ NS_IMETHODIMP nsExternalProtocolHandler: - nsCOMPtr uri = do_CreateInstance(kSimpleURICID, &rv); + nsCOMPtr uri = do_CreateInstance(NS_SIMPLEURI_CONTRACTID, &rv); Index: mozilla/widget/src/mac/nsMacMessagePump.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/mac/nsMacMessagePump.cpp,v retrieving revision 1.151 diff -pU0 -r1.151 mozilla/widget/src/mac/nsMacMessagePump.cpp --- mozilla/widget/src/mac/nsMacMessagePump.cpp +++ mozilla/widget/src/mac/nsMacMessagePump.cpp @@ -288 +287,0 @@ void nsMacMessagePump::DoMessagePump() -//static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID); @@ -313 +312 @@ PRBool nsMacMessagePump::BrowserIsBusy() - nsCOMPtr socketTransport = do_GetService(kSocketTransportServiceCID); + nsCOMPtr socketTransport = do_GetService(NS_SOCKETTRANSPORTSERVICE_CONTRACTID); Index: mozilla/xpfe/appshell/src/nsAbout.cpp =================================================================== RCS file: /cvsroot/mozilla/xpfe/appshell/src/nsAbout.cpp,v retrieving revision 1.19 diff -pU0 -r1.19 mozilla/xpfe/appshell/src/nsAbout.cpp --- mozilla/xpfe/appshell/src/nsAbout.cpp +++ mozilla/xpfe/appshell/src/nsAbout.cpp @@ -48,2 +47,0 @@ -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); - @@ -58 +56 @@ nsAbout::NewChannel(nsIURI *aURI, nsICha - nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); + nsCOMPtr ioService(do_GetService(NS_IOSERVICE_CONTRACTID, &rv)); Index: mozilla/xpfe/appshell/src/nsXULWindow.cpp =================================================================== RCS file: /cvsroot/mozilla/xpfe/appshell/src/nsXULWindow.cpp,v retrieving revision 1.169 diff -pU0 -r1.169 mozilla/xpfe/appshell/src/nsXULWindow.cpp Index: mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp =================================================================== RCS file: /cvsroot/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp,v retrieving revision 1.339 diff -pU0 -r1.339 mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp --- mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp +++ mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp @@ -165 +164,0 @@ static NS_DEFINE_CID(kRDFContainerUtilsC -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); @@ -169 +167,0 @@ static NS_DEFINE_CID(kPlatformCharsetCID -static NS_DEFINE_CID(kCacheServiceCID, NS_CACHESERVICE_CID); @@ -1633 +1631 @@ nsBookmarksService::Init() - mNetService = do_GetService(kIOServiceCID, &rv); + mNetService = do_GetService(NS_IOSERVICE_CONTRACTID, &rv); @@ -1637 +1635 @@ nsBookmarksService::Init() - mCacheService = do_GetService(kCacheServiceCID, &rv); + mCacheService = do_GetService(NS_CACHESERVICE_CONTRACTID, &rv); Index: mozilla/xpfe/components/search/src/nsInternetSearchService.cpp =================================================================== RCS file: /cvsroot/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp,v retrieving revision 1.248 diff -pU0 -r1.248 mozilla/xpfe/components/search/src/nsInternetSearchService.cpp Index: mozilla/xpfe/components/search/src/nsLocalSearchService.cpp =================================================================== RCS file: /cvsroot/mozilla/xpfe/components/search/src/nsLocalSearchService.cpp,v retrieving revision 1.47 diff -pU0 -r1.47 mozilla/xpfe/components/search/src/nsLocalSearchService.cpp