From 3817aa452bb5a687459a320d79a8eb12e3c46a15 Mon Sep 17 00:00:00 2001 From: "mscott%netscape.com" Date: Wed, 9 Jun 1999 06:40:48 +0000 Subject: [PATCH] Use NS_WITH_SERVICE1 which uses the service manager that was passed in to NSRegisterSelf / NSUnregisterSelf. git-svn-id: svn://10.0.0.236/trunk@34375 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/addrbook/build/nsAbFactory.cpp | 4 ++-- mozilla/mailnews/base/build/nsMsgFactory.cpp | 4 ++-- mozilla/mailnews/compose/build/nsMsgCompFactory.cpp | 10 ++-------- mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp | 4 ++-- mozilla/mailnews/imap/build/nsImapFactory.cpp | 4 ++-- mozilla/mailnews/local/build/nsMsgLocalFactory.cpp | 4 ++-- .../mime/cthandlers/calendar/nsCalendarFactory.cpp | 4 ++-- .../mailnews/mime/cthandlers/vcard/nsVCardFactory.cpp | 4 ++-- .../mailnews/mime/emitters/html/nsEmitterFactory.cpp | 4 ++-- .../mailnews/mime/emitters/raw/nsEmitterFactory.cpp | 4 ++-- .../mailnews/mime/emitters/xml/nsEmitterFactory.cpp | 4 ++-- mozilla/mailnews/mime/src/nsMimeFactory.cpp | 2 +- mozilla/mailnews/news/build/nsMsgNewsFactory.cpp | 5 +---- 13 files changed, 24 insertions(+), 33 deletions(-) diff --git a/mozilla/mailnews/addrbook/build/nsAbFactory.cpp b/mozilla/mailnews/addrbook/build/nsAbFactory.cpp index 2fdb877fe90..3fc6d09235c 100644 --- a/mozilla/mailnews/addrbook/build/nsAbFactory.cpp +++ b/mozilla/mailnews/addrbook/build/nsAbFactory.cpp @@ -219,7 +219,7 @@ NSRegisterSelf(nsISupports* aServMgr, const char* path) nsCOMPtr 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 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); diff --git a/mozilla/mailnews/base/build/nsMsgFactory.cpp b/mozilla/mailnews/base/build/nsMsgFactory.cpp index 3019be8fd20..9316c117fae 100644 --- a/mozilla/mailnews/base/build/nsMsgFactory.cpp +++ b/mozilla/mailnews/base/build/nsMsgFactory.cpp @@ -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); diff --git a/mozilla/mailnews/compose/build/nsMsgCompFactory.cpp b/mozilla/mailnews/compose/build/nsMsgCompFactory.cpp index f6433a24b9a..aaeb9cefb88 100644 --- a/mozilla/mailnews/compose/build/nsMsgCompFactory.cpp +++ b/mozilla/mailnews/compose/build/nsMsgCompFactory.cpp @@ -229,10 +229,7 @@ extern "C" NS_EXPORT nsresult NSRegisterSelf(nsISupports* aServMgr, const char* nsresult rv = NS_OK; nsresult finalResult = NS_OK; - nsCOMPtr 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 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); diff --git a/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp b/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp index 59a2400b898..fc32ca5ab13 100644 --- a/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp +++ b/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp @@ -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); diff --git a/mozilla/mailnews/imap/build/nsImapFactory.cpp b/mozilla/mailnews/imap/build/nsImapFactory.cpp index 3b4cd36eff5..e6f10bf0048 100644 --- a/mozilla/mailnews/imap/build/nsImapFactory.cpp +++ b/mozilla/mailnews/imap/build/nsImapFactory.cpp @@ -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); diff --git a/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp b/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp index 78dfbb91877..af5a7f4930c 100644 --- a/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp +++ b/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp @@ -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); diff --git a/mozilla/mailnews/mime/cthandlers/calendar/nsCalendarFactory.cpp b/mozilla/mailnews/mime/cthandlers/calendar/nsCalendarFactory.cpp index 3d16e1f6916..10948eaadbb 100644 --- a/mozilla/mailnews/mime/cthandlers/calendar/nsCalendarFactory.cpp +++ b/mozilla/mailnews/mime/cthandlers/calendar/nsCalendarFactory.cpp @@ -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); diff --git a/mozilla/mailnews/mime/cthandlers/vcard/nsVCardFactory.cpp b/mozilla/mailnews/mime/cthandlers/vcard/nsVCardFactory.cpp index 516c49d54c7..0b2c46aebe5 100644 --- a/mozilla/mailnews/mime/cthandlers/vcard/nsVCardFactory.cpp +++ b/mozilla/mailnews/mime/cthandlers/vcard/nsVCardFactory.cpp @@ -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); diff --git a/mozilla/mailnews/mime/emitters/html/nsEmitterFactory.cpp b/mozilla/mailnews/mime/emitters/html/nsEmitterFactory.cpp index f2aa86e2abf..4ee70d3f021 100644 --- a/mozilla/mailnews/mime/emitters/html/nsEmitterFactory.cpp +++ b/mozilla/mailnews/mime/emitters/html/nsEmitterFactory.cpp @@ -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); diff --git a/mozilla/mailnews/mime/emitters/raw/nsEmitterFactory.cpp b/mozilla/mailnews/mime/emitters/raw/nsEmitterFactory.cpp index 40eb400a8ff..e49a83a88ee 100644 --- a/mozilla/mailnews/mime/emitters/raw/nsEmitterFactory.cpp +++ b/mozilla/mailnews/mime/emitters/raw/nsEmitterFactory.cpp @@ -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); diff --git a/mozilla/mailnews/mime/emitters/xml/nsEmitterFactory.cpp b/mozilla/mailnews/mime/emitters/xml/nsEmitterFactory.cpp index 49c27d52950..575838c4969 100644 --- a/mozilla/mailnews/mime/emitters/xml/nsEmitterFactory.cpp +++ b/mozilla/mailnews/mime/emitters/xml/nsEmitterFactory.cpp @@ -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); diff --git a/mozilla/mailnews/mime/src/nsMimeFactory.cpp b/mozilla/mailnews/mime/src/nsMimeFactory.cpp index 312e62fd7e2..8fe75a7452c 100644 --- a/mozilla/mailnews/mime/src/nsMimeFactory.cpp +++ b/mozilla/mailnews/mime/src/nsMimeFactory.cpp @@ -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 diff --git a/mozilla/mailnews/news/build/nsMsgNewsFactory.cpp b/mozilla/mailnews/news/build/nsMsgNewsFactory.cpp index 6403af61664..1266ebbed5f 100644 --- a/mozilla/mailnews/news/build/nsMsgNewsFactory.cpp +++ b/mozilla/mailnews/news/build/nsMsgNewsFactory.cpp @@ -304,10 +304,7 @@ NSRegisterSelf(nsISupports* aServMgr, const char* path) { nsresult rv = NS_OK; - nsCOMPtr 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,