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

Bug 86734: Remove NS_WITH_SERVICE. r=dbaron, rs=scc, a=asa

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@99906 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jaggernaut%netscape.com 2001-07-25 07:54:28 +00:00
parent 5457c9aeca
commit 2b3b3b2586
477 changed files with 1976 additions and 1454 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/accessible/src/base/nsAccessible.cpp
View File

@ -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<nsIStringBundleService> stringBundleService =
do_GetService(kStringBundleServiceCID, &rv);
// nsCOMPtr<nsIStringBundleService> stringBundleService(do_GetService(kStringBundleServiceCID, &rv));
if (!stringBundleService) {
NS_WARNING("ERROR: Failed to get StringBundle Service instance.\n");

3
mozilla/accessible/src/nsAccessible.cpp
View File

@ -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<nsIStringBundleService> stringBundleService =
do_GetService(kStringBundleServiceCID, &rv);
// nsCOMPtr<nsIStringBundleService> stringBundleService(do_GetService(kStringBundleServiceCID, &rv));
if (!stringBundleService) {
NS_WARNING("ERROR: Failed to get StringBundle Service instance.\n");

2
mozilla/caps/src/nsCodebasePrincipal.cpp
View File

@ -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<nsIPref> prefs(do_GetService("@mozilla.org/preferences;1", &rv));
if (NS_FAILED(rv))
return NS_ERROR_FAILURE;
PRBool enabled;

6
mozilla/caps/src/nsScriptSecurityManager.cpp
View File

@ -1600,7 +1600,8 @@ nsScriptSecurityManager::SetCanEnableCapability(const char* certificateID,
if (!mSystemCertificate)
{
nsCOMPtr<nsIFile> systemCertFile;
NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
nsCOMPtr<nsIProperties> 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<nsIXPConnect> xpc =
do_GetService(nsIXPConnect::GetCID(), &rv);
if (NS_SUCCEEDED(rv) && xpc)
{
rv = xpc->SetDefaultSecurityManager(

24
mozilla/caps/src/nsSecurityManagerFactory.cpp
View File

@ -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<nsIScriptSecurityManager> 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<nsIScriptSecurityManager> 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<nsIScriptSecurityManager> 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<nsIScriptSecurityManager> 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<nsIScriptSecurityManager> 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<nsIScriptSecurityManager> securityManager =
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
if (NS_FAILED(rv))
return JS_FALSE;

11
mozilla/chrome/src/nsChromeProtocolHandler.cpp
View File

@ -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<nsIChromeRegistry> 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<nsIXULPrototypeCache> cache =
do_GetService(kXULPrototypeCacheCID, &rv);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIXULPrototypeDocument> 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<nsIIOService> 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<nsIScriptSecurityManager> securityManager =
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIPrincipal> principal;

18
mozilla/chrome/src/nsChromeRegistry.cpp
View File

@ -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<nsIObserverService> 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<nsIWindowMediator> windowMediator =
do_GetService(kWindowMediatorCID, &rv);
if (NS_SUCCEEDED(rv)) {
nsCOMPtr<nsISimpleEnumerator> 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<nsIXULPrototypeCache> 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<nsIImageManager> 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<imgICache> 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<nsILocalFile> listFile;
NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
nsCOMPtr<nsIProperties> 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));

3
mozilla/content/base/src/nsContentPolicy.cpp
View File

@ -48,7 +48,8 @@ nsContentPolicy::nsContentPolicy()
{
NS_INIT_REFCNT();
nsresult rv;
NS_WITH_SERVICE(nsICategoryManager, catman, NS_CATEGORYMANAGER_CONTRACTID, &rv);
nsCOMPtr<nsICategoryManager> catman =
do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
if (NS_FAILED(rv))
/* log an error? */
return;

2
mozilla/content/base/src/nsCopySupport.cpp
View File

@ -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<nsIClipboard> clipboard(do_GetService(kCClipboardCID, &rv));
if (NS_FAILED(rv))
return rv;

11
mozilla/content/base/src/nsDocument.cpp
View File

@ -729,8 +729,8 @@ nsDocument::GetPrincipal(nsIPrincipal **aPrincipal)
{
if (!mPrincipal) {
nsresult rv;
NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager,
NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
nsCOMPtr<nsIScriptSecurityManager> 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<nsIScriptSecurityManager> 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<nsIAtom> tag;
NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv);
nsCOMPtr<nsIXBLService> xblService =
do_GetService("@mozilla.org/xbl;1", &rv);
nsCOMPtr<nsIContent> content(do_QueryInterface(aElement));
xblService->ResolveTag(content, &namespaceID, getter_AddRefs(tag));

24
mozilla/content/base/src/nsDocumentViewer.cpp
View File

@ -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<nsIPrintOptions> 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<nsIPrintOptions> 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<nsIPrintOptions> 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<nsIPrintOptions> 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<nsIPrintOptions> printService =
do_GetService(kPrintOptionsCID, &rv);
if (NS_SUCCEEDED(rv) && printService) {
printService->GetPrintRange(&printRangeType);
}
@ -3692,7 +3697,8 @@ void DocumentViewerImpl::Notify(nsIImageGroup *aImageGroup,
nsCOMPtr<nsIEventQueue> eventQ;
// Get the event queue of the current thread...
NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueService, &rv);
nsCOMPtr<nsIEventQueueService> 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<nsIChromeRegistry> chromeRegistry =
do_GetService("@mozilla.org/chrome/chrome-registry;1", &rv);
if (NS_SUCCEEDED(rv) && chromeRegistry) {
nsCOMPtr<nsISupportsArray> sheets;
@ -4394,7 +4401,8 @@ nsresult rv;
// Setup print options for UI
rv = NS_ERROR_FAILURE;
NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv);
nsCOMPtr<nsIPrintOptions> printService =
do_GetService(kPrintOptionsCID, &rv);
if (NS_SUCCEEDED(rv) && printService) {
if (mPrt->mIsParentAFrameSet) {
if (mPrt->mCurrentFocusWin) {

4
mozilla/content/base/src/nsGenericElement.cpp
View File

@ -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<nsIScriptSecurityManager> securityManager =
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
nsCOMPtr<nsIURI> absURI;
if (NS_SUCCEEDED(rv))
rv = NS_NewURI(getter_AddRefs(absURI), absURLSpec, aBaseURL);

4
mozilla/content/base/src/nsPlainTextSerializer.cpp
View File

@ -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<nsILineBreakerFactory> 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<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID, &rv));
if (NS_SUCCEEDED(rv) && prefs) {
prefs->GetBoolPref(PREF_STRUCTS, &mStructs);
prefs->GetIntPref(PREF_HEADER_STRATEGY, &mHeaderStrategy);

5
mozilla/content/base/src/nsSelection.cpp
View File

@ -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<nsIPref> 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<nsIAutoCopyService> autoCopyService =
do_GetService("@mozilla.org/autocopy;1", &rv);
if (NS_SUCCEEDED(rv) && autoCopyService)
{

5
mozilla/content/base/src/nsSyncLoadService.cpp
View File

@ -238,7 +238,7 @@ nsSyncLoader::LoadDocument(nsIURI* documentURI, nsIDOMDocument **_retval)
nsCOMPtr<nsIEventQueueService> eventQService;
nsCOMPtr<nsIXPCNativeCallContext> cc;
NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv);
nsCOMPtr<nsIXPConnect> 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<nsIAppShellService> appshellSvc =
do_GetService(kAppShellServiceCID, &rv);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIDOMWindowInternal> junk;
rv = appshellSvc->GetHiddenWindowAndJSContext(getter_AddRefs(junk), &cx);

8
mozilla/content/events/src/nsEventStateManager.cpp
View File

@ -174,8 +174,8 @@ NS_IMETHODIMP
nsEventStateManager::Init()
{
nsresult rv;
NS_WITH_SERVICE(nsIObserverService, observerService,
NS_OBSERVERSERVICE_CONTRACTID, &rv);
nsCOMPtr<nsIObserverService> 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<nsIObserverService> observerService =
do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv);
if (NS_SUCCEEDED(rv))
{
nsAutoString topic; topic.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID);

4
mozilla/content/html/content/src/nsHTMLInputElement.cpp
View File

@ -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<nsIScriptSecurityManager> securityManager =
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &result);
if (NS_FAILED(result))
return result;

10
mozilla/content/html/document/src/nsHTMLContentSink.cpp
View File

@ -897,10 +897,8 @@ NS_CreateHTMLElement(nsIHTMLContent** aResult, nsINodeInfo *aNodeInfo, PRBool aC
{
nsresult rv = NS_OK;
NS_WITH_SERVICE(nsIParserService,
parserService,
kParserServiceCID,
&rv);
nsCOMPtr<nsIParserService> 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<nsIScriptSecurityManager> securityManager =
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
if (NS_FAILED(rv)) return;
rv = securityManager->CheckLoadURI(mDocumentBaseURL, baseHrefURI, nsIScriptSecurityManager::STANDARD);

9
mozilla/content/html/document/src/nsHTMLDocument.cpp
View File

@ -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<nsIPref> 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<nsIRDFService> 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<nsIScriptSecurityManager> securityManager =
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
if (NS_FAILED(rv))
return NS_ERROR_FAILURE;
nsCOMPtr<nsIPrincipal> newCodebase;

12
mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp
View File

@ -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<nsIParserService> parserService =
do_GetService(kParserServiceCID, &result);
NS_ENSURE_SUCCESS(result, result);
nsAutoString tmpName;
@ -560,10 +558,8 @@ nsHTMLFragmentContentSink::AddLeaf(const nsIParserNode& aNode)
nsCOMPtr<nsIHTMLContent> content;
nsHTMLTag nodeType = nsHTMLTag(aNode.GetNodeType());
NS_WITH_SERVICE(nsIParserService,
parserService,
kParserServiceCID,
&result);
nsCOMPtr<nsIParserService> parserService =
do_GetService(kParserServiceCID, &result);
NS_ENSURE_SUCCESS(result, result);

3
mozilla/content/html/document/src/nsImageDocument.cpp
View File

@ -467,7 +467,8 @@ nsresult nsImageDocument::UpdateTitle( void )
nsCOMPtr<nsIStringBundle> bundle;
nsresult rv;
// Create a bundle for the localization
NS_WITH_SERVICE(nsIStringBundleService, stringService, kStringBundleServiceCID, &rv);
nsCOMPtr<nsIStringBundleService> stringService =
do_GetService(kStringBundleServiceCID, &rv);
if (NS_SUCCEEDED(rv) && stringService) {
rv = stringService->CreateBundle(NSIMAGEDOCUMENT_PROPERTIES_URI, getter_AddRefs(bundle));
}

8
mozilla/content/html/style/src/nsCSSLoader.cpp
View File

@ -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<nsICharsetConverterManager> 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<nsIScriptSecurityManager> 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<nsICharsetAlias> calias(do_GetService(kCharsetAliasCID, &rv));
NS_ASSERTION(calias, "cannot find charset alias");
nsAutoString charsetName(aCharsetSrc);
if( NS_SUCCEEDED(rv) && (nsnull != calias))

4
mozilla/content/html/style/src/nsStyleUtil.cpp
View File

@ -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<nsIPref> 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<nsIPref> prefs(do_GetService(kPrefCID, &rv));
if (NS_SUCCEEDED(rv) && prefs) {
prefs->GetBoolPref("font.size.nav4algorithm", &gNavAlgorithmPref);
prefs->RegisterCallback("font.size.nav4algorithm", NavAlgorithmPrefChangedCallback, NULL);

4
mozilla/content/shared/src/nsStyleUtil.cpp
View File

@ -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<nsIPref> 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<nsIPref> prefs(do_GetService(kPrefCID, &rv));
if (NS_SUCCEEDED(rv) && prefs) {
prefs->GetBoolPref("font.size.nav4algorithm", &gNavAlgorithmPref);
prefs->RegisterCallback("font.size.nav4algorithm", NavAlgorithmPrefChangedCallback, NULL);

6
mozilla/content/xbl/src/nsBindingManager.cpp
View File

@ -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<nsIXBLService> 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<nsIXBLService> xblService =
do_GetService("@mozilla.org/xbl;1", &rv);
if (!xblService)
return rv;

2
mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp
View File

@ -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<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID, &rv));
if (NS_SUCCEEDED(rv) && prefs)
{
prefs->GetIntPref("ui.key.menuAccessKey", &kMenuAccessKey);

2
mozilla/content/xbl/src/nsXBLService.cpp
View File

@ -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<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID, &rv));
if (NS_SUCCEEDED(rv))
prefs->GetBoolPref(kDisableChromeCachePref, &gDisableChromeCache);

3
mozilla/content/xbl/src/nsXBLWindowHandler.cpp
View File

@ -101,7 +101,8 @@ void nsXBLSpecialDocInfo::LoadDocInfo()
return;
nsresult rv;
NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv);
nsCOMPtr<nsIXBLService> xblService =
do_GetService("@mozilla.org/xbl;1", &rv);
if (NS_FAILED(rv) || !xblService)
return;

12
mozilla/content/xml/content/src/nsXMLElement.cpp
View File

@ -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<nsIIOService> 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<nsIScriptSecurityManager> 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<nsIXBLService> xblService =
do_GetService("@mozilla.org/xbl;1", &rv);
xblService->LoadBindings(this, value, PR_FALSE,
getter_AddRefs(binding), &dummy);
if (binding) {

2
mozilla/content/xml/document/src/nsXMLContentSink.cpp
View File

@ -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<nsIElementFactory> elementFactory(do_GetService(contractID, &rv));
*aResult = elementFactory;
NS_IF_ADDREF(*aResult);

10
mozilla/content/xml/document/src/nsXMLDocument.cpp
View File

@ -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<nsIPref> 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<nsIScriptSecurityManager> 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<nsIScriptSecurityManager> 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;

6
mozilla/content/xul/content/src/nsXULElement.cpp
View File

@ -718,7 +718,8 @@ nsXULElement::QueryInterface(REFNSIID iid, void** result)
(NodeInfo()->NamespaceEquals(kNameSpaceID_XUL))){
nsCOMPtr<nsIAtom> tag;
PRInt32 dummy;
NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv);
nsCOMPtr<nsIXBLService> 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<nsIAtom> tag;
PRInt32 dummy;
NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv);
nsCOMPtr<nsIXBLService> 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::

4
mozilla/content/xul/content/src/nsXULPopupListener.cpp
View File

@ -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<nsIPref> 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<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID, &rv));
if ( prefs ) {
rv = prefs->GetBoolPref("browser.chrome.toolbar_tips", &sShowTooltips);
}

16
mozilla/content/xul/document/src/nsXULDocument.cpp
View File

@ -789,8 +789,8 @@ NS_IMETHODIMP
nsXULDocument::SetBaseURL(nsIURI* aURL)
{
nsresult rv;
NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager,
NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
nsCOMPtr<nsIScriptSecurityManager> 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<nsIChromeRegistry> reg(do_GetService(kChromeRegistryCID, &rv));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsISupportsArray> 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<nsIXBLService> xblService =
do_GetService("@mozilla.org/xbl;1", &rv);
if (xblService) {
nsCOMPtr<nsIDOMEventReceiver> rec(do_QueryInterface(aElement));
xblService->AttachGlobalKeyHandler(rec);
@ -4713,7 +4714,7 @@ nsresult
nsXULDocument::AddChromeOverlays()
{
nsresult rv;
NS_WITH_SERVICE(nsIChromeRegistry, reg, kChromeRegistryCID, &rv);
nsCOMPtr<nsIChromeRegistry> 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<nsIElementFactory> 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<nsIAtom> tag;
NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv);
nsCOMPtr<nsIXBLService> xblService =
do_GetService("@mozilla.org/xbl;1", &rv);
nsCOMPtr<nsIContent> content(do_QueryInterface(aElement));
xblService->ResolveTag(content, &namespaceID, getter_AddRefs(tag));

2
mozilla/content/xul/document/src/nsXULPrototypeCache.cpp
View File

@ -164,7 +164,7 @@ NS_NewXULPrototypeCache(nsISupports* aOuter, REFNSIID aIID, void** aResult)
nsresult rv;
NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv);
nsCOMPtr<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID, &rv));
if (NS_SUCCEEDED(rv)) {
// XXX Ignore return values.
prefs->GetBoolPref(kDisableXULCachePref, &gDisableXULCache);

6
mozilla/content/xul/document/src/nsXULPrototypeDocument.cpp
View File

@ -358,10 +358,8 @@ nsXULPrototypeDocument::GetDocumentPrincipal(nsIPrincipal** aResult)
{
if (!mDocumentPrincipal) {
nsresult rv;
NS_WITH_SERVICE(nsIScriptSecurityManager,
securityManager,
NS_SCRIPTSECURITYMANAGER_CONTRACTID,
&rv);
nsCOMPtr<nsIScriptSecurityManager> securityManager =
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
if (NS_FAILED(rv))
return NS_ERROR_FAILURE;

2
mozilla/content/xul/templates/src/nsXULContentBuilder.cpp
View File

@ -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<nsIElementFactory> elementFactory(do_GetService(contractID, &rv));
if (!elementFactory)
elementFactory = gXMLElementFactory; // Nothing found. Use generic XML element.

3
mozilla/docshell/base/nsDocShell.cpp
View File

@ -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<nsIPluginHost> pluginHost =
do_GetService(kPluginManagerCID, &err);
if (NS_FAILED(err))
return NS_ERROR_FAILURE;

5
mozilla/dom/src/base/nsGlobalWindow.cpp
View File

@ -314,7 +314,8 @@ NS_IMETHODIMP GlobalWindowImpl::SetNewDocument(nsIDOMDocument* aDocument)
nsCOMPtr<nsIDOMWindowInternal> us(do_QueryInterface(NS_STATIC_CAST(nsIDOMWindow*,this)));
if (internal == us) {
nsresult rv;
NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv);
nsCOMPtr<nsIXBLService> xblService =
do_GetService("@mozilla.org/xbl;1", &rv);
if (xblService) {
nsCOMPtr<nsIDOMEventReceiver> 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<nsIPref> prefs(do_GetService(kPrefServiceCID, &rv));
if (NS_FAILED(rv) || prefs == nsnull)
return rv;

27
mozilla/dom/src/base/nsJSEnvironment.cpp
View File

@ -286,7 +286,7 @@ int PR_CALLBACK
nsJSContext::JSOptionChangedCallback(const char *pref, void *data)
{
nsresult rv;
NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv);
nsCOMPtr<nsIPref> 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<nsIXPConnect> 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<nsIPref> 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<nsIJSContextStack> 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<nsIJSContextStack> 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<nsIJSContextStack> 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<nsIJSContextStack> 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<nsIObserverService> 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<nsIXPConnect> 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<nsILiveConnectManager> manager =
do_GetService(nsIJVMManager::GetCID(), &rv);
// Should the JVM manager perhaps define methods for starting up LiveConnect?
if (NS_SUCCEEDED(rv) && manager != nsnull) {

6
mozilla/dom/src/base/nsJSUtils.cpp
View File

@ -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<nsIXPConnect> 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<nsIScriptSecurityManager> secMan =
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
if (NS_FAILED(rv)) {
nsJSUtils::ReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR);
return nsnull;

8
mozilla/editor/base/nsEditor.cpp
View File

@ -956,7 +956,7 @@ nsEditor::GetWrapWidth(PRInt32 *aWrapColumn)
*aWrapColumn = 72;
nsresult rv;
NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv);
nsCOMPtr<nsIPref> 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<nsIPref> 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<nsIElementFactory> elementFactory =
do_GetService(NS_ELEMENT_FACTORY_CONTRACTID_PREFIX"http://www.w3.org/1999/xhtml", &rv);
if (!elementFactory)
return NS_ERROR_FAILURE;

11
mozilla/editor/base/nsEditorEventListeners.cpp
View File

@ -382,7 +382,7 @@ nsTextEditorMouseListener::MouseClick(nsIDOMEvent* aMouseEvent)
if (button == 1)
{
nsresult rv;
NS_WITH_SERVICE(nsIPref, prefService, kPrefServiceCID, &rv);
nsCOMPtr<nsIPref> 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<nsIDragService> dragService =
do_GetService( "@mozilla.org/widget/dragservice;1", &rv );
if ( NS_SUCCEEDED(rv) ) {
nsCOMPtr<nsIDragSession> 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<nsIDragService> 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<nsILookAndFeel> look =
do_GetService(kLookAndFeelCID, &result);
if (NS_SUCCEEDED(result) && look)
{

14
mozilla/editor/base/nsEditorShell.cpp
View File

@ -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<nsIPref> prefs( do_GetService( NS_PREF_CONTRACTID, &res ) );
if (prefs)
{
nsCOMPtr<nsILocalFile> defaultDir;
@ -2815,7 +2815,8 @@ nsEditorShell::DoFind(PRBool aFindNext)
// Get find component.
nsresult rv;
NS_WITH_SERVICE(nsIFindComponent, findComponent, NS_IFINDCOMPONENT_CONTRACTID, &rv);
nsCOMPtr<nsIFindComponent> 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<nsIFindComponent> 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<nsIPref> 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<nsIPref> 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<nsIPref> prefs(do_GetService(kPrefServiceCID, &res));
if (NS_FAILED(res)) return NS_OK;
PRBool normalizeTable = PR_FALSE;

12
mozilla/editor/base/nsHTMLDataTransfer.cpp
View File

@ -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<nsIDragService> dragService =
do_GetService("@mozilla.org/widget/dragservice;1", &rv);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIDragSession> 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<nsIDragService> 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<nsIClipboard> 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<nsIClipboard> 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<nsIClipboard> clipboard(do_GetService(kCClipboardCID, &rv));
if (NS_FAILED(rv)) return rv;
// Create generic Transferable for getting the data

2
mozilla/editor/base/nsHTMLEditRules.cpp
View File

@ -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<nsIPref> prefs(do_GetService(kPrefServiceCID, &res));
if (NS_FAILED(res)) return res;
char *returnInEmptyLIKillsList = 0;

10
mozilla/editor/base/nsPlaintextDataTransfer.cpp
View File

@ -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<nsIDragService> dragService =
do_GetService("@mozilla.org/widget/dragservice;1", &rv);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIDragSession> 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<nsIDragService> 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<nsIClipboard> 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<nsIClipboard> clipboard(do_GetService(kCClipboardCID, &rv));
if (NS_FAILED(rv)) return rv;
// the flavors that we can deal with

4
mozilla/editor/base/nsPlaintextEditor.cpp
View File

@ -1588,7 +1588,7 @@ nsPlaintextEditor::PasteAsQuotation(PRInt32 aSelectionType)
{
// Get Clipboard Service
nsresult rv;
NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv);
nsCOMPtr<nsIClipboard> 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<nsIPref> prefs(do_GetService(kPrefServiceCID, &rv));
if (NS_FAILED(rv)) return 0;
char *citationType = 0;

2
mozilla/editor/base/nsTextEditRules.cpp
View File

@ -529,7 +529,7 @@ nsTextEditRules::WillInsertText(PRInt32 aAction,
};
PRInt32 singleLineNewlineBehavior = 1;
nsresult rv;
NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv);
nsCOMPtr<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID, &rv));
if (NS_SUCCEEDED(rv) && prefs)
rv = prefs->GetIntPref("editor.singleLine.pasteNewlines",
&singleLineNewlineBehavior);

14
mozilla/editor/composer/src/nsEditorShell.cpp
View File

@ -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<nsIPref> prefs( do_GetService( NS_PREF_CONTRACTID, &res ) );
if (prefs)
{
nsCOMPtr<nsILocalFile> defaultDir;
@ -2815,7 +2815,8 @@ nsEditorShell::DoFind(PRBool aFindNext)
// Get find component.
nsresult rv;
NS_WITH_SERVICE(nsIFindComponent, findComponent, NS_IFINDCOMPONENT_CONTRACTID, &rv);
nsCOMPtr<nsIFindComponent> 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<nsIFindComponent> 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<nsIPref> 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<nsIPref> 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<nsIPref> prefs(do_GetService(kPrefServiceCID, &res));
if (NS_FAILED(res)) return NS_OK;
PRBool normalizeTable = PR_FALSE;

8
mozilla/editor/libeditor/base/nsEditor.cpp
View File

@ -956,7 +956,7 @@ nsEditor::GetWrapWidth(PRInt32 *aWrapColumn)
*aWrapColumn = 72;
nsresult rv;
NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv);
nsCOMPtr<nsIPref> 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<nsIPref> 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<nsIElementFactory> elementFactory =
do_GetService(NS_ELEMENT_FACTORY_CONTRACTID_PREFIX"http://www.w3.org/1999/xhtml", &rv);
if (!elementFactory)
return NS_ERROR_FAILURE;

12
mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp
View File

@ -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<nsIDragService> dragService =
do_GetService("@mozilla.org/widget/dragservice;1", &rv);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIDragSession> 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<nsIDragService> 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<nsIClipboard> 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<nsIClipboard> 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<nsIClipboard> clipboard(do_GetService(kCClipboardCID, &rv));
if (NS_FAILED(rv)) return rv;
// Create generic Transferable for getting the data

2
mozilla/editor/libeditor/html/nsHTMLEditRules.cpp
View File

@ -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<nsIPref> prefs(do_GetService(kPrefServiceCID, &res));
if (NS_FAILED(res)) return res;
char *returnInEmptyLIKillsList = 0;

11
mozilla/editor/libeditor/text/nsEditorEventListeners.cpp
View File

@ -382,7 +382,7 @@ nsTextEditorMouseListener::MouseClick(nsIDOMEvent* aMouseEvent)
if (button == 1)
{
nsresult rv;
NS_WITH_SERVICE(nsIPref, prefService, kPrefServiceCID, &rv);
nsCOMPtr<nsIPref> 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<nsIDragService> dragService =
do_GetService( "@mozilla.org/widget/dragservice;1", &rv );
if ( NS_SUCCEEDED(rv) ) {
nsCOMPtr<nsIDragSession> 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<nsIDragService> 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<nsILookAndFeel> look =
do_GetService(kLookAndFeelCID, &result);
if (NS_SUCCEEDED(result) && look)
{

10
mozilla/editor/libeditor/text/nsPlaintextDataTransfer.cpp
View File

@ -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<nsIDragService> dragService =
do_GetService("@mozilla.org/widget/dragservice;1", &rv);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIDragSession> 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<nsIDragService> 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<nsIClipboard> 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<nsIClipboard> clipboard(do_GetService(kCClipboardCID, &rv));
if (NS_FAILED(rv)) return rv;
// the flavors that we can deal with

4
mozilla/editor/libeditor/text/nsPlaintextEditor.cpp
View File

@ -1588,7 +1588,7 @@ nsPlaintextEditor::PasteAsQuotation(PRInt32 aSelectionType)
{
// Get Clipboard Service
nsresult rv;
NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv);
nsCOMPtr<nsIClipboard> 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<nsIPref> prefs(do_GetService(kPrefServiceCID, &rv));
if (NS_FAILED(rv)) return 0;
char *citationType = 0;

2
mozilla/editor/libeditor/text/nsTextEditRules.cpp
View File

@ -529,7 +529,7 @@ nsTextEditRules::WillInsertText(PRInt32 aAction,
};
PRInt32 singleLineNewlineBehavior = 1;
nsresult rv;
NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv);
nsCOMPtr<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID, &rv));
if (NS_SUCCEEDED(rv) && prefs)
rv = prefs->GetIntPref("editor.singleLine.pasteNewlines",
&singleLineNewlineBehavior);

2
mozilla/embedding/base/nsEmbedWin32.cpp
View File

@ -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<nsITimerQueue> timerQueue(do_GetService(kTimerManagerCID, &rv));
if (NS_FAILED(rv))
{
return NS_ERROR_FAILURE;

6
mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp
View File

@ -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<nsIProfile> 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<nsIPrintOptions> printService =
do_GetService(kPrintOptionsCID, &rv);
if (printService)
{
printService->GetPrintSilent(&oldPrintSilent);

3
mozilla/embedding/browser/photon/src/PtMozilla.cpp
View File

@ -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<nsIPrintOptions> printService =
do_GetService(kPrintOptionsCID, &rv);
printService->SetEndPageRange( (PRInt32) pc ); /* use SetEndPageRange/GetEndPageRange to convey the print context */
print->Print( window, printService, moz->MyBrowser->WebBrowserContainer );
}

6
mozilla/embedding/browser/powerplant/source/CAppFileLocationProvider.cpp
View File

@ -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<nsIProperties> 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<nsILocalFile> localDir;
NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
nsCOMPtr<nsIProperties> 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;

9
mozilla/embedding/browser/powerplant/source/CBrowserApp.cp
View File

@ -211,7 +211,7 @@ CBrowserApp::CBrowserApp()
CBrowserApp::~CBrowserApp()
{
nsresult rv;
NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv);
nsCOMPtr<nsIPref> 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<nsIObserverService> 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<nsIPref> 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<nsIPref> prefs(do_GetService(kPrefCID, &rv));
if (NS_SUCCEEDED(rv)) {
// We are using the default prefs from mozilla. If you were

6
mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp
View File

@ -310,7 +310,8 @@ Boolean CBrowserShell::ObeyCommand(PP_PowerPlant::CommandT inCommand, void* ioPa
nsCOMPtr<nsIDOMWindow> domWindow;
nsCOMPtr<nsIDOMWindowInternal> domWindowInternal;
NS_WITH_SERVICE(nsIWalletService, walletService, NS_WALLETSERVICE_CONTRACTID, &rv);
nsCOMPtr<nsIWalletService> 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<nsIDOMWindow> domWindow;
nsCOMPtr<nsIDOMWindowInternal> domWindowInternal;
NS_WITH_SERVICE(nsIWalletService, walletService, NS_WALLETSERVICE_CONTRACTID, &rv);
nsCOMPtr<nsIWalletService> walletService =
do_GetService(NS_WALLETSERVICE_CONTRACTID, &rv);
ThrowIfError_(rv);
rv = mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindow));
ThrowIfError_(rv);

9
mozilla/embedding/browser/powerplant/source/CProfileManager.cpp
View File

@ -70,7 +70,8 @@ void CProfileManager::StartUp()
{
nsresult rv;
NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv);
nsCOMPtr<nsIProfile> 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<nsIProfile> 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<nsIProfile> profileService =
do_GetService(NS_PROFILE_CONTRACTID, &rv);
ThrowIfNil_(profileService);
nsXPIDLString currentProfile;

11
mozilla/embedding/browser/powerplant/source/UMacUnicode.cpp
View File

@ -67,7 +67,8 @@ CPlatformUCSConversion::PreparePlatformCharset()
if (mPlatformCharset.Length() == 0)
{
NS_WITH_SERVICE(nsIPlatformCharset, pcharset, NS_PLATFORMCHARSET_CONTRACTID, &res);
nsCOMPtr<nsIPlatformCharset> 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<nsICharsetConverterManager> 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<nsICharsetConverterManager> ucmgr =
do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res);
NS_ASSERTION((NS_SUCCEEDED(res) && ucmgr),
"cannot get charset converter manager ");
if(NS_SUCCEEDED(res) && ucmgr)

6
mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp
View File

@ -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<nsIGlobalHistory> 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<nsIPrintOptions> printService =
do_GetService(kPrintOptionsCID, &rv);
if (NS_SUCCEEDED(rv) && printService) {
return printService->SetIsCancelled(PR_TRUE);
}

3
mozilla/embedding/browser/webBrowser/nsWebBrowserPersist.cpp
View File

@ -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<nsIFileTransportService> fts =
do_GetService(kFileTransportServiceCID, &rv);
if (NS_FAILED(rv))
{

6
mozilla/embedding/qa/testembed/ProfileMgr.cpp
View File

@ -57,7 +57,8 @@ nsresult CProfileMgr::StartUp()
{
nsresult rv;
NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv);
nsCOMPtr<nsIProfile> 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<nsIProfile> profileService =
do_GetService(NS_PROFILE_CONTRACTID, &rv);
if (NS_SUCCEEDED(rv))
rv = profileService->SetCurrentProfile(dialog.m_SelectedProfile.get());
}

15
mozilla/embedding/qa/testembed/ProfilesDlg.cpp
View File

@ -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<nsIProfile> 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<nsIProfile> 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<nsIProfile> 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<nsIProfile> 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<nsIProfile> profileService =
do_GetService(NS_PROFILE_CONTRACTID, &rv);
ASSERT(NS_SUCCEEDED(rv));
if (NS_SUCCEEDED(rv))
{

7
mozilla/embedding/qa/testembed/TestEmbed.cpp
View File

@ -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<nsIPref> 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<nsIObserverService> 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<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID, &rv));
if (NS_SUCCEEDED(rv)) {
// We are using the default prefs from mozilla. If you were

3
mozilla/embedding/qa/testembed/Tests.cpp
View File

@ -251,7 +251,8 @@ void CTests::OnTestsCreateprofile()
if (myDialog.DoModal() == IDOK)
{
// NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv);
// nsCOMPtr<nsIProfile> profileService =
// do_GetService(NS_PROFILE_CONTRACTID, &rv);
nsCOMPtr<nsIProfile> theProfServ(do_GetService(NS_PROFILE_CONTRACTID));
if (!theProfServ)
{

6
mozilla/embedding/qa/testembed/winEmbedFileLocProvider.cpp
View File

@ -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<nsIProperties> 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<nsILocalFile> localDir;
NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
nsCOMPtr<nsIProperties> 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))

7
mozilla/embedding/tests/mfcembed/MfcEmbed.cpp
View File

@ -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<nsIPref> 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<nsIObserverService> 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<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID, &rv));
if (NS_SUCCEEDED(rv)) {
// We are using the default prefs from mozilla. If you were

6
mozilla/embedding/tests/mfcembed/ProfileMgr.cpp
View File

@ -57,7 +57,8 @@ nsresult CProfileMgr::StartUp()
{
nsresult rv;
NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv);
nsCOMPtr<nsIProfile> 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<nsIProfile> profileService =
do_GetService(NS_PROFILE_CONTRACTID, &rv);
if (NS_SUCCEEDED(rv))
rv = profileService->SetCurrentProfile(dialog.m_SelectedProfile.get());
}

15
mozilla/embedding/tests/mfcembed/ProfilesDlg.cpp
View File

@ -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<nsIProfile> 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<nsIProfile> 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<nsIProfile> 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<nsIProfile> 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<nsIProfile> profileService =
do_GetService(NS_PROFILE_CONTRACTID, &rv);
ASSERT(NS_SUCCEEDED(rv));
if (NS_SUCCEEDED(rv))
{

6
mozilla/embedding/tests/mfcembed/winEmbedFileLocProvider.cpp
View File

@ -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<nsIProperties> 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<nsILocalFile> localDir;
NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
nsCOMPtr<nsIProperties> 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))

9
mozilla/embedding/tests/winEmbed/winEmbed.cpp
View File

@ -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<nsIProfile> 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<nsIProfile> 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<nsIProfile> 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];

6
mozilla/extensions/cookie/nsCookieService.cpp
View File

@ -63,14 +63,16 @@ nsresult nsCookieService::Init()
COOKIE_Read();
nsresult rv;
NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv);
nsCOMPtr<nsIObserverService> 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<nsIDocumentLoader> docLoaderService =
do_GetService(kDocLoaderServiceCID, &rv);
if (NS_SUCCEEDED(rv) && docLoaderService) {
nsCOMPtr<nsIWebProgress> progress(do_QueryInterface(docLoaderService));
if (progress)

12
mozilla/extensions/cookie/nsCookies.cpp
View File

@ -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<nsIPref> 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<nsIPref> 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<nsIPref> 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<nsIPref> 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<nsIPref> 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<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID, &rv));
if (NS_FAILED(prefs->GetBoolPref(cookie_strictDomainsPref, &pref_scd))) {
pref_scd = PR_FALSE;
}

8
mozilla/extensions/cookie/nsImages.cpp
View File

@ -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<nsIPref> 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<nsIPref> 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<nsIPref> 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<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID, &rv));
if (NS_FAILED(rv) ||
NS_FAILED(prefs->GetBoolPref("imageblocker.enabled", &prefvalue)) ||
!prefvalue) {

3
mozilla/extensions/cookie/nsPermissionManager.cpp
View File

@ -104,7 +104,8 @@ nsresult nsPermissionManager::Init()
PERMISSION_Read();
nsresult rv;
NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv);
nsCOMPtr<nsIObserverService> 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());

3
mozilla/extensions/cookie/nsUtils.cpp
View File

@ -266,7 +266,8 @@ PRUnichar *
CKutil_Localize(const PRUnichar *genericString) {
nsresult ret;
PRUnichar *ptrv = nsnull;
NS_WITH_SERVICE(nsIStringBundleService, pStringService, kStringBundleServiceCID, &ret);
nsCOMPtr<nsIStringBundleService> pStringService =
do_GetService(kStringBundleServiceCID, &ret);
if (NS_SUCCEEDED(ret) && (nsnull != pStringService)) {
nsCOMPtr<nsIStringBundle> bundle;
ret = pStringService->CreateBundle(LOCALIZATION, getter_AddRefs(bundle));

9
mozilla/extensions/cookie/tests/TestCookie.cpp
View File

@ -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<nsIEventQueueService> 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<nsIStringBundleService> bundleService =
do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
if (NS_SUCCEEDED(rv))
{
nsCOMPtr<nsIStringBundle> 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<nsICookieService> cookieService =
do_GetService(kCookieServiceCID, &rv);
if (NS_FAILED(rv)) return -1;
SetACookie(cookieService, "http://www.blah.com", "myCookie=yup; path=/");

6
mozilla/extensions/datetime/nsDateTimeChannel.cpp
View File

@ -162,7 +162,8 @@ nsDateTimeChannel::Open(nsIInputStream **_retval)
if (NS_FAILED(rv))
return rv;
NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv);
nsCOMPtr<nsISocketTransportService> socketService =
do_GetService(kSocketTransportServiceCID, &rv);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsITransport> 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<nsISocketTransportService> socketService =
do_GetService(kSocketTransportServiceCID, &rv);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsITransport> transport;

10
mozilla/extensions/finger/nsFingerChannel.cpp
View File

@ -192,7 +192,8 @@ nsFingerChannel::Open(nsIInputStream **_retval)
if (NS_FAILED(rv))
return rv;
NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv);
nsCOMPtr<nsISocketTransportService> 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<nsISocketTransportService> 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<nsIStreamListener> converterListener;
NS_WITH_SERVICE(nsIStreamConverterService, StreamConvService,
kStreamConverterServiceCID, &rv);
nsCOMPtr<nsIStreamConverterService> StreamConvService =
do_GetService(kStreamConverterServiceCID, &rv);
if (NS_FAILED(rv)) return rv;
nsAutoString fromStr; fromStr.AssignWithConversion("text/plain");

2
mozilla/extensions/pics/src/nsPICSElementObserver.cpp
View File

@ -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<nsIIOService> service(do_GetService(kIOServiceCID, &rv));
if (NS_FAILED(rv)) return rv;
nsIURI *uri = nsnull;

4
mozilla/extensions/psm-glue/src/nsCrypto.cpp
View File

@ -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<nsIEventQueueService> eventQService =
do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv);
if (NS_FAILED(rv))
return nsnull;

21
mozilla/extensions/psm-glue/src/nsPSMComponent.cpp
View File

@ -100,7 +100,8 @@ nsPSMComponent::~nsPSMComponent()
if (mCertContentListener) {
nsresult rv = NS_ERROR_FAILURE;
NS_WITH_SERVICE(nsIURILoader, dispatcher, NS_URI_LOADER_CONTRACTID, &rv);
nsCOMPtr<nsIURILoader> 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<nsIURILoader> 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<nsIObserverService> 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<nsILocalFile> psmAppFile;
NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
nsCOMPtr<nsIProperties> 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<nsILocalFile> psmAppFile;
NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
nsCOMPtr<nsIProperties> 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<nsIProfile> 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<nsIScriptSecurityManager> secMan =
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
rv = secMan->GetCertificatePrincipal((const char*)fingerprint.data,
aPrincipal);

21
mozilla/extensions/psm-glue/src/nsSecureBrowserUIImpl.cpp
View File

@ -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<nsIStringBundleService> 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<nsIPSMComponent> 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<nsIPSMComponent> 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<nsIPSMComponent> 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<nsIPSMComponent> 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<nsIPSMComponent> 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<nsIPSMComponent> psm =
do_GetService(PSM_COMPONENT_CONTRACTID, &rv);
if (NS_FAILED(rv))
return rv;
return psm->PassPrefs();

6
mozilla/extensions/python/xpcom/src/xpcom.cpp
View File

@ -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<nsIProxyObjectManager> proxyMgr =
do_GetService(kProxyObjectManagerCID, &rv_proxy);
if ( NS_SUCCEEDED(rv_proxy) ) {
rv_proxy = proxyMgr->GetProxyForObject(pQueue,

5
mozilla/extensions/transformiix/source/xml/parser/nsSyncLoader.cpp
View File

@ -238,7 +238,7 @@ nsSyncLoader::LoadDocument(nsIURI* documentURI, nsIDOMDocument **_retval)
nsCOMPtr<nsIEventQueueService> eventQService;
nsCOMPtr<nsIXPCNativeCallContext> cc;
NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv);
nsCOMPtr<nsIXPConnect> 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<nsIAppShellService> appshellSvc =
do_GetService(kAppShellServiceCID, &rv);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIDOMWindowInternal> junk;
rv = appshellSvc->GetHiddenWindowAndJSContext(getter_AddRefs(junk), &cx);

15
mozilla/extensions/wallet/cookieviewer/nsCookieViewer.cpp
View File

@ -58,7 +58,8 @@ CookieViewerImpl::GetCookieValue(char** aValue)
}
nsresult res;
NS_WITH_SERVICE(nsICookieService, cookieservice, kCookieServiceCID, &res);
nsCOMPtr<nsICookieService> cookieservice =
do_GetService(kCookieServiceCID, &res);
if (NS_FAILED(res)) return res;
nsAutoString cookieList;
res = cookieservice->Cookie_GetCookieListForViewer(cookieList);
@ -77,7 +78,8 @@ CookieViewerImpl::GetPermissionValue(PRInt32 type, char** aValue)
}
nsresult res;
NS_WITH_SERVICE(nsICookieService, cookieservice, kCookieServiceCID, &res);
nsCOMPtr<nsICookieService> cookieservice =
do_GetService(kCookieServiceCID, &res);
if (NS_FAILED(res)) return res;
nsAutoString PermissionList;
res = cookieservice->Cookie_GetPermissionListForViewer(PermissionList, type);
@ -96,7 +98,8 @@ CookieViewerImpl::SetValue(const char* aValue, nsIDOMWindowInternal* win)
return NS_ERROR_NULL_POINTER;
}
nsresult res;
NS_WITH_SERVICE(nsICookieService, cookieservice, kCookieServiceCID, &res);
nsCOMPtr<nsICookieService> cookieservice =
do_GetService(kCookieServiceCID, &res);
if (NS_FAILED(res)) return res;
nsAutoString netList; netList.AssignWithConversion(aValue);
res = cookieservice->Cookie_CookieViewerReturn(netList);
@ -111,7 +114,8 @@ CookieViewerImpl::BlockImage(const char* imageURL)
return NS_ERROR_NULL_POINTER;
}
nsresult res;
NS_WITH_SERVICE(nsICookieService, cookieservice, kCookieServiceCID, &res);
nsCOMPtr<nsICookieService> cookieservice =
do_GetService(kCookieServiceCID, &res);
if (NS_FAILED(res)) {
return res;
}
@ -172,7 +176,8 @@ CookieViewerImpl::AddPermission(nsIDOMWindowInternal* aWin, PRBool permission, P
/* got the url at last, now pass it on to the Permission_Add routie */
NS_WITH_SERVICE(nsICookieService, cookieservice, kCookieServiceCID, &rv);
nsCOMPtr<nsICookieService> cookieservice =
do_GetService(kCookieServiceCID, &rv);
if (NS_FAILED(rv)) {
return rv;
}

6
mozilla/extensions/wallet/editor/nsWalletEditor.cpp
View File

@ -55,7 +55,8 @@ WalletEditorImpl::GetValue(PRUnichar** aValue)
return NS_ERROR_NULL_POINTER;
}
nsresult res;
NS_WITH_SERVICE(nsIWalletService, walletservice, kWalletServiceCID, &res);
nsCOMPtr<nsIWalletService> walletservice =
do_GetService(kWalletServiceCID, &res);
if (NS_FAILED(res)) return res;
nsAutoString walletList;
res = walletservice->WALLET_PreEdit(walletList);
@ -74,7 +75,8 @@ WalletEditorImpl::SetValue(const PRUnichar* aValue, nsIDOMWindowInternal* win)
return NS_ERROR_NULL_POINTER;
}
nsresult res;
NS_WITH_SERVICE(nsIWalletService, walletservice, kWalletServiceCID, &res);
nsCOMPtr<nsIWalletService> walletservice =
do_GetService(kWalletServiceCID, &res);
if (NS_FAILED(res)) return res;
nsAutoString walletList( aValue );
res = walletservice->WALLET_PostEdit(walletList);

9
mozilla/extensions/wallet/signonviewer/nsSignonViewer.cpp
View File

@ -55,7 +55,8 @@ SignonViewerImpl::GetNopreviewValue(PRUnichar** aValue)
return NS_ERROR_NULL_POINTER;
}
nsresult res;
NS_WITH_SERVICE(nsIWalletService, walletservice, kWalletServiceCID, &res);
nsCOMPtr<nsIWalletService> walletservice =
do_GetService(kWalletServiceCID, &res);
if (NS_FAILED(res)) return res;
nsAutoString nopreviewList;
res = walletservice->WALLET_GetNopreviewListForViewer(nopreviewList);
@ -73,7 +74,8 @@ SignonViewerImpl::GetNocaptureValue(PRUnichar** aValue)
return NS_ERROR_NULL_POINTER;
}
nsresult res;
NS_WITH_SERVICE(nsIWalletService, walletservice, kWalletServiceCID, &res);
nsCOMPtr<nsIWalletService> walletservice =
do_GetService(kWalletServiceCID, &res);
if (NS_FAILED(res)) return res;
nsAutoString nocaptureList;
res = walletservice->WALLET_GetNocaptureListForViewer(nocaptureList);
@ -92,7 +94,8 @@ SignonViewerImpl::SetValue(const PRUnichar* aValue, nsIDOMWindowInternal* win)
return NS_ERROR_NULL_POINTER;
}
nsresult res;
NS_WITH_SERVICE(nsIWalletService, walletservice, kWalletServiceCID, &res);
nsCOMPtr<nsIWalletService> walletservice =
do_GetService(kWalletServiceCID, &res);
if (NS_FAILED(res)) return res;
nsAutoString walletList( aValue );
res = walletservice->SI_SignonViewerReturn(walletList);

2
mozilla/extensions/wallet/src/htmldlgs.h
View File

@ -170,7 +170,7 @@ XP_MakeHTMLDialog2(XPDialogInfo *dialogInfo) {
char* separator;
nsresult res;
NS_WITH_SERVICE(nsIIOService, netservice, kIOServiceCID, &res);
nsCOMPtr<nsIIOService> netservice(do_GetService(kIOServiceCID, &res));
if ((NS_SUCCEEDED(res)) && (nsnull != netservice)) {
const nsAutoString html_dlgs = nsAutoString(HTML_DLGS_URL);

6
mozilla/extensions/wallet/src/nsWalletService.cpp
View File

@ -217,7 +217,8 @@ nsresult nsWalletlibService::Init()
{
nsresult rv;
NS_WITH_SERVICE(nsIObserverService, svc, NS_OBSERVERSERVICE_CONTRACTID, &rv);
nsCOMPtr<nsIObserverService> svc =
do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv);
if (NS_SUCCEEDED(rv) && svc) {
// Register as an observer of form submission
nsAutoString topic; topic.AssignWithConversion(NS_FORMSUBMIT_SUBJECT);
@ -229,7 +230,8 @@ nsresult nsWalletlibService::Init()
NS_ASSERTION(PR_FALSE, "Could not get nsIObserverService");
// Get the global document loader service...
NS_WITH_SERVICE(nsIDocumentLoader, docLoaderService, kDocLoaderServiceCID, &rv)
nsCOMPtr<nsIDocumentLoader> docLoaderService =
do_GetService(kDocLoaderServiceCID, &rv);
if (NS_SUCCEEDED(rv) && docLoaderService) {
nsCOMPtr<nsIWebProgress> progress(do_QueryInterface(docLoaderService, &rv));
if (NS_SUCCEEDED(rv))

3
mozilla/extensions/wallet/src/wallet.cpp
View File

@ -3741,7 +3741,8 @@ wallet_IsFromCartman(nsIURI* aURL) {
if (PL_strncasecmp(host, "127.0.0.1", 9) == 0) {
/* submit is to server on local machine */
nsresult res;
NS_WITH_SERVICE(nsISecurityManagerComponent, psm, PSM_COMPONENT_CONTRACTID, &res);
nsCOMPtr<nsISecurityManagerComponent> psm =
do_GetService(PSM_COMPONENT_CONTRACTID, &res);
if (NS_SUCCEEDED(res)) {
nsXPIDLCString password;
if (NS_SUCCEEDED(aURL->GetPassword(getter_Copies(password))) && password) {

6
mozilla/extensions/wallet/walletpreview/nsWalletPreview.cpp
View File

@ -58,7 +58,8 @@ WalletPreviewImpl::GetPrefillValue(PRUnichar** aValue)
return NS_ERROR_NULL_POINTER;
}
nsresult res;
NS_WITH_SERVICE(nsIWalletService, walletservice, kWalletServiceCID, &res);
nsCOMPtr<nsIWalletService> walletservice =
do_GetService(kWalletServiceCID, &res);
if (NS_FAILED(res)) return res;
nsAutoString walletList;
res = walletservice->WALLET_GetPrefillListForViewer(walletList);
@ -115,7 +116,8 @@ WalletPreviewImpl::SetValue(const PRUnichar* aValue, nsIDOMWindowInternal* win)
return NS_ERROR_NULL_POINTER;
}
nsresult res;
NS_WITH_SERVICE(nsIWalletService, walletservice, kWalletServiceCID, &res);
nsCOMPtr<nsIWalletService> walletservice =
do_GetService(kWalletServiceCID, &res);
if (NS_FAILED(res)) return res;
nsAutoString walletList( aValue );
res = walletservice->WALLET_PrefillReturn(walletList);

6
mozilla/extensions/wallet/walletpreview/nsWalletPreviewFactory.cpp
View File

@ -177,7 +177,8 @@ NSRegisterSelf(nsISupports* aServMgr , const char* aPath)
nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
if (NS_FAILED(rv)) return rv;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
nsCOMPtr<nsIComponentManager> compMgr =
do_GetService(kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = compMgr->RegisterComponent(kWalletPreviewCID,
@ -199,7 +200,8 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* aPath)
nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
if (NS_FAILED(rv)) return rv;
NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv);
nsCOMPtr<nsIComponentManager> compMgr =
do_GetService(kComponentManagerCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = compMgr->UnregisterComponent(kWalletPreviewCID, aPath);

2
mozilla/extensions/webservices/soap/src/nsDefaultSOAPEncoder.cpp
View File

@ -304,7 +304,7 @@ nsDefaultSOAPEncoder::SerializeJavaScriptArray(JSObject* arrayobj,
{
nsresult rv;
nsCOMPtr<nsIXPCNativeCallContext> cc;
NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv);
nsCOMPtr<nsIXPConnect> xpc(do_GetService(nsIXPConnect::GetCID(), &rv));
if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
// Add a SOAP-ENC:arrayType parameter. We always assume it's a

Some files were not shown because too many files have changed in this diff Show More