Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use NS_WITH_SERVICE1 which uses the service manager that was passed in to

Browse Source 
NSRegisterSelf / NSUnregisterSelf.


git-svn-id: svn://10.0.0.236/trunk@34375 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mscott%netscape.com 1999-06-09 06:40:48 +00:00
parent e0486d146d
commit 3817aa452b
13 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/mailnews/addrbook/build/nsAbFactory.cpp
View File

@ -219,7 +219,7 @@ NSRegisterSelf(nsISupports* aServMgr, const char* path)
nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
if (NS_FAILED(rv)) return rv;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
// register our RDF datasources:
@ -263,7 +263,7 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* path)
nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
if (NS_FAILED(rv)) return rv;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterComponent(kAbDirectoryDataSourceCID, path);

4
mozilla/mailnews/base/build/nsMsgFactory.cpp
View File

@ -338,7 +338,7 @@ NSRegisterSelf(nsISupports* aServMgr, const char* path)
nsresult rv;
nsresult finalResult = NS_OK;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
// register the message folder factory
@ -465,7 +465,7 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* path)
nsresult rv = NS_OK;
nsresult finalResult = NS_OK;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterComponent(kCUrlListenerManagerCID, path);

10
mozilla/mailnews/compose/build/nsMsgCompFactory.cpp
View File

@ -229,10 +229,7 @@ extern "C" NS_EXPORT nsresult NSRegisterSelf(nsISupports* aServMgr, const char*
nsresult rv = NS_OK;
nsresult finalResult = NS_OK;
nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
if (NS_FAILED(rv)) return rv;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
// register the message compose factory
@ -295,10 +292,7 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* path)
nsresult finalResult = NS_OK;
nsresult rv = NS_OK;
nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
if (NS_FAILED(rv)) return rv;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterComponent(kCComposeAppCoreCID, path);

4
mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp
View File

@ -177,7 +177,7 @@ NSRegisterSelf(nsISupports* aServMgr, const char* path)
nsresult rv = NS_OK;
nsresult finalResult = NS_OK;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
@ -202,7 +202,7 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* path)
nsresult rv = NS_OK;
nsresult finalResult = NS_OK;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterComponent(kCMailDB, path);

4
mozilla/mailnews/imap/build/nsImapFactory.cpp
View File

@ -203,7 +203,7 @@ NSRegisterSelf(nsISupports* aServMgr, const char* path)
nsresult rv = NS_OK;
nsresult finalResult = NS_OK;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = compMgr->RegisterComponent(kCImapUrl, nsnull, nsnull,
@ -258,7 +258,7 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* path)
nsresult rv = NS_OK;
nsresult finalResult = NS_OK;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterComponent(kCImapUrl, path);

4
mozilla/mailnews/local/build/nsMsgLocalFactory.cpp
View File

@ -251,7 +251,7 @@ NSRegisterSelf(nsISupports* aServMgr, const char* path)
nsresult rv;
nsresult finalResult = NS_OK;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = compMgr->RegisterComponent(kMailboxUrlCID, nsnull, nsnull,
@ -322,7 +322,7 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* path)
nsresult rv = NS_OK;
nsresult finalResult = NS_OK;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterComponent(kMailboxUrlCID, path);

4
mozilla/mailnews/mime/cthandlers/calendar/nsCalendarFactory.cpp
View File

@ -191,7 +191,7 @@ NSRegisterSelf(nsISupports* aServMgr, const char* path)
{
nsresult rv = NS_OK;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = compMgr->RegisterComponent(kMimeContentTypeHandlerCID,
@ -206,7 +206,7 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* path)
{
nsresult rv;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterComponent(kMimeContentTypeHandlerCID, path);

4
mozilla/mailnews/mime/cthandlers/vcard/nsVCardFactory.cpp
View File

@ -191,7 +191,7 @@ NSRegisterSelf(nsISupports* aServMgr, const char* path)
{
nsresult rv = NS_OK;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = compMgr->RegisterComponent(kMimeContentTypeHandlerCID,
@ -206,7 +206,7 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* path)
{
nsresult rv = NS_OK;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterComponent(kMimeContentTypeHandlerCID, path);

4
mozilla/mailnews/mime/emitters/html/nsEmitterFactory.cpp
View File

@ -192,7 +192,7 @@ NSRegisterSelf(nsISupports* aServMgr, const char* path)
{
nsresult rv;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = compMgr->RegisterComponent(kMimeEmitterCID,
@ -207,7 +207,7 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* path)
{
nsresult rv;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterComponent(kMimeEmitterCID, path);

4
mozilla/mailnews/mime/emitters/raw/nsEmitterFactory.cpp
View File

@ -192,7 +192,7 @@ NSRegisterSelf(nsISupports* aServMgr, const char* path)
{
nsresult rv = NS_OK;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = compMgr->RegisterComponent(kMimeEmitterCID,
@ -207,7 +207,7 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* path)
{
nsresult rv = NS_OK;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterComponent(kMimeEmitterCID, path);

4
mozilla/mailnews/mime/emitters/xml/nsEmitterFactory.cpp
View File

@ -191,7 +191,7 @@ NSRegisterSelf(nsISupports* aServMgr, const char* path)
{
nsresult rv = NS_OK;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = compMgr->RegisterComponent(kMimeEmitterCID,
@ -205,7 +205,7 @@ extern "C" NS_EXPORT nsresult
NSUnregisterSelf(nsISupports* aServMgr, const char* path)
{
nsresult rv = NS_OK;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterComponent(kMimeEmitterCID, path);

2
mozilla/mailnews/mime/src/nsMimeFactory.cpp
View File

@ -222,7 +222,7 @@ extern "C" NS_EXPORT nsresult NSRegisterSelf(nsISupports* aServMgr, const char *
nsresult rv = NS_OK;
nsresult finalResult = NS_OK;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
// Content type handler object class access interface

5
mozilla/mailnews/news/build/nsMsgNewsFactory.cpp
View File

@ -304,10 +304,7 @@ NSRegisterSelf(nsISupports* aServMgr, const char* path)
{
nsresult rv = NS_OK;
nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
if (NS_FAILED(rv)) return rv;
NS_WITH_SERVICE(nsIComponentManager,compMgr,kComponentManagerCID,&rv);
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = compMgr->RegisterComponent(kNntpUrlCID,