diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp index f7aad6f0af57..0c235d2b34a6 100644 --- a/accessible/src/base/nsAccessible.cpp +++ b/accessible/src/base/nsAccessible.cpp @@ -583,7 +583,8 @@ nsresult nsAccessible::GetTranslatedString(PRUnichar *aKey, nsAWritableString *a if (firstTime) { firstTime = PR_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIStringBundleService, stringBundleService, kStringBundleServiceCID, &rv); + nsCOMPtr stringBundleService = + do_GetService(kStringBundleServiceCID, &rv); // nsCOMPtr stringBundleService(do_GetService(kStringBundleServiceCID, &rv)); if (!stringBundleService) { NS_WARNING("ERROR: Failed to get StringBundle Service instance.\n"); diff --git a/accessible/src/nsAccessible.cpp b/accessible/src/nsAccessible.cpp index f7aad6f0af57..0c235d2b34a6 100644 --- a/accessible/src/nsAccessible.cpp +++ b/accessible/src/nsAccessible.cpp @@ -583,7 +583,8 @@ nsresult nsAccessible::GetTranslatedString(PRUnichar *aKey, nsAWritableString *a if (firstTime) { firstTime = PR_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIStringBundleService, stringBundleService, kStringBundleServiceCID, &rv); + nsCOMPtr stringBundleService = + do_GetService(kStringBundleServiceCID, &rv); // nsCOMPtr stringBundleService(do_GetService(kStringBundleServiceCID, &rv)); if (!stringBundleService) { NS_WARNING("ERROR: Failed to get StringBundle Service instance.\n"); diff --git a/caps/src/nsCodebasePrincipal.cpp b/caps/src/nsCodebasePrincipal.cpp index 51c3b4177084..4d774fcce210 100644 --- a/caps/src/nsCodebasePrincipal.cpp +++ b/caps/src/nsCodebasePrincipal.cpp @@ -86,7 +86,7 @@ nsCodebasePrincipal::CanEnableCapability(const char *capability, // check to see if the codebase principal pref is enabled. static char pref[] = "signed.applets.codebase_principal_support"; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, "@mozilla.org/preferences;1", &rv); + nsCOMPtr prefs(do_GetService("@mozilla.org/preferences;1", &rv)); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; PRBool enabled; diff --git a/caps/src/nsScriptSecurityManager.cpp b/caps/src/nsScriptSecurityManager.cpp index 5294e00ebe00..de43fc3169ef 100644 --- a/caps/src/nsScriptSecurityManager.cpp +++ b/caps/src/nsScriptSecurityManager.cpp @@ -1600,7 +1600,8 @@ nsScriptSecurityManager::SetCanEnableCapability(const char* certificateID, if (!mSystemCertificate) { nsCOMPtr systemCertFile; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return NS_ERROR_FAILURE; rv = directoryService->Get(NS_XPCOM_CURRENT_PROCESS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(systemCertFile)); @@ -1862,7 +1863,8 @@ nsScriptSecurityManager::GetScriptSecurityManager() return NULL; nsresult rv; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc = + do_GetService(nsIXPConnect::GetCID(), &rv); if (NS_SUCCEEDED(rv) && xpc) { rv = xpc->SetDefaultSecurityManager( diff --git a/caps/src/nsSecurityManagerFactory.cpp b/caps/src/nsSecurityManagerFactory.cpp index 2f4de065d17f..f667d253357d 100644 --- a/caps/src/nsSecurityManagerFactory.cpp +++ b/caps/src/nsSecurityManagerFactory.cpp @@ -93,8 +93,8 @@ netscape_security_isPrivilegeEnabled(JSContext *cx, JSObject *obj, uintN argc, char *cap = getStringArgument(cx, obj, 0, argc, argv); if (cap) { nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { @@ -121,8 +121,8 @@ netscape_security_enablePrivilege(JSContext *cx, JSObject *obj, uintN argc, if (!cap) return JS_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return JS_FALSE; @@ -147,8 +147,8 @@ netscape_security_disablePrivilege(JSContext *cx, JSObject *obj, uintN argc, if (!cap) return JS_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return JS_FALSE; @@ -174,8 +174,8 @@ netscape_security_revertPrivilege(JSContext *cx, JSObject *obj, uintN argc, if (!cap) return JS_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return JS_FALSE; @@ -201,8 +201,8 @@ netscape_security_setCanEnablePrivilege(JSContext *cx, JSObject *obj, uintN argc if (!principalID || !cap) return JS_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return JS_FALSE; @@ -228,8 +228,8 @@ netscape_security_invalidate(JSContext *cx, JSObject *obj, uintN argc, if (!principalID) return JS_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return JS_FALSE; diff --git a/chrome/src/nsChromeProtocolHandler.cpp b/chrome/src/nsChromeProtocolHandler.cpp index e5204b7e10e3..5ee8f08f1de2 100644 --- a/chrome/src/nsChromeProtocolHandler.cpp +++ b/chrome/src/nsChromeProtocolHandler.cpp @@ -565,7 +565,7 @@ nsChromeProtocolHandler::NewChannel(nsIURI* aURI, // Canonify the "chrome:" URL; e.g., so that we collapse // "chrome://navigator/content/navigator.xul" and "chrome://navigator/content" // and "chrome://navigator/content/navigator.xul". - NS_WITH_SERVICE(nsIChromeRegistry, reg, kChromeRegistryCID, &rv); + nsCOMPtr reg(do_GetService(kChromeRegistryCID, &rv)); if (NS_FAILED(rv)) return rv; rv = reg->Canonify(aURI); @@ -573,7 +573,8 @@ nsChromeProtocolHandler::NewChannel(nsIURI* aURI, // Check the prototype cache to see if we've already got the // document in the cache. - NS_WITH_SERVICE(nsIXULPrototypeCache, cache, kXULPrototypeCacheCID, &rv); + nsCOMPtr cache = + do_GetService(kXULPrototypeCacheCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr proto; @@ -601,7 +602,7 @@ nsChromeProtocolHandler::NewChannel(nsIURI* aURI, rv = reg->ConvertChromeURL(chromeURI, getter_Copies(spec)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; rv = serv->NewURI(spec, nsnull, getter_AddRefs(chromeURI)); @@ -639,8 +640,8 @@ nsChromeProtocolHandler::NewChannel(nsIURI* aURI, if (PL_strcasecmp(fileExtension, "xul") == 0 || PL_strcasecmp(fileExtension, "html") == 0 || PL_strcasecmp(fileExtension, "xml") == 0) { - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr principal; diff --git a/chrome/src/nsChromeRegistry.cpp b/chrome/src/nsChromeRegistry.cpp index 32883dd37131..87b4db110b44 100644 --- a/chrome/src/nsChromeRegistry.cpp +++ b/chrome/src/nsChromeRegistry.cpp @@ -339,7 +339,8 @@ nsChromeRegistry::Init() rv = mRDFService->GetResource(kURICHROME_packageVersion, getter_AddRefs(mPackageVersion)); NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get RDF resource"); - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (observerService) { observerService->AddObserver(this, NS_LITERAL_STRING("profile-before-change").get()); observerService->AddObserver(this, NS_LITERAL_STRING("profile-do-change").get()); @@ -1094,7 +1095,8 @@ NS_IMETHODIMP nsChromeRegistry::RefreshSkins() if (NS_FAILED(rv)) return rv; // Get the window mediator - NS_WITH_SERVICE(nsIWindowMediator, windowMediator, kWindowMediatorCID, &rv); + nsCOMPtr windowMediator = + do_GetService(kWindowMediatorCID, &rv); if (NS_SUCCEEDED(rv)) { nsCOMPtr windowEnumerator; @@ -1129,18 +1131,21 @@ nsresult nsChromeRegistry::FlushCaches() // Flush the style sheet cache completely. // XXX For now flush everything. need a better call that only flushes style sheets. - NS_WITH_SERVICE(nsIXULPrototypeCache, xulCache, "@mozilla.org/xul/xul-prototype-cache;1", &rv); + nsCOMPtr xulCache = + do_GetService("@mozilla.org/xul/xul-prototype-cache;1", &rv); if (NS_SUCCEEDED(rv) && xulCache) { xulCache->Flush(); } // Flush the old image cache. - NS_WITH_SERVICE(nsIImageManager, imageManager, kImageManagerCID, &rv); + nsCOMPtr imageManager = + do_GetService(kImageManagerCID, &rv); if (imageManager) rv = imageManager->FlushCache(1); // Flush the new imagelib image chrome cache. - NS_WITH_SERVICE(imgICache, imageCache, "@mozilla.org/image/cache;1", &rv); + nsCOMPtr imageCache = + do_GetService("@mozilla.org/image/cache;1", &rv); if (NS_SUCCEEDED(rv) && imageCache) { imageCache->ClearCache(PR_TRUE); } @@ -2976,7 +2981,8 @@ nsChromeRegistry::CheckForNewChrome() // open the installed-chrome file nsCOMPtr listFile; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = directoryService->Get(NS_APP_CHROME_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(listFile)); diff --git a/content/base/src/nsContentPolicy.cpp b/content/base/src/nsContentPolicy.cpp index 69f54e48b5af..d84d06187a24 100644 --- a/content/base/src/nsContentPolicy.cpp +++ b/content/base/src/nsContentPolicy.cpp @@ -48,7 +48,8 @@ nsContentPolicy::nsContentPolicy() { NS_INIT_REFCNT(); nsresult rv; - NS_WITH_SERVICE(nsICategoryManager, catman, NS_CATEGORYMANAGER_CONTRACTID, &rv); + nsCOMPtr catman = + do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) /* log an error? */ return; diff --git a/content/base/src/nsCopySupport.cpp b/content/base/src/nsCopySupport.cpp index f5a14edbb331..9c08f4715dc3 100644 --- a/content/base/src/nsCopySupport.cpp +++ b/content/base/src/nsCopySupport.cpp @@ -162,7 +162,7 @@ nsresult nsCopySupport::HTMLCopy(nsISelection *aSel, nsIDocument *aDoc, PRInt16 #endif // IBMBIDI // Get the Clipboard - NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv); + nsCOMPtr clipboard(do_GetService(kCClipboardCID, &rv)); if (NS_FAILED(rv)) return rv; diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index cbe8169183f1..2a2771bbaab6 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -729,8 +729,8 @@ nsDocument::GetPrincipal(nsIPrincipal **aPrincipal) { if (!mPrincipal) { nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv = securityManager->GetCodebasePrincipal(mDocumentURL, @@ -792,8 +792,8 @@ NS_IMETHODIMP nsDocument::SetBaseURL(nsIURI* aURL) { nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { rv = securityManager->CheckLoadURI(mDocumentURL, aURL, nsIScriptSecurityManager::STANDARD); if (NS_SUCCEEDED(rv)) { @@ -2328,7 +2328,8 @@ nsDocument::GetBoxObjectFor(nsIDOMElement* aElement, nsIBoxObject** aResult) PRInt32 namespaceID; nsCOMPtr tag; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); nsCOMPtr content(do_QueryInterface(aElement)); xblService->ResolveTag(content, &namespaceID, getter_AddRefs(tag)); diff --git a/content/base/src/nsDocumentViewer.cpp b/content/base/src/nsDocumentViewer.cpp index 06cbb966a8d4..693f4d9a715a 100644 --- a/content/base/src/nsDocumentViewer.cpp +++ b/content/base/src/nsDocumentViewer.cpp @@ -2164,7 +2164,8 @@ DocumentViewerImpl::PrintPage(nsIPresContext* aPresContext, PRINT_DEBUG_MSG3("------ In DV::PrintPage PO: %p (%s)\n", aPO, gFrameTypesStr[aPO->mFrameType]); nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv) && printService) { PRBool isCancelled; printService->GetIsCancelled(&isCancelled); @@ -2445,7 +2446,8 @@ void DocumentViewerImpl::CalcPageFrameLocation(nsIPresShell * aPresShell, // The PageFrame or Seq frame has the margins set // these need to be removed nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv) && printService) { nsMargin margin(0,0,0,0); printService->GetMarginInTwips(margin); @@ -2791,7 +2793,8 @@ DocumentViewerImpl::ReflowPrintObject(PrintObject * aPO) // put it keeps it from page breaking in the middle of your print of the selection // (see also nsSimplePageSequence.cpp) PRInt16 printRangeType = nsIPrintOptions::kRangeAllPages; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv)) { printService->GetPrintRange(&printRangeType); } @@ -3011,7 +3014,8 @@ DocumentViewerImpl::EnablePOsForPrinting() mPrt->mSelectedPO = nsnull; nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_FAILED(rv)) { return rv; } @@ -3325,7 +3329,8 @@ DocumentViewerImpl::DoPrint(PrintObject * aPO, PRBool aDoSyncPrinting, PRBool& a PRInt16 printRangeType = nsIPrintOptions::kRangeAllPages; nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv) && printService) { printService->GetPrintRange(&printRangeType); } @@ -3692,7 +3697,8 @@ void DocumentViewerImpl::Notify(nsIImageGroup *aImageGroup, nsCOMPtr eventQ; // Get the event queue of the current thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueService, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueService, &rv); if (NS_FAILED(rv)) return; rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, @@ -3791,7 +3797,8 @@ DocumentViewerImpl::CreateStyleSet(nsIDocument* aDocument, } } - NS_WITH_SERVICE(nsIChromeRegistry, chromeRegistry, "@mozilla.org/chrome/chrome-registry;1", &rv); + nsCOMPtr chromeRegistry = + do_GetService("@mozilla.org/chrome/chrome-registry;1", &rv); if (NS_SUCCEEDED(rv) && chromeRegistry) { nsCOMPtr sheets; @@ -4394,7 +4401,8 @@ nsresult rv; // Setup print options for UI rv = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv) && printService) { if (mPrt->mIsParentAFrameSet) { if (mPrt->mCurrentFocusWin) { diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp index e2086b883aa7..40c5a0ee1630 100644 --- a/content/base/src/nsGenericElement.cpp +++ b/content/base/src/nsGenericElement.cpp @@ -2602,8 +2602,8 @@ nsGenericElement::TriggerLink(nsIPresContext* aPresContext, if (aClick) { nsresult proceed = NS_OK; // Check that this page is allowed to load this URI. - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); nsCOMPtr absURI; if (NS_SUCCEEDED(rv)) rv = NS_NewURI(getter_AddRefs(absURI), absURLSpec, aBaseURL); diff --git a/content/base/src/nsPlainTextSerializer.cpp b/content/base/src/nsPlainTextSerializer.cpp index 2636396d389b..94671d7798a1 100644 --- a/content/base/src/nsPlainTextSerializer.cpp +++ b/content/base/src/nsPlainTextSerializer.cpp @@ -154,7 +154,7 @@ nsPlainTextSerializer::Init(PRUint32 aFlags, PRUint32 aWrapColumn, // Only create a linebreaker if we will handle wrapping. if(MayWrap()) { - NS_WITH_SERVICE(nsILineBreakerFactory, lf, kLWBrkCID, &rv); + nsCOMPtr lf(do_GetService(kLWBrkCID, &rv)); if (NS_SUCCEEDED(rv)) { nsAutoString lbarg; rv = lf->GetBreaker(lbarg, getter_AddRefs(mLineBreaker)); @@ -176,7 +176,7 @@ nsPlainTextSerializer::Init(PRUint32 aFlags, PRUint32 aWrapColumn, if(mFlags & nsIDocumentEncoder::OutputFormatted) { // Get some prefs that controls how we do formatted output - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { prefs->GetBoolPref(PREF_STRUCTS, &mStructs); prefs->GetIntPref(PREF_HEADER_STRATEGY, &mHeaderStrategy); diff --git a/content/base/src/nsSelection.cpp b/content/base/src/nsSelection.cpp index ea94e4829258..c5a9883b9e5a 100644 --- a/content/base/src/nsSelection.cpp +++ b/content/base/src/nsSelection.cpp @@ -912,14 +912,15 @@ nsSelection::nsSelection() // Check to see if the autocopy pref is enabled // and add the autocopy listener if it is nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, "@mozilla.org/preferences;1", &rv); + nsCOMPtr prefs(do_GetService("@mozilla.org/preferences;1", &rv)); if (NS_SUCCEEDED(rv) && prefs) { static char pref[] = "clipboard.autocopy"; PRBool autoCopy = PR_FALSE; if (NS_SUCCEEDED(prefs->GetBoolPref(pref, &autoCopy)) && autoCopy) { - NS_WITH_SERVICE(nsIAutoCopyService, autoCopyService, "@mozilla.org/autocopy;1", &rv); + nsCOMPtr autoCopyService = + do_GetService("@mozilla.org/autocopy;1", &rv); if (NS_SUCCEEDED(rv) && autoCopyService) { diff --git a/content/base/src/nsSyncLoadService.cpp b/content/base/src/nsSyncLoadService.cpp index 62f1dbc6e68d..12caf0e38b2a 100644 --- a/content/base/src/nsSyncLoadService.cpp +++ b/content/base/src/nsSyncLoadService.cpp @@ -238,7 +238,7 @@ nsSyncLoader::LoadDocument(nsIURI* documentURI, nsIDOMDocument **_retval) nsCOMPtr eventQService; nsCOMPtr cc; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_SUCCEEDED(rv)) { rv = xpc->GetCurrentNativeCallContext(getter_AddRefs(cc)); } @@ -249,7 +249,8 @@ nsSyncLoader::LoadDocument(nsIURI* documentURI, nsIDOMDocument **_retval) if (NS_FAILED(rv)) return NS_ERROR_FAILURE; } else { - NS_WITH_SERVICE(nsIAppShellService, appshellSvc, kAppShellServiceCID, &rv); + nsCOMPtr appshellSvc = + do_GetService(kAppShellServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr junk; rv = appshellSvc->GetHiddenWindowAndJSContext(getter_AddRefs(junk), &cx); diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp index 3b152f1741d7..253981d47fca 100644 --- a/content/events/src/nsEventStateManager.cpp +++ b/content/events/src/nsEventStateManager.cpp @@ -174,8 +174,8 @@ NS_IMETHODIMP nsEventStateManager::Init() { nsresult rv; - NS_WITH_SERVICE(nsIObserverService, observerService, - NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsAutoString topic; topic.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID); @@ -237,8 +237,8 @@ nsEventStateManager::~nsEventStateManager() nsresult rv; - NS_WITH_SERVICE (nsIObserverService, observerService, - NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsAutoString topic; topic.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID); diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp index c0b8f8d16584..a10f9831ff21 100644 --- a/content/html/content/src/nsHTMLInputElement.cpp +++ b/content/html/content/src/nsHTMLInputElement.cpp @@ -464,8 +464,8 @@ nsHTMLInputElement::SetValue(const nsAReadableString& aValue) NS_FORM_INPUT_FILE == type) { if (NS_FORM_INPUT_FILE == type) { nsresult result; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &result); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &result); if (NS_FAILED(result)) return result; diff --git a/content/html/document/src/nsHTMLContentSink.cpp b/content/html/document/src/nsHTMLContentSink.cpp index f9daadf6f0cd..8a870badda65 100644 --- a/content/html/document/src/nsHTMLContentSink.cpp +++ b/content/html/document/src/nsHTMLContentSink.cpp @@ -897,10 +897,8 @@ NS_CreateHTMLElement(nsIHTMLContent** aResult, nsINodeInfo *aNodeInfo, PRBool aC { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIParserService, - parserService, - kParserServiceCID, - &rv); + nsCOMPtr parserService = + do_GetService(kParserServiceCID, &rv); if (NS_SUCCEEDED(rv)) { nsAutoString tmpName; @@ -4076,8 +4074,8 @@ HTMLContentSink::ProcessBaseHref(const nsAReadableString& aBaseHref) } } else { // NAV compatibility quirk - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return; rv = securityManager->CheckLoadURI(mDocumentBaseURL, baseHrefURI, nsIScriptSecurityManager::STANDARD); diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp index cf8d6831f038..81545adcc8b6 100644 --- a/content/html/document/src/nsHTMLDocument.cpp +++ b/content/html/document/src/nsHTMLDocument.cpp @@ -162,7 +162,8 @@ static int PR_CALLBACK MyPrefChangedCallback(const char*aPrefName, void* instance_data) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, "@mozilla.org/preferences;1", &rv); + nsCOMPtr prefs = + do_GetService("@mozilla.org/preferences;1", &rv); PRUnichar* detector_name = nsnull; if(NS_SUCCEEDED(rv) && NS_SUCCEEDED( rv = prefs->GetLocalizedUnicharPref("intl.charset.detector", @@ -230,7 +231,7 @@ nsHTMLDocument::nsHTMLDocument() NS_GET_IID(nsIRDFService), (nsISupports**) &gRDF); - //NS_WITH_SERVICE(nsIRDFService, gRDF, kRDFServiceCID, &rv); + //nsCOMPtr gRDF(do_GetService(kRDFServiceCID, &rv)); } mDomainWasSet = PR_FALSE; // Bug 13871: Frameset spoofing @@ -1725,8 +1726,8 @@ nsHTMLDocument::SetDomain(const nsAReadableString& aDomain) // Get codebase principal nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; nsCOMPtr newCodebase; diff --git a/content/html/document/src/nsHTMLFragmentContentSink.cpp b/content/html/document/src/nsHTMLFragmentContentSink.cpp index d93c017258ae..5d12fb218c5f 100644 --- a/content/html/document/src/nsHTMLFragmentContentSink.cpp +++ b/content/html/document/src/nsHTMLFragmentContentSink.cpp @@ -483,10 +483,8 @@ nsHTMLFragmentContentSink::OpenContainer(const nsIParserNode& aNode) nsHTMLTag nodeType = nsHTMLTag(aNode.GetNodeType()); nsIHTMLContent *content = nsnull; - NS_WITH_SERVICE(nsIParserService, - parserService, - kParserServiceCID, - &result); + nsCOMPtr parserService = + do_GetService(kParserServiceCID, &result); NS_ENSURE_SUCCESS(result, result); nsAutoString tmpName; @@ -560,10 +558,8 @@ nsHTMLFragmentContentSink::AddLeaf(const nsIParserNode& aNode) nsCOMPtr content; nsHTMLTag nodeType = nsHTMLTag(aNode.GetNodeType()); - NS_WITH_SERVICE(nsIParserService, - parserService, - kParserServiceCID, - &result); + nsCOMPtr parserService = + do_GetService(kParserServiceCID, &result); NS_ENSURE_SUCCESS(result, result); diff --git a/content/html/document/src/nsImageDocument.cpp b/content/html/document/src/nsImageDocument.cpp index 23ba85f9abd1..815fe9103b98 100644 --- a/content/html/document/src/nsImageDocument.cpp +++ b/content/html/document/src/nsImageDocument.cpp @@ -467,7 +467,8 @@ nsresult nsImageDocument::UpdateTitle( void ) nsCOMPtr bundle; nsresult rv; // Create a bundle for the localization - NS_WITH_SERVICE(nsIStringBundleService, stringService, kStringBundleServiceCID, &rv); + nsCOMPtr stringService = + do_GetService(kStringBundleServiceCID, &rv); if (NS_SUCCEEDED(rv) && stringService) { rv = stringService->CreateBundle(NSIMAGEDOCUMENT_PROPERTIES_URI, getter_AddRefs(bundle)); } diff --git a/content/html/style/src/nsCSSLoader.cpp b/content/html/style/src/nsCSSLoader.cpp index 292e134107da..9f529c089072 100644 --- a/content/html/style/src/nsCSSLoader.cpp +++ b/content/html/style/src/nsCSSLoader.cpp @@ -614,7 +614,8 @@ SheetLoadData::OnStreamComplete(nsIStreamLoader* aLoader, (void)mLoader->SetCharset(strHTTPHeaderData, strStyleDataUndecoded); // bug 66190: ignore errors { // now get the decoder - NS_WITH_SERVICE(nsICharsetConverterManager,ccm,kCharsetConverterManagerCID,&result); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &result); if (NS_SUCCEEDED(result) && ccm) { nsString charset; mLoader->GetCharset(charset); @@ -1318,7 +1319,8 @@ CSSLoaderImpl::LoadStyleLink(nsIContent* aElement, } if (!isForViewSource) { nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; nsIURI* docURI; rv = mDocument->GetBaseURL(docURI); @@ -1587,7 +1589,7 @@ NS_IMETHODIMP CSSLoaderImpl::SetCharset(/*in*/ const nsString &aCharsetSrc) if (aCharsetSrc.Length() == 0) { mCharset.AssignWithConversion("ISO-8859-1"); } else { - NS_WITH_SERVICE(nsICharsetAlias, calias, kCharsetAliasCID, &rv); + nsCOMPtr calias(do_GetService(kCharsetAliasCID, &rv)); NS_ASSERTION(calias, "cannot find charset alias"); nsAutoString charsetName(aCharsetSrc); if( NS_SUCCEEDED(rv) && (nsnull != calias)) diff --git a/content/html/style/src/nsStyleUtil.cpp b/content/html/style/src/nsStyleUtil.cpp index 07cc0d5a6281..737fc15b1d2b 100644 --- a/content/html/style/src/nsStyleUtil.cpp +++ b/content/html/style/src/nsStyleUtil.cpp @@ -208,7 +208,7 @@ static PRBool gNavAlgorithmPref = PR_FALSE; static int PR_CALLBACK NavAlgorithmPrefChangedCallback(const char * name, void * closure) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { prefs->GetBoolPref(name, &gNavAlgorithmPref); } @@ -229,7 +229,7 @@ static PRBool UseNewFontAlgorithm() once = PR_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { prefs->GetBoolPref("font.size.nav4algorithm", &gNavAlgorithmPref); prefs->RegisterCallback("font.size.nav4algorithm", NavAlgorithmPrefChangedCallback, NULL); diff --git a/content/shared/src/nsStyleUtil.cpp b/content/shared/src/nsStyleUtil.cpp index 07cc0d5a6281..737fc15b1d2b 100644 --- a/content/shared/src/nsStyleUtil.cpp +++ b/content/shared/src/nsStyleUtil.cpp @@ -208,7 +208,7 @@ static PRBool gNavAlgorithmPref = PR_FALSE; static int PR_CALLBACK NavAlgorithmPrefChangedCallback(const char * name, void * closure) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { prefs->GetBoolPref(name, &gNavAlgorithmPref); } @@ -229,7 +229,7 @@ static PRBool UseNewFontAlgorithm() once = PR_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { prefs->GetBoolPref("font.size.nav4algorithm", &gNavAlgorithmPref); prefs->RegisterCallback("font.size.nav4algorithm", NavAlgorithmPrefChangedCallback, NULL); diff --git a/content/xbl/src/nsBindingManager.cpp b/content/xbl/src/nsBindingManager.cpp index ab187595e126..312db198bb7a 100644 --- a/content/xbl/src/nsBindingManager.cpp +++ b/content/xbl/src/nsBindingManager.cpp @@ -817,7 +817,8 @@ nsBindingManager::AddLayeredBinding(nsIContent* aContent, const nsAReadableStrin { // First we need to load our binding. nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if (!xblService) return rv; @@ -889,7 +890,8 @@ nsBindingManager::LoadBindingDocument(nsIDocument* aBoundDoc, const nsAReadableS // First we need to load our binding. *aResult = nsnull; nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if (!xblService) return rv; diff --git a/content/xbl/src/nsXBLPrototypeHandler.cpp b/content/xbl/src/nsXBLPrototypeHandler.cpp index 502c8a095bae..36c334f3d4c7 100644 --- a/content/xbl/src/nsXBLPrototypeHandler.cpp +++ b/content/xbl/src/nsXBLPrototypeHandler.cpp @@ -181,7 +181,7 @@ nsXBLPrototypeHandler::InitAccessKeys() // Get the menu access key value from prefs, overriding the default: nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { prefs->GetIntPref("ui.key.menuAccessKey", &kMenuAccessKey); diff --git a/content/xbl/src/nsXBLService.cpp b/content/xbl/src/nsXBLService.cpp index 18347d1b8c9b..e9a519d1f0e7 100644 --- a/content/xbl/src/nsXBLService.cpp +++ b/content/xbl/src/nsXBLService.cpp @@ -574,7 +574,7 @@ nsXBLService::nsXBLService(void) kInputAtom = NS_NewAtom("input"); // Find out if the XUL cache is on or off - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv)) prefs->GetBoolPref(kDisableChromeCachePref, &gDisableChromeCache); diff --git a/content/xbl/src/nsXBLWindowHandler.cpp b/content/xbl/src/nsXBLWindowHandler.cpp index f5170f800e25..a0b18b028bfa 100644 --- a/content/xbl/src/nsXBLWindowHandler.cpp +++ b/content/xbl/src/nsXBLWindowHandler.cpp @@ -101,7 +101,8 @@ void nsXBLSpecialDocInfo::LoadDocInfo() return; nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if (NS_FAILED(rv) || !xblService) return; diff --git a/content/xml/content/src/nsXMLElement.cpp b/content/xml/content/src/nsXMLElement.cpp index 64e462f07f45..dd5a53c024f7 100644 --- a/content/xml/content/src/nsXMLElement.cpp +++ b/content/xml/content/src/nsXMLElement.cpp @@ -163,7 +163,7 @@ static inline nsresult MakeURI(const char *aSpec, nsIURI *aBase, nsIURI **aURI) { nsresult rv; static NS_DEFINE_CID(ioServCID,NS_IOSERVICE_CID); - NS_WITH_SERVICE(nsIIOService,service,ioServCID,&rv); + nsCOMPtr service(do_GetService(ioServCID, &rv)); if (NS_FAILED(rv)) return rv; @@ -308,10 +308,8 @@ static nsresult CheckLoadURI(nsIURI *aBaseURI, const nsAReadableString& aURI, nsresult rv; rv = MakeURI(str,aBaseURI,aAbsURI); if (NS_SUCCEEDED(rv)) { - NS_WITH_SERVICE(nsIScriptSecurityManager, - securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, - &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { rv= securityManager->CheckLoadURI(aBaseURI, *aAbsURI, @@ -619,8 +617,8 @@ nsXMLElement::GetScriptObject(nsIScriptContext* aContext, void** aScriptObject) // We have a binding that must be installed. nsresult rv; PRBool dummy; - NS_WITH_SERVICE(nsIXBLService, xblService, - "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); xblService->LoadBindings(this, value, PR_FALSE, getter_AddRefs(binding), &dummy); if (binding) { diff --git a/content/xml/document/src/nsXMLContentSink.cpp b/content/xml/document/src/nsXMLContentSink.cpp index 59ab6ddc6626..91cea3f2f729 100644 --- a/content/xml/document/src/nsXMLContentSink.cpp +++ b/content/xml/document/src/nsXMLContentSink.cpp @@ -1857,7 +1857,7 @@ nsXMLContentSink::GetElementFactory(PRInt32 aNameSpaceID, nsIElementFactory** aR contractID.AppendWithConversion(nameSpace); // Retrieve the appropriate factory. - NS_WITH_SERVICE(nsIElementFactory, elementFactory, contractID, &rv); + nsCOMPtr elementFactory(do_GetService(contractID, &rv)); *aResult = elementFactory; NS_IF_ADDREF(*aResult); diff --git a/content/xml/document/src/nsXMLDocument.cpp b/content/xml/document/src/nsXMLDocument.cpp index c0d260ea06e9..28afec38520f 100644 --- a/content/xml/document/src/nsXMLDocument.cpp +++ b/content/xml/document/src/nsXMLDocument.cpp @@ -105,7 +105,8 @@ static int PR_CALLBACK MyPrefChangedCallback(const char*aPrefName, void* instance_data) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, "@mozilla.org/preferences;1", &rv); + nsCOMPtr prefs = + do_GetService("@mozilla.org/preferences;1", &rv); PRUnichar* detector_name = nsnull; if(NS_SUCCEEDED(rv) && NS_SUCCEEDED( rv = prefs->GetLocalizedUnicharPref("intl.charset.detector", @@ -270,8 +271,8 @@ nsXMLDocument::OnRedirect(nsIHttpChannel *aHttpChannel, nsIChannel *aNewChannel) { nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; @@ -311,7 +312,8 @@ nsXMLDocument::Load(const nsAReadableString& aUrl) if (NS_FAILED(rv)) return rv; // Get security manager, check to see if we're allowed to load this URI - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; if (NS_FAILED(secMan->CheckConnect(nsnull, uri, "XMLDocument", "load"))) return NS_ERROR_FAILURE; diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp index cc10c9ef446e..033c4afcffc7 100644 --- a/content/xul/content/src/nsXULElement.cpp +++ b/content/xul/content/src/nsXULElement.cpp @@ -718,7 +718,8 @@ nsXULElement::QueryInterface(REFNSIID iid, void** result) (NodeInfo()->NamespaceEquals(kNameSpaceID_XUL))){ nsCOMPtr tag; PRInt32 dummy; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); xblService->ResolveTag(NS_STATIC_CAST(nsIStyledContent*, this), &dummy, getter_AddRefs(tag)); if (tag.get() == nsXULAtoms::tree) { // We delegate XULTreeElement APIs to an aggregate object @@ -744,7 +745,8 @@ nsXULElement::QueryInterface(REFNSIID iid, void** result) nsCOMPtr tag; PRInt32 dummy; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); xblService->ResolveTag(NS_STATIC_CAST(nsIStyledContent*, this), &dummy, getter_AddRefs(tag)); if (tag.get() == nsXULAtoms::tree) { inst = nsContentUtils:: diff --git a/content/xul/content/src/nsXULPopupListener.cpp b/content/xul/content/src/nsXULPopupListener.cpp index 30f6493c297c..24ac1981035c 100644 --- a/content/xul/content/src/nsXULPopupListener.cpp +++ b/content/xul/content/src/nsXULPopupListener.cpp @@ -232,7 +232,7 @@ XULPopupListenerImpl::Init(nsIDOMElement* aElement, const XULPopupType& popup) // Only the first time, register the callback and get the initial value of the pref if ( !prefChangeRegistered ) { - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if ( prefs ) { // get the initial value of the pref rv = prefs->GetBoolPref("browser.chrome.toolbar_tips", &sShowTooltips); @@ -257,7 +257,7 @@ int XULPopupListenerImpl :: sTooltipPrefChanged (const char *, void * inData ) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if ( prefs ) { rv = prefs->GetBoolPref("browser.chrome.toolbar_tips", &sShowTooltips); } diff --git a/content/xul/document/src/nsXULDocument.cpp b/content/xul/document/src/nsXULDocument.cpp index 27d5d21d2fbd..7f43433ae781 100644 --- a/content/xul/document/src/nsXULDocument.cpp +++ b/content/xul/document/src/nsXULDocument.cpp @@ -789,8 +789,8 @@ NS_IMETHODIMP nsXULDocument::SetBaseURL(nsIURI* aURL) { nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { rv = securityManager->CheckLoadURI(mDocumentURL, aURL, nsIScriptSecurityManager::STANDARD); if (NS_SUCCEEDED(rv)) { @@ -1536,7 +1536,7 @@ nsXULDocument::EndLoad() PRBool useXULCache; gXULCache->GetEnabled(&useXULCache); - NS_WITH_SERVICE(nsIChromeRegistry, reg, kChromeRegistryCID, &rv); + nsCOMPtr reg(do_GetService(kChromeRegistryCID, &rv)); if (NS_FAILED(rv)) return rv; nsCOMPtr sheets; reg->GetStyleSheets(uri, getter_AddRefs(sheets)); @@ -3207,7 +3207,8 @@ nsXULDocument::AddElementToDocumentPost(nsIContent* aElement) aElement->GetTag(*getter_AddRefs(tag)); if (tag.get() == nsXULAtoms::keyset) { // Create our XUL key listener and hook it up. - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if (xblService) { nsCOMPtr rec(do_QueryInterface(aElement)); xblService->AttachGlobalKeyHandler(rec); @@ -4713,7 +4714,7 @@ nsresult nsXULDocument::AddChromeOverlays() { nsresult rv; - NS_WITH_SERVICE(nsIChromeRegistry, reg, kChromeRegistryCID, &rv); + nsCOMPtr reg(do_GetService(kChromeRegistryCID, &rv)); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; @@ -6005,7 +6006,7 @@ nsXULDocument::GetElementFactory(PRInt32 aNameSpaceID, nsIElementFactory** aResu contractID.AppendWithConversion(nameSpace); // Retrieve the appropriate factory. - NS_WITH_SERVICE(nsIElementFactory, elementFactory, contractID, &rv); + nsCOMPtr elementFactory(do_GetService(contractID, &rv)); if (!elementFactory) elementFactory = gXMLElementFactory; // Nothing found. Use generic XML element. @@ -6042,7 +6043,8 @@ nsXULDocument::GetBoxObjectFor(nsIDOMElement* aElement, nsIBoxObject** aResult) PRInt32 namespaceID; nsCOMPtr tag; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); nsCOMPtr content(do_QueryInterface(aElement)); xblService->ResolveTag(content, &namespaceID, getter_AddRefs(tag)); diff --git a/content/xul/document/src/nsXULPrototypeCache.cpp b/content/xul/document/src/nsXULPrototypeCache.cpp index bb976321d05c..2581440e7b1f 100644 --- a/content/xul/document/src/nsXULPrototypeCache.cpp +++ b/content/xul/document/src/nsXULPrototypeCache.cpp @@ -164,7 +164,7 @@ NS_NewXULPrototypeCache(nsISupports* aOuter, REFNSIID aIID, void** aResult) nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv)) { // XXX Ignore return values. prefs->GetBoolPref(kDisableXULCachePref, &gDisableXULCache); diff --git a/content/xul/document/src/nsXULPrototypeDocument.cpp b/content/xul/document/src/nsXULPrototypeDocument.cpp index bb1bdceb58dc..a2a37cdc8584 100644 --- a/content/xul/document/src/nsXULPrototypeDocument.cpp +++ b/content/xul/document/src/nsXULPrototypeDocument.cpp @@ -358,10 +358,8 @@ nsXULPrototypeDocument::GetDocumentPrincipal(nsIPrincipal** aResult) { if (!mDocumentPrincipal) { nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, - securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, - &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; diff --git a/content/xul/templates/src/nsXULContentBuilder.cpp b/content/xul/templates/src/nsXULContentBuilder.cpp index 5e3cb1471800..327398435634 100644 --- a/content/xul/templates/src/nsXULContentBuilder.cpp +++ b/content/xul/templates/src/nsXULContentBuilder.cpp @@ -1641,7 +1641,7 @@ nsXULContentBuilder::GetElementFactory(PRInt32 aNameSpaceID, nsIElementFactory** contractID.AppendWithConversion(nameSpace.get()); // Retrieve the appropriate factory. - NS_WITH_SERVICE(nsIElementFactory, elementFactory, contractID, &rv); + nsCOMPtr elementFactory(do_GetService(contractID, &rv)); if (!elementFactory) elementFactory = gXMLElementFactory; // Nothing found. Use generic XML element. diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index e61b5cf0aafc..74cce7a62532 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -3897,7 +3897,8 @@ nsDocShell::NewContentViewerObj(const char *aContentType, if (!docLoaderFactory) { // try again after loading plugins nsresult err; - NS_WITH_SERVICE(nsIPluginHost, pluginHost, kPluginManagerCID, &err); + nsCOMPtr pluginHost = + do_GetService(kPluginManagerCID, &err); if (NS_FAILED(err)) return NS_ERROR_FAILURE; diff --git a/dom/src/base/nsGlobalWindow.cpp b/dom/src/base/nsGlobalWindow.cpp index 268b46eff0ca..6b5fc3dc49e2 100644 --- a/dom/src/base/nsGlobalWindow.cpp +++ b/dom/src/base/nsGlobalWindow.cpp @@ -314,7 +314,8 @@ NS_IMETHODIMP GlobalWindowImpl::SetNewDocument(nsIDOMDocument* aDocument) nsCOMPtr us(do_QueryInterface(NS_STATIC_CAST(nsIDOMWindow*,this))); if (internal == us) { nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if (xblService) { nsCOMPtr rec(do_QueryInterface(mChromeEventHandler)); xblService->AttachGlobalKeyHandler(rec); @@ -4139,7 +4140,7 @@ NavigatorImpl::GetCookieEnabled(PRBool *aCookieEnabled) nsresult rv = NS_OK; *aCookieEnabled = PR_FALSE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (NS_FAILED(rv) || prefs == nsnull) return rv; diff --git a/dom/src/base/nsJSEnvironment.cpp b/dom/src/base/nsJSEnvironment.cpp index 19c1604165a7..8947ba100037 100644 --- a/dom/src/base/nsJSEnvironment.cpp +++ b/dom/src/base/nsJSEnvironment.cpp @@ -286,7 +286,7 @@ int PR_CALLBACK nsJSContext::JSOptionChangedCallback(const char *pref, void *data) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED(rv)) { nsJSContext *context = NS_REINTERPRET_CAST(nsJSContext *, data); PRUint32 oldDefaultJSOptions = context->mDefaultJSOptions; @@ -335,7 +335,7 @@ nsJSContext::nsJSContext(JSRuntime *aRuntime) // a new JSContext just in case the heap manager recycles the JSContext // struct. nsresult rv; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if (NS_SUCCEEDED(rv)) xpc->SyncJSContexts(); @@ -344,7 +344,7 @@ nsJSContext::nsJSContext(JSRuntime *aRuntime) ::JS_SetContextPrivate(mContext, (void *)this); // Check for the JS strict option, which enables extra error checks - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED(rv)) { (void) prefs->RegisterCallback(js_options_dot_str, JSOptionChangedCallback, @@ -455,7 +455,8 @@ nsJSContext::EvaluateStringWithValue(const nsAReadableString& aScript, // from native code via XPConnect uses the right context. Do this whether // or not the SecurityManager said "ok", in order to simplify control flow // below where we pop before returning. - NS_WITH_SERVICE(nsIJSContextStack, stack, "@mozilla.org/js/xpc/ContextStack;1", &rv); + nsCOMPtr stack = + do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv); if (NS_FAILED(rv) || NS_FAILED(stack->Push(mContext))) { JSPRINCIPALS_DROP(mContext, jsprin); return NS_ERROR_FAILURE; @@ -572,7 +573,8 @@ nsJSContext::EvaluateString(const nsAReadableString& aScript, // from native code via XPConnect uses the right context. Do this whether // or not the SecurityManager said "ok", in order to simplify control flow // below where we pop before returning. - NS_WITH_SERVICE(nsIJSContextStack, stack, "@mozilla.org/js/xpc/ContextStack;1", &rv); + nsCOMPtr stack = + do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv); if (NS_FAILED(rv) || NS_FAILED(stack->Push(mContext))) { JSPRINCIPALS_DROP(mContext, jsprin); return NS_ERROR_FAILURE; @@ -733,7 +735,8 @@ nsJSContext::ExecuteScript(void* aScriptObject, // Push our JSContext on our thread's context stack, in case native code // called from JS calls back into JS via XPConnect. - NS_WITH_SERVICE(nsIJSContextStack, stack, "@mozilla.org/js/xpc/ContextStack;1", &rv); + nsCOMPtr stack = + do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv); if (NS_FAILED(rv) || NS_FAILED(stack->Push(mContext))) { return NS_ERROR_FAILURE; } @@ -919,7 +922,8 @@ nsJSContext::CallEventHandler(void *aTarget, void *aHandler, PRUint32 argc, if (NS_FAILED(rv)) return NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIJSContextStack, stack, "@mozilla.org/js/xpc/ContextStack;1", &rv); + nsCOMPtr stack = + do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv); if (NS_FAILED(rv) || NS_FAILED(stack->Push(mContext))) return NS_ERROR_FAILURE; @@ -1488,7 +1492,8 @@ nsJSEnvironment::nsJSEnvironment() // So that we get deleted on XPCOM shutdown, set up an // observer. nsresult rv; - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); NS_ASSERTION(NS_SUCCEEDED(rv), "going to leak a nsJSEnvironment"); if (NS_SUCCEEDED(rv)) { @@ -1527,7 +1532,7 @@ nsJSEnvironment::nsJSEnvironment() gOldJSGCCallback = ::JS_SetGCCallbackRT(mRuntime, DOMGCCallback); // Set these global xpconnect options... - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if (NS_SUCCEEDED(rv)) { xpc->SetCollectGarbageOnMainThreadOnly(PR_TRUE); xpc->SetDeferReleasesUntilAfterGarbageCollection(PR_TRUE); @@ -1536,8 +1541,8 @@ nsJSEnvironment::nsJSEnvironment() } // Initialize LiveConnect. XXXbe use contractid rather than GetCID - NS_WITH_SERVICE(nsILiveConnectManager, manager, - nsIJVMManager::GetCID(), &rv); + nsCOMPtr manager = + do_GetService(nsIJVMManager::GetCID(), &rv); // Should the JVM manager perhaps define methods for starting up LiveConnect? if (NS_SUCCEEDED(rv) && manager != nsnull) { diff --git a/dom/src/base/nsJSUtils.cpp b/dom/src/base/nsJSUtils.cpp index 509d2f1a53c3..7d68e1627d1d 100644 --- a/dom/src/base/nsJSUtils.cpp +++ b/dom/src/base/nsJSUtils.cpp @@ -182,7 +182,7 @@ nsJSUtils::ConvertJSValToXPCObject(nsISupports** aSupports, REFNSIID aIID, } else if (JSVAL_IS_OBJECT(aValue)) { nsresult rv; - NS_WITH_SERVICE(nsIXPConnect, xpc, kXPConnectCID, &rv); + nsCOMPtr xpc(do_GetService(kXPConnectCID, &rv)); if (NS_FAILED(rv)) return JS_FALSE; @@ -330,8 +330,8 @@ nsJSUtils::GetSecurityManager(JSContext *cx, JSObject *obj) { if (!mCachedSecurityManager) { nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) { nsJSUtils::ReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); return nsnull; diff --git a/editor/base/nsEditor.cpp b/editor/base/nsEditor.cpp index b411803fa02a..8a481b1a0af8 100644 --- a/editor/base/nsEditor.cpp +++ b/editor/base/nsEditor.cpp @@ -956,7 +956,7 @@ nsEditor::GetWrapWidth(PRInt32 *aWrapColumn) *aWrapColumn = 72; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv) && prefs) (void) prefs->GetIntPref("editor.htmlWrapColumn", aWrapColumn); return NS_OK; @@ -990,7 +990,7 @@ nsEditor::SaveFile(nsIFile *aFileSpec, PRBool aReplaceExisting, else { // Should we prettyprint? Check the pref - NS_WITH_SERVICE(nsIPref, prefService, kPrefServiceCID, &rv); + nsCOMPtr prefService(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED(rv) && prefService) { PRBool prettyprint = PR_FALSE;; @@ -5069,8 +5069,8 @@ nsEditor::CreateHTMLContent(const nsAReadableString& aTag, nsIContent** aContent { nsresult rv; - NS_WITH_SERVICE(nsIElementFactory, elementFactory, - NS_ELEMENT_FACTORY_CONTRACTID_PREFIX"http://www.w3.org/1999/xhtml" , &rv); + nsCOMPtr elementFactory = + do_GetService(NS_ELEMENT_FACTORY_CONTRACTID_PREFIX"http://www.w3.org/1999/xhtml", &rv); if (!elementFactory) return NS_ERROR_FAILURE; diff --git a/editor/base/nsEditorEventListeners.cpp b/editor/base/nsEditorEventListeners.cpp index f88626512c6f..5c7c3af0b2ee 100644 --- a/editor/base/nsEditorEventListeners.cpp +++ b/editor/base/nsEditorEventListeners.cpp @@ -382,7 +382,7 @@ nsTextEditorMouseListener::MouseClick(nsIDOMEvent* aMouseEvent) if (button == 1) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefService, kPrefServiceCID, &rv); + nsCOMPtr prefService(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED(rv) && prefService) { PRBool doMiddleMousePaste = PR_FALSE;; @@ -643,7 +643,8 @@ nsresult nsTextEditorDragListener::DragOver(nsIDOMEvent* aDragEvent) { nsresult rv; - NS_WITH_SERVICE ( nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv ); + nsCOMPtr dragService = + do_GetService( "@mozilla.org/widget/dragservice;1", &rv ); if ( NS_SUCCEEDED(rv) ) { nsCOMPtr dragSession; dragService->GetCurrentSession(getter_AddRefs(dragSession)); @@ -690,7 +691,8 @@ nsTextEditorDragListener::DragDrop(nsIDOMEvent* aMouseEvent) if ( mEditor ) { nsresult rv; - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); if (NS_FAILED(rv)) return rv; PRUint32 flags; @@ -1075,7 +1077,8 @@ nsTextEditorFocusListener::Focus(nsIDOMEvent* aEvent) PRInt32 pixelWidth; nsresult result; - NS_WITH_SERVICE(nsILookAndFeel, look, kLookAndFeelCID, &result); + nsCOMPtr look = + do_GetService(kLookAndFeelCID, &result); if (NS_SUCCEEDED(result) && look) { diff --git a/editor/base/nsEditorShell.cpp b/editor/base/nsEditorShell.cpp index cf90ea457eb8..f9d9b3b5b779 100644 --- a/editor/base/nsEditorShell.cpp +++ b/editor/base/nsEditorShell.cpp @@ -2158,7 +2158,7 @@ nsEditorShell::GetLocalFileURL(nsIDOMWindowInternal *parent, const PRUnichar *fi #if 0 // get default directory from preference - NS_WITH_SERVICE( nsIPref, prefs, NS_PREF_CONTRACTID, &res ); + nsCOMPtr prefs( do_GetService( NS_PREF_CONTRACTID, &res ) ); if (prefs) { nsCOMPtr defaultDir; @@ -2815,7 +2815,8 @@ nsEditorShell::DoFind(PRBool aFindNext) // Get find component. nsresult rv; - NS_WITH_SERVICE(nsIFindComponent, findComponent, NS_IFINDCOMPONENT_CONTRACTID, &rv); + nsCOMPtr findComponent = + do_GetService(NS_IFINDCOMPONENT_CONTRACTID, &rv); NS_ASSERTION(((NS_SUCCEEDED(rv)) && findComponent), "GetService failed for find component."); if (NS_FAILED(rv)) { return rv; } @@ -2860,7 +2861,8 @@ nsEditorShell::Replace() // Get find component. nsresult rv; - NS_WITH_SERVICE(nsIFindComponent, findComponent, NS_IFINDCOMPONENT_CONTRACTID, &rv); + nsCOMPtr findComponent = + do_GetService(NS_IFINDCOMPONENT_CONTRACTID, &rv); NS_ASSERTION(((NS_SUCCEEDED(rv)) && findComponent), "GetService failed for find component."); if (NS_FAILED(rv)) { return rv; } @@ -4508,7 +4510,7 @@ nsEditorShell::InitSpellChecker() PRUnichar *dictName = nsnull; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &result)); if (NS_SUCCEEDED(result) && prefs) result = prefs->CopyUnicharPref("spellchecker.dictionary", &dictName); @@ -4795,7 +4797,7 @@ nsEditorShell::UninitSpellChecker() if (mEditor) { // Save the last used dictionary to the user's preferences. - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &result)); if (NS_SUCCEEDED(result) && prefs) { @@ -5341,7 +5343,7 @@ nsEditorShell::CheckPrefAndNormalizeTable() if (htmlEditor) { - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &res)); if (NS_FAILED(res)) return NS_OK; PRBool normalizeTable = PR_FALSE; diff --git a/editor/base/nsHTMLDataTransfer.cpp b/editor/base/nsHTMLDataTransfer.cpp index 888b31c696b3..6d5881ecd334 100644 --- a/editor/base/nsHTMLDataTransfer.cpp +++ b/editor/base/nsHTMLDataTransfer.cpp @@ -696,7 +696,8 @@ NS_IMETHODIMP nsHTMLEditor::InsertFromDrop(nsIDOMEvent* aDropEvent) ForceCompositionEnd(); nsresult rv; - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr dragSession; @@ -941,7 +942,8 @@ NS_IMETHODIMP nsHTMLEditor::DoDrag(nsIDOMEvent *aDragEvent) return NS_ERROR_OUT_OF_MEMORY; /* get the drag service */ - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); if (NS_FAILED(rv)) return rv; /* create html flavor transferable */ @@ -1047,7 +1049,7 @@ NS_IMETHODIMP nsHTMLEditor::Paste(PRInt32 aSelectionType) // Get Clipboard Service nsresult rv; - NS_WITH_SERVICE ( nsIClipboard, clipboard, kCClipboardCID, &rv ); + nsCOMPtr clipboard( do_GetService( kCClipboardCID, &rv ) ); if ( NS_FAILED(rv) ) return rv; @@ -1115,7 +1117,7 @@ NS_IMETHODIMP nsHTMLEditor::CanPaste(PRInt32 aSelectionType, PRBool *aCanPaste) return NS_OK; nsresult rv; - NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv); + nsCOMPtr clipboard(do_GetService(kCClipboardCID, &rv)); if (NS_FAILED(rv)) return rv; // the flavors that we can deal with @@ -1237,7 +1239,7 @@ NS_IMETHODIMP nsHTMLEditor::PasteAsPlaintextQuotation(PRInt32 aSelectionType) { // Get Clipboard Service nsresult rv; - NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv); + nsCOMPtr clipboard(do_GetService(kCClipboardCID, &rv)); if (NS_FAILED(rv)) return rv; // Create generic Transferable for getting the data diff --git a/editor/base/nsHTMLEditRules.cpp b/editor/base/nsHTMLEditRules.cpp index d7c6233a6b5c..90713f7cd581 100644 --- a/editor/base/nsHTMLEditRules.cpp +++ b/editor/base/nsHTMLEditRules.cpp @@ -210,7 +210,7 @@ nsHTMLEditRules::Init(nsPlaintextEditor *aEditor, PRUint32 aFlags) if (NS_FAILED(res)) return res; // cache any prefs we care about - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &res)); if (NS_FAILED(res)) return res; char *returnInEmptyLIKillsList = 0; diff --git a/editor/base/nsPlaintextDataTransfer.cpp b/editor/base/nsPlaintextDataTransfer.cpp index 5cb7476005c2..8dcf08fa3a43 100644 --- a/editor/base/nsPlaintextDataTransfer.cpp +++ b/editor/base/nsPlaintextDataTransfer.cpp @@ -184,7 +184,8 @@ NS_IMETHODIMP nsPlaintextEditor::InsertFromDrop(nsIDOMEvent* aDropEvent) ForceCompositionEnd(); nsresult rv; - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr dragSession; @@ -425,7 +426,8 @@ NS_IMETHODIMP nsPlaintextEditor::DoDrag(nsIDOMEvent *aDragEvent) return NS_ERROR_OUT_OF_MEMORY; /* get the drag service */ - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); if (NS_FAILED(rv)) return rv; /* create html flavor transferable */ @@ -531,7 +533,7 @@ NS_IMETHODIMP nsPlaintextEditor::Paste(PRInt32 aSelectionType) // Get Clipboard Service nsresult rv; - NS_WITH_SERVICE ( nsIClipboard, clipboard, kCClipboardCID, &rv ); + nsCOMPtr clipboard( do_GetService( kCClipboardCID, &rv ) ); if ( NS_FAILED(rv) ) return rv; @@ -562,7 +564,7 @@ NS_IMETHODIMP nsPlaintextEditor::CanPaste(PRInt32 aSelectionType, PRBool *aCanPa return NS_OK; nsresult rv; - NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv); + nsCOMPtr clipboard(do_GetService(kCClipboardCID, &rv)); if (NS_FAILED(rv)) return rv; // the flavors that we can deal with diff --git a/editor/base/nsPlaintextEditor.cpp b/editor/base/nsPlaintextEditor.cpp index bfeebdc11699..cbd24cb03bd2 100644 --- a/editor/base/nsPlaintextEditor.cpp +++ b/editor/base/nsPlaintextEditor.cpp @@ -1588,7 +1588,7 @@ nsPlaintextEditor::PasteAsQuotation(PRInt32 aSelectionType) { // Get Clipboard Service nsresult rv; - NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv); + nsCOMPtr clipboard(do_GetService(kCClipboardCID, &rv)); if (NS_FAILED(rv)) return rv; // Create generic Transferable for getting the data @@ -1650,7 +1650,7 @@ static nsICiter* MakeACiter() // Make a citer of an appropriate type nsICiter* citer = 0; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (NS_FAILED(rv)) return 0; char *citationType = 0; diff --git a/editor/base/nsTextEditRules.cpp b/editor/base/nsTextEditRules.cpp index d09ab2070eac..5fd45238f4b7 100644 --- a/editor/base/nsTextEditRules.cpp +++ b/editor/base/nsTextEditRules.cpp @@ -529,7 +529,7 @@ nsTextEditRules::WillInsertText(PRInt32 aAction, }; PRInt32 singleLineNewlineBehavior = 1; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv) && prefs) rv = prefs->GetIntPref("editor.singleLine.pasteNewlines", &singleLineNewlineBehavior); diff --git a/editor/composer/src/nsEditorShell.cpp b/editor/composer/src/nsEditorShell.cpp index cf90ea457eb8..f9d9b3b5b779 100644 --- a/editor/composer/src/nsEditorShell.cpp +++ b/editor/composer/src/nsEditorShell.cpp @@ -2158,7 +2158,7 @@ nsEditorShell::GetLocalFileURL(nsIDOMWindowInternal *parent, const PRUnichar *fi #if 0 // get default directory from preference - NS_WITH_SERVICE( nsIPref, prefs, NS_PREF_CONTRACTID, &res ); + nsCOMPtr prefs( do_GetService( NS_PREF_CONTRACTID, &res ) ); if (prefs) { nsCOMPtr defaultDir; @@ -2815,7 +2815,8 @@ nsEditorShell::DoFind(PRBool aFindNext) // Get find component. nsresult rv; - NS_WITH_SERVICE(nsIFindComponent, findComponent, NS_IFINDCOMPONENT_CONTRACTID, &rv); + nsCOMPtr findComponent = + do_GetService(NS_IFINDCOMPONENT_CONTRACTID, &rv); NS_ASSERTION(((NS_SUCCEEDED(rv)) && findComponent), "GetService failed for find component."); if (NS_FAILED(rv)) { return rv; } @@ -2860,7 +2861,8 @@ nsEditorShell::Replace() // Get find component. nsresult rv; - NS_WITH_SERVICE(nsIFindComponent, findComponent, NS_IFINDCOMPONENT_CONTRACTID, &rv); + nsCOMPtr findComponent = + do_GetService(NS_IFINDCOMPONENT_CONTRACTID, &rv); NS_ASSERTION(((NS_SUCCEEDED(rv)) && findComponent), "GetService failed for find component."); if (NS_FAILED(rv)) { return rv; } @@ -4508,7 +4510,7 @@ nsEditorShell::InitSpellChecker() PRUnichar *dictName = nsnull; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &result)); if (NS_SUCCEEDED(result) && prefs) result = prefs->CopyUnicharPref("spellchecker.dictionary", &dictName); @@ -4795,7 +4797,7 @@ nsEditorShell::UninitSpellChecker() if (mEditor) { // Save the last used dictionary to the user's preferences. - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &result)); if (NS_SUCCEEDED(result) && prefs) { @@ -5341,7 +5343,7 @@ nsEditorShell::CheckPrefAndNormalizeTable() if (htmlEditor) { - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &res)); if (NS_FAILED(res)) return NS_OK; PRBool normalizeTable = PR_FALSE; diff --git a/editor/libeditor/base/nsEditor.cpp b/editor/libeditor/base/nsEditor.cpp index b411803fa02a..8a481b1a0af8 100644 --- a/editor/libeditor/base/nsEditor.cpp +++ b/editor/libeditor/base/nsEditor.cpp @@ -956,7 +956,7 @@ nsEditor::GetWrapWidth(PRInt32 *aWrapColumn) *aWrapColumn = 72; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv) && prefs) (void) prefs->GetIntPref("editor.htmlWrapColumn", aWrapColumn); return NS_OK; @@ -990,7 +990,7 @@ nsEditor::SaveFile(nsIFile *aFileSpec, PRBool aReplaceExisting, else { // Should we prettyprint? Check the pref - NS_WITH_SERVICE(nsIPref, prefService, kPrefServiceCID, &rv); + nsCOMPtr prefService(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED(rv) && prefService) { PRBool prettyprint = PR_FALSE;; @@ -5069,8 +5069,8 @@ nsEditor::CreateHTMLContent(const nsAReadableString& aTag, nsIContent** aContent { nsresult rv; - NS_WITH_SERVICE(nsIElementFactory, elementFactory, - NS_ELEMENT_FACTORY_CONTRACTID_PREFIX"http://www.w3.org/1999/xhtml" , &rv); + nsCOMPtr elementFactory = + do_GetService(NS_ELEMENT_FACTORY_CONTRACTID_PREFIX"http://www.w3.org/1999/xhtml", &rv); if (!elementFactory) return NS_ERROR_FAILURE; diff --git a/editor/libeditor/html/nsHTMLDataTransfer.cpp b/editor/libeditor/html/nsHTMLDataTransfer.cpp index 888b31c696b3..6d5881ecd334 100644 --- a/editor/libeditor/html/nsHTMLDataTransfer.cpp +++ b/editor/libeditor/html/nsHTMLDataTransfer.cpp @@ -696,7 +696,8 @@ NS_IMETHODIMP nsHTMLEditor::InsertFromDrop(nsIDOMEvent* aDropEvent) ForceCompositionEnd(); nsresult rv; - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr dragSession; @@ -941,7 +942,8 @@ NS_IMETHODIMP nsHTMLEditor::DoDrag(nsIDOMEvent *aDragEvent) return NS_ERROR_OUT_OF_MEMORY; /* get the drag service */ - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); if (NS_FAILED(rv)) return rv; /* create html flavor transferable */ @@ -1047,7 +1049,7 @@ NS_IMETHODIMP nsHTMLEditor::Paste(PRInt32 aSelectionType) // Get Clipboard Service nsresult rv; - NS_WITH_SERVICE ( nsIClipboard, clipboard, kCClipboardCID, &rv ); + nsCOMPtr clipboard( do_GetService( kCClipboardCID, &rv ) ); if ( NS_FAILED(rv) ) return rv; @@ -1115,7 +1117,7 @@ NS_IMETHODIMP nsHTMLEditor::CanPaste(PRInt32 aSelectionType, PRBool *aCanPaste) return NS_OK; nsresult rv; - NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv); + nsCOMPtr clipboard(do_GetService(kCClipboardCID, &rv)); if (NS_FAILED(rv)) return rv; // the flavors that we can deal with @@ -1237,7 +1239,7 @@ NS_IMETHODIMP nsHTMLEditor::PasteAsPlaintextQuotation(PRInt32 aSelectionType) { // Get Clipboard Service nsresult rv; - NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv); + nsCOMPtr clipboard(do_GetService(kCClipboardCID, &rv)); if (NS_FAILED(rv)) return rv; // Create generic Transferable for getting the data diff --git a/editor/libeditor/html/nsHTMLEditRules.cpp b/editor/libeditor/html/nsHTMLEditRules.cpp index d7c6233a6b5c..90713f7cd581 100644 --- a/editor/libeditor/html/nsHTMLEditRules.cpp +++ b/editor/libeditor/html/nsHTMLEditRules.cpp @@ -210,7 +210,7 @@ nsHTMLEditRules::Init(nsPlaintextEditor *aEditor, PRUint32 aFlags) if (NS_FAILED(res)) return res; // cache any prefs we care about - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &res)); if (NS_FAILED(res)) return res; char *returnInEmptyLIKillsList = 0; diff --git a/editor/libeditor/text/nsEditorEventListeners.cpp b/editor/libeditor/text/nsEditorEventListeners.cpp index f88626512c6f..5c7c3af0b2ee 100644 --- a/editor/libeditor/text/nsEditorEventListeners.cpp +++ b/editor/libeditor/text/nsEditorEventListeners.cpp @@ -382,7 +382,7 @@ nsTextEditorMouseListener::MouseClick(nsIDOMEvent* aMouseEvent) if (button == 1) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefService, kPrefServiceCID, &rv); + nsCOMPtr prefService(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED(rv) && prefService) { PRBool doMiddleMousePaste = PR_FALSE;; @@ -643,7 +643,8 @@ nsresult nsTextEditorDragListener::DragOver(nsIDOMEvent* aDragEvent) { nsresult rv; - NS_WITH_SERVICE ( nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv ); + nsCOMPtr dragService = + do_GetService( "@mozilla.org/widget/dragservice;1", &rv ); if ( NS_SUCCEEDED(rv) ) { nsCOMPtr dragSession; dragService->GetCurrentSession(getter_AddRefs(dragSession)); @@ -690,7 +691,8 @@ nsTextEditorDragListener::DragDrop(nsIDOMEvent* aMouseEvent) if ( mEditor ) { nsresult rv; - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); if (NS_FAILED(rv)) return rv; PRUint32 flags; @@ -1075,7 +1077,8 @@ nsTextEditorFocusListener::Focus(nsIDOMEvent* aEvent) PRInt32 pixelWidth; nsresult result; - NS_WITH_SERVICE(nsILookAndFeel, look, kLookAndFeelCID, &result); + nsCOMPtr look = + do_GetService(kLookAndFeelCID, &result); if (NS_SUCCEEDED(result) && look) { diff --git a/editor/libeditor/text/nsPlaintextDataTransfer.cpp b/editor/libeditor/text/nsPlaintextDataTransfer.cpp index 5cb7476005c2..8dcf08fa3a43 100644 --- a/editor/libeditor/text/nsPlaintextDataTransfer.cpp +++ b/editor/libeditor/text/nsPlaintextDataTransfer.cpp @@ -184,7 +184,8 @@ NS_IMETHODIMP nsPlaintextEditor::InsertFromDrop(nsIDOMEvent* aDropEvent) ForceCompositionEnd(); nsresult rv; - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr dragSession; @@ -425,7 +426,8 @@ NS_IMETHODIMP nsPlaintextEditor::DoDrag(nsIDOMEvent *aDragEvent) return NS_ERROR_OUT_OF_MEMORY; /* get the drag service */ - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); if (NS_FAILED(rv)) return rv; /* create html flavor transferable */ @@ -531,7 +533,7 @@ NS_IMETHODIMP nsPlaintextEditor::Paste(PRInt32 aSelectionType) // Get Clipboard Service nsresult rv; - NS_WITH_SERVICE ( nsIClipboard, clipboard, kCClipboardCID, &rv ); + nsCOMPtr clipboard( do_GetService( kCClipboardCID, &rv ) ); if ( NS_FAILED(rv) ) return rv; @@ -562,7 +564,7 @@ NS_IMETHODIMP nsPlaintextEditor::CanPaste(PRInt32 aSelectionType, PRBool *aCanPa return NS_OK; nsresult rv; - NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv); + nsCOMPtr clipboard(do_GetService(kCClipboardCID, &rv)); if (NS_FAILED(rv)) return rv; // the flavors that we can deal with diff --git a/editor/libeditor/text/nsPlaintextEditor.cpp b/editor/libeditor/text/nsPlaintextEditor.cpp index bfeebdc11699..cbd24cb03bd2 100644 --- a/editor/libeditor/text/nsPlaintextEditor.cpp +++ b/editor/libeditor/text/nsPlaintextEditor.cpp @@ -1588,7 +1588,7 @@ nsPlaintextEditor::PasteAsQuotation(PRInt32 aSelectionType) { // Get Clipboard Service nsresult rv; - NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv); + nsCOMPtr clipboard(do_GetService(kCClipboardCID, &rv)); if (NS_FAILED(rv)) return rv; // Create generic Transferable for getting the data @@ -1650,7 +1650,7 @@ static nsICiter* MakeACiter() // Make a citer of an appropriate type nsICiter* citer = 0; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (NS_FAILED(rv)) return 0; char *citationType = 0; diff --git a/editor/libeditor/text/nsTextEditRules.cpp b/editor/libeditor/text/nsTextEditRules.cpp index d09ab2070eac..5fd45238f4b7 100644 --- a/editor/libeditor/text/nsTextEditRules.cpp +++ b/editor/libeditor/text/nsTextEditRules.cpp @@ -529,7 +529,7 @@ nsTextEditRules::WillInsertText(PRInt32 aAction, }; PRInt32 singleLineNewlineBehavior = 1; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv) && prefs) rv = prefs->GetIntPref("editor.singleLine.pasteNewlines", &singleLineNewlineBehavior); diff --git a/embedding/base/nsEmbedWin32.cpp b/embedding/base/nsEmbedWin32.cpp index a73fbc5a5255..44bd80f652b1 100644 --- a/embedding/base/nsEmbedWin32.cpp +++ b/embedding/base/nsEmbedWin32.cpp @@ -39,7 +39,7 @@ static NS_DEFINE_CID(kTimerManagerCID, NS_TIMERMANAGER_CID); nsresult NS_DoIdleEmbeddingStuff() { nsresult rv = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsITimerQueue, timerQueue, kTimerManagerCID, &rv); + nsCOMPtr timerQueue(do_GetService(kTimerManagerCID, &rv)); if (NS_FAILED(rv)) { return NS_ERROR_FAILURE; diff --git a/embedding/browser/activex/src/control/MozillaBrowser.cpp b/embedding/browser/activex/src/control/MozillaBrowser.cpp index dbfad6f48e9a..aae7f898e4bd 100644 --- a/embedding/browser/activex/src/control/MozillaBrowser.cpp +++ b/embedding/browser/activex/src/control/MozillaBrowser.cpp @@ -903,7 +903,8 @@ HRESULT CMozillaBrowser::Initialize() } // Set the profile which the control will use - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); if (NS_FAILED(rv)) { return E_FAIL; @@ -1329,7 +1330,8 @@ HRESULT CMozillaBrowser::PrintDocument(BOOL promptUser) nsresult rv; PRBool oldPrintSilent = PR_FALSE; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (printService) { printService->GetPrintSilent(&oldPrintSilent); diff --git a/embedding/browser/photon/src/PtMozilla.cpp b/embedding/browser/photon/src/PtMozilla.cpp index 9a67de65393f..0be9194dad56 100644 --- a/embedding/browser/photon/src/PtMozilla.cpp +++ b/embedding/browser/photon/src/PtMozilla.cpp @@ -529,7 +529,8 @@ static void mozilla_modify( PtWidget_t *widget, PtArg_t const *argt ) { PpPrintContext_t *pc = moz_construct_print_context( pPageInfo ); nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); printService->SetEndPageRange( (PRInt32) pc ); /* use SetEndPageRange/GetEndPageRange to convey the print context */ print->Print( window, printService, moz->MyBrowser->WebBrowserContainer ); } diff --git a/embedding/browser/powerplant/source/CAppFileLocationProvider.cpp b/embedding/browser/powerplant/source/CAppFileLocationProvider.cpp index ce1a538f75ef..eb833c29fd20 100755 --- a/embedding/browser/powerplant/source/CAppFileLocationProvider.cpp +++ b/embedding/browser/powerplant/source/CAppFileLocationProvider.cpp @@ -159,7 +159,8 @@ NS_METHOD CAppFileLocationProvider::CloneMozBinDirectory(nsILocalFile **aLocalFi // This will be set if a directory was passed to NS_InitXPCOM // 2. If that doesn't work, set it to be the current process directory - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; @@ -198,7 +199,8 @@ NS_METHOD CAppFileLocationProvider::GetProductDirectory(nsILocalFile **aLocalFil PRBool exists; nsCOMPtr localDir; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = directoryService->Get(NS_MAC_DOCUMENTS_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(localDir)); if (NS_FAILED(rv)) return rv; diff --git a/embedding/browser/powerplant/source/CBrowserApp.cp b/embedding/browser/powerplant/source/CBrowserApp.cp index eb9cd0789565..d13f64bb615f 100644 --- a/embedding/browser/powerplant/source/CBrowserApp.cp +++ b/embedding/browser/powerplant/source/CBrowserApp.cp @@ -211,7 +211,7 @@ CBrowserApp::CBrowserApp() CBrowserApp::~CBrowserApp() { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv) && prefs) prefs->SavePrefFile(nsnull); @@ -232,7 +232,8 @@ CBrowserApp::StartUp() #if USE_PROFILES // Register for profile changes - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); ThrowIfNil_(observerService); observerService->AddObserver(this, NS_LITERAL_STRING("profile-approve-change").get()); observerService->AddObserver(this, NS_LITERAL_STRING("profile-change-teardown").get()); @@ -256,7 +257,7 @@ CBrowserApp::StartUp() rv = locationProvider->Initialize(rootDir, "guest"); ThrowIfError_(rv); - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); ThrowIfNil_(prefs); // Needed because things read default prefs during startup prefs->ResetPrefs(); @@ -500,7 +501,7 @@ Boolean CBrowserApp::AttemptQuitSelf(SInt32 inSaveOption) nsresult CBrowserApp::InitializePrefs() { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv)) { // We are using the default prefs from mozilla. If you were diff --git a/embedding/browser/powerplant/source/CBrowserShell.cpp b/embedding/browser/powerplant/source/CBrowserShell.cpp index df24d490f995..fe399102dc60 100644 --- a/embedding/browser/powerplant/source/CBrowserShell.cpp +++ b/embedding/browser/powerplant/source/CBrowserShell.cpp @@ -310,7 +310,8 @@ Boolean CBrowserShell::ObeyCommand(PP_PowerPlant::CommandT inCommand, void* ioPa nsCOMPtr domWindow; nsCOMPtr domWindowInternal; - NS_WITH_SERVICE(nsIWalletService, walletService, NS_WALLETSERVICE_CONTRACTID, &rv); + nsCOMPtr walletService = + do_GetService(NS_WALLETSERVICE_CONTRACTID, &rv); ThrowIfError_(rv); rv = mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindow)); ThrowIfError_(rv); @@ -326,7 +327,8 @@ Boolean CBrowserShell::ObeyCommand(PP_PowerPlant::CommandT inCommand, void* ioPa nsCOMPtr domWindow; nsCOMPtr domWindowInternal; - NS_WITH_SERVICE(nsIWalletService, walletService, NS_WALLETSERVICE_CONTRACTID, &rv); + nsCOMPtr walletService = + do_GetService(NS_WALLETSERVICE_CONTRACTID, &rv); ThrowIfError_(rv); rv = mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindow)); ThrowIfError_(rv); diff --git a/embedding/browser/powerplant/source/CProfileManager.cpp b/embedding/browser/powerplant/source/CProfileManager.cpp index 306501a0ff86..6849b81e2fe6 100755 --- a/embedding/browser/powerplant/source/CProfileManager.cpp +++ b/embedding/browser/powerplant/source/CProfileManager.cpp @@ -70,7 +70,8 @@ void CProfileManager::StartUp() { nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); ThrowIfNil_(profileService); PRInt32 profileCount; @@ -158,7 +159,8 @@ void CProfileManager::DoManageProfilesDialog() StDialogHandler theHandler(dlog_ManageProfiles, LCommander::GetTopCommander()); LWindow *theDialog = theHandler.GetDialog(); - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); ThrowIfNil_(profileService); // Set up the dialog by filling the list of current profiles @@ -313,7 +315,8 @@ void CProfileManager::DoLogout() enum { iPersist = 1, iCancel, iCleanse }; nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); ThrowIfNil_(profileService); nsXPIDLString currentProfile; diff --git a/embedding/browser/powerplant/source/UMacUnicode.cpp b/embedding/browser/powerplant/source/UMacUnicode.cpp index a53273225eb7..38f14d12933e 100644 --- a/embedding/browser/powerplant/source/UMacUnicode.cpp +++ b/embedding/browser/powerplant/source/UMacUnicode.cpp @@ -67,7 +67,8 @@ CPlatformUCSConversion::PreparePlatformCharset() if (mPlatformCharset.Length() == 0) { - NS_WITH_SERVICE(nsIPlatformCharset, pcharset, NS_PLATFORMCHARSET_CONTRACTID, &res); + nsCOMPtr pcharset = + do_GetService(NS_PLATFORMCHARSET_CONTRACTID, &res); if (!(NS_SUCCEEDED(res) && pcharset)) { NS_WARNING("cannot get platform charset"); } @@ -88,8 +89,8 @@ CPlatformUCSConversion::PrepareEncoder() { res = PreparePlatformCharset(); if(NS_SUCCEEDED(res)) { - NS_WITH_SERVICE(nsICharsetConverterManager, - ucmgr, NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res); + nsCOMPtr ucmgr = + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res); NS_ASSERTION((NS_SUCCEEDED(res) && ucmgr), "cannot get charset converter manager "); if(NS_SUCCEEDED(res) && ucmgr) @@ -111,8 +112,8 @@ CPlatformUCSConversion::PrepareDecoder() { res = PreparePlatformCharset(); if(NS_SUCCEEDED(res)) { - NS_WITH_SERVICE(nsICharsetConverterManager, - ucmgr, NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res); + nsCOMPtr ucmgr = + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res); NS_ASSERTION((NS_SUCCEEDED(res) && ucmgr), "cannot get charset converter manager "); if(NS_SUCCEEDED(res) && ucmgr) diff --git a/embedding/browser/webBrowser/nsWebBrowser.cpp b/embedding/browser/webBrowser/nsWebBrowser.cpp index 08f1b3a0905c..9be8d4ab31ba 100644 --- a/embedding/browser/webBrowser/nsWebBrowser.cpp +++ b/embedding/browser/webBrowser/nsWebBrowser.cpp @@ -291,7 +291,8 @@ NS_IMETHODIMP nsWebBrowser::EnableGlobalHistory(PRBool aEnable) if (NS_FAILED(rv)) return rv; if (aEnable) { - NS_WITH_SERVICE(nsIGlobalHistory, history, NS_GLOBALHISTORY_CONTRACTID, &rv); + nsCOMPtr history = + do_GetService(NS_GLOBALHISTORY_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = dsHistory->SetGlobalHistory(history); } @@ -1611,7 +1612,8 @@ NS_IMETHODIMP nsWebBrowser::Print(nsIDOMWindow *aDOMWindow, NS_IMETHODIMP nsWebBrowser::Cancel(void) { nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv) && printService) { return printService->SetIsCancelled(PR_TRUE); } diff --git a/embedding/browser/webBrowser/nsWebBrowserPersist.cpp b/embedding/browser/webBrowser/nsWebBrowserPersist.cpp index ed930a70a076..e671097910b0 100644 --- a/embedding/browser/webBrowser/nsWebBrowserPersist.cpp +++ b/embedding/browser/webBrowser/nsWebBrowserPersist.cpp @@ -160,7 +160,8 @@ NS_IMETHODIMP nsWebBrowserPersist::SaveURI(nsIURI *aURI, nsIInputStream *aPostDa } NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID); - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) { diff --git a/embedding/qa/testembed/ProfileMgr.cpp b/embedding/qa/testembed/ProfileMgr.cpp index 8bad6249fd40..d153a455492c 100644 --- a/embedding/qa/testembed/ProfileMgr.cpp +++ b/embedding/qa/testembed/ProfileMgr.cpp @@ -57,7 +57,8 @@ nsresult CProfileMgr::StartUp() { nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; PRInt32 profileCount; @@ -115,7 +116,8 @@ nsresult CProfileMgr::DoManageProfilesDialog(PRBool bAtStartUp) { SetShowDialogOnStart(dialog.m_bAskAtStartUp); - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) rv = profileService->SetCurrentProfile(dialog.m_SelectedProfile.get()); } diff --git a/embedding/qa/testembed/ProfilesDlg.cpp b/embedding/qa/testembed/ProfilesDlg.cpp index 73db97a45ec8..446301fd86a1 100644 --- a/embedding/qa/testembed/ProfilesDlg.cpp +++ b/embedding/qa/testembed/ProfilesDlg.cpp @@ -25,7 +25,8 @@ static void ValidateProfileName(const CString& profileName, CDataExchange* pDX) PRBool exists = FALSE; { - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); rv = profileService->ProfileExists(T2W(profileName), &exists); } @@ -183,7 +184,8 @@ BOOL CProfilesDlg::OnInitDialog() // Fill the list of profiles nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); profileService->GetCurrentProfile(getter_Copies(curProfileName)); PRInt32 selectedRow = 0; @@ -218,7 +220,8 @@ void CProfilesDlg::OnNewProfile() { nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); ASSERT(NS_SUCCEEDED(rv)); if (NS_SUCCEEDED(rv)) { @@ -253,7 +256,8 @@ void CProfilesDlg::OnRenameProfile() nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); ASSERT(NS_SUCCEEDED(rv)); if (NS_SUCCEEDED(rv)) { @@ -274,7 +278,8 @@ void CProfilesDlg::OnDeleteProfile() m_ProfileList.GetText(itemIndex, selectedProfile); nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); ASSERT(NS_SUCCEEDED(rv)); if (NS_SUCCEEDED(rv)) { diff --git a/embedding/qa/testembed/TestEmbed.cpp b/embedding/qa/testembed/TestEmbed.cpp index 6a55a609dcb7..f2d384f7586f 100644 --- a/embedding/qa/testembed/TestEmbed.cpp +++ b/embedding/qa/testembed/TestEmbed.cpp @@ -432,7 +432,7 @@ void CTestEmbedApp::OnEditPreferences() // Save these changes to disk now nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv)) { prefs->SetIntPref("browser.startup.page", m_iStartupPage); @@ -452,7 +452,8 @@ BOOL CTestEmbedApp::InitializeProfiles() return FALSE; nsresult rv; - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); observerService->AddObserver(this, NS_LITERAL_STRING("profile-approve-change").get()); observerService->AddObserver(this, NS_LITERAL_STRING("profile-change-teardown").get()); observerService->AddObserver(this, NS_LITERAL_STRING("profile-after-change").get()); @@ -483,7 +484,7 @@ BOOL CTestEmbedApp::CreateHiddenWindow() nsresult CTestEmbedApp::InitializePrefs() { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv)) { // We are using the default prefs from mozilla. If you were diff --git a/embedding/qa/testembed/Tests.cpp b/embedding/qa/testembed/Tests.cpp index 679528c92bf8..70b49372dff0 100644 --- a/embedding/qa/testembed/Tests.cpp +++ b/embedding/qa/testembed/Tests.cpp @@ -251,7 +251,8 @@ void CTests::OnTestsCreateprofile() if (myDialog.DoModal() == IDOK) { -// NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); +// nsCOMPtr profileService = +// do_GetService(NS_PROFILE_CONTRACTID, &rv); nsCOMPtr theProfServ(do_GetService(NS_PROFILE_CONTRACTID)); if (!theProfServ) { diff --git a/embedding/qa/testembed/winEmbedFileLocProvider.cpp b/embedding/qa/testembed/winEmbedFileLocProvider.cpp index cf10580fe9e7..96c4d4728290 100644 --- a/embedding/qa/testembed/winEmbedFileLocProvider.cpp +++ b/embedding/qa/testembed/winEmbedFileLocProvider.cpp @@ -167,7 +167,8 @@ NS_METHOD winEmbedFileLocProvider::CloneMozBinDirectory(nsILocalFile **aLocalFil // This will be set if a directory was passed to NS_InitXPCOM // 2. If that doesn't work, set it to be the current process directory - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; @@ -206,7 +207,8 @@ NS_METHOD winEmbedFileLocProvider::GetProductDirectory(nsILocalFile **aLocalFile PRBool exists; nsCOMPtr localDir; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = directoryService->Get(NS_WIN_APPDATA_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(localDir)); if (NS_SUCCEEDED(rv)) diff --git a/embedding/tests/mfcembed/MfcEmbed.cpp b/embedding/tests/mfcembed/MfcEmbed.cpp index b0e96a44c86b..a4ccf665ee8b 100644 --- a/embedding/tests/mfcembed/MfcEmbed.cpp +++ b/embedding/tests/mfcembed/MfcEmbed.cpp @@ -415,7 +415,7 @@ void CMfcEmbedApp::OnEditPreferences() // Save these changes to disk now nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv)) { prefs->SetIntPref("browser.startup.page", m_iStartupPage); @@ -435,7 +435,8 @@ BOOL CMfcEmbedApp::InitializeProfiles() return FALSE; nsresult rv; - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); observerService->AddObserver(this, NS_LITERAL_STRING("profile-approve-change").get()); observerService->AddObserver(this, NS_LITERAL_STRING("profile-change-teardown").get()); observerService->AddObserver(this, NS_LITERAL_STRING("profile-after-change").get()); @@ -466,7 +467,7 @@ BOOL CMfcEmbedApp::CreateHiddenWindow() nsresult CMfcEmbedApp::InitializePrefs() { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv)) { // We are using the default prefs from mozilla. If you were diff --git a/embedding/tests/mfcembed/ProfileMgr.cpp b/embedding/tests/mfcembed/ProfileMgr.cpp index 11ef829ac4a8..779ee643f391 100644 --- a/embedding/tests/mfcembed/ProfileMgr.cpp +++ b/embedding/tests/mfcembed/ProfileMgr.cpp @@ -57,7 +57,8 @@ nsresult CProfileMgr::StartUp() { nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; PRInt32 profileCount; @@ -115,7 +116,8 @@ nsresult CProfileMgr::DoManageProfilesDialog(PRBool bAtStartUp) { SetShowDialogOnStart(dialog.m_bAskAtStartUp); - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) rv = profileService->SetCurrentProfile(dialog.m_SelectedProfile.get()); } diff --git a/embedding/tests/mfcembed/ProfilesDlg.cpp b/embedding/tests/mfcembed/ProfilesDlg.cpp index 611461bed604..9041769aa514 100644 --- a/embedding/tests/mfcembed/ProfilesDlg.cpp +++ b/embedding/tests/mfcembed/ProfilesDlg.cpp @@ -25,7 +25,8 @@ static void ValidateProfileName(const CString& profileName, CDataExchange* pDX) PRBool exists = FALSE; { - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); rv = profileService->ProfileExists(T2W(profileName), &exists); } @@ -183,7 +184,8 @@ BOOL CProfilesDlg::OnInitDialog() // Fill the list of profiles nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); profileService->GetCurrentProfile(getter_Copies(curProfileName)); PRInt32 selectedRow = 0; @@ -218,7 +220,8 @@ void CProfilesDlg::OnNewProfile() { nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); ASSERT(NS_SUCCEEDED(rv)); if (NS_SUCCEEDED(rv)) { @@ -253,7 +256,8 @@ void CProfilesDlg::OnRenameProfile() nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); ASSERT(NS_SUCCEEDED(rv)); if (NS_SUCCEEDED(rv)) { @@ -274,7 +278,8 @@ void CProfilesDlg::OnDeleteProfile() m_ProfileList.GetText(itemIndex, selectedProfile); nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); ASSERT(NS_SUCCEEDED(rv)); if (NS_SUCCEEDED(rv)) { diff --git a/embedding/tests/mfcembed/winEmbedFileLocProvider.cpp b/embedding/tests/mfcembed/winEmbedFileLocProvider.cpp index cf10580fe9e7..96c4d4728290 100644 --- a/embedding/tests/mfcembed/winEmbedFileLocProvider.cpp +++ b/embedding/tests/mfcembed/winEmbedFileLocProvider.cpp @@ -167,7 +167,8 @@ NS_METHOD winEmbedFileLocProvider::CloneMozBinDirectory(nsILocalFile **aLocalFil // This will be set if a directory was passed to NS_InitXPCOM // 2. If that doesn't work, set it to be the current process directory - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; @@ -206,7 +207,8 @@ NS_METHOD winEmbedFileLocProvider::GetProductDirectory(nsILocalFile **aLocalFile PRBool exists; nsCOMPtr localDir; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = directoryService->Get(NS_WIN_APPDATA_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(localDir)); if (NS_SUCCEEDED(rv)) diff --git a/embedding/tests/winEmbed/winEmbed.cpp b/embedding/tests/winEmbed/winEmbed.cpp index 7793dfa6d57a..60e261b59e74 100644 --- a/embedding/tests/winEmbed/winEmbed.cpp +++ b/embedding/tests/winEmbed/winEmbed.cpp @@ -855,7 +855,8 @@ LRESULT CALLBACK BrowserWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l BOOL ChooseNewProfile(BOOL bShowForMultipleProfilesOnly, const char *szDefaultProfile) { nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); if (NS_FAILED(rv)) { return FALSE; @@ -917,7 +918,8 @@ LRESULT CALLBACK ChooseProfileDlgProc(HWND hDlg, UINT message, WPARAM wParam, LP { HWND hwndProfileList = GetDlgItem(hDlg, IDC_PROFILELIST); - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); // Get the list of profile names and add them to the list box PRUint32 listLen = 0; @@ -965,7 +967,8 @@ LRESULT CALLBACK ChooseProfileDlgProc(HWND hDlg, UINT message, WPARAM wParam, LP INT currentProfileIndex = SendMessage(hwndProfileList, LB_GETCURSEL, 0, 0); if (currentProfileIndex != LB_ERR) { - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); // Convert TCHAR name to unicode and make it current INT profileNameLen = SendMessage(hwndProfileList, LB_GETTEXTLEN, currentProfileIndex, 0); TCHAR *profileName = new TCHAR[profileNameLen + 1]; diff --git a/extensions/cookie/nsCookieService.cpp b/extensions/cookie/nsCookieService.cpp index aad852c75cfa..1b1499c63dbd 100644 --- a/extensions/cookie/nsCookieService.cpp +++ b/extensions/cookie/nsCookieService.cpp @@ -63,14 +63,16 @@ nsresult nsCookieService::Init() COOKIE_Read(); nsresult rv; - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (observerService) { observerService->AddObserver(this, NS_LITERAL_STRING("profile-before-change").get()); observerService->AddObserver(this, NS_LITERAL_STRING("profile-do-change").get()); } // Register as an observer for the document loader - NS_WITH_SERVICE(nsIDocumentLoader, docLoaderService, kDocLoaderServiceCID, &rv) + nsCOMPtr docLoaderService = + do_GetService(kDocLoaderServiceCID, &rv); if (NS_SUCCEEDED(rv) && docLoaderService) { nsCOMPtr progress(do_QueryInterface(docLoaderService)); if (progress) diff --git a/extensions/cookie/nsCookies.cpp b/extensions/cookie/nsCookies.cpp index 3df462ae7d90..0e25fc8644c0 100644 --- a/extensions/cookie/nsCookies.cpp +++ b/extensions/cookie/nsCookies.cpp @@ -320,7 +320,7 @@ MODULE_PRIVATE int PR_CALLBACK cookie_BehaviorPrefChanged(const char * newpref, void * data) { PRInt32 n; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_FAILED(prefs->GetIntPref(cookie_behaviorPref, &n))) { n = PERMISSION_Accept; } @@ -332,7 +332,7 @@ MODULE_PRIVATE int PR_CALLBACK cookie_WarningPrefChanged(const char * newpref, void * data) { PRBool x; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_FAILED(prefs->GetBoolPref(cookie_warningPref, &x))) { x = PR_FALSE; } @@ -344,7 +344,7 @@ MODULE_PRIVATE int PR_CALLBACK cookie_LifetimeOptPrefChanged(const char * newpref, void * data) { PRInt32 n; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_FAILED(prefs->GetIntPref(cookie_lifetimePref, &n))) { n = COOKIE_Normal; } @@ -356,7 +356,7 @@ MODULE_PRIVATE int PR_CALLBACK cookie_LifetimeLimitPrefChanged(const char * newpref, void * data) { PRInt32 n; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (!NS_FAILED(prefs->GetIntPref(cookie_lifetimeValue, &n))) { cookie_SetLifetimeLimit(n); } @@ -371,7 +371,7 @@ COOKIE_RegisterPrefCallbacks(void) { PRInt32 n; PRBool x; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); // Initialize for cookie_behaviorPref if (NS_FAILED(prefs->GetIntPref(cookie_behaviorPref, &n))) { @@ -841,7 +841,7 @@ cookie_SetCookieString(char * curURL, nsIPrompt *aPrompter, const char * setCook * */ nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_FAILED(prefs->GetBoolPref(cookie_strictDomainsPref, &pref_scd))) { pref_scd = PR_FALSE; } diff --git a/extensions/cookie/nsImages.cpp b/extensions/cookie/nsImages.cpp index 843152cad309..9884733394ce 100644 --- a/extensions/cookie/nsImages.cpp +++ b/extensions/cookie/nsImages.cpp @@ -70,7 +70,7 @@ MODULE_PRIVATE int PR_CALLBACK image_BehaviorPrefChanged(const char * newpref, void * data) { PRInt32 n; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_FAILED(prefs->GetIntPref(image_behaviorPref, &n))) { image_SetBehaviorPref(PERMISSION_Accept); } else { @@ -83,7 +83,7 @@ MODULE_PRIVATE int PR_CALLBACK image_WarningPrefChanged(const char * newpref, void * data) { PRBool x; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_FAILED(prefs->GetBoolPref(image_warningPref, &x))) { x = PR_FALSE; } @@ -96,7 +96,7 @@ IMAGE_RegisterPrefCallbacks(void) { PRInt32 n; PRBool x; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); // Initialize for image_behaviorPref if (NS_FAILED(prefs->GetIntPref(image_behaviorPref, &n))) { @@ -120,7 +120,7 @@ IMAGE_CheckForPermission /* exit if imageblocker is not enabled */ nsresult rv; PRBool prefvalue = PR_FALSE; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_FAILED(rv) || NS_FAILED(prefs->GetBoolPref("imageblocker.enabled", &prefvalue)) || !prefvalue) { diff --git a/extensions/cookie/nsPermissionManager.cpp b/extensions/cookie/nsPermissionManager.cpp index d80786577ff8..2e30bf9c0387 100644 --- a/extensions/cookie/nsPermissionManager.cpp +++ b/extensions/cookie/nsPermissionManager.cpp @@ -104,7 +104,8 @@ nsresult nsPermissionManager::Init() PERMISSION_Read(); nsresult rv; - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (observerService) { observerService->AddObserver(this, NS_LITERAL_STRING("profile-before-change").get()); observerService->AddObserver(this, NS_LITERAL_STRING("profile-do-change").get()); diff --git a/extensions/cookie/nsUtils.cpp b/extensions/cookie/nsUtils.cpp index c38c2c9e3719..a617c5077280 100644 --- a/extensions/cookie/nsUtils.cpp +++ b/extensions/cookie/nsUtils.cpp @@ -266,7 +266,8 @@ PRUnichar * CKutil_Localize(const PRUnichar *genericString) { nsresult ret; PRUnichar *ptrv = nsnull; - NS_WITH_SERVICE(nsIStringBundleService, pStringService, kStringBundleServiceCID, &ret); + nsCOMPtr pStringService = + do_GetService(kStringBundleServiceCID, &ret); if (NS_SUCCEEDED(ret) && (nsnull != pStringService)) { nsCOMPtr bundle; ret = pStringService->CreateBundle(LOCALIZATION, getter_AddRefs(bundle)); diff --git a/extensions/cookie/tests/TestCookie.cpp b/extensions/cookie/tests/TestCookie.cpp index cd5cd5f26abf..abd9806878e6 100644 --- a/extensions/cookie/tests/TestCookie.cpp +++ b/extensions/cookie/tests/TestCookie.cpp @@ -77,7 +77,8 @@ int main(PRInt32 argc, char *argv[]) if (NS_FAILED(rv)) return -1; // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return -1; rv = eventQService->CreateThreadEventQueue(); @@ -85,7 +86,8 @@ int main(PRInt32 argc, char *argv[]) eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, &gEventQ); - NS_WITH_SERVICE(nsIStringBundleService, bundleService, NS_STRINGBUNDLE_CONTRACTID, &rv); + nsCOMPtr bundleService = + do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsCOMPtr stringBundle; @@ -93,7 +95,8 @@ int main(PRInt32 argc, char *argv[]) rv = bundleService->CreateBundle(propertyURL, getter_AddRefs(stringBundle)); } - NS_WITH_SERVICE(nsICookieService, cookieService, kCookieServiceCID, &rv); + nsCOMPtr cookieService = + do_GetService(kCookieServiceCID, &rv); if (NS_FAILED(rv)) return -1; SetACookie(cookieService, "http://www.blah.com", "myCookie=yup; path=/"); diff --git a/extensions/pics/src/nsPICSElementObserver.cpp b/extensions/pics/src/nsPICSElementObserver.cpp index b31ea179e2e3..83e603afe84d 100644 --- a/extensions/pics/src/nsPICSElementObserver.cpp +++ b/extensions/pics/src/nsPICSElementObserver.cpp @@ -153,7 +153,7 @@ NS_IMETHODIMP nsPICSElementObserver::Notify(PRUint32 aDocumentID, char *label = theValue2.ToNewCString(); if (valueArray[numOfAttributes]) { const nsString& theURLValue=valueArray[numOfAttributes]; - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv); + nsCOMPtr service(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsIURI *uri = nsnull; diff --git a/extensions/psm-glue/src/nsCrypto.cpp b/extensions/psm-glue/src/nsCrypto.cpp index 673b354e9b1a..abe7a21db4d0 100644 --- a/extensions/psm-glue/src/nsCrypto.cpp +++ b/extensions/psm-glue/src/nsCrypto.cpp @@ -583,8 +583,8 @@ cryptojs_DestroyCRMFRequests(PCMT_CONTROL control, CMUint32 *rsrcids, nsIEventQueue* getUIEventQueue() { nsresult rv; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, - NS_EVENTQUEUESERVICE_CONTRACTID, &rv); + nsCOMPtr eventQService = + do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return nsnull; diff --git a/extensions/psm-glue/src/nsPSMComponent.cpp b/extensions/psm-glue/src/nsPSMComponent.cpp index 7cc2cb52e814..cd382c8bce0a 100644 --- a/extensions/psm-glue/src/nsPSMComponent.cpp +++ b/extensions/psm-glue/src/nsPSMComponent.cpp @@ -100,7 +100,8 @@ nsPSMComponent::~nsPSMComponent() if (mCertContentListener) { nsresult rv = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIURILoader, dispatcher, NS_URI_LOADER_CONTRACTID, &rv); + nsCOMPtr dispatcher = + do_GetService(NS_URI_LOADER_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { rv = dispatcher->UnRegisterContentListener(mCertContentListener); } @@ -146,7 +147,8 @@ nsPSMComponent::RegisterCertContentListener() { nsresult rv = NS_OK; if (mCertContentListener == nsnull) { - NS_WITH_SERVICE(nsIURILoader, dispatcher, NS_URI_LOADER_CONTRACTID, &rv); + nsCOMPtr dispatcher = + do_GetService(NS_URI_LOADER_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { mCertContentListener = do_CreateInstance(NS_CERTCONTENTLISTEN_CONTRACTID); rv = dispatcher->RegisterContentListener(mCertContentListener); @@ -159,7 +161,8 @@ nsresult nsPSMComponent::RegisterProfileChangeObserver() { nsresult rv; - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); NS_ASSERTION(observerService, "could not get observer service"); if (observerService) { // Our refcnt must be > 0 when we call AddObserver or we'll get deleted. @@ -520,7 +523,8 @@ nsPSMComponent::GetControlConnection( CMT_CONTROL * *_retval ) if (mControl == nsnull) { nsCOMPtr psmAppFile; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; directoryService->Get( NS_XPCOM_CURRENT_PROCESS_DIR, @@ -549,7 +553,8 @@ nsPSMComponent::GetControlConnection( CMT_CONTROL * *_retval ) if (mControl == nsnull) { nsCOMPtr psmAppFile; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; directoryService->Get( NS_XPCOM_CURRENT_PROCESS_DIR, @@ -612,7 +617,7 @@ nsPSMComponent::GetControlConnection( CMT_CONTROL * *_retval ) profileSpec->Create(nsIFile::DIRECTORY_TYPE, 0); #endif - NS_WITH_SERVICE(nsIProfile, profile, kProfileCID, &rv); + nsCOMPtr profile(do_GetService(kProfileCID, &rv)); if (NS_SUCCEEDED(rv)) { rv = profile->GetCurrentProfile(getter_Copies(profileName)); @@ -1171,8 +1176,8 @@ nsPSMComponent::VerifySignature(const char* aRSABuf, PRUint32 aRSABufLen, //-- Get a principal nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv) + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; rv = secMan->GetCertificatePrincipal((const char*)fingerprint.data, aPrincipal); diff --git a/extensions/psm-glue/src/nsSecureBrowserUIImpl.cpp b/extensions/psm-glue/src/nsSecureBrowserUIImpl.cpp index 26765f0bd521..52cd99ed6b5d 100644 --- a/extensions/psm-glue/src/nsSecureBrowserUIImpl.cpp +++ b/extensions/psm-glue/src/nsSecureBrowserUIImpl.cpp @@ -164,7 +164,8 @@ nsSecureBrowserUIImpl::Init(nsIDOMWindow *window, nsIDOMElement *button) getter_AddRefs(mPref)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIStringBundleService, service, kCStringBundleServiceCID, &rv); + nsCOMPtr service = + do_GetService(kCStringBundleServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = service->CreateBundle(SECURITY_STRING_BUNDLE_URL, getter_AddRefs(mStringBundle)); @@ -205,7 +206,8 @@ NS_IMETHODIMP nsSecureBrowserUIImpl::DisplayPageInfoUI() { nsresult res; - NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_CONTRACTID, &res); + nsCOMPtr psm = + do_GetService(PSM_COMPONENT_CONTRACTID, &res); if (NS_FAILED(res)) return res; @@ -563,7 +565,8 @@ nsSecureBrowserUIImpl::IsURLfromPSM(nsIURI* aURL, PRBool* value) if ( PL_strncasecmp(host, "127.0.0.1", 9) == 0 ) { nsresult res; - NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_CONTRACTID, &res); + nsCOMPtr psm = + do_GetService(PSM_COMPONENT_CONTRACTID, &res); if (NS_FAILED(res)) return res; @@ -648,7 +651,8 @@ nsSecureBrowserUIImpl::CheckProtocolContextSwitch( nsISecurityEventSink* eventSi if (!outCheckValue) { mPref->SetBoolPref(LEAVE_SITE_PREF, PR_FALSE); - NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_CONTRACTID, &res); + nsCOMPtr psm = + do_GetService(PSM_COMPONENT_CONTRACTID, &res); if (NS_FAILED(res)) return res; psm->PassPrefs(); @@ -686,7 +690,8 @@ nsSecureBrowserUIImpl::CheckProtocolContextSwitch( nsISecurityEventSink* eventSi if (!outCheckValue) { mPref->SetBoolPref(ENTER_SITE_PREF, PR_FALSE); - NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_CONTRACTID, &res); + nsCOMPtr psm = + do_GetService(PSM_COMPONENT_CONTRACTID, &res); if (NS_FAILED(res)) return res; psm->PassPrefs(); @@ -759,7 +764,8 @@ nsSecureBrowserUIImpl::CheckMixedContext(nsISecurityEventSink *eventSink, nsIReq if (!outCheckValue) { mPref->SetBoolPref(MIXEDCONTENT_PREF, PR_FALSE); - NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_CONTRACTID, &rv); + nsCOMPtr psm = + do_GetService(PSM_COMPONENT_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; psm->PassPrefs(); @@ -833,7 +839,8 @@ nsSecureBrowserUIImpl::CheckPost(nsIURI *actionURL, PRBool *okayToPost) if (!outCheckValue) { mPref->SetBoolPref(INSECURE_SUBMIT_PREF, PR_FALSE); - NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_CONTRACTID, &rv); + nsCOMPtr psm = + do_GetService(PSM_COMPONENT_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; return psm->PassPrefs(); diff --git a/extensions/python/xpcom/src/xpcom.cpp b/extensions/python/xpcom/src/xpcom.cpp index 2d5f4a04e7a0..9abfac7ecef0 100644 --- a/extensions/python/xpcom/src/xpcom.cpp +++ b/extensions/python/xpcom/src/xpcom.cpp @@ -355,10 +355,8 @@ PyXPCOMMethod_GetProxyForObject(PyObject *self, PyObject *args) nsresult rv_proxy; nsISupports *presult = nsnull; Py_BEGIN_ALLOW_THREADS; - NS_WITH_SERVICE(nsIProxyObjectManager, - proxyMgr, - kProxyObjectManagerCID, - &rv_proxy); + nsCOMPtr proxyMgr = + do_GetService(kProxyObjectManagerCID, &rv_proxy); if ( NS_SUCCEEDED(rv_proxy) ) { rv_proxy = proxyMgr->GetProxyForObject(pQueue, diff --git a/extensions/transformiix/source/xml/parser/nsSyncLoader.cpp b/extensions/transformiix/source/xml/parser/nsSyncLoader.cpp index 62f1dbc6e68d..12caf0e38b2a 100644 --- a/extensions/transformiix/source/xml/parser/nsSyncLoader.cpp +++ b/extensions/transformiix/source/xml/parser/nsSyncLoader.cpp @@ -238,7 +238,7 @@ nsSyncLoader::LoadDocument(nsIURI* documentURI, nsIDOMDocument **_retval) nsCOMPtr eventQService; nsCOMPtr cc; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_SUCCEEDED(rv)) { rv = xpc->GetCurrentNativeCallContext(getter_AddRefs(cc)); } @@ -249,7 +249,8 @@ nsSyncLoader::LoadDocument(nsIURI* documentURI, nsIDOMDocument **_retval) if (NS_FAILED(rv)) return NS_ERROR_FAILURE; } else { - NS_WITH_SERVICE(nsIAppShellService, appshellSvc, kAppShellServiceCID, &rv); + nsCOMPtr appshellSvc = + do_GetService(kAppShellServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr junk; rv = appshellSvc->GetHiddenWindowAndJSContext(getter_AddRefs(junk), &cx); diff --git a/extensions/xmlterm/base/mozXMLTermFactory.cpp b/extensions/xmlterm/base/mozXMLTermFactory.cpp index fe0447c25293..c48ee222eeea 100644 --- a/extensions/xmlterm/base/mozXMLTermFactory.cpp +++ b/extensions/xmlterm/base/mozXMLTermFactory.cpp @@ -252,7 +252,8 @@ NSRegisterSelf(nsISupports* aServMgr , const char* aPath) nsCOMPtr servMgr(do_QueryInterface(aServMgr, &result)); if (NS_FAILED(result)) return result; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &result); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &result); if (NS_FAILED(result)) return result; printf("Registering lineterm interface\n"); @@ -285,7 +286,8 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* aPath) nsCOMPtr servMgr(do_QueryInterface(aServMgr, &result)); if (NS_FAILED(result)) return result; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &result); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &result); if (NS_FAILED(result)) return result; result = compMgr->UnregisterComponent(kLineTermCID, aPath); diff --git a/extensions/xmlterm/base/mozXMLTerminal.cpp b/extensions/xmlterm/base/mozXMLTerminal.cpp index 05e14f3fdbdf..f9487065345b 100644 --- a/extensions/xmlterm/base/mozXMLTerminal.cpp +++ b/extensions/xmlterm/base/mozXMLTerminal.cpp @@ -752,7 +752,7 @@ NS_IMETHODIMP mozXMLTerminal::ShowCaret(void) PRInt32 pixelWidth; nsresult result; - NS_WITH_SERVICE(nsILookAndFeel, look, kLookAndFeelCID, &result); + nsCOMPtr look(do_GetService(kLookAndFeelCID, &result)); if (NS_SUCCEEDED(result) && look) { look->GetMetric(nsILookAndFeel::eMetric_SingleLineCaretWidth, pixelWidth); @@ -791,7 +791,7 @@ NS_IMETHODIMP mozXMLTerminal::Paste() XMLT_LOG(mozXMLTerminal::Paste,20,("\n")); // Get Clipboard service - NS_WITH_SERVICE (nsIClipboard, clipboard, kCClipboardCID, &result); + nsCOMPtr clipboard(do_GetService(kCClipboardCID, &result)); if ( NS_FAILED(result) ) return result; diff --git a/gfx/src/beos/nsDeviceContextBeOS.cpp b/gfx/src/beos/nsDeviceContextBeOS.cpp index 5c0fed433dd1..09047905d3ba 100644 --- a/gfx/src/beos/nsDeviceContextBeOS.cpp +++ b/gfx/src/beos/nsDeviceContextBeOS.cpp @@ -107,7 +107,7 @@ NS_IMETHODIMP nsDeviceContextBeOS::Init(nsNativeWidget aNativeWidget) PRInt32 prefVal = -1; nsresult res; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (NS_SUCCEEDED(res) && prefs) { res = prefs->GetIntPref("browser.display.screen_resolution", &prefVal); if (! NS_SUCCEEDED(res)) { @@ -474,7 +474,7 @@ int nsDeviceContextBeOS::prefChanged(const char *aPref, void *aClosure) if (nsCRT::strcmp(aPref, "browser.display.screen_resolution")==0) { PRInt32 dpi; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); rv = prefs->GetIntPref(aPref, &dpi); if (NS_SUCCEEDED(rv)) context->SetDPI(dpi); diff --git a/gfx/src/gtk/nsDeviceContextGTK.cpp b/gfx/src/gtk/nsDeviceContextGTK.cpp index 277909f6f828..4437239bdb54 100644 --- a/gfx/src/gtk/nsDeviceContextGTK.cpp +++ b/gfx/src/gtk/nsDeviceContextGTK.cpp @@ -147,7 +147,7 @@ NS_IMETHODIMP nsDeviceContextGTK::Init(nsNativeWidget aNativeWidget) // If it's positive, we use it as the logical resolution nsresult res; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (NS_SUCCEEDED(res) && prefs) { res = prefs->GetIntPref("browser.display.screen_resolution", &prefVal); if (NS_FAILED(res)) { @@ -557,7 +557,7 @@ int nsDeviceContextGTK::prefChanged(const char *aPref, void *aClosure) if (nsCRT::strcmp(aPref, "browser.display.screen_resolution")==0) { PRInt32 dpi; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); rv = prefs->GetIntPref(aPref, &dpi); if (NS_SUCCEEDED(rv)) context->SetDPI(dpi); diff --git a/gfx/src/mac/nsDeviceContextMac.cpp b/gfx/src/mac/nsDeviceContextMac.cpp index d9cf88933b6a..b22cec59f221 100644 --- a/gfx/src/mac/nsDeviceContextMac.cpp +++ b/gfx/src/mac/nsDeviceContextMac.cpp @@ -1040,7 +1040,7 @@ PRUint32 nsDeviceContextMac::GetScreenResolution() initialized = PR_TRUE; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { PRInt32 intVal; if (NS_SUCCEEDED(prefs->GetIntPref("browser.display.screen_resolution", &intVal))) { @@ -1066,7 +1066,7 @@ PRBool nsDeviceContextMac::DisplayVerySmallFonts() initialized = PR_TRUE; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { PRBool boolVal; if (NS_SUCCEEDED(prefs->GetBoolPref("browser.display_very_small_fonts", &boolVal))) { diff --git a/gfx/src/mac/nsDeviceContextSpecMac.cpp b/gfx/src/mac/nsDeviceContextSpecMac.cpp index ff61244b9cd9..6b342208d44c 100644 --- a/gfx/src/mac/nsDeviceContextSpecMac.cpp +++ b/gfx/src/mac/nsDeviceContextSpecMac.cpp @@ -344,7 +344,8 @@ PDlgInitUPP theInitProcPtr; // about to put up the dialog, so get the initial settings nsresult rv = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (printService) { gCurrOptions = printService; } else { diff --git a/gfx/src/nsDeviceContext.cpp b/gfx/src/nsDeviceContext.cpp index bf34afad4eac..8e5abb12d0f7 100644 --- a/gfx/src/nsDeviceContext.cpp +++ b/gfx/src/nsDeviceContext.cpp @@ -702,14 +702,15 @@ DeviceContextImpl::GetLocalizedBundle(const char * aPropFileName, nsIStringBundl // Create a URL for the string resource file // Create a bundle for the localization - NS_WITH_SERVICE(nsIIOService, pNetService, kIOServiceCID, &rv); + nsCOMPtr pNetService(do_GetService(kIOServiceCID, &rv)); if (NS_SUCCEEDED(rv) && pNetService) { nsCOMPtr uri; rv = pNetService->NewURI(aPropFileName, nsnull, getter_AddRefs(uri)); if (NS_SUCCEEDED(rv) && uri) { // Create bundle - NS_WITH_SERVICE(nsIStringBundleService, stringService, kStringBundleServiceCID, &rv); + nsCOMPtr stringService = + do_GetService(kStringBundleServiceCID, &rv); if (NS_SUCCEEDED(rv) && stringService) { nsXPIDLCString spec; rv = uri->GetSpec(getter_Copies(spec)); diff --git a/gfx/src/nsImageManager.cpp b/gfx/src/nsImageManager.cpp index 393f763bc93b..1a8e83df5ca8 100644 --- a/gfx/src/nsImageManager.cpp +++ b/gfx/src/nsImageManager.cpp @@ -77,7 +77,7 @@ ImageManagerImpl::ImageManagerImpl() PRInt32 cacheSize = (1024L * 2048L); nsresult res = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (prefs) { PRInt32 tempSize; diff --git a/gfx/src/nsImageNetContextSync.cpp b/gfx/src/nsImageNetContextSync.cpp index eb759f2e53f3..3a8df4532b74 100644 --- a/gfx/src/nsImageNetContextSync.cpp +++ b/gfx/src/nsImageNetContextSync.cpp @@ -196,7 +196,7 @@ ImageNetContextSyncImpl::GetURL(ilIURL* aURL, nsresult res; // Get a network service interface which we'll use to create a stream - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &res); + nsCOMPtr service(do_GetService(kIOServiceCID, &res)); if (NS_SUCCEEDED(res)) { nsIInputStream* stream = nsnull; diff --git a/gfx/src/os2/nsDeviceContextOS2.cpp b/gfx/src/os2/nsDeviceContextOS2.cpp index b4f2f506adc1..a46f63e34a96 100644 --- a/gfx/src/os2/nsDeviceContextOS2.cpp +++ b/gfx/src/os2/nsDeviceContextOS2.cpp @@ -85,7 +85,7 @@ nsDeviceContextOS2 :: nsDeviceContextOS2() #ifndef XP_OS2 nsresult res = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (NS_SUCCEEDED(res)) { static PRBool roundingInitialized = PR_FALSE; if (!roundingInitialized) { diff --git a/gfx/src/photon/nsDeviceContextPh.cpp b/gfx/src/photon/nsDeviceContextPh.cpp index ae1b6a7f6749..c664d59a3dfa 100644 --- a/gfx/src/photon/nsDeviceContextPh.cpp +++ b/gfx/src/photon/nsDeviceContextPh.cpp @@ -192,7 +192,7 @@ void nsDeviceContextPh :: CommonInit( nsNativeDeviceContext aDC ) { PRInt32 prefVal = -1; nsresult res; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if( NS_SUCCEEDED( res ) && prefs ) { res = prefs->GetIntPref("browser.display.screen_resolution", &prefVal); if( !NS_SUCCEEDED( res ) ) { @@ -520,7 +520,7 @@ int nsDeviceContextPh::prefChanged( const char *aPref, void *aClosure ) { if( nsCRT::strcmp(aPref, "browser.display.screen_resolution")==0 ) { PRInt32 dpi; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); rv = prefs->GetIntPref(aPref, &dpi); if( NS_SUCCEEDED( rv ) ) context->SetDPI( dpi ); } diff --git a/gfx/src/photon/nsDeviceContextSpecFactoryP.cpp b/gfx/src/photon/nsDeviceContextSpecFactoryP.cpp index 3ad3ccaf6377..40e6a59a773f 100644 --- a/gfx/src/photon/nsDeviceContextSpecFactoryP.cpp +++ b/gfx/src/photon/nsDeviceContextSpecFactoryP.cpp @@ -63,7 +63,8 @@ NS_IMETHODIMP nsDeviceContextSpecFactoryPh :: CreateDeviceContextSpec(nsIWidget NS_ENSURE_ARG_POINTER(aWidget); nsresult rv = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); nsIDeviceContextSpec *devSpec = nsnull; diff --git a/gfx/src/photon/nsDeviceContextSpecPh.cpp b/gfx/src/photon/nsDeviceContextSpecPh.cpp index f729e60c95a9..6596aa0aa716 100644 --- a/gfx/src/photon/nsDeviceContextSpecPh.cpp +++ b/gfx/src/photon/nsDeviceContextSpecPh.cpp @@ -57,7 +57,8 @@ NS_IMETHODIMP nsDeviceContextSpecPh :: Init(PRBool aQuiet) if( aQuiet ) { // no dialogs - NS_WITH_SERVICE( nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); PRInt32 value; printService->GetEndPageRange( &value ); /* use SetEndPageRange/GetEndPageRange to convey the print context */ mPC = ( PpPrintContext_t * ) value; diff --git a/gfx/src/qt/nsDeviceContextQT.cpp b/gfx/src/qt/nsDeviceContextQT.cpp index 2a07f18027a2..232a7d6fa21b 100644 --- a/gfx/src/qt/nsDeviceContextQT.cpp +++ b/gfx/src/qt/nsDeviceContextQT.cpp @@ -127,7 +127,7 @@ NS_IMETHODIMP nsDeviceContextQT::Init(nsNativeWidget aNativeWidget) PRInt32 prefVal = -1; nsresult res; - NS_WITH_SERVICE(nsIPref,prefs,kPrefCID,&res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (NS_SUCCEEDED(res) && prefs) { res = prefs->GetIntPref("browser.display.screen_resolution",&prefVal); if (! NS_SUCCEEDED(res)) { @@ -500,7 +500,7 @@ int nsDeviceContextQT::prefChanged(const char *aPref,void *aClosure) if (nsCRT::strcmp(aPref,"browser.display.screen_resolution") == 0) { PRInt32 dpi; - NS_WITH_SERVICE(nsIPref,prefs,kPrefCID,&rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); rv = prefs->GetIntPref(aPref, &dpi); if (NS_SUCCEEDED(rv)) context->SetDPI(dpi); diff --git a/gfx/src/qt/nsDeviceContextSpecQT.cpp b/gfx/src/qt/nsDeviceContextSpecQT.cpp index e3861f944f9a..32fd7452f93e 100644 --- a/gfx/src/qt/nsDeviceContextSpecQT.cpp +++ b/gfx/src/qt/nsDeviceContextSpecQT.cpp @@ -122,7 +122,7 @@ NS_IMETHODIMP nsDeviceContextSpecQT::QueryInterface(REFNSIID aIID, NS_IMETHODIMP nsDeviceContextSpecQT::Init(PRBool aQuiet) { nsresult rv = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPrintOptions,printService,kPrintOptionsCID,&rv); + nsCOMPtr printService(do_GetService(kPrintOptionsCID, &rv)); // if there is a current selection then enable the "Selection" radio button if (NS_SUCCEEDED(rv) && printService) { diff --git a/gfx/src/windows/nsDeviceContextSpecFactoryW.cpp b/gfx/src/windows/nsDeviceContextSpecFactoryW.cpp index 3b6a51711e85..801efba08719 100644 --- a/gfx/src/windows/nsDeviceContextSpecFactoryW.cpp +++ b/gfx/src/windows/nsDeviceContextSpecFactoryW.cpp @@ -445,7 +445,8 @@ NS_IMETHODIMP nsDeviceContextSpecFactoryWin :: CreateDeviceContextSpec(nsIWidget NS_ENSURE_ARG_POINTER(aWidget); nsresult rv = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); gDialogWasExtended = PR_FALSE; diff --git a/gfx/src/windows/nsDeviceContextWin.cpp b/gfx/src/windows/nsDeviceContextWin.cpp index 6d39796ea6a6..5981abdb7011 100644 --- a/gfx/src/windows/nsDeviceContextWin.cpp +++ b/gfx/src/windows/nsDeviceContextWin.cpp @@ -64,7 +64,7 @@ nsDeviceContextWin :: nsDeviceContextWin() mCachedFullRect = PR_FALSE; nsresult res = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (NS_SUCCEEDED(res)) { static PRBool roundingInitialized = PR_FALSE; if (!roundingInitialized) { @@ -94,7 +94,7 @@ nsDeviceContextWin :: ~nsDeviceContextWin() NS_IF_RELEASE(mSpec); nsresult res = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (NS_SUCCEEDED(res)) { prefs->UnregisterCallback(nav4rounding, PrefChanged, this); } @@ -901,7 +901,7 @@ int nsDeviceContextWin :: PrefChanged(const char* aPref, void* aClosure) { nsresult res = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (NS_SUCCEEDED(res)) { prefs->GetBoolPref(nav4rounding, &gRound); nsDeviceContextWin* deviceContext = (nsDeviceContextWin*) aClosure; diff --git a/gfx/src/xlib/nsDeviceContextXlib.cpp b/gfx/src/xlib/nsDeviceContextXlib.cpp index e21545a4b1f7..45e7b7084d8a 100644 --- a/gfx/src/xlib/nsDeviceContextXlib.cpp +++ b/gfx/src/xlib/nsDeviceContextXlib.cpp @@ -142,7 +142,7 @@ nsDeviceContextXlib::CommonInit(void) if (!initialized) { initialized = 1; nsresult res; - NS_WITH_SERVICE(nsIPref,prefs,kPrefCID,&res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (NS_SUCCEEDED(res) && prefs) { PRInt32 intVal = 96; res = prefs->GetIntPref("browser.display.screen_resolution", &intVal); diff --git a/htmlparser/robot/nsDebugRobot.cpp b/htmlparser/robot/nsDebugRobot.cpp index 72cf1e343cd1..573cbdf06224 100644 --- a/htmlparser/robot/nsDebugRobot.cpp +++ b/htmlparser/robot/nsDebugRobot.cpp @@ -242,7 +242,7 @@ extern "C" NS_EXPORT int DebugRobot( // Create url nsIURI* url; nsresult rv; - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv); + nsCOMPtr service(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsIURI *uri = nsnull; diff --git a/htmlparser/robot/nsRobotSink.cpp b/htmlparser/robot/nsRobotSink.cpp index 8d086e3046f0..8164ffd53301 100644 --- a/htmlparser/robot/nsRobotSink.cpp +++ b/htmlparser/robot/nsRobotSink.cpp @@ -347,7 +347,7 @@ void RobotSink::ProcessLink(const nsString& aLink) if (nsnull != docURL) { nsIURI* absurl; nsresult rv; - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv); + nsCOMPtr service(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return; nsIURI *uri = nsnull, *baseUri = nsnull; diff --git a/htmlparser/src/CNavDTD.cpp b/htmlparser/src/CNavDTD.cpp index e9d1fecef29b..2a2bd7cc64e7 100644 --- a/htmlparser/src/CNavDTD.cpp +++ b/htmlparser/src/CNavDTD.cpp @@ -1565,7 +1565,8 @@ nsresult CNavDTD::HandleKeyGen(nsIParserNode* aNode) { if(aNode) { - NS_WITH_SERVICE(nsIFormProcessor, theFormProcessor, kFormProcessorCID, &result) + nsCOMPtr theFormProcessor = + do_GetService(kFormProcessorCID, &result); if(NS_SUCCEEDED(result)) { PRInt32 theAttrCount=aNode->GetAttributeCount(); diff --git a/htmlparser/src/nsHTMLContentSinkStream.cpp b/htmlparser/src/nsHTMLContentSinkStream.cpp index 88cf9752b7f9..6ea19d913cce 100644 --- a/htmlparser/src/nsHTMLContentSinkStream.cpp +++ b/htmlparser/src/nsHTMLContentSinkStream.cpp @@ -222,7 +222,7 @@ nsHTMLContentSinkStream::InitEncoders() if (mStream) { nsAutoString charsetName; charsetName.Assign(mCharsetOverride); - NS_WITH_SERVICE(nsICharsetAlias, calias, kCharsetAliasCID, &res); + nsCOMPtr calias(do_GetService(kCharsetAliasCID, &res)); if (NS_SUCCEEDED(res) && calias) { nsAutoString temp; temp.Assign(mCharsetOverride); res = calias->GetPreferred(temp, charsetName); diff --git a/htmlparser/src/nsParser.cpp b/htmlparser/src/nsParser.cpp index dac563cc84db..ebf279b61e8d 100644 --- a/htmlparser/src/nsParser.cpp +++ b/htmlparser/src/nsParser.cpp @@ -357,7 +357,8 @@ nsParser::nsParser(nsITokenObserver* anObserver) { nsresult rv = NS_OK; if (mEventQueue == nsnull) { // Cache the event queue of the current UI thread - NS_WITH_SERVICE(nsIEventQueueService, eventService, kEventQueueServiceCID, &rv); + nsCOMPtr eventService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv) && (eventService)) { // XXX this implies that the UI is the current thread. rv = eventService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(mEventQueue)); } diff --git a/htmlparser/src/nsScanner.cpp b/htmlparser/src/nsScanner.cpp index 1d21666be98a..e573a1463b58 100644 --- a/htmlparser/src/nsScanner.cpp +++ b/htmlparser/src/nsScanner.cpp @@ -153,7 +153,7 @@ nsresult nsScanner::SetDocumentCharset(const nsString& aCharset , nsCharsetSourc if( aSource < mCharsetSource) // priority is lower the the current one , just return res; - NS_WITH_SERVICE(nsICharsetAlias, calias, kCharsetAliasCID, &res); + nsCOMPtr calias(do_GetService(kCharsetAliasCID, &res)); NS_ASSERTION( nsnull != calias, "cannot find charset alias"); nsAutoString charsetName; charsetName.Assign(aCharset); if( NS_SUCCEEDED(res) && (nsnull != calias)) @@ -175,7 +175,8 @@ nsresult nsScanner::SetDocumentCharset(const nsString& aCharset , nsCharsetSourc mCharset = charsetName; mCharsetSource = aSource; - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &res); if(NS_SUCCEEDED(res) && (nsnull != ccm)) { nsIUnicodeDecoder * decoder = nsnull; diff --git a/htmlparser/tests/grabpage/grabpage.cpp b/htmlparser/tests/grabpage/grabpage.cpp index 07a224ece413..2f6e23d09a8b 100644 --- a/htmlparser/tests/grabpage/grabpage.cpp +++ b/htmlparser/tests/grabpage/grabpage.cpp @@ -224,7 +224,7 @@ PageGrabber::Grab(const nsString& aURL) nsIURI* url = NULL; nsresult rv; - rv = NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + rv = nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsIChannel *channel = nsnull; diff --git a/intl/chardet/src/nsMetaCharsetObserver.cpp b/intl/chardet/src/nsMetaCharsetObserver.cpp index 710e6f9866b1..06819322ee18 100644 --- a/intl/chardet/src/nsMetaCharsetObserver.cpp +++ b/intl/chardet/src/nsMetaCharsetObserver.cpp @@ -45,7 +45,7 @@ nsMetaCharsetObserver::nsMetaCharsetObserver() bMetaCharsetObserverStarted = PR_FALSE; nsresult res; mAlias = nsnull; - NS_WITH_SERVICE(nsICharsetAlias, calias, kCharsetAliasCID, &res); + nsCOMPtr calias(do_GetService(kCharsetAliasCID, &res)); if(NS_SUCCEEDED(res)) { mAlias = calias; } @@ -341,7 +341,8 @@ NS_IMETHODIMP nsMetaCharsetObserver::Start() bMetaCharsetObserverStarted = PR_TRUE; // get the observer service - NS_WITH_SERVICE(nsIObserverService, anObserverService, NS_OBSERVERSERVICE_CONTRACTID, &res); + nsCOMPtr anObserverService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &res); if (NS_FAILED(res)) return res; nsAutoString htmlTopic; htmlTopic.AssignWithConversion(kHTMLTextContentType); @@ -359,7 +360,8 @@ NS_IMETHODIMP nsMetaCharsetObserver::End() if (bMetaCharsetObserverStarted == PR_TRUE) { bMetaCharsetObserverStarted = PR_FALSE; - NS_WITH_SERVICE(nsIObserverService, anObserverService, NS_OBSERVERSERVICE_CONTRACTID, &res); + nsCOMPtr anObserverService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &res); if (NS_FAILED(res)) return res; nsAutoString htmlTopic; htmlTopic.AssignWithConversion(kHTMLTextContentType); diff --git a/intl/locale/src/mac/nsCollationMac.cpp b/intl/locale/src/mac/nsCollationMac.cpp index 78dae2084252..06230aaa5d36 100644 --- a/intl/locale/src/mac/nsCollationMac.cpp +++ b/intl/locale/src/mac/nsCollationMac.cpp @@ -149,7 +149,8 @@ nsresult nsCollationMac::Initialize(nsILocale* locale) // get locale string, use app default if no locale specified if (locale == nsnull) { - NS_WITH_SERVICE(nsILocaleService, localeService, kLocaleServiceCID, &res); + nsCOMPtr localeService = + do_GetService(kLocaleServiceCID, &res); if (NS_SUCCEEDED(res)) { nsILocale *appLocale; res = localeService->GetApplicationLocale(&appLocale); diff --git a/intl/locale/src/mac/nsDateTimeFormatMac.cpp b/intl/locale/src/mac/nsDateTimeFormatMac.cpp index ec2ed1e70b86..3711073ac8e1 100644 --- a/intl/locale/src/mac/nsDateTimeFormatMac.cpp +++ b/intl/locale/src/mac/nsDateTimeFormatMac.cpp @@ -253,7 +253,8 @@ nsresult nsDateTimeFormatMac::Initialize(nsILocale* locale) // get application locale - NS_WITH_SERVICE(nsILocaleService, localeService, kLocaleServiceCID, &res); + nsCOMPtr localeService = + do_GetService(kLocaleServiceCID, &res); if (NS_SUCCEEDED(res)) { nsILocale *appLocale; res = localeService->GetApplicationLocale(&appLocale); diff --git a/intl/locale/src/nsScriptableDateFormat.cpp b/intl/locale/src/nsScriptableDateFormat.cpp index b1d7ecdc70af..7926df2a979f 100644 --- a/intl/locale/src/nsScriptableDateFormat.cpp +++ b/intl/locale/src/nsScriptableDateFormat.cpp @@ -94,7 +94,8 @@ NS_IMETHODIMP nsScriptableDateFormat::FormatDateTime( // get locale service - NS_WITH_SERVICE(nsILocaleService, localeService, kLocaleServiceCID, &rv); + nsCOMPtr localeService = + do_GetService(kLocaleServiceCID, &rv); if (NS_SUCCEEDED(rv)) { rv = localeName.Length() ? localeService->NewLocale(localeName.get(), &aLocale) : localeService->GetApplicationLocale(&aLocale); diff --git a/intl/locale/src/os2/nsCollationOS2.cpp b/intl/locale/src/os2/nsCollationOS2.cpp index f14543ff0282..2af5283b5975 100644 --- a/intl/locale/src/os2/nsCollationOS2.cpp +++ b/intl/locale/src/os2/nsCollationOS2.cpp @@ -93,7 +93,8 @@ nsresult nsCollationOS2::Initialize(nsILocale *locale) // get locale string, use app default if no locale specified if (locale == nsnull) { - NS_WITH_SERVICE(nsILocaleService, localeService, kLocaleServiceCID, &res); + nsCOMPtr localeService = + do_GetService(kLocaleServiceCID, &res); if (NS_SUCCEEDED(res)) { nsILocale *appLocale; res = localeService->GetApplicationLocale(&appLocale); diff --git a/intl/locale/src/unix/nsCollationUnix.cpp b/intl/locale/src/unix/nsCollationUnix.cpp index e958339c70ed..99b6ce7b7bfe 100644 --- a/intl/locale/src/unix/nsCollationUnix.cpp +++ b/intl/locale/src/unix/nsCollationUnix.cpp @@ -109,7 +109,8 @@ nsresult nsCollationUnix::Initialize(nsILocale* locale) // get locale string, use app default if no locale specified if (locale == nsnull) { - NS_WITH_SERVICE(nsILocaleService, localeService, kLocaleServiceCID, &res); + nsCOMPtr localeService = + do_GetService(kLocaleServiceCID, &res); if (NS_SUCCEEDED(res)) { nsILocale *appLocale; res = localeService->GetApplicationLocale(&appLocale); diff --git a/intl/locale/src/unix/nsDateTimeFormatUnix.cpp b/intl/locale/src/unix/nsDateTimeFormatUnix.cpp index e465862b789f..8cfcd9787bd3 100644 --- a/intl/locale/src/unix/nsDateTimeFormatUnix.cpp +++ b/intl/locale/src/unix/nsDateTimeFormatUnix.cpp @@ -71,7 +71,8 @@ nsresult nsDateTimeFormatUnix::Initialize(nsILocale* locale) // get locale name string, use app default if no locale specified if (NULL == locale) { - NS_WITH_SERVICE(nsILocaleService, localeService, kLocaleServiceCID, &res); + nsCOMPtr localeService = + do_GetService(kLocaleServiceCID, &res); if (NS_SUCCEEDED(res)) { nsILocale *appLocale; res = localeService->GetApplicationLocale(&appLocale); diff --git a/intl/locale/src/windows/nsCollationWin.cpp b/intl/locale/src/windows/nsCollationWin.cpp index e2a48e832d7b..68884c62452d 100644 --- a/intl/locale/src/windows/nsCollationWin.cpp +++ b/intl/locale/src/windows/nsCollationWin.cpp @@ -89,7 +89,8 @@ nsresult nsCollationWin::Initialize(nsILocale* locale) // get locale string, use app default if no locale specified if (locale == nsnull) { - NS_WITH_SERVICE(nsILocaleService, localeService, kLocaleServiceCID, &res); + nsCOMPtr localeService = + do_GetService(kLocaleServiceCID, &res); if (NS_SUCCEEDED(res)) { nsILocale *appLocale; res = localeService->GetApplicationLocale(&appLocale); diff --git a/intl/locale/src/windows/nsDateTimeFormatWin.cpp b/intl/locale/src/windows/nsDateTimeFormatWin.cpp index 2c193f875f05..4c2e235b1c56 100644 --- a/intl/locale/src/windows/nsDateTimeFormatWin.cpp +++ b/intl/locale/src/windows/nsDateTimeFormatWin.cpp @@ -83,7 +83,8 @@ nsresult nsDateTimeFormatWin::Initialize(nsILocale* locale) // get locale string, use app default if no locale specified if (NULL == locale) { - NS_WITH_SERVICE(nsILocaleService, localeService, kLocaleServiceCID, &res); + nsCOMPtr localeService = + do_GetService(kLocaleServiceCID, &res); if (NS_SUCCEEDED(res)) { nsILocale *appLocale; res = localeService->GetApplicationLocale(&appLocale); diff --git a/intl/strres/src/nsAcceptLang.cpp b/intl/strres/src/nsAcceptLang.cpp index 86172923dd17..e2beb843be32 100644 --- a/intl/strres/src/nsAcceptLang.cpp +++ b/intl/strres/src/nsAcceptLang.cpp @@ -79,7 +79,8 @@ nsAcceptLang::GetAcceptLangFromLocale(const PRUnichar *aLocale, PRUnichar **_ret nsresult res; - NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res); + nsCOMPtr sBundleService = + do_GetService(kStringBundleServiceCID, &res); if (NS_FAILED(res) || (nsnull == sBundleService)) { return NS_ERROR_FAILURE; } @@ -173,7 +174,8 @@ nsAcceptLang::GetLocaleFromAcceptLang(const PRUnichar *aName, PRUnichar **_retva } /* lang only */ - NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res); + nsCOMPtr sBundleService = + do_GetService(kStringBundleServiceCID, &res); if (NS_FAILED(res) || (nsnull == sBundleService)) { #ifdef DEBUG printf("\n** nsAcceptLang::GetLocaleFromAcceptLang: failed to get nsIStringBundleService!! **\n"); diff --git a/intl/uconv/public/nsICharsetConverterManager.h b/intl/uconv/public/nsICharsetConverterManager.h index a64e6aedc43e..7b1b835ee6d9 100644 --- a/intl/uconv/public/nsICharsetConverterManager.h +++ b/intl/uconv/public/nsICharsetConverterManager.h @@ -72,7 +72,8 @@ nsUConverterRegSelf( const char* aFromCharset, \ nsRegistryKey key; \ char buff[1024]; \ PRBool isOpen = PR_FALSE; \ - NS_WITH_SERVICE( nsIRegistry, registry, NS_REGISTRY_CONTRACTID, &res); \ + nsCOMPtr registry = \ + do_GetService(NS_REGISTRY_CONTRACTID, &res); \ if (NS_FAILED(res)) \ goto done; \ res = registry->IsOpen(&isOpen); \ diff --git a/intl/uconv/src/nsCharsetConverterManager.cpp b/intl/uconv/src/nsCharsetConverterManager.cpp index 0f1728a662a5..a748c7093a06 100644 --- a/intl/uconv/src/nsCharsetConverterManager.cpp +++ b/intl/uconv/src/nsCharsetConverterManager.cpp @@ -188,7 +188,7 @@ nsresult nsCharsetConverterManager::RegisterConverterManagerData() { nsresult res = NS_OK; - NS_WITH_SERVICE(nsIRegistry, registry, kRegistryCID, &res); + nsCOMPtr registry(do_GetService(kRegistryCID, &res)); if (NS_FAILED(res)) return res; // open registry if necessary @@ -251,7 +251,8 @@ nsresult nsCharsetConverterManager::LoadExtensibleBundle( { nsresult res = NS_OK; - NS_WITH_SERVICE(nsIStringBundleService, sbServ, kStringBundleServiceCID, &res); + nsCOMPtr sbServ = + do_GetService(kStringBundleServiceCID, &res); if (NS_FAILED(res)) return res; res = sbServ->CreateExtensibleBundle(aRegistryKey, aResult); @@ -309,7 +310,7 @@ nsresult nsCharsetConverterManager::GetRegistryEnumeration( if (NS_FAILED(res)) return res; // get the registry - NS_WITH_SERVICE(nsIRegistry, registry, kRegistryCID, &res); + nsCOMPtr registry(do_GetService(kRegistryCID, &res)); if (NS_FAILED(res)) return res; // open registry if necessary @@ -381,7 +382,7 @@ nsresult nsCharsetConverterManager::GetRegistryEnumeration2( if (NS_FAILED(res)) return res; // get the registry - NS_WITH_SERVICE(nsIRegistry, registry, kRegistryCID, &res); + nsCOMPtr registry(do_GetService(kRegistryCID, &res)); if (NS_FAILED(res)) return res; // open registry if necessary @@ -624,7 +625,7 @@ NS_IMETHODIMP nsCharsetConverterManager::GetCharsetAtom( // We try to obtain the preferred name for this charset from the charset // aliases. If we don't get it from there, we just use the original string nsAutoString charset(aCharset); - NS_WITH_SERVICE(nsICharsetAlias, csAlias, kCharsetAliasCID, &res); + nsCOMPtr csAlias(do_GetService(kCharsetAliasCID, &res)); NS_ASSERTION(NS_SUCCEEDED(res), "failed to get the CharsetAlias service"); if (NS_SUCCEEDED(res)) { nsAutoString pref; diff --git a/intl/uconv/src/nsCharsetMenu.cpp b/intl/uconv/src/nsCharsetMenu.cpp index 90d20e99f579..caf678b35d5a 100644 --- a/intl/uconv/src/nsCharsetMenu.cpp +++ b/intl/uconv/src/nsCharsetMenu.cpp @@ -1530,7 +1530,8 @@ nsresult nsCharsetMenu::GetCollation(nsICollation ** aCollation) nsCOMPtr locale = nsnull; nsICollationFactory * collationFactory = nsnull; - NS_WITH_SERVICE(nsILocaleService, localeServ, kLocaleServiceCID, &res); + nsCOMPtr localeServ = + do_GetService(kLocaleServiceCID, &res); if (NS_FAILED(res)) return res; res = localeServ->GetApplicationLocale(getter_AddRefs(locale)); diff --git a/intl/uconv/src/nsTextToSubURI.cpp b/intl/uconv/src/nsTextToSubURI.cpp index 7479b1908dc2..da6b9257c8dc 100644 --- a/intl/uconv/src/nsTextToSubURI.cpp +++ b/intl/uconv/src/nsTextToSubURI.cpp @@ -118,7 +118,8 @@ NS_IMETHODIMP nsTextToSubURI::UnEscapeAndConvert( NS_ASSERTION(unescaped, "nsUnescape returned null"); // Convert from the charset to unicode - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { nsAutoString charsetStr; charsetStr.AssignWithConversion(charset); nsIUnicodeDecoder *decoder; diff --git a/intl/uconv/tests/TestUConv.cpp b/intl/uconv/tests/TestUConv.cpp index fba3628b3cce..a38063c1dfc7 100644 --- a/intl/uconv/tests/TestUConv.cpp +++ b/intl/uconv/tests/TestUConv.cpp @@ -222,7 +222,8 @@ nsresult nsTestUConv::TestCharsetManager() const PRUnichar * name; nsCOMPtr csAtom; - NS_WITH_SERVICE(nsICharsetConverterManager2, ccMan, kCharsetConverterManagerCID, &res); + nsCOMPtr ccMan = + do_GetService(kCharsetConverterManagerCID, &res); if (NS_FAILED(res)) { mLog.PrintError("NS_WITH_SERVICE", res); return res; @@ -273,7 +274,8 @@ nsresult nsTestUConv::DisplayDetectors() mLog.AddTrace(trace); nsresult res = NS_OK; - NS_WITH_SERVICE(nsICharsetConverterManager2, ccMan, kCharsetConverterManagerCID, &res); + nsCOMPtr ccMan = + do_GetService(kCharsetConverterManagerCID, &res); if (NS_FAILED(res)) { mLog.PrintError("NS_WITH_SERVICE", res); return res; @@ -338,7 +340,8 @@ nsresult nsTestUConv::DisplayCharsets() mLog.AddTrace(trace); nsresult res = NS_OK; - NS_WITH_SERVICE(nsICharsetConverterManager2, ccMan, kCharsetConverterManagerCID, &res); + nsCOMPtr ccMan = + do_GetService(kCharsetConverterManagerCID, &res); if (NS_FAILED(res)) { mLog.PrintError("NS_WITH_SERVICE", res); return res; @@ -469,7 +472,8 @@ nsresult nsTestUConv::Encode(PRUnichar ** aSrc, PRUnichar * aSrcEnd, mLog.AddTrace(trace); nsresult res = NS_OK; - NS_WITH_SERVICE(nsICharsetConverterManager, ccMan, kCharsetConverterManagerCID, &res); + nsCOMPtr ccMan = + do_GetService(kCharsetConverterManagerCID, &res); if (NS_FAILED(res)) { mLog.PrintError("NS_WITH_SERVICE", res); return res; diff --git a/intl/uconv/ucvja/nsJapaneseToUnicode.cpp b/intl/uconv/ucvja/nsJapaneseToUnicode.cpp index b2eda3f8415e..5e3d0a2062ec 100644 --- a/intl/uconv/ucvja/nsJapaneseToUnicode.cpp +++ b/intl/uconv/ucvja/nsJapaneseToUnicode.cpp @@ -738,8 +738,8 @@ NS_IMETHODIMP nsISO2022JPToUnicodeV2::Convert( // creating a delegate converter (GB2312) nsresult rv; nsString tmpCharset; - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, - kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (!NS_FAILED(rv)) { tmpCharset.AssignWithConversion("GB2312"); rv = ccm->GetUnicodeDecoder(&tmpCharset, &mGB2312Decoder); @@ -792,8 +792,8 @@ NS_IMETHODIMP nsISO2022JPToUnicodeV2::Convert( // creating a delegate converter (EUC-KR) nsresult rv; nsString tmpCharset; - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, - kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (!NS_FAILED(rv)) { tmpCharset.AssignWithConversion("EUC-KR"); rv = ccm->GetUnicodeDecoder(&tmpCharset, &mEUCKRDecoder); @@ -865,8 +865,8 @@ NS_IMETHODIMP nsISO2022JPToUnicodeV2::Convert( // creating a delegate converter (ISO-8859-7) nsresult rv; nsString tmpCharset; - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, - kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (!NS_FAILED(rv)) { tmpCharset.AssignWithConversion("ISO-8859-7"); rv = ccm->GetUnicodeDecoder(&tmpCharset, &mISO88597Decoder); diff --git a/intl/unicharutil/src/nsSaveAsCharset.cpp b/intl/unicharutil/src/nsSaveAsCharset.cpp index 8789aea4717c..415b6944f261 100644 --- a/intl/unicharutil/src/nsSaveAsCharset.cpp +++ b/intl/unicharutil/src/nsSaveAsCharset.cpp @@ -75,7 +75,8 @@ nsSaveAsCharset::Init(const char *charset, PRUint32 attr, PRUint32 entityVersion mEntityVersion = entityVersion; // set up unicode encoder - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_FAILED(rv)) return rv; rv = ccm->GetUnicodeEncoder(&aCharset, &mEncoder); diff --git a/js/src/xpconnect/sample/xpcsample1.cpp b/js/src/xpconnect/sample/xpcsample1.cpp index 22957df1d984..9df88ed91fd1 100644 --- a/js/src/xpconnect/sample/xpcsample1.cpp +++ b/js/src/xpconnect/sample/xpcsample1.cpp @@ -238,7 +238,7 @@ nsXPCSample_HookerUpper::CreateSampleObjectAtGlobalScope(const char *name, PRInt // get the xpconnect service nsresult rv; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_FAILED(rv)) return NS_ERROR_FAILURE; diff --git a/js/src/xpconnect/src/nsXPConnect.cpp b/js/src/xpconnect/src/nsXPConnect.cpp index 22c8afe92602..348bf9c3629d 100644 --- a/js/src/xpconnect/src/nsXPConnect.cpp +++ b/js/src/xpconnect/src/nsXPConnect.cpp @@ -312,7 +312,8 @@ nsXPConnect::CreateRuntime() { NS_ASSERTION(!mRuntime,"CreateRuntime called but mRuntime already init'd"); nsresult rv; - NS_WITH_SERVICE(nsIJSRuntimeService, rtsvc, XPC_RUNTIME_CONTRACTID, &rv); + nsCOMPtr rtsvc = + do_GetService(XPC_RUNTIME_CONTRACTID, &rv); if(NS_SUCCEEDED(rv) && rtsvc) { mRuntime = XPCJSRuntime::newXPCJSRuntime(this, rtsvc); @@ -1058,7 +1059,8 @@ nsXPConnect::DebugDumpJSStack(PRBool showArgs, #ifdef DEBUG JSContext* cx; nsresult rv; - NS_WITH_SERVICE(nsIThreadJSContextStack, stack, XPC_CONTEXT_STACK_CONTRACTID, &rv); + nsCOMPtr stack = + do_GetService(XPC_CONTEXT_STACK_CONTRACTID, &rv); if(NS_FAILED(rv) || !stack) printf("failed to get nsIThreadJSContextStack service!\n"); else if(NS_FAILED(stack->Peek(&cx))) @@ -1078,7 +1080,8 @@ nsXPConnect::DebugDumpEvalInJSStackFrame(PRUint32 aFrameNumber, const char *aSou #ifdef DEBUG JSContext* cx; nsresult rv; - NS_WITH_SERVICE(nsIThreadJSContextStack, stack, XPC_CONTEXT_STACK_CONTRACTID, &rv); + nsCOMPtr stack = + do_GetService(XPC_CONTEXT_STACK_CONTRACTID, &rv); if(NS_FAILED(rv) || !stack) printf("failed to get nsIThreadJSContextStack service!\n"); else if(NS_FAILED(stack->Peek(&cx))) @@ -1097,7 +1100,7 @@ JS_BEGIN_EXTERN_C void DumpJSStack() { nsresult rv; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_SUCCEEDED(rv) && xpc) xpc->DebugDumpJSStack(PR_TRUE, PR_TRUE, PR_FALSE); else @@ -1107,7 +1110,7 @@ void DumpJSStack() void DumpJSEval(PRUint32 frameno, const char* text) { nsresult rv; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_SUCCEEDED(rv) && xpc) xpc->DebugDumpEvalInJSStackFrame(frameno, text); else diff --git a/js/src/xpconnect/tests/TestXPC.cpp b/js/src/xpconnect/tests/TestXPC.cpp index 1498cc89075d..0b92f62a36ba 100644 --- a/js/src/xpconnect/tests/TestXPC.cpp +++ b/js/src/xpconnect/tests/TestXPC.cpp @@ -509,7 +509,8 @@ TestThreadJSContextStack(JSContext* jscontext) printf("ThreadJSContextStack tests...\n"); nsresult rv; - NS_WITH_SERVICE(nsIJSContextStack, stack, "@mozilla.org/js/xpc/ContextStack;1", &rv); + nsCOMPtr stack = + do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv); if(NS_SUCCEEDED(rv)) { @@ -564,7 +565,7 @@ TestThreadJSContextStack(JSContext* jscontext) static void ShowXPCException() { nsresult rv; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_SUCCEEDED(rv) && xpc) { nsCOMPtr e; @@ -619,7 +620,8 @@ static void TestCategoryManmager() printf("\n"); nsresult rv; - NS_WITH_SERVICE(nsICategoryManager, catman, "@mozilla.org/categorymanager;1", &rv); + nsCOMPtr catman = + do_GetService("@mozilla.org/categorymanager;1", &rv); if(NS_SUCCEEDED(rv) && catman) { printf("got category manager\n"); @@ -678,7 +680,8 @@ int main() SetupRegistry(); // get the JSRuntime from the runtime svc, if possible - NS_WITH_SERVICE(nsIJSRuntimeService, rtsvc, "@mozilla.org/js/xpc/RuntimeService;1", &rv); + nsCOMPtr rtsvc = + do_GetService("@mozilla.org/js/xpc/RuntimeService;1", &rv); if(NS_FAILED(rv) || NS_FAILED(rtsvc->GetRuntime(&rt)) || !rt) DIE("FAILED to get a JSRuntime"); @@ -688,11 +691,12 @@ int main() JS_SetErrorReporter(jscontext, my_ErrorReporter); - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(!xpc) DIE("FAILED to get xpconnect service\n"); - NS_WITH_SERVICE(nsIJSContextStack, cxstack, "@mozilla.org/js/xpc/ContextStack;1", &rv); + nsCOMPtr cxstack = + do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv); if(NS_FAILED(rv)) DIE("FAILED to get the nsThreadJSContextStack service!\n"); diff --git a/js/src/xpconnect/tests/components/xpctest_echo.cpp b/js/src/xpconnect/tests/components/xpctest_echo.cpp index 097cc2b73ab7..4b4d544f2805 100644 --- a/js/src/xpconnect/tests/components/xpctest_echo.cpp +++ b/js/src/xpconnect/tests/components/xpctest_echo.cpp @@ -273,7 +273,7 @@ xpctestEcho::GetStack(nsIStackFrame **_retval) return NS_ERROR_NULL_POINTER; nsresult rv; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_SUCCEEDED(rv)) { nsIStackFrame* jsstack; @@ -337,7 +337,7 @@ NS_IMETHODIMP xpctestEcho::DebugDumpJSStack() { nsresult rv; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_SUCCEEDED(rv)) { rv = xpc->DebugDumpJSStack(JS_TRUE, JS_TRUE, JS_TRUE); @@ -378,7 +378,7 @@ xpctestEcho::SetAString(const char * aAString) #define GET_CALL_CONTEXT \ nsresult rv; \ nsCOMPtr cc; \ - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); \ + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); \ if(NS_SUCCEEDED(rv)) \ rv = xpc->GetCurrentNativeCallContext(getter_AddRefs(cc)) /* no ';' */ diff --git a/js/src/xpconnect/tools/src/nsXPCToolsCompiler.cpp b/js/src/xpconnect/tools/src/nsXPCToolsCompiler.cpp index 33d7502f42e7..98e283af7744 100644 --- a/js/src/xpconnect/tools/src/nsXPCToolsCompiler.cpp +++ b/js/src/xpconnect/tools/src/nsXPCToolsCompiler.cpp @@ -83,7 +83,7 @@ NS_IMETHODIMP nsXPCToolsCompiler::CompileFile(nsILocalFile *aFile, PRBool strict // get the xpconnect service nsresult rv; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_FAILED(rv)) return NS_ERROR_FAILURE; diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index 40deca6f6260..c35db34b499f 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -3417,7 +3417,8 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsIPresShell* aPresShell, if (!display->mBinding.IsEmpty()) { // Get the XBL loader. nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if (!xblService) return rv; @@ -7226,7 +7227,8 @@ nsCSSFrameConstructor::ConstructFrameInternal( nsIPresShell* aPresShe if (!display->mBinding.IsEmpty()) { // Get the XBL loader. nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if (!xblService) return rv; diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp index 06cbb966a8d4..693f4d9a715a 100644 --- a/layout/base/nsDocumentViewer.cpp +++ b/layout/base/nsDocumentViewer.cpp @@ -2164,7 +2164,8 @@ DocumentViewerImpl::PrintPage(nsIPresContext* aPresContext, PRINT_DEBUG_MSG3("------ In DV::PrintPage PO: %p (%s)\n", aPO, gFrameTypesStr[aPO->mFrameType]); nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv) && printService) { PRBool isCancelled; printService->GetIsCancelled(&isCancelled); @@ -2445,7 +2446,8 @@ void DocumentViewerImpl::CalcPageFrameLocation(nsIPresShell * aPresShell, // The PageFrame or Seq frame has the margins set // these need to be removed nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv) && printService) { nsMargin margin(0,0,0,0); printService->GetMarginInTwips(margin); @@ -2791,7 +2793,8 @@ DocumentViewerImpl::ReflowPrintObject(PrintObject * aPO) // put it keeps it from page breaking in the middle of your print of the selection // (see also nsSimplePageSequence.cpp) PRInt16 printRangeType = nsIPrintOptions::kRangeAllPages; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv)) { printService->GetPrintRange(&printRangeType); } @@ -3011,7 +3014,8 @@ DocumentViewerImpl::EnablePOsForPrinting() mPrt->mSelectedPO = nsnull; nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_FAILED(rv)) { return rv; } @@ -3325,7 +3329,8 @@ DocumentViewerImpl::DoPrint(PrintObject * aPO, PRBool aDoSyncPrinting, PRBool& a PRInt16 printRangeType = nsIPrintOptions::kRangeAllPages; nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv) && printService) { printService->GetPrintRange(&printRangeType); } @@ -3692,7 +3697,8 @@ void DocumentViewerImpl::Notify(nsIImageGroup *aImageGroup, nsCOMPtr eventQ; // Get the event queue of the current thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueService, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueService, &rv); if (NS_FAILED(rv)) return; rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, @@ -3791,7 +3797,8 @@ DocumentViewerImpl::CreateStyleSet(nsIDocument* aDocument, } } - NS_WITH_SERVICE(nsIChromeRegistry, chromeRegistry, "@mozilla.org/chrome/chrome-registry;1", &rv); + nsCOMPtr chromeRegistry = + do_GetService("@mozilla.org/chrome/chrome-registry;1", &rv); if (NS_SUCCEEDED(rv) && chromeRegistry) { nsCOMPtr sheets; @@ -4394,7 +4401,8 @@ nsresult rv; // Setup print options for UI rv = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv) && printService) { if (mPrt->mIsParentAFrameSet) { if (mPrt->mCurrentFocusWin) { diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp index 3499d3017283..1348adcf80d1 100644 --- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -1567,7 +1567,8 @@ PresShell::Init(nsIDocument* aDocument, } // Cache the event queue of the current UI thread - NS_WITH_SERVICE(nsIEventQueueService, eventService, kEventQueueServiceCID, &result); + nsCOMPtr eventService = + do_GetService(kEventQueueServiceCID, &result); if (NS_SUCCEEDED(result)) // XXX this implies that the UI is the current thread. result = eventService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(mEventQueue)); @@ -1578,7 +1579,7 @@ PresShell::Init(nsIDocument* aDocument, gAsyncReflowDuringDocLoad = PR_TRUE; // Get the prefs service - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &result)); if (NS_SUCCEEDED(result)) { prefs->GetIntPref("layout.reflow.timeslice", &gMaxRCProcessingTime); prefs->GetBoolPref("layout.reflow.async.duringDocLoad", &gAsyncReflowDuringDocLoad); @@ -1603,7 +1604,7 @@ PresShell::Init(nsIDocument* aDocument, #ifdef MOZ_REFLOW_PERF // Get the prefs service - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &result)); if (NS_SUCCEEDED(result)) { if (mReflowCountMgr != nsnull) { PRBool paintFrameCounts = PR_FALSE; diff --git a/layout/base/src/nsCopySupport.cpp b/layout/base/src/nsCopySupport.cpp index f5a14edbb331..9c08f4715dc3 100644 --- a/layout/base/src/nsCopySupport.cpp +++ b/layout/base/src/nsCopySupport.cpp @@ -162,7 +162,7 @@ nsresult nsCopySupport::HTMLCopy(nsISelection *aSel, nsIDocument *aDoc, PRInt16 #endif // IBMBIDI // Get the Clipboard - NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv); + nsCOMPtr clipboard(do_GetService(kCClipboardCID, &rv)); if (NS_FAILED(rv)) return rv; diff --git a/layout/base/src/nsPrintPreviewContext.cpp b/layout/base/src/nsPrintPreviewContext.cpp index 7c806a1c37ef..58b1f089201a 100644 --- a/layout/base/src/nsPrintPreviewContext.cpp +++ b/layout/base/src/nsPrintPreviewContext.cpp @@ -101,7 +101,8 @@ PrintPreviewContext::GetPageDim(nsRect* aActualRect, nsRect* aAdjRect) // XXX maybe we get the size of the default printer instead nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); // Setting what would be the "default" case here, because // getting the PrintService could fail aActualRect->width = (nscoord) NS_INCHES_TO_TWIPS(8.5); diff --git a/layout/forms/nsFormControlHelper.cpp b/layout/forms/nsFormControlHelper.cpp index 09dce905d301..fc9b42c0a0ec 100644 --- a/layout/forms/nsFormControlHelper.cpp +++ b/layout/forms/nsFormControlHelper.cpp @@ -885,14 +885,15 @@ nsFormControlHelper::GetLocalizedString(const char * aPropFileName, const char* // Create a URL for the string resource file // Create a bundle for the localization - NS_WITH_SERVICE(nsIIOService, pNetService, kIOServiceCID, &rv); + nsCOMPtr pNetService(do_GetService(kIOServiceCID, &rv)); if (NS_SUCCEEDED(rv) && pNetService) { nsCOMPtr uri; rv = pNetService->NewURI(aPropFileName, nsnull, getter_AddRefs(uri)); if (NS_SUCCEEDED(rv) && uri) { // Create bundle - NS_WITH_SERVICE(nsIStringBundleService, stringService, kStringBundleServiceCID, &rv); + nsCOMPtr stringService = + do_GetService(kStringBundleServiceCID, &rv); if (NS_SUCCEEDED(rv) && stringService) { nsXPIDLCString spec; rv = uri->GetSpec(getter_Copies(spec)); diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index d9e2b0d5601c..1ba09b01c5f7 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -827,7 +827,8 @@ nsFrame::HandleEvent(nsIPresContext* aPresContext, // if(content) { //nsCOMPtr node = do_QueryInterface(content); nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIAccessibilityService, accService, "@mozilla.org/accessibilityService;1", &rv); + nsCOMPtr accService = + do_GetService("@mozilla.org/accessibilityService;1", &rv); if (accService) { // get an accessible for the dom node nsISupports* f = (nsISupports*)(nsIFrame*)this; diff --git a/layout/generic/nsFrameFrame.cpp b/layout/generic/nsFrameFrame.cpp index 919253477554..80f2d7f73f06 100644 --- a/layout/generic/nsFrameFrame.cpp +++ b/layout/generic/nsFrameFrame.cpp @@ -1190,8 +1190,8 @@ nsHTMLFrameInnerFrame::DoLoadURL(nsIPresContext* aPresContext) NS_NewURI(getter_AddRefs(uri), absURL, nsnull); // Check for security - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); // Get base URL diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp index 35b26d82003f..0cf3f2616128 100644 --- a/layout/generic/nsGfxScrollFrame.cpp +++ b/layout/generic/nsGfxScrollFrame.cpp @@ -396,10 +396,8 @@ nsGfxScrollFrame::CreateAnonymousContent(nsIPresContext* aPresContext, // create horzontal scrollbar nsresult rv; - NS_WITH_SERVICE(nsIElementFactory, elementFactory, - NS_ELEMENT_FACTORY_CONTRACTID_PREFIX - "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", - &rv); + nsCOMPtr elementFactory = + do_GetService(NS_ELEMENT_FACTORY_CONTRACTID_PREFIX "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", &rv); if (!elementFactory) return NS_ERROR_FAILURE; diff --git a/layout/generic/nsHTMLFrame.cpp b/layout/generic/nsHTMLFrame.cpp index c344f3ff2104..08604da00a89 100644 --- a/layout/generic/nsHTMLFrame.cpp +++ b/layout/generic/nsHTMLFrame.cpp @@ -235,7 +235,7 @@ CanvasFrame::Init(nsIPresContext* aPresContext, // Get the prefs service nsresult result; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &result)); if (NS_SUCCEEDED(result)) { prefs->GetBoolPref("layout.reflow.showframecounts", &mShowFocusPrefOn); } diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp index acc45b18553f..e1caea709286 100644 --- a/layout/generic/nsImageFrame.cpp +++ b/layout/generic/nsImageFrame.cpp @@ -1100,8 +1100,8 @@ nsImageFrame::TriggerLink(nsIPresContext* aPresContext, // Check that this page is allowed to load this URI. // Almost a copy of the similarly named method in nsGenericElement nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); nsCOMPtr ps; if (NS_SUCCEEDED(rv)) diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp index 7b84c459b539..00ba09f1f16a 100644 --- a/layout/generic/nsPageFrame.cpp +++ b/layout/generic/nsPageFrame.cpp @@ -444,7 +444,8 @@ nsPageFrame::Paint(nsIPresContext* aPresContext, if (printOptBits & nsIPrintOptions::kOptPrintDatePrinted) { // Get Locale for Formating DateTime nsCOMPtr locale; - NS_WITH_SERVICE(nsILocaleService, localeSvc, kLocaleServiceCID, &rv); + nsCOMPtr localeSvc = + do_GetService(kLocaleServiceCID, &rv); if (NS_SUCCEEDED(rv)) { rv = localeSvc->GetApplicationLocale(getter_AddRefs(locale)); diff --git a/layout/generic/nsSelection.cpp b/layout/generic/nsSelection.cpp index ea94e4829258..c5a9883b9e5a 100644 --- a/layout/generic/nsSelection.cpp +++ b/layout/generic/nsSelection.cpp @@ -912,14 +912,15 @@ nsSelection::nsSelection() // Check to see if the autocopy pref is enabled // and add the autocopy listener if it is nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, "@mozilla.org/preferences;1", &rv); + nsCOMPtr prefs(do_GetService("@mozilla.org/preferences;1", &rv)); if (NS_SUCCEEDED(rv) && prefs) { static char pref[] = "clipboard.autocopy"; PRBool autoCopy = PR_FALSE; if (NS_SUCCEEDED(prefs->GetBoolPref(pref, &autoCopy)) && autoCopy) { - NS_WITH_SERVICE(nsIAutoCopyService, autoCopyService, "@mozilla.org/autocopy;1", &rv); + nsCOMPtr autoCopyService = + do_GetService("@mozilla.org/autocopy;1", &rv); if (NS_SUCCEEDED(rv) && autoCopyService) { diff --git a/layout/generic/nsSimplePageSequence.cpp b/layout/generic/nsSimplePageSequence.cpp index 09922e20e0e7..6111b1f67ee0 100644 --- a/layout/generic/nsSimplePageSequence.cpp +++ b/layout/generic/nsSimplePageSequence.cpp @@ -95,7 +95,8 @@ nsSimplePageSequenceFrame::nsSimplePageSequenceFrame() : // XXX this code and the object data member "mIsPrintingSelection" is only needed // for the hack for printing selection where we make the page the max size nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv) && printService) { PRInt16 printType; printService->GetPrintRange(&printType); diff --git a/layout/html/base/src/nsFrame.cpp b/layout/html/base/src/nsFrame.cpp index d9e2b0d5601c..1ba09b01c5f7 100644 --- a/layout/html/base/src/nsFrame.cpp +++ b/layout/html/base/src/nsFrame.cpp @@ -827,7 +827,8 @@ nsFrame::HandleEvent(nsIPresContext* aPresContext, // if(content) { //nsCOMPtr node = do_QueryInterface(content); nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIAccessibilityService, accService, "@mozilla.org/accessibilityService;1", &rv); + nsCOMPtr accService = + do_GetService("@mozilla.org/accessibilityService;1", &rv); if (accService) { // get an accessible for the dom node nsISupports* f = (nsISupports*)(nsIFrame*)this; diff --git a/layout/html/base/src/nsGfxScrollFrame.cpp b/layout/html/base/src/nsGfxScrollFrame.cpp index 35b26d82003f..0cf3f2616128 100644 --- a/layout/html/base/src/nsGfxScrollFrame.cpp +++ b/layout/html/base/src/nsGfxScrollFrame.cpp @@ -396,10 +396,8 @@ nsGfxScrollFrame::CreateAnonymousContent(nsIPresContext* aPresContext, // create horzontal scrollbar nsresult rv; - NS_WITH_SERVICE(nsIElementFactory, elementFactory, - NS_ELEMENT_FACTORY_CONTRACTID_PREFIX - "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", - &rv); + nsCOMPtr elementFactory = + do_GetService(NS_ELEMENT_FACTORY_CONTRACTID_PREFIX "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", &rv); if (!elementFactory) return NS_ERROR_FAILURE; diff --git a/layout/html/base/src/nsHTMLFrame.cpp b/layout/html/base/src/nsHTMLFrame.cpp index c344f3ff2104..08604da00a89 100644 --- a/layout/html/base/src/nsHTMLFrame.cpp +++ b/layout/html/base/src/nsHTMLFrame.cpp @@ -235,7 +235,7 @@ CanvasFrame::Init(nsIPresContext* aPresContext, // Get the prefs service nsresult result; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &result)); if (NS_SUCCEEDED(result)) { prefs->GetBoolPref("layout.reflow.showframecounts", &mShowFocusPrefOn); } diff --git a/layout/html/base/src/nsImageFrame.cpp b/layout/html/base/src/nsImageFrame.cpp index acc45b18553f..e1caea709286 100644 --- a/layout/html/base/src/nsImageFrame.cpp +++ b/layout/html/base/src/nsImageFrame.cpp @@ -1100,8 +1100,8 @@ nsImageFrame::TriggerLink(nsIPresContext* aPresContext, // Check that this page is allowed to load this URI. // Almost a copy of the similarly named method in nsGenericElement nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); nsCOMPtr ps; if (NS_SUCCEEDED(rv)) diff --git a/layout/html/base/src/nsPageFrame.cpp b/layout/html/base/src/nsPageFrame.cpp index 7b84c459b539..00ba09f1f16a 100644 --- a/layout/html/base/src/nsPageFrame.cpp +++ b/layout/html/base/src/nsPageFrame.cpp @@ -444,7 +444,8 @@ nsPageFrame::Paint(nsIPresContext* aPresContext, if (printOptBits & nsIPrintOptions::kOptPrintDatePrinted) { // Get Locale for Formating DateTime nsCOMPtr locale; - NS_WITH_SERVICE(nsILocaleService, localeSvc, kLocaleServiceCID, &rv); + nsCOMPtr localeSvc = + do_GetService(kLocaleServiceCID, &rv); if (NS_SUCCEEDED(rv)) { rv = localeSvc->GetApplicationLocale(getter_AddRefs(locale)); diff --git a/layout/html/base/src/nsPresShell.cpp b/layout/html/base/src/nsPresShell.cpp index 3499d3017283..1348adcf80d1 100644 --- a/layout/html/base/src/nsPresShell.cpp +++ b/layout/html/base/src/nsPresShell.cpp @@ -1567,7 +1567,8 @@ PresShell::Init(nsIDocument* aDocument, } // Cache the event queue of the current UI thread - NS_WITH_SERVICE(nsIEventQueueService, eventService, kEventQueueServiceCID, &result); + nsCOMPtr eventService = + do_GetService(kEventQueueServiceCID, &result); if (NS_SUCCEEDED(result)) // XXX this implies that the UI is the current thread. result = eventService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(mEventQueue)); @@ -1578,7 +1579,7 @@ PresShell::Init(nsIDocument* aDocument, gAsyncReflowDuringDocLoad = PR_TRUE; // Get the prefs service - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &result)); if (NS_SUCCEEDED(result)) { prefs->GetIntPref("layout.reflow.timeslice", &gMaxRCProcessingTime); prefs->GetBoolPref("layout.reflow.async.duringDocLoad", &gAsyncReflowDuringDocLoad); @@ -1603,7 +1604,7 @@ PresShell::Init(nsIDocument* aDocument, #ifdef MOZ_REFLOW_PERF // Get the prefs service - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &result)); if (NS_SUCCEEDED(result)) { if (mReflowCountMgr != nsnull) { PRBool paintFrameCounts = PR_FALSE; diff --git a/layout/html/base/src/nsSimplePageSequence.cpp b/layout/html/base/src/nsSimplePageSequence.cpp index 09922e20e0e7..6111b1f67ee0 100644 --- a/layout/html/base/src/nsSimplePageSequence.cpp +++ b/layout/html/base/src/nsSimplePageSequence.cpp @@ -95,7 +95,8 @@ nsSimplePageSequenceFrame::nsSimplePageSequenceFrame() : // XXX this code and the object data member "mIsPrintingSelection" is only needed // for the hack for printing selection where we make the page the max size nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv) && printService) { PRInt16 printType; printService->GetPrintRange(&printType); diff --git a/layout/html/document/src/nsFrameFrame.cpp b/layout/html/document/src/nsFrameFrame.cpp index 919253477554..80f2d7f73f06 100644 --- a/layout/html/document/src/nsFrameFrame.cpp +++ b/layout/html/document/src/nsFrameFrame.cpp @@ -1190,8 +1190,8 @@ nsHTMLFrameInnerFrame::DoLoadURL(nsIPresContext* aPresContext) NS_NewURI(getter_AddRefs(uri), absURL, nsnull); // Check for security - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); // Get base URL diff --git a/layout/html/forms/src/nsFormControlHelper.cpp b/layout/html/forms/src/nsFormControlHelper.cpp index 09dce905d301..fc9b42c0a0ec 100644 --- a/layout/html/forms/src/nsFormControlHelper.cpp +++ b/layout/html/forms/src/nsFormControlHelper.cpp @@ -885,14 +885,15 @@ nsFormControlHelper::GetLocalizedString(const char * aPropFileName, const char* // Create a URL for the string resource file // Create a bundle for the localization - NS_WITH_SERVICE(nsIIOService, pNetService, kIOServiceCID, &rv); + nsCOMPtr pNetService(do_GetService(kIOServiceCID, &rv)); if (NS_SUCCEEDED(rv) && pNetService) { nsCOMPtr uri; rv = pNetService->NewURI(aPropFileName, nsnull, getter_AddRefs(uri)); if (NS_SUCCEEDED(rv) && uri) { // Create bundle - NS_WITH_SERVICE(nsIStringBundleService, stringService, kStringBundleServiceCID, &rv); + nsCOMPtr stringService = + do_GetService(kStringBundleServiceCID, &rv); if (NS_SUCCEEDED(rv) && stringService) { nsXPIDLCString spec; rv = uri->GetSpec(getter_Copies(spec)); diff --git a/layout/html/forms/src/nsFormFrame.cpp b/layout/html/forms/src/nsFormFrame.cpp index df97b1b83a3e..95ba26d8cf36 100644 --- a/layout/html/forms/src/nsFormFrame.cpp +++ b/layout/html/forms/src/nsFormFrame.cpp @@ -723,7 +723,8 @@ nsFormFrame::OnSubmit(nsIPresContext* aPresContext, nsIFrame* aFrame) // Get a service to process the value part of the form data // If one doesn't exist, that fine. It's not required. nsresult result = NS_OK; - NS_WITH_SERVICE(nsIFormProcessor, formProcessor, kFormProcessorCID, &result) + nsCOMPtr formProcessor = + do_GetService(kFormProcessorCID, &result); nsString data; // this could be more efficient, by allocating a larger buffer @@ -807,8 +808,8 @@ nsFormFrame::OnSubmit(nsIPresContext* aPresContext, nsIFrame* aFrame) } } else { // Get security manager, check to see if access to action URI is allowed. - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &result); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &result); nsCOMPtr actionURL; if (NS_FAILED(result)) return result; @@ -882,7 +883,8 @@ nsFormFrame::OnSubmit(nsIPresContext* aPresContext, nsIFrame* aFrame) // Notify observers that the form is being submitted. result = NS_OK; - NS_WITH_SERVICE(nsIObserverService, service, NS_OBSERVERSERVICE_CONTRACTID, &result); + nsCOMPtr service = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &result); if (NS_FAILED(result)) return result; nsString theTopic; theTopic.AssignWithConversion(NS_FORMSUBMIT_SUBJECT); @@ -1095,7 +1097,7 @@ void nsFormFrame::GetSubmitCharset(nsString& oCharset) PRInt32 offset=0; PRInt32 spPos=0; // get charset from charsets one by one - NS_WITH_SERVICE(nsICharsetAlias, calias, kCharsetAliasCID, &rv); + nsCOMPtr calias(do_GetService(kCharsetAliasCID, &rv)); if(NS_SUCCEEDED(rv) && (nsnull != calias)) { do { spPos = acceptCharsetValue.FindChar(PRUnichar(' '),PR_TRUE, offset); @@ -1198,7 +1200,8 @@ NS_IMETHODIMP nsFormFrame::GetPlatformEncoder(nsIUnicodeEncoder** encoder) } // get unicode converter mgr - //NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + //nsCOMPtr ccm = + // do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeEncoder(&localeCharset, encoder); diff --git a/layout/html/style/src/nsCSSFrameConstructor.cpp b/layout/html/style/src/nsCSSFrameConstructor.cpp index 40deca6f6260..c35db34b499f 100644 --- a/layout/html/style/src/nsCSSFrameConstructor.cpp +++ b/layout/html/style/src/nsCSSFrameConstructor.cpp @@ -3417,7 +3417,8 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsIPresShell* aPresShell, if (!display->mBinding.IsEmpty()) { // Get the XBL loader. nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if (!xblService) return rv; @@ -7226,7 +7227,8 @@ nsCSSFrameConstructor::ConstructFrameInternal( nsIPresShell* aPresShe if (!display->mBinding.IsEmpty()) { // Get the XBL loader. nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if (!xblService) return rv; diff --git a/layout/html/tests/TestCSSParser.cpp b/layout/html/tests/TestCSSParser.cpp index 642d7664f7d1..4364e20f3ff0 100644 --- a/layout/html/tests/TestCSSParser.cpp +++ b/layout/html/tests/TestCSSParser.cpp @@ -143,7 +143,7 @@ int main(int argc, char** argv) char* urlName = argv[i]; // Create url object nsIURI* url; - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv); + nsCOMPtr service(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return -1; nsIURI *uri = nsnull; diff --git a/layout/html/tests/TestCSSScanner.cpp b/layout/html/tests/TestCSSScanner.cpp index c1337aff6214..38be6c4bf001 100644 --- a/layout/html/tests/TestCSSScanner.cpp +++ b/layout/html/tests/TestCSSScanner.cpp @@ -43,7 +43,7 @@ int main(int argc, char** argv) char* urlName = argv[1]; nsIURI* url; nsresult rv; - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv); + nsCOMPtr service(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return -1; nsIURI *uri = nsnull; diff --git a/layout/mathml/base/src/nsMathMLChar.cpp b/layout/mathml/base/src/nsMathMLChar.cpp index 1bbccfcc4927..2ac583966bb4 100644 --- a/layout/mathml/base/src/nsMathMLChar.cpp +++ b/layout/mathml/base/src/nsMathMLChar.cpp @@ -720,7 +720,8 @@ nsresult nsGlyphTableList::Initialize() { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIObserverService, obs, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr obs = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsAutoString topic; topic.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID); rv = obs->AddObserver(this, topic.get()); @@ -734,7 +735,8 @@ nsGlyphTableList::Finalize() { // Remove our observer from the observer service nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIObserverService, obs, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr obs = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsAutoString topic; topic.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID); rv = obs->RemoveObserver(this, topic.get()); diff --git a/layout/style/nsCSSLoader.cpp b/layout/style/nsCSSLoader.cpp index 292e134107da..9f529c089072 100644 --- a/layout/style/nsCSSLoader.cpp +++ b/layout/style/nsCSSLoader.cpp @@ -614,7 +614,8 @@ SheetLoadData::OnStreamComplete(nsIStreamLoader* aLoader, (void)mLoader->SetCharset(strHTTPHeaderData, strStyleDataUndecoded); // bug 66190: ignore errors { // now get the decoder - NS_WITH_SERVICE(nsICharsetConverterManager,ccm,kCharsetConverterManagerCID,&result); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &result); if (NS_SUCCEEDED(result) && ccm) { nsString charset; mLoader->GetCharset(charset); @@ -1318,7 +1319,8 @@ CSSLoaderImpl::LoadStyleLink(nsIContent* aElement, } if (!isForViewSource) { nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; nsIURI* docURI; rv = mDocument->GetBaseURL(docURI); @@ -1587,7 +1589,7 @@ NS_IMETHODIMP CSSLoaderImpl::SetCharset(/*in*/ const nsString &aCharsetSrc) if (aCharsetSrc.Length() == 0) { mCharset.AssignWithConversion("ISO-8859-1"); } else { - NS_WITH_SERVICE(nsICharsetAlias, calias, kCharsetAliasCID, &rv); + nsCOMPtr calias(do_GetService(kCharsetAliasCID, &rv)); NS_ASSERTION(calias, "cannot find charset alias"); nsAutoString charsetName(aCharsetSrc); if( NS_SUCCEEDED(rv) && (nsnull != calias)) diff --git a/layout/style/nsStyleUtil.cpp b/layout/style/nsStyleUtil.cpp index 07cc0d5a6281..737fc15b1d2b 100644 --- a/layout/style/nsStyleUtil.cpp +++ b/layout/style/nsStyleUtil.cpp @@ -208,7 +208,7 @@ static PRBool gNavAlgorithmPref = PR_FALSE; static int PR_CALLBACK NavAlgorithmPrefChangedCallback(const char * name, void * closure) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { prefs->GetBoolPref(name, &gNavAlgorithmPref); } @@ -229,7 +229,7 @@ static PRBool UseNewFontAlgorithm() once = PR_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { prefs->GetBoolPref("font.size.nav4algorithm", &gNavAlgorithmPref); prefs->RegisterCallback("font.size.nav4algorithm", NavAlgorithmPrefChangedCallback, NULL); diff --git a/layout/xul/base/src/nsMenuBarListener.cpp b/layout/xul/base/src/nsMenuBarListener.cpp index 2e48dcc1d957..9c84bbb076d4 100644 --- a/layout/xul/base/src/nsMenuBarListener.cpp +++ b/layout/xul/base/src/nsMenuBarListener.cpp @@ -102,7 +102,7 @@ void nsMenuBarListener::InitAccessKey() // Get the menu access key value from prefs, overriding the default: nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { rv = prefs->GetIntPref("ui.key.menuAccessKey", &mAccessKey); diff --git a/layout/xul/base/src/nsMenuFrame.cpp b/layout/xul/base/src/nsMenuFrame.cpp index 933992a3c3db..38934c438903 100644 --- a/layout/xul/base/src/nsMenuFrame.cpp +++ b/layout/xul/base/src/nsMenuFrame.cpp @@ -837,7 +837,8 @@ void nsMenuFrame::GetMenuChildrenElement(nsIContent** aResult) { nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); PRInt32 dummy; PRInt32 count; mContent->ChildCount(count); @@ -1379,7 +1380,7 @@ nsMenuFrame::BuildAcceleratorText(nsString& aAccelString) // Get the accelerator key value from prefs, overriding the default: nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv) && prefs) rv = prefs->GetIntPref("ui.key.accelKey", &accelKey); } diff --git a/layout/xul/base/src/nsSplitterFrame.cpp b/layout/xul/base/src/nsSplitterFrame.cpp index f55397021734..d94ef46cb086 100644 --- a/layout/xul/base/src/nsSplitterFrame.cpp +++ b/layout/xul/base/src/nsSplitterFrame.cpp @@ -866,7 +866,8 @@ nsSplitterFrameInner::MouseDown(nsIDOMEvent* aMouseEvent) childFrame->GetContent(getter_AddRefs(content)); nsCOMPtr atom; nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if (NS_SUCCEEDED(rv) && xblService) { PRInt32 dummy; diff --git a/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp b/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp index 369a56217800..f8f69aeb2725 100644 --- a/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp +++ b/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp @@ -2667,7 +2667,8 @@ nsOutlinerBodyFrame :: OnDragEnter ( nsIDOMEvent* inEvent ) // cache the drag session nsresult rv; - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); nsCOMPtr dragSession; dragService->GetCurrentSession(getter_AddRefs(mDragSession)); NS_ASSERTION ( mDragSession, "can't get drag session" ); diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp index 369a56217800..f8f69aeb2725 100644 --- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp +++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp @@ -2667,7 +2667,8 @@ nsOutlinerBodyFrame :: OnDragEnter ( nsIDOMEvent* inEvent ) // cache the drag session nsresult rv; - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); nsCOMPtr dragSession; dragService->GetCurrentSession(getter_AddRefs(mDragSession)); NS_ASSERTION ( mDragSession, "can't get drag session" ); diff --git a/modules/libimg/src/if.cpp b/modules/libimg/src/if.cpp index 4c199f5dba1e..56ffc884567d 100644 --- a/modules/libimg/src/if.cpp +++ b/modules/libimg/src/if.cpp @@ -1812,7 +1812,7 @@ PRBool il_PermitLoad(const char * image_url, nsIImageRequestObserver * aObserver } /* check to see if we need to block image from loading */ - NS_WITH_SERVICE(nsIImgManager, imgmanager, kImgManagerCID, &rv); + nsCOMPtr imgmanager(do_GetService(kImgManagerCID, &rv)); if (NS_FAILED(rv)) { Recycle(host); Recycle(firstHost); diff --git a/modules/libjar/nsJAR.cpp b/modules/libjar/nsJAR.cpp index 39bedaf94b02..cc8c08cf376e 100644 --- a/modules/libjar/nsJAR.cpp +++ b/modules/libjar/nsJAR.cpp @@ -356,7 +356,8 @@ nsJAR::GetCertificatePrincipal(const char* aFilename, nsIPrincipal** aPrincipal) //-- Get the signature verifier service nsresult rv; - NS_WITH_SERVICE(nsISignatureVerifier, verifier, SIGNATURE_VERIFIER_CONTRACTID, &rv); + nsCOMPtr verifier = + do_GetService(SIGNATURE_VERIFIER_CONTRACTID, &rv); if (NS_FAILED(rv)) // No signature verifier available return NS_OK; @@ -1137,7 +1138,8 @@ nsZipReaderCache::Init(PRUint32 cacheSize) #endif // Register as a memory pressure observer - NS_WITH_SERVICE(nsIObserverService, os, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr os = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { rv = os->AddObserver(this, NS_MEMORY_PRESSURE_TOPIC); diff --git a/modules/libjar/nsJARChannel.cpp b/modules/libjar/nsJARChannel.cpp index 5cbcc160ee0f..c03ecf2f7313 100644 --- a/modules/libjar/nsJARChannel.cpp +++ b/modules/libjar/nsJARChannel.cpp @@ -329,7 +329,8 @@ nsJARChannel::AsyncReadJARElement() nsAutoMonitor monitor(mMonitor); - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr jarTransport; @@ -482,8 +483,8 @@ nsJARChannel::GetOwner(nsISupports* *aOwner) if (NS_FAILED(rv)) return rv; if (certificate) { // Get the codebase principal - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - kScriptSecurityManagerCID, &rv); + nsCOMPtr secMan = + do_GetService(kScriptSecurityManagerCID, &rv); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; nsCOMPtr codebase; rv = secMan->GetCodebasePrincipal(mJARBaseURI, diff --git a/modules/libjar/nsJARURI.cpp b/modules/libjar/nsJARURI.cpp index 1f1be0a13a28..e451e8a5bf9a 100644 --- a/modules/libjar/nsJARURI.cpp +++ b/modules/libjar/nsJARURI.cpp @@ -105,7 +105,7 @@ NS_IMETHODIMP nsJARURI::SetSpec(const char * aSpec) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; PRUint32 startPos, endPos; @@ -320,7 +320,7 @@ nsJARURI::Resolve(const char *relativePath, char **result) if (!relativePath) return NS_ERROR_NULL_POINTER; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsXPIDLCString scheme; @@ -383,7 +383,7 @@ NS_IMETHODIMP nsJARURI::SetJAREntry(const char* entryPath) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; if (mJAREntry) diff --git a/modules/libpref/src/nsPref.cpp b/modules/libpref/src/nsPref.cpp index 7b324418440a..017aae37a568 100644 --- a/modules/libpref/src/nsPref.cpp +++ b/modules/libpref/src/nsPref.cpp @@ -139,7 +139,8 @@ nsPref::nsPref() PR_AtomicIncrement(&g_InstanceCount); NS_INIT_REFCNT(); - NS_WITH_SERVICE(nsIPrefService, pService, NS_PREFSERVICE_CONTRACTID, &rv); + nsCOMPtr pService = + do_GetService(NS_PREFSERVICE_CONTRACTID, &rv); mPrefService = pService; mPrefService->GetDefaultBranch("", &pBranch); diff --git a/modules/libpref/src/nsPrefBranch.cpp b/modules/libpref/src/nsPrefBranch.cpp index 86264fb53993..c5f09699064e 100644 --- a/modules/libpref/src/nsPrefBranch.cpp +++ b/modules/libpref/src/nsPrefBranch.cpp @@ -693,7 +693,8 @@ nsresult nsPrefBranch::QueryObserver(const char *aPrefName) PL_strncasecmp(aPrefName, capabilityPrefix, sizeof(capabilityPrefix)-1) == 0) { nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, kSecurityManagerCID, &rv); + nsCOMPtr secMan = + do_GetService(kSecurityManagerCID, &rv); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; PRBool enabled; rv = secMan->IsCapabilityEnabled("CapabilityPreferencesAccess", &enabled); diff --git a/modules/libpref/src/nsPrefService.cpp b/modules/libpref/src/nsPrefService.cpp index 95058da088d9..53bcf176b958 100644 --- a/modules/libpref/src/nsPrefService.cpp +++ b/modules/libpref/src/nsPrefService.cpp @@ -110,7 +110,8 @@ nsresult nsPrefService::Init() nsresult rv = NS_OK; if (PREF_Init(nsnull) == PR_TRUE) { - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (observerService) { // Our refcnt must be > 0 when we call this, or we'll get deleted! ++mRefCnt; @@ -713,7 +714,8 @@ extern "C" JSRuntime* PREF_GetJSRuntime() { nsresult rv; - NS_WITH_SERVICE(nsIJSRuntimeService, rtsvc, "@mozilla.org/js/xpc/RuntimeService;1", &rv); + nsCOMPtr rtsvc = + do_GetService("@mozilla.org/js/xpc/RuntimeService;1", &rv); if (NS_SUCCEEDED(rv)) { JSRuntime* rt; rv = rtsvc->GetRuntime(&rt); diff --git a/modules/mpfilelocprovider/src/nsMPFileLocProvider.cpp b/modules/mpfilelocprovider/src/nsMPFileLocProvider.cpp index 3906fff0b946..a14421a09fca 100755 --- a/modules/mpfilelocprovider/src/nsMPFileLocProvider.cpp +++ b/modules/mpfilelocprovider/src/nsMPFileLocProvider.cpp @@ -118,7 +118,8 @@ nsresult nsMPFileLocProvider::Initialize(nsIFile* profileParentDir, const char * sApp_NewsDirectory50 = NS_NewAtom(NS_APP_NEWS_50_DIR); sApp_MessengerFolderCache50 = NS_NewAtom(NS_APP_MESSENGER_FOLDER_CACHE_50_DIR); - NS_WITH_SERVICE(nsIDirectoryService, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) directoryService->RegisterProvider(this); diff --git a/modules/oji/src/nsCSecurityContext.cpp b/modules/oji/src/nsCSecurityContext.cpp index 5233eaa0bcea..41e7eb13a5c2 100644 --- a/modules/oji/src/nsCSecurityContext.cpp +++ b/modules/oji/src/nsCSecurityContext.cpp @@ -107,8 +107,8 @@ nsCSecurityContext::GetOrigin(char* buf, int buflen) // Get the Script Security Manager. nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv) + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv) || !secMan) return NS_ERROR_FAILURE; @@ -180,8 +180,8 @@ nsCSecurityContext::GetCertificateID(char* buf, int buflen) // Get the Script Security Manager. nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv) + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv) || !secMan) return NS_ERROR_FAILURE; @@ -227,8 +227,8 @@ nsCSecurityContext::nsCSecurityContext(JSContext* cx) // Get the Script Security Manager. nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv) + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv) || !secMan) return; @@ -271,8 +271,8 @@ nsCSecurityContext::nsCSecurityContext(nsIPrincipal *principal) // Get the Script Security Manager. nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv) + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv) || !secMan) return; nsCOMPtr sysprincipal; diff --git a/modules/oji/src/nsJVMManager.cpp b/modules/oji/src/nsJVMManager.cpp index 150e6b1f6822..dbfd9d2b20ec 100644 --- a/modules/oji/src/nsJVMManager.cpp +++ b/modules/oji/src/nsJVMManager.cpp @@ -260,7 +260,8 @@ NS_METHOD nsJVMManager::PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) { nsresult rv; - NS_WITH_SERVICE(nsIEventQueueService, eventService, kEventQueueServiceCID, &rv); + nsCOMPtr eventService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr eventQueue = NULL; @@ -572,7 +573,8 @@ nsJVMManager::StartupJVM(void) // beard: Now uses the nsIPluginHost to load the plugin factory for NS_JVM_MIME_TYPE. nsresult err; - NS_WITH_SERVICE(nsIPluginHost, pluginHost, kPluginManagerCID, &err); + nsCOMPtr pluginHost = + do_GetService(kPluginManagerCID, &err); if (NS_FAILED(err)) { fStatus = nsJVMStatus_Failed; @@ -595,9 +597,8 @@ nsJVMManager::StartupJVM(void) nsIPlugin* pluginFactory = NULL; // this code is the correct way to obtain pluggable JVM - NS_WITH_SERVICE(nsIPlugin, f, - NS_INLINE_PLUGIN_CONTRACTID_PREFIX NS_JVM_MIME_TYPE, - &err); + nsCOMPtr f = + do_GetService(NS_INLINE_PLUGIN_CONTRACTID_PREFIX NS_JVM_MIME_TYPE, &err); if (NS_FAILED(err) || !f) { err = pluginHost->GetPluginFactory(NS_JVM_MIME_TYPE, &pluginFactory); } @@ -849,8 +850,8 @@ nsJVMManager::IsAllPermissionGranted( // Get the Script Security Manager. - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv) + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv) || !secMan) return PR_FALSE; // Ask the Script Security Manager to make a Certificate Principal. @@ -892,14 +893,15 @@ nsJVMManager::IsAppletTrusted( nsresult rv = NS_OK; //-- Get the signature verifier service - NS_WITH_SERVICE(nsISignatureVerifier, verifier, SIGNATURE_VERIFIER_CONTRACTID, &rv); + nsCOMPtr verifier = + do_GetService(SIGNATURE_VERIFIER_CONTRACTID, &rv); if (NS_FAILED(rv)) // No signature verifier available return NS_OK; // Get the Script Security Manager. - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv) + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv) || !secMan) return PR_FALSE; diff --git a/modules/oji/tests/src/TM/PostEvent.cpp b/modules/oji/tests/src/TM/PostEvent.cpp index 186d3e1f67f5..35b4d56db680 100755 --- a/modules/oji/tests/src/TM/PostEvent.cpp +++ b/modules/oji/tests/src/TM/PostEvent.cpp @@ -112,7 +112,8 @@ TM_OJIAPITest(ThreadManager_PostEvent_6) { nsresult rv, lrc, lrc1; static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID); - NS_WITH_SERVICE(nsIEventQueueService, eventService, kEventQueueServiceCID, &rv); + nsCOMPtr eventService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) nsresult rc = rv; nsIEventQueue *nq; @@ -196,7 +197,8 @@ TM_OJIAPITest(ThreadManager_PostEvent_7) { nsresult rv, lrc, lrc1; static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID); - NS_WITH_SERVICE(nsIEventQueueService, eventService, kEventQueueServiceCID, &rv); + nsCOMPtr eventService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) nsresult rc = rv; nsIEventQueue *nq; diff --git a/modules/plugin/SanePlugin/nsSanePlugin.cpp b/modules/plugin/SanePlugin/nsSanePlugin.cpp index eff2a999cbc1..1259cb9561b5 100644 --- a/modules/plugin/SanePlugin/nsSanePlugin.cpp +++ b/modules/plugin/SanePlugin/nsSanePlugin.cpp @@ -2515,8 +2515,8 @@ void PR_CALLBACK scanimage_thread_routine( void * arg ) nsCOMPtr eventQ; // Get the event queue of the current thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, - kEventQueueService, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueService, &rv); if (NS_FAILED(rv)) { NS_ERROR("Unable to get event queue service!\n"); return; diff --git a/modules/plugin/SanePlugin/nsSanePluginFactory.cpp b/modules/plugin/SanePlugin/nsSanePluginFactory.cpp index b7c88b2ae0d9..1e7d6c27498a 100644 --- a/modules/plugin/SanePlugin/nsSanePluginFactory.cpp +++ b/modules/plugin/SanePlugin/nsSanePluginFactory.cpp @@ -253,7 +253,8 @@ NSRegisterSelf( nsISupports* aServMgr, const char* aPath ) if ( NS_FAILED( rv ) ) return rv; - NS_WITH_SERVICE( nsIComponentManager, compMgr, kComponentManagerCID, &rv ); + nsCOMPtr compMgr = + do_GetService( kComponentManagerCID, &rv ); if ( NS_FAILED( rv ) ) return rv; @@ -292,7 +293,8 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* aPath) nsCOMPtr servMgr(do_QueryInterface(aServMgr, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; rv = compMgr->UnregisterComponent(knsSanePluginControlCID, aPath); diff --git a/modules/plugin/base/src/ns4xPlugin.cpp b/modules/plugin/base/src/ns4xPlugin.cpp index 870c59710426..e2ed6e6cf731 100644 --- a/modules/plugin/base/src/ns4xPlugin.cpp +++ b/modules/plugin/base/src/ns4xPlugin.cpp @@ -1089,7 +1089,7 @@ _getvalue(NPP npp, NPNVariable variable, void *result) { *(NPBool*)result = PR_TRUE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &res)); if(NS_SUCCEEDED(res) && (nsnull != prefs)) { PRBool js; diff --git a/modules/plugin/base/src/nsPluginHostImpl.cpp b/modules/plugin/base/src/nsPluginHostImpl.cpp index f851c7ebbce4..984d8304ee76 100644 --- a/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -2875,7 +2875,8 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType, // notify Java DOM component nsresult res; - NS_WITH_SERVICE(nsIPluginInstanceOwner, javaDOM, "@mozilla.org/blackwood/java-dom;1", &res); + nsCOMPtr javaDOM = + do_GetService("@mozilla.org/blackwood/java-dom;1", &res); if (NS_SUCCEEDED(res) && javaDOM) javaDOM->SetInstance(instance); @@ -2961,7 +2962,8 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType, // notify Java DOM component nsresult res; - NS_WITH_SERVICE(nsIPluginInstanceOwner, javaDOM, "@mozilla.org/blackwood/java-dom;1", &res); + nsCOMPtr javaDOM = + do_GetService("@mozilla.org/blackwood/java-dom;1", &res); if (NS_SUCCEEDED(res) && javaDOM) javaDOM->SetInstance(instance); @@ -3262,7 +3264,8 @@ NS_IMETHODIMP nsPluginHostImpl::SetUpPluginInstance(const char *aMimeType, } if (NS_FAILED(result)) { - NS_WITH_SERVICE(nsIPlugin, bwPlugin, "@mozilla.org/blackwood/pluglet-engine;1",&result); + nsCOMPtr bwPlugin = + do_GetService("@mozilla.org/blackwood/pluglet-engine;1", &result); if (NS_SUCCEEDED(result)) { result = bwPlugin->CreatePluginInstance(NULL, @@ -3763,7 +3766,8 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi // should we also look for a 'carb' resource? if (PR_FindSymbol(pluginTag->mLibrary, "mainRD") != NULL) { - NS_WITH_SERVICE(nsIClassicPluginFactory, factory, NS_CLASSIC_PLUGIN_FACTORY_CONTRACTID, &rv); + nsCOMPtr factory = + do_GetService(NS_CLASSIC_PLUGIN_FACTORY_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) rv = factory->CreatePlugin(serviceManager, pluginTag->mFileName, @@ -4826,13 +4830,14 @@ NS_IMETHODIMP nsPluginHostImpl::GetCookie(const char* inCookieURL, void* inOutCo return NS_ERROR_INVALID_ARG; } - NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv) || (nsnull == ioService)) { return rv; } - NS_WITH_SERVICE(nsICookieService, cookieService, kCookieServiceCID, &rv); + nsCOMPtr cookieService = + do_GetService(kCookieServiceCID, &rv); if (NS_FAILED(rv) || (nsnull == cookieService)) { return NS_ERROR_INVALID_ARG; @@ -4868,13 +4873,14 @@ NS_IMETHODIMP nsPluginHostImpl::SetCookie(const char* inCookieURL, const void* i return NS_ERROR_INVALID_ARG; } - NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv) || (nsnull == ioService)) { return rv; } - NS_WITH_SERVICE(nsICookieService, cookieService, kCookieServiceCID, &rv); + nsCOMPtr cookieService = + do_GetService(kCookieServiceCID, &rv); if (NS_FAILED(rv) || (nsnull == cookieService)) { return NS_ERROR_FAILURE; diff --git a/modules/plugin/base/src/nsPluginSafety.h b/modules/plugin/base/src/nsPluginSafety.h index d34524b6160f..6bea2fb99cd9 100644 --- a/modules/plugin/base/src/nsPluginSafety.h +++ b/modules/plugin/base/src/nsPluginSafety.h @@ -33,7 +33,7 @@ PR_BEGIN_MACRO \ nsresult res; \ PRBool dontdoit = PR_FALSE; \ - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res);\ + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &res));\ if(NS_SUCCEEDED(res) && (prefs != nsnull)) \ { \ res = prefs->GetBoolPref("plugin.dont_try_safe_calls", &dontdoit);\ @@ -50,7 +50,7 @@ PR_BEGIN_MACRO \ } \ catch(...) \ { \ - NS_WITH_SERVICE(nsIPluginHost, host, kCPluginManagerCID, &res);\ + nsCOMPtr host(do_GetService(kCPluginManagerCID, &res));\ if(NS_SUCCEEDED(res) && (host != nsnull)) \ host->HandleBadPlugin(library); \ ret = (NPError)NS_ERROR_FAILURE; \ @@ -62,7 +62,7 @@ PR_END_MACRO PR_BEGIN_MACRO \ nsresult res; \ PRBool dontdoit = PR_FALSE; \ - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res);\ + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &res));\ if(NS_SUCCEEDED(res) && (prefs != nsnull))\ { \ res = prefs->GetBoolPref("plugin.dont_try_safe_calls", &dontdoit);\ @@ -79,7 +79,7 @@ PR_BEGIN_MACRO \ } \ catch(...) \ { \ - NS_WITH_SERVICE(nsIPluginHost, host, kCPluginManagerCID, &res);\ + nsCOMPtr host(do_GetService(kCPluginManagerCID, &res));\ if(NS_SUCCEEDED(res) && (host != nsnull))\ host->HandleBadPlugin(library); \ } \ diff --git a/modules/plugin/nglsrc/ns4xPlugin.cpp b/modules/plugin/nglsrc/ns4xPlugin.cpp index 870c59710426..e2ed6e6cf731 100644 --- a/modules/plugin/nglsrc/ns4xPlugin.cpp +++ b/modules/plugin/nglsrc/ns4xPlugin.cpp @@ -1089,7 +1089,7 @@ _getvalue(NPP npp, NPNVariable variable, void *result) { *(NPBool*)result = PR_TRUE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &res)); if(NS_SUCCEEDED(res) && (nsnull != prefs)) { PRBool js; diff --git a/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/modules/plugin/nglsrc/nsPluginHostImpl.cpp index f851c7ebbce4..984d8304ee76 100644 --- a/modules/plugin/nglsrc/nsPluginHostImpl.cpp +++ b/modules/plugin/nglsrc/nsPluginHostImpl.cpp @@ -2875,7 +2875,8 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType, // notify Java DOM component nsresult res; - NS_WITH_SERVICE(nsIPluginInstanceOwner, javaDOM, "@mozilla.org/blackwood/java-dom;1", &res); + nsCOMPtr javaDOM = + do_GetService("@mozilla.org/blackwood/java-dom;1", &res); if (NS_SUCCEEDED(res) && javaDOM) javaDOM->SetInstance(instance); @@ -2961,7 +2962,8 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType, // notify Java DOM component nsresult res; - NS_WITH_SERVICE(nsIPluginInstanceOwner, javaDOM, "@mozilla.org/blackwood/java-dom;1", &res); + nsCOMPtr javaDOM = + do_GetService("@mozilla.org/blackwood/java-dom;1", &res); if (NS_SUCCEEDED(res) && javaDOM) javaDOM->SetInstance(instance); @@ -3262,7 +3264,8 @@ NS_IMETHODIMP nsPluginHostImpl::SetUpPluginInstance(const char *aMimeType, } if (NS_FAILED(result)) { - NS_WITH_SERVICE(nsIPlugin, bwPlugin, "@mozilla.org/blackwood/pluglet-engine;1",&result); + nsCOMPtr bwPlugin = + do_GetService("@mozilla.org/blackwood/pluglet-engine;1", &result); if (NS_SUCCEEDED(result)) { result = bwPlugin->CreatePluginInstance(NULL, @@ -3763,7 +3766,8 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi // should we also look for a 'carb' resource? if (PR_FindSymbol(pluginTag->mLibrary, "mainRD") != NULL) { - NS_WITH_SERVICE(nsIClassicPluginFactory, factory, NS_CLASSIC_PLUGIN_FACTORY_CONTRACTID, &rv); + nsCOMPtr factory = + do_GetService(NS_CLASSIC_PLUGIN_FACTORY_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) rv = factory->CreatePlugin(serviceManager, pluginTag->mFileName, @@ -4826,13 +4830,14 @@ NS_IMETHODIMP nsPluginHostImpl::GetCookie(const char* inCookieURL, void* inOutCo return NS_ERROR_INVALID_ARG; } - NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv) || (nsnull == ioService)) { return rv; } - NS_WITH_SERVICE(nsICookieService, cookieService, kCookieServiceCID, &rv); + nsCOMPtr cookieService = + do_GetService(kCookieServiceCID, &rv); if (NS_FAILED(rv) || (nsnull == cookieService)) { return NS_ERROR_INVALID_ARG; @@ -4868,13 +4873,14 @@ NS_IMETHODIMP nsPluginHostImpl::SetCookie(const char* inCookieURL, const void* i return NS_ERROR_INVALID_ARG; } - NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv) || (nsnull == ioService)) { return rv; } - NS_WITH_SERVICE(nsICookieService, cookieService, kCookieServiceCID, &rv); + nsCOMPtr cookieService = + do_GetService(kCookieServiceCID, &rv); if (NS_FAILED(rv) || (nsnull == cookieService)) { return NS_ERROR_FAILURE; diff --git a/modules/plugin/nglsrc/nsPluginSafety.h b/modules/plugin/nglsrc/nsPluginSafety.h index d34524b6160f..6bea2fb99cd9 100644 --- a/modules/plugin/nglsrc/nsPluginSafety.h +++ b/modules/plugin/nglsrc/nsPluginSafety.h @@ -33,7 +33,7 @@ PR_BEGIN_MACRO \ nsresult res; \ PRBool dontdoit = PR_FALSE; \ - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res);\ + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &res));\ if(NS_SUCCEEDED(res) && (prefs != nsnull)) \ { \ res = prefs->GetBoolPref("plugin.dont_try_safe_calls", &dontdoit);\ @@ -50,7 +50,7 @@ PR_BEGIN_MACRO \ } \ catch(...) \ { \ - NS_WITH_SERVICE(nsIPluginHost, host, kCPluginManagerCID, &res);\ + nsCOMPtr host(do_GetService(kCPluginManagerCID, &res));\ if(NS_SUCCEEDED(res) && (host != nsnull)) \ host->HandleBadPlugin(library); \ ret = (NPError)NS_ERROR_FAILURE; \ @@ -62,7 +62,7 @@ PR_END_MACRO PR_BEGIN_MACRO \ nsresult res; \ PRBool dontdoit = PR_FALSE; \ - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res);\ + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &res));\ if(NS_SUCCEEDED(res) && (prefs != nsnull))\ { \ res = prefs->GetBoolPref("plugin.dont_try_safe_calls", &dontdoit);\ @@ -79,7 +79,7 @@ PR_BEGIN_MACRO \ } \ catch(...) \ { \ - NS_WITH_SERVICE(nsIPluginHost, host, kCPluginManagerCID, &res);\ + nsCOMPtr host(do_GetService(kCPluginManagerCID, &res));\ if(NS_SUCCEEDED(res) && (host != nsnull))\ host->HandleBadPlugin(library); \ } \ diff --git a/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp b/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp index eff2a999cbc1..1259cb9561b5 100644 --- a/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp +++ b/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp @@ -2515,8 +2515,8 @@ void PR_CALLBACK scanimage_thread_routine( void * arg ) nsCOMPtr eventQ; // Get the event queue of the current thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, - kEventQueueService, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueService, &rv); if (NS_FAILED(rv)) { NS_ERROR("Unable to get event queue service!\n"); return; diff --git a/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp b/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp index b7c88b2ae0d9..1e7d6c27498a 100644 --- a/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp +++ b/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp @@ -253,7 +253,8 @@ NSRegisterSelf( nsISupports* aServMgr, const char* aPath ) if ( NS_FAILED( rv ) ) return rv; - NS_WITH_SERVICE( nsIComponentManager, compMgr, kComponentManagerCID, &rv ); + nsCOMPtr compMgr = + do_GetService( kComponentManagerCID, &rv ); if ( NS_FAILED( rv ) ) return rv; @@ -292,7 +293,8 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* aPath) nsCOMPtr servMgr(do_QueryInterface(aServMgr, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; rv = compMgr->UnregisterComponent(knsSanePluginControlCID, aPath); diff --git a/netwerk/base/src/nsAsyncStreamListener.cpp b/netwerk/base/src/nsAsyncStreamListener.cpp index 5701f19c6135..37b65520af19 100644 --- a/netwerk/base/src/nsAsyncStreamListener.cpp +++ b/netwerk/base/src/nsAsyncStreamListener.cpp @@ -163,7 +163,8 @@ nsAsyncStreamObserver::Init(nsIRequestObserver* aObserver, nsIEventQueue* aEvent NS_ASSERTION(aObserver, "null observer"); mReceiver = aObserver; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueService, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueService, &rv); if (NS_FAILED(rv)) return rv; diff --git a/netwerk/base/src/nsDownloader.cpp b/netwerk/base/src/nsDownloader.cpp index 77bfdd9a2c77..f4e30fb23c23 100644 --- a/netwerk/base/src/nsDownloader.cpp +++ b/netwerk/base/src/nsDownloader.cpp @@ -67,8 +67,8 @@ nsDownloader::Init(nsIURI* aURL, // in a recursive situation and breaks the asynchronous // semantics of nsIDownloader nsresult rv2 = NS_OK; - NS_WITH_SERVICE(nsIProxyObjectManager, pIProxyObjectManager, - kProxyObjectManagerCID, &rv); + nsCOMPtr pIProxyObjectManager = + do_GetService(kProxyObjectManagerCID, &rv); if (NS_FAILED(rv2)) return rv2; nsCOMPtr pObserver; rv2 = pIProxyObjectManager->GetProxyForObject(NS_CURRENT_EVENTQ, diff --git a/netwerk/base/src/nsFileTransport.cpp b/netwerk/base/src/nsFileTransport.cpp index 6f8b42c61c7c..33bd8c993e2d 100644 --- a/netwerk/base/src/nsFileTransport.cpp +++ b/netwerk/base/src/nsFileTransport.cpp @@ -1082,8 +1082,8 @@ nsFileTransport::SetNotificationCallbacks(nsIInterfaceRequestor *aCallbacks, // Otherwise, generate a proxied event sink nsresult rv; - NS_WITH_SERVICE(nsIProxyObjectManager, - proxyMgr, kProxyObjectManagerCID, &rv); + nsCOMPtr proxyMgr = + do_GetService(kProxyObjectManagerCID, &rv); if (NS_FAILED(rv)) return rv; return proxyMgr->GetProxyForObject(NS_CURRENT_EVENTQ, // calling thread diff --git a/netwerk/base/src/nsIOService.cpp b/netwerk/base/src/nsIOService.cpp index 9cc9479535e9..d64be6341293 100644 --- a/netwerk/base/src/nsIOService.cpp +++ b/netwerk/base/src/nsIOService.cpp @@ -187,7 +187,7 @@ nsIOService::Init() } // Lets make it really easy to block extra ports: - NS_WITH_SERVICE(nsIPref, prefService, kPrefServiceCID, &rv); + nsCOMPtr prefService(do_GetService(kPrefServiceCID, &rv)); if (NS_FAILED(rv) && !prefService) { NS_ASSERTION(0, "Prefs not found!"); return NS_ERROR_FAILURE; diff --git a/netwerk/base/src/nsInputStreamChannel.cpp b/netwerk/base/src/nsInputStreamChannel.cpp index 9029f8c6693a..89c6fd01d2c4 100644 --- a/netwerk/base/src/nsInputStreamChannel.cpp +++ b/netwerk/base/src/nsInputStreamChannel.cpp @@ -294,7 +294,8 @@ nsStreamIOChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt) } if (mFileTransport == nsnull) { - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) goto done; rv = fts->CreateTransportFromStreamIO(mStreamIO, getter_AddRefs(mFileTransport)); diff --git a/netwerk/base/src/nsNetModRegEntry.cpp b/netwerk/base/src/nsNetModRegEntry.cpp index aca606ec91e3..9ffcdb453006 100644 --- a/netwerk/base/src/nsNetModRegEntry.cpp +++ b/netwerk/base/src/nsNetModRegEntry.cpp @@ -145,7 +145,8 @@ nsNetModRegEntry::nsNetModRegEntry(const char *aTopic, mSyncProxy = nsnull; mRealNotifier = aNotify; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, result); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, result); if (NS_FAILED(*result)) return; @@ -162,7 +163,8 @@ nsNetModRegEntry::BuildProxy(PRBool sync) nsresult result; - NS_WITH_SERVICE( nsIProxyObjectManager, proxyManager, kProxyObjectManagerCID, &result); + nsCOMPtr proxyManager = + do_GetService(kProxyObjectManagerCID, &result); if (NS_FAILED(result)) return result; diff --git a/netwerk/base/src/nsProtocolProxyService.cpp b/netwerk/base/src/nsProtocolProxyService.cpp index b4794cd4db66..0beabf974756 100644 --- a/netwerk/base/src/nsProtocolProxyService.cpp +++ b/netwerk/base/src/nsProtocolProxyService.cpp @@ -302,7 +302,7 @@ void PR_CALLBACK nsProtocolProxyService::HandlePACLoadEvent(PLEvent* aEvent) return; } - NS_WITH_SERVICE(nsIIOService, pIOService, kIOServiceCID, &rv); + nsCOMPtr pIOService(do_GetService(kIOServiceCID, &rv)); if (!pIOService || NS_FAILED(rv)) { NS_ERROR("Cannot get IO Service"); return; diff --git a/netwerk/base/src/nsSocketTransport.cpp b/netwerk/base/src/nsSocketTransport.cpp index c05870c7736f..5bfa236ca37b 100644 --- a/netwerk/base/src/nsSocketTransport.cpp +++ b/netwerk/base/src/nsSocketTransport.cpp @@ -613,10 +613,7 @@ nsresult nsSocketTransport::doResolveHost(void) // mNetAddress.ipv6.port = PR_htons(((mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort)); - NS_WITH_SERVICE(nsIDNSService, - pDNSService, - kDNSService, - &rv); + nsCOMPtr pDNSService(do_GetService(kDNSService, &rv)); if (NS_FAILED(rv)) return rv; // @@ -696,10 +693,8 @@ nsresult nsSocketTransport::doConnection(PRInt16 aSelectFlags) if (!mSocketTypeCount) mSocketFD = PR_OpenTCPSocket(PR_AF_INET6); else { - NS_WITH_SERVICE(nsISocketProviderService, - pProviderService, - kSocketProviderService, - &rv); + nsCOMPtr pProviderService = + do_GetService(kSocketProviderService, &rv); char * destHost = mHostName; PRInt32 destPort = mPort; @@ -886,10 +881,7 @@ nsSocketTransport::doBlockingConnection() // The hostname has not been resolved yet... // if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) { - NS_WITH_SERVICE(nsIDNSService, - pDNSService, - kDNSService, - &rv); + nsCOMPtr pDNSService(do_GetService(kDNSService, &rv)); if (NS_FAILED(rv)) return rv; nsXPIDLCString result; @@ -1269,8 +1261,8 @@ nsSocketTransport::SetNotificationCallbacks(nsIInterfaceRequestor *aCallbacks, // Otherwise, generate a proxied event sink nsresult rv; - NS_WITH_SERVICE(nsIProxyObjectManager, - proxyMgr, kProxyObjectManagerCID, &rv); + nsCOMPtr proxyMgr = + do_GetService(kProxyObjectManagerCID, &rv); if (NS_FAILED(rv)) return rv; return proxyMgr->GetProxyForObject(NS_CURRENT_EVENTQ, // calling thread diff --git a/netwerk/base/src/nsSocketTransportService.cpp b/netwerk/base/src/nsSocketTransportService.cpp index 973911c9e65b..795760cce22c 100644 --- a/netwerk/base/src/nsSocketTransportService.cpp +++ b/netwerk/base/src/nsSocketTransportService.cpp @@ -528,7 +528,7 @@ nsSocketTransportService::CreateTransportOfTypes(PRUint32 socketTypeCount, { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIIOService, ios, kIOServiceCID, &rv); + nsCOMPtr ios(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; PRBool offline; rv = ios->GetOffline(&offline); diff --git a/netwerk/base/src/nsStreamLoader.cpp b/netwerk/base/src/nsStreamLoader.cpp index 8559eedd9d49..889bb77c01df 100644 --- a/netwerk/base/src/nsStreamLoader.cpp +++ b/netwerk/base/src/nsStreamLoader.cpp @@ -46,8 +46,8 @@ nsStreamLoader::Init(nsIURI* aURL, // in a recursive situation and breaks the asynchronous // semantics of nsIStreamLoader nsresult rv2 = NS_OK; - NS_WITH_SERVICE(nsIProxyObjectManager, pIProxyObjectManager, - kProxyObjectManagerCID, &rv2); + nsCOMPtr pIProxyObjectManager = + do_GetService(kProxyObjectManagerCID, &rv2); if (NS_FAILED(rv2)) return rv2; nsCOMPtr pObserver; diff --git a/netwerk/cache/filecache/nsDiskCacheRecordChannel.cpp b/netwerk/cache/filecache/nsDiskCacheRecordChannel.cpp index 02bd079f55a0..81d7e482e67b 100644 --- a/netwerk/cache/filecache/nsDiskCacheRecordChannel.cpp +++ b/netwerk/cache/filecache/nsDiskCacheRecordChannel.cpp @@ -342,7 +342,8 @@ nsDiskCacheRecordChannel::OpenInputStream(PRUint32 offset, PRUint32 count, PRUin if(mFileTransport) return NS_ERROR_IN_PROGRESS; - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if(NS_FAILED(rv)) return rv; rv = fts->CreateTransport(mSpec, PR_RDONLY, PR_IRUSR | PR_IWUSR, @@ -371,7 +372,8 @@ nsDiskCacheRecordChannel::OpenOutputStream(PRUint32 offset, PRUint32 count, PRUi nsCOMPtr outputStream; - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if(NS_FAILED(rv)) return rv; rv = fts->CreateTransport(mSpec, PR_WRONLY | PR_CREATE_FILE, PR_IRUSR | PR_IWUSR, @@ -410,7 +412,8 @@ nsDiskCacheRecordChannel::AsyncRead(nsIStreamListener *aListener, nsISupports *a } - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = fts->CreateTransport(mSpec, PR_RDONLY, PR_IRUSR | PR_IWUSR, diff --git a/netwerk/cache/filecache/nsNetDiskCache.cpp b/netwerk/cache/filecache/nsNetDiskCache.cpp index 3ec7a24271b5..48ee8638569c 100644 --- a/netwerk/cache/filecache/nsNetDiskCache.cpp +++ b/netwerk/cache/filecache/nsNetDiskCache.cpp @@ -80,7 +80,7 @@ static const char * const CACHE_ENABLE_PREF = "browser.cache.disk.enable"; static int PR_CALLBACK folderChanged(const char *pref, void *closure) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if ( NS_FAILED (rv ) ) return rv; @@ -94,7 +94,7 @@ static int PR_CALLBACK folderChanged(const char *pref, void *closure) static int PR_CALLBACK enableChanged(const char *pref, void *closure) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if ( NS_FAILED (rv ) ) return rv; @@ -128,7 +128,7 @@ nsNetDiskCache::~nsNetDiskCache() ShutdownDB(); nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if ( NS_SUCCEEDED (rv ) ) { prefs->UnregisterCallback( CACHE_DIR_PREF, folderChanged, this ); @@ -253,7 +253,7 @@ NS_IMETHODIMP nsNetDiskCache::Init(void) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if ( NS_FAILED (rv ) ) return rv; rv = prefs->RegisterCallback( CACHE_DIR_PREF, folderChanged, this); diff --git a/netwerk/cache/filecache/test/diskcache.cpp b/netwerk/cache/filecache/test/diskcache.cpp index 4ceec73a5444..bb6e13b9ea3c 100644 --- a/netwerk/cache/filecache/test/diskcache.cpp +++ b/netwerk/cache/filecache/test/diskcache.cpp @@ -265,7 +265,8 @@ nsresult InitQueue() { nsresult rv; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue service"); rv = eventQService->CreateThreadEventQueue(); @@ -738,7 +739,7 @@ nsresult NS_AutoregisterComponents() PRBool initPref () { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefPtr, kPrefCID, &rv); + nsCOMPtr prefPtr(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return false; diff --git a/netwerk/cache/memcache/nsMemCacheChannel.cpp b/netwerk/cache/memcache/nsMemCacheChannel.cpp index 82a4dbad0133..6194a662fb27 100644 --- a/netwerk/cache/memcache/nsMemCacheChannel.cpp +++ b/netwerk/cache/memcache/nsMemCacheChannel.cpp @@ -228,10 +228,11 @@ public: mContext = aContext; mDownstreamListener = aListener; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueService, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueService, &rv); if (NS_FAILED(rv)) return rv; rv = eventQService->GetThreadEventQueue(PR_CurrentThread(), &eventQ); diff --git a/netwerk/cache/mgr/nsCacheEntryChannel.cpp b/netwerk/cache/mgr/nsCacheEntryChannel.cpp index 5a7559e34583..96ef029aad97 100644 --- a/netwerk/cache/mgr/nsCacheEntryChannel.cpp +++ b/netwerk/cache/mgr/nsCacheEntryChannel.cpp @@ -253,7 +253,7 @@ nsCacheEntryChannel::GetURI(nsIURI * *aURI) rv = mCacheEntry->GetUriSpec(&spec); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; rv = serv->NewURI(spec, nsnull, aURI); diff --git a/netwerk/cache/mgr/nsCacheManager.cpp b/netwerk/cache/mgr/nsCacheManager.cpp index 1f0a8623c957..7192bae35c1c 100644 --- a/netwerk/cache/mgr/nsCacheManager.cpp +++ b/netwerk/cache/mgr/nsCacheManager.cpp @@ -52,7 +52,7 @@ const char* CACHE_DISK_CAPACITY = "browser.cache.disk_cache_size"; static int PR_CALLBACK diskCacheSizeChanged(const char *pref, void *closure) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); PRInt32 capacity = DEFAULT_DISK_CACHE_CAPACITY; if ( NS_SUCCEEDED (rv ) ) { @@ -65,7 +65,7 @@ static int PR_CALLBACK memCacheSizeChanged(const char *pref, void *closure) { nsresult rv; PRInt32 capacity = DEFAULT_MEMORY_CACHE_CAPACITY ; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if ( NS_SUCCEEDED (rv ) ) { rv = prefs->GetIntPref(CACHE_MEM_CAPACITY, &capacity ); @@ -99,14 +99,15 @@ nsCacheManager::~nsCacheManager() delete mMemSpaceManager; delete mDiskSpaceManager; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if ( NS_SUCCEEDED (rv ) ) { prefs->UnregisterCallback( CACHE_DISK_CAPACITY, diskCacheSizeChanged, this); prefs->UnregisterCallback( CACHE_MEM_CAPACITY, memCacheSizeChanged, this); } // Unregister this memory pressure observer - NS_WITH_SERVICE(nsIObserverService, os, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr os = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { rv = os->RemoveObserver(this, NS_MEMORY_PRESSURE_TOPIC); } @@ -117,7 +118,7 @@ nsCacheManager::~nsCacheManager() nsresult nsCacheManager::InitPrefs() { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if ( NS_FAILED (rv ) ) return rv; rv = prefs->RegisterCallback( CACHE_DISK_CAPACITY, diskCacheSizeChanged, this); @@ -143,7 +144,8 @@ nsCacheManager::Init() return NS_ERROR_OUT_OF_MEMORY; // Register as a memory pressure observer - NS_WITH_SERVICE(nsIObserverService, os, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr os = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { rv = os->AddObserver(this, NS_MEMORY_PRESSURE_TOPIC); } diff --git a/netwerk/mime/src/nsXMLMIMEDataSource.cpp b/netwerk/mime/src/nsXMLMIMEDataSource.cpp index 82933a024ff8..774673540b7a 100644 --- a/netwerk/mime/src/nsXMLMIMEDataSource.cpp +++ b/netwerk/mime/src/nsXMLMIMEDataSource.cpp @@ -290,7 +290,8 @@ nsXMLMIMEDataSource::Serialize() { nsresult rv = NS_OK; nsCOMPtr transport; - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv) ; + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv) ; if(NS_FAILED(rv)) return rv ; rv = fts->CreateTransport(mFile, PR_WRONLY|PR_CREATE_FILE, PR_IRWXU, getter_AddRefs(transport)) ; @@ -688,7 +689,8 @@ nsXMLMIMEDataSource::InitFromFile( nsIFile* aFile ) nsresult rv; nsCOMPtr transport; - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv) ; + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv) ; if(NS_FAILED(rv)) return rv ; // Made second parameter 0 since I really don't know what it is used for rv = fts->CreateTransport(aFile, PR_RDONLY, PR_IRWXU, getter_AddRefs(transport)) ; diff --git a/netwerk/protocol/about/src/mzAboutMozilla.cpp b/netwerk/protocol/about/src/mzAboutMozilla.cpp index ab33d5b20fe6..443cb0b33081 100644 --- a/netwerk/protocol/about/src/mzAboutMozilla.cpp +++ b/netwerk/protocol/about/src/mzAboutMozilla.cpp @@ -37,7 +37,7 @@ NS_IMETHODIMP mzAboutMozilla::NewChannel(nsIURI *aURI, nsIChannel **result) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; rv = ioService->NewChannel(kCreditsPage, nsnull, result); diff --git a/netwerk/protocol/about/src/nsAboutCache.cpp b/netwerk/protocol/about/src/nsAboutCache.cpp index c006a1ff8e09..e906248d4ca0 100644 --- a/netwerk/protocol/about/src/nsAboutCache.cpp +++ b/netwerk/protocol/about/src/nsAboutCache.cpp @@ -84,8 +84,8 @@ nsAboutCache::NewChannel(nsIURI *aURI, nsIChannel **result) } */ // Get the cache manager service - NS_WITH_SERVICE(nsICacheService, cacheService, - NS_CACHESERVICE_CONTRACTID, &rv); + nsCOMPtr cacheService = + do_GetService(NS_CACHESERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr storageStream; diff --git a/netwerk/protocol/about/src/nsAboutCredits.cpp b/netwerk/protocol/about/src/nsAboutCredits.cpp index c1dcf8349731..d8e5d54e1178 100644 --- a/netwerk/protocol/about/src/nsAboutCredits.cpp +++ b/netwerk/protocol/about/src/nsAboutCredits.cpp @@ -37,7 +37,7 @@ NS_IMETHODIMP nsAboutCredits::NewChannel(nsIURI *aURI, nsIChannel **result) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; rv = ioService->NewChannel(kCreditsPage, nsnull, result); diff --git a/netwerk/protocol/about/src/nsAboutPlugins.cpp b/netwerk/protocol/about/src/nsAboutPlugins.cpp index 71f366f7ba7a..44f665408d4b 100755 --- a/netwerk/protocol/about/src/nsAboutPlugins.cpp +++ b/netwerk/protocol/about/src/nsAboutPlugins.cpp @@ -38,7 +38,7 @@ NS_IMETHODIMP nsAboutPlugins::NewChannel(nsIURI *aURI, nsIChannel **result) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; rv = ioService->NewChannel(kPluginsPage, nsnull, result); diff --git a/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp b/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp index 216517e370eb..440fbae772d0 100644 --- a/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp +++ b/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp @@ -141,7 +141,7 @@ nsAboutProtocolHandler::NewChannel(nsIURI* uri, nsIChannel* *result) what.BeginReading(begin); contractID.Append(Substring(begin, end)); - NS_WITH_SERVICE(nsIAboutModule, aboutMod, contractID.get(), &rv); + nsCOMPtr aboutMod(do_GetService(contractID.get(), &rv)); if (NS_SUCCEEDED(rv)) { // The standard return case: return aboutMod->NewChannel(uri, result); diff --git a/netwerk/protocol/about/src/nsAboutRedirector.cpp b/netwerk/protocol/about/src/nsAboutRedirector.cpp index 85dff521f448..b0d2a915d68e 100644 --- a/netwerk/protocol/about/src/nsAboutRedirector.cpp +++ b/netwerk/protocol/about/src/nsAboutRedirector.cpp @@ -50,7 +50,7 @@ nsAboutRedirector::NewChannel(nsIURI *aURI, nsIChannel **result) nsXPIDLCString path; (void)aURI->GetPath(getter_Copies(path)); nsresult rv; - NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; @@ -66,8 +66,8 @@ nsAboutRedirector::NewChannel(nsIURI *aURI, nsIChannel **result) if (NS_SUCCEEDED(rv) && result && !PL_strncasecmp(kRedirMap[i][1], kChromePrefix, sizeof(kChromePrefix)-1)) { - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; diff --git a/netwerk/protocol/data/src/nsDataChannel.cpp b/netwerk/protocol/data/src/nsDataChannel.cpp index 121f61d5a751..778108303351 100644 --- a/netwerk/protocol/data/src/nsDataChannel.cpp +++ b/netwerk/protocol/data/src/nsDataChannel.cpp @@ -313,7 +313,8 @@ nsDataChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt) nsCOMPtr eventQ; nsCOMPtr listener; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(eventQ)); diff --git a/netwerk/protocol/datetime/src/nsDateTimeChannel.cpp b/netwerk/protocol/datetime/src/nsDateTimeChannel.cpp index cc0e46737915..caa75b8e6178 100644 --- a/netwerk/protocol/datetime/src/nsDateTimeChannel.cpp +++ b/netwerk/protocol/datetime/src/nsDateTimeChannel.cpp @@ -162,7 +162,8 @@ nsDateTimeChannel::Open(nsIInputStream **_retval) if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv); + nsCOMPtr socketService = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr transport; @@ -183,7 +184,8 @@ nsDateTimeChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt) if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv); + nsCOMPtr socketService = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr transport; diff --git a/netwerk/protocol/file/src/nsFileChannel.cpp b/netwerk/protocol/file/src/nsFileChannel.cpp index ed793c049d75..d668b7cdfc84 100644 --- a/netwerk/protocol/file/src/nsFileChannel.cpp +++ b/netwerk/protocol/file/src/nsFileChannel.cpp @@ -226,7 +226,8 @@ nsFileChannel::EnsureTransport() if (!exist) return NS_ERROR_FILE_NOT_FOUND; - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = fts->CreateTransport(mFile, mIOFlags, mPerm, diff --git a/netwerk/protocol/finger/src/nsFingerChannel.cpp b/netwerk/protocol/finger/src/nsFingerChannel.cpp index c443b111c87c..d9fe1684832f 100644 --- a/netwerk/protocol/finger/src/nsFingerChannel.cpp +++ b/netwerk/protocol/finger/src/nsFingerChannel.cpp @@ -192,7 +192,8 @@ nsFingerChannel::Open(nsIInputStream **_retval) if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv); + nsCOMPtr socketService = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = socketService->CreateTransport(mHost, mPort, nsnull, -1, BUFFER_SEG_SIZE, @@ -214,7 +215,8 @@ nsFingerChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt) if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv); + nsCOMPtr socketService = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = socketService->CreateTransport(mHost, mPort, nsnull, -1, BUFFER_SEG_SIZE, @@ -364,8 +366,8 @@ nsFingerChannel::OnStopRequest(nsIRequest *aRequest, nsISupports* aContext, mActAsObserver = PR_FALSE; nsCOMPtr converterListener; - NS_WITH_SERVICE(nsIStreamConverterService, StreamConvService, - kStreamConverterServiceCID, &rv); + nsCOMPtr StreamConvService = + do_GetService(kStreamConverterServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsAutoString fromStr; fromStr.AssignWithConversion("text/plain"); diff --git a/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp b/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp index e1b8ee6aa271..33039e8b59e8 100644 --- a/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp +++ b/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp @@ -315,7 +315,7 @@ nsFtpState::nsFtpState() { mGenerateRawContent = mGenerateHTMLContent = PR_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) || pPref) { pPref->GetBoolPref("network.dir.generate_html", &mGenerateHTMLContent); pPref->GetBoolPref("network.ftp.raw_output", &mGenerateRawContent); @@ -951,7 +951,7 @@ nsFtpState::S_pass() { if (mAnonymous) { char* anonPassword; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) || pPref) rv = pPref->CopyCharPref("network.ftp.anonymous_password", &anonPassword); if (NS_SUCCEEDED(rv) && anonPassword && *anonPassword != '\0') { @@ -1027,7 +1027,8 @@ nsFtpState::R_pass() { // kick back out to S_pass() and ask the user again. nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIWalletService, walletService, kWalletServiceCID, &rv); + nsCOMPtr walletService = + do_GetService(kWalletServiceCID, &rv); if (NS_FAILED(rv)) return FTP_ERROR; nsXPIDLCString uri; @@ -1906,10 +1907,8 @@ nsFtpState::BuildStreamConverter(nsIStreamListener** convertStreamListener) nsCOMPtr converterListener; nsCOMPtr listener = do_QueryInterface(mChannel); - NS_WITH_SERVICE(nsIStreamConverterService, - scs, - kStreamConverterServiceCID, - &rv); + nsCOMPtr scs = + do_GetService(kStreamConverterServiceCID, &rv); if (NS_FAILED(rv)) return rv; @@ -1964,10 +1963,8 @@ nsFtpState::CreateTransport(const char * host, PRInt32 port, PRUint32 bufferSegm { nsresult rv; - NS_WITH_SERVICE(nsISocketTransportService, - sts, - kSocketTransportServiceCID, - &rv); + nsCOMPtr sts = + do_GetService(kSocketTransportServiceCID, &rv); return sts->CreateTransport(host, port, nsnull, PRUint32(-1), bufferSegmentSize, diff --git a/netwerk/protocol/gopher/src/nsGopherChannel.cpp b/netwerk/protocol/gopher/src/nsGopherChannel.cpp index 52566af614f6..d796cee56710 100644 --- a/netwerk/protocol/gopher/src/nsGopherChannel.cpp +++ b/netwerk/protocol/gopher/src/nsGopherChannel.cpp @@ -237,10 +237,8 @@ nsGopherChannel::Open(nsIInputStream **_retval) if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsISocketTransportService, - socketService, - kSocketTransportServiceCID, - &rv); + nsCOMPtr socketService = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = socketService->CreateTransport(mHost, @@ -279,10 +277,8 @@ nsGopherChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt) mListener = aListener; mResponseContext = ctxt; - NS_WITH_SERVICE(nsISocketTransportService, - socketService, - kSocketTransportServiceCID, - &rv); + nsCOMPtr socketService = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = socketService->CreateTransport(mHost, @@ -503,8 +499,8 @@ nsGopherChannel::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext, nsCOMPtr converterListener; - NS_WITH_SERVICE(nsIStreamConverterService, StreamConvService, - kStreamConverterServiceCID, &rv); + nsCOMPtr StreamConvService = + do_GetService(kStreamConverterServiceCID, &rv); if (NS_FAILED(rv)) return rv; // What we now do depends on what type of file we have diff --git a/netwerk/protocol/jar/src/nsJARChannel.cpp b/netwerk/protocol/jar/src/nsJARChannel.cpp index 5cbcc160ee0f..c03ecf2f7313 100644 --- a/netwerk/protocol/jar/src/nsJARChannel.cpp +++ b/netwerk/protocol/jar/src/nsJARChannel.cpp @@ -329,7 +329,8 @@ nsJARChannel::AsyncReadJARElement() nsAutoMonitor monitor(mMonitor); - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr jarTransport; @@ -482,8 +483,8 @@ nsJARChannel::GetOwner(nsISupports* *aOwner) if (NS_FAILED(rv)) return rv; if (certificate) { // Get the codebase principal - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - kScriptSecurityManagerCID, &rv); + nsCOMPtr secMan = + do_GetService(kScriptSecurityManagerCID, &rv); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; nsCOMPtr codebase; rv = secMan->GetCodebasePrincipal(mJARBaseURI, diff --git a/netwerk/protocol/jar/src/nsJARURI.cpp b/netwerk/protocol/jar/src/nsJARURI.cpp index 1f1be0a13a28..e451e8a5bf9a 100644 --- a/netwerk/protocol/jar/src/nsJARURI.cpp +++ b/netwerk/protocol/jar/src/nsJARURI.cpp @@ -105,7 +105,7 @@ NS_IMETHODIMP nsJARURI::SetSpec(const char * aSpec) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; PRUint32 startPos, endPos; @@ -320,7 +320,7 @@ nsJARURI::Resolve(const char *relativePath, char **result) if (!relativePath) return NS_ERROR_NULL_POINTER; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsXPIDLCString scheme; @@ -383,7 +383,7 @@ NS_IMETHODIMP nsJARURI::SetJAREntry(const char* entryPath) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; if (mJAREntry) diff --git a/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp b/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp index 16f5339f4ab9..7148c6e0c503 100644 --- a/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp +++ b/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp @@ -44,7 +44,7 @@ nsKeywordProtocolHandler::nsKeywordProtocolHandler() { nsresult nsKeywordProtocolHandler::Init() { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsXPIDLCString url; @@ -169,7 +169,7 @@ nsKeywordProtocolHandler::NewChannel(nsIURI* uri, nsIChannel* *result) char *httpSpec = MangleKeywordIntoHTTPURL(path, mKeywordURL.get()); if (!httpSpec) return NS_ERROR_OUT_OF_MEMORY; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; // now we have an HTTP url, give the user an HTTP channel diff --git a/netwerk/protocol/res/src/nsResChannel.cpp b/netwerk/protocol/res/src/nsResChannel.cpp index 6ede48701b4b..e0ea024721bb 100644 --- a/netwerk/protocol/res/src/nsResChannel.cpp +++ b/netwerk/protocol/res/src/nsResChannel.cpp @@ -273,7 +273,7 @@ nsResChannel::EnsureNextResolvedChannel() nsresult rv; nsXPIDLCString resolvedURI; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) goto done; rv = mSubstitutions.Next(getter_Copies(resolvedURI)); diff --git a/netwerk/streamconv/converters/nsFTPDirListingConv.cpp b/netwerk/streamconv/converters/nsFTPDirListingConv.cpp index 3a83a542707e..24c96b49c703 100644 --- a/netwerk/streamconv/converters/nsFTPDirListingConv.cpp +++ b/netwerk/streamconv/converters/nsFTPDirListingConv.cpp @@ -403,7 +403,8 @@ nsresult nsFTPDirListingConv::Init() { // Grab the nsILocale for date parsing. nsresult rv; - NS_WITH_SERVICE(nsILocaleService, localeSvc, kLocaleServiceCID, &rv); + nsCOMPtr localeSvc = + do_GetService(kLocaleServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = localeSvc->GetApplicationLocale(&mLocale); diff --git a/netwerk/streamconv/test/TestStreamConv.cpp b/netwerk/streamconv/test/TestStreamConv.cpp index 2843fec2a452..a8edc25cfa9e 100644 --- a/netwerk/streamconv/test/TestStreamConv.cpp +++ b/netwerk/streamconv/test/TestStreamConv.cpp @@ -127,7 +127,8 @@ main(int argc, char* argv[]) nsresult rv; // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = eventQService->CreateThreadEventQueue(); @@ -185,7 +186,8 @@ main(int argc, char* argv[]) count++; } - NS_WITH_SERVICE(nsIStreamConverterService, StreamConvService, kStreamConverterServiceCID, &rv); + nsCOMPtr StreamConvService = + do_GetService(kStreamConverterServiceCID, &rv); if (NS_FAILED(rv)) return rv; // Define the *from* content type and *to* content-type for conversion. diff --git a/netwerk/test/TestCacheMgr.cpp b/netwerk/test/TestCacheMgr.cpp index d785d7f0eb2b..fb7d7d7ff2db 100644 --- a/netwerk/test/TestCacheMgr.cpp +++ b/netwerk/test/TestCacheMgr.cpp @@ -255,7 +255,8 @@ nsresult InitQueue() { nsresult rv; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue service"); rv = eventQService->CreateThreadEventQueue(); diff --git a/netwerk/test/TestCacheService.cpp b/netwerk/test/TestCacheService.cpp index d2e8abca7018..b5b661c1185a 100644 --- a/netwerk/test/TestCacheService.cpp +++ b/netwerk/test/TestCacheService.cpp @@ -62,7 +62,8 @@ MakeCacheSession(const char * clientID, nsICacheSession **session) nsresult rv; if (!gCacheService) { - // NS_WITH_SERVICE(nsICacheService, cacheService, kCacheServiceCID, &rv); + // nsCOMPtr cacheService = + // do_GetService(kCacheServiceCID, &rv); gCacheService = do_GetService(kCacheServiceCID, &rv); if (NS_FAILED(rv) || !gCacheService) { printf("do_GetService(kCacheServiceCID) failed : %x\n", rv); @@ -188,7 +189,8 @@ main(int argc, char* argv[]) /** * Create event queue for this thread */ - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) goto error_exit; rv = eventQService->CreateThreadEventQueue(); diff --git a/netwerk/test/TestCallbacks.cpp b/netwerk/test/TestCallbacks.cpp index 67d024cba202..253bd548f0bd 100644 --- a/netwerk/test/TestCallbacks.cpp +++ b/netwerk/test/TestCallbacks.cpp @@ -237,8 +237,8 @@ int main(int argc, char *argv[]) { if (NS_FAILED(rv)) return rv; // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, - kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = eventQService->CreateThreadEventQueue(); diff --git a/netwerk/test/TestFileInput.cpp b/netwerk/test/TestFileInput.cpp index fe65148686cf..2070f35107d8 100644 --- a/netwerk/test/TestFileInput.cpp +++ b/netwerk/test/TestFileInput.cpp @@ -92,7 +92,8 @@ public: PRThread* prthread; thread->GetPRThread(&prthread); PR_EnterMonitor(mMonitor); - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv)) { rv = eventQService->CreateThreadEventQueue(); @@ -397,7 +398,8 @@ main(int argc, char* argv[]) rv = NS_AutoregisterComponents(); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; SerialReadTest(dirName); diff --git a/netwerk/test/TestFileTransport.cpp b/netwerk/test/TestFileTransport.cpp index 154f5068af71..84208404f41b 100644 --- a/netwerk/test/TestFileTransport.cpp +++ b/netwerk/test/TestFileTransport.cpp @@ -179,7 +179,8 @@ TestAsyncRead(const char* fileName, PRUint32 offset, PRInt32 length) PRINTF(("TestAsyncRead\n")); - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsITransport* fileTrans; @@ -230,7 +231,8 @@ TestAsyncWrite(const char* fileName, PRUint32 offset, PRInt32 length) PRINTF(("TestAsyncWrite\n")); - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCAutoString outFile(fileName); @@ -346,7 +348,8 @@ main(int argc, char* argv[]) rv = NS_AutoregisterComponents(); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = eventQService->CreateThreadEventQueue(); diff --git a/netwerk/test/TestHttp.cpp b/netwerk/test/TestHttp.cpp index 8f836e223e1f..b04b8e1bb4e1 100644 --- a/netwerk/test/TestHttp.cpp +++ b/netwerk/test/TestHttp.cpp @@ -142,7 +142,8 @@ int main(int argc, char **argv) RETURN_IF_FAILED(rv, "NS_AutoregisterComponents"); // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, eqs, kEventQueueServiceCID, &rv); + nsCOMPtr eqs = + do_GetService(kEventQueueServiceCID, &rv); RETURN_IF_FAILED(rv, "do_GetService(EventQueueService)"); rv = eqs->CreateMonitoredThreadEventQueue(); diff --git a/netwerk/test/TestMCTransport.cpp b/netwerk/test/TestMCTransport.cpp index 6ba6316a277c..12bd4f3e0415 100644 --- a/netwerk/test/TestMCTransport.cpp +++ b/netwerk/test/TestMCTransport.cpp @@ -149,7 +149,7 @@ nsresult TestMCTransport(const char *filename) if (NS_FAILED(rv)) return rv; #else - NS_WITH_SERVICE(nsICacheService, serv, kCacheServiceCID, &rv); + nsCOMPtr serv(do_GetService(kCacheServiceCID, &rv)); if (NS_FAILED(rv)) return rv; rv = serv->CreateSession("TestMCTransport", @@ -216,7 +216,8 @@ int main(int argc, char **argv) return -1; } - NS_WITH_SERVICE(nsIEventQueueService, eqs, kEventQueueServiceCID, &rv); + nsCOMPtr eqs = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) { printf("failed to create event queue service: rv=%x\n", rv); return -1; diff --git a/netwerk/test/TestMakeAbs.cpp b/netwerk/test/TestMakeAbs.cpp index 6f3270e8e00d..392d6200a257 100644 --- a/netwerk/test/TestMakeAbs.cpp +++ b/netwerk/test/TestMakeAbs.cpp @@ -37,7 +37,7 @@ nsresult NS_AutoregisterComponents() nsresult ServiceMakeAbsolute(nsIURI *baseURI, char *relativeInfo, char **_retval) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; return serv->MakeAbsolute(relativeInfo, baseURI, _retval); @@ -63,7 +63,7 @@ main(int argc, char* argv[]) rv = NS_AutoregisterComponents(); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsCOMPtr uri; diff --git a/netwerk/test/TestOverlappedIO.cpp b/netwerk/test/TestOverlappedIO.cpp index b2ac136d0018..05060d4d606e 100644 --- a/netwerk/test/TestOverlappedIO.cpp +++ b/netwerk/test/TestOverlappedIO.cpp @@ -270,7 +270,8 @@ main(int argc, char* argv[]) int port = 80; // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) { NS_WARNING("failed to create: event queue service!"); return rv; @@ -285,7 +286,8 @@ main(int argc, char* argv[]) eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, &gEventQ); // Create the Socket transport service... - NS_WITH_SERVICE(nsISocketTransportService, sts, kSocketTransportServiceCID, &rv); + nsCOMPtr sts = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_FAILED(rv)) { NS_WARNING("failed to create: socket transport service!"); return rv; diff --git a/netwerk/test/TestPageLoad.cpp b/netwerk/test/TestPageLoad.cpp index 8a1d2f3c0c78..62a9b7e6986c 100644 --- a/netwerk/test/TestPageLoad.cpp +++ b/netwerk/test/TestPageLoad.cpp @@ -354,7 +354,8 @@ int main(int argc, char **argv) RETURN_IF_FAILED(rv, "NS_AutoregisterComponents"); // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, eqs, kEventQueueServiceCID, &rv); + nsCOMPtr eqs = + do_GetService(kEventQueueServiceCID, &rv); RETURN_IF_FAILED(rv, "do_GetService(EventQueueService)"); rv = eqs->CreateMonitoredThreadEventQueue(); diff --git a/netwerk/test/TestProtocols.cpp b/netwerk/test/TestProtocols.cpp index cb38e405b8c9..94ef7572c340 100644 --- a/netwerk/test/TestProtocols.cpp +++ b/netwerk/test/TestProtocols.cpp @@ -379,7 +379,7 @@ nsresult StartLoadingURL(const char* aUrlString) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, pService, kIOServiceCID, &rv); + nsCOMPtr pService(do_GetService(kIOServiceCID, &rv)); if (pService) { nsCOMPtr pURL; @@ -526,7 +526,8 @@ main(int argc, char* argv[]) // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = eventQService->CreateThreadEventQueue(); @@ -539,7 +540,8 @@ main(int argc, char* argv[]) // I'm doing this using the serviceManager for convenience's sake. // Presumably an application will init it's own cookie service a // different way (this way works too though). - NS_WITH_SERVICE(nsICookieService, cookieService, nsCookieServiceCID, &rv); + nsCOMPtr cookieService = + do_GetService(nsCookieServiceCID, &rv); if (NS_FAILED(rv)) return rv; #endif // NECKO diff --git a/netwerk/test/TestRawCache.cpp b/netwerk/test/TestRawCache.cpp index 8bc2c7743d45..5b4c927c7d04 100644 --- a/netwerk/test/TestRawCache.cpp +++ b/netwerk/test/TestRawCache.cpp @@ -263,7 +263,8 @@ nsresult InitQueue() { nsresult rv; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue service"); rv = eventQService->CreateThreadEventQueue(); @@ -692,7 +693,7 @@ nsresult NS_AutoregisterComponents() PRBool initPref () { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefPtr, kPrefCID, &rv); + nsCOMPtr prefPtr(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return false; diff --git a/netwerk/test/TestRes.cpp b/netwerk/test/TestRes.cpp index a93103cdf1b4..f57df255d287 100644 --- a/netwerk/test/TestRes.cpp +++ b/netwerk/test/TestRes.cpp @@ -41,7 +41,7 @@ SetupMapping() { nsresult rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsCOMPtr ph; @@ -67,7 +67,7 @@ TestOpenInputStream(const char* url) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsCOMPtr channel; @@ -189,7 +189,8 @@ TestAsyncRead(const char* url) { nsresult rv; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = eventQService->CreateThreadEventQueue(); @@ -198,7 +199,7 @@ TestAsyncRead(const char* url) rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, &gEventQ); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsCOMPtr channel; diff --git a/netwerk/test/TestSocketIO.cpp b/netwerk/test/TestSocketIO.cpp index 509725b6dfa5..5fbcff5a5dcf 100644 --- a/netwerk/test/TestSocketIO.cpp +++ b/netwerk/test/TestSocketIO.cpp @@ -274,7 +274,8 @@ main(int argc, char* argv[]) int port = 80; // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) { NS_WARNING("failed to create: event queue service!"); return rv; @@ -289,7 +290,8 @@ main(int argc, char* argv[]) eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, &gEventQ); // Create the Socket transport service... - NS_WITH_SERVICE(nsISocketTransportService, sts, kSocketTransportServiceCID, &rv); + nsCOMPtr sts = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_FAILED(rv)) { NS_WARNING("failed to create: socket transport service!"); return rv; diff --git a/netwerk/test/TestSocketInput.cpp b/netwerk/test/TestSocketInput.cpp index 99de484ad948..d4d348a772a1 100644 --- a/netwerk/test/TestSocketInput.cpp +++ b/netwerk/test/TestSocketInput.cpp @@ -147,7 +147,8 @@ main(int argc, char* argv[]) if (NS_FAILED(rv)) return rv; // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = eventQService->CreateThreadEventQueue(); @@ -157,7 +158,8 @@ main(int argc, char* argv[]) rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(eventQ)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsISocketTransportService, sts, kSocketTransportServiceCID, &rv); + nsCOMPtr sts = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsITransport* transport; diff --git a/netwerk/test/TestSocketTransport.cpp b/netwerk/test/TestSocketTransport.cpp index 1ada9ce0e999..c5e8e664236b 100644 --- a/netwerk/test/TestSocketTransport.cpp +++ b/netwerk/test/TestSocketTransport.cpp @@ -301,7 +301,8 @@ TestConnection::TestConnection(const char* aHostName, PRInt32 aPort, mOutStream = nsnull; // Create a socket transport... - NS_WITH_SERVICE(nsISocketTransportService, sts, kSocketTransportServiceCID, &rv); + nsCOMPtr sts = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_SUCCEEDED(rv)) { rv = sts->CreateTransport(aHostName, aPort, nsnull, -1, 0, 0, &mTransport); if (NS_SUCCEEDED(rv)) { @@ -353,7 +354,8 @@ TestConnection::Run(void) nsresult rv = NS_OK; // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = eventQService->CreateThreadEventQueue(); @@ -622,7 +624,8 @@ main(int argc, char* argv[]) if (NS_FAILED(rv)) return rv; // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = eventQService->CreateThreadEventQueue(); diff --git a/netwerk/test/TestThreadedIO.cpp b/netwerk/test/TestThreadedIO.cpp index 81729fd8b0bb..35f8c9629375 100644 --- a/netwerk/test/TestThreadedIO.cpp +++ b/netwerk/test/TestThreadedIO.cpp @@ -41,7 +41,8 @@ createEventQueue() { nsCOMPtr result; // Get event queue service. nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIEventQueueService, eqs, NS_EVENTQUEUESERVICE_CONTRACTID, &rv); + nsCOMPtr eqs = + do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv); if ( NS_SUCCEEDED( rv ) ) { // Have service create us an event queue. rv = eqs->CreateThreadEventQueue(); diff --git a/netwerk/test/TestWriteStream.cpp b/netwerk/test/TestWriteStream.cpp index 50234197a3e2..1794291964e6 100644 --- a/netwerk/test/TestWriteStream.cpp +++ b/netwerk/test/TestWriteStream.cpp @@ -109,7 +109,8 @@ TestSyncWrite(char* filename, PRUint32 startPosition, PRInt32 length) RandomStream *randomStream; char buf[500]; - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv) ; + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv) ; if (NS_FAILED(rv)) return rv ; nsCOMPtr fs; diff --git a/netwerk/test/urltest.cpp b/netwerk/test/urltest.cpp index 5a9f4381b43c..ac6d50eae487 100644 --- a/netwerk/test/urltest.cpp +++ b/netwerk/test/urltest.cpp @@ -69,7 +69,8 @@ int writeoutto(const char* i_pURL, char** o_Result, PRBool bUseStd = PR_TRUE) } else { - NS_WITH_SERVICE(nsIIOService, pService, kIOServiceCID, &result); + nsCOMPtr pService = + do_GetService(kIOServiceCID, &result); if (NS_FAILED(result)) { cout << "Service failed!" << endl; diff --git a/parser/htmlparser/robot/nsDebugRobot.cpp b/parser/htmlparser/robot/nsDebugRobot.cpp index 72cf1e343cd1..573cbdf06224 100644 --- a/parser/htmlparser/robot/nsDebugRobot.cpp +++ b/parser/htmlparser/robot/nsDebugRobot.cpp @@ -242,7 +242,7 @@ extern "C" NS_EXPORT int DebugRobot( // Create url nsIURI* url; nsresult rv; - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv); + nsCOMPtr service(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsIURI *uri = nsnull; diff --git a/parser/htmlparser/robot/nsRobotSink.cpp b/parser/htmlparser/robot/nsRobotSink.cpp index 8d086e3046f0..8164ffd53301 100644 --- a/parser/htmlparser/robot/nsRobotSink.cpp +++ b/parser/htmlparser/robot/nsRobotSink.cpp @@ -347,7 +347,7 @@ void RobotSink::ProcessLink(const nsString& aLink) if (nsnull != docURL) { nsIURI* absurl; nsresult rv; - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv); + nsCOMPtr service(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return; nsIURI *uri = nsnull, *baseUri = nsnull; diff --git a/parser/htmlparser/src/CNavDTD.cpp b/parser/htmlparser/src/CNavDTD.cpp index e9d1fecef29b..2a2bd7cc64e7 100644 --- a/parser/htmlparser/src/CNavDTD.cpp +++ b/parser/htmlparser/src/CNavDTD.cpp @@ -1565,7 +1565,8 @@ nsresult CNavDTD::HandleKeyGen(nsIParserNode* aNode) { if(aNode) { - NS_WITH_SERVICE(nsIFormProcessor, theFormProcessor, kFormProcessorCID, &result) + nsCOMPtr theFormProcessor = + do_GetService(kFormProcessorCID, &result); if(NS_SUCCEEDED(result)) { PRInt32 theAttrCount=aNode->GetAttributeCount(); diff --git a/parser/htmlparser/src/nsHTMLContentSinkStream.cpp b/parser/htmlparser/src/nsHTMLContentSinkStream.cpp index 88cf9752b7f9..6ea19d913cce 100644 --- a/parser/htmlparser/src/nsHTMLContentSinkStream.cpp +++ b/parser/htmlparser/src/nsHTMLContentSinkStream.cpp @@ -222,7 +222,7 @@ nsHTMLContentSinkStream::InitEncoders() if (mStream) { nsAutoString charsetName; charsetName.Assign(mCharsetOverride); - NS_WITH_SERVICE(nsICharsetAlias, calias, kCharsetAliasCID, &res); + nsCOMPtr calias(do_GetService(kCharsetAliasCID, &res)); if (NS_SUCCEEDED(res) && calias) { nsAutoString temp; temp.Assign(mCharsetOverride); res = calias->GetPreferred(temp, charsetName); diff --git a/parser/htmlparser/src/nsParser.cpp b/parser/htmlparser/src/nsParser.cpp index dac563cc84db..ebf279b61e8d 100644 --- a/parser/htmlparser/src/nsParser.cpp +++ b/parser/htmlparser/src/nsParser.cpp @@ -357,7 +357,8 @@ nsParser::nsParser(nsITokenObserver* anObserver) { nsresult rv = NS_OK; if (mEventQueue == nsnull) { // Cache the event queue of the current UI thread - NS_WITH_SERVICE(nsIEventQueueService, eventService, kEventQueueServiceCID, &rv); + nsCOMPtr eventService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv) && (eventService)) { // XXX this implies that the UI is the current thread. rv = eventService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(mEventQueue)); } diff --git a/parser/htmlparser/src/nsScanner.cpp b/parser/htmlparser/src/nsScanner.cpp index 1d21666be98a..e573a1463b58 100644 --- a/parser/htmlparser/src/nsScanner.cpp +++ b/parser/htmlparser/src/nsScanner.cpp @@ -153,7 +153,7 @@ nsresult nsScanner::SetDocumentCharset(const nsString& aCharset , nsCharsetSourc if( aSource < mCharsetSource) // priority is lower the the current one , just return res; - NS_WITH_SERVICE(nsICharsetAlias, calias, kCharsetAliasCID, &res); + nsCOMPtr calias(do_GetService(kCharsetAliasCID, &res)); NS_ASSERTION( nsnull != calias, "cannot find charset alias"); nsAutoString charsetName; charsetName.Assign(aCharset); if( NS_SUCCEEDED(res) && (nsnull != calias)) @@ -175,7 +175,8 @@ nsresult nsScanner::SetDocumentCharset(const nsString& aCharset , nsCharsetSourc mCharset = charsetName; mCharsetSource = aSource; - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &res); if(NS_SUCCEEDED(res) && (nsnull != ccm)) { nsIUnicodeDecoder * decoder = nsnull; diff --git a/parser/htmlparser/tests/grabpage/grabpage.cpp b/parser/htmlparser/tests/grabpage/grabpage.cpp index 07a224ece413..2f6e23d09a8b 100644 --- a/parser/htmlparser/tests/grabpage/grabpage.cpp +++ b/parser/htmlparser/tests/grabpage/grabpage.cpp @@ -224,7 +224,7 @@ PageGrabber::Grab(const nsString& aURL) nsIURI* url = NULL; nsresult rv; - rv = NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + rv = nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsIChannel *channel = nsnull; diff --git a/profile/Acct/nsAccount.cpp b/profile/Acct/nsAccount.cpp index 8fa2e895586b..bdc94bfe3ec7 100644 --- a/profile/Acct/nsAccount.cpp +++ b/profile/Acct/nsAccount.cpp @@ -336,7 +336,7 @@ int nsAccount::GetNCIValues(nsString MiddleValue) nsString Trial; Trial.AssignWithConversion("resource:/res/acct/NCI_Dir/"); Trial = Trial + MiddleValue; printf("this is the trial value %s \n", Trial.ToNewCString()); - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &ret); + nsCOMPtr service(do_GetService(kIOServiceCID, &ret)); if (NS_FAILED(ret)) return ret; @@ -418,7 +418,7 @@ int nsAccount::GetConfigValues(nsString fileName) nsString Trial; Trial.AssignWithConversion("resource:/res/acct/NCI_Dir/"); Trial = Trial + fileName; printf("this is the trial value %s \n", Trial.ToNewCString()); - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &ret); + nsCOMPtr service(do_GetService(kIOServiceCID, &ret)); if (NS_FAILED(ret)) return ret; diff --git a/profile/Acctidl/nsAccountServicesFactory.cpp b/profile/Acctidl/nsAccountServicesFactory.cpp index 858269c8cce1..021da10b2101 100644 --- a/profile/Acctidl/nsAccountServicesFactory.cpp +++ b/profile/Acctidl/nsAccountServicesFactory.cpp @@ -177,7 +177,8 @@ NSRegisterSelf(nsISupports* aServMgr , const char* aPath) nsCOMPtr servMgr(do_QueryInterface(aServMgr, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; rv = compMgr->RegisterComponent(kAccountServicesCID, @@ -199,7 +200,8 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* aPath) nsCOMPtr servMgr(do_QueryInterface(aServMgr, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; rv = compMgr->UnregisterComponent(kAccountServicesCID, aPath); diff --git a/profile/pref-migrator/src/nsPrefMigration.cpp b/profile/pref-migrator/src/nsPrefMigration.cpp index 37bce7ae8293..8f1aef8d9168 100644 --- a/profile/pref-migrator/src/nsPrefMigration.cpp +++ b/profile/pref-migrator/src/nsPrefMigration.cpp @@ -275,10 +275,11 @@ nsPrefMigration::getPrefService() // get the prefs service nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pIMyService, kPrefServiceCID, &rv); + nsCOMPtr pIMyService(do_GetService(kPrefServiceCID, &rv)); if(NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIProxyObjectManager, pIProxyObjectManager, kProxyObjectManagerCID, &rv); + nsCOMPtr pIProxyObjectManager = + do_GetService(kProxyObjectManagerCID, &rv); if(NS_FAILED(rv)) return rv; @@ -364,7 +365,8 @@ extern "C" void ProfileMigrationController(void *data) return; } - NS_WITH_SERVICE(nsIProxyObjectManager, pIProxyObjectManager, kProxyObjectManagerCID, &rv); + nsCOMPtr pIProxyObjectManager = + do_GetService(kProxyObjectManagerCID, &rv); if(NS_FAILED(rv)) { migrator->mErrorCode = rv; @@ -2084,7 +2086,8 @@ ConvertStringToUTF8(nsAutoString& aCharset, const char* inString, char** outStri nsresult rv; // convert result to unicode - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if(NS_SUCCEEDED(rv)) { nsCOMPtr decoder; // this may be cached @@ -2221,7 +2224,7 @@ nsPrefConverter::ConvertPrefsToUTF8() nsCStringArray prefsToMigrate; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if(NS_FAILED(rv)) return rv; if (!prefs) return NS_ERROR_FAILURE; diff --git a/profile/src/nsProfile.cpp b/profile/src/nsProfile.cpp index 359c73b7fa1c..67f4182c522b 100644 --- a/profile/src/nsProfile.cpp +++ b/profile/src/nsProfile.cpp @@ -291,7 +291,8 @@ nsProfile::nsProfile() sApp_MessengerFolderCache50 = NS_NewAtom(NS_APP_MESSENGER_FOLDER_CACHE_50_DIR); nsresult rv; - NS_WITH_SERVICE(nsIDirectoryService, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) directoryService->RegisterProvider(this); } @@ -468,7 +469,7 @@ nsProfile::LoadDefaultProfileDir(nsCString & profileURLStr, PRBool canInteract) PRInt32 numProfiles=0; nsXPIDLString currentProfileStr; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return rv; GetProfileCount(&numProfiles); @@ -561,7 +562,8 @@ nsProfile::LoadDefaultProfileDir(nsCString & profileURLStr, PRBool canInteract) if (NS_FAILED(rv)) return rv; } - NS_WITH_SERVICE(nsICategoryManager, catman, NS_CATEGORYMANAGER_CONTRACTID, &rv); + nsCOMPtr catman = + do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv); if(NS_SUCCEEDED(rv) && catman) { @@ -828,7 +830,7 @@ nsProfile::ProcessArgs(nsICmdLineService *cmdLineArgs, } else if (num4xProfiles == 1 && numProfiles == 0) { PRBool confirmAutomigration = PR_FALSE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv) + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { rv = prefs->GetBoolPref(PREF_CONFIRM_AUTOMIGRATION, &confirmAutomigration); @@ -1001,7 +1003,8 @@ nsProfile::SetCurrentProfile(const PRUnichar * aCurrentProfile) else isSwitch = PR_FALSE; - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); NS_ENSURE_TRUE(observerService, NS_ERROR_FAILURE); nsISupports *subject = (nsISupports *)((nsIProfile *)this); @@ -1025,7 +1028,8 @@ nsProfile::SetCurrentProfile(const PRUnichar * aCurrentProfile) } // Flush the stringbundle cache - NS_WITH_SERVICE(nsIStringBundleService, bundleService, NS_STRINGBUNDLE_CONTRACTID, &rv); + nsCOMPtr bundleService = + do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { rv = bundleService->FlushBundles(); NS_ASSERTION(NS_SUCCEEDED(rv), "failed to flush bundle cache"); @@ -1080,7 +1084,8 @@ NS_IMETHODIMP nsProfile::ShutDownCurrentProfile(PRUint32 shutDownType) { nsresult rv; - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); NS_ENSURE_TRUE(observerService, NS_ERROR_FAILURE); nsISupports *subject = (nsISupports *)((nsIProfile *)this); @@ -1732,7 +1737,7 @@ NS_IMETHODIMP nsProfile::StartApprunner(const PRUnichar* profileName) nsresult nsProfile::LoadNewProfilePrefs() { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return rv; prefs->ResetUserPrefs(); @@ -1844,14 +1849,16 @@ nsProfile::DefineLocaleDefaultsDir() { nsresult rv; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); NS_ENSURE_TRUE(directoryService, NS_ERROR_FAILURE); nsCOMPtr localeDefaults; rv = directoryService->Get(NS_APP_PROFILE_DEFAULTS_NLOC_50_DIR, NS_GET_IID(nsIFile), getter_AddRefs(localeDefaults)); if (NS_SUCCEEDED(rv)) { - NS_WITH_SERVICE(nsIChromeRegistry, chromeRegistry, kChromeRegistryCID, &rv); + nsCOMPtr chromeRegistry = + do_GetService(kChromeRegistryCID, &rv); if (NS_SUCCEEDED(rv)) { nsXPIDLString localeName; @@ -1869,7 +1876,8 @@ nsresult nsProfile::UndefineFileLocations() { nsresult rv; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); NS_ENSURE_TRUE(directoryService, NS_ERROR_FAILURE); (void) directoryService->Undefine(NS_APP_PREFS_50_DIR); diff --git a/profile/src/nsProfileAccess.cpp b/profile/src/nsProfileAccess.cpp index 04956a6b2571..91bdf2a17e71 100644 --- a/profile/src/nsProfileAccess.cpp +++ b/profile/src/nsProfileAccess.cpp @@ -138,7 +138,8 @@ ConvertStringToUnicode(nsAutoString& aCharset, const char* inString, nsAutoStrin { nsresult rv; // convert result to unicode - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if(NS_SUCCEEDED(rv)) { nsCOMPtr decoder; // this may be cached diff --git a/rdf/chrome/src/nsChromeProtocolHandler.cpp b/rdf/chrome/src/nsChromeProtocolHandler.cpp index e5204b7e10e3..5ee8f08f1de2 100644 --- a/rdf/chrome/src/nsChromeProtocolHandler.cpp +++ b/rdf/chrome/src/nsChromeProtocolHandler.cpp @@ -565,7 +565,7 @@ nsChromeProtocolHandler::NewChannel(nsIURI* aURI, // Canonify the "chrome:" URL; e.g., so that we collapse // "chrome://navigator/content/navigator.xul" and "chrome://navigator/content" // and "chrome://navigator/content/navigator.xul". - NS_WITH_SERVICE(nsIChromeRegistry, reg, kChromeRegistryCID, &rv); + nsCOMPtr reg(do_GetService(kChromeRegistryCID, &rv)); if (NS_FAILED(rv)) return rv; rv = reg->Canonify(aURI); @@ -573,7 +573,8 @@ nsChromeProtocolHandler::NewChannel(nsIURI* aURI, // Check the prototype cache to see if we've already got the // document in the cache. - NS_WITH_SERVICE(nsIXULPrototypeCache, cache, kXULPrototypeCacheCID, &rv); + nsCOMPtr cache = + do_GetService(kXULPrototypeCacheCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr proto; @@ -601,7 +602,7 @@ nsChromeProtocolHandler::NewChannel(nsIURI* aURI, rv = reg->ConvertChromeURL(chromeURI, getter_Copies(spec)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; rv = serv->NewURI(spec, nsnull, getter_AddRefs(chromeURI)); @@ -639,8 +640,8 @@ nsChromeProtocolHandler::NewChannel(nsIURI* aURI, if (PL_strcasecmp(fileExtension, "xul") == 0 || PL_strcasecmp(fileExtension, "html") == 0 || PL_strcasecmp(fileExtension, "xml") == 0) { - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr principal; diff --git a/rdf/chrome/src/nsChromeRegistry.cpp b/rdf/chrome/src/nsChromeRegistry.cpp index 32883dd37131..87b4db110b44 100644 --- a/rdf/chrome/src/nsChromeRegistry.cpp +++ b/rdf/chrome/src/nsChromeRegistry.cpp @@ -339,7 +339,8 @@ nsChromeRegistry::Init() rv = mRDFService->GetResource(kURICHROME_packageVersion, getter_AddRefs(mPackageVersion)); NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get RDF resource"); - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (observerService) { observerService->AddObserver(this, NS_LITERAL_STRING("profile-before-change").get()); observerService->AddObserver(this, NS_LITERAL_STRING("profile-do-change").get()); @@ -1094,7 +1095,8 @@ NS_IMETHODIMP nsChromeRegistry::RefreshSkins() if (NS_FAILED(rv)) return rv; // Get the window mediator - NS_WITH_SERVICE(nsIWindowMediator, windowMediator, kWindowMediatorCID, &rv); + nsCOMPtr windowMediator = + do_GetService(kWindowMediatorCID, &rv); if (NS_SUCCEEDED(rv)) { nsCOMPtr windowEnumerator; @@ -1129,18 +1131,21 @@ nsresult nsChromeRegistry::FlushCaches() // Flush the style sheet cache completely. // XXX For now flush everything. need a better call that only flushes style sheets. - NS_WITH_SERVICE(nsIXULPrototypeCache, xulCache, "@mozilla.org/xul/xul-prototype-cache;1", &rv); + nsCOMPtr xulCache = + do_GetService("@mozilla.org/xul/xul-prototype-cache;1", &rv); if (NS_SUCCEEDED(rv) && xulCache) { xulCache->Flush(); } // Flush the old image cache. - NS_WITH_SERVICE(nsIImageManager, imageManager, kImageManagerCID, &rv); + nsCOMPtr imageManager = + do_GetService(kImageManagerCID, &rv); if (imageManager) rv = imageManager->FlushCache(1); // Flush the new imagelib image chrome cache. - NS_WITH_SERVICE(imgICache, imageCache, "@mozilla.org/image/cache;1", &rv); + nsCOMPtr imageCache = + do_GetService("@mozilla.org/image/cache;1", &rv); if (NS_SUCCEEDED(rv) && imageCache) { imageCache->ClearCache(PR_TRUE); } @@ -2976,7 +2981,8 @@ nsChromeRegistry::CheckForNewChrome() // open the installed-chrome file nsCOMPtr listFile; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = directoryService->Get(NS_APP_CHROME_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(listFile)); diff --git a/rdf/datasource/src/nsFileSystemDataSource.cpp b/rdf/datasource/src/nsFileSystemDataSource.cpp index 55abbd269502..ff902704269f 100644 --- a/rdf/datasource/src/nsFileSystemDataSource.cpp +++ b/rdf/datasource/src/nsFileSystemDataSource.cpp @@ -263,7 +263,8 @@ FileSystemDataSource::FileSystemDataSource(void) gRDFService->GetResource(NC_NAMESPACE_URI "IEFavorite", &kNC_IEFavoriteObject); gRDFService->GetResource(NC_NAMESPACE_URI "IEFavoriteFolder", &kNC_IEFavoriteFolder); /* - NS_WITH_SERVICE(nsIPlatformCharset, platformCharset, kPlatformCharsetCID, &rv); + nsCOMPtr platformCharset = + do_GetService(kPlatformCharsetCID, &rv); if (NS_SUCCEEDED(rv) && (platformCharset)) { nsAutoString defaultCharset; @@ -272,8 +273,8 @@ FileSystemDataSource::FileSystemDataSource(void) { // found the default platform charset // now try and get a decoder from it to Unicode - NS_WITH_SERVICE(nsICharsetConverterManager, charsetConv, - kCharsetConverterManagerCID, &rv); + nsCOMPtr charsetConv = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv) && (charsetConv)) { rv = charsetConv->GetUnicodeDecoder(&defaultCharset, diff --git a/rdf/tests/domds/nsRDFDOMViewerUtils.cpp b/rdf/tests/domds/nsRDFDOMViewerUtils.cpp index ea6d76da6c50..4562bc3c4f22 100644 --- a/rdf/tests/domds/nsRDFDOMViewerUtils.cpp +++ b/rdf/tests/domds/nsRDFDOMViewerUtils.cpp @@ -52,7 +52,8 @@ nsDOMViewerObject::SetTargetLiteral(nsIRDFResource *aProperty, nsString& str) { nsresult rv; - NS_WITH_SERVICE(nsIRDFService, rdf, NS_RDF_CONTRACTID "/rdf-service;1", &rv); + nsCOMPtr rdf = + do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv); PRUnichar* uniStr = str.ToNewUnicode(); nsCOMPtr literal; diff --git a/rdf/tests/dsds/nsRDFDataSourceDS.cpp b/rdf/tests/dsds/nsRDFDataSourceDS.cpp index 5f399facea1d..d3a7e35b724b 100644 --- a/rdf/tests/dsds/nsRDFDataSourceDS.cpp +++ b/rdf/tests/dsds/nsRDFDataSourceDS.cpp @@ -150,7 +150,7 @@ nsRDFDataSourceDataSource::Init(const char *uri) // get RDF resources - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); if (!kNC_Name) { rdf->GetResource(NC_RDF_Name, &kNC_Name); rdf->GetResource(NC_RDF_Child, &kNC_Child); @@ -384,7 +384,7 @@ nsRDFDataSourceDataSource::ArcLabelsOut(nsIRDFResource *aSource, #ifdef DEBUG_alecf printf("Ahah! This is a datasource node. Setting the datasource.."); #endif - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); rv = rdf->GetDataSource((const char*)sourceval, &mDataSource); #ifdef DEBUG_alecf diff --git a/rdf/tests/dsds/nsRDFDataSourceFactory.cpp b/rdf/tests/dsds/nsRDFDataSourceFactory.cpp index 20daeda69f31..53372dea588b 100644 --- a/rdf/tests/dsds/nsRDFDataSourceFactory.cpp +++ b/rdf/tests/dsds/nsRDFDataSourceFactory.cpp @@ -60,12 +60,8 @@ nsresult NSRegisterSelf(nsISupports* aServMgr, const char* aPath) { nsresult rv; - NS_WITH_SERVICE1(nsIComponentManager, - compMgr, - aServMgr, - kComponentManagerCID, - &rv); - + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, aServMgr, &rv); if (NS_FAILED(rv)) return rv; rv = compMgr->RegisterComponent(kRDFDataSourceCID, @@ -80,12 +76,12 @@ NSRegisterSelf(nsISupports* aServMgr, const char* aPath) nsresult NSUnregisterSelf(nsISupports* aServMgr, const char* aPath) { - nsresult rv; - NS_WITH_SERVICE1(nsIComponentManager, compMgr, - aServMgr, kComponentManagerCID, &rv); - if (NS_FAILED(rv)) return rv; + nsresult rv; + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, aServMgr, &rv); + if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterComponent(kRDFDataSourceCID, aPath); + rv = compMgr->UnregisterComponent(kRDFDataSourceCID, aPath); - return rv; + return rv; } diff --git a/rdf/tests/rdfcat/rdfcat.cpp b/rdf/tests/rdfcat/rdfcat.cpp index 7973fffc5fa6..20701d476ea1 100644 --- a/rdf/tests/rdfcat/rdfcat.cpp +++ b/rdf/tests/rdfcat/rdfcat.cpp @@ -152,7 +152,8 @@ main(int argc, char** argv) NS_SetupRegistry(); // Get netlib off the floor... - NS_WITH_SERVICE(nsIEventQueueService, theEventQueueService, kEventQueueServiceCID, &rv); + nsCOMPtr theEventQueueService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = theEventQueueService->CreateThreadEventQueue(); diff --git a/rdf/tests/rdfpoll/rdfpoll.cpp b/rdf/tests/rdfpoll/rdfpoll.cpp index 17d6b1db6c5a..6c3ecd51baf6 100644 --- a/rdf/tests/rdfpoll/rdfpoll.cpp +++ b/rdf/tests/rdfpoll/rdfpoll.cpp @@ -281,7 +281,8 @@ main(int argc, char** argv) SetupRegistry(); // Get netlib off the floor... - NS_WITH_SERVICE(nsIEventQueueService, theEventQueueService, kEventQueueServiceCID, &rv); + nsCOMPtr theEventQueueService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = theEventQueueService->CreateThreadEventQueue(); diff --git a/uriloader/base/nsDocLoader.cpp b/uriloader/base/nsDocLoader.cpp index 3251ef2cbc29..fc2bcdf5f0fd 100644 --- a/uriloader/base/nsDocLoader.cpp +++ b/uriloader/base/nsDocLoader.cpp @@ -1254,8 +1254,8 @@ NS_IMETHODIMP nsDocLoaderImpl::OnRedirect(nsIHttpChannel *aOldChannel, nsIChanne if (NS_FAILED(rv)) return rv; // verify that this is a legal redirect - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = securityManager->CheckLoadURI(oldURI, newURI, nsIScriptSecurityManager::DISALLOW_FROM_MAIL); diff --git a/uriloader/base/nsURILoader.cpp b/uriloader/base/nsURILoader.cpp index c04ff041826d..e0a0975ba22e 100644 --- a/uriloader/base/nsURILoader.cpp +++ b/uriloader/base/nsURILoader.cpp @@ -380,7 +380,8 @@ nsresult nsDocumentOpenInfo::RetargetOutput(nsIRequest *request, const char * aS // because we said we could handle "*/*" in our accept headers if (aOutContentType && *aOutContentType && nsCRT::strcasecmp(aSrcContentType, aOutContentType) && nsCRT::strcmp(aSrcContentType, "*/*")) { - NS_WITH_SERVICE(nsIStreamConverterService, StreamConvService, kStreamConverterServiceCID, &rv); + nsCOMPtr StreamConvService = + do_GetService(kStreamConverterServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsAutoString from_w; from_w.AssignWithConversion (aSrcContentType); nsAutoString to_w; to_w.AssignWithConversion (aOutContentType); diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index b5963908d148..615347ff28f8 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -868,7 +868,8 @@ nsresult nsExternalAppHandler::SetUpTempFile(nsIChannel * aChannel) mTempFile->CreateUnique(nsnull, nsIFile::NORMAL_FILE_TYPE, 0644); NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID); - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr fileTransport; diff --git a/view/src/nsViewManager.cpp b/view/src/nsViewManager.cpp index acc7c6ba7fdf..01d4e6fbc4de 100644 --- a/view/src/nsViewManager.cpp +++ b/view/src/nsViewManager.cpp @@ -592,7 +592,8 @@ NS_IMETHODIMP nsViewManager::Init(nsIDeviceContext* aContext, nscoord aX, nscoor if (nsnull == mEventQueue) { // Cache the event queue of the current UI thread - NS_WITH_SERVICE(nsIEventQueueService, eventService, kEventQueueServiceCID, &rv); + nsCOMPtr eventService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv) && (nsnull != eventService)) { // XXX this implies that the UI is the current thread. rv = eventService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(mEventQueue)); } diff --git a/view/src/nsViewManager2.cpp b/view/src/nsViewManager2.cpp index 4a2f9e10161c..fcc3cd068043 100755 --- a/view/src/nsViewManager2.cpp +++ b/view/src/nsViewManager2.cpp @@ -382,7 +382,8 @@ NS_IMETHODIMP nsViewManager2::Init(nsIDeviceContext* aContext, nscoord aX, nscoo if (nsnull == mEventQueue) { // Cache the event queue of the current UI thread - NS_WITH_SERVICE(nsIEventQueueService, eventService, kEventQueueServiceCID, &rv); + nsCOMPtr eventService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv) && (nsnull != eventService)) { // XXX this implies that the UI is the current thread. rv = eventService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(mEventQueue)); } diff --git a/webshell/tests/viewer/nsBrowserWindow.cpp b/webshell/tests/viewer/nsBrowserWindow.cpp index ca70eebc4a7b..cb87d8907eff 100644 --- a/webshell/tests/viewer/nsBrowserWindow.cpp +++ b/webshell/tests/viewer/nsBrowserWindow.cpp @@ -1020,7 +1020,7 @@ nsBrowserWindow::DispatchMenuItem(PRInt32 aID) (nsISupports **)&walletservice); if ((NS_OK == res) && (nsnull != walletservice)) { nsIURI * url; - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &res); + nsCOMPtr service(do_GetService(kIOServiceCID, &res)); if (NS_FAILED(res)) return nsEventStatus_eIgnore; nsIURI *uri = nsnull; @@ -1280,7 +1280,7 @@ GetTitleSuffix(void) return suffix; } nsIURI* url = nsnull; - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &ret); + nsCOMPtr service(do_GetService(kIOServiceCID, &ret)); if (NS_FAILED(ret)) return ret; nsIURI *uri = nsnull; diff --git a/webshell/tests/viewer/nsMacMain.cpp b/webshell/tests/viewer/nsMacMain.cpp index f34f01ffb00a..d9b516756d78 100644 --- a/webshell/tests/viewer/nsMacMain.cpp +++ b/webshell/tests/viewer/nsMacMain.cpp @@ -354,7 +354,8 @@ nsNativeBrowserWindow::DispatchMenuItem(PRInt32 aID) case cmd_DumpLeaks: { nsresult rv; - NS_WITH_SERVICE(nsILeakDetector, leakDetector, "@mozilla.org/xpcom/leakdetector;1", &rv) + nsCOMPtr leakDetector = + do_GetService("@mozilla.org/xpcom/leakdetector;1", &rv); if (NS_SUCCEEDED(rv)) leakDetector->DumpLeaks(); } diff --git a/webshell/tests/viewer/nsViewerApp.cpp b/webshell/tests/viewer/nsViewerApp.cpp index 9bcaf7f5aed9..d1cbb9d01a12 100644 --- a/webshell/tests/viewer/nsViewerApp.cpp +++ b/webshell/tests/viewer/nsViewerApp.cpp @@ -261,7 +261,8 @@ nsViewerApp::SetupRegistry() NS_RELEASE(bwf); // register the cookie manager - NS_WITH_SERVICE(nsICookieService, cookieService, kCookieServiceCID, &rv); + nsCOMPtr cookieService = + do_GetService(kCookieServiceCID, &rv); if (NS_FAILED(rv) || (nsnull == cookieService)) { #ifdef DEBUG printf("Unable to instantiate Cookie Manager\n"); diff --git a/webshell/tests/viewer/nsWinMain.cpp b/webshell/tests/viewer/nsWinMain.cpp index 5b4ac2e3ce98..081cd36005cf 100644 --- a/webshell/tests/viewer/nsWinMain.cpp +++ b/webshell/tests/viewer/nsWinMain.cpp @@ -58,7 +58,7 @@ nsNativeViewerApp::Run() int keepGoing = 1; nsresult rv; - NS_WITH_SERVICE(nsITimerQueue, queue, kTimerManagerCID, &rv); + nsCOMPtr queue(do_GetService(kTimerManagerCID, &rv)); if (NS_FAILED(rv)) return 0; // Pump all messages diff --git a/widget/src/beos/nsDragService.cpp b/widget/src/beos/nsDragService.cpp index aab49a2d537f..888973e9c860 100644 --- a/widget/src/beos/nsDragService.cpp +++ b/widget/src/beos/nsDragService.cpp @@ -112,7 +112,7 @@ void nsDragService::SetTopLevelView(BView *v) // Get the DragService from the service manager. nsresult rv; - NS_WITH_SERVICE(nsIDragService, dragService, kCDragServiceCID, &rv); + nsCOMPtr dragService(do_GetService(kCDragServiceCID, &rv)); if (NS_FAILED(rv)) { return; diff --git a/widget/src/beos/nsFilePicker.cpp b/widget/src/beos/nsFilePicker.cpp index 3bdfe06591b0..5aa94742bc43 100644 --- a/widget/src/beos/nsFilePicker.cpp +++ b/widget/src/beos/nsFilePicker.cpp @@ -333,7 +333,8 @@ char * nsFilePicker::ConvertToFileSystemCharset(const PRUnichar *inString) nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeEncoder(&fileSystemCharset, &mUnicodeEncoder); } @@ -370,7 +371,8 @@ PRUnichar * nsFilePicker::ConvertFromFileSystemCharset(const char *inString) nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeDecoder(&fileSystemCharset, &mUnicodeDecoder); } diff --git a/widget/src/gtk/nsFileWidget.cpp b/widget/src/gtk/nsFileWidget.cpp index dd4af7660fd1..b39971159089 100644 --- a/widget/src/gtk/nsFileWidget.cpp +++ b/widget/src/gtk/nsFileWidget.cpp @@ -438,7 +438,8 @@ NS_IMETHODIMP nsFileWidget::Create(nsIWidget *aParent, } // get an unicode converter - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeEncoder(&localeCharset, &gUnicodeEncoder); } diff --git a/widget/src/gtk/nsGtkIMEHelper.cpp b/widget/src/gtk/nsGtkIMEHelper.cpp index df725cfd6e17..d3ef59eac819 100644 --- a/widget/src/gtk/nsGtkIMEHelper.cpp +++ b/widget/src/gtk/nsGtkIMEHelper.cpp @@ -87,8 +87,8 @@ void nsGtkIMEHelper::SetupUnicodeDecoder() { mDecoder = nsnull; nsresult result = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPlatformCharset, platform, NS_PLATFORMCHARSET_CONTRACTID, - &result); + nsCOMPtr platform = + do_GetService(NS_PLATFORMCHARSET_CONTRACTID, &result); if (platform && NS_SUCCEEDED(result)) { nsAutoString charset; charset.AssignWithConversion(""); @@ -1173,7 +1173,7 @@ nsIMEGtkIC::GetInputStyle() { return ret_style; #endif - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (!NS_FAILED(rv) && (prefs)) { char *input_style; rv = prefs->CopyCharPref(PREF_XIM_INPUTSTYLE, &input_style); diff --git a/widget/src/gtk/nsGtkMozRemoteHelper.cpp b/widget/src/gtk/nsGtkMozRemoteHelper.cpp index 863c076bfc0f..4ed102912ec2 100644 --- a/widget/src/gtk/nsGtkMozRemoteHelper.cpp +++ b/widget/src/gtk/nsGtkMozRemoteHelper.cpp @@ -648,7 +648,7 @@ nsGtkMozRemoteHelper::OpenURL (const char *aURL, PRBool aNewWindow, PRBoo nsString newURL; nsCString navChromeURL; nsXPIDLCString tempString; - NS_WITH_SERVICE(nsIPref, prefs, "@mozilla.org/preferences;1", &rv); + nsCOMPtr prefs(do_GetService("@mozilla.org/preferences;1", &rv)); if (NS_SUCCEEDED(rv)) prefs->CopyCharPref("browser.chromeURL", getter_Copies(tempString)); // make a copy for the auto string @@ -767,8 +767,8 @@ nsGtkMozRemoteHelper::MailTo (const PRUnichar *aToList) #ifdef MOZ_MAIL_NEWS nsresult rv; // get the messenger compose service - NS_WITH_SERVICE(nsIMsgComposeService, composeService, - "@mozilla.org/messengercompose;1", &rv); + nsCOMPtr composeService = + do_GetService("@mozilla.org/messengercompose;1", &rv); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; if (aToList) @@ -833,7 +833,8 @@ NS_METHOD nsGtkMozRemoteHelper::GetLastBrowserWindow (nsIDOMWindow **_retval) browserString.AssignWithConversion("navigator:browser"); // get the window mediator service - NS_WITH_SERVICE(nsIWindowMediator, windowMediator, kWindowMediatorCID, &rv); + nsCOMPtr windowMediator = + do_GetService(kWindowMediatorCID, &rv); if (NS_FAILED(rv)) return rv; diff --git a/widget/src/gtk/nsWidget.cpp b/widget/src/gtk/nsWidget.cpp index 7669c68d7ec1..14ab63b560e1 100644 --- a/widget/src/gtk/nsWidget.cpp +++ b/widget/src/gtk/nsWidget.cpp @@ -2606,7 +2606,7 @@ static void debugSetupWindow (void) nsresult rv; debugCheckedDebugWindow = PR_TRUE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (!NS_FAILED(rv) && (prefs)) { rv = prefs->GetBoolPref(debugPrefName, &enable_window); if (!NS_FAILED(rv) && enable_window) { @@ -2643,7 +2643,7 @@ static int debugWindowPrefChanged (const char *newpref, void *data) { PRBool enable_window; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (!NS_FAILED(rv) && (prefs)) { rv = prefs->GetBoolPref(debugPrefName, &enable_window); if (!NS_FAILED(rv) && enable_window) { @@ -2668,7 +2668,7 @@ static void debugRegisterCallback (void) // make sure we don't call in here again debugCallbackRegistered = PR_TRUE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (!NS_FAILED(rv)) { rv = prefs->RegisterCallback(debugPrefName, debugWindowPrefChanged, NULL); } diff --git a/widget/src/gtk/nsWindow.cpp b/widget/src/gtk/nsWindow.cpp index 9e1c81811763..7a824b263442 100644 --- a/widget/src/gtk/nsWindow.cpp +++ b/widget/src/gtk/nsWindow.cpp @@ -2211,7 +2211,8 @@ NS_IMETHODIMP nsWindow::SetTitle(const nsString& aTitle) platformCharset.AssignWithConversion("ISO-8859-1"); // get the encoder - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); + nsCOMPtr ccm = + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); rv = ccm->GetUnicodeEncoder(&platformCharset, getter_AddRefs(encoder)); // Estimate out length and allocate the buffer based on a worst-case estimate, then do diff --git a/widget/src/mac/nsMacControl.cpp b/widget/src/mac/nsMacControl.cpp index af0ba3ad41f7..bc1184cbb3d1 100644 --- a/widget/src/mac/nsMacControl.cpp +++ b/widget/src/mac/nsMacControl.cpp @@ -398,7 +398,8 @@ void nsMacControl::StringToStr255(const nsString& aText, Str255& aStr255) nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeEncoder(&fileSystemCharset, &mUnicodeEncoder); } @@ -436,7 +437,8 @@ void nsMacControl::Str255ToString(const Str255& aStr255, nsString& aText) nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeDecoder(&fileSystemCharset, &mUnicodeDecoder); } diff --git a/widget/src/mac/nsMenu.cpp b/widget/src/mac/nsMenu.cpp index 5c692722b85d..9182b9b3de0d 100644 --- a/widget/src/mac/nsMenu.cpp +++ b/widget/src/mac/nsMenu.cpp @@ -1303,7 +1303,8 @@ nsMenu::GetMenuPopupContent(nsIContent** aResult) *aResult = nsnull; nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if ( !xblService ) return; diff --git a/widget/src/mac/nsMenuX.cpp b/widget/src/mac/nsMenuX.cpp index 340860f95db5..7946b06a3c36 100644 --- a/widget/src/mac/nsMenuX.cpp +++ b/widget/src/mac/nsMenuX.cpp @@ -1154,7 +1154,8 @@ nsMenuX::GetMenuPopupContent(nsIContent** aResult) *aResult = nsnull; nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if ( !xblService ) return; diff --git a/widget/src/motif/app_context/nsMotifAppContextServiceFactory.cpp b/widget/src/motif/app_context/nsMotifAppContextServiceFactory.cpp index 5597c08a1a31..4ea1dfa7b1f8 100644 --- a/widget/src/motif/app_context/nsMotifAppContextServiceFactory.cpp +++ b/widget/src/motif/app_context/nsMotifAppContextServiceFactory.cpp @@ -131,7 +131,8 @@ NSRegisterSelf(nsISupports* aServMgr, const char *fullpath) serviceManager(do_QueryInterface(aServMgr, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; rv = compMgr->RegisterComponent(kCMotifAppContextServiceCID, @@ -151,7 +152,8 @@ NSUnregisterSelf(nsISupports *aServMgr, const char *fullpath) serviceManager(do_QueryInterface(aServMgr, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; compMgr->UnregisterComponent(kCMotifAppContextServiceCID, fullpath); diff --git a/widget/src/motif/nsAppShell.cpp b/widget/src/motif/nsAppShell.cpp index 65ae615a2036..4f0874c80f45 100644 --- a/widget/src/motif/nsAppShell.cpp +++ b/widget/src/motif/nsAppShell.cpp @@ -82,7 +82,8 @@ NS_METHOD nsAppShell::Create(int* bac, char ** bav) nsresult rv; - NS_WITH_SERVICE(nsICmdLineService, cmdLineArgs, kCmdLineServiceCID, &rv); + nsCOMPtr cmdLineArgs = + do_GetService(kCmdLineServiceCID, &rv); if (NS_SUCCEEDED(rv)) { rv = cmdLineArgs->GetArgc(&argc); @@ -140,7 +141,8 @@ NS_METHOD nsAppShell::Run() nsIEventQueue * EQueue = nsnull; // Get the event queue service - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) { NS_ASSERTION("Could not obtain event queue service", PR_FALSE); return rv; diff --git a/widget/src/os2/nsAppShell.cpp b/widget/src/os2/nsAppShell.cpp index ade916b79c40..48ffbb9dd870 100644 --- a/widget/src/os2/nsAppShell.cpp +++ b/widget/src/os2/nsAppShell.cpp @@ -155,7 +155,7 @@ nsresult nsAppShell::Run() #if 0 nsresult rv; - NS_WITH_SERVICE(nsITimerQueue, queue, kTimerManagerCID, &rv); + nsCOMPtr queue(do_GetService(kTimerManagerCID, &rv)); if (NS_FAILED(rv)) return rv; #endif @@ -245,7 +245,7 @@ nsresult nsAppShell::GetNativeEvent( PRBool &aRealEvent, void *&aEvent) #if 0 nsresult rv; - NS_WITH_SERVICE(nsITimerQueue, queue, kTimerManagerCID, &rv); + nsCOMPtr queue(do_GetService(kTimerManagerCID, &rv)); if (NS_FAILED(rv)) return rv; #endif diff --git a/widget/src/os2/nsFilePicker.cpp b/widget/src/os2/nsFilePicker.cpp index dbd2c1ad1525..1dd2dbea50ae 100644 --- a/widget/src/os2/nsFilePicker.cpp +++ b/widget/src/os2/nsFilePicker.cpp @@ -320,7 +320,8 @@ char * nsFilePicker::ConvertToFileSystemCharset(const PRUnichar *inString) nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeEncoder(&fileSystemCharset, &mUnicodeEncoder); } @@ -357,7 +358,8 @@ PRUnichar * nsFilePicker::ConvertFromFileSystemCharset(const char *inString) nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeDecoder(&fileSystemCharset, &mUnicodeDecoder); } diff --git a/widget/src/os2/nsFileWidget.cpp b/widget/src/os2/nsFileWidget.cpp index 2c9ef49d74de..4638f5cced86 100644 --- a/widget/src/os2/nsFileWidget.cpp +++ b/widget/src/os2/nsFileWidget.cpp @@ -375,7 +375,8 @@ char * nsFileWidget::ConvertToFileSystemCharset(const PRUnichar *inString, PRInt nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeEncoder(&fileSystemCharset, &mUnicodeEncoder); } diff --git a/widget/src/photon/nsAppShell.cpp b/widget/src/photon/nsAppShell.cpp index 6951f3983a86..23dfb7cbae7c 100644 --- a/widget/src/photon/nsAppShell.cpp +++ b/widget/src/photon/nsAppShell.cpp @@ -144,7 +144,8 @@ NS_IMETHODIMP nsAppShell::Create(int *bac, char **bav) nsresult rv; - NS_WITH_SERVICE(nsICmdLineService, cmdLineArgs, kCmdLineServiceCID, &rv); + nsCOMPtr cmdLineArgs = + do_GetService(kCmdLineServiceCID, &rv); if (NS_SUCCEEDED(rv)) { rv = cmdLineArgs->GetArgc(&argc); diff --git a/widget/src/windows/nsAppShell.cpp b/widget/src/windows/nsAppShell.cpp index 8cc72d40ab66..e631ec8953ae 100644 --- a/widget/src/windows/nsAppShell.cpp +++ b/widget/src/windows/nsAppShell.cpp @@ -84,7 +84,7 @@ NS_METHOD nsAppShell::Run(void) int keepGoing = 1; nsresult rv; - NS_WITH_SERVICE(nsITimerQueue, queue, kTimerManagerCID, &rv); + nsCOMPtr queue(do_GetService(kTimerManagerCID, &rv)); if (NS_FAILED(rv)) return rv; gKeepGoing = 1; @@ -152,7 +152,7 @@ nsAppShell::GetNativeEvent(PRBool &aRealEvent, void *&aEvent) BOOL gotMessage = false; nsresult rv; - NS_WITH_SERVICE(nsITimerQueue, queue, kTimerManagerCID, &rv); + nsCOMPtr queue(do_GetService(kTimerManagerCID, &rv)); if (NS_FAILED(rv)) return rv; do { diff --git a/widget/src/windows/nsFilePicker.cpp b/widget/src/windows/nsFilePicker.cpp index cc41557707cf..a93a6848d315 100644 --- a/widget/src/windows/nsFilePicker.cpp +++ b/widget/src/windows/nsFilePicker.cpp @@ -365,7 +365,8 @@ char * nsFilePicker::ConvertToFileSystemCharset(const PRUnichar *inString) nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeEncoder(&fileSystemCharset, &mUnicodeEncoder); } @@ -402,7 +403,8 @@ PRUnichar * nsFilePicker::ConvertFromFileSystemCharset(const char *inString) nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeDecoder(&fileSystemCharset, &mUnicodeDecoder); } diff --git a/widget/src/windows/nsFileWidget.cpp b/widget/src/windows/nsFileWidget.cpp index aa11702f84dc..4d26855b0b21 100644 --- a/widget/src/windows/nsFileWidget.cpp +++ b/widget/src/windows/nsFileWidget.cpp @@ -408,7 +408,8 @@ char * nsFileWidget::ConvertToFileSystemCharset(const PRUnichar *inString, PRInt nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeEncoder(&fileSystemCharset, &mUnicodeEncoder); } @@ -446,7 +447,8 @@ PRUnichar * nsFileWidget::ConvertFromFileSystemCharset(const char *inString) nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeDecoder(&fileSystemCharset, &mUnicodeDecoder); } diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp index 650365a2b385..186519e650f7 100644 --- a/widget/src/windows/nsWindow.cpp +++ b/widget/src/windows/nsWindow.cpp @@ -2955,7 +2955,8 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM wParam, LPARAM lParam, LRESULT case WM_ENTERIDLE: { nsresult rv; - NS_WITH_SERVICE(nsITimerQueue, queue, kTimerManagerCID, &rv); + nsCOMPtr queue = + do_GetService(kTimerManagerCID, &rv); if (!NS_FAILED(rv)) { if (queue->HasReadyTimers(NS_PRIORITY_LOWEST)) { diff --git a/widget/src/xlib/nsWindow.cpp b/widget/src/xlib/nsWindow.cpp index 0fc665681c7f..eb5d3f84fa2c 100644 --- a/widget/src/xlib/nsWindow.cpp +++ b/widget/src/xlib/nsWindow.cpp @@ -777,7 +777,8 @@ NS_IMETHODIMP nsWindow::SetTitle(const nsString& aTitle) platformCharset.AssignWithConversion("ISO-8859-1"); /* get the encoder */ - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); + nsCOMPtr ccm = + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); rv = ccm->GetUnicodeEncoder(&platformCharset, getter_AddRefs(encoder)); /* Estimate out length and allocate the buffer based on a worst-case estimate, then do diff --git a/widget/src/xlib/window_service/nsXlibWindowServiceFactory.cpp b/widget/src/xlib/window_service/nsXlibWindowServiceFactory.cpp index 486237808fd9..ac0ec4cf6e89 100644 --- a/widget/src/xlib/window_service/nsXlibWindowServiceFactory.cpp +++ b/widget/src/xlib/window_service/nsXlibWindowServiceFactory.cpp @@ -132,7 +132,8 @@ NSRegisterSelf(nsISupports* aServMgr, const char *fullpath) serviceManager(do_QueryInterface(aServMgr, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; rv = compMgr->RegisterComponent(kCXlibWindowServiceCID, @@ -152,7 +153,8 @@ NSUnregisterSelf(nsISupports *aServMgr, const char *fullpath) serviceManager(do_QueryInterface(aServMgr, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; compMgr->UnregisterComponent(kCXlibWindowServiceCID, fullpath); diff --git a/widget/src/xpwidgets/nsPrimitiveHelpers.cpp b/widget/src/xpwidgets/nsPrimitiveHelpers.cpp index 80b40602181c..99905e218cea 100644 --- a/widget/src/xpwidgets/nsPrimitiveHelpers.cpp +++ b/widget/src/xpwidgets/nsPrimitiveHelpers.cpp @@ -152,7 +152,8 @@ nsPrimitiveHelpers :: ConvertUnicodeToPlatformPlainText ( PRUnichar* inUnicode, #if 0 // get the encoder - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); + nsCOMPtr ccm = + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); rv = ccm->GetUnicodeEncoder(&platformCharset, getter_AddRefs(encoder)); // Estimate out length and allocate the buffer based on a worst-case estimate, then do @@ -218,7 +219,8 @@ nsPrimitiveHelpers :: ConvertPlatformPlainTextToUnicode ( const char* inText, PR platformCharset.AssignWithConversion("ISO-8859-1"); // get the decoder - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); + nsCOMPtr ccm = + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); rv = ccm->GetUnicodeDecoder(&platformCharset, getter_AddRefs(decoder)); hasConverter = PR_TRUE; diff --git a/widget/src/xpwidgets/nsXPLookAndFeel.cpp b/widget/src/xpwidgets/nsXPLookAndFeel.cpp index cdf308ae334b..6a0c9bcf1846 100644 --- a/widget/src/xpwidgets/nsXPLookAndFeel.cpp +++ b/widget/src/xpwidgets/nsXPLookAndFeel.cpp @@ -216,7 +216,7 @@ static int PR_CALLBACK intPrefChanged (const char *newpref, void *data) if (np) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefService, kPrefServiceCID, &rv); + nsCOMPtr prefService(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED(rv) && prefService) { PRInt32 intpref; @@ -240,7 +240,7 @@ static int PR_CALLBACK floatPrefChanged (const char *newpref, void *data) if (np) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefService, kPrefServiceCID, &rv); + nsCOMPtr prefService(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED(rv) && prefService) { PRInt32 intpref; @@ -264,7 +264,7 @@ static int PR_CALLBACK colorPrefChanged (const char *newpref, void *data) if (np) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefService, kPrefServiceCID, &rv); + nsCOMPtr prefService(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED(rv) && prefService) { char *colorStr = 0; @@ -352,7 +352,7 @@ nsXPLookAndFeel::Init() sInitialized = PR_TRUE; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefService, kPrefServiceCID, &rv); + nsCOMPtr prefService(do_GetService(kPrefServiceCID, &rv)); if (NS_FAILED(rv) || !prefService) return; diff --git a/widget/timer/src/unix/motif/nsTimerMotifFactory.cpp b/widget/timer/src/unix/motif/nsTimerMotifFactory.cpp index a52648098f75..fa59c34ec985 100644 --- a/widget/timer/src/unix/motif/nsTimerMotifFactory.cpp +++ b/widget/timer/src/unix/motif/nsTimerMotifFactory.cpp @@ -140,7 +140,8 @@ NSRegisterSelf(nsISupports* aServMgr, const char *fullpath) serviceManager(do_QueryInterface(aServMgr, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; rv = compMgr->RegisterComponent(kCTimerMotif, @@ -162,7 +163,8 @@ NSUnregisterSelf(nsISupports* aServMgr, const char *fullpath) serviceManager(do_QueryInterface(aServMgr, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; compMgr->UnregisterComponent(kCTimerMotif, fullpath); diff --git a/xpcom/build/nsXPComInit.cpp b/xpcom/build/nsXPComInit.cpp index 343481851474..51f22428b155 100644 --- a/xpcom/build/nsXPComInit.cpp +++ b/xpcom/build/nsXPComInit.cpp @@ -439,7 +439,8 @@ nsresult NS_COM NS_ShutdownXPCOM(nsIServiceManager* servMgr) { // Block it so that the COMPtr will get deleted before we hit // servicemanager shutdown - NS_WITH_SERVICE (nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsIServiceManager *mgr; // NO COMPtr as we dont release the service manager @@ -456,8 +457,8 @@ nsresult NS_COM NS_ShutdownXPCOM(nsIServiceManager* servMgr) // grab the event queue so that we can process events one last time before exiting nsCOMPtr currentQ; { - NS_WITH_SERVICE(nsIEventQueueService, eventQService, - kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (eventQService) { eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(currentQ)); diff --git a/xpcom/components/nsComponentManager.cpp b/xpcom/components/nsComponentManager.cpp index 17696b74bfef..05fe9a20a897 100644 --- a/xpcom/components/nsComponentManager.cpp +++ b/xpcom/components/nsComponentManager.cpp @@ -2001,7 +2001,8 @@ nsComponentManagerImpl::AutoRegisterImpl(PRInt32 when, nsIFile *inDirSpec) dir = inDirSpec; // Set components' directory for AutoRegisterInterfces to query - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; // Don't care if undefining fails @@ -2012,7 +2013,8 @@ nsComponentManagerImpl::AutoRegisterImpl(PRInt32 when, nsIFile *inDirSpec) else { // Do default components directory - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = directoryService->Get(NS_XPCOM_COMPONENT_DIR, NS_GET_IID(nsIFile), getter_AddRefs(dir)); @@ -2026,7 +2028,8 @@ nsComponentManagerImpl::AutoRegisterImpl(PRInt32 when, nsIFile *inDirSpec) return NS_ERROR_UNEXPECTED; // Notify observers of xpcom autoregistration start - NS_WITH_SERVICE (nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) { diff --git a/xpcom/components/nsIServiceManager.h b/xpcom/components/nsIServiceManager.h index c17ba1da7d33..21579dea0d3f 100644 --- a/xpcom/components/nsIServiceManager.h +++ b/xpcom/components/nsIServiceManager.h @@ -379,45 +379,6 @@ CallGetService( const char *aContractID, nsnull); } -//////////////////////////////////////////////////////////////////////////////// -// NS_WITH_SERVICE: macro to make using services easier. -// -// Services can be used with COMPtrs. GetService() is used to get a service. -// NS_RELEASE() can be called on the service got to release it. -// -// NOTE: ReleaseService() is OBSOLETE. -// -// NOTE: NS_WITH_SERVICE is deprecated. This: -// { -// nsCOMPtr service( do_GetService(NS_MYSERVICE_CONTRACTID, &rv) ); -// if (NS_FAILED(rv)) return rv; -// service->Doit(...); // use my service -// } -// is preferred over either of the blocks of code below. -// -// Back when NS_WITH_SERVICE wasn't deprecated you could replace this: -// { -// nsIMyService* service; -// rv = nsServiceManager::GetService(kMyServiceCID, NS_GET_IID(nsIMyService), -// &service); -// if (NS_FAILED(rv)) return rv; -// service->Doit(...); // use my service -// rv = nsServiceManager::ReleaseService(kMyServiceCID, service); -// } -// with this: -// { -// NS_WITH_SERVICE(nsIMyService, service, kMyServiceCID, &rv); -// if (NS_FAILED(rv)) return rv; -// service->Doit(...); // use my service -// } -// and the automatic destructor from COMPtr will take care of releasing the service. -//////////////////////////////////////////////////////////////////////////////// -#define NS_WITH_SERVICE(T, var, cid, rvAddr) \ - nsCOMPtr var = do_GetService(cid, rvAddr); - -#define NS_WITH_SERVICE1(T, var, isupportsServMgr, cid, rvAddr) \ - nsCOMPtr var = do_GetService(cid, isupportsServMgr, rvAddr); - //////////////////////////////////////////////////////////////////////////////// // NS_NewServiceManager: For when you want to create a service manager // in a given context. diff --git a/xpcom/components/nsNativeComponentLoader.cpp b/xpcom/components/nsNativeComponentLoader.cpp index 879cdeb8743d..c901412c8abd 100644 --- a/xpcom/components/nsNativeComponentLoader.cpp +++ b/xpcom/components/nsNativeComponentLoader.cpp @@ -665,7 +665,8 @@ nsNativeComponentLoader::AutoUnregisterComponent(PRInt32 when, if (NS_FAILED(rv)) return rv; // Notify observers, if any, of autoregistration work - NS_WITH_SERVICE (nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsIServiceManager *mgr; // NO COMPtr as we dont release the service manager @@ -821,7 +822,8 @@ nsNativeComponentLoader::AutoRegisterComponent(PRInt32 when, // Notify observers, if any, of autoregistration work - NS_WITH_SERVICE (nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsIServiceManager *mgr; // NO COMPtr as we dont release the service manager diff --git a/xpcom/ds/nsIStopwatch.idl b/xpcom/ds/nsIStopwatch.idl index c5407f0b54cc..92355b3a7a03 100644 --- a/xpcom/ds/nsIStopwatch.idl +++ b/xpcom/ds/nsIStopwatch.idl @@ -125,7 +125,8 @@ interface nsIStopwatch : nsISupports if (_stopwatch == nsnull) { \ nsresult _rv; \ static NS_DEFINE_CID(kStopwatchServiceCID, NS_STOPWATCHSERVICE_CID); \ - NS_WITH_SERVICE(nsIStopwatchService, _serv, kStopwatchServiceCID, &_rv); \ + nsCOMPtr _serv = \ + do_GetService(kStopwatchServiceCID, &_rv); \ if (NS_SUCCEEDED(_rv)) { \ _rv = _serv->CreateStopwatch(#_stopwatch, _countUnits, _perThread, \ &_stopwatch); \ diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp index d0d7cb4c3d75..104622ae874d 100755 --- a/xpcom/io/nsAppFileLocationProvider.cpp +++ b/xpcom/io/nsAppFileLocationProvider.cpp @@ -211,7 +211,8 @@ NS_METHOD nsAppFileLocationProvider::CloneMozBinDirectory(nsILocalFile **aLocalF // This will be set if a directory was passed to NS_InitXPCOM // 2. If that doesn't work, set it to be the current process directory - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; @@ -253,7 +254,8 @@ NS_METHOD nsAppFileLocationProvider::GetProductDirectory(nsILocalFile **aLocalFi nsCOMPtr localDir; #if defined(XP_MAC) - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; OSErr err; long response; @@ -262,12 +264,14 @@ NS_METHOD nsAppFileLocationProvider::GetProductDirectory(nsILocalFile **aLocalFi rv = directoryService->Get(prop, NS_GET_IID(nsILocalFile), getter_AddRefs(localDir)); if (NS_FAILED(rv)) return rv; #elif defined(XP_OS2) - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = directoryService->Get(NS_OS2_HOME_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(localDir)); if (NS_FAILED(rv)) return rv; #elif defined(XP_PC) - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = directoryService->Get(NS_WIN_APPDATA_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(localDir)); if (NS_SUCCEEDED(rv)) diff --git a/xpcom/io/nsFileSpec.cpp b/xpcom/io/nsFileSpec.cpp index 4a2ca07f7237..ffc211996553 100644 --- a/xpcom/io/nsFileSpec.cpp +++ b/xpcom/io/nsFileSpec.cpp @@ -1193,7 +1193,8 @@ PRUnichar * nsFileSpec::ConvertFromFileSystemCharset(const char *inString) nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeDecoder(&fileSystemCharset, &aUnicodeDecoder); } diff --git a/xpcom/io/nsIFile.idl b/xpcom/io/nsIFile.idl index cd33061feefa..9f7f2d17b95b 100644 --- a/xpcom/io/nsIFile.idl +++ b/xpcom/io/nsIFile.idl @@ -329,7 +329,7 @@ NS_GetSpecialDirectory(const char* specialDirName, nsIFile* *result) { nsresult rv; static NS_DEFINE_CID(kDirectoryServiceCID, NS_DIRECTORY_SERVICE_CID); - NS_WITH_SERVICE(nsIProperties, serv, kDirectoryServiceCID, &rv); + nsCOMPtr serv(do_GetService(kDirectoryServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsCOMPtr dir; diff --git a/xpcom/io/nsLocalFileCommon.cpp b/xpcom/io/nsLocalFileCommon.cpp index 1107f726115d..7376412fdf9f 100644 --- a/xpcom/io/nsLocalFileCommon.cpp +++ b/xpcom/io/nsLocalFileCommon.cpp @@ -136,7 +136,8 @@ nsFSStringConversion::PrepareFSCharset() if(!mFSCharset) { // lazy eval of the file system charset - NS_WITH_SERVICE(nsIPlatformCharset, pcharset, NS_PLATFORMCHARSET_CONTRACTID, &res); + nsCOMPtr pcharset = + do_GetService(NS_PLATFORMCHARSET_CONTRACTID, &res); if (NS_SUCCEEDED(res) && !pcharset) res = NS_ERROR_NULL_POINTER; if (NS_SUCCEEDED(res)) { mFSCharset = new nsString(); @@ -163,8 +164,8 @@ nsFSStringConversion::PrepareEncoder() { res = PrepareFSCharset(); if(NS_SUCCEEDED(res)) { - NS_WITH_SERVICE(nsICharsetConverterManager, - ucmgr, NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res); + nsCOMPtr ucmgr = + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res); NS_ASSERTION((NS_SUCCEEDED(res) && ucmgr), "cannot get charset converter manager "); if(NS_SUCCEEDED(res) && ucmgr) @@ -186,8 +187,8 @@ nsFSStringConversion::PrepareDecoder() { res = PrepareFSCharset(); if(NS_SUCCEEDED(res)) { - NS_WITH_SERVICE(nsICharsetConverterManager, - ucmgr, NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res); + nsCOMPtr ucmgr = + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res); NS_ASSERTION((NS_SUCCEEDED(res) && ucmgr), "cannot get charset converter manager "); if(NS_SUCCEEDED(res) && ucmgr) @@ -423,7 +424,7 @@ nsresult nsLocalFile::ParseURL(const char* inURL, char **outHost, char **outDire } } - NS_WITH_SERVICE(nsIURLParser, parser, kStdURLParserCID, &rv); + nsCOMPtr parser(do_GetService(kStdURLParserCID, &rv)); if (NS_FAILED(rv)) return rv; nsXPIDLCString ePath; diff --git a/xpcom/io/nsLocalFileMac.cpp b/xpcom/io/nsLocalFileMac.cpp index 15ec778e2e11..324078869784 100644 --- a/xpcom/io/nsLocalFileMac.cpp +++ b/xpcom/io/nsLocalFileMac.cpp @@ -3089,7 +3089,8 @@ nsresult nsLocalFile::SetOSTypeAndCreatorFromExtension(const char* extension) ++extPtr; } - NS_WITH_SERVICE(nsIInternetConfigService, icService, NS_INTERNETCONFIGSERVICE_CONTRACTID, &rv); + nsCOMPtr icService = + do_GetService(NS_INTERNETCONFIGSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsCOMPtr mimeInfo; diff --git a/xpcom/io/nsUnicharInputStream.cpp b/xpcom/io/nsUnicharInputStream.cpp index 3ca1a85f994c..6b9d1143ef1b 100644 --- a/xpcom/io/nsUnicharInputStream.cpp +++ b/xpcom/io/nsUnicharInputStream.cpp @@ -151,7 +151,8 @@ NS_NewB2UConverter(nsIUnicodeDecoder** aInstancePtrResult, if (aCharSet == nsnull) aCharSet = &defaultCharset; - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &res); if (NS_FAILED(res)) return res; return ccm->GetUnicodeDecoder(aCharSet, aInstancePtrResult); diff --git a/xpcom/proxy/public/nsProxiedService.h b/xpcom/proxy/public/nsProxiedService.h index 8c41e46ed6f6..5289c8ff365f 100644 --- a/xpcom/proxy/public/nsProxiedService.h +++ b/xpcom/proxy/public/nsProxiedService.h @@ -33,10 +33,12 @@ // Now you can replace this: // { // nsresult rv; -// NS_WITH_SERVICE(nsIMyService, pIMyService, kMyServiceCID, &rv); +// nsCOMPtr pIMyService = +// do_GetService(kMyServiceCID, &rv); // if(NS_FAILED(rv)) // return; -// NS_WITH_SERVICE(nsIProxyObjectManager, pIProxyObjectManager, kProxyObjectManagerCID, &rv); +// nsCOMPtr pIProxyObjectManager = +// do_GetService(kProxyObjectManagerCID, &rv); // if(NS_FAILED(rv)) // return; // nsIMyService pIProxiedObject = NULL; @@ -90,8 +92,8 @@ class nsProxiedService getter_AddRefs(mService)); if (NS_FAILED(*rv)) return; - NS_WITH_SERVICE(nsIProxyObjectManager, pIProxyObjectManager, - kProxyObjectManagerCID, rv); + nsCOMPtr pIProxyObjectManager = + do_GetService(kProxyObjectManagerCID, rv); if (NS_FAILED(*rv)) return; PRInt32 proxyType = PROXY_SYNC; diff --git a/xpcom/proxy/src/nsProxyObjectManager.cpp b/xpcom/proxy/src/nsProxyObjectManager.cpp index 8520dd6bf643..e74a2e8da060 100644 --- a/xpcom/proxy/src/nsProxyObjectManager.cpp +++ b/xpcom/proxy/src/nsProxyObjectManager.cpp @@ -182,7 +182,8 @@ nsProxyObjectManager::GetProxyForObject(nsIEventQueue *destQueue, // check to see if the destination Q is a special case. - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; diff --git a/xpcom/proxy/tests/proxytests.cpp b/xpcom/proxy/tests/proxytests.cpp index c0df560aaef1..9e4243077180 100644 --- a/xpcom/proxy/tests/proxytests.cpp +++ b/xpcom/proxy/tests/proxytests.cpp @@ -294,7 +294,8 @@ void TestCase_NestedLoop(void *arg) printf("Getting EventQueue...\n"); nsIEventQueue* eventQ; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv)) { rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, &eventQ); @@ -413,7 +414,8 @@ static void PR_CALLBACK EventLoop( void *arg ) printf("Creating EventQueue...\n"); nsIEventQueue* eventQ; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv)) { rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, &eventQ); if (NS_FAILED(rv)) diff --git a/xpcom/tests/PropertiesTest.cpp b/xpcom/tests/PropertiesTest.cpp index 532c7cb34480..4d94132dfeb3 100644 --- a/xpcom/tests/PropertiesTest.cpp +++ b/xpcom/tests/PropertiesTest.cpp @@ -106,10 +106,11 @@ main(int argc, char* argv[]) nsIInputStream* in = nsnull; - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &ret); + nsCOMPtr service(do_GetService(kIOServiceCID, &ret)); if (NS_FAILED(ret)) return ret; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &ret); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &ret); if (NS_FAILED(ret)) return ret; nsIChannel *channel = nsnull; diff --git a/xpcom/tests/windows/TestHelloXPLoop.cpp b/xpcom/tests/windows/TestHelloXPLoop.cpp index e4daee8a86d4..e99859d10598 100644 --- a/xpcom/tests/windows/TestHelloXPLoop.cpp +++ b/xpcom/tests/windows/TestHelloXPLoop.cpp @@ -59,7 +59,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prevInstance, LPSTR lpszCmdLine, nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup, nsnull); - NS_WITH_SERVICE(nsINativeApp, nativeAppService, kNativeAppCID, &rv); + nsCOMPtr nativeAppService(do_GetService(kNativeAppCID, &rv)); if(NS_FAILED(rv)) { @@ -131,7 +131,8 @@ LRESULT CALLBACK WndProc(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam) case WM_DESTROY: { nsresult rv; - NS_WITH_SERVICE(nsINativeApp, nativeAppService, kNativeAppCID, &rv); + nsCOMPtr nativeAppService = + do_GetService(kNativeAppCID, &rv); if(NS_FAILED(rv)) { ErrorBox("Could not get NativeAppService"); diff --git a/xpfe/appshell/src/nsAbout.cpp b/xpfe/appshell/src/nsAbout.cpp index bc9bc11699da..557af5b27da3 100644 --- a/xpfe/appshell/src/nsAbout.cpp +++ b/xpfe/appshell/src/nsAbout.cpp @@ -38,15 +38,15 @@ NS_IMETHODIMP nsAbout::NewChannel(nsIURI *aURI, nsIChannel **result) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if ( NS_FAILED(rv) ) return rv; nsCOMPtr tempChannel; rv = ioService->NewChannel(kURI, nsnull, getter_AddRefs(tempChannel)); - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; diff --git a/xpfe/appshell/src/nsAppShellService.cpp b/xpfe/appshell/src/nsAppShellService.cpp index 0d9865e1dbb6..cb01f9e5c4c5 100644 --- a/xpfe/appshell/src/nsAppShellService.cpp +++ b/xpfe/appshell/src/nsAppShellService.cpp @@ -282,7 +282,8 @@ nsAppShellService::EnumerateComponents( EnumeratorMemberFunction function ) { nsRegistryKey key; nsCOMPtr components; const char *failed = "GetService"; - NS_WITH_SERVICE(nsIRegistry, registry, NS_REGISTRY_CONTRACTID, &rv); + nsCOMPtr registry = + do_GetService(NS_REGISTRY_CONTRACTID, &rv); if ( NS_SUCCEEDED(rv) && ( failed = "Open" ) diff --git a/xpfe/appshell/src/nsCommandLineServiceMac.cpp b/xpfe/appshell/src/nsCommandLineServiceMac.cpp index 2e6f70694fbc..8b893dd4aab9 100644 --- a/xpfe/appshell/src/nsCommandLineServiceMac.cpp +++ b/xpfe/appshell/src/nsCommandLineServiceMac.cpp @@ -323,7 +323,8 @@ OSErr nsMacCommandLine::Quit(TAskSave askSave) //---------------------------------------------------------------------------------------- { nsresult rv; - NS_WITH_SERVICE(nsIAppShellService, appShellService, kAppShellServiceCID, &rv); + nsCOMPtr appShellService = + do_GetService(kAppShellServiceCID, &rv); if (NS_FAILED(rv)) return errAEEventNotHandled; diff --git a/xpfe/appshell/src/nsWindowMediator.cpp b/xpfe/appshell/src/nsWindowMediator.cpp index 2a0223c0fb2f..203c327ed959 100644 --- a/xpfe/appshell/src/nsWindowMediator.cpp +++ b/xpfe/appshell/src/nsWindowMediator.cpp @@ -983,7 +983,8 @@ nsWindowMediator::Init() (void**) &mInner))) return rv; - NS_WITH_SERVICE(nsIRDFContainerUtils, rdfc, kRDFContainerUtilsCID, &rv); + nsCOMPtr rdfc = + do_GetService(kRDFContainerUtilsCID, &rv); if (NS_FAILED(rv)) return rv; diff --git a/xpfe/bootstrap/nsAppRunner.cpp b/xpfe/bootstrap/nsAppRunner.cpp index 95620e685e02..cd014f4050cb 100644 --- a/xpfe/bootstrap/nsAppRunner.cpp +++ b/xpfe/bootstrap/nsAppRunner.cpp @@ -1004,7 +1004,8 @@ static nsresult VerifyInstallation(int argc, char **argv) nsresult rv; nsCOMPtr registryFile; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return NS_OK; rv = directoryService->Get(NS_OS_CURRENT_PROCESS_DIR, diff --git a/xpfe/browser/src/nsBrowserInstance.cpp b/xpfe/browser/src/nsBrowserInstance.cpp index 1c7aeb31e7a0..db131c70ff8d 100644 --- a/xpfe/browser/src/nsBrowserInstance.cpp +++ b/xpfe/browser/src/nsBrowserInstance.cpp @@ -219,7 +219,8 @@ public: mBuffer[avail] = '\0'; mCursor = mBuffer; - NS_WITH_SERVICE(nsIObserverService, obsServ, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr obsServ = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = obsServ->AddObserver(this, NS_LITERAL_STRING("EndDocumentLoad").get()); NS_ASSERTION(NS_SUCCEEDED(rv), "unable to add self to observer service"); @@ -246,9 +247,11 @@ public: nsresult rv; // make sure our timer is stopped first StopTimer(); - NS_WITH_SERVICE(nsIAppShellService, appShellServ, kAppShellServiceCID, &rv); + nsCOMPtr appShellServ = + do_GetService(kAppShellServiceCID, &rv); if(NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIProxyObjectManager, pIProxyObjectManager, kProxyObjectManagerCID, &rv); + nsCOMPtr pIProxyObjectManager = + do_GetService(kProxyObjectManagerCID, &rv); if(NS_FAILED(rv)) return rv; nsCOMPtr appShellProxy; rv = pIProxyObjectManager->GetProxyForObject(NS_UI_THREAD_EVENTQ, NS_GET_IID(nsIAppShellService), @@ -635,7 +638,8 @@ nsBrowserInstance::StartPageCycler(PRBool* aIsPageCycling) *aIsPageCycling = PR_FALSE; if (!sCmdLineURLUsed) { - NS_WITH_SERVICE(nsICmdLineService, cmdLineArgs, kCmdLineServiceCID, &rv); + nsCOMPtr cmdLineArgs = + do_GetService(kCmdLineServiceCID, &rv); if (NS_FAILED(rv)) { if (APP_DEBUG) fprintf(stderr, "Could not obtain CmdLine processing service\n"); return NS_ERROR_FAILURE; diff --git a/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/xpfe/components/bookmarks/src/nsBookmarksService.cpp index 336ab5439e7a..45bab0b76e74 100644 --- a/xpfe/components/bookmarks/src/nsBookmarksService.cpp +++ b/xpfe/components/bookmarks/src/nsBookmarksService.cpp @@ -480,14 +480,16 @@ BookmarkParser::Init(nsFileSpec *fileSpec, nsIRDFDataSource *aDataSource, nsresult rv; // determine default platform charset... - NS_WITH_SERVICE(nsIPlatformCharset, platformCharset, kPlatformCharsetCID, &rv); + nsCOMPtr platformCharset = + do_GetService(kPlatformCharsetCID, &rv); if (NS_SUCCEEDED(rv) && (platformCharset)) { nsAutoString defaultCharset; if (NS_SUCCEEDED(rv = platformCharset->GetCharset(kPlatformCharsetSel_4xBookmarkFile, defaultCharset))) { // found the default platform charset, now try and get a decoder from it to Unicode - NS_WITH_SERVICE(nsICharsetConverterManager, charsetConv, kCharsetConverterManagerCID, &rv); + nsCOMPtr charsetConv = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv) && (charsetConv)) { rv = charsetConv->GetUnicodeDecoder(&defaultCharset, getter_AddRefs(mUnicodeDecoder)); @@ -1655,7 +1657,7 @@ nsBookmarksService::Init() // determine what the name of the Personal Toolbar Folder is... // first from user preference, then string bundle, then hard-coded default - NS_WITH_SERVICE(nsIPref, prefServ, kPrefCID, &rv); + nsCOMPtr prefServ(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && (prefServ)) { char *prefVal = nsnull; @@ -1684,7 +1686,8 @@ nsBookmarksService::Init() } // Register as an observer of profile changes - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); NS_ASSERTION(observerService, "Could not get observer service."); if (observerService) { observerService->AddObserver(this, NS_LITERAL_STRING("profile-before-change").get()); @@ -2385,7 +2388,8 @@ nsBookmarksService::OnStopRequest(nsIRequest* request, nsISupports *ctxt, if ((openURLFlag == PR_TRUE) || (schedule.Find(NS_ConvertASCIItoUCS2("open"), PR_TRUE, 0) >= 0)) { - NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID, &rv); + nsCOMPtr appShell = + do_GetService(kAppShellServiceCID, &rv); if (NS_SUCCEEDED(rv)) { nsCOMPtr wwatch(do_GetService("@mozilla.org/embedcomp/window-watcher;1")); @@ -3942,7 +3946,7 @@ nsBookmarksService::GetBookmarksFile(nsFileSpec* aResult) // First we see if the user has set a pref for the location of the // bookmarks file. - NS_WITH_SERVICE(nsIPref, prefServ, kPrefCID, &rv); + nsCOMPtr prefServ(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv)) { nsXPIDLCString prefVal; rv = prefServ->CopyCharPref("browser.bookmarks.file", diff --git a/xpfe/components/directory/nsDirectoryViewer.cpp b/xpfe/components/directory/nsDirectoryViewer.cpp index 892663292c20..1d3475bf3f2f 100644 --- a/xpfe/components/directory/nsDirectoryViewer.cpp +++ b/xpfe/components/directory/nsDirectoryViewer.cpp @@ -494,7 +494,7 @@ nsHTTPIndexParser::OnStartRequest(nsIRequest *request, nsISupports* aContext) // Using XPConnect, wrap the HTTP index object... static NS_DEFINE_CID(kXPConnectCID, NS_XPCONNECT_CID); - NS_WITH_SERVICE(nsIXPConnect, xpc, kXPConnectCID, &rv); + nsCOMPtr xpc(do_GetService(kXPConnectCID, &rv)); if (NS_FAILED(rv)) return rv; nsCOMPtr wrapper; diff --git a/xpfe/components/history/src/nsGlobalHistory.cpp b/xpfe/components/history/src/nsGlobalHistory.cpp index ae4060af78e8..ead38455c0dd 100644 --- a/xpfe/components/history/src/nsGlobalHistory.cpp +++ b/xpfe/components/history/src/nsGlobalHistory.cpp @@ -1095,7 +1095,7 @@ nsGlobalHistory::SaveLastPageVisited(const char *aURL) if (!aURL) return NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return rv; rv = prefs->SetCharPref(PREF_BROWSER_HISTORY_LAST_PAGE_VISITED, aURL); @@ -1110,7 +1110,7 @@ nsGlobalHistory::GetLastPageVisited(char **_retval) if (!_retval) return NS_ERROR_NULL_POINTER; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return rv; nsXPIDLCString lastPageVisited; @@ -2054,7 +2054,7 @@ nsGlobalHistory::Init() // we'd like to get this pref when we need it, but at that point, // we can't get the pref service. This means if the user changes // this pref, we won't notice until the next time we run. - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv)) rv = prefs->GetIntPref(PREF_BROWSER_HISTORY_EXPIRE_DAYS, &mExpireDays); @@ -2094,7 +2094,8 @@ nsGlobalHistory::Init() } // register to observe profile changes - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); NS_ASSERTION(observerService, "failed to get observer service"); if (observerService) { observerService->AddObserver(this, NS_LITERAL_STRING("profile-before-change").get()); @@ -3597,7 +3598,7 @@ nsGlobalHistory::OnStartLookup(const PRUnichar *searchString, nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return rv; PRBool enabled = PR_FALSE; diff --git a/xpfe/components/related/src/nsRelatedLinksHandler.cpp b/xpfe/components/related/src/nsRelatedLinksHandler.cpp index 8be4676a576c..01430badab01 100644 --- a/xpfe/components/related/src/nsRelatedLinksHandler.cpp +++ b/xpfe/components/related/src/nsRelatedLinksHandler.cpp @@ -622,7 +622,7 @@ RelatedLinksHandlerImpl::Init() gRDFService->GetResource(NC_NAMESPACE_URI "RelatedLinksTopic", &kNC_RelatedLinksTopic); gRDFService->GetResource(NC_NAMESPACE_URI "child", &kNC_Child); - NS_WITH_SERVICE(nsIPref, prefServ, kPrefCID, &rv); + nsCOMPtr prefServ(do_GetService(kPrefCID, &rv)); mRLServerURL = new nsString(); if (NS_SUCCEEDED(rv) && (prefServ)) { diff --git a/xpfe/components/search/src/nsInternetSearchService.cpp b/xpfe/components/search/src/nsInternetSearchService.cpp index 450c60ef8428..54eacd5a21ad 100755 --- a/xpfe/components/search/src/nsInternetSearchService.cpp +++ b/xpfe/components/search/src/nsInternetSearchService.cpp @@ -884,7 +884,8 @@ InternetSearchDataSource::Init() DeferredInit(); // Register as a profile change obsevrer - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (observerService) { observerService->AddObserver(this, NS_LITERAL_STRING("profile-before-change").get()); observerService->AddObserver(this, NS_LITERAL_STRING("profile-do-change").get()); @@ -2426,8 +2427,8 @@ InternetSearchDataSource::GetInternetSearchURL(const char *searchEngineURI, char *utf8data = text.ToNewUTF8String(); if (utf8data) { - NS_WITH_SERVICE(nsITextToSubURI, textToSubURI, - kTextToSubURICID, &rv); + nsCOMPtr textToSubURI = + do_GetService(kTextToSubURICID, &rv); if (NS_SUCCEEDED(rv) && (textToSubURI)) { PRUnichar *uni = nsnull; @@ -3509,8 +3510,8 @@ InternetSearchDataSource::DoSearch(nsIRDFResource *source, nsIRDFResource *engin // "interpret/resultTranslationFont" since we always convert results to Unicode if (resultEncodingStr.Length() > 0) { - NS_WITH_SERVICE(nsICharsetConverterManager, charsetConv, - kCharsetConverterManagerCID, &rv); + nsCOMPtr charsetConv = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv) && (charsetConv)) { rv = charsetConv->GetUnicodeDecoder(&resultEncodingStr, @@ -3535,8 +3536,8 @@ InternetSearchDataSource::DoSearch(nsIRDFResource *source, nsIRDFResource *engin char *utf8data = textTemp.ToNewUTF8String(); if (utf8data) { - NS_WITH_SERVICE(nsITextToSubURI, textToSubURI, - kTextToSubURICID, &rv); + nsCOMPtr textToSubURI = + do_GetService(kTextToSubURICID, &rv); if (NS_SUCCEEDED(rv) && (textToSubURI)) { PRUnichar *uni = nsnull; diff --git a/xpfe/components/search/src/nsLocalSearchService.cpp b/xpfe/components/search/src/nsLocalSearchService.cpp index e65e72495058..502ef3c60612 100755 --- a/xpfe/components/search/src/nsLocalSearchService.cpp +++ b/xpfe/components/search/src/nsLocalSearchService.cpp @@ -301,8 +301,8 @@ LocalSearchDataSource::parseResourceIntoFindTokens(nsIRDFResource *u, findTokenP { if (!strcmp(token, "text")) { - NS_WITH_SERVICE(nsITextToSubURI, textToSubURI, - kTextToSubURICID, &rv); + nsCOMPtr textToSubURI = + do_GetService(kTextToSubURICID, &rv); if (NS_SUCCEEDED(rv) && (textToSubURI)) { PRUnichar *uni = nsnull; diff --git a/xpfe/components/startup/src/nsCommandLineServiceMac.cpp b/xpfe/components/startup/src/nsCommandLineServiceMac.cpp index 2e6f70694fbc..8b893dd4aab9 100644 --- a/xpfe/components/startup/src/nsCommandLineServiceMac.cpp +++ b/xpfe/components/startup/src/nsCommandLineServiceMac.cpp @@ -323,7 +323,8 @@ OSErr nsMacCommandLine::Quit(TAskSave askSave) //---------------------------------------------------------------------------------------- { nsresult rv; - NS_WITH_SERVICE(nsIAppShellService, appShellService, kAppShellServiceCID, &rv); + nsCOMPtr appShellService = + do_GetService(kAppShellServiceCID, &rv); if (NS_FAILED(rv)) return errAEEventNotHandled; diff --git a/xpfe/components/timebomb/nsTimeBomb.cpp b/xpfe/components/timebomb/nsTimeBomb.cpp index 407f4121162a..78e63f9e2b37 100644 --- a/xpfe/components/timebomb/nsTimeBomb.cpp +++ b/xpfe/components/timebomb/nsTimeBomb.cpp @@ -49,7 +49,8 @@ static nsresult DisplayURI(const char *urlStr, PRBool block) rv = NS_NewURI(getter_AddRefs(URL), (const char *)urlStr); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID, &rv); + nsCOMPtr appShell = + do_GetService(kAppShellServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr window; diff --git a/xpfe/components/xfer/src/nsStreamTransfer.cpp b/xpfe/components/xfer/src/nsStreamTransfer.cpp index 51364d673447..395eb5ea9501 100644 --- a/xpfe/components/xfer/src/nsStreamTransfer.cpp +++ b/xpfe/components/xfer/src/nsStreamTransfer.cpp @@ -229,7 +229,8 @@ nsStreamTransfer::SelectFile( nsIDOMWindowInternal *parent, nsILocalFile **aResu nsCOMPtr startDir; // Pull in the user's preferences and get the default download directory. - NS_WITH_SERVICE( nsIPref, prefs, NS_PREF_CONTRACTID, &rv ); + nsCOMPtr prefs = + do_GetService( NS_PREF_CONTRACTID, &rv ); if ( NS_SUCCEEDED( rv ) && prefs ) { prefs->GetFileXPref( "browser.download.dir", getter_AddRefs( startDir ) ); if ( startDir ) { @@ -244,7 +245,8 @@ nsStreamTransfer::SelectFile( nsIDOMWindowInternal *parent, nsILocalFile **aResu nsAutoString title( NS_ConvertASCIItoUCS2( "Save File" ) ); nsCID cid = NS_STRINGBUNDLESERVICE_CID; - NS_WITH_SERVICE( nsIStringBundleService, bundleService, cid, &rv ); + nsCOMPtr bundleService = + do_GetService( cid, &rv ); if ( NS_SUCCEEDED( rv ) ) { nsCOMPtr bundle; PRUnichar *pString; diff --git a/xpfe/components/xfer/src/nsStreamXferOp.cpp b/xpfe/components/xfer/src/nsStreamXferOp.cpp index 4b14500a616a..9173530c181a 100644 --- a/xpfe/components/xfer/src/nsStreamXferOp.cpp +++ b/xpfe/components/xfer/src/nsStreamXferOp.cpp @@ -148,7 +148,8 @@ nsStreamXferOp::Start( void ) { if ( !mOutputTransport ) { // First, get file transport service. NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID); - NS_WITH_SERVICE( nsIFileTransportService, fts, kFileTransportServiceCID, &rv ); + nsCOMPtr fts = + do_GetService( kFileTransportServiceCID, &rv ); if ( NS_SUCCEEDED( rv ) ) { // Next, create output file channel. diff --git a/xpinstall/src/ScheduledTasks.cpp b/xpinstall/src/ScheduledTasks.cpp index f4df4f747f4b..cc60a04db94b 100644 --- a/xpinstall/src/ScheduledTasks.cpp +++ b/xpinstall/src/ScheduledTasks.cpp @@ -142,7 +142,8 @@ char* GetRegFilePath() nsresult rv; nsCOMPtr iFileUtilityPath; //Get the program directory - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return nsnull; diff --git a/xpinstall/src/nsInstall.cpp b/xpinstall/src/nsInstall.cpp index 61b9df550766..8038f642b448 100644 --- a/xpinstall/src/nsInstall.cpp +++ b/xpinstall/src/nsInstall.cpp @@ -1365,7 +1365,8 @@ nsPIXPIProxy* nsInstall::GetUIThreadProxy() if (!mUIThreadProxy) { nsresult rv; - NS_WITH_SERVICE( nsIProxyObjectManager, pmgr, kProxyObjectManagerCID, &rv); + nsCOMPtr pmgr = + do_GetService(kProxyObjectManagerCID, &rv); if (NS_SUCCEEDED(rv)) { nsCOMPtr tmp(do_QueryInterface(new nsXPIProxy())); @@ -2552,7 +2553,8 @@ nsInstall::ExtractFileFromJar(const nsString& aJarfile, nsIFile* aSuggestedName, if (aSuggestedName == nsnull) { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); directoryService->Get(NS_OS_TEMP_DIR, NS_GET_IID(nsIFile), getter_AddRefs(tempFile)); diff --git a/xpinstall/src/nsInstallFolder.cpp b/xpinstall/src/nsInstallFolder.cpp index 5d390cace2a3..441ce6f4bcd5 100644 --- a/xpinstall/src/nsInstallFolder.cpp +++ b/xpinstall/src/nsInstallFolder.cpp @@ -171,7 +171,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 100: /////////////////////////////////////////////////////////// Plugins if (!nsSoftwareUpdate::GetProgramDirectory()) { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_OS_CURRENT_PROCESS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(mFileSpec)); @@ -202,7 +203,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 101: /////////////////////////////////////////////////////////// Program if (!nsSoftwareUpdate::GetProgramDirectory()) //Not in stub installer { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_OS_CURRENT_PROCESS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(mFileSpec)); } @@ -215,7 +217,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 104: /////////////////////////////////////////////////////////// Temporary { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_OS_TEMP_DIR, NS_GET_IID(nsIFile), getter_AddRefs(mFileSpec)); } @@ -224,7 +227,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 106: /////////////////////////////////////////////////////////// Current User { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_APP_USER_PROFILE_50_DIR, NS_GET_IID(nsIFile), getter_AddRefs(mFileSpec)); } @@ -232,7 +236,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 107: /////////////////////////////////////////////////////////// Preferences { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_APP_PREFS_50_DIR, NS_GET_IID(nsIFile), getter_AddRefs(mFileSpec)); } @@ -240,7 +245,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 108: /////////////////////////////////////////////////////////// OS Drive { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_OS_DRIVE_DIR, NS_GET_IID(nsIFile), getter_AddRefs(mFileSpec)); } @@ -276,7 +282,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 110: /////////////////////////////////////////////////////////// Components if (!nsSoftwareUpdate::GetProgramDirectory()) { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_OS_CURRENT_PROCESS_DIR, NS_GET_IID(nsIFile), @@ -311,7 +318,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 111: /////////////////////////////////////////////////////////// Chrome if (!nsSoftwareUpdate::GetProgramDirectory()) { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_OS_CURRENT_PROCESS_DIR, NS_GET_IID(nsIFile), @@ -345,7 +353,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe #if defined(XP_PC) && !defined(XP_OS2) case 200: /////////////////////////////////////////////////////////// Win System { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_OS_SYSTEM_DIR, NS_GET_IID(nsIFile), @@ -356,7 +365,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 201: /////////////////////////////////////////////////////////// Windows { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_WIN_WINDOWS_DIR, NS_GET_IID(nsIFile), @@ -368,7 +378,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe #ifdef XP_MAC case 300: /////////////////////////////////////////////////////////// Mac System { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_OS_SYSTEM_DIR, NS_GET_IID(nsIFile), @@ -378,7 +389,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 301: /////////////////////////////////////////////////////////// Mac Desktop { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_MAC_DESKTOP_DIR, NS_GET_IID(nsIFile), @@ -388,7 +400,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 302: /////////////////////////////////////////////////////////// Mac Trash { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_MAC_TRASH_DIR, NS_GET_IID(nsIFile), @@ -398,7 +411,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 303: /////////////////////////////////////////////////////////// Mac Startup { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_MAC_STARTUP_DIR, NS_GET_IID(nsIFile), @@ -408,7 +422,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 304: /////////////////////////////////////////////////////////// Mac Shutdown { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_MAC_SHUTDOWN_DIR, NS_GET_IID(nsIFile), @@ -418,7 +433,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 305: /////////////////////////////////////////////////////////// Mac Apple Menu { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_MAC_APPLE_MENU_DIR, NS_GET_IID(nsIFile), @@ -428,7 +444,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 306: /////////////////////////////////////////////////////////// Mac Control Panel { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_MAC_CONTROL_PANELS_DIR, NS_GET_IID(nsIFile), @@ -438,7 +455,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 307: /////////////////////////////////////////////////////////// Mac Extension { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_MAC_EXTENSIONS_DIR, NS_GET_IID(nsIFile), @@ -448,7 +466,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 308: /////////////////////////////////////////////////////////// Mac Fonts { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_MAC_FONTS_DIR, NS_GET_IID(nsIFile), @@ -458,7 +477,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 309: /////////////////////////////////////////////////////////// Mac Preferences { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_MAC_PREFS_DIR, NS_GET_IID(nsIFile), @@ -468,7 +488,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 310: /////////////////////////////////////////////////////////// Mac Documents { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_MAC_DOCUMENTS_DIR, NS_GET_IID(nsIFile), @@ -480,7 +501,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe #ifdef XP_UNIX case 400: /////////////////////////////////////////////////////////// Unix Local { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_UNIX_LOCAL_DIR, NS_GET_IID(nsIFile), @@ -490,7 +512,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 401: /////////////////////////////////////////////////////////// Unix Lib { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_UNIX_LIB_DIR, NS_GET_IID(nsIFile), diff --git a/xpinstall/src/nsInstallTrigger.cpp b/xpinstall/src/nsInstallTrigger.cpp index 68fc2cb719cb..0281640d1619 100644 --- a/xpinstall/src/nsInstallTrigger.cpp +++ b/xpinstall/src/nsInstallTrigger.cpp @@ -321,7 +321,8 @@ nsInstallTrigger::InitRegistry(void) nsresult rv; NR_StartupRegistry(); /* startup the registry; if already started, this will essentially be a noop */ - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if(!directoryService) return NS_ERROR_FAILURE; diff --git a/xpinstall/src/nsLoggingProgressNotifier.cpp b/xpinstall/src/nsLoggingProgressNotifier.cpp index 2bce3edbc9e9..06d55e866204 100644 --- a/xpinstall/src/nsLoggingProgressNotifier.cpp +++ b/xpinstall/src/nsLoggingProgressNotifier.cpp @@ -72,8 +72,8 @@ nsLoggingProgressListener::BeforeJavascriptEvaluation(const PRUnichar *URL) // Not in stub installer if (!nsSoftwareUpdate::GetProgramDirectory()) { - NS_WITH_SERVICE(nsIProperties, dirSvc, - NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr dirSvc = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!dirSvc) return NS_ERROR_FAILURE; dirSvc->Get(NS_OS_CURRENT_PROCESS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(iFile)); @@ -123,8 +123,8 @@ nsLoggingProgressListener::BeforeJavascriptEvaluation(const PRUnichar *URL) { // failed to create the log file in the application directory // so try to create the log file in the user's profile directory - NS_WITH_SERVICE(nsIProperties, dirSvc, - NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr dirSvc = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!dirSvc) return NS_ERROR_FAILURE; dirSvc->Get(NS_APP_USER_PROFILE_50_DIR, NS_GET_IID(nsIFile), getter_AddRefs(iFile)); diff --git a/xpinstall/src/nsSoftwareUpdate.cpp b/xpinstall/src/nsSoftwareUpdate.cpp index 7a4b5a058946..05005313e6f4 100644 --- a/xpinstall/src/nsSoftwareUpdate.cpp +++ b/xpinstall/src/nsSoftwareUpdate.cpp @@ -125,7 +125,8 @@ nsSoftwareUpdate::nsSoftwareUpdate() nsresult rv; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if(!directoryService) return; @@ -144,8 +145,8 @@ nsSoftwareUpdate::nsSoftwareUpdate() /***************************************/ /* Add this as a shutdown observer */ /***************************************/ - NS_WITH_SERVICE(nsIObserverService, observerService, - NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) observerService->AddObserver(this, NS_LITERAL_STRING(NS_XPCOM_SHUTDOWN_OBSERVER_ID).get()); @@ -196,7 +197,8 @@ nsSoftwareUpdate::Shutdown() nsresult rv; nsCOMPtr pathToCleanupUtility; //Get the program directory - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); directoryService->Get(NS_OS_CURRENT_PROCESS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(pathToCleanupUtility)); diff --git a/xpinstall/src/nsSoftwareUpdateRun.cpp b/xpinstall/src/nsSoftwareUpdateRun.cpp index dfe1a1fde711..31ed845ad174 100644 --- a/xpinstall/src/nsSoftwareUpdateRun.cpp +++ b/xpinstall/src/nsSoftwareUpdateRun.cpp @@ -125,7 +125,8 @@ XPInstallErrorReporter(JSContext *cx, const char *message, JSErrorReport *report nsIXPIListener *listener; // lets set up an eventQ so that our xpcom/proxies will not have to: - NS_WITH_SERVICE(nsISoftwareUpdate, softwareUpdate, kSoftwareUpdateCID, &rv ); + nsCOMPtr softwareUpdate = + do_GetService(kSoftwareUpdateCID, &rv); if (!NS_SUCCEEDED(rv)) @@ -372,14 +373,16 @@ extern "C" void RunInstallOnThread(void *data) // lets set up an eventQ so that our xpcom/proxies will not have to: nsCOMPtr eventQ; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv)) { eventQService->CreateMonitoredThreadEventQueue(); eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(eventQ)); } - NS_WITH_SERVICE(nsISoftwareUpdate, softwareUpdate, kSoftwareUpdateCID, &rv ); + nsCOMPtr softwareUpdate = + do_GetService(kSoftwareUpdateCID, &rv); if (!NS_SUCCEEDED(rv)) { @@ -405,7 +408,8 @@ extern "C" void RunInstallOnThread(void *data) { PRBool ownRuntime = PR_FALSE; - NS_WITH_SERVICE(nsIJSRuntimeService, rtsvc, "@mozilla.org/js/xpc/RuntimeService;1", &rv); + nsCOMPtr rtsvc = + do_GetService("@mozilla.org/js/xpc/RuntimeService;1", &rv); if(NS_FAILED(rv) || NS_FAILED(rtsvc->GetRuntime(&rt))) { // service not available (wizard context?) diff --git a/xpinstall/src/nsXPITriggerInfo.cpp b/xpinstall/src/nsXPITriggerInfo.cpp index 3f8cd6f0c44b..0301b269f302 100644 --- a/xpinstall/src/nsXPITriggerInfo.cpp +++ b/xpinstall/src/nsXPITriggerInfo.cpp @@ -168,7 +168,8 @@ void nsXPITriggerInfo::SendStatus(const PRUnichar* URL, PRInt32 status) if ( mCx && mGlobalWrapper && mCbval ) { - NS_WITH_SERVICE(nsIEventQueueService, EQService, kEventQueueServiceCID, &rv); + nsCOMPtr EQService = + do_GetService(kEventQueueServiceCID, &rv); if ( NS_SUCCEEDED( rv ) ) { rv = EQService->GetThreadEventQueue(mThread, getter_AddRefs(eq)); diff --git a/xpinstall/src/nsXPInstallManager.cpp b/xpinstall/src/nsXPInstallManager.cpp index 064dcc58b2d0..96f93747d1e4 100644 --- a/xpinstall/src/nsXPInstallManager.cpp +++ b/xpinstall/src/nsXPInstallManager.cpp @@ -211,7 +211,8 @@ nsXPInstallManager::InitManager(nsIScriptGlobalObject* aGlobalObject, nsXPITrigg getter_AddRefs(Idlg) ); if (NS_SUCCEEDED(rv)) { - NS_WITH_SERVICE( nsIProxyObjectManager, pmgr, kProxyObjectManagerCID, &rv); + nsCOMPtr pmgr = + do_GetService(kProxyObjectManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = pmgr->GetProxyForObject( NS_UI_THREAD_EVENTQ, NS_GET_IID(nsIXPIProgressDlg), @@ -298,8 +299,8 @@ PRBool nsXPInstallManager::ConfirmChromeInstall(nsIScriptGlobalObject* aGlobalOb nsXPIDLString confirmFormat; PRUnichar* confirmText = nsnull; nsCOMPtr xpiBundle; - NS_WITH_SERVICE( nsIStringBundleService, bundleSvc, - kStringBundleServiceCID, &rv ); + nsCOMPtr bundleSvc = + do_GetService( kStringBundleServiceCID, &rv ); if (NS_SUCCEEDED(rv) && bundleSvc) { rv = bundleSvc->CreateBundle( XPINSTALL_BUNDLE_URL, @@ -462,7 +463,8 @@ NS_IMETHODIMP nsXPInstallManager::DownloadNext() if (mDlg) mDlg->StartInstallPhase(); - NS_WITH_SERVICE(nsISoftwareUpdate, softupdate, nsSoftwareUpdate::GetCID(), &rv); + nsCOMPtr softupdate = + do_GetService(nsSoftwareUpdate::GetCID(), &rv); if (NS_SUCCEEDED(rv)) { for (PRUint32 i = 0; i < mTriggers->Size(); ++i) @@ -623,8 +625,8 @@ nsXPInstallManager::GetDestinationFile(nsString& url, nsILocalFile* *file) PRInt32 pos = url.RFindChar('/'); url.Mid( leaf, pos+1, url.Length() ); - NS_WITH_SERVICE(nsIProperties, directoryService, - NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (mChromeType == 0 ) { @@ -691,7 +693,8 @@ nsXPInstallManager::OnStartRequest(nsIRequest* request, nsISupports *ctxt) NS_ASSERTION( !mItem->mOutStream, "Received double OnStartRequest from Necko"); NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID); - NS_WITH_SERVICE( nsIFileTransportService, fts, kFileTransportServiceCID, &rv ); + nsCOMPtr fts = + do_GetService( kFileTransportServiceCID, &rv ); if (NS_SUCCEEDED(rv) && !mItem->mOutStream) {