From 22be4352a5bf2fe96fac8d57f50cf1c5045f5b03 Mon Sep 17 00:00:00 2001 From: "mscott%netscape.com" Date: Tue, 4 May 1999 21:05:30 +0000 Subject: [PATCH] part of mailnews audit --> Conversion to NS_WITH_SERVICE --- mailnews/db/msgdb/src/nsImapMailDatabase.cpp | 6 +----- mailnews/db/msgdb/src/nsMsgDatabase.cpp | 8 ++------ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/mailnews/db/msgdb/src/nsImapMailDatabase.cpp b/mailnews/db/msgdb/src/nsImapMailDatabase.cpp index 88f9f2f0a015..e8dab4bfaf33 100644 --- a/mailnews/db/msgdb/src/nsImapMailDatabase.cpp +++ b/mailnews/db/msgdb/src/nsImapMailDatabase.cpp @@ -155,9 +155,7 @@ nsImapMailDatabase::CreateMsgHdr(nsIMdbRow* hdrRow, nsMsgKey key, nsIMsgHdr* *re nsresult rv; nsIRDFService *rdf; - rv = nsServiceManager::GetService(kRDFServiceCID, - nsIRDFService::GetIID(), - (nsISupports**)&rdf); + NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); if (NS_FAILED(rv)) return rv; @@ -191,8 +189,6 @@ nsImapMailDatabase::CreateMsgHdr(nsIMdbRow* hdrRow, nsMsgKey key, nsIMsgHdr* *re msgHdr->SetMessageKey(key); } *result = msgHdr; - - //nsServiceManager::ReleaseService(kRDFServiceCID, rdf); return NS_OK; } diff --git a/mailnews/db/msgdb/src/nsMsgDatabase.cpp b/mailnews/db/msgdb/src/nsMsgDatabase.cpp index 4fec465328b6..92e919d0f979 100644 --- a/mailnews/db/msgdb/src/nsMsgDatabase.cpp +++ b/mailnews/db/msgdb/src/nsMsgDatabase.cpp @@ -2530,16 +2530,12 @@ PRBool nsMsgDatabase::ThreadBySubjectWithoutRe() nsresult nsMsgDatabase::GetBoolPref(const char *prefName, PRBool *result) { PRBool prefValue = PR_FALSE; - nsIPref* prefs = nsnull; nsresult rv; - rv = nsServiceManager::GetService(kPrefCID, kIPrefIID, (nsISupports**)&prefs); - if (prefs && NS_SUCCEEDED(rv)) + NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + if (NS_SUCCEEDED(rv) && prefs) { -// prefs->Startup("prefs50.js"); - rv = prefs->GetBoolPref(prefName, &prefValue); *result = prefValue; - nsServiceManager::ReleaseService(kPrefCID, prefs); } return rv; }