Index: mozilla/browser/components/bookmarks/src/nsBookmarksFeedHandler.cpp =================================================================== RCS file: /cvsroot/mozilla/browser/components/bookmarks/src/nsBookmarksFeedHandler.cpp,v retrieving revision 1.14 diff -pU0 -r1.14 mozilla/browser/components/bookmarks/src/nsBookmarksFeedHandler.cpp --- mozilla/browser/components/bookmarks/src/nsBookmarksFeedHandler.cpp +++ mozilla/browser/components/bookmarks/src/nsBookmarksFeedHandler.cpp @@ -106,3 +105,0 @@ extern nsIRDFContainerUtils *gRDFC; -static NS_DEFINE_CID(kRDFContainerCID, NS_RDFCONTAINER_CID); -static NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID); - @@ -249 +246 @@ nsFeedLoadListener::OnStopRequest(nsIReq - mLivemarkContainer = do_CreateInstance (kRDFContainerCID, &rv); + mLivemarkContainer = do_CreateInstance (NS_RDF_CONTRACTID "/container;1", &rv); @@ -387 +384 @@ nsFeedLoadListener::TryParseAsRDF () - nsCOMPtr ds(do_CreateInstance(kRDFInMemoryDataSourceCID, &rv)); + nsCOMPtr ds(do_CreateInstance(NS_RDF_DATASOURCE_CONTRACTID_PREFIX "in-memory-datasource", &rv)); @@ -450 +447 @@ nsFeedLoadListener::TryParseAsRDF () - nsCOMPtr itemsContainer = do_CreateInstance (kRDFContainerCID, &rv); + nsCOMPtr itemsContainer = do_CreateInstance (NS_RDF_CONTRACTID "/container;1", &rv); @@ -1018 +1015 @@ nsBookmarksService::UpdateLivemarkChildr - nsCOMPtr container(do_CreateInstance(kRDFContainerCID, &rv)); + nsCOMPtr container(do_CreateInstance(NS_RDF_CONTRACTID "/container;1", &rv)); @@ -1067 +1064 @@ nsBMSVCClearSeqContainer (nsIRDFDataSour - nsCOMPtr itemsContainer = do_CreateInstance (kRDFContainerCID, &rv); + nsCOMPtr itemsContainer = do_CreateInstance (NS_RDF_CONTRACTID "/container;1", &rv); 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 @@ -184,4 +183,0 @@ nsIRDFResource *kDC_date; -static NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID); -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); -static NS_DEFINE_CID(kRDFContainerCID, NS_RDFCONTAINER_CID); -static NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID); @@ -220 +216 @@ bm_AddRefGlobals() - rv = CallGetService(kRDFServiceCID, &gRDF); + rv = CallGetService(NS_RDF_CONTRACTID "/rdf-service;1", &gRDF); @@ -224 +220 @@ bm_AddRefGlobals() - rv = CallGetService(kRDFContainerUtilsCID, &gRDFC); + rv = CallGetService(NS_RDF_CONTRACTID "/container-utils;1", &gRDFC); @@ -972 +968 @@ BookmarkParser::Parse(nsIRDFResource *aC - nsCOMPtr container = do_CreateInstance(kRDFContainerCID, &rv); + nsCOMPtr container = do_CreateInstance(NS_RDF_CONTRACTID "/container;1", &rv); @@ -4529 +4525 @@ nsBookmarksService::InitDataSource() - nsresult rv = CallCreateInstance(kRDFInMemoryDataSourceCID, &mInner); + nsresult rv = CallCreateInstance(NS_RDF_DATASOURCE_CONTRACTID_PREFIX "in-memory-datasource", &mInner); @@ -4551 +4547 @@ nsBookmarksService::InitDataSource() - nsCOMPtr container(do_CreateInstance(kRDFContainerCID, &rv)); + nsCOMPtr container(do_CreateInstance(NS_RDF_CONTRACTID "/container;1", &rv)); @@ -4771 +4767 @@ nsBookmarksService::LoadBookmarks() - nsCOMPtr container(do_CreateInstance(kRDFContainerCID, &rv)); + nsCOMPtr container(do_CreateInstance(NS_RDF_CONTRACTID "/container;1", &rv)); @@ -4884 +4880 @@ nsBookmarksService::WriteBookmarksContai - nsCOMPtr container = do_CreateInstance(kRDFContainerCID, &rv); + nsCOMPtr container = do_CreateInstance(NS_RDF_CONTRACTID "/container;1", &rv); @@ -5529 +5525 @@ nsBookmarksService::ClearBookmarksContai - nsCOMPtr itemsContainer = do_CreateInstance (kRDFContainerCID, &rv); + nsCOMPtr itemsContainer = do_CreateInstance (NS_RDF_CONTRACTID "/container;1", &rv); Index: mozilla/browser/components/bookmarks/src/nsForwardProxyDataSource.cpp =================================================================== RCS file: /cvsroot/mozilla/browser/components/bookmarks/src/nsForwardProxyDataSource.cpp,v retrieving revision 1.2 diff -pU0 -r1.2 mozilla/browser/components/bookmarks/src/nsForwardProxyDataSource.cpp --- mozilla/browser/components/bookmarks/src/nsForwardProxyDataSource.cpp +++ mozilla/browser/components/bookmarks/src/nsForwardProxyDataSource.cpp @@ -58 +57,0 @@ static NS_DEFINE_IID(kISupportsIID, NS_ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); @@ -66 +65 @@ nsForwardProxyDataSource::Init(void) - nsCOMPtr rdf = do_GetService(kRDFServiceCID); + nsCOMPtr rdf = do_GetService(NS_RDF_CONTRACTID "/rdf-service;1"); Index: mozilla/browser/components/places/src/nsBookmarksFeedHandler.cpp =================================================================== RCS file: /cvsroot/mozilla/browser/components/places/src/nsBookmarksFeedHandler.cpp,v retrieving revision 1.13 diff -pU0 -r1.13 mozilla/browser/components/places/src/nsBookmarksFeedHandler.cpp --- mozilla/browser/components/places/src/nsBookmarksFeedHandler.cpp +++ mozilla/browser/components/places/src/nsBookmarksFeedHandler.cpp @@ -88,2 +87,0 @@ static NS_DEFINE_CID(kCParserCID, NS_PAR -static NS_DEFINE_CID(kRDFContainerCID, NS_RDFCONTAINER_CID); -static NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID); @@ -333 +331 @@ nsLivemarkLoadListener::TryParseAsRDF () - nsCOMPtr ds(do_CreateInstance(kRDFInMemoryDataSourceCID, &rv)); + nsCOMPtr ds(do_CreateInstance(NS_RDF_DATASOURCE_CONTRACTID_PREFIX "in-memory-datasource", &rv)); @@ -396 +394 @@ nsLivemarkLoadListener::TryParseAsRDF () - nsCOMPtr itemsContainer = do_CreateInstance (kRDFContainerCID, &rv); + nsCOMPtr itemsContainer = do_CreateInstance (NS_RDF_CONTRACTID "/container;1", &rv); Index: mozilla/browser/components/places/src/nsLivemarkService.cpp =================================================================== RCS file: /cvsroot/mozilla/browser/components/places/src/nsLivemarkService.cpp,v retrieving revision 1.22 diff -pU0 -r1.22 mozilla/browser/components/places/src/nsLivemarkService.cpp --- mozilla/browser/components/places/src/nsLivemarkService.cpp +++ mozilla/browser/components/places/src/nsLivemarkService.cpp @@ -62 +61,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); @@ -149 +148 @@ nsLivemarkService::Init() - pRDF = do_GetService(kRDFServiceCID, &rv); + pRDF = do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv); Index: mozilla/chrome/src/nsChromeUIDataSource.cpp =================================================================== RCS file: /cvsroot/mozilla/chrome/src/nsChromeUIDataSource.cpp,v retrieving revision 1.17 diff -pU0 -r1.17 mozilla/chrome/src/nsChromeUIDataSource.cpp --- mozilla/chrome/src/nsChromeUIDataSource.cpp +++ mozilla/chrome/src/nsChromeUIDataSource.cpp @@ -62,2 +61,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); - @@ -70 +68 @@ nsChromeUIDataSource::nsChromeUIDataSour - rv = CallGetService(kRDFServiceCID, &mRDFService); + rv = CallGetService(NS_RDF_CONTRACTID "/rdf-service;1", &mRDFService); 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 @@ -157,2 +156,0 @@ static NS_DEFINE_CID(kCookieServiceCID, -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); - Index: mozilla/content/xul/document/src/nsXULDocument.cpp =================================================================== RCS file: /cvsroot/mozilla/content/xul/document/src/nsXULDocument.cpp,v retrieving revision 1.714 diff -pU0 -r1.714 mozilla/content/xul/document/src/nsXULDocument.cpp --- mozilla/content/xul/document/src/nsXULDocument.cpp +++ mozilla/content/xul/document/src/nsXULDocument.cpp @@ -130 +129,0 @@ static NS_DEFINE_CID(kParserCID, -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); @@ -1929 +1928 @@ nsXULDocument::Init() - rv = CallGetService(kRDFServiceCID, &gRDFService); + rv = CallGetService(NS_RDF_CONTRACTID "/rdf-service;1", &gRDFService); Index: mozilla/content/xul/templates/src/nsXULContentUtils.cpp =================================================================== RCS file: /cvsroot/mozilla/content/xul/templates/src/nsXULContentUtils.cpp,v retrieving revision 1.76 diff -pU0 -r1.76 mozilla/content/xul/templates/src/nsXULContentUtils.cpp --- mozilla/content/xul/templates/src/nsXULContentUtils.cpp +++ mozilla/content/xul/templates/src/nsXULContentUtils.cpp @@ -95 +94,0 @@ static NS_DEFINE_CID(kDateTimeFormatCID, -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); @@ -120 +119 @@ nsXULContentUtils::Init() - nsresult rv = CallGetService(kRDFServiceCID, &gRDF); + nsresult rv = CallGetService(NS_RDF_CONTRACTID "/rdf-service;1", &gRDF); Index: mozilla/content/xul/templates/src/nsXULSortService.cpp =================================================================== RCS file: /cvsroot/mozilla/content/xul/templates/src/nsXULSortService.cpp,v retrieving revision 1.175 diff -pU0 -r1.175 mozilla/content/xul/templates/src/nsXULSortService.cpp --- mozilla/content/xul/templates/src/nsXULSortService.cpp +++ mozilla/content/xul/templates/src/nsXULSortService.cpp @@ -96,4 +95,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); -static NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID); -static NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID); - @@ -211 +207 @@ XULSortServiceImpl::XULSortServiceImpl(v - nsresult rv = CallGetService(kRDFServiceCID, &gRDFService); + nsresult rv = CallGetService(NS_RDF_CONTRACTID "/rdf-service;1", &gRDFService); @@ -215 +211 @@ XULSortServiceImpl::XULSortServiceImpl(v - rv = CallGetService(kRDFContainerUtilsCID, &gRDFC); + rv = CallGetService(NS_RDF_CONTRACTID "/container-utils;1", &gRDFC); @@ -607 +603 @@ XULSortServiceImpl::GetCachedTarget(sort - sortInfo->mInner = do_CreateInstance(kRDFInMemoryDataSourceCID, &rv); + sortInfo->mInner = do_CreateInstance(NS_RDF_DATASOURCE_CONTRACTID_PREFIX "in-memory-datasource", &rv); Index: mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp =================================================================== RCS file: /cvsroot/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp,v retrieving revision 1.329 diff -pU0 -r1.329 mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp --- mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp +++ mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp @@ -104,5 +103,0 @@ - -static NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID); -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); - -//---------------------------------------------------------------------- @@ -179 +174 @@ nsXULTemplateBuilder::InitGlobals() - rv = CallGetService(kRDFServiceCID, &gRDFService); + rv = CallGetService(NS_RDF_CONTRACTID "/rdf-service;1", &gRDFService); @@ -183 +178 @@ nsXULTemplateBuilder::InitGlobals() - rv = CallGetService(kRDFContainerUtilsCID, &gRDFContainerUtils); + rv = CallGetService(NS_RDF_CONTRACTID "/container-utils;1", &gRDFContainerUtils); Index: mozilla/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp =================================================================== RCS file: /cvsroot/mozilla/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp,v retrieving revision 1.3 diff -pU0 -r1.3 mozilla/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp --- mozilla/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp +++ mozilla/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp @@ -71,5 +70,0 @@ -//---------------------------------------------------------------------- - -static NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID); -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); - @@ -114 +109 @@ nsXULTemplateQueryProcessorRDF::InitGlob - rv = CallGetService(kRDFServiceCID, &gRDFService); + rv = CallGetService(NS_RDF_CONTRACTID "/rdf-service;1", &gRDFService); @@ -120 +115 @@ nsXULTemplateQueryProcessorRDF::InitGlob - rv = CallGetService(kRDFContainerUtilsCID, &gRDFContainerUtils); + rv = CallGetService(NS_RDF_CONTRACTID "/container-utils;1", &gRDFContainerUtils); Index: mozilla/extensions/sql/base/src/mozSqlResult.cpp =================================================================== RCS file: /cvsroot/mozilla/extensions/sql/base/src/mozSqlResult.cpp,v retrieving revision 1.19 diff -pU0 -r1.19 mozilla/extensions/sql/base/src/mozSqlResult.cpp --- mozilla/extensions/sql/base/src/mozSqlResult.cpp +++ mozilla/extensions/sql/base/src/mozSqlResult.cpp @@ -49 +48,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); @@ -80 +79 @@ mozSqlResult::Init() - rv = CallGetService(kRDFServiceCID, &gRDFService); + rv = CallGetService(NS_RDF_CONTRACTID "/rdf-service;1", &gRDFService); Index: mozilla/extensions/sql/base/src/mozSqlService.cpp =================================================================== RCS file: /cvsroot/mozilla/extensions/sql/base/src/mozSqlService.cpp,v retrieving revision 1.13 diff -pU0 -r1.13 mozilla/extensions/sql/base/src/mozSqlService.cpp --- mozilla/extensions/sql/base/src/mozSqlService.cpp +++ mozilla/extensions/sql/base/src/mozSqlService.cpp @@ -54,3 +53,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); -static NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID); - @@ -109 +106 @@ mozSqlService::Init() - rv = CallGetService(kRDFServiceCID, &gRDFService); + rv = CallGetService(NS_RDF_CONTRACTID "/rdf-service;1", &gRDFService); @@ -112 +109 @@ mozSqlService::Init() - rv = CallGetService(kRDFContainerUtilsCID, &gRDFContainerUtils); + rv = CallGetService(NS_RDF_CONTRACTID "/container-utils;1", &gRDFContainerUtils); Index: mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp,v retrieving revision 1.142 diff -pU0 -r1.142 mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp --- mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp +++ mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp @@ -3623,2 +3623 @@ NS_IMETHODIMP nsAddrDatabase::AddListDir - static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); - NS_WITH_PROXIED_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, + NS_WITH_PROXIED_SERVICE(nsIRDFService, rdfService, NS_RDF_CONTRACTID "/rdf-service;1", Index: mozilla/mailnews/base/search/src/nsMsgFilterDelegateFactory.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/base/search/src/nsMsgFilterDelegateFactory.cpp,v retrieving revision 1.15 diff -pU0 -r1.15 mozilla/mailnews/base/search/src/nsMsgFilterDelegateFactory.cpp --- mozilla/mailnews/base/search/src/nsMsgFilterDelegateFactory.cpp +++ mozilla/mailnews/base/search/src/nsMsgFilterDelegateFactory.cpp @@ -53,2 +52,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); - @@ -209 +207 @@ nsMsgFilterDelegateFactory::getFilterLis - nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); + nsCOMPtr rdf(do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv)); Index: mozilla/mailnews/base/src/nsMessenger.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/base/src/nsMessenger.cpp,v retrieving revision 1.334 diff -pU0 -r1.334 mozilla/mailnews/base/src/nsMessenger.cpp --- mozilla/mailnews/base/src/nsMessenger.cpp +++ mozilla/mailnews/base/src/nsMessenger.cpp @@ -153 +152,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); @@ -1303 +1302 @@ nsMessenger::DoCommand(nsIRDFCompositeDa - nsCOMPtr rdfService(do_GetService(kRDFServiceCID, &rv)); + nsCOMPtr rdfService(do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv)); @@ -1465 +1464 @@ nsMessenger::RenameFolder(nsIRDFComposit - nsCOMPtr rdfService(do_GetService(kRDFServiceCID, &rv)); + nsCOMPtr rdfService(do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv)); @@ -1821 +1820 @@ nsSaveMsgListener::OnStopRunningUrl(nsIU - nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); + nsCOMPtr rdf(do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv)); Index: mozilla/mailnews/base/src/nsMsgRDFDataSource.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/base/src/nsMsgRDFDataSource.cpp,v retrieving revision 1.56 diff -pU0 -r1.56 mozilla/mailnews/base/src/nsMsgRDFDataSource.cpp --- mozilla/mailnews/base/src/nsMsgRDFDataSource.cpp +++ mozilla/mailnews/base/src/nsMsgRDFDataSource.cpp @@ -47,2 +46,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); - @@ -360 +358 @@ nsMsgRDFDataSource::getRDFService() - mRDFService = do_GetService(kRDFServiceCID, &rv); + mRDFService = do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv); Index: mozilla/mailnews/base/src/nsMsgServiceProvider.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/base/src/nsMsgServiceProvider.cpp,v retrieving revision 1.28 diff -pU0 -r1.28 mozilla/mailnews/base/src/nsMsgServiceProvider.cpp --- mozilla/mailnews/base/src/nsMsgServiceProvider.cpp +++ mozilla/mailnews/base/src/nsMsgServiceProvider.cpp @@ -54,4 +53,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); -static NS_DEFINE_CID(kRDFCompositeDataSourceCID, NS_RDFCOMPOSITEDATASOURCE_CID); -static NS_DEFINE_CID(kRDFXMLDataSourceCID, NS_RDFXMLDATASOURCE_CID); - @@ -74 +70 @@ nsMsgServiceProviderService::Init() - nsCOMPtr rdf = do_GetService(kRDFServiceCID, &rv); + nsCOMPtr rdf = do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv); @@ -77 +73 @@ nsMsgServiceProviderService::Init() - mInnerDataSource = do_CreateInstance(kRDFCompositeDataSourceCID, &rv); + mInnerDataSource = do_CreateInstance(NS_RDF_DATASOURCE_CONTRACTID_PREFIX "composite-datasource", &rv); @@ -124 +120 @@ nsMsgServiceProviderService::LoadDataSou - do_CreateInstance(kRDFXMLDataSourceCID, &rv); + do_CreateInstance(NS_RDF_DATASOURCE_CONTRACTID_PREFIX "xml-datasource", &rv); Index: mozilla/mailnews/base/src/nsSoundDatasource.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/base/src/nsSoundDatasource.cpp,v retrieving revision 1.14 diff -pU0 -r1.14 mozilla/mailnews/base/src/nsSoundDatasource.cpp --- mozilla/mailnews/base/src/nsSoundDatasource.cpp +++ mozilla/mailnews/base/src/nsSoundDatasource.cpp @@ -72,2 +71,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); - @@ -89 +87 @@ nsSoundDatasource::Init() - mRDFService = do_GetService(kRDFServiceCID, &rv); + mRDFService = do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv); Index: mozilla/mailnews/base/src/nsSubscribableServer.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/base/src/nsSubscribableServer.cpp,v retrieving revision 1.44 diff -pU0 -r1.44 mozilla/mailnews/base/src/nsSubscribableServer.cpp --- mozilla/mailnews/base/src/nsSubscribableServer.cpp +++ mozilla/mailnews/base/src/nsSubscribableServer.cpp @@ -59,2 +58,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); - @@ -280 +278 @@ nsSubscribableServer::EnsureRDFService() - mRDFService = do_GetService(kRDFServiceCID, &rv); + mRDFService = do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv); Index: mozilla/mailnews/base/src/nsSubscribeDataSource.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/base/src/nsSubscribeDataSource.cpp,v retrieving revision 1.21 diff -pU0 -r1.21 mozilla/mailnews/base/src/nsSubscribeDataSource.cpp --- mozilla/mailnews/base/src/nsSubscribeDataSource.cpp +++ mozilla/mailnews/base/src/nsSubscribeDataSource.cpp @@ -53,2 +52,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); - @@ -81 +79 @@ nsSubscribeDataSource::Init() - mRDFService = do_GetService(kRDFServiceCID, &rv); + mRDFService = do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv); Index: mozilla/mailnews/base/util/nsMsgDBFolder.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/base/util/nsMsgDBFolder.cpp,v retrieving revision 1.273 diff -pU0 -r1.273 mozilla/mailnews/base/util/nsMsgDBFolder.cpp --- mozilla/mailnews/base/util/nsMsgDBFolder.cpp +++ mozilla/mailnews/base/util/nsMsgDBFolder.cpp @@ -100 +99,0 @@ static PRTime gtimeOfLastPurgeCheck; -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); @@ -2290 +2289 @@ nsMsgDBFolder::FindSubFolder(const nsACS - nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); + nsCOMPtr rdf(do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv)); @@ -3645 +3644 @@ NS_IMETHODIMP nsMsgDBFolder::SetPrefFlag - nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); + nsCOMPtr rdf(do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv)); Index: mozilla/mailnews/base/util/nsMsgIdentity.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/base/util/nsMsgIdentity.cpp,v retrieving revision 1.77 diff -pU0 -r1.77 mozilla/mailnews/base/util/nsMsgIdentity.cpp --- mozilla/mailnews/base/util/nsMsgIdentity.cpp +++ mozilla/mailnews/base/util/nsMsgIdentity.cpp @@ -60,2 +59,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); - @@ -599 +597 @@ nsMsgIdentity::getFolderPref(const char - nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); + nsCOMPtr rdf(do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv)); @@ -641 +639 @@ nsMsgIdentity::setFolderPref(const char - nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); + nsCOMPtr rdf(do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv)); Index: mozilla/mailnews/compose/src/nsMsgCopy.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/compose/src/nsMsgCopy.cpp,v retrieving revision 1.90 diff -pU0 -r1.90 mozilla/mailnews/compose/src/nsMsgCopy.cpp --- mozilla/mailnews/compose/src/nsMsgCopy.cpp +++ mozilla/mailnews/compose/src/nsMsgCopy.cpp @@ -64,2 +63,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); - @@ -429 +427 @@ LocateMessageFolder(nsIMsgIdentity *us - nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); + nsCOMPtr rdf(do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv)); Index: mozilla/mailnews/compose/src/nsMsgSend.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/compose/src/nsMsgSend.cpp,v retrieving revision 1.380 diff -pU0 -r1.380 mozilla/mailnews/compose/src/nsMsgSend.cpp --- mozilla/mailnews/compose/src/nsMsgSend.cpp +++ mozilla/mailnews/compose/src/nsMsgSend.cpp @@ -115,2 +114,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); - @@ -4501 +4499 @@ nsMsgComposeAndSend::MimeDoFCC(nsFileSpe - nsCOMPtr rdfService = do_GetService(kRDFServiceCID); + nsCOMPtr rdfService = do_GetService(NS_RDF_CONTRACTID "/rdf-service;1"); Index: mozilla/mailnews/compose/src/nsSmtpDataSource.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/compose/src/nsSmtpDataSource.cpp,v retrieving revision 1.21 diff -pU0 -r1.21 mozilla/mailnews/compose/src/nsSmtpDataSource.cpp --- mozilla/mailnews/compose/src/nsSmtpDataSource.cpp +++ mozilla/mailnews/compose/src/nsSmtpDataSource.cpp @@ -50,2 +49,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); - @@ -87 +85 @@ nsSmtpDataSource::initGlobalObjects() - nsCOMPtr rdf = do_GetService(kRDFServiceCID, &rv); + nsCOMPtr rdf = do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv); @@ -165 +163 @@ nsSmtpDataSource::GetTarget(nsIRDFResour - do_GetService(kRDFServiceCID, &rv); + do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv); @@ -248 +246 @@ nsSmtpDataSource::GetSmtpServerTargets(n - do_GetService(kRDFServiceCID, &rv); + do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv); 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 --- mozilla/mailnews/imap/src/nsImapIncomingServer.cpp +++ mozilla/mailnews/imap/src/nsImapIncomingServer.cpp @@ -101 +100,0 @@ static NS_DEFINE_CID(kImapProtocolCID, N -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); @@ -1619 +1618 @@ nsresult nsImapIncomingServer::GetFolder - nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); + nsCOMPtr rdf(do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv)); Index: mozilla/mailnews/imap/src/nsImapMailFolder.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/imap/src/nsImapMailFolder.cpp,v retrieving revision 1.722 diff -pU0 -r1.722 mozilla/mailnews/imap/src/nsImapMailFolder.cpp --- mozilla/mailnews/imap/src/nsImapMailFolder.cpp +++ mozilla/mailnews/imap/src/nsImapMailFolder.cpp @@ -117 +116,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); @@ -389 +388 @@ NS_IMETHODIMP nsImapMailFolder::AddSubfo - nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); + nsCOMPtr rdf(do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv)); @@ -901 +900 @@ NS_IMETHODIMP nsImapMailFolder::CreateCl - nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); + nsCOMPtr rdf(do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv)); @@ -1070 +1069 @@ NS_IMETHODIMP nsImapMailFolder::CreateSt - nsCOMPtr rdf(do_GetService(kRDFServiceCID, &status)); + nsCOMPtr rdf(do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &status)); @@ -3872 +3871 @@ nsresult nsImapMailFolder::MoveIncorpora - nsCOMPtr rdf(do_GetService(kRDFServiceCID, &err)); + nsCOMPtr rdf(do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &err)); @@ -6357 +6356 @@ nsresult nsImapMailFolder::GetClearedOri - nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); + nsCOMPtr rdf(do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv)); @@ -6405 +6404 @@ nsresult nsImapMailFolder::GetOriginalOp - nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); + nsCOMPtr rdf(do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv)); Index: mozilla/mailnews/imap/src/nsImapOfflineSync.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/imap/src/nsImapOfflineSync.cpp,v retrieving revision 1.56 diff -pU0 -r1.56 mozilla/mailnews/imap/src/nsImapOfflineSync.cpp --- mozilla/mailnews/imap/src/nsImapOfflineSync.cpp +++ mozilla/mailnews/imap/src/nsImapOfflineSync.cpp @@ -55,2 +54,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); - @@ -325 +323 @@ nsImapOfflineSync::ProcessAppendMsgOpera - nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); + nsCOMPtr rdf(do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv)); @@ -444 +442 @@ void nsImapOfflineSync::ProcessMoveOpera - nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); + nsCOMPtr rdf(do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv)); @@ -541 +539 @@ void nsImapOfflineSync::ProcessCopyOpera - nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); + nsCOMPtr rdf(do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv)); Index: mozilla/mailnews/import/src/nsImportAddressBooks.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/import/src/nsImportAddressBooks.cpp,v retrieving revision 1.53 diff -pU0 -r1.53 mozilla/mailnews/import/src/nsImportAddressBooks.cpp --- mozilla/mailnews/import/src/nsImportAddressBooks.cpp +++ mozilla/mailnews/import/src/nsImportAddressBooks.cpp @@ -74 +73,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); @@ -821 +820 @@ nsIAddrDatabase *GetAddressBook( const P - NS_WITH_PROXIED_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, + NS_WITH_PROXIED_SERVICE(nsIRDFService, rdfService, NS_RDF_CONTRACTID "/rdf-service;1", 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 @@ -93 +92,0 @@ static NS_DEFINE_CID(kIOServiceCID, -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); @@ -1805 +1804 @@ NS_IMETHODIMP nsParseNewMailState::Apply - nsCOMPtr rdf(do_GetService(kRDFServiceCID, &err)); + nsCOMPtr rdf(do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &err)); Index: mozilla/mailnews/local/src/nsPop3Service.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/local/src/nsPop3Service.cpp,v retrieving revision 1.110 diff -pU0 -r1.110 mozilla/mailnews/local/src/nsPop3Service.cpp --- mozilla/mailnews/local/src/nsPop3Service.cpp +++ mozilla/mailnews/local/src/nsPop3Service.cpp @@ -76 +75,0 @@ static NS_DEFINE_CID(kPop3UrlCID, NS_POP -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); @@ -311 +310 @@ NS_IMETHODIMP nsPop3Service::NewURI(cons - nsCOMPtr rdfService(do_GetService(kRDFServiceCID, &rv)); + nsCOMPtr rdfService(do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv)); Index: mozilla/mailnews/news/src/nsNewsFolder.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/news/src/nsNewsFolder.cpp,v retrieving revision 1.267 diff -pU0 -r1.267 mozilla/mailnews/news/src/nsNewsFolder.cpp --- mozilla/mailnews/news/src/nsNewsFolder.cpp +++ mozilla/mailnews/news/src/nsNewsFolder.cpp @@ -102 +101,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); @@ -202 +201 @@ nsMsgNewsFolder::AddNewsgroup(const nsAC - nsCOMPtr rdf = do_GetService(kRDFServiceCID, &rv); + nsCOMPtr rdf = do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv); Index: mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp =================================================================== RCS file: /cvsroot/mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp,v retrieving revision 1.64 diff -pU0 -r1.64 mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp --- mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp +++ mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp @@ -77 +76,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); @@ -207 +206 @@ nsDownloadManager::Init() - rv = CallGetService(kRDFServiceCID, &gRDFService); + rv = CallGetService(NS_RDF_CONTRACTID "/rdf-service;1", &gRDFService); Index: mozilla/toolkit/components/history/src/nsGlobalHistory.cpp =================================================================== RCS file: /cvsroot/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp,v retrieving revision 1.73 diff -pU0 -r1.73 mozilla/toolkit/components/history/src/nsGlobalHistory.cpp --- mozilla/toolkit/components/history/src/nsGlobalHistory.cpp +++ mozilla/toolkit/components/history/src/nsGlobalHistory.cpp @@ -138 +137,0 @@ nsIPrefBranch* nsGlobalHistory::gPrefBra -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); @@ -2617 +2616 @@ nsGlobalHistory::Init() - rv = CallGetService(kRDFServiceCID, &gRDFService); + rv = CallGetService(NS_RDF_CONTRACTID "/rdf-service;1", &gRDFService); Index: mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp =================================================================== RCS file: /cvsroot/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp,v retrieving revision 1.299 diff -pU0 -r1.299 mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp --- mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp +++ mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -129 +128,0 @@ static const char NEVER_ASK_FOR_OPEN_FIL -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); @@ -518 +517 @@ nsresult nsExternalHelperAppService::Ini - nsCOMPtr rdf = do_GetService(kRDFServiceCID, &rv); + nsCOMPtr rdf = do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv); @@ -860 +859 @@ PRBool nsExternalHelperAppService::MIMET - nsCOMPtr rdf = do_GetService(kRDFServiceCID, &rv); + nsCOMPtr rdf = do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv); @@ -899 +898 @@ nsresult nsExternalHelperAppService::Get - nsCOMPtr rdf = do_GetService(kRDFServiceCID, &rv); + nsCOMPtr rdf = do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv); @@ -962 +961 @@ PRBool nsExternalHelperAppService::GetTy - nsCOMPtr rdf = do_GetService(kRDFServiceCID, &rv); + nsCOMPtr rdf = do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv); 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 @@ -161,4 +160,0 @@ nsIRDFResource *kNC_BookmarkCommand -static NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID); -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); -static NS_DEFINE_CID(kRDFContainerCID, NS_RDFCONTAINER_CID); -static NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID); @@ -201 +197 @@ bm_AddRefGlobals() - rv = CallGetService(kRDFServiceCID, &gRDF); + rv = CallGetService(NS_RDF_CONTRACTID "/rdf-service;1", &gRDF); @@ -207 +203 @@ bm_AddRefGlobals() - rv = CallGetService(kRDFContainerUtilsCID, &gRDFC); + rv = CallGetService(NS_RDF_CONTRACTID "/container-utils;1", &gRDFC); @@ -846 +842 @@ BookmarkParser::Parse(nsIRDFResource *aC - do_CreateInstance(kRDFContainerCID, &rv); + do_CreateInstance(NS_RDF_CONTRACTID "/container;1", &rv); @@ -4651 +4647 @@ nsBookmarksService::deleteBookmarkItem(n - do_CreateInstance(kRDFContainerCID, &rv); + do_CreateInstance(NS_RDF_CONTRACTID "/container;1", &rv); @@ -5119 +5115 @@ nsBookmarksService::initDatasource() - nsresult rv = CallCreateInstance(kRDFInMemoryDataSourceCID, &mInner); + nsresult rv = CallCreateInstance(NS_RDF_DATASOURCE_CONTRACTID_PREFIX "in-memory-datasource", &mInner); @@ -5141 +5137 @@ nsBookmarksService::initDatasource() - nsCOMPtr container(do_CreateInstance(kRDFContainerCID, &rv)); + nsCOMPtr container(do_CreateInstance(NS_RDF_CONTRACTID "/container;1", &rv)); @@ -5294 +5290 @@ nsBookmarksService::LoadBookmarks() - nsCOMPtr rootContainer(do_CreateInstance(kRDFContainerCID, &rv)); + nsCOMPtr rootContainer(do_CreateInstance(NS_RDF_CONTRACTID "/container;1", &rv)); @@ -5321 +5317 @@ nsBookmarksService::LoadBookmarks() - nsCOMPtr container(do_CreateInstance(kRDFContainerCID, &rv)); + nsCOMPtr container(do_CreateInstance(NS_RDF_CONTRACTID "/container;1", &rv)); @@ -5343 +5339 @@ nsBookmarksService::LoadBookmarks() - nsCOMPtr bookmarksRoot(do_CreateInstance(kRDFContainerCID, &rv)); + nsCOMPtr bookmarksRoot(do_CreateInstance(NS_RDF_CONTRACTID "/container;1", &rv)); @@ -5376 +5372 @@ nsBookmarksService::LoadBookmarks() - nsCOMPtr container(do_CreateInstance(kRDFContainerCID, &rv)); + nsCOMPtr container(do_CreateInstance(NS_RDF_CONTRACTID "/container;1", &rv)); @@ -5486 +5482 @@ nsBookmarksService::WriteBookmarksContai - do_CreateInstance(kRDFContainerCID, &rv); + do_CreateInstance(NS_RDF_CONTRACTID "/container;1", &rv); Index: mozilla/xpfe/components/directory/nsDirectoryViewer.cpp =================================================================== RCS file: /cvsroot/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp,v retrieving revision 1.124 diff -pU0 -r1.124 mozilla/xpfe/components/directory/nsDirectoryViewer.cpp --- mozilla/xpfe/components/directory/nsDirectoryViewer.cpp +++ mozilla/xpfe/components/directory/nsDirectoryViewer.cpp @@ -96,7 +95,0 @@ static const int FORMAT_XUL = 3; -//---------------------------------------------------------------------- -// -// Common CIDs -// - -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); - @@ -608 +601 @@ nsHTTPIndex::CommonInit() - mDirRDF = do_GetService(kRDFServiceCID, &rv); + mDirRDF = do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv); Index: mozilla/xpfe/components/history/src/nsGlobalHistory.cpp =================================================================== RCS file: /cvsroot/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp,v retrieving revision 1.219 diff -pU0 -r1.219 mozilla/xpfe/components/history/src/nsGlobalHistory.cpp --- mozilla/xpfe/components/history/src/nsGlobalHistory.cpp +++ mozilla/xpfe/components/history/src/nsGlobalHistory.cpp @@ -128,5 +127,0 @@ static const PRInt64 MSECS_PER_DAY = LL_ -//---------------------------------------------------------------------- -// -// CIDs - -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); @@ -2509 +2504 @@ nsGlobalHistory::Init() - rv = CallGetService(kRDFServiceCID, &gRDFService); + rv = CallGetService(NS_RDF_CONTRACTID "/rdf-service;1", &gRDFService); Index: mozilla/xpfe/components/intl/nsCharsetMenu.cpp =================================================================== RCS file: /cvsroot/mozilla/xpfe/components/intl/nsCharsetMenu.cpp,v retrieving revision 1.43 diff -pU0 -r1.43 mozilla/xpfe/components/intl/nsCharsetMenu.cpp --- mozilla/xpfe/components/intl/nsCharsetMenu.cpp +++ mozilla/xpfe/components/intl/nsCharsetMenu.cpp @@ -73 +72,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); @@ -75,3 +73,0 @@ static NS_DEFINE_CID(kCharsetConverterMa -static NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID); -static NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID); -static NS_DEFINE_CID(kRDFContainerCID, NS_RDFCONTAINER_CID); @@ -512 +508 @@ nsCharsetMenu::nsCharsetMenu() - mRDFService = do_GetService(kRDFServiceCID, &res); + mRDFService = do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &res); @@ -517 +513 @@ nsCharsetMenu::nsCharsetMenu() - CallCreateInstance(kRDFInMemoryDataSourceCID, &mInner); + CallCreateInstance(NS_RDF_DATASOURCE_CONTRACTID_PREFIX "in-memory-datasource", &mInner); @@ -748 +744 @@ nsresult nsCharsetMenu::Init() - res = CallGetService(kRDFContainerUtilsCID, &rdfUtil); + res = CallGetService(NS_RDF_CONTRACTID "/container-utils;1", &rdfUtil); @@ -1722 +1718 @@ nsresult nsCharsetMenu::NewRDFContainer( - nsresult res = CallCreateInstance(kRDFContainerCID, aResult); + nsresult res = CallCreateInstance(NS_RDF_CONTRACTID "/container;1", aResult); Index: mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp =================================================================== RCS file: /cvsroot/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp,v retrieving revision 1.75 diff -pU0 -r1.75 mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp --- mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp +++ mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp @@ -74,2 +73,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); -static NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID); @@ -210 +208 @@ RelatedLinksStreamListener::Init() - nsresult rv = CallGetService(kRDFServiceCID, &gRDFService); + nsresult rv = CallGetService(NS_RDF_CONTRACTID "/rdf-service;1", &gRDFService); @@ -624 +622 @@ RelatedLinksHandlerImpl::Init() - rv = CallGetService(kRDFServiceCID, &gRDFService); + rv = CallGetService(NS_RDF_CONTRACTID "/rdf-service;1", &gRDFService); @@ -656 +654 @@ RelatedLinksHandlerImpl::Init() - mInner = do_CreateInstance(kRDFInMemoryDataSourceCID, &rv); + mInner = do_CreateInstance(NS_RDF_DATASOURCE_CONTRACTID_PREFIX "in-memory-datasource", &rv); 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 --- mozilla/xpfe/components/search/src/nsLocalSearchService.cpp +++ mozilla/xpfe/components/search/src/nsLocalSearchService.cpp @@ -64 +63,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); @@ -99 +98 @@ LocalSearchDataSource::LocalSearchDataSo - nsresult rv = CallGetService(kRDFServiceCID, &gRDFService); + nsresult rv = CallGetService(NS_RDF_CONTRACTID "/rdf-service;1", &gRDFService); Index: mozilla/xpinstall/src/nsUpdateNotification.cpp =================================================================== RCS file: /cvsroot/mozilla/xpinstall/src/nsUpdateNotification.cpp,v retrieving revision 1.14 diff -pU0 -r1.14 mozilla/xpinstall/src/nsUpdateNotification.cpp --- mozilla/xpinstall/src/nsUpdateNotification.cpp +++ mozilla/xpinstall/src/nsUpdateNotification.cpp @@ -74,3 +73,0 @@ -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); -static NS_DEFINE_CID(kRDFContainerCID, NS_RDFCONTAINER_CID); - @@ -96,3 +93 @@ nsXPINotifierImpl::nsXPINotifierImpl() - static NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID); - - mNotifications = do_CreateInstance(kRDFInMemoryDataSourceCID); + mNotifications = do_CreateInstance(NS_RDF_DATASOURCE_CONTRACTID_PREFIX "in-memory-datasource"); @@ -201 +196 @@ nsXPINotifierImpl::Init() - rv = CallGetService(kRDFServiceCID, &mRDF); + rv = CallGetService(NS_RDF_CONTRACTID "/rdf-service;1", &mRDF); @@ -225 +220 @@ nsXPINotifierImpl::Init() - distributorsContainer = do_CreateInstance(kRDFContainerCID, &rv); + distributorsContainer = do_CreateInstance(NS_RDF_CONTRACTID "/container;1", &rv); @@ -397 +391,0 @@ nsXPINotifierImpl::OpenRemoteDataSource( - static NS_DEFINE_CID(kRDFXMLDataSourceCID, NS_RDFXMLDATASOURCE_CID); @@ -400 +394 @@ nsXPINotifierImpl::OpenRemoteDataSource( - nsCOMPtr remote = do_CreateInstance(kRDFXMLDataSourceCID, &rv); + nsCOMPtr remote = do_CreateInstance(NS_RDF_DATASOURCE_CONTRACTID_PREFIX "xml-datasource", &rv); @@ -486 +480 @@ nsXPINotifierImpl::OnEndLoad(nsIRDFXMLSi - do_CreateInstance(kRDFContainerCID, &rv); + do_CreateInstance(NS_RDF_CONTRACTID "/container;1", &rv);