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 @@ -189,3 +188,0 @@ static NS_DEFINE_CID(kIOServiceCID, -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); -static NS_DEFINE_CID(kPlatformCharsetCID, NS_PLATFORMCHARSET_CID); @@ -671 +668 @@ BookmarkParser::Init(nsIFile *aFile, nsI - do_GetService(kPlatformCharsetCID, &rv); + do_GetService(NS_PLATFORMCHARSET_CONTRACTID, &rv); @@ -679 +676 @@ BookmarkParser::Init(nsIFile *aFile, nsI - do_GetService(kCharsetConverterManagerCID, &rv); + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); @@ -1129 +1126 @@ BookmarkParser::ParseMetaTag(const nsStr - rv = CallGetService(kCharsetConverterManagerCID, &charsetConv); + rv = CallGetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &charsetConv); @@ -1704 +1701 @@ nsBookmarksService::Init() - nsCOMPtr stringService = do_GetService(kStringBundleServiceCID, &rv); + nsCOMPtr stringService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); Index: mozilla/browser/components/migration/src/nsBrowserProfileMigratorUtils.cpp =================================================================== RCS file: /cvsroot/mozilla/browser/components/migration/src/nsBrowserProfileMigratorUtils.cpp,v retrieving revision 1.10 diff -pU0 -r1.10 mozilla/browser/components/migration/src/nsBrowserProfileMigratorUtils.cpp --- mozilla/browser/components/migration/src/nsBrowserProfileMigratorUtils.cpp +++ mozilla/browser/components/migration/src/nsBrowserProfileMigratorUtils.cpp @@ -65,2 +64,0 @@ -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); - @@ -265 +263 @@ ImportBookmarksHTML(nsIFile* aBookmarksF - do_GetService(kStringBundleServiceCID, &rv); + do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); Index: mozilla/browser/components/migration/src/nsIEProfileMigrator.cpp =================================================================== RCS file: /cvsroot/mozilla/browser/components/migration/src/nsIEProfileMigrator.cpp,v retrieving revision 1.37 diff -pU0 -r1.37 mozilla/browser/components/migration/src/nsIEProfileMigrator.cpp --- mozilla/browser/components/migration/src/nsIEProfileMigrator.cpp +++ mozilla/browser/components/migration/src/nsIEProfileMigrator.cpp @@ -99 +98,0 @@ -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); @@ -1135 +1134 @@ nsIEProfileMigrator::CopyFavorites(PRBoo - nsCOMPtr bundleService = do_GetService(kStringBundleServiceCID, &rv); + nsCOMPtr bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); @@ -1219 +1218 @@ nsIEProfileMigrator::CopySmartKeywords(n - nsCOMPtr bundleService = do_GetService(kStringBundleServiceCID); + nsCOMPtr bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID); Index: mozilla/browser/components/migration/src/nsMacIEProfileMigrator.cpp =================================================================== RCS file: /cvsroot/mozilla/browser/components/migration/src/nsMacIEProfileMigrator.cpp,v retrieving revision 1.9 diff -pU0 -r1.9 mozilla/browser/components/migration/src/nsMacIEProfileMigrator.cpp --- mozilla/browser/components/migration/src/nsMacIEProfileMigrator.cpp +++ mozilla/browser/components/migration/src/nsMacIEProfileMigrator.cpp @@ -55,2 +54,0 @@ -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); - @@ -194 +192 @@ nsMacIEProfileMigrator::CopyBookmarks(PR - do_GetService(kStringBundleServiceCID, &rv); + do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); Index: mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp =================================================================== RCS file: /cvsroot/mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp,v retrieving revision 1.48 diff -pU0 -r1.48 mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp --- mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp +++ mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp @@ -77 +76,0 @@ -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); @@ -1065 +1064 @@ nsOperaProfileMigrator::CopyBookmarks(PR - nsCOMPtr bundleService(do_GetService(kStringBundleServiceCID)); + nsCOMPtr bundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID)); Index: mozilla/browser/components/migration/src/nsSafariProfileMigrator.cpp =================================================================== RCS file: /cvsroot/mozilla/browser/components/migration/src/nsSafariProfileMigrator.cpp,v retrieving revision 1.24 diff -pU0 -r1.24 mozilla/browser/components/migration/src/nsSafariProfileMigrator.cpp --- mozilla/browser/components/migration/src/nsSafariProfileMigrator.cpp +++ mozilla/browser/components/migration/src/nsSafariProfileMigrator.cpp @@ -83,2 +82,0 @@ -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); - @@ -915 +913 @@ nsSafariProfileMigrator::CopyBookmarks(P - nsCOMPtr bundleService = do_GetService(kStringBundleServiceCID, &rv); + nsCOMPtr bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); Index: mozilla/browser/components/places/src/nsNavHistory.cpp =================================================================== RCS file: /cvsroot/mozilla/browser/components/places/src/nsNavHistory.cpp,v retrieving revision 1.100 diff -pU0 -r1.100 mozilla/browser/components/places/src/nsNavHistory.cpp --- mozilla/browser/components/places/src/nsNavHistory.cpp +++ mozilla/browser/components/places/src/nsNavHistory.cpp @@ -336 +335,0 @@ nsNavHistory::Init() - static NS_DEFINE_CID(kCollationFactoryCID, NS_COLLATIONFACTORY_CID); @@ -338 +337 @@ nsNavHistory::Init() - kCollationFactoryCID, &rv); + NS_COLLATIONFACTORY_CONTRACTID, &rv); @@ -344,2 +343 @@ nsNavHistory::Init() - static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID); - mDateFormatter = do_CreateInstance(kDateTimeFormatCID, &rv); + mDateFormatter = do_CreateInstance(NS_DATETIMEFORMAT_CONTRACTID, &rv); Index: mozilla/content/base/src/nsDocument.cpp =================================================================== RCS file: /cvsroot/mozilla/content/base/src/nsDocument.cpp,v retrieving revision 3.643 diff -pU0 -r3.643 mozilla/content/base/src/nsDocument.cpp --- mozilla/content/base/src/nsDocument.cpp +++ mozilla/content/base/src/nsDocument.cpp @@ -156,2 +155,0 @@ static PRLogModuleInfo* gDocumentLeakPRL -static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID); - Index: mozilla/content/base/src/nsScriptLoader.cpp =================================================================== RCS file: /cvsroot/mozilla/content/base/src/nsScriptLoader.cpp,v retrieving revision 1.92 diff -pU0 -r1.92 mozilla/content/base/src/nsScriptLoader.cpp --- mozilla/content/base/src/nsScriptLoader.cpp +++ mozilla/content/base/src/nsScriptLoader.cpp @@ -70,2 +69,0 @@ -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); - @@ -870 +868 @@ nsScriptLoader::ConvertToUTF16(nsIChanne - do_GetService(kCharsetConverterManagerCID, &rv); + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); Index: mozilla/content/base/src/nsXMLHttpRequest.cpp =================================================================== RCS file: /cvsroot/mozilla/content/base/src/nsXMLHttpRequest.cpp,v retrieving revision 1.152 diff -pU0 -r1.152 mozilla/content/base/src/nsXMLHttpRequest.cpp --- mozilla/content/base/src/nsXMLHttpRequest.cpp +++ mozilla/content/base/src/nsXMLHttpRequest.cpp @@ -93 +92,0 @@ static NS_DEFINE_CID(kIDOMDOMImplementat -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); @@ -1102 +1101 @@ nsXMLHttpRequest::GetStreamForWString(co - do_GetService(kCharsetConverterManagerCID, &rv); + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); Index: mozilla/content/xslt/src/xslt/txXPathResultComparator.cpp =================================================================== RCS file: /cvsroot/mozilla/content/xslt/src/xslt/txXPathResultComparator.cpp,v retrieving revision 1.15 diff -pU0 -r1.15 mozilla/content/xslt/src/xslt/txXPathResultComparator.cpp --- mozilla/content/xslt/src/xslt/txXPathResultComparator.cpp +++ mozilla/content/xslt/src/xslt/txXPathResultComparator.cpp @@ -50,2 +49,0 @@ - -static NS_DEFINE_CID(kCollationFactoryCID, NS_COLLATIONFACTORY_CID); @@ -99 +97 @@ nsresult txResultStringComparator::init( - do_CreateInstance(kCollationFactoryCID, &rv); + do_CreateInstance(NS_COLLATIONFACTORY_CONTRACTID, &rv); 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 @@ -94 +93,0 @@ -static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID); @@ -96,2 +94,0 @@ static NS_DEFINE_CID(kRDFServiceCID, -static NS_DEFINE_CID(kCollationFactoryCID, NS_COLLATIONFACTORY_CID); - @@ -141 +138 @@ nsXULContentUtils::Init() - rv = CallCreateInstance(kDateTimeFormatCID, &gFormat); + rv = CallCreateInstance(NS_DATETIMEFORMAT_CONTRACTID, &gFormat); @@ -184 +181 @@ nsXULContentUtils::GetCollation() - do_CreateInstance(kCollationFactoryCID); + do_CreateInstance(NS_COLLATIONFACTORY_CONTRACTID); 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 @@ -177 +176,0 @@ static NS_DEFINE_CID(kSimpleURICID, NS_S -static NS_DEFINE_CID(kDocumentCharsetInfoCID, NS_DOCUMENTCHARSETINFO_CID); @@ -1346 +1345 @@ nsDocShell::GetDocumentCharsetInfo(nsIDo - mDocumentCharsetInfo = do_CreateInstance(kDocumentCharsetInfoCID); + mDocumentCharsetInfo = do_CreateInstance(NS_DOCUMENTCHARSETINFO_CONTRACTID); Index: mozilla/dom/src/base/nsJSEnvironment.cpp =================================================================== RCS file: /cvsroot/mozilla/dom/src/base/nsJSEnvironment.cpp,v retrieving revision 1.280 diff -pU0 -r1.280 mozilla/dom/src/base/nsJSEnvironment.cpp --- mozilla/dom/src/base/nsJSEnvironment.cpp +++ mozilla/dom/src/base/nsJSEnvironment.cpp @@ -98,2 +97,0 @@ -static NS_DEFINE_CID(kCollationFactoryCID, NS_COLLATIONFACTORY_CID); - @@ -450 +448 @@ LocaleCompare(JSContext *cx, JSString *s - do_CreateInstance(kCollationFactoryCID, &rv); + do_CreateInstance(NS_COLLATIONFACTORY_CONTRACTID, &rv); Index: mozilla/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp =================================================================== RCS file: /cvsroot/mozilla/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp,v retrieving revision 1.27 diff -pU0 -r1.27 mozilla/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp --- mozilla/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp +++ mozilla/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp @@ -102,2 +101,0 @@ static NS_DEFINE_IID(kPrinterEnumeratorC -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); - @@ -374 +372 @@ GetLocalizedBundle(const char * aPropFil - do_GetService(kStringBundleServiceCID, &rv); + do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); Index: mozilla/embedding/components/windowwatcher/src/nsPromptService.cpp =================================================================== RCS file: /cvsroot/mozilla/embedding/components/windowwatcher/src/nsPromptService.cpp,v retrieving revision 1.31 diff -pU0 -r1.31 mozilla/embedding/components/windowwatcher/src/nsPromptService.cpp --- mozilla/embedding/components/windowwatcher/src/nsPromptService.cpp +++ mozilla/embedding/components/windowwatcher/src/nsPromptService.cpp @@ -56,2 +55,0 @@ static const char kWarningIconClass[] = -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); - @@ -669 +667 @@ nsPromptService::GetLocaleString(const c - nsCOMPtr stringService = do_GetService(kStringBundleServiceCID); + nsCOMPtr stringService = do_GetService(NS_STRINGBUNDLE_CONTRACTID); Index: mozilla/embedding/tests/mfcembed/components/nsPrintDialogUtil.cpp =================================================================== RCS file: /cvsroot/mozilla/embedding/tests/mfcembed/components/nsPrintDialogUtil.cpp,v retrieving revision 1.17 diff -pU0 -r1.17 mozilla/embedding/tests/mfcembed/components/nsPrintDialogUtil.cpp --- mozilla/embedding/tests/mfcembed/components/nsPrintDialogUtil.cpp +++ mozilla/embedding/tests/mfcembed/components/nsPrintDialogUtil.cpp @@ -92,2 +91,0 @@ static NS_DEFINE_IID(kPrinterEnumeratorC -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); - @@ -361 +359 @@ GetLocalizedBundle(const char * aPropFil - do_GetService(kStringBundleServiceCID, &rv); + do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); Index: mozilla/extensions/spellcheck/myspell/src/csutil.cpp =================================================================== RCS file: /cvsroot/mozilla/extensions/spellcheck/myspell/src/csutil.cpp,v retrieving revision 1.6 diff -pU0 -r1.6 mozilla/extensions/spellcheck/myspell/src/csutil.cpp --- mozilla/extensions/spellcheck/myspell/src/csutil.cpp +++ mozilla/extensions/spellcheck/myspell/src/csutil.cpp @@ -15,3 +14,0 @@ -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); -static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID); - @@ -200 +197 @@ struct cs_info * get_current_cs(const ch - nsCOMPtr ccm = do_GetService(kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); @@ -211 +208 @@ struct cs_info * get_current_cs(const ch - caseConv = do_GetService(kUnicharUtilCID, &rv); + caseConv = do_GetService(NS_UNICHARUTIL_CONTRACTID, &rv); Index: mozilla/extensions/spellcheck/myspell/src/mozMySpell.cpp =================================================================== RCS file: /cvsroot/mozilla/extensions/spellcheck/myspell/src/mozMySpell.cpp,v retrieving revision 1.13 diff -pU0 -r1.13 mozilla/extensions/spellcheck/myspell/src/mozMySpell.cpp --- mozilla/extensions/spellcheck/myspell/src/mozMySpell.cpp +++ mozilla/extensions/spellcheck/myspell/src/mozMySpell.cpp @@ -74,2 +73,0 @@ const PRInt32 kFirstDirSize=8; -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); -static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID); @@ -148 +146 @@ NS_IMETHODIMP mozMySpell::SetDictionary( - nsCOMPtr ccm = do_GetService(kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); Index: mozilla/extensions/spellcheck/src/mozEnglishWordUtils.cpp =================================================================== RCS file: /cvsroot/mozilla/extensions/spellcheck/src/mozEnglishWordUtils.cpp,v retrieving revision 1.9 diff -pU0 -r1.9 mozilla/extensions/spellcheck/src/mozEnglishWordUtils.cpp --- mozilla/extensions/spellcheck/src/mozEnglishWordUtils.cpp +++ mozilla/extensions/spellcheck/src/mozEnglishWordUtils.cpp @@ -46,2 +45,0 @@ -static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID); - @@ -84 +82 @@ NS_IMETHODIMP mozEnglishWordUtils::GetRo - mCaseConv = do_GetService(kUnicharUtilCID); + mCaseConv = do_GetService(NS_UNICHARUTIL_CONTRACTID); Index: mozilla/extensions/spellcheck/src/mozPersonalDictionary.cpp =================================================================== RCS file: /cvsroot/mozilla/extensions/spellcheck/src/mozPersonalDictionary.cpp,v retrieving revision 1.10 diff -pU0 -r1.10 mozilla/extensions/spellcheck/src/mozPersonalDictionary.cpp --- mozilla/extensions/spellcheck/src/mozPersonalDictionary.cpp +++ mozilla/extensions/spellcheck/src/mozPersonalDictionary.cpp @@ -55 +54,0 @@ -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); 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 @@ -50 +49,0 @@ static NS_DEFINE_CID(kRDFServiceCID, NS_ -static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID); @@ -83 +82 @@ mozSqlResult::Init() - rv = CallCreateInstance(kDateTimeFormatCID, &gFormat); + rv = CallCreateInstance(NS_DATETIMEFORMAT_CONTRACTID, &gFormat); Index: mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp =================================================================== RCS file: /cvsroot/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp,v retrieving revision 1.115 diff -pU0 -r1.115 mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp --- mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp +++ mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp @@ -131 +130,0 @@ static NS_DEFINE_IID(kRangeCID, NS_RANGE -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); @@ -287 +286 @@ nsTypeAheadFind::PrefsReset() - do_GetService(kStringBundleServiceCID); + do_GetService(NS_STRINGBUNDLE_CONTRACTID); Index: mozilla/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.cpp =================================================================== RCS file: /cvsroot/mozilla/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.cpp,v retrieving revision 1.2 diff -pU0 -r1.2 mozilla/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.cpp Index: mozilla/gfx/src/freetype/nsFreeType.cpp =================================================================== RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v retrieving revision 1.29 diff -pU0 -r1.29 mozilla/gfx/src/freetype/nsFreeType.cpp --- mozilla/gfx/src/freetype/nsFreeType.cpp +++ mozilla/gfx/src/freetype/nsFreeType.cpp @@ -93,2 +92,0 @@ static nsHashtable* gFreeTypeFaces = nsn -static NS_DEFINE_CID(kCharSetManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); - @@ -789 +787 @@ nsFreeType2::GetCharSetManager() - CallGetService(kCharSetManagerCID, &sCharSetManager); + CallGetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &sCharSetManager); Index: mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp =================================================================== RCS file: /cvsroot/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp,v retrieving revision 1.284 diff -pU0 -r1.284 mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp --- mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp +++ mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp @@ -156 +155,0 @@ struct nsFontPropertyName -static NS_DEFINE_CID(kCharSetManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); @@ -158 +156,0 @@ static NS_DEFINE_CID(kPrefCID, NS_PREF_C -static NS_DEFINE_CID(kSaveAsCharsetCID, NS_SAVEASCHARSET_CID); @@ -1093 +1091 @@ InitGlobals(nsIDeviceContext *aDevice) - CallGetService(kCharSetManagerCID, &gCharSetManager); + CallGetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &gCharSetManager); @@ -3004 +3002 @@ nsFontGTKSubstitute::Convert(const PRUni - CallCreateInstance(kSaveAsCharsetCID, &gFontSubConverter); + CallCreateInstance(NS_SAVEASCHARSET_CONTRACTID, &gFontSubConverter); Index: mozilla/gfx/src/mac/nsMacUnicodeFontInfo.cpp =================================================================== RCS file: /cvsroot/mozilla/gfx/src/mac/nsMacUnicodeFontInfo.cpp,v retrieving revision 1.27 diff -pU0 -r1.27 mozilla/gfx/src/mac/nsMacUnicodeFontInfo.cpp --- mozilla/gfx/src/mac/nsMacUnicodeFontInfo.cpp +++ mozilla/gfx/src/mac/nsMacUnicodeFontInfo.cpp @@ -87,2 +86,0 @@ NS_IMETHODIMP nsFontCleanupObserver::Obs -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); - @@ -532 +530 @@ GetConverter(const nsCString& aFontName, - rv = CallGetService(kCharsetConverterManagerCID, &gCharsetManager); + rv = CallGetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &gCharsetManager); Index: mozilla/gfx/src/mac/nsUnicodeRenderingToolkit.cpp =================================================================== RCS file: /cvsroot/mozilla/gfx/src/mac/nsUnicodeRenderingToolkit.cpp,v retrieving revision 1.48 diff -pU0 -r1.48 mozilla/gfx/src/mac/nsUnicodeRenderingToolkit.cpp --- mozilla/gfx/src/mac/nsUnicodeRenderingToolkit.cpp +++ mozilla/gfx/src/mac/nsUnicodeRenderingToolkit.cpp @@ -59,2 +58,0 @@ -static NS_DEFINE_CID(kSaveAsCharsetCID, NS_SAVEASCHARSET_CID); - @@ -684 +682 @@ PRBool nsUnicodeRenderingToolkit :: Load - mTrans = do_CreateInstance(kSaveAsCharsetCID, &res); + mTrans = do_CreateInstance(NS_SAVEASCHARSET_CONTRACTID, &res); Index: mozilla/gfx/src/os2/nsFontMetricsOS2.cpp =================================================================== RCS file: /cvsroot/mozilla/gfx/src/os2/nsFontMetricsOS2.cpp,v retrieving revision 1.128 diff -pU0 -r1.128 mozilla/gfx/src/os2/nsFontMetricsOS2.cpp --- mozilla/gfx/src/os2/nsFontMetricsOS2.cpp +++ mozilla/gfx/src/os2/nsFontMetricsOS2.cpp @@ -71 +70,0 @@ -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); @@ -73 +71,0 @@ static NS_DEFINE_CID(kPrefCID, NS_PREF_C -static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID); Index: mozilla/gfx/src/os2/nsOS2Uni.cpp =================================================================== RCS file: /cvsroot/mozilla/gfx/src/os2/nsOS2Uni.cpp,v retrieving revision 1.4 diff -pU0 -r1.4 mozilla/gfx/src/os2/nsOS2Uni.cpp --- mozilla/gfx/src/os2/nsOS2Uni.cpp +++ mozilla/gfx/src/os2/nsOS2Uni.cpp @@ -78,2 +77,0 @@ ConverterInfo gConverterInfo[eCONVERTER_ -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); - @@ -84 +82 @@ OS2Uni::GetUconvObject(int aCodePage, Co - CallGetService(kCharsetConverterManagerCID, &gCharsetManager); + CallGetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &gCharsetManager); Index: mozilla/gfx/src/ps/nsPostScriptObj.cpp =================================================================== RCS file: /cvsroot/mozilla/gfx/src/ps/nsPostScriptObj.cpp,v retrieving revision 1.128 diff -pU0 -r1.128 mozilla/gfx/src/ps/nsPostScriptObj.cpp --- mozilla/gfx/src/ps/nsPostScriptObj.cpp +++ mozilla/gfx/src/ps/nsPostScriptObj.cpp @@ -113 +112,0 @@ static NS_DEFINE_CID(kPrefCID, NS_PREF_C -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); @@ -2861 +2860 @@ static void PrefEnumCallback(const char - do_GetService(kCharsetConverterManagerCID, &res); + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res); Index: mozilla/gfx/src/windows/nsFontMetricsWin.cpp =================================================================== RCS file: /cvsroot/mozilla/gfx/src/windows/nsFontMetricsWin.cpp,v retrieving revision 3.244 diff -pU0 -r3.244 mozilla/gfx/src/windows/nsFontMetricsWin.cpp --- mozilla/gfx/src/windows/nsFontMetricsWin.cpp +++ mozilla/gfx/src/windows/nsFontMetricsWin.cpp @@ -138 +137,0 @@ static PRBool LookupWinFontName(const -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); @@ -359 +358 @@ InitGlobals(void) - CallGetService(kCharsetConverterManagerCID, &gCharsetManager); + CallGetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &gCharsetManager); Index: mozilla/intl/build/nsI18nModule.cpp =================================================================== RCS file: /cvsroot/mozilla/intl/build/nsI18nModule.cpp,v retrieving revision 1.14 diff -pU0 -r1.14 mozilla/intl/build/nsI18nModule.cpp Index: mozilla/intl/locale/public/nsDateTimeFormatCID.h =================================================================== RCS file: /cvsroot/mozilla/intl/locale/public/nsDateTimeFormatCID.h,v retrieving revision 1.9 diff -pU0 -r1.9 mozilla/intl/locale/public/nsDateTimeFormatCID.h --- mozilla/intl/locale/public/nsDateTimeFormatCID.h +++ mozilla/intl/locale/public/nsDateTimeFormatCID.h @@ -43,0 +44 @@ +#define NS_DATETIMEFORMAT_CONTRACTID "@mozilla.org/intl/datetimeformat;1" Index: mozilla/intl/locale/public/nsILanguageAtomService.h =================================================================== RCS file: /cvsroot/mozilla/intl/locale/public/nsILanguageAtomService.h,v retrieving revision 1.2 diff -pU0 -r1.2 mozilla/intl/locale/public/nsILanguageAtomService.h Index: mozilla/layout/forms/nsFormControlHelper.cpp =================================================================== RCS file: /cvsroot/mozilla/layout/forms/nsFormControlHelper.cpp,v retrieving revision 1.116 diff -pU0 -r1.116 mozilla/layout/forms/nsFormControlHelper.cpp --- mozilla/layout/forms/nsFormControlHelper.cpp +++ mozilla/layout/forms/nsFormControlHelper.cpp @@ -72 +71,0 @@ -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); Index: mozilla/layout/forms/nsIsIndexFrame.cpp =================================================================== RCS file: /cvsroot/mozilla/layout/forms/nsIsIndexFrame.cpp,v retrieving revision 1.77 diff -pU0 -r1.77 mozilla/layout/forms/nsIsIndexFrame.cpp --- mozilla/layout/forms/nsIsIndexFrame.cpp +++ mozilla/layout/forms/nsIsIndexFrame.cpp @@ -83,2 +82,0 @@ -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); - @@ -475 +473 @@ NS_IMETHODIMP nsIsIndexFrame::GetEncoder - rv = CallGetService(kCharsetConverterManagerCID, &ccm); + rv = CallGetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &ccm); Index: mozilla/layout/generic/nsImageMap.cpp =================================================================== RCS file: /cvsroot/mozilla/layout/generic/nsImageMap.cpp,v retrieving revision 3.124 diff -pU0 -r3.124 mozilla/layout/generic/nsImageMap.cpp Index: mozilla/layout/generic/nsSimplePageSequence.cpp =================================================================== RCS file: /cvsroot/mozilla/layout/generic/nsSimplePageSequence.cpp,v retrieving revision 3.134 diff -pU0 -r3.134 mozilla/layout/generic/nsSimplePageSequence.cpp --- mozilla/layout/generic/nsSimplePageSequence.cpp +++ mozilla/layout/generic/nsSimplePageSequence.cpp @@ -58 +57,0 @@ -static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID); @@ -369 +368 @@ nsSimplePageSequenceFrame::Reflow(nsPres - mDateFormatter = do_CreateInstance(kDateTimeFormatCID); + mDateFormatter = do_CreateInstance(NS_DATETIMEFORMAT_CONTRACTID); Index: mozilla/layout/generic/nsTextFrame.cpp =================================================================== RCS file: /cvsroot/mozilla/layout/generic/nsTextFrame.cpp,v retrieving revision 1.575 diff -pU0 -r1.575 mozilla/layout/generic/nsTextFrame.cpp Index: mozilla/layout/generic/nsTextTransformer.cpp =================================================================== RCS file: /cvsroot/mozilla/layout/generic/nsTextTransformer.cpp,v retrieving revision 1.112 diff -pU0 -r1.112 mozilla/layout/generic/nsTextTransformer.cpp --- mozilla/layout/generic/nsTextTransformer.cpp +++ mozilla/layout/generic/nsTextTransformer.cpp @@ -124,2 +123,0 @@ nsAutoTextBuffer::GrowTo(PRInt32 aNewSiz -static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID); - @@ -152 +150 @@ static nsresult EnsureCaseConv() - res = CallGetService(kUnicharUtilCID, &gCaseConv); + res = CallGetService(NS_UNICHARUTIL_CONTRACTID, &gCaseConv); Index: mozilla/mail/components/migration/src/nsDogbertProfileMigrator.cpp =================================================================== RCS file: /cvsroot/mozilla/mail/components/migration/src/nsDogbertProfileMigrator.cpp,v retrieving revision 1.6 diff -pU0 -r1.6 mozilla/mail/components/migration/src/nsDogbertProfileMigrator.cpp --- mozilla/mail/components/migration/src/nsDogbertProfileMigrator.cpp +++ mozilla/mail/components/migration/src/nsDogbertProfileMigrator.cpp @@ -69,3 +68,0 @@ -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); - @@ -1855 +1852 @@ nsresult nsDogbertProfileMigrator::Deter - nsCOMPtr bundleService = do_GetService(kStringBundleServiceCID, &rv); + nsCOMPtr bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); @@ -2196 +2193 @@ static nsresult ConvertStringToUTF8(cons - nsCOMPtr ccm = do_GetService(kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); Index: mozilla/mail/components/migration/src/nsNetscapeProfileMigratorBase.cpp =================================================================== RCS file: /cvsroot/mozilla/mail/components/migration/src/nsNetscapeProfileMigratorBase.cpp,v retrieving revision 1.4 diff -pU0 -r1.4 mozilla/mail/components/migration/src/nsNetscapeProfileMigratorBase.cpp --- mozilla/mail/components/migration/src/nsNetscapeProfileMigratorBase.cpp +++ mozilla/mail/components/migration/src/nsNetscapeProfileMigratorBase.cpp @@ -62,2 +61,0 @@ -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); - @@ -72 +70 @@ nsNetscapeProfileMigratorBase::nsNetscap - nsCOMPtr bundleService(do_GetService(kStringBundleServiceCID)); + nsCOMPtr bundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID)); Index: mozilla/mailnews/addrbook/src/nsAbView.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsAbView.cpp,v retrieving revision 1.60 diff -pU0 -r1.60 mozilla/mailnews/addrbook/src/nsAbView.cpp --- mozilla/mailnews/addrbook/src/nsAbView.cpp +++ mozilla/mailnews/addrbook/src/nsAbView.cpp @@ -76,2 +75,0 @@ -static NS_DEFINE_CID(kCollationFactoryCID, NS_COLLATIONFACTORY_CID); - @@ -786 +784 @@ nsresult nsAbView::GenerateCollationKeys - nsCOMPtr factory = do_CreateInstance(kCollationFactoryCID, &rv); + nsCOMPtr factory = do_CreateInstance(NS_COLLATIONFACTORY_CONTRACTID, &rv); Index: mozilla/mailnews/addrbook/src/nsDirectoryDataSource.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsDirectoryDataSource.cpp,v retrieving revision 1.71 diff -pU0 -r1.71 mozilla/mailnews/addrbook/src/nsDirectoryDataSource.cpp --- mozilla/mailnews/addrbook/src/nsDirectoryDataSource.cpp +++ mozilla/mailnews/addrbook/src/nsDirectoryDataSource.cpp @@ -64,2 +63,0 @@ -static NS_DEFINE_CID(kCollationFactoryCID, NS_COLLATIONFACTORY_CID); - @@ -767 +765 @@ nsresult nsAbDirectoryDataSource::Create - nsCOMPtr factory = do_CreateInstance(kCollationFactoryCID, &rv); + nsCOMPtr factory = do_CreateInstance(NS_COLLATIONFACTORY_CONTRACTID, &rv); Index: mozilla/mailnews/base/src/nsMsgDBView.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/base/src/nsMsgDBView.cpp,v retrieving revision 1.233 diff -pU0 -r1.233 mozilla/mailnews/base/src/nsMsgDBView.cpp --- mozilla/mailnews/base/src/nsMsgDBView.cpp +++ mozilla/mailnews/base/src/nsMsgDBView.cpp @@ -71,2 +70,0 @@ -static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID); - @@ -603 +601 @@ nsresult nsMsgDBView::FetchDate(nsIMsgDB - mDateFormater = do_CreateInstance(kDateTimeFormatCID); + mDateFormater = do_CreateInstance(NS_DATETIMEFORMAT_CONTRACTID); 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 @@ -101 +100,0 @@ static NS_DEFINE_CID(kRDFServiceCID, NS_ -static NS_DEFINE_CID(kCollationFactoryCID, NS_COLLATIONFACTORY_CID); @@ -2171 +2170 @@ nsMsgDBFolder::createCollationKeyGenerat - nsCOMPtr factory = do_CreateInstance(kCollationFactoryCID, &rv); + nsCOMPtr factory = do_CreateInstance(NS_COLLATIONFACTORY_CONTRACTID, &rv); Index: mozilla/mailnews/base/util/nsMsgI18N.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/base/util/nsMsgI18N.cpp,v retrieving revision 1.93 diff -pU0 -r1.93 mozilla/mailnews/base/util/nsMsgI18N.cpp --- mozilla/mailnews/base/util/nsMsgI18N.cpp +++ mozilla/mailnews/base/util/nsMsgI18N.cpp @@ -67,3 +66,0 @@ -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); -static NS_DEFINE_CID(kEntityConverterCID, NS_ENTITYCONVERTER_CID); - @@ -267 +264 @@ PRBool nsMsgI18Nmultibyte_charset(const - nsCOMPtr ccm = do_GetService(kCharsetConverterManagerCID, &res); + nsCOMPtr ccm = do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res); @@ -290 +287 @@ PRBool nsMsgI18Ncheck_data_in_charset_ra - nsCOMPtr ccm = do_GetService(kCharsetConverterManagerCID, &res); + nsCOMPtr ccm = do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res); @@ -404 +401 @@ nsresult nsMsgI18NConvertToEntity(const - nsCOMPtr entityConv = do_CreateInstance(kEntityConverterCID, &res); + nsCOMPtr entityConv = do_CreateInstance(NS_ENTITYCONVERTER_CONTRACTID, &res); Index: mozilla/mailnews/compose/src/nsMsgCompose.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/compose/src/nsMsgCompose.cpp,v retrieving revision 1.485 diff -pU0 -r1.485 mozilla/mailnews/compose/src/nsMsgCompose.cpp --- mozilla/mailnews/compose/src/nsMsgCompose.cpp +++ mozilla/mailnews/compose/src/nsMsgCompose.cpp @@ -129,3 +128,0 @@ -// Defines.... -static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID); - @@ -2046 +2043 @@ QuotingOutputStreamListener::QuotingOutp - nsCOMPtr dateFormatter = do_CreateInstance(kDateTimeFormatCID, &rv); + nsCOMPtr dateFormatter = do_CreateInstance(NS_DATETIMEFORMAT_CONTRACTID, &rv); Index: mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp,v retrieving revision 1.362 diff -pU0 -r1.362 mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp --- mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp +++ mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp @@ -94,2 +93,0 @@ static NS_DEFINE_CID(kCMorkFactory, NS_M -static NS_DEFINE_CID(kCollationFactoryCID, NS_COLLATIONFACTORY_CID); - @@ -3220 +3218 @@ nsresult nsMsgDatabase::GetCollationKeyG - nsCOMPtr f = do_CreateInstance(kCollationFactoryCID, &err); + nsCOMPtr f = do_CreateInstance(NS_COLLATIONFACTORY_CONTRACTID, &err); 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 @@ -115 +114,0 @@ static NS_DEFINE_CID(kSocketTransportSer -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); Index: mozilla/mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp,v retrieving revision 1.84 diff -pU0 -r1.84 mozilla/mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp --- mozilla/mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp +++ mozilla/mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp @@ -67 +66,0 @@ -static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID); @@ -277 +276 @@ nsresult nsMimeHtmlDisplayEmitter::Gener - mDateFormater = do_CreateInstance(kDateTimeFormatCID, &rv); + mDateFormater = do_CreateInstance(NS_DATETIMEFORMAT_CONTRACTID, &rv); Index: mozilla/modules/oji/src/nsJVMManager.cpp =================================================================== RCS file: /cvsroot/mozilla/modules/oji/src/nsJVMManager.cpp,v retrieving revision 1.78 diff -pU0 -r1.78 mozilla/modules/oji/src/nsJVMManager.cpp --- mozilla/modules/oji/src/nsJVMManager.cpp +++ mozilla/modules/oji/src/nsJVMManager.cpp @@ -104,2 +103,0 @@ extern "C" int XP_JAVA_DEBUGGER_FAILED; -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); - @@ -194 +192 @@ nsJVMManager::ShowJavaConsole(void) - nsCOMPtr strings(do_GetService(kStringBundleServiceCID)); + nsCOMPtr strings(do_GetService(NS_STRINGBUNDLE_CONTRACTID)); Index: mozilla/netwerk/base/src/nsDirectoryIndexStream.cpp =================================================================== RCS file: /cvsroot/mozilla/netwerk/base/src/nsDirectoryIndexStream.cpp,v retrieving revision 1.39 diff -pU0 -r1.39 mozilla/netwerk/base/src/nsDirectoryIndexStream.cpp --- mozilla/netwerk/base/src/nsDirectoryIndexStream.cpp +++ mozilla/netwerk/base/src/nsDirectoryIndexStream.cpp @@ -72,2 +71,0 @@ static PRLogModuleInfo* gLog; -static NS_DEFINE_CID(kCollationFactoryCID, NS_COLLATIONFACTORY_CID); - @@ -179 +177 @@ nsDirectoryIndexStream::Init(nsIFile* aD - nsCOMPtr cf = do_CreateInstance(kCollationFactoryCID, + nsCOMPtr cf = do_CreateInstance(NS_COLLATIONFACTORY_CONTRACTID, Index: mozilla/netwerk/streamconv/converters/nsIndexedToHTML.cpp =================================================================== RCS file: /cvsroot/mozilla/netwerk/streamconv/converters/nsIndexedToHTML.cpp,v retrieving revision 1.74 diff -pU0 -r1.74 mozilla/netwerk/streamconv/converters/nsIndexedToHTML.cpp --- mozilla/netwerk/streamconv/converters/nsIndexedToHTML.cpp +++ mozilla/netwerk/streamconv/converters/nsIndexedToHTML.cpp @@ -60,2 +59,0 @@ NS_IMPL_THREADSAFE_ISUPPORTS4(nsIndexedT -static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID); - @@ -104 +102 @@ nsIndexedToHTML::Init(nsIStreamListener* - mDateTime = do_CreateInstance(kDateTimeFormatCID, &rv); + mDateTime = do_CreateInstance(NS_DATETIMEFORMAT_CONTRACTID, &rv); Index: mozilla/parser/htmlparser/src/nsParserMsgUtils.cpp =================================================================== RCS file: /cvsroot/mozilla/parser/htmlparser/src/nsParserMsgUtils.cpp,v retrieving revision 3.6 diff -pU0 -r3.6 mozilla/parser/htmlparser/src/nsParserMsgUtils.cpp --- mozilla/parser/htmlparser/src/nsParserMsgUtils.cpp +++ mozilla/parser/htmlparser/src/nsParserMsgUtils.cpp @@ -44,2 +43,0 @@ -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); - @@ -57 +55 @@ static nsresult GetBundle(const char * a - do_GetService(kStringBundleServiceCID, &rv); + do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); Index: mozilla/parser/htmlparser/src/nsScanner.cpp =================================================================== RCS file: /cvsroot/mozilla/parser/htmlparser/src/nsScanner.cpp,v retrieving revision 3.147 diff -pU0 -r3.147 mozilla/parser/htmlparser/src/nsScanner.cpp --- mozilla/parser/htmlparser/src/nsScanner.cpp +++ mozilla/parser/htmlparser/src/nsScanner.cpp @@ -72,2 +71,0 @@ nsReadEndCondition::nsReadEndCondition(c -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); - @@ -220 +218 @@ nsresult nsScanner::SetDocumentCharset(c - do_GetService(kCharsetConverterManagerCID, &res); + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res); Index: mozilla/profile/pref-migrator/src/nsPrefMigration.cpp =================================================================== RCS file: /cvsroot/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp,v retrieving revision 1.203 diff -pU0 -r1.203 mozilla/profile/pref-migrator/src/nsPrefMigration.cpp --- mozilla/profile/pref-migrator/src/nsPrefMigration.cpp +++ mozilla/profile/pref-migrator/src/nsPrefMigration.cpp @@ -246,3 +245,0 @@ static NS_DEFINE_CID(kPrefServiceCID, NS -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); - @@ -450 +447 @@ nsPrefMigration::ShowSpaceDialog(PRInt32 - nsCOMPtr bundleService = do_GetService(kStringBundleServiceCID, &rv); + nsCOMPtr bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); @@ -2217 +2214 @@ nsPrefMigration::DetermineOldPath(nsIFil - nsCOMPtr bundleService = do_GetService(kStringBundleServiceCID, &rv); + nsCOMPtr bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); @@ -2307 +2304 @@ ConvertStringToUTF8(const char* aCharset - do_GetService(kCharsetConverterManagerCID, &rv); + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); Index: mozilla/security/manager/boot/src/nsSecurityWarningDialogs.cpp =================================================================== RCS file: /cvsroot/mozilla/security/manager/boot/src/nsSecurityWarningDialogs.cpp,v retrieving revision 1.11 diff -pU0 -r1.11 mozilla/security/manager/boot/src/nsSecurityWarningDialogs.cpp Index: mozilla/security/manager/pki/src/nsNSSDialogs.cpp =================================================================== RCS file: /cvsroot/mozilla/security/manager/pki/src/nsNSSDialogs.cpp,v retrieving revision 1.60 diff -pU0 -r1.60 mozilla/security/manager/pki/src/nsNSSDialogs.cpp --- mozilla/security/manager/pki/src/nsNSSDialogs.cpp +++ mozilla/security/manager/pki/src/nsNSSDialogs.cpp @@ -72 +71,0 @@ static NS_DEFINE_CID(kCStringBundleServi -static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID); @@ -318 +317 @@ nsNSSDialogs::ConfirmCertExpired(nsIInte - rv = CallCreateInstance(kDateTimeFormatCID, &aDateTimeFormat); + rv = CallCreateInstance(NS_DATETIMEFORMAT_CONTRACTID, &aDateTimeFormat); Index: mozilla/security/manager/ssl/src/nsCRLInfo.cpp =================================================================== RCS file: /cvsroot/mozilla/security/manager/ssl/src/nsCRLInfo.cpp,v retrieving revision 1.7 diff -pU0 -r1.7 mozilla/security/manager/ssl/src/nsCRLInfo.cpp --- mozilla/security/manager/ssl/src/nsCRLInfo.cpp +++ mozilla/security/manager/ssl/src/nsCRLInfo.cpp @@ -60,2 +59,0 @@ extern "C" { -static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID); - @@ -99 +97 @@ nsCRLInfo::nsCRLInfo(CERTSignedCrl *sign - nsCOMPtr dateFormatter = do_CreateInstance(kDateTimeFormatCID); + nsCOMPtr dateFormatter = do_CreateInstance(NS_DATETIMEFORMAT_CONTRACTID); Index: mozilla/security/manager/ssl/src/nsCRLManager.cpp =================================================================== RCS file: /cvsroot/mozilla/security/manager/ssl/src/nsCRLManager.cpp,v retrieving revision 1.12 diff -pU0 -r1.12 mozilla/security/manager/ssl/src/nsCRLManager.cpp --- mozilla/security/manager/ssl/src/nsCRLManager.cpp +++ mozilla/security/manager/ssl/src/nsCRLManager.cpp @@ -71 +70,0 @@ extern "C" { -static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID); @@ -491 +490 @@ nsCRLManager::ComputeNextAutoUpdateTime( - nsCOMPtr dateFormatter = do_CreateInstance(kDateTimeFormatCID, &rv); + nsCOMPtr dateFormatter = do_CreateInstance(NS_DATETIMEFORMAT_CONTRACTID, &rv); Index: mozilla/security/manager/ssl/src/nsNSSCertHelper.cpp =================================================================== RCS file: /cvsroot/mozilla/security/manager/ssl/src/nsNSSCertHelper.cpp,v retrieving revision 1.21 diff -pU0 -r1.21 mozilla/security/manager/ssl/src/nsNSSCertHelper.cpp --- mozilla/security/manager/ssl/src/nsNSSCertHelper.cpp +++ mozilla/security/manager/ssl/src/nsNSSCertHelper.cpp @@ -56 +55,0 @@ -static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID); @@ -1520 +1519 @@ ProcessTime(PRTime dispTime, const PRUni - do_CreateInstance(kDateTimeFormatCID, &rv); + do_CreateInstance(NS_DATETIMEFORMAT_CONTRACTID, &rv); Index: mozilla/security/manager/ssl/src/nsNSSCertValidity.cpp =================================================================== RCS file: /cvsroot/mozilla/security/manager/ssl/src/nsNSSCertValidity.cpp,v retrieving revision 1.6 diff -pU0 -r1.6 mozilla/security/manager/ssl/src/nsNSSCertValidity.cpp --- mozilla/security/manager/ssl/src/nsNSSCertValidity.cpp +++ mozilla/security/manager/ssl/src/nsNSSCertValidity.cpp @@ -48,2 +47,0 @@ -static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID); - @@ -94 +92 @@ NS_IMETHODIMP nsX509CertValidity::GetNot - do_CreateInstance(kDateTimeFormatCID, &rv); + do_CreateInstance(NS_DATETIMEFORMAT_CONTRACTID, &rv); @@ -113 +111 @@ NS_IMETHODIMP nsX509CertValidity::GetNot - do_CreateInstance(kDateTimeFormatCID, &rv); + do_CreateInstance(NS_DATETIMEFORMAT_CONTRACTID, &rv); @@ -133 +131 @@ NS_IMETHODIMP nsX509CertValidity::GetNot - do_CreateInstance(kDateTimeFormatCID, &rv); + do_CreateInstance(NS_DATETIMEFORMAT_CONTRACTID, &rv); @@ -165 +163 @@ NS_IMETHODIMP nsX509CertValidity::GetNot - do_CreateInstance(kDateTimeFormatCID, &rv); + do_CreateInstance(NS_DATETIMEFORMAT_CONTRACTID, &rv); @@ -184 +182 @@ NS_IMETHODIMP nsX509CertValidity::GetNot - do_CreateInstance(kDateTimeFormatCID, &rv); + do_CreateInstance(NS_DATETIMEFORMAT_CONTRACTID, &rv); @@ -203 +201 @@ NS_IMETHODIMP nsX509CertValidity::GetNot - do_CreateInstance(kDateTimeFormatCID, &rv); + do_CreateInstance(NS_DATETIMEFORMAT_CONTRACTID, &rv); Index: mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp =================================================================== RCS file: /cvsroot/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp,v retrieving revision 1.109 diff -pU0 -r1.109 mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp 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 @@ -78 +77,0 @@ static NS_DEFINE_CID(kRDFServiceCID, NS_ -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); @@ -232 +231 @@ nsDownloadManager::Init() - nsCOMPtr bundleService = do_GetService(kStringBundleServiceCID, &rv); + nsCOMPtr bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); @@ -1377 +1376 @@ nsDownloadManager::ConfirmCancelDownload - nsCOMPtr bundleService = do_GetService(kStringBundleServiceCID); + nsCOMPtr bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID); @@ -2106 +2105 @@ nsDownload::OnStatusChange(nsIWebProgres - nsCOMPtr bundleService = do_GetService(kStringBundleServiceCID, &rv); + nsCOMPtr bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); 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 @@ -139 +138,0 @@ static NS_DEFINE_CID(kRDFServiceCID, -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); @@ -2645 +2644 @@ nsGlobalHistory::Init() - do_GetService(kStringBundleServiceCID, &rv); + do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); Index: mozilla/uriloader/base/nsDocLoader.cpp =================================================================== RCS file: /cvsroot/mozilla/uriloader/base/nsDocLoader.cpp,v retrieving revision 3.290 diff -pU0 -r3.290 mozilla/uriloader/base/nsDocLoader.cpp --- mozilla/uriloader/base/nsDocLoader.cpp +++ mozilla/uriloader/base/nsDocLoader.cpp @@ -65 +64,0 @@ -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); @@ -1067 +1066 @@ NS_IMETHODIMP nsDocLoader::OnStatus(nsIR - nsCOMPtr sbs = do_GetService(kStringBundleServiceCID, &rv); + nsCOMPtr sbs = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); Index: mozilla/widget/src/beos/nsFilePicker.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/beos/nsFilePicker.cpp,v retrieving revision 1.28 diff -pU0 -r1.28 mozilla/widget/src/beos/nsFilePicker.cpp --- mozilla/widget/src/beos/nsFilePicker.cpp +++ mozilla/widget/src/beos/nsFilePicker.cpp @@ -59,2 +58,0 @@ -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); - Index: mozilla/widget/src/gtk/nsGtkIMEHelper.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/gtk/nsGtkIMEHelper.cpp,v retrieving revision 1.59 diff -pU0 -r1.59 mozilla/widget/src/gtk/nsGtkIMEHelper.cpp --- mozilla/widget/src/gtk/nsGtkIMEHelper.cpp +++ mozilla/widget/src/gtk/nsGtkIMEHelper.cpp @@ -54,2 +53,0 @@ -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); - @@ -139 +137 @@ void nsGtkIMEHelper::SetupUnicodeDecoder - nsresult res = CallGetService(kCharsetConverterManagerCID, &manager); + nsresult res = CallGetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &manager); Index: mozilla/widget/src/mac/nsMacControl.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/mac/nsMacControl.cpp,v retrieving revision 1.62 diff -pU0 -r1.62 mozilla/widget/src/mac/nsMacControl.cpp --- mozilla/widget/src/mac/nsMacControl.cpp +++ mozilla/widget/src/mac/nsMacControl.cpp @@ -74,2 +73,0 @@ void DumpControlState(ControlHandle inCo - -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); @@ -466 +464 @@ void nsMacControl::StringToStr255(const - do_GetService(kCharsetConverterManagerCID, &rv); + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); @@ -508 +506 @@ void nsMacControl::Str255ToString(const - do_GetService(kCharsetConverterManagerCID, &rv); + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); Index: mozilla/widget/src/os2/nsFilePicker.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/os2/nsFilePicker.cpp,v retrieving revision 1.49 diff -pU0 -r1.49 mozilla/widget/src/os2/nsFilePicker.cpp --- mozilla/widget/src/os2/nsFilePicker.cpp +++ mozilla/widget/src/os2/nsFilePicker.cpp @@ -69,2 +68,0 @@ typedef struct _MyData -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); - @@ -551 +549 @@ char * nsFilePicker::ConvertToFileSystem - do_GetService(kCharsetConverterManagerCID, &rv); + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); @@ -594 +592 @@ PRUnichar * nsFilePicker::ConvertFromFil - do_GetService(kCharsetConverterManagerCID, &rv); + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); Index: mozilla/widget/src/photon/nsFilePicker.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/photon/nsFilePicker.cpp,v retrieving revision 1.12 diff -pU0 -r1.12 mozilla/widget/src/photon/nsFilePicker.cpp --- mozilla/widget/src/photon/nsFilePicker.cpp +++ mozilla/widget/src/photon/nsFilePicker.cpp @@ -55,3 +54,0 @@ - -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); - Index: mozilla/widget/src/windows/nsDataObj.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/windows/nsDataObj.cpp,v retrieving revision 1.77 diff -pU0 -r1.77 mozilla/widget/src/windows/nsDataObj.cpp --- mozilla/widget/src/windows/nsDataObj.cpp +++ mozilla/widget/src/windows/nsDataObj.cpp @@ -607 +606,0 @@ CreateFilenameFromTextW(nsString & aText -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); @@ -614 +613 @@ GetLocalizedString(const PRUnichar * aNa - nsCOMPtr stringService = do_GetService(kStringBundleServiceCID, &rv); + nsCOMPtr stringService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); Index: mozilla/widget/src/windows/nsFilePicker.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/windows/nsFilePicker.cpp,v retrieving revision 1.89 diff -pU0 -r1.89 mozilla/widget/src/windows/nsFilePicker.cpp --- mozilla/widget/src/windows/nsFilePicker.cpp +++ mozilla/widget/src/windows/nsFilePicker.cpp @@ -68,2 +67,0 @@ -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); - Index: mozilla/widget/src/xpwidgets/nsBaseFilePicker.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/xpwidgets/nsBaseFilePicker.cpp,v retrieving revision 1.29 diff -pU0 -r1.29 mozilla/widget/src/xpwidgets/nsBaseFilePicker.cpp --- mozilla/widget/src/xpwidgets/nsBaseFilePicker.cpp +++ mozilla/widget/src/xpwidgets/nsBaseFilePicker.cpp @@ -62,2 +61,0 @@ - -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); @@ -66 +63,0 @@ static NS_DEFINE_CID(kStringBundleServic - @@ -130 +127 @@ nsBaseFilePicker::AppendFilters(PRInt32 - nsCOMPtr stringService = do_GetService(kStringBundleServiceCID); + nsCOMPtr stringService = do_GetService(NS_STRINGBUNDLE_CONTRACTID); Index: mozilla/xpcom/base/nsLeakDetector.cpp =================================================================== RCS file: /cvsroot/mozilla/xpcom/base/nsLeakDetector.cpp,v retrieving revision 1.21 diff -pU0 -r1.21 mozilla/xpcom/base/nsLeakDetector.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 @@ -166,3 +165,0 @@ static NS_DEFINE_CID(kIOServiceCID, -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); -static NS_DEFINE_CID(kPlatformCharsetCID, NS_PLATFORMCHARSET_CID); @@ -170 +166,0 @@ static NS_DEFINE_CID(kCacheServiceCID, -static NS_DEFINE_CID(kCollationFactoryCID, NS_COLLATIONFACTORY_CID); @@ -224 +220 @@ bm_AddRefGlobals() - nsCOMPtr factory = do_CreateInstance(kCollationFactoryCID); + nsCOMPtr factory = do_CreateInstance(NS_COLLATIONFACTORY_CONTRACTID); @@ -557 +553 @@ BookmarkParser::Init(nsIFile *aFile, nsI - do_GetService(kPlatformCharsetCID, &rv); + do_GetService(NS_PLATFORMCHARSET_CONTRACTID, &rv); @@ -565 +561 @@ BookmarkParser::Init(nsIFile *aFile, nsI - do_GetService(kCharsetConverterManagerCID, &rv); + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); @@ -1003 +999 @@ BookmarkParser::ParseMetaTag(const nsStr - rv = CallGetService(kCharsetConverterManagerCID, &charsetConv); + rv = CallGetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &charsetConv); @@ -1655 +1651 @@ nsBookmarksService::Init() - do_GetService(kStringBundleServiceCID); + do_GetService(NS_STRINGBUNDLE_CONTRACTID); Index: mozilla/xpfe/components/filepicker/src/nsFileView.cpp =================================================================== RCS file: /cvsroot/mozilla/xpfe/components/filepicker/src/nsFileView.cpp,v retrieving revision 1.27 diff -pU0 -r1.27 mozilla/xpfe/components/filepicker/src/nsFileView.cpp --- mozilla/xpfe/components/filepicker/src/nsFileView.cpp +++ mozilla/xpfe/components/filepicker/src/nsFileView.cpp @@ -216,2 +215,0 @@ nsFileComplete::StopSearch() -static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID); - @@ -297 +295 @@ nsFileView::Init() - mDateFormatter = do_CreateInstance(kDateTimeFormatCID); + mDateFormatter = do_CreateInstance(NS_DATETIMEFORMAT_CONTRACTID); 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 @@ -133 +132,0 @@ static NS_DEFINE_CID(kRDFServiceCID, -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); @@ -2547 +2546 @@ nsGlobalHistory::Init() - do_GetService(kStringBundleServiceCID, &rv); + do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); 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 @@ -74 +73,0 @@ static NS_DEFINE_CID(kRDFServiceCID, NS_ -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); @@ -78,2 +76,0 @@ static NS_DEFINE_CID(kRDFContainerCID, N -static NS_DEFINE_CID(kCollationFactoryCID, NS_COLLATIONFACTORY_CID); -static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID); @@ -509 +506 @@ nsCharsetMenu::nsCharsetMenu() - mCCManager = do_GetService(kCharsetConverterManagerCID, &res); + mCCManager = do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res); @@ -1811 +1808 @@ nsresult nsCharsetMenu::GetCollation(nsI - do_GetService(kLocaleServiceCID, &res); + do_GetService(NS_LOCALESERVICE_CONTRACTID, &res); @@ -1817 +1814 @@ nsresult nsCharsetMenu::GetCollation(nsI - res = CallCreateInstance(kCollationFactoryCID, &collationFactory); + res = CallCreateInstance(NS_COLLATIONFACTORY_CONTRACTID, &collationFactory); 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 @@ -76 +75,0 @@ static NS_DEFINE_CID(kRDFInMemoryDataSou -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); @@ -218 +217 @@ RelatedLinksStreamListener::Init() - rv = CallGetService(kCharsetConverterManagerCID, &charsetConv); + rv = CallGetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &charsetConv); Index: mozilla/xpinstall/src/nsInstall.cpp =================================================================== RCS file: /cvsroot/mozilla/xpinstall/src/nsInstall.cpp,v retrieving revision 1.241 diff -pU0 -r1.241 mozilla/xpinstall/src/nsInstall.cpp --- mozilla/xpinstall/src/nsInstall.cpp +++ mozilla/xpinstall/src/nsInstall.cpp @@ -120,2 +119,0 @@ -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); - @@ -275 +273 @@ nsInstall::nsInstall(nsIZipReader * theJ - kStringBundleServiceCID, + NS_STRINGBUNDLE_CONTRACTID, @@ -1240 +1238 @@ nsInstall::LoadResources(JSContext* cx, - ret = CallGetService(kStringBundleServiceCID, &service); + ret = CallGetService(NS_STRINGBUNDLE_CONTRACTID, &service); @@ -2567 +2565 @@ PRUnichar *GetTranslatedString(const PRU - nsCOMPtr stringService = do_GetService(kStringBundleServiceCID); + nsCOMPtr stringService = do_GetService(NS_STRINGBUNDLE_CONTRACTID);