From f015deb427fb96b2e25f7984481dfb2188647892 Mon Sep 17 00:00:00 2001 From: "dp%netscape.com" Date: Thu, 6 May 1999 01:37:04 +0000 Subject: [PATCH] Converting stray UnregisterFactory calls to UnregisterComponent git-svn-id: svn://10.0.0.236/trunk@30485 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/editor/base/nsEditor.cpp | 6 +-- .../editor/guimgr/src/nsGuiManagerFactory.cpp | 2 +- mozilla/editor/libeditor/base/nsEditor.cpp | 6 +-- .../txtsvc/nsTextServicesFactory.cpp | 2 +- .../txmgr/src/nsTransactionManagerFactory.cpp | 2 +- .../txtsvc/src/nsTextServicesFactory.cpp | 2 +- mozilla/intl/locale/src/mac/nsLocaleSHLIB.cpp | 8 ++-- mozilla/intl/locale/src/unix/nsLocaleSO.cpp | 10 ++--- .../intl/locale/src/windows/nsLocaleDLL.cpp | 12 ++--- mozilla/intl/lwbrk/src/nsLWBrk.cpp | 2 +- mozilla/intl/strres/src/nsStringBundle.cpp | 2 +- mozilla/intl/uconv/src/nsUConvDll.cpp | 10 ++--- mozilla/intl/uconv/ucvcn/nsUCvCnDll.cpp | 2 +- mozilla/intl/uconv/ucvja/nsUCVJADll.cpp | 2 +- mozilla/intl/uconv/ucvja2/nsUCVJA2Dll.cpp | 2 +- mozilla/intl/uconv/ucvlatin/nsUCvLatinDll.cpp | 2 +- .../unicharutil/src/nsUnicharUtilFactory.cpp | 2 +- .../db/msgdb/build/nsMsgDBFactory.cpp | 6 +-- mozilla/mailnews/imap/build/nsImapFactory.cpp | 12 ++--- .../local/build/nsMsgLocalFactory.cpp | 10 ++--- .../modules/libimg/gifcom/nsGIFDecoder.cpp | 2 +- .../modules/libimg/jpgcom/nsJPGDecoder.cpp | 2 +- .../modules/libimg/pngcom/nsPNGDecoder.cpp | 2 +- mozilla/modules/libpref/src/nsPref.cpp | 2 +- mozilla/profile/src/nsProfile.cpp | 2 +- mozilla/silentdl/nsSilentDownload.cpp | 44 +++---------------- mozilla/xpcom/tests/dynamic/TestDynamic.cpp | 2 +- mozilla/xpfe/AppCores/src/nsAppCores.cpp | 18 ++++---- .../xpfe/appshell/src/nsAppShellFactory.cpp | 14 +++--- mozilla/xpinstall/src/nsSoftwareUpdate.cpp | 6 +-- 30 files changed, 82 insertions(+), 114 deletions(-) diff --git a/mozilla/editor/base/nsEditor.cpp b/mozilla/editor/base/nsEditor.cpp index 2d33ea5496b..183450456c3 100644 --- a/mozilla/editor/base/nsEditor.cpp +++ b/mozilla/editor/base/nsEditor.cpp @@ -279,11 +279,11 @@ NSUnregisterSelf(nsISupports* aServMgr, const char *path) (nsISupports**)&compMgr); if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterFactory(kIEditFactoryIID, path); + rv = compMgr->UnregisterComponent(kIEditFactoryIID, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kITextEditFactoryIID, path); + rv = compMgr->UnregisterComponent(kITextEditFactoryIID, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kIHTMLEditFactoryIID, path); + rv = compMgr->UnregisterComponent(kIHTMLEditFactoryIID, path); done: (void)servMgr->ReleaseService(kComponentManagerCID, compMgr); diff --git a/mozilla/editor/guimgr/src/nsGuiManagerFactory.cpp b/mozilla/editor/guimgr/src/nsGuiManagerFactory.cpp index 73811669100..cf6c4a0c1a9 100644 --- a/mozilla/editor/guimgr/src/nsGuiManagerFactory.cpp +++ b/mozilla/editor/guimgr/src/nsGuiManagerFactory.cpp @@ -158,7 +158,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char (nsISupports**)&compMgr); if (NS_FAILED(rv)) return rv; - rv = nsComponentManager::UnregisterFactory(kIGuiManagerFactoryIID, path); + rv = nsComponentManager::UnregisterComponent(kIGuiManagerFactoryIID, path); (void)servMgr->ReleaseService(kComponentManagerCID, compMgr); return rv; diff --git a/mozilla/editor/libeditor/base/nsEditor.cpp b/mozilla/editor/libeditor/base/nsEditor.cpp index 2d33ea5496b..183450456c3 100644 --- a/mozilla/editor/libeditor/base/nsEditor.cpp +++ b/mozilla/editor/libeditor/base/nsEditor.cpp @@ -279,11 +279,11 @@ NSUnregisterSelf(nsISupports* aServMgr, const char *path) (nsISupports**)&compMgr); if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterFactory(kIEditFactoryIID, path); + rv = compMgr->UnregisterComponent(kIEditFactoryIID, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kITextEditFactoryIID, path); + rv = compMgr->UnregisterComponent(kITextEditFactoryIID, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kIHTMLEditFactoryIID, path); + rv = compMgr->UnregisterComponent(kIHTMLEditFactoryIID, path); done: (void)servMgr->ReleaseService(kComponentManagerCID, compMgr); diff --git a/mozilla/editor/libeditor/txtsvc/nsTextServicesFactory.cpp b/mozilla/editor/libeditor/txtsvc/nsTextServicesFactory.cpp index 2dacb0140f5..e9586bec11f 100644 --- a/mozilla/editor/libeditor/txtsvc/nsTextServicesFactory.cpp +++ b/mozilla/editor/libeditor/txtsvc/nsTextServicesFactory.cpp @@ -170,7 +170,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char (nsISupports**)&compMgr); if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterFactory(kCTextServicesDocumentCID, path); + rv = compMgr->UnregisterComponent(kCTextServicesDocumentCID, path); (void)servMgr->ReleaseService(kComponentManagerCID, compMgr); return rv; diff --git a/mozilla/editor/txmgr/src/nsTransactionManagerFactory.cpp b/mozilla/editor/txmgr/src/nsTransactionManagerFactory.cpp index fee6fea10d7..943a41850b0 100644 --- a/mozilla/editor/txmgr/src/nsTransactionManagerFactory.cpp +++ b/mozilla/editor/txmgr/src/nsTransactionManagerFactory.cpp @@ -169,7 +169,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char (nsISupports**)&compMgr); if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterFactory(kCTransactionManagerCID, path); + rv = compMgr->UnregisterComponent(kCTransactionManagerCID, path); (void)servMgr->ReleaseService(kComponentManagerCID, compMgr); return rv; diff --git a/mozilla/editor/txtsvc/src/nsTextServicesFactory.cpp b/mozilla/editor/txtsvc/src/nsTextServicesFactory.cpp index 2dacb0140f5..e9586bec11f 100644 --- a/mozilla/editor/txtsvc/src/nsTextServicesFactory.cpp +++ b/mozilla/editor/txtsvc/src/nsTextServicesFactory.cpp @@ -170,7 +170,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char (nsISupports**)&compMgr); if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterFactory(kCTextServicesDocumentCID, path); + rv = compMgr->UnregisterComponent(kCTextServicesDocumentCID, path); (void)servMgr->ReleaseService(kComponentManagerCID, compMgr); return rv; diff --git a/mozilla/intl/locale/src/mac/nsLocaleSHLIB.cpp b/mozilla/intl/locale/src/mac/nsLocaleSHLIB.cpp index 6d813dfc652..92dc4dd3c3d 100644 --- a/mozilla/intl/locale/src/mac/nsLocaleSHLIB.cpp +++ b/mozilla/intl/locale/src/mac/nsLocaleSHLIB.cpp @@ -186,16 +186,16 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char (nsISupports**)&compMgr); if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterFactory(kLocaleFactoryCID, path); + rv = compMgr->UnregisterComponent(kLocaleFactoryCID, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kCollationFactoryCID, path); + rv = compMgr->UnregisterComponent(kCollationFactoryCID, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kCollationCID, path); + rv = compMgr->UnregisterComponent(kCollationCID, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kDateTimeFormatCID, path); + rv = compMgr->UnregisterComponent(kDateTimeFormatCID, path); if (NS_FAILED(rv)) goto done; done: diff --git a/mozilla/intl/locale/src/unix/nsLocaleSO.cpp b/mozilla/intl/locale/src/unix/nsLocaleSO.cpp index 72686e13a7f..5d49bd2d2a1 100644 --- a/mozilla/intl/locale/src/unix/nsLocaleSO.cpp +++ b/mozilla/intl/locale/src/unix/nsLocaleSO.cpp @@ -192,19 +192,19 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char (nsISupports**)&compMgr); if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterFactory(kLocaleFactoryCID, path); + rv = compMgr->UnregisterComponent(kLocaleFactoryCID, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kPosixLocaleFactoryCID,path); + rv = compMgr->UnregisterComponent(kPosixLocaleFactoryCID,path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kCollationFactoryCID, path); + rv = compMgr->UnregisterComponent(kCollationFactoryCID, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kCollationCID, path); + rv = compMgr->UnregisterComponent(kCollationCID, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kDateTimeFormatCID, path); + rv = compMgr->UnregisterComponent(kDateTimeFormatCID, path); if (NS_FAILED(rv)) goto done; done: diff --git a/mozilla/intl/locale/src/windows/nsLocaleDLL.cpp b/mozilla/intl/locale/src/windows/nsLocaleDLL.cpp index 76d28aacc2a..0839de0d144 100644 --- a/mozilla/intl/locale/src/windows/nsLocaleDLL.cpp +++ b/mozilla/intl/locale/src/windows/nsLocaleDLL.cpp @@ -201,19 +201,19 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char (nsISupports**)&compMgr); if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterFactory(kLocaleFactoryCID, path); + rv = compMgr->UnregisterComponent(kLocaleFactoryCID, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kWin32LocaleFactoryCID, path); + rv = compMgr->UnregisterComponent(kWin32LocaleFactoryCID, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kCollationFactoryCID, path); + rv = compMgr->UnregisterComponent(kCollationFactoryCID, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kCollationCID, path); + rv = compMgr->UnregisterComponent(kCollationCID, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kDateTimeFormatCID, path); + rv = compMgr->UnregisterComponent(kDateTimeFormatCID, path); if (NS_FAILED(rv)) goto done; done: @@ -221,4 +221,4 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char return rv; } -#endif \ No newline at end of file +#endif diff --git a/mozilla/intl/lwbrk/src/nsLWBrk.cpp b/mozilla/intl/lwbrk/src/nsLWBrk.cpp index 6abaa9e3000..d7ddb80d016 100644 --- a/mozilla/intl/lwbrk/src/nsLWBrk.cpp +++ b/mozilla/intl/lwbrk/src/nsLWBrk.cpp @@ -141,7 +141,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char (nsISupports**)&compMgr); if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterFactory(kLWBrkCID, path); + rv = compMgr->UnregisterComponent(kLWBrkCID, path); (void)servMgr->ReleaseService(kComponentManagerCID, compMgr); return rv; diff --git a/mozilla/intl/strres/src/nsStringBundle.cpp b/mozilla/intl/strres/src/nsStringBundle.cpp index a6329331507..c3657a39c6f 100644 --- a/mozilla/intl/strres/src/nsStringBundle.cpp +++ b/mozilla/intl/strres/src/nsStringBundle.cpp @@ -254,7 +254,7 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* path) (nsISupports**)&compMgr); if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterFactory(kStringBundleServiceCID, path); + rv = compMgr->UnregisterComponent(kStringBundleServiceCID, path); if (NS_FAILED(rv)) goto done; done: diff --git a/mozilla/intl/uconv/src/nsUConvDll.cpp b/mozilla/intl/uconv/src/nsUConvDll.cpp index 079d9f9f752..ad0ee491d5c 100644 --- a/mozilla/intl/uconv/src/nsUConvDll.cpp +++ b/mozilla/intl/uconv/src/nsUConvDll.cpp @@ -171,19 +171,19 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char (nsISupports**)&compMgr); if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterFactory(kUnicodeDecodeHelperCID, path); + rv = compMgr->UnregisterComponent(kUnicodeDecodeHelperCID, path); if(NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kUnicodeEncodeHelperCID, path); + rv = compMgr->UnregisterComponent(kUnicodeEncodeHelperCID, path); if(NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kCharsetAliasCID, path); + rv = compMgr->UnregisterComponent(kCharsetAliasCID, path); if(NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kCharsetConverterManagerCID, path); + rv = compMgr->UnregisterComponent(kCharsetConverterManagerCID, path); if(NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kPlatformCharsetCID, path); + rv = compMgr->UnregisterComponent(kPlatformCharsetCID, path); done: (void)servMgr->ReleaseService(kComponentManagerCID, compMgr); diff --git a/mozilla/intl/uconv/ucvcn/nsUCvCnDll.cpp b/mozilla/intl/uconv/ucvcn/nsUCvCnDll.cpp index 4138b45a9ae..cff063872f2 100644 --- a/mozilla/intl/uconv/ucvcn/nsUCvCnDll.cpp +++ b/mozilla/intl/uconv/ucvcn/nsUCvCnDll.cpp @@ -239,7 +239,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char if (NS_FAILED(rv)) return rv; for (PRUint32 i=0; iUnregisterFactory(*(g_FactoryData[i].mCID), path); + rv = compMgr->UnregisterComponent(*(g_FactoryData[i].mCID), path); if(NS_FAILED(rv)) goto done; } diff --git a/mozilla/intl/uconv/ucvja/nsUCVJADll.cpp b/mozilla/intl/uconv/ucvja/nsUCVJADll.cpp index 35e36d58788..9882f119f96 100644 --- a/mozilla/intl/uconv/ucvja/nsUCVJADll.cpp +++ b/mozilla/intl/uconv/ucvja/nsUCVJADll.cpp @@ -196,7 +196,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char if (NS_FAILED(rv)) return rv; for (PRUint32 i=0; iUnregisterFactory(*(g_FactoryData[i].mCID), path); + rv = compMgr->UnregisterComponent(*(g_FactoryData[i].mCID), path); if(NS_FAILED(rv)) goto done; } diff --git a/mozilla/intl/uconv/ucvja2/nsUCVJA2Dll.cpp b/mozilla/intl/uconv/ucvja2/nsUCVJA2Dll.cpp index d2f728d8770..9cd0ef7f49c 100644 --- a/mozilla/intl/uconv/ucvja2/nsUCVJA2Dll.cpp +++ b/mozilla/intl/uconv/ucvja2/nsUCVJA2Dll.cpp @@ -234,7 +234,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char if (NS_FAILED(rv)) return rv; for (PRUint32 i=0; iUnregisterFactory(*(g_FactoryData[i].mCID), path); + rv = compMgr->UnregisterComponent(*(g_FactoryData[i].mCID), path); if(NS_FAILED(rv)) goto done; } diff --git a/mozilla/intl/uconv/ucvlatin/nsUCvLatinDll.cpp b/mozilla/intl/uconv/ucvlatin/nsUCvLatinDll.cpp index 5335fc268cd..1988fa0bd41 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUCvLatinDll.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUCvLatinDll.cpp @@ -673,7 +673,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char if (NS_FAILED(rv)) return rv; for (PRUint32 i=0; iUnregisterFactory(*(g_FactoryData[i].mCID), path); + rv = compMgr->UnregisterComponent(*(g_FactoryData[i].mCID), path); if(NS_FAILED(rv)) goto done; } diff --git a/mozilla/intl/unicharutil/src/nsUnicharUtilFactory.cpp b/mozilla/intl/unicharutil/src/nsUnicharUtilFactory.cpp index 40673966c85..9a54067521b 100644 --- a/mozilla/intl/unicharutil/src/nsUnicharUtilFactory.cpp +++ b/mozilla/intl/unicharutil/src/nsUnicharUtilFactory.cpp @@ -142,7 +142,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char (nsISupports**)&compMgr); if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterFactory(kUnicharUtilCID, path); + rv = compMgr->UnregisterComponent(kUnicharUtilCID, path); (void)servMgr->ReleaseService(kComponentManagerCID, compMgr); return rv; diff --git a/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp b/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp index 6df77318ace..f398f8a0361 100644 --- a/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp +++ b/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp @@ -216,13 +216,13 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* path) (nsISupports**)&compMgr); if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterFactory(kCMailDB, path); + rv = compMgr->UnregisterComponent(kCMailDB, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kCImapDB, path); + rv = compMgr->UnregisterComponent(kCImapDB, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kCNewsDB, path); + rv = compMgr->UnregisterComponent(kCNewsDB, path); if (NS_FAILED(rv)) goto done; done: diff --git a/mozilla/mailnews/imap/build/nsImapFactory.cpp b/mozilla/mailnews/imap/build/nsImapFactory.cpp index 61d402cfed2..0a6fdc49a97 100644 --- a/mozilla/mailnews/imap/build/nsImapFactory.cpp +++ b/mozilla/mailnews/imap/build/nsImapFactory.cpp @@ -272,25 +272,25 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* path) (nsISupports**)&compMgr); if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterFactory(kCImapUrl, path); + rv = compMgr->UnregisterComponent(kCImapUrl, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kCImapProtocol, path); + rv = compMgr->UnregisterComponent(kCImapProtocol, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kCImapHostSessionList, path); + rv = compMgr->UnregisterComponent(kCImapHostSessionList, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kCImapIncomingServer, path); + rv = compMgr->UnregisterComponent(kCImapIncomingServer, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kCImapService, path); + rv = compMgr->UnregisterComponent(kCImapService, path); if (NS_FAILED(rv)) goto done; rv = compMgr->UnregisterComponent(kCImapMessageResource, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kCImapResource, path); + rv = compMgr->UnregisterComponent(kCImapResource, path); if (NS_FAILED(rv)) goto done; done: diff --git a/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp b/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp index 54b43e271d4..9436cf2c3f2 100644 --- a/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp +++ b/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp @@ -326,19 +326,19 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* path) (nsISupports**)&compMgr); if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterFactory(kMailboxUrlCID, path); + rv = compMgr->UnregisterComponent(kMailboxUrlCID, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kMailboxServiceCID, path); + rv = compMgr->UnregisterComponent(kMailboxServiceCID, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kPop3UrlCID, path); + rv = compMgr->UnregisterComponent(kPop3UrlCID, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kPop3ServiceCID, path); + rv = compMgr->UnregisterComponent(kPop3ServiceCID, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kMailboxParserCID, path); + rv = compMgr->UnregisterComponent(kMailboxParserCID, path); if (NS_FAILED(rv)) goto done; rv = compMgr->UnregisterComponent(kLocalMailFolderResourceCID, path); diff --git a/mozilla/modules/libimg/gifcom/nsGIFDecoder.cpp b/mozilla/modules/libimg/gifcom/nsGIFDecoder.cpp index 0724e2286cf..f5baa1afbd6 100644 --- a/mozilla/modules/libimg/gifcom/nsGIFDecoder.cpp +++ b/mozilla/modules/libimg/gifcom/nsGIFDecoder.cpp @@ -183,7 +183,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char (nsISupports**)&compMgr); if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterFactory(kGIFDecoderCID, path); + rv = compMgr->UnregisterComponent(kGIFDecoderCID, path); (void)servMgr->ReleaseService(kComponentManagerCID, compMgr); return rv; diff --git a/mozilla/modules/libimg/jpgcom/nsJPGDecoder.cpp b/mozilla/modules/libimg/jpgcom/nsJPGDecoder.cpp index c7263041641..d2510308741 100644 --- a/mozilla/modules/libimg/jpgcom/nsJPGDecoder.cpp +++ b/mozilla/modules/libimg/jpgcom/nsJPGDecoder.cpp @@ -145,7 +145,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char (nsISupports**)&compMgr); if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterFactory(kJPGDecoderCID, path); + rv = compMgr->UnregisterComponent(kJPGDecoderCID, path); (void)servMgr->ReleaseService(kComponentManagerCID, compMgr); return rv; diff --git a/mozilla/modules/libimg/pngcom/nsPNGDecoder.cpp b/mozilla/modules/libimg/pngcom/nsPNGDecoder.cpp index ecc4764f85d..566595b11f4 100644 --- a/mozilla/modules/libimg/pngcom/nsPNGDecoder.cpp +++ b/mozilla/modules/libimg/pngcom/nsPNGDecoder.cpp @@ -185,7 +185,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char (nsISupports**)&compMgr); if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterFactory(kPNGDecoderCID, path); + rv = compMgr->UnregisterComponent(kPNGDecoderCID, path); (void)servMgr->ReleaseService(kComponentManagerCID, compMgr); return rv; diff --git a/mozilla/modules/libpref/src/nsPref.cpp b/mozilla/modules/libpref/src/nsPref.cpp index 19224478e3d..5e62c368ec3 100644 --- a/mozilla/modules/libpref/src/nsPref.cpp +++ b/mozilla/modules/libpref/src/nsPref.cpp @@ -1027,7 +1027,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterFactory(kPrefCID, path); + rv = compMgr->UnregisterComponent(kPrefCID, path); (void)servMgr->ReleaseService(kComponentManagerCID, compMgr); return rv; diff --git a/mozilla/profile/src/nsProfile.cpp b/mozilla/profile/src/nsProfile.cpp index 81558593dc2..d9c3d78226d 100644 --- a/mozilla/profile/src/nsProfile.cpp +++ b/mozilla/profile/src/nsProfile.cpp @@ -756,7 +756,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char (nsISupports**)&compMgr); if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterFactory(kProfileCID, path); + rv = compMgr->UnregisterComponent(kProfileCID, path); (void)servMgr->ReleaseService(kComponentManagerCID, compMgr); return rv; diff --git a/mozilla/silentdl/nsSilentDownload.cpp b/mozilla/silentdl/nsSilentDownload.cpp index eed5a2e997c..e0dc3565904 100644 --- a/mozilla/silentdl/nsSilentDownload.cpp +++ b/mozilla/silentdl/nsSilentDownload.cpp @@ -1032,25 +1032,9 @@ nsSilentDownloadManagerFactory::QueryInterface(REFNSIID aIID,void** aInstancePtr } +NS_IMPL_ADDREF(nsSilentDownloadManagerFactory) +NS_IMPL_RELEASE(nsSilentDownloadManagerFactory) -NS_IMETHODIMP -nsSilentDownloadManagerFactory::AddRef(void) -{ - return ++mRefCnt; -} - - -NS_IMETHODIMP -nsSilentDownloadManagerFactory::Release(void) -{ - if (--mRefCnt ==0) - { - delete this; - return 0; // Don't access mRefCnt after deleting! - } - - return mRefCnt; -} NS_IMETHODIMP nsSilentDownloadManagerFactory::CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult) @@ -1134,25 +1118,9 @@ nsSilentDownloadTaskFactory::QueryInterface(REFNSIID aIID,void** aInstancePtr) } +NS_IMPL_ADDREF(nsSilentDownloadTaskFactory) +NS_IMPL_RELEASE(nsSilentDownloadTaskFactory) -NS_IMETHODIMP -nsSilentDownloadTaskFactory::AddRef(void) -{ - return ++mRefCnt; -} - - -NS_IMETHODIMP -nsSilentDownloadTaskFactory::Release(void) -{ - if (--mRefCnt ==0) - { - delete this; - return 0; // Don't access mRefCnt after deleting! - } - - return mRefCnt; -} NS_IMETHODIMP nsSilentDownloadTaskFactory::CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult) @@ -1483,9 +1451,9 @@ NSUnregisterSelf(nsISupports* aServMgr, const char *path) printf("*** SilentDownload is being unregistered\n"); #endif - rv = compMgr->UnregisterFactory(kSilentDownloadCID, path); + rv = compMgr->UnregisterComponent(kSilentDownloadCID, path); if (NS_FAILED(rv)) goto done; - rv = compMgr->UnregisterFactory(kSilentDownloadTaskCID, path); + rv = compMgr->UnregisterComponent(kSilentDownloadTaskCID, path); done: (void)servMgr->ReleaseService(kComponentManagerCID, compMgr); diff --git a/mozilla/xpcom/tests/dynamic/TestDynamic.cpp b/mozilla/xpcom/tests/dynamic/TestDynamic.cpp index da4f77811ca..968ffd232ec 100644 --- a/mozilla/xpcom/tests/dynamic/TestDynamic.cpp +++ b/mozilla/xpcom/tests/dynamic/TestDynamic.cpp @@ -167,7 +167,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char (nsISupports**)&compMgr); if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterFactory(kTestLoadedFactoryCID, path); + rv = compMgr->UnregisterComponent(kTestLoadedFactoryCID, path); (void)servMgr->ReleaseService(kComponentManagerCID, compMgr); return rv; diff --git a/mozilla/xpfe/AppCores/src/nsAppCores.cpp b/mozilla/xpfe/AppCores/src/nsAppCores.cpp index acc39b66a7b..f64020e118e 100644 --- a/mozilla/xpfe/AppCores/src/nsAppCores.cpp +++ b/mozilla/xpfe/AppCores/src/nsAppCores.cpp @@ -80,15 +80,15 @@ NSUnregisterSelf(nsISupports* serviceMgr, const char *path) { printf("*** AppCores object is being unregistered\n"); - nsComponentManager::UnregisterFactory(kAppCoresManagerCID, path); - nsComponentManager::UnregisterFactory(kDOMPropsCoreCID, path); - nsComponentManager::UnregisterFactory(kPrefsCoreCID, path); - nsComponentManager::UnregisterFactory(kProfileCoreCID, path); - nsComponentManager::UnregisterFactory(kRDFCoreCID, path); - nsComponentManager::UnregisterFactory(kToolbarCoreCID, path); - nsComponentManager::UnregisterFactory(kToolkitCoreCID, path); - nsComponentManager::UnregisterFactory(kBrowserAppCoreCID, path); - nsComponentManager::UnregisterFactory(kEditorAppCoreCID, path); + nsComponentManager::UnregisterComponent(kAppCoresManagerCID, path); + nsComponentManager::UnregisterComponent(kDOMPropsCoreCID, path); + nsComponentManager::UnregisterComponent(kPrefsCoreCID, path); + nsComponentManager::UnregisterComponent(kProfileCoreCID, path); + nsComponentManager::UnregisterComponent(kRDFCoreCID, path); + nsComponentManager::UnregisterComponent(kToolbarCoreCID, path); + nsComponentManager::UnregisterComponent(kToolkitCoreCID, path); + nsComponentManager::UnregisterComponent(kBrowserAppCoreCID, path); + nsComponentManager::UnregisterComponent(kEditorAppCoreCID, path); return NS_OK; } diff --git a/mozilla/xpfe/appshell/src/nsAppShellFactory.cpp b/mozilla/xpfe/appshell/src/nsAppShellFactory.cpp index 531fbbd149c..2cacc660a33 100644 --- a/mozilla/xpfe/appshell/src/nsAppShellFactory.cpp +++ b/mozilla/xpfe/appshell/src/nsAppShellFactory.cpp @@ -65,13 +65,13 @@ NSRegisterSelf(nsISupports* serviceMgr, const char *path) extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* serviceMgr, const char *path) { - nsComponentManager::UnregisterFactory(kAppShellServiceCID, path); - nsComponentManager::UnregisterFactory(kCmdLineServiceCID, path); - nsComponentManager::UnregisterFactory(kFileLocatorCID, path); - nsComponentManager::UnregisterFactory(kProtocolHelperCID, path); - nsComponentManager::UnregisterFactory(kXPConnectFactoryCID, path); - nsComponentManager::UnregisterFactory(kGlobalHistoryCID, path); - nsComponentManager::UnregisterFactory(kNetSupportDialogCID, path); + nsComponentManager::UnregisterComponent(kAppShellServiceCID, path); + nsComponentManager::UnregisterComponent(kCmdLineServiceCID, path); + nsComponentManager::UnregisterComponent(kFileLocatorCID, path); + nsComponentManager::UnregisterComponent(kProtocolHelperCID, path); + nsComponentManager::UnregisterComponent(kXPConnectFactoryCID, path); + nsComponentManager::UnregisterComponent(kGlobalHistoryCID, path); + nsComponentManager::UnregisterComponent(kNetSupportDialogCID, path); return NS_OK; } diff --git a/mozilla/xpinstall/src/nsSoftwareUpdate.cpp b/mozilla/xpinstall/src/nsSoftwareUpdate.cpp index a7aab98c8fd..5f2087b8d36 100644 --- a/mozilla/xpinstall/src/nsSoftwareUpdate.cpp +++ b/mozilla/xpinstall/src/nsSoftwareUpdate.cpp @@ -395,9 +395,9 @@ NSUnregisterSelf(nsISupports* serviceMgr, const char *path) { printf("*** XPInstall is being unregistered\n"); - nsRepository::UnregisterFactory(kSoftwareUpdate_CID, path); - nsRepository::UnregisterFactory(kInstallTrigger_CID, path); - nsRepository::UnregisterFactory(kInstallVersion_CID, path); + nsRepository::UnregisterComponent(kSoftwareUpdate_CID, path); + nsRepository::UnregisterComponent(kInstallTrigger_CID, path); + nsRepository::UnregisterComponent(kInstallVersion_CID, path); return NS_OK; }