From 2b3b3b258678acb26e3a09027ffe9a7a74b1f080 Mon Sep 17 00:00:00 2001 From: "jaggernaut%netscape.com" Date: Wed, 25 Jul 2001 07:54:28 +0000 Subject: [PATCH] Bug 86734: Remove NS_WITH_SERVICE. r=dbaron, rs=scc, a=asa git-svn-id: svn://10.0.0.236/trunk@99906 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/accessible/src/base/nsAccessible.cpp | 3 +- mozilla/accessible/src/nsAccessible.cpp | 3 +- mozilla/caps/src/nsCodebasePrincipal.cpp | 2 +- mozilla/caps/src/nsScriptSecurityManager.cpp | 6 +- mozilla/caps/src/nsSecurityManagerFactory.cpp | 24 ++--- .../chrome/src/nsChromeProtocolHandler.cpp | 11 +-- mozilla/chrome/src/nsChromeRegistry.cpp | 18 ++-- mozilla/content/base/src/nsContentPolicy.cpp | 3 +- mozilla/content/base/src/nsCopySupport.cpp | 2 +- mozilla/content/base/src/nsDocument.cpp | 11 +-- mozilla/content/base/src/nsDocumentViewer.cpp | 24 +++-- mozilla/content/base/src/nsGenericElement.cpp | 4 +- .../base/src/nsPlainTextSerializer.cpp | 4 +- mozilla/content/base/src/nsSelection.cpp | 5 +- .../content/base/src/nsSyncLoadService.cpp | 5 +- .../events/src/nsEventStateManager.cpp | 8 +- .../html/content/src/nsHTMLInputElement.cpp | 4 +- .../html/document/src/nsHTMLContentSink.cpp | 10 +-- .../html/document/src/nsHTMLDocument.cpp | 9 +- .../src/nsHTMLFragmentContentSink.cpp | 12 +-- .../html/document/src/nsImageDocument.cpp | 3 +- .../content/html/style/src/nsCSSLoader.cpp | 8 +- .../content/html/style/src/nsStyleUtil.cpp | 4 +- mozilla/content/shared/src/nsStyleUtil.cpp | 4 +- mozilla/content/xbl/src/nsBindingManager.cpp | 6 +- .../content/xbl/src/nsXBLPrototypeHandler.cpp | 2 +- mozilla/content/xbl/src/nsXBLService.cpp | 2 +- .../content/xbl/src/nsXBLWindowHandler.cpp | 3 +- .../content/xml/content/src/nsXMLElement.cpp | 12 ++- .../xml/document/src/nsXMLContentSink.cpp | 2 +- .../xml/document/src/nsXMLDocument.cpp | 10 ++- .../content/xul/content/src/nsXULElement.cpp | 6 +- .../xul/content/src/nsXULPopupListener.cpp | 4 +- .../xul/document/src/nsXULDocument.cpp | 16 ++-- .../xul/document/src/nsXULPrototypeCache.cpp | 2 +- .../document/src/nsXULPrototypeDocument.cpp | 6 +- .../xul/templates/src/nsXULContentBuilder.cpp | 2 +- mozilla/docshell/base/nsDocShell.cpp | 3 +- mozilla/dom/src/base/nsGlobalWindow.cpp | 5 +- mozilla/dom/src/base/nsJSEnvironment.cpp | 27 +++--- mozilla/dom/src/base/nsJSUtils.cpp | 6 +- mozilla/editor/base/nsEditor.cpp | 8 +- .../editor/base/nsEditorEventListeners.cpp | 11 ++- mozilla/editor/base/nsEditorShell.cpp | 14 +-- mozilla/editor/base/nsHTMLDataTransfer.cpp | 12 +-- mozilla/editor/base/nsHTMLEditRules.cpp | 2 +- .../editor/base/nsPlaintextDataTransfer.cpp | 10 ++- mozilla/editor/base/nsPlaintextEditor.cpp | 4 +- mozilla/editor/base/nsTextEditRules.cpp | 2 +- mozilla/editor/composer/src/nsEditorShell.cpp | 14 +-- mozilla/editor/libeditor/base/nsEditor.cpp | 8 +- .../libeditor/html/nsHTMLDataTransfer.cpp | 12 +-- .../editor/libeditor/html/nsHTMLEditRules.cpp | 2 +- .../libeditor/text/nsEditorEventListeners.cpp | 11 ++- .../text/nsPlaintextDataTransfer.cpp | 10 ++- .../libeditor/text/nsPlaintextEditor.cpp | 4 +- .../editor/libeditor/text/nsTextEditRules.cpp | 2 +- mozilla/embedding/base/nsEmbedWin32.cpp | 2 +- .../activex/src/control/MozillaBrowser.cpp | 6 +- .../browser/photon/src/PtMozilla.cpp | 3 +- .../source/CAppFileLocationProvider.cpp | 6 +- .../browser/powerplant/source/CBrowserApp.cp | 9 +- .../powerplant/source/CBrowserShell.cpp | 6 +- .../powerplant/source/CProfileManager.cpp | 9 +- .../browser/powerplant/source/UMacUnicode.cpp | 11 +-- .../browser/webBrowser/nsWebBrowser.cpp | 6 +- .../webBrowser/nsWebBrowserPersist.cpp | 3 +- mozilla/embedding/qa/testembed/ProfileMgr.cpp | 6 +- .../embedding/qa/testembed/ProfilesDlg.cpp | 15 ++-- mozilla/embedding/qa/testembed/TestEmbed.cpp | 7 +- mozilla/embedding/qa/testembed/Tests.cpp | 3 +- .../qa/testembed/winEmbedFileLocProvider.cpp | 6 +- mozilla/embedding/tests/mfcembed/MfcEmbed.cpp | 7 +- .../embedding/tests/mfcembed/ProfileMgr.cpp | 6 +- .../embedding/tests/mfcembed/ProfilesDlg.cpp | 15 ++-- .../mfcembed/winEmbedFileLocProvider.cpp | 6 +- mozilla/embedding/tests/winEmbed/winEmbed.cpp | 9 +- mozilla/extensions/cookie/nsCookieService.cpp | 6 +- mozilla/extensions/cookie/nsCookies.cpp | 12 +-- mozilla/extensions/cookie/nsImages.cpp | 8 +- .../extensions/cookie/nsPermissionManager.cpp | 3 +- mozilla/extensions/cookie/nsUtils.cpp | 3 +- .../extensions/cookie/tests/TestCookie.cpp | 9 +- .../extensions/datetime/nsDateTimeChannel.cpp | 6 +- mozilla/extensions/finger/nsFingerChannel.cpp | 10 ++- .../pics/src/nsPICSElementObserver.cpp | 2 +- mozilla/extensions/psm-glue/src/nsCrypto.cpp | 4 +- .../psm-glue/src/nsPSMComponent.cpp | 21 +++-- .../psm-glue/src/nsSecureBrowserUIImpl.cpp | 21 +++-- mozilla/extensions/python/xpcom/src/xpcom.cpp | 6 +- .../source/xml/parser/nsSyncLoader.cpp | 5 +- .../wallet/cookieviewer/nsCookieViewer.cpp | 15 ++-- .../wallet/editor/nsWalletEditor.cpp | 6 +- .../wallet/signonviewer/nsSignonViewer.cpp | 9 +- mozilla/extensions/wallet/src/htmldlgs.h | 2 +- .../extensions/wallet/src/nsWalletService.cpp | 6 +- mozilla/extensions/wallet/src/wallet.cpp | 3 +- .../wallet/walletpreview/nsWalletPreview.cpp | 6 +- .../walletpreview/nsWalletPreviewFactory.cpp | 6 +- .../soap/src/nsDefaultSOAPEncoder.cpp | 2 +- .../webservices/soap/src/nsSOAPCall.cpp | 4 +- .../webservices/soap/src/nsSOAPUtils.cpp | 8 +- .../xmlextras/base/src/nsDOMParser.cpp | 12 ++- .../xmlextras/base/src/nsXMLHttpRequest.cpp | 16 ++-- .../soap/src/nsDefaultSOAPEncoder.cpp | 2 +- .../xmlextras/soap/src/nsSOAPCall.cpp | 4 +- .../xmlextras/soap/src/nsSOAPUtils.cpp | 8 +- .../xmlterm/base/mozXMLTermFactory.cpp | 6 +- .../xmlterm/base/mozXMLTerminal.cpp | 4 +- mozilla/gfx/src/beos/nsDeviceContextBeOS.cpp | 4 +- mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp | 4 +- mozilla/gfx/src/mac/nsDeviceContextMac.cpp | 4 +- .../gfx/src/mac/nsDeviceContextSpecMac.cpp | 3 +- mozilla/gfx/src/nsDeviceContext.cpp | 5 +- mozilla/gfx/src/nsImageManager.cpp | 2 +- mozilla/gfx/src/nsImageNetContextSync.cpp | 2 +- mozilla/gfx/src/os2/nsDeviceContextOS2.cpp | 2 +- mozilla/gfx/src/photon/nsDeviceContextPh.cpp | 4 +- .../photon/nsDeviceContextSpecFactoryP.cpp | 3 +- .../gfx/src/photon/nsDeviceContextSpecPh.cpp | 3 +- mozilla/gfx/src/qt/nsDeviceContextQT.cpp | 4 +- mozilla/gfx/src/qt/nsDeviceContextSpecQT.cpp | 2 +- .../windows/nsDeviceContextSpecFactoryW.cpp | 3 +- .../gfx/src/windows/nsDeviceContextWin.cpp | 6 +- mozilla/gfx/src/xlib/nsDeviceContextXlib.cpp | 2 +- mozilla/htmlparser/robot/nsDebugRobot.cpp | 2 +- mozilla/htmlparser/robot/nsRobotSink.cpp | 2 +- mozilla/htmlparser/src/CNavDTD.cpp | 3 +- .../src/nsHTMLContentSinkStream.cpp | 2 +- mozilla/htmlparser/src/nsParser.cpp | 3 +- mozilla/htmlparser/src/nsScanner.cpp | 5 +- .../htmlparser/tests/grabpage/grabpage.cpp | 2 +- .../chardet/src/nsMetaCharsetObserver.cpp | 8 +- .../intl/locale/src/mac/nsCollationMac.cpp | 3 +- .../locale/src/mac/nsDateTimeFormatMac.cpp | 3 +- .../locale/src/nsScriptableDateFormat.cpp | 3 +- .../intl/locale/src/os2/nsCollationOS2.cpp | 3 +- .../intl/locale/src/unix/nsCollationUnix.cpp | 3 +- .../locale/src/unix/nsDateTimeFormatUnix.cpp | 3 +- .../locale/src/windows/nsCollationWin.cpp | 3 +- .../src/windows/nsDateTimeFormatWin.cpp | 3 +- mozilla/intl/strres/src/nsAcceptLang.cpp | 6 +- .../uconv/public/nsICharsetConverterManager.h | 3 +- .../uconv/src/nsCharsetConverterManager.cpp | 11 +-- mozilla/intl/uconv/src/nsCharsetMenu.cpp | 3 +- mozilla/intl/uconv/src/nsTextToSubURI.cpp | 3 +- mozilla/intl/uconv/tests/TestUConv.cpp | 12 ++- .../intl/uconv/ucvja/nsJapaneseToUnicode.cpp | 12 +-- .../intl/unicharutil/src/nsSaveAsCharset.cpp | 3 +- .../js/src/xpconnect/sample/xpcsample1.cpp | 2 +- mozilla/js/src/xpconnect/src/nsXPConnect.cpp | 13 +-- mozilla/js/src/xpconnect/tests/TestXPC.cpp | 16 ++-- .../tests/components/xpctest_echo.cpp | 6 +- .../tools/src/nsXPCToolsCompiler.cpp | 2 +- mozilla/layout/base/nsCSSFrameConstructor.cpp | 6 +- mozilla/layout/base/nsDocumentViewer.cpp | 24 +++-- mozilla/layout/base/nsPresShell.cpp | 7 +- mozilla/layout/base/src/nsCopySupport.cpp | 2 +- .../layout/base/src/nsPrintPreviewContext.cpp | 3 +- mozilla/layout/forms/nsFormControlHelper.cpp | 5 +- mozilla/layout/generic/nsFrame.cpp | 3 +- mozilla/layout/generic/nsFrameFrame.cpp | 4 +- mozilla/layout/generic/nsGfxScrollFrame.cpp | 6 +- mozilla/layout/generic/nsHTMLFrame.cpp | 2 +- mozilla/layout/generic/nsImageFrame.cpp | 4 +- mozilla/layout/generic/nsPageFrame.cpp | 3 +- mozilla/layout/generic/nsSelection.cpp | 5 +- .../layout/generic/nsSimplePageSequence.cpp | 3 +- mozilla/layout/html/base/src/nsFrame.cpp | 3 +- .../layout/html/base/src/nsGfxScrollFrame.cpp | 6 +- mozilla/layout/html/base/src/nsHTMLFrame.cpp | 2 +- mozilla/layout/html/base/src/nsImageFrame.cpp | 4 +- mozilla/layout/html/base/src/nsPageFrame.cpp | 3 +- mozilla/layout/html/base/src/nsPresShell.cpp | 7 +- .../html/base/src/nsSimplePageSequence.cpp | 3 +- .../layout/html/document/src/nsFrameFrame.cpp | 4 +- .../html/forms/src/nsFormControlHelper.cpp | 5 +- mozilla/layout/html/forms/src/nsFormFrame.cpp | 15 ++-- .../html/style/src/nsCSSFrameConstructor.cpp | 6 +- mozilla/layout/html/tests/TestCSSParser.cpp | 2 +- mozilla/layout/html/tests/TestCSSScanner.cpp | 2 +- .../layout/mathml/base/src/nsMathMLChar.cpp | 6 +- mozilla/layout/style/nsCSSLoader.cpp | 8 +- mozilla/layout/style/nsStyleUtil.cpp | 4 +- .../layout/xul/base/src/nsMenuBarListener.cpp | 2 +- mozilla/layout/xul/base/src/nsMenuFrame.cpp | 5 +- .../layout/xul/base/src/nsSplitterFrame.cpp | 3 +- .../src/outliner/src/nsOutlinerBodyFrame.cpp | 3 +- .../xul/base/src/tree/src/nsTreeBodyFrame.cpp | 3 +- .../mailnews/absync/src/nsABSyncDriver.cpp | 7 +- mozilla/mailnews/absync/src/nsAbSync.cpp | 19 ++-- .../absync/src/nsAbSyncPostEngine.cpp | 4 +- .../mailnews/addrbook/src/nsABSyncDriver.cpp | 2 +- .../addrbook/src/nsAbAddressCollecter.cpp | 16 ++-- .../addrbook/src/nsAbAutoCompleteSession.cpp | 4 +- .../mailnews/addrbook/src/nsAbBSDirectory.cpp | 14 +-- mozilla/mailnews/addrbook/src/nsAbCard.cpp | 5 +- .../addrbook/src/nsAbCardProperty.cpp | 6 +- .../mailnews/addrbook/src/nsAbDirProperty.cpp | 2 +- .../mailnews/addrbook/src/nsAbDirectory.cpp | 42 +++++---- mozilla/mailnews/addrbook/src/nsAbMDBCard.cpp | 5 +- .../addrbook/src/nsAbMDBCardProperty.cpp | 6 +- .../addrbook/src/nsAbMDBDirProperty.cpp | 2 +- .../addrbook/src/nsAbMDBDirectory.cpp | 36 ++++---- .../addrbook/src/nsAbMDBRDFResource.cpp | 6 +- .../addrbook/src/nsAbRDFDataSource.cpp | 2 +- .../mailnews/addrbook/src/nsAbRDFResource.cpp | 6 +- .../addrbook/src/nsAddbookProtocolHandler.cpp | 10 ++- .../mailnews/addrbook/src/nsAddrDatabase.cpp | 14 +-- .../mailnews/addrbook/src/nsAddressBook.cpp | 28 +++--- .../addrbook/src/nsCardDataSource.cpp | 6 +- mozilla/mailnews/addrbook/src/nsDirPrefs.cpp | 61 ++++++------- .../addrbook/src/nsDirectoryDataSource.cpp | 6 +- .../mailnews/base/search/src/nsMsgFilter.cpp | 4 +- .../base/search/src/nsMsgSearchAdapter.cpp | 2 +- .../mailnews/base/search/tests/filterTest.cpp | 5 +- mozilla/mailnews/base/src/nsMessenger.cpp | 10 +-- .../base/src/nsMessengerBootstrap.cpp | 2 +- .../mailnews/base/src/nsMessengerMigrator.cpp | 30 ++++--- mozilla/mailnews/base/src/nsMsgAccount.cpp | 8 +- .../mailnews/base/src/nsMsgAccountManager.cpp | 19 ++-- .../mailnews/base/src/nsMsgBiffManager.cpp | 15 ++-- .../base/src/nsMsgFolderCompactor.cpp | 4 +- .../base/src/nsMsgFolderDataSource.cpp | 6 +- .../mailnews/base/src/nsMsgMailSession.cpp | 4 +- .../base/src/nsMsgNotificationManager.cpp | 9 +- .../mailnews/base/src/nsMsgOfflineManager.cpp | 15 ++-- .../mailnews/base/src/nsMsgPrintEngine.cpp | 3 +- mozilla/mailnews/base/src/nsMsgWindow.cpp | 9 +- .../base/src/nsStatusBarBiffManager.cpp | 6 +- mozilla/mailnews/base/util/nsMsgDBFolder.cpp | 10 ++- mozilla/mailnews/base/util/nsMsgFolder.cpp | 38 ++++---- mozilla/mailnews/base/util/nsMsgI18N.cpp | 18 ++-- mozilla/mailnews/base/util/nsMsgIdentity.cpp | 2 +- .../base/util/nsMsgIncomingServer.cpp | 9 +- .../mailnews/base/util/nsMsgMailNewsUrl.cpp | 7 +- mozilla/mailnews/base/util/nsMsgProtocol.cpp | 9 +- mozilla/mailnews/base/util/nsMsgUtf7Utils.cpp | 9 +- .../compose/src/nsMsgAttachmentHandler.cpp | 4 +- .../mailnews/compose/src/nsMsgCompPrefs.cpp | 2 +- .../mailnews/compose/src/nsMsgCompUtils.cpp | 17 ++-- .../src/nsMsgComposeContentHandler.cpp | 3 +- mozilla/mailnews/compose/src/nsMsgCopy.cpp | 14 +-- mozilla/mailnews/compose/src/nsMsgQuote.cpp | 7 +- mozilla/mailnews/compose/src/nsMsgSend.cpp | 14 +-- .../mailnews/compose/src/nsMsgSendLater.cpp | 10 ++- mozilla/mailnews/compose/src/nsSmtpServer.cpp | 23 ++--- .../mailnews/compose/src/nsSmtpService.cpp | 10 +-- .../mailnews/db/msgdb/src/nsMsgDatabase.cpp | 6 +- mozilla/mailnews/imap/src/nsIMAPBodyShell.cpp | 2 +- .../imap/src/nsImapIncomingServer.cpp | 44 ++++++---- .../mailnews/imap/src/nsImapMailFolder.cpp | 87 ++++++++++--------- .../mailnews/imap/src/nsImapMoveCoalescer.cpp | 3 +- .../mailnews/imap/src/nsImapOfflineSync.cpp | 11 +-- mozilla/mailnews/imap/src/nsImapProtocol.cpp | 15 ++-- mozilla/mailnews/imap/src/nsImapService.cpp | 25 +++--- .../mailnews/imap/src/nsImapStringBundle.cpp | 3 +- mozilla/mailnews/imap/src/nsImapUndoTxn.cpp | 8 +- mozilla/mailnews/imap/src/nsImapUrl.cpp | 8 +- mozilla/mailnews/imap/src/nsImapUtils.cpp | 4 +- .../import/eudora/src/nsEudoraCompose.cpp | 3 +- .../import/eudora/src/nsEudoraImport.cpp | 4 +- .../import/eudora/src/nsEudoraMac.cpp | 9 +- .../eudora/src/nsEudoraStringBundle.cpp | 6 +- .../import/eudora/src/nsEudoraWin32.cpp | 9 +- .../import/oexpress/nsOEAddressIterator.cpp | 2 +- .../mailnews/import/oexpress/nsOEImport.cpp | 6 +- .../import/oexpress/nsOEScanBoxes.cpp | 2 +- .../mailnews/import/oexpress/nsOESettings.cpp | 5 +- .../import/oexpress/nsOEStringBundle.cpp | 6 +- .../import/outlook/src/nsOutlookCompose.cpp | 3 +- .../import/outlook/src/nsOutlookImport.cpp | 4 +- .../import/outlook/src/nsOutlookMail.cpp | 6 +- .../import/outlook/src/nsOutlookSettings.cpp | 5 +- .../outlook/src/nsOutlookStringBundle.cpp | 6 +- .../import/src/nsImportAddressBooks.cpp | 5 +- mozilla/mailnews/import/src/nsImportMail.cpp | 3 +- .../mailnews/import/src/nsImportService.cpp | 6 +- .../import/src/nsImportStringBundle.cpp | 6 +- .../mailnews/import/text/src/nsTextImport.cpp | 10 +-- .../import/text/src/nsTextStringBundle.cpp | 6 +- .../mailnews/local/src/nsLocalMailFolder.cpp | 23 ++--- mozilla/mailnews/local/src/nsLocalUndoTxn.cpp | 7 +- mozilla/mailnews/local/src/nsLocalUtils.cpp | 4 +- .../mailnews/local/src/nsMailboxProtocol.cpp | 3 +- .../mailnews/local/src/nsMailboxService.cpp | 3 +- mozilla/mailnews/local/src/nsMailboxUrl.cpp | 4 +- .../local/src/nsMovemailIncomingServer.cpp | 4 +- .../mailnews/local/src/nsMovemailService.cpp | 4 +- mozilla/mailnews/local/src/nsNoneService.cpp | 4 +- mozilla/mailnews/local/src/nsParseMailbox.cpp | 4 +- .../local/src/nsPop3IncomingServer.cpp | 5 +- mozilla/mailnews/local/src/nsPop3Service.cpp | 6 +- .../mime/cthandlers/vcard/mimevcrd.cpp | 3 +- .../mime/emitters/src/nsMimeBaseEmitter.cpp | 3 +- .../mime/emitters/src/nsMimeXULEmitter.cpp | 10 ++- mozilla/mailnews/mime/src/comi18n.cpp | 10 ++- mozilla/mailnews/mime/src/mimedrft.cpp | 10 +-- mozilla/mailnews/mime/src/mimemoz2.cpp | 5 +- mozilla/mailnews/mime/src/mimetext.cpp | 2 +- .../mailnews/mime/src/nsStreamConverter.cpp | 2 +- mozilla/mailnews/news/src/nsNNTPProtocol.cpp | 3 +- .../mailnews/news/src/nsNewsDownloader.cpp | 4 +- mozilla/mailnews/news/src/nsNewsFolder.cpp | 6 +- mozilla/mailnews/news/src/nsNewsUtils.cpp | 6 +- .../news/src/nsNntpIncomingServer.cpp | 4 +- mozilla/mailnews/news/src/nsNntpService.cpp | 8 +- mozilla/modules/libimg/src/if.cpp | 2 +- mozilla/modules/libjar/nsJAR.cpp | 6 +- mozilla/modules/libjar/nsJARChannel.cpp | 7 +- mozilla/modules/libjar/nsJARURI.cpp | 6 +- mozilla/modules/libpref/src/nsPref.cpp | 3 +- mozilla/modules/libpref/src/nsPrefBranch.cpp | 3 +- mozilla/modules/libpref/src/nsPrefService.cpp | 6 +- .../src/nsMPFileLocProvider.cpp | 3 +- .../modules/oji/src/nsCSecurityContext.cpp | 16 ++-- mozilla/modules/oji/src/nsJVMManager.cpp | 22 ++--- .../modules/oji/tests/src/TM/PostEvent.cpp | 6 +- .../plugin/SanePlugin/nsSanePlugin.cpp | 4 +- .../plugin/SanePlugin/nsSanePluginFactory.cpp | 6 +- .../modules/plugin/base/src/ns4xPlugin.cpp | 2 +- .../plugin/base/src/nsPluginHostImpl.cpp | 22 +++-- .../modules/plugin/base/src/nsPluginSafety.h | 8 +- mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp | 2 +- .../plugin/nglsrc/nsPluginHostImpl.cpp | 22 +++-- .../modules/plugin/nglsrc/nsPluginSafety.h | 8 +- .../samples/SanePlugin/nsSanePlugin.cpp | 4 +- .../SanePlugin/nsSanePluginFactory.cpp | 6 +- .../base/src/nsAsyncStreamListener.cpp | 3 +- mozilla/netwerk/base/src/nsDownloader.cpp | 4 +- mozilla/netwerk/base/src/nsFileTransport.cpp | 4 +- mozilla/netwerk/base/src/nsIOService.cpp | 2 +- .../netwerk/base/src/nsInputStreamChannel.cpp | 3 +- mozilla/netwerk/base/src/nsNetModRegEntry.cpp | 6 +- .../base/src/nsProtocolProxyService.cpp | 2 +- .../netwerk/base/src/nsSocketTransport.cpp | 20 ++--- .../base/src/nsSocketTransportService.cpp | 2 +- mozilla/netwerk/base/src/nsStreamLoader.cpp | 4 +- .../filecache/nsDiskCacheRecordChannel.cpp | 9 +- .../cache/filecache/nsNetDiskCache.cpp | 8 +- .../cache/filecache/test/diskcache.cpp | 5 +- .../cache/memcache/nsMemCacheChannel.cpp | 5 +- .../netwerk/cache/mgr/nsCacheEntryChannel.cpp | 2 +- mozilla/netwerk/cache/mgr/nsCacheManager.cpp | 14 +-- .../netwerk/mime/src/nsXMLMIMEDataSource.cpp | 6 +- .../protocol/about/src/mzAboutMozilla.cpp | 2 +- .../protocol/about/src/nsAboutCache.cpp | 4 +- .../protocol/about/src/nsAboutCredits.cpp | 2 +- .../protocol/about/src/nsAboutPlugins.cpp | 2 +- .../about/src/nsAboutProtocolHandler.cpp | 2 +- .../protocol/about/src/nsAboutRedirector.cpp | 6 +- .../protocol/data/src/nsDataChannel.cpp | 3 +- .../datetime/src/nsDateTimeChannel.cpp | 6 +- .../protocol/file/src/nsFileChannel.cpp | 3 +- .../protocol/finger/src/nsFingerChannel.cpp | 10 ++- .../ftp/src/nsFtpConnectionThread.cpp | 19 ++-- .../protocol/gopher/src/nsGopherChannel.cpp | 16 ++-- .../netwerk/protocol/jar/src/nsJARChannel.cpp | 7 +- mozilla/netwerk/protocol/jar/src/nsJARURI.cpp | 6 +- .../keyword/src/nsKeywordProtocolHandler.cpp | 4 +- .../netwerk/protocol/res/src/nsResChannel.cpp | 2 +- .../converters/nsFTPDirListingConv.cpp | 3 +- .../streamconv/test/TestStreamConv.cpp | 6 +- mozilla/netwerk/test/TestCacheMgr.cpp | 3 +- mozilla/netwerk/test/TestCacheService.cpp | 6 +- mozilla/netwerk/test/TestCallbacks.cpp | 4 +- mozilla/netwerk/test/TestFileInput.cpp | 6 +- mozilla/netwerk/test/TestFileTransport.cpp | 9 +- mozilla/netwerk/test/TestHttp.cpp | 3 +- mozilla/netwerk/test/TestMCTransport.cpp | 5 +- mozilla/netwerk/test/TestMakeAbs.cpp | 4 +- mozilla/netwerk/test/TestOverlappedIO.cpp | 6 +- mozilla/netwerk/test/TestPageLoad.cpp | 3 +- mozilla/netwerk/test/TestProtocols.cpp | 8 +- mozilla/netwerk/test/TestRawCache.cpp | 5 +- mozilla/netwerk/test/TestRes.cpp | 9 +- mozilla/netwerk/test/TestSocketIO.cpp | 6 +- mozilla/netwerk/test/TestSocketInput.cpp | 6 +- mozilla/netwerk/test/TestSocketTransport.cpp | 9 +- mozilla/netwerk/test/TestThreadedIO.cpp | 3 +- mozilla/netwerk/test/TestWriteStream.cpp | 3 +- mozilla/netwerk/test/urltest.cpp | 3 +- .../parser/htmlparser/robot/nsDebugRobot.cpp | 2 +- .../parser/htmlparser/robot/nsRobotSink.cpp | 2 +- mozilla/parser/htmlparser/src/CNavDTD.cpp | 3 +- .../src/nsHTMLContentSinkStream.cpp | 2 +- mozilla/parser/htmlparser/src/nsParser.cpp | 3 +- mozilla/parser/htmlparser/src/nsScanner.cpp | 5 +- .../htmlparser/tests/grabpage/grabpage.cpp | 2 +- mozilla/profile/Acct/nsAccount.cpp | 4 +- .../Acctidl/nsAccountServicesFactory.cpp | 6 +- .../pref-migrator/src/nsPrefMigration.cpp | 13 +-- mozilla/profile/src/nsProfile.cpp | 30 ++++--- mozilla/profile/src/nsProfileAccess.cpp | 3 +- .../chrome/src/nsChromeProtocolHandler.cpp | 11 +-- mozilla/rdf/chrome/src/nsChromeRegistry.cpp | 18 ++-- .../datasource/src/nsFileSystemDataSource.cpp | 7 +- .../rdf/tests/domds/nsRDFDOMViewerUtils.cpp | 3 +- mozilla/rdf/tests/dsds/nsRDFDataSourceDS.cpp | 4 +- .../rdf/tests/dsds/nsRDFDataSourceFactory.cpp | 20 ++--- mozilla/rdf/tests/rdfcat/rdfcat.cpp | 3 +- mozilla/rdf/tests/rdfpoll/rdfpoll.cpp | 3 +- mozilla/uriloader/base/nsDocLoader.cpp | 4 +- mozilla/uriloader/base/nsURILoader.cpp | 3 +- .../exthandler/nsExternalHelperAppService.cpp | 3 +- mozilla/view/src/nsViewManager.cpp | 3 +- mozilla/view/src/nsViewManager2.cpp | 3 +- .../webshell/tests/viewer/nsBrowserWindow.cpp | 4 +- mozilla/webshell/tests/viewer/nsMacMain.cpp | 3 +- mozilla/webshell/tests/viewer/nsViewerApp.cpp | 3 +- mozilla/webshell/tests/viewer/nsWinMain.cpp | 2 +- mozilla/widget/src/beos/nsDragService.cpp | 2 +- mozilla/widget/src/beos/nsFilePicker.cpp | 6 +- mozilla/widget/src/gtk/nsFileWidget.cpp | 3 +- mozilla/widget/src/gtk/nsGtkIMEHelper.cpp | 6 +- .../widget/src/gtk/nsGtkMozRemoteHelper.cpp | 9 +- mozilla/widget/src/gtk/nsWidget.cpp | 6 +- mozilla/widget/src/gtk/nsWindow.cpp | 3 +- mozilla/widget/src/mac/nsMacControl.cpp | 6 +- mozilla/widget/src/mac/nsMenu.cpp | 3 +- mozilla/widget/src/mac/nsMenuX.cpp | 3 +- .../nsMotifAppContextServiceFactory.cpp | 6 +- mozilla/widget/src/motif/nsAppShell.cpp | 6 +- mozilla/widget/src/os2/nsAppShell.cpp | 4 +- mozilla/widget/src/os2/nsFilePicker.cpp | 6 +- mozilla/widget/src/os2/nsFileWidget.cpp | 3 +- mozilla/widget/src/photon/nsAppShell.cpp | 3 +- mozilla/widget/src/windows/nsAppShell.cpp | 4 +- mozilla/widget/src/windows/nsFilePicker.cpp | 6 +- mozilla/widget/src/windows/nsFileWidget.cpp | 6 +- mozilla/widget/src/windows/nsWindow.cpp | 3 +- mozilla/widget/src/xlib/nsWindow.cpp | 3 +- .../nsXlibWindowServiceFactory.cpp | 6 +- .../src/xpwidgets/nsPrimitiveHelpers.cpp | 6 +- .../widget/src/xpwidgets/nsXPLookAndFeel.cpp | 8 +- .../src/unix/motif/nsTimerMotifFactory.cpp | 6 +- mozilla/xpcom/build/nsXPComInit.cpp | 7 +- .../xpcom/components/nsComponentManager.cpp | 9 +- mozilla/xpcom/components/nsIServiceManager.h | 39 --------- .../components/nsNativeComponentLoader.cpp | 6 +- mozilla/xpcom/ds/nsIStopwatch.idl | 3 +- .../xpcom/io/nsAppFileLocationProvider.cpp | 12 ++- mozilla/xpcom/io/nsFileSpec.cpp | 3 +- mozilla/xpcom/io/nsIFile.idl | 2 +- mozilla/xpcom/io/nsLocalFileCommon.cpp | 13 +-- mozilla/xpcom/io/nsLocalFileMac.cpp | 3 +- mozilla/xpcom/io/nsUnicharInputStream.cpp | 3 +- mozilla/xpcom/proxy/public/nsProxiedService.h | 10 ++- .../xpcom/proxy/src/nsProxyObjectManager.cpp | 3 +- mozilla/xpcom/proxy/tests/proxytests.cpp | 6 +- mozilla/xpcom/tests/PropertiesTest.cpp | 5 +- .../xpcom/tests/windows/TestHelloXPLoop.cpp | 5 +- mozilla/xpfe/appshell/src/nsAbout.cpp | 6 +- .../xpfe/appshell/src/nsAppShellService.cpp | 3 +- .../appshell/src/nsCommandLineServiceMac.cpp | 3 +- .../xpfe/appshell/src/nsWindowMediator.cpp | 3 +- mozilla/xpfe/bootstrap/nsAppRunner.cpp | 3 +- .../xpfe/browser/src/nsBrowserInstance.cpp | 12 ++- .../bookmarks/src/nsBookmarksService.cpp | 16 ++-- .../directory/nsDirectoryViewer.cpp | 2 +- .../history/src/nsGlobalHistory.cpp | 11 +-- .../related/src/nsRelatedLinksHandler.cpp | 2 +- .../search/src/nsInternetSearchService.cpp | 15 ++-- .../search/src/nsLocalSearchService.cpp | 4 +- .../startup/src/nsCommandLineServiceMac.cpp | 3 +- .../xpfe/components/timebomb/nsTimeBomb.cpp | 3 +- .../components/xfer/src/nsStreamTransfer.cpp | 6 +- .../components/xfer/src/nsStreamXferOp.cpp | 3 +- mozilla/xpinstall/src/ScheduledTasks.cpp | 3 +- mozilla/xpinstall/src/nsInstall.cpp | 6 +- mozilla/xpinstall/src/nsInstallFolder.cpp | 69 ++++++++++----- mozilla/xpinstall/src/nsInstallTrigger.cpp | 3 +- .../src/nsLoggingProgressNotifier.cpp | 8 +- mozilla/xpinstall/src/nsSoftwareUpdate.cpp | 10 ++- mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp | 12 ++- mozilla/xpinstall/src/nsXPITriggerInfo.cpp | 3 +- mozilla/xpinstall/src/nsXPInstallManager.cpp | 17 ++-- 477 files changed, 1976 insertions(+), 1454 deletions(-) diff --git a/mozilla/accessible/src/base/nsAccessible.cpp b/mozilla/accessible/src/base/nsAccessible.cpp index f7aad6f0af5..0c235d2b34a 100644 --- a/mozilla/accessible/src/base/nsAccessible.cpp +++ b/mozilla/accessible/src/base/nsAccessible.cpp @@ -583,7 +583,8 @@ nsresult nsAccessible::GetTranslatedString(PRUnichar *aKey, nsAWritableString *a if (firstTime) { firstTime = PR_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIStringBundleService, stringBundleService, kStringBundleServiceCID, &rv); + nsCOMPtr stringBundleService = + do_GetService(kStringBundleServiceCID, &rv); // nsCOMPtr stringBundleService(do_GetService(kStringBundleServiceCID, &rv)); if (!stringBundleService) { NS_WARNING("ERROR: Failed to get StringBundle Service instance.\n"); diff --git a/mozilla/accessible/src/nsAccessible.cpp b/mozilla/accessible/src/nsAccessible.cpp index f7aad6f0af5..0c235d2b34a 100644 --- a/mozilla/accessible/src/nsAccessible.cpp +++ b/mozilla/accessible/src/nsAccessible.cpp @@ -583,7 +583,8 @@ nsresult nsAccessible::GetTranslatedString(PRUnichar *aKey, nsAWritableString *a if (firstTime) { firstTime = PR_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIStringBundleService, stringBundleService, kStringBundleServiceCID, &rv); + nsCOMPtr stringBundleService = + do_GetService(kStringBundleServiceCID, &rv); // nsCOMPtr stringBundleService(do_GetService(kStringBundleServiceCID, &rv)); if (!stringBundleService) { NS_WARNING("ERROR: Failed to get StringBundle Service instance.\n"); diff --git a/mozilla/caps/src/nsCodebasePrincipal.cpp b/mozilla/caps/src/nsCodebasePrincipal.cpp index 51c3b417708..4d774fcce21 100644 --- a/mozilla/caps/src/nsCodebasePrincipal.cpp +++ b/mozilla/caps/src/nsCodebasePrincipal.cpp @@ -86,7 +86,7 @@ nsCodebasePrincipal::CanEnableCapability(const char *capability, // check to see if the codebase principal pref is enabled. static char pref[] = "signed.applets.codebase_principal_support"; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, "@mozilla.org/preferences;1", &rv); + nsCOMPtr prefs(do_GetService("@mozilla.org/preferences;1", &rv)); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; PRBool enabled; diff --git a/mozilla/caps/src/nsScriptSecurityManager.cpp b/mozilla/caps/src/nsScriptSecurityManager.cpp index 5294e00ebe0..de43fc3169e 100644 --- a/mozilla/caps/src/nsScriptSecurityManager.cpp +++ b/mozilla/caps/src/nsScriptSecurityManager.cpp @@ -1600,7 +1600,8 @@ nsScriptSecurityManager::SetCanEnableCapability(const char* certificateID, if (!mSystemCertificate) { nsCOMPtr systemCertFile; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return NS_ERROR_FAILURE; rv = directoryService->Get(NS_XPCOM_CURRENT_PROCESS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(systemCertFile)); @@ -1862,7 +1863,8 @@ nsScriptSecurityManager::GetScriptSecurityManager() return NULL; nsresult rv; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc = + do_GetService(nsIXPConnect::GetCID(), &rv); if (NS_SUCCEEDED(rv) && xpc) { rv = xpc->SetDefaultSecurityManager( diff --git a/mozilla/caps/src/nsSecurityManagerFactory.cpp b/mozilla/caps/src/nsSecurityManagerFactory.cpp index 2f4de065d17..f667d253357 100644 --- a/mozilla/caps/src/nsSecurityManagerFactory.cpp +++ b/mozilla/caps/src/nsSecurityManagerFactory.cpp @@ -93,8 +93,8 @@ netscape_security_isPrivilegeEnabled(JSContext *cx, JSObject *obj, uintN argc, char *cap = getStringArgument(cx, obj, 0, argc, argv); if (cap) { nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { @@ -121,8 +121,8 @@ netscape_security_enablePrivilege(JSContext *cx, JSObject *obj, uintN argc, if (!cap) return JS_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return JS_FALSE; @@ -147,8 +147,8 @@ netscape_security_disablePrivilege(JSContext *cx, JSObject *obj, uintN argc, if (!cap) return JS_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return JS_FALSE; @@ -174,8 +174,8 @@ netscape_security_revertPrivilege(JSContext *cx, JSObject *obj, uintN argc, if (!cap) return JS_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return JS_FALSE; @@ -201,8 +201,8 @@ netscape_security_setCanEnablePrivilege(JSContext *cx, JSObject *obj, uintN argc if (!principalID || !cap) return JS_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return JS_FALSE; @@ -228,8 +228,8 @@ netscape_security_invalidate(JSContext *cx, JSObject *obj, uintN argc, if (!principalID) return JS_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return JS_FALSE; diff --git a/mozilla/chrome/src/nsChromeProtocolHandler.cpp b/mozilla/chrome/src/nsChromeProtocolHandler.cpp index e5204b7e10e..5ee8f08f1de 100644 --- a/mozilla/chrome/src/nsChromeProtocolHandler.cpp +++ b/mozilla/chrome/src/nsChromeProtocolHandler.cpp @@ -565,7 +565,7 @@ nsChromeProtocolHandler::NewChannel(nsIURI* aURI, // Canonify the "chrome:" URL; e.g., so that we collapse // "chrome://navigator/content/navigator.xul" and "chrome://navigator/content" // and "chrome://navigator/content/navigator.xul". - NS_WITH_SERVICE(nsIChromeRegistry, reg, kChromeRegistryCID, &rv); + nsCOMPtr reg(do_GetService(kChromeRegistryCID, &rv)); if (NS_FAILED(rv)) return rv; rv = reg->Canonify(aURI); @@ -573,7 +573,8 @@ nsChromeProtocolHandler::NewChannel(nsIURI* aURI, // Check the prototype cache to see if we've already got the // document in the cache. - NS_WITH_SERVICE(nsIXULPrototypeCache, cache, kXULPrototypeCacheCID, &rv); + nsCOMPtr cache = + do_GetService(kXULPrototypeCacheCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr proto; @@ -601,7 +602,7 @@ nsChromeProtocolHandler::NewChannel(nsIURI* aURI, rv = reg->ConvertChromeURL(chromeURI, getter_Copies(spec)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; rv = serv->NewURI(spec, nsnull, getter_AddRefs(chromeURI)); @@ -639,8 +640,8 @@ nsChromeProtocolHandler::NewChannel(nsIURI* aURI, if (PL_strcasecmp(fileExtension, "xul") == 0 || PL_strcasecmp(fileExtension, "html") == 0 || PL_strcasecmp(fileExtension, "xml") == 0) { - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr principal; diff --git a/mozilla/chrome/src/nsChromeRegistry.cpp b/mozilla/chrome/src/nsChromeRegistry.cpp index 32883dd3713..87b4db110b4 100644 --- a/mozilla/chrome/src/nsChromeRegistry.cpp +++ b/mozilla/chrome/src/nsChromeRegistry.cpp @@ -339,7 +339,8 @@ nsChromeRegistry::Init() rv = mRDFService->GetResource(kURICHROME_packageVersion, getter_AddRefs(mPackageVersion)); NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get RDF resource"); - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (observerService) { observerService->AddObserver(this, NS_LITERAL_STRING("profile-before-change").get()); observerService->AddObserver(this, NS_LITERAL_STRING("profile-do-change").get()); @@ -1094,7 +1095,8 @@ NS_IMETHODIMP nsChromeRegistry::RefreshSkins() if (NS_FAILED(rv)) return rv; // Get the window mediator - NS_WITH_SERVICE(nsIWindowMediator, windowMediator, kWindowMediatorCID, &rv); + nsCOMPtr windowMediator = + do_GetService(kWindowMediatorCID, &rv); if (NS_SUCCEEDED(rv)) { nsCOMPtr windowEnumerator; @@ -1129,18 +1131,21 @@ nsresult nsChromeRegistry::FlushCaches() // Flush the style sheet cache completely. // XXX For now flush everything. need a better call that only flushes style sheets. - NS_WITH_SERVICE(nsIXULPrototypeCache, xulCache, "@mozilla.org/xul/xul-prototype-cache;1", &rv); + nsCOMPtr xulCache = + do_GetService("@mozilla.org/xul/xul-prototype-cache;1", &rv); if (NS_SUCCEEDED(rv) && xulCache) { xulCache->Flush(); } // Flush the old image cache. - NS_WITH_SERVICE(nsIImageManager, imageManager, kImageManagerCID, &rv); + nsCOMPtr imageManager = + do_GetService(kImageManagerCID, &rv); if (imageManager) rv = imageManager->FlushCache(1); // Flush the new imagelib image chrome cache. - NS_WITH_SERVICE(imgICache, imageCache, "@mozilla.org/image/cache;1", &rv); + nsCOMPtr imageCache = + do_GetService("@mozilla.org/image/cache;1", &rv); if (NS_SUCCEEDED(rv) && imageCache) { imageCache->ClearCache(PR_TRUE); } @@ -2976,7 +2981,8 @@ nsChromeRegistry::CheckForNewChrome() // open the installed-chrome file nsCOMPtr listFile; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = directoryService->Get(NS_APP_CHROME_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(listFile)); diff --git a/mozilla/content/base/src/nsContentPolicy.cpp b/mozilla/content/base/src/nsContentPolicy.cpp index 69f54e48b5a..d84d06187a2 100644 --- a/mozilla/content/base/src/nsContentPolicy.cpp +++ b/mozilla/content/base/src/nsContentPolicy.cpp @@ -48,7 +48,8 @@ nsContentPolicy::nsContentPolicy() { NS_INIT_REFCNT(); nsresult rv; - NS_WITH_SERVICE(nsICategoryManager, catman, NS_CATEGORYMANAGER_CONTRACTID, &rv); + nsCOMPtr catman = + do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) /* log an error? */ return; diff --git a/mozilla/content/base/src/nsCopySupport.cpp b/mozilla/content/base/src/nsCopySupport.cpp index f5a14edbb33..9c08f4715dc 100644 --- a/mozilla/content/base/src/nsCopySupport.cpp +++ b/mozilla/content/base/src/nsCopySupport.cpp @@ -162,7 +162,7 @@ nsresult nsCopySupport::HTMLCopy(nsISelection *aSel, nsIDocument *aDoc, PRInt16 #endif // IBMBIDI // Get the Clipboard - NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv); + nsCOMPtr clipboard(do_GetService(kCClipboardCID, &rv)); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp index cbe8169183f..2a2771bbaab 100644 --- a/mozilla/content/base/src/nsDocument.cpp +++ b/mozilla/content/base/src/nsDocument.cpp @@ -729,8 +729,8 @@ nsDocument::GetPrincipal(nsIPrincipal **aPrincipal) { if (!mPrincipal) { nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv = securityManager->GetCodebasePrincipal(mDocumentURL, @@ -792,8 +792,8 @@ NS_IMETHODIMP nsDocument::SetBaseURL(nsIURI* aURL) { nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { rv = securityManager->CheckLoadURI(mDocumentURL, aURL, nsIScriptSecurityManager::STANDARD); if (NS_SUCCEEDED(rv)) { @@ -2328,7 +2328,8 @@ nsDocument::GetBoxObjectFor(nsIDOMElement* aElement, nsIBoxObject** aResult) PRInt32 namespaceID; nsCOMPtr tag; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); nsCOMPtr content(do_QueryInterface(aElement)); xblService->ResolveTag(content, &namespaceID, getter_AddRefs(tag)); diff --git a/mozilla/content/base/src/nsDocumentViewer.cpp b/mozilla/content/base/src/nsDocumentViewer.cpp index 06cbb966a8d..693f4d9a715 100644 --- a/mozilla/content/base/src/nsDocumentViewer.cpp +++ b/mozilla/content/base/src/nsDocumentViewer.cpp @@ -2164,7 +2164,8 @@ DocumentViewerImpl::PrintPage(nsIPresContext* aPresContext, PRINT_DEBUG_MSG3("------ In DV::PrintPage PO: %p (%s)\n", aPO, gFrameTypesStr[aPO->mFrameType]); nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv) && printService) { PRBool isCancelled; printService->GetIsCancelled(&isCancelled); @@ -2445,7 +2446,8 @@ void DocumentViewerImpl::CalcPageFrameLocation(nsIPresShell * aPresShell, // The PageFrame or Seq frame has the margins set // these need to be removed nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv) && printService) { nsMargin margin(0,0,0,0); printService->GetMarginInTwips(margin); @@ -2791,7 +2793,8 @@ DocumentViewerImpl::ReflowPrintObject(PrintObject * aPO) // put it keeps it from page breaking in the middle of your print of the selection // (see also nsSimplePageSequence.cpp) PRInt16 printRangeType = nsIPrintOptions::kRangeAllPages; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv)) { printService->GetPrintRange(&printRangeType); } @@ -3011,7 +3014,8 @@ DocumentViewerImpl::EnablePOsForPrinting() mPrt->mSelectedPO = nsnull; nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_FAILED(rv)) { return rv; } @@ -3325,7 +3329,8 @@ DocumentViewerImpl::DoPrint(PrintObject * aPO, PRBool aDoSyncPrinting, PRBool& a PRInt16 printRangeType = nsIPrintOptions::kRangeAllPages; nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv) && printService) { printService->GetPrintRange(&printRangeType); } @@ -3692,7 +3697,8 @@ void DocumentViewerImpl::Notify(nsIImageGroup *aImageGroup, nsCOMPtr eventQ; // Get the event queue of the current thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueService, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueService, &rv); if (NS_FAILED(rv)) return; rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, @@ -3791,7 +3797,8 @@ DocumentViewerImpl::CreateStyleSet(nsIDocument* aDocument, } } - NS_WITH_SERVICE(nsIChromeRegistry, chromeRegistry, "@mozilla.org/chrome/chrome-registry;1", &rv); + nsCOMPtr chromeRegistry = + do_GetService("@mozilla.org/chrome/chrome-registry;1", &rv); if (NS_SUCCEEDED(rv) && chromeRegistry) { nsCOMPtr sheets; @@ -4394,7 +4401,8 @@ nsresult rv; // Setup print options for UI rv = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv) && printService) { if (mPrt->mIsParentAFrameSet) { if (mPrt->mCurrentFocusWin) { diff --git a/mozilla/content/base/src/nsGenericElement.cpp b/mozilla/content/base/src/nsGenericElement.cpp index e2086b883aa..40c5a0ee163 100644 --- a/mozilla/content/base/src/nsGenericElement.cpp +++ b/mozilla/content/base/src/nsGenericElement.cpp @@ -2602,8 +2602,8 @@ nsGenericElement::TriggerLink(nsIPresContext* aPresContext, if (aClick) { nsresult proceed = NS_OK; // Check that this page is allowed to load this URI. - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); nsCOMPtr absURI; if (NS_SUCCEEDED(rv)) rv = NS_NewURI(getter_AddRefs(absURI), absURLSpec, aBaseURL); diff --git a/mozilla/content/base/src/nsPlainTextSerializer.cpp b/mozilla/content/base/src/nsPlainTextSerializer.cpp index 2636396d389..94671d7798a 100644 --- a/mozilla/content/base/src/nsPlainTextSerializer.cpp +++ b/mozilla/content/base/src/nsPlainTextSerializer.cpp @@ -154,7 +154,7 @@ nsPlainTextSerializer::Init(PRUint32 aFlags, PRUint32 aWrapColumn, // Only create a linebreaker if we will handle wrapping. if(MayWrap()) { - NS_WITH_SERVICE(nsILineBreakerFactory, lf, kLWBrkCID, &rv); + nsCOMPtr lf(do_GetService(kLWBrkCID, &rv)); if (NS_SUCCEEDED(rv)) { nsAutoString lbarg; rv = lf->GetBreaker(lbarg, getter_AddRefs(mLineBreaker)); @@ -176,7 +176,7 @@ nsPlainTextSerializer::Init(PRUint32 aFlags, PRUint32 aWrapColumn, if(mFlags & nsIDocumentEncoder::OutputFormatted) { // Get some prefs that controls how we do formatted output - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { prefs->GetBoolPref(PREF_STRUCTS, &mStructs); prefs->GetIntPref(PREF_HEADER_STRATEGY, &mHeaderStrategy); diff --git a/mozilla/content/base/src/nsSelection.cpp b/mozilla/content/base/src/nsSelection.cpp index ea94e482925..c5a9883b9e5 100644 --- a/mozilla/content/base/src/nsSelection.cpp +++ b/mozilla/content/base/src/nsSelection.cpp @@ -912,14 +912,15 @@ nsSelection::nsSelection() // Check to see if the autocopy pref is enabled // and add the autocopy listener if it is nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, "@mozilla.org/preferences;1", &rv); + nsCOMPtr prefs(do_GetService("@mozilla.org/preferences;1", &rv)); if (NS_SUCCEEDED(rv) && prefs) { static char pref[] = "clipboard.autocopy"; PRBool autoCopy = PR_FALSE; if (NS_SUCCEEDED(prefs->GetBoolPref(pref, &autoCopy)) && autoCopy) { - NS_WITH_SERVICE(nsIAutoCopyService, autoCopyService, "@mozilla.org/autocopy;1", &rv); + nsCOMPtr autoCopyService = + do_GetService("@mozilla.org/autocopy;1", &rv); if (NS_SUCCEEDED(rv) && autoCopyService) { diff --git a/mozilla/content/base/src/nsSyncLoadService.cpp b/mozilla/content/base/src/nsSyncLoadService.cpp index 62f1dbc6e68..12caf0e38b2 100644 --- a/mozilla/content/base/src/nsSyncLoadService.cpp +++ b/mozilla/content/base/src/nsSyncLoadService.cpp @@ -238,7 +238,7 @@ nsSyncLoader::LoadDocument(nsIURI* documentURI, nsIDOMDocument **_retval) nsCOMPtr eventQService; nsCOMPtr cc; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_SUCCEEDED(rv)) { rv = xpc->GetCurrentNativeCallContext(getter_AddRefs(cc)); } @@ -249,7 +249,8 @@ nsSyncLoader::LoadDocument(nsIURI* documentURI, nsIDOMDocument **_retval) if (NS_FAILED(rv)) return NS_ERROR_FAILURE; } else { - NS_WITH_SERVICE(nsIAppShellService, appshellSvc, kAppShellServiceCID, &rv); + nsCOMPtr appshellSvc = + do_GetService(kAppShellServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr junk; rv = appshellSvc->GetHiddenWindowAndJSContext(getter_AddRefs(junk), &cx); diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp index 3b152f1741d..253981d47fc 100644 --- a/mozilla/content/events/src/nsEventStateManager.cpp +++ b/mozilla/content/events/src/nsEventStateManager.cpp @@ -174,8 +174,8 @@ NS_IMETHODIMP nsEventStateManager::Init() { nsresult rv; - NS_WITH_SERVICE(nsIObserverService, observerService, - NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsAutoString topic; topic.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID); @@ -237,8 +237,8 @@ nsEventStateManager::~nsEventStateManager() nsresult rv; - NS_WITH_SERVICE (nsIObserverService, observerService, - NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsAutoString topic; topic.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID); diff --git a/mozilla/content/html/content/src/nsHTMLInputElement.cpp b/mozilla/content/html/content/src/nsHTMLInputElement.cpp index c0b8f8d1658..a10f9831ff2 100644 --- a/mozilla/content/html/content/src/nsHTMLInputElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLInputElement.cpp @@ -464,8 +464,8 @@ nsHTMLInputElement::SetValue(const nsAReadableString& aValue) NS_FORM_INPUT_FILE == type) { if (NS_FORM_INPUT_FILE == type) { nsresult result; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &result); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &result); if (NS_FAILED(result)) return result; diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp index f9daadf6f0c..8a870badda6 100644 --- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp @@ -897,10 +897,8 @@ NS_CreateHTMLElement(nsIHTMLContent** aResult, nsINodeInfo *aNodeInfo, PRBool aC { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIParserService, - parserService, - kParserServiceCID, - &rv); + nsCOMPtr parserService = + do_GetService(kParserServiceCID, &rv); if (NS_SUCCEEDED(rv)) { nsAutoString tmpName; @@ -4076,8 +4074,8 @@ HTMLContentSink::ProcessBaseHref(const nsAReadableString& aBaseHref) } } else { // NAV compatibility quirk - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return; rv = securityManager->CheckLoadURI(mDocumentBaseURL, baseHrefURI, nsIScriptSecurityManager::STANDARD); diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp index cf8d6831f03..81545adcc8b 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp @@ -162,7 +162,8 @@ static int PR_CALLBACK MyPrefChangedCallback(const char*aPrefName, void* instance_data) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, "@mozilla.org/preferences;1", &rv); + nsCOMPtr prefs = + do_GetService("@mozilla.org/preferences;1", &rv); PRUnichar* detector_name = nsnull; if(NS_SUCCEEDED(rv) && NS_SUCCEEDED( rv = prefs->GetLocalizedUnicharPref("intl.charset.detector", @@ -230,7 +231,7 @@ nsHTMLDocument::nsHTMLDocument() NS_GET_IID(nsIRDFService), (nsISupports**) &gRDF); - //NS_WITH_SERVICE(nsIRDFService, gRDF, kRDFServiceCID, &rv); + //nsCOMPtr gRDF(do_GetService(kRDFServiceCID, &rv)); } mDomainWasSet = PR_FALSE; // Bug 13871: Frameset spoofing @@ -1725,8 +1726,8 @@ nsHTMLDocument::SetDomain(const nsAReadableString& aDomain) // Get codebase principal nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; nsCOMPtr newCodebase; diff --git a/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp b/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp index d93c017258a..5d12fb218c5 100644 --- a/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp +++ b/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp @@ -483,10 +483,8 @@ nsHTMLFragmentContentSink::OpenContainer(const nsIParserNode& aNode) nsHTMLTag nodeType = nsHTMLTag(aNode.GetNodeType()); nsIHTMLContent *content = nsnull; - NS_WITH_SERVICE(nsIParserService, - parserService, - kParserServiceCID, - &result); + nsCOMPtr parserService = + do_GetService(kParserServiceCID, &result); NS_ENSURE_SUCCESS(result, result); nsAutoString tmpName; @@ -560,10 +558,8 @@ nsHTMLFragmentContentSink::AddLeaf(const nsIParserNode& aNode) nsCOMPtr content; nsHTMLTag nodeType = nsHTMLTag(aNode.GetNodeType()); - NS_WITH_SERVICE(nsIParserService, - parserService, - kParserServiceCID, - &result); + nsCOMPtr parserService = + do_GetService(kParserServiceCID, &result); NS_ENSURE_SUCCESS(result, result); diff --git a/mozilla/content/html/document/src/nsImageDocument.cpp b/mozilla/content/html/document/src/nsImageDocument.cpp index 23ba85f9abd..815fe9103b9 100644 --- a/mozilla/content/html/document/src/nsImageDocument.cpp +++ b/mozilla/content/html/document/src/nsImageDocument.cpp @@ -467,7 +467,8 @@ nsresult nsImageDocument::UpdateTitle( void ) nsCOMPtr bundle; nsresult rv; // Create a bundle for the localization - NS_WITH_SERVICE(nsIStringBundleService, stringService, kStringBundleServiceCID, &rv); + nsCOMPtr stringService = + do_GetService(kStringBundleServiceCID, &rv); if (NS_SUCCEEDED(rv) && stringService) { rv = stringService->CreateBundle(NSIMAGEDOCUMENT_PROPERTIES_URI, getter_AddRefs(bundle)); } diff --git a/mozilla/content/html/style/src/nsCSSLoader.cpp b/mozilla/content/html/style/src/nsCSSLoader.cpp index 292e134107d..9f529c08907 100644 --- a/mozilla/content/html/style/src/nsCSSLoader.cpp +++ b/mozilla/content/html/style/src/nsCSSLoader.cpp @@ -614,7 +614,8 @@ SheetLoadData::OnStreamComplete(nsIStreamLoader* aLoader, (void)mLoader->SetCharset(strHTTPHeaderData, strStyleDataUndecoded); // bug 66190: ignore errors { // now get the decoder - NS_WITH_SERVICE(nsICharsetConverterManager,ccm,kCharsetConverterManagerCID,&result); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &result); if (NS_SUCCEEDED(result) && ccm) { nsString charset; mLoader->GetCharset(charset); @@ -1318,7 +1319,8 @@ CSSLoaderImpl::LoadStyleLink(nsIContent* aElement, } if (!isForViewSource) { nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; nsIURI* docURI; rv = mDocument->GetBaseURL(docURI); @@ -1587,7 +1589,7 @@ NS_IMETHODIMP CSSLoaderImpl::SetCharset(/*in*/ const nsString &aCharsetSrc) if (aCharsetSrc.Length() == 0) { mCharset.AssignWithConversion("ISO-8859-1"); } else { - NS_WITH_SERVICE(nsICharsetAlias, calias, kCharsetAliasCID, &rv); + nsCOMPtr calias(do_GetService(kCharsetAliasCID, &rv)); NS_ASSERTION(calias, "cannot find charset alias"); nsAutoString charsetName(aCharsetSrc); if( NS_SUCCEEDED(rv) && (nsnull != calias)) diff --git a/mozilla/content/html/style/src/nsStyleUtil.cpp b/mozilla/content/html/style/src/nsStyleUtil.cpp index 07cc0d5a628..737fc15b1d2 100644 --- a/mozilla/content/html/style/src/nsStyleUtil.cpp +++ b/mozilla/content/html/style/src/nsStyleUtil.cpp @@ -208,7 +208,7 @@ static PRBool gNavAlgorithmPref = PR_FALSE; static int PR_CALLBACK NavAlgorithmPrefChangedCallback(const char * name, void * closure) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { prefs->GetBoolPref(name, &gNavAlgorithmPref); } @@ -229,7 +229,7 @@ static PRBool UseNewFontAlgorithm() once = PR_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { prefs->GetBoolPref("font.size.nav4algorithm", &gNavAlgorithmPref); prefs->RegisterCallback("font.size.nav4algorithm", NavAlgorithmPrefChangedCallback, NULL); diff --git a/mozilla/content/shared/src/nsStyleUtil.cpp b/mozilla/content/shared/src/nsStyleUtil.cpp index 07cc0d5a628..737fc15b1d2 100644 --- a/mozilla/content/shared/src/nsStyleUtil.cpp +++ b/mozilla/content/shared/src/nsStyleUtil.cpp @@ -208,7 +208,7 @@ static PRBool gNavAlgorithmPref = PR_FALSE; static int PR_CALLBACK NavAlgorithmPrefChangedCallback(const char * name, void * closure) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { prefs->GetBoolPref(name, &gNavAlgorithmPref); } @@ -229,7 +229,7 @@ static PRBool UseNewFontAlgorithm() once = PR_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { prefs->GetBoolPref("font.size.nav4algorithm", &gNavAlgorithmPref); prefs->RegisterCallback("font.size.nav4algorithm", NavAlgorithmPrefChangedCallback, NULL); diff --git a/mozilla/content/xbl/src/nsBindingManager.cpp b/mozilla/content/xbl/src/nsBindingManager.cpp index ab187595e12..312db198bb7 100644 --- a/mozilla/content/xbl/src/nsBindingManager.cpp +++ b/mozilla/content/xbl/src/nsBindingManager.cpp @@ -817,7 +817,8 @@ nsBindingManager::AddLayeredBinding(nsIContent* aContent, const nsAReadableStrin { // First we need to load our binding. nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if (!xblService) return rv; @@ -889,7 +890,8 @@ nsBindingManager::LoadBindingDocument(nsIDocument* aBoundDoc, const nsAReadableS // First we need to load our binding. *aResult = nsnull; nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if (!xblService) return rv; diff --git a/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp b/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp index 502c8a095ba..36c334f3d4c 100644 --- a/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp +++ b/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp @@ -181,7 +181,7 @@ nsXBLPrototypeHandler::InitAccessKeys() // Get the menu access key value from prefs, overriding the default: nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { prefs->GetIntPref("ui.key.menuAccessKey", &kMenuAccessKey); diff --git a/mozilla/content/xbl/src/nsXBLService.cpp b/mozilla/content/xbl/src/nsXBLService.cpp index 18347d1b8c9..e9a519d1f0e 100644 --- a/mozilla/content/xbl/src/nsXBLService.cpp +++ b/mozilla/content/xbl/src/nsXBLService.cpp @@ -574,7 +574,7 @@ nsXBLService::nsXBLService(void) kInputAtom = NS_NewAtom("input"); // Find out if the XUL cache is on or off - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv)) prefs->GetBoolPref(kDisableChromeCachePref, &gDisableChromeCache); diff --git a/mozilla/content/xbl/src/nsXBLWindowHandler.cpp b/mozilla/content/xbl/src/nsXBLWindowHandler.cpp index f5170f800e2..a0b18b028bf 100644 --- a/mozilla/content/xbl/src/nsXBLWindowHandler.cpp +++ b/mozilla/content/xbl/src/nsXBLWindowHandler.cpp @@ -101,7 +101,8 @@ void nsXBLSpecialDocInfo::LoadDocInfo() return; nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if (NS_FAILED(rv) || !xblService) return; diff --git a/mozilla/content/xml/content/src/nsXMLElement.cpp b/mozilla/content/xml/content/src/nsXMLElement.cpp index 64e462f07f4..dd5a53c024f 100644 --- a/mozilla/content/xml/content/src/nsXMLElement.cpp +++ b/mozilla/content/xml/content/src/nsXMLElement.cpp @@ -163,7 +163,7 @@ static inline nsresult MakeURI(const char *aSpec, nsIURI *aBase, nsIURI **aURI) { nsresult rv; static NS_DEFINE_CID(ioServCID,NS_IOSERVICE_CID); - NS_WITH_SERVICE(nsIIOService,service,ioServCID,&rv); + nsCOMPtr service(do_GetService(ioServCID, &rv)); if (NS_FAILED(rv)) return rv; @@ -308,10 +308,8 @@ static nsresult CheckLoadURI(nsIURI *aBaseURI, const nsAReadableString& aURI, nsresult rv; rv = MakeURI(str,aBaseURI,aAbsURI); if (NS_SUCCEEDED(rv)) { - NS_WITH_SERVICE(nsIScriptSecurityManager, - securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, - &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { rv= securityManager->CheckLoadURI(aBaseURI, *aAbsURI, @@ -619,8 +617,8 @@ nsXMLElement::GetScriptObject(nsIScriptContext* aContext, void** aScriptObject) // We have a binding that must be installed. nsresult rv; PRBool dummy; - NS_WITH_SERVICE(nsIXBLService, xblService, - "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); xblService->LoadBindings(this, value, PR_FALSE, getter_AddRefs(binding), &dummy); if (binding) { diff --git a/mozilla/content/xml/document/src/nsXMLContentSink.cpp b/mozilla/content/xml/document/src/nsXMLContentSink.cpp index 59ab6ddc662..91cea3f2f72 100644 --- a/mozilla/content/xml/document/src/nsXMLContentSink.cpp +++ b/mozilla/content/xml/document/src/nsXMLContentSink.cpp @@ -1857,7 +1857,7 @@ nsXMLContentSink::GetElementFactory(PRInt32 aNameSpaceID, nsIElementFactory** aR contractID.AppendWithConversion(nameSpace); // Retrieve the appropriate factory. - NS_WITH_SERVICE(nsIElementFactory, elementFactory, contractID, &rv); + nsCOMPtr elementFactory(do_GetService(contractID, &rv)); *aResult = elementFactory; NS_IF_ADDREF(*aResult); diff --git a/mozilla/content/xml/document/src/nsXMLDocument.cpp b/mozilla/content/xml/document/src/nsXMLDocument.cpp index c0d260ea06e..28afec38520 100644 --- a/mozilla/content/xml/document/src/nsXMLDocument.cpp +++ b/mozilla/content/xml/document/src/nsXMLDocument.cpp @@ -105,7 +105,8 @@ static int PR_CALLBACK MyPrefChangedCallback(const char*aPrefName, void* instance_data) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, "@mozilla.org/preferences;1", &rv); + nsCOMPtr prefs = + do_GetService("@mozilla.org/preferences;1", &rv); PRUnichar* detector_name = nsnull; if(NS_SUCCEEDED(rv) && NS_SUCCEEDED( rv = prefs->GetLocalizedUnicharPref("intl.charset.detector", @@ -270,8 +271,8 @@ nsXMLDocument::OnRedirect(nsIHttpChannel *aHttpChannel, nsIChannel *aNewChannel) { nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; @@ -311,7 +312,8 @@ nsXMLDocument::Load(const nsAReadableString& aUrl) if (NS_FAILED(rv)) return rv; // Get security manager, check to see if we're allowed to load this URI - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; if (NS_FAILED(secMan->CheckConnect(nsnull, uri, "XMLDocument", "load"))) return NS_ERROR_FAILURE; diff --git a/mozilla/content/xul/content/src/nsXULElement.cpp b/mozilla/content/xul/content/src/nsXULElement.cpp index cc10c9ef446..033c4afcffc 100644 --- a/mozilla/content/xul/content/src/nsXULElement.cpp +++ b/mozilla/content/xul/content/src/nsXULElement.cpp @@ -718,7 +718,8 @@ nsXULElement::QueryInterface(REFNSIID iid, void** result) (NodeInfo()->NamespaceEquals(kNameSpaceID_XUL))){ nsCOMPtr tag; PRInt32 dummy; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); xblService->ResolveTag(NS_STATIC_CAST(nsIStyledContent*, this), &dummy, getter_AddRefs(tag)); if (tag.get() == nsXULAtoms::tree) { // We delegate XULTreeElement APIs to an aggregate object @@ -744,7 +745,8 @@ nsXULElement::QueryInterface(REFNSIID iid, void** result) nsCOMPtr tag; PRInt32 dummy; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); xblService->ResolveTag(NS_STATIC_CAST(nsIStyledContent*, this), &dummy, getter_AddRefs(tag)); if (tag.get() == nsXULAtoms::tree) { inst = nsContentUtils:: diff --git a/mozilla/content/xul/content/src/nsXULPopupListener.cpp b/mozilla/content/xul/content/src/nsXULPopupListener.cpp index 30f6493c297..24ac1981035 100644 --- a/mozilla/content/xul/content/src/nsXULPopupListener.cpp +++ b/mozilla/content/xul/content/src/nsXULPopupListener.cpp @@ -232,7 +232,7 @@ XULPopupListenerImpl::Init(nsIDOMElement* aElement, const XULPopupType& popup) // Only the first time, register the callback and get the initial value of the pref if ( !prefChangeRegistered ) { - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if ( prefs ) { // get the initial value of the pref rv = prefs->GetBoolPref("browser.chrome.toolbar_tips", &sShowTooltips); @@ -257,7 +257,7 @@ int XULPopupListenerImpl :: sTooltipPrefChanged (const char *, void * inData ) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if ( prefs ) { rv = prefs->GetBoolPref("browser.chrome.toolbar_tips", &sShowTooltips); } diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp index 27d5d21d2fb..7f43433ae78 100644 --- a/mozilla/content/xul/document/src/nsXULDocument.cpp +++ b/mozilla/content/xul/document/src/nsXULDocument.cpp @@ -789,8 +789,8 @@ NS_IMETHODIMP nsXULDocument::SetBaseURL(nsIURI* aURL) { nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { rv = securityManager->CheckLoadURI(mDocumentURL, aURL, nsIScriptSecurityManager::STANDARD); if (NS_SUCCEEDED(rv)) { @@ -1536,7 +1536,7 @@ nsXULDocument::EndLoad() PRBool useXULCache; gXULCache->GetEnabled(&useXULCache); - NS_WITH_SERVICE(nsIChromeRegistry, reg, kChromeRegistryCID, &rv); + nsCOMPtr reg(do_GetService(kChromeRegistryCID, &rv)); if (NS_FAILED(rv)) return rv; nsCOMPtr sheets; reg->GetStyleSheets(uri, getter_AddRefs(sheets)); @@ -3207,7 +3207,8 @@ nsXULDocument::AddElementToDocumentPost(nsIContent* aElement) aElement->GetTag(*getter_AddRefs(tag)); if (tag.get() == nsXULAtoms::keyset) { // Create our XUL key listener and hook it up. - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if (xblService) { nsCOMPtr rec(do_QueryInterface(aElement)); xblService->AttachGlobalKeyHandler(rec); @@ -4713,7 +4714,7 @@ nsresult nsXULDocument::AddChromeOverlays() { nsresult rv; - NS_WITH_SERVICE(nsIChromeRegistry, reg, kChromeRegistryCID, &rv); + nsCOMPtr reg(do_GetService(kChromeRegistryCID, &rv)); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; @@ -6005,7 +6006,7 @@ nsXULDocument::GetElementFactory(PRInt32 aNameSpaceID, nsIElementFactory** aResu contractID.AppendWithConversion(nameSpace); // Retrieve the appropriate factory. - NS_WITH_SERVICE(nsIElementFactory, elementFactory, contractID, &rv); + nsCOMPtr elementFactory(do_GetService(contractID, &rv)); if (!elementFactory) elementFactory = gXMLElementFactory; // Nothing found. Use generic XML element. @@ -6042,7 +6043,8 @@ nsXULDocument::GetBoxObjectFor(nsIDOMElement* aElement, nsIBoxObject** aResult) PRInt32 namespaceID; nsCOMPtr tag; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); nsCOMPtr content(do_QueryInterface(aElement)); xblService->ResolveTag(content, &namespaceID, getter_AddRefs(tag)); diff --git a/mozilla/content/xul/document/src/nsXULPrototypeCache.cpp b/mozilla/content/xul/document/src/nsXULPrototypeCache.cpp index bb976321d05..2581440e7b1 100644 --- a/mozilla/content/xul/document/src/nsXULPrototypeCache.cpp +++ b/mozilla/content/xul/document/src/nsXULPrototypeCache.cpp @@ -164,7 +164,7 @@ NS_NewXULPrototypeCache(nsISupports* aOuter, REFNSIID aIID, void** aResult) nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv)) { // XXX Ignore return values. prefs->GetBoolPref(kDisableXULCachePref, &gDisableXULCache); diff --git a/mozilla/content/xul/document/src/nsXULPrototypeDocument.cpp b/mozilla/content/xul/document/src/nsXULPrototypeDocument.cpp index bb1bdceb58d..a2a37cdc858 100644 --- a/mozilla/content/xul/document/src/nsXULPrototypeDocument.cpp +++ b/mozilla/content/xul/document/src/nsXULPrototypeDocument.cpp @@ -358,10 +358,8 @@ nsXULPrototypeDocument::GetDocumentPrincipal(nsIPrincipal** aResult) { if (!mDocumentPrincipal) { nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, - securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, - &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; diff --git a/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp b/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp index 5e3cb147180..32739843563 100644 --- a/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp +++ b/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp @@ -1641,7 +1641,7 @@ nsXULContentBuilder::GetElementFactory(PRInt32 aNameSpaceID, nsIElementFactory** contractID.AppendWithConversion(nameSpace.get()); // Retrieve the appropriate factory. - NS_WITH_SERVICE(nsIElementFactory, elementFactory, contractID, &rv); + nsCOMPtr elementFactory(do_GetService(contractID, &rv)); if (!elementFactory) elementFactory = gXMLElementFactory; // Nothing found. Use generic XML element. diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index e61b5cf0aaf..74cce7a6253 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -3897,7 +3897,8 @@ nsDocShell::NewContentViewerObj(const char *aContentType, if (!docLoaderFactory) { // try again after loading plugins nsresult err; - NS_WITH_SERVICE(nsIPluginHost, pluginHost, kPluginManagerCID, &err); + nsCOMPtr pluginHost = + do_GetService(kPluginManagerCID, &err); if (NS_FAILED(err)) return NS_ERROR_FAILURE; diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp index 268b46eff0c..6b5fc3dc49e 100644 --- a/mozilla/dom/src/base/nsGlobalWindow.cpp +++ b/mozilla/dom/src/base/nsGlobalWindow.cpp @@ -314,7 +314,8 @@ NS_IMETHODIMP GlobalWindowImpl::SetNewDocument(nsIDOMDocument* aDocument) nsCOMPtr us(do_QueryInterface(NS_STATIC_CAST(nsIDOMWindow*,this))); if (internal == us) { nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if (xblService) { nsCOMPtr rec(do_QueryInterface(mChromeEventHandler)); xblService->AttachGlobalKeyHandler(rec); @@ -4139,7 +4140,7 @@ NavigatorImpl::GetCookieEnabled(PRBool *aCookieEnabled) nsresult rv = NS_OK; *aCookieEnabled = PR_FALSE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (NS_FAILED(rv) || prefs == nsnull) return rv; diff --git a/mozilla/dom/src/base/nsJSEnvironment.cpp b/mozilla/dom/src/base/nsJSEnvironment.cpp index 19c1604165a..8947ba10003 100644 --- a/mozilla/dom/src/base/nsJSEnvironment.cpp +++ b/mozilla/dom/src/base/nsJSEnvironment.cpp @@ -286,7 +286,7 @@ int PR_CALLBACK nsJSContext::JSOptionChangedCallback(const char *pref, void *data) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED(rv)) { nsJSContext *context = NS_REINTERPRET_CAST(nsJSContext *, data); PRUint32 oldDefaultJSOptions = context->mDefaultJSOptions; @@ -335,7 +335,7 @@ nsJSContext::nsJSContext(JSRuntime *aRuntime) // a new JSContext just in case the heap manager recycles the JSContext // struct. nsresult rv; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if (NS_SUCCEEDED(rv)) xpc->SyncJSContexts(); @@ -344,7 +344,7 @@ nsJSContext::nsJSContext(JSRuntime *aRuntime) ::JS_SetContextPrivate(mContext, (void *)this); // Check for the JS strict option, which enables extra error checks - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED(rv)) { (void) prefs->RegisterCallback(js_options_dot_str, JSOptionChangedCallback, @@ -455,7 +455,8 @@ nsJSContext::EvaluateStringWithValue(const nsAReadableString& aScript, // from native code via XPConnect uses the right context. Do this whether // or not the SecurityManager said "ok", in order to simplify control flow // below where we pop before returning. - NS_WITH_SERVICE(nsIJSContextStack, stack, "@mozilla.org/js/xpc/ContextStack;1", &rv); + nsCOMPtr stack = + do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv); if (NS_FAILED(rv) || NS_FAILED(stack->Push(mContext))) { JSPRINCIPALS_DROP(mContext, jsprin); return NS_ERROR_FAILURE; @@ -572,7 +573,8 @@ nsJSContext::EvaluateString(const nsAReadableString& aScript, // from native code via XPConnect uses the right context. Do this whether // or not the SecurityManager said "ok", in order to simplify control flow // below where we pop before returning. - NS_WITH_SERVICE(nsIJSContextStack, stack, "@mozilla.org/js/xpc/ContextStack;1", &rv); + nsCOMPtr stack = + do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv); if (NS_FAILED(rv) || NS_FAILED(stack->Push(mContext))) { JSPRINCIPALS_DROP(mContext, jsprin); return NS_ERROR_FAILURE; @@ -733,7 +735,8 @@ nsJSContext::ExecuteScript(void* aScriptObject, // Push our JSContext on our thread's context stack, in case native code // called from JS calls back into JS via XPConnect. - NS_WITH_SERVICE(nsIJSContextStack, stack, "@mozilla.org/js/xpc/ContextStack;1", &rv); + nsCOMPtr stack = + do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv); if (NS_FAILED(rv) || NS_FAILED(stack->Push(mContext))) { return NS_ERROR_FAILURE; } @@ -919,7 +922,8 @@ nsJSContext::CallEventHandler(void *aTarget, void *aHandler, PRUint32 argc, if (NS_FAILED(rv)) return NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIJSContextStack, stack, "@mozilla.org/js/xpc/ContextStack;1", &rv); + nsCOMPtr stack = + do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv); if (NS_FAILED(rv) || NS_FAILED(stack->Push(mContext))) return NS_ERROR_FAILURE; @@ -1488,7 +1492,8 @@ nsJSEnvironment::nsJSEnvironment() // So that we get deleted on XPCOM shutdown, set up an // observer. nsresult rv; - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); NS_ASSERTION(NS_SUCCEEDED(rv), "going to leak a nsJSEnvironment"); if (NS_SUCCEEDED(rv)) { @@ -1527,7 +1532,7 @@ nsJSEnvironment::nsJSEnvironment() gOldJSGCCallback = ::JS_SetGCCallbackRT(mRuntime, DOMGCCallback); // Set these global xpconnect options... - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if (NS_SUCCEEDED(rv)) { xpc->SetCollectGarbageOnMainThreadOnly(PR_TRUE); xpc->SetDeferReleasesUntilAfterGarbageCollection(PR_TRUE); @@ -1536,8 +1541,8 @@ nsJSEnvironment::nsJSEnvironment() } // Initialize LiveConnect. XXXbe use contractid rather than GetCID - NS_WITH_SERVICE(nsILiveConnectManager, manager, - nsIJVMManager::GetCID(), &rv); + nsCOMPtr manager = + do_GetService(nsIJVMManager::GetCID(), &rv); // Should the JVM manager perhaps define methods for starting up LiveConnect? if (NS_SUCCEEDED(rv) && manager != nsnull) { diff --git a/mozilla/dom/src/base/nsJSUtils.cpp b/mozilla/dom/src/base/nsJSUtils.cpp index 509d2f1a53c..7d68e1627d1 100644 --- a/mozilla/dom/src/base/nsJSUtils.cpp +++ b/mozilla/dom/src/base/nsJSUtils.cpp @@ -182,7 +182,7 @@ nsJSUtils::ConvertJSValToXPCObject(nsISupports** aSupports, REFNSIID aIID, } else if (JSVAL_IS_OBJECT(aValue)) { nsresult rv; - NS_WITH_SERVICE(nsIXPConnect, xpc, kXPConnectCID, &rv); + nsCOMPtr xpc(do_GetService(kXPConnectCID, &rv)); if (NS_FAILED(rv)) return JS_FALSE; @@ -330,8 +330,8 @@ nsJSUtils::GetSecurityManager(JSContext *cx, JSObject *obj) { if (!mCachedSecurityManager) { nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) { nsJSUtils::ReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); return nsnull; diff --git a/mozilla/editor/base/nsEditor.cpp b/mozilla/editor/base/nsEditor.cpp index b411803fa02..8a481b1a0af 100644 --- a/mozilla/editor/base/nsEditor.cpp +++ b/mozilla/editor/base/nsEditor.cpp @@ -956,7 +956,7 @@ nsEditor::GetWrapWidth(PRInt32 *aWrapColumn) *aWrapColumn = 72; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv) && prefs) (void) prefs->GetIntPref("editor.htmlWrapColumn", aWrapColumn); return NS_OK; @@ -990,7 +990,7 @@ nsEditor::SaveFile(nsIFile *aFileSpec, PRBool aReplaceExisting, else { // Should we prettyprint? Check the pref - NS_WITH_SERVICE(nsIPref, prefService, kPrefServiceCID, &rv); + nsCOMPtr prefService(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED(rv) && prefService) { PRBool prettyprint = PR_FALSE;; @@ -5069,8 +5069,8 @@ nsEditor::CreateHTMLContent(const nsAReadableString& aTag, nsIContent** aContent { nsresult rv; - NS_WITH_SERVICE(nsIElementFactory, elementFactory, - NS_ELEMENT_FACTORY_CONTRACTID_PREFIX"http://www.w3.org/1999/xhtml" , &rv); + nsCOMPtr elementFactory = + do_GetService(NS_ELEMENT_FACTORY_CONTRACTID_PREFIX"http://www.w3.org/1999/xhtml", &rv); if (!elementFactory) return NS_ERROR_FAILURE; diff --git a/mozilla/editor/base/nsEditorEventListeners.cpp b/mozilla/editor/base/nsEditorEventListeners.cpp index f88626512c6..5c7c3af0b2e 100644 --- a/mozilla/editor/base/nsEditorEventListeners.cpp +++ b/mozilla/editor/base/nsEditorEventListeners.cpp @@ -382,7 +382,7 @@ nsTextEditorMouseListener::MouseClick(nsIDOMEvent* aMouseEvent) if (button == 1) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefService, kPrefServiceCID, &rv); + nsCOMPtr prefService(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED(rv) && prefService) { PRBool doMiddleMousePaste = PR_FALSE;; @@ -643,7 +643,8 @@ nsresult nsTextEditorDragListener::DragOver(nsIDOMEvent* aDragEvent) { nsresult rv; - NS_WITH_SERVICE ( nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv ); + nsCOMPtr dragService = + do_GetService( "@mozilla.org/widget/dragservice;1", &rv ); if ( NS_SUCCEEDED(rv) ) { nsCOMPtr dragSession; dragService->GetCurrentSession(getter_AddRefs(dragSession)); @@ -690,7 +691,8 @@ nsTextEditorDragListener::DragDrop(nsIDOMEvent* aMouseEvent) if ( mEditor ) { nsresult rv; - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); if (NS_FAILED(rv)) return rv; PRUint32 flags; @@ -1075,7 +1077,8 @@ nsTextEditorFocusListener::Focus(nsIDOMEvent* aEvent) PRInt32 pixelWidth; nsresult result; - NS_WITH_SERVICE(nsILookAndFeel, look, kLookAndFeelCID, &result); + nsCOMPtr look = + do_GetService(kLookAndFeelCID, &result); if (NS_SUCCEEDED(result) && look) { diff --git a/mozilla/editor/base/nsEditorShell.cpp b/mozilla/editor/base/nsEditorShell.cpp index cf90ea457eb..f9d9b3b5b77 100644 --- a/mozilla/editor/base/nsEditorShell.cpp +++ b/mozilla/editor/base/nsEditorShell.cpp @@ -2158,7 +2158,7 @@ nsEditorShell::GetLocalFileURL(nsIDOMWindowInternal *parent, const PRUnichar *fi #if 0 // get default directory from preference - NS_WITH_SERVICE( nsIPref, prefs, NS_PREF_CONTRACTID, &res ); + nsCOMPtr prefs( do_GetService( NS_PREF_CONTRACTID, &res ) ); if (prefs) { nsCOMPtr defaultDir; @@ -2815,7 +2815,8 @@ nsEditorShell::DoFind(PRBool aFindNext) // Get find component. nsresult rv; - NS_WITH_SERVICE(nsIFindComponent, findComponent, NS_IFINDCOMPONENT_CONTRACTID, &rv); + nsCOMPtr findComponent = + do_GetService(NS_IFINDCOMPONENT_CONTRACTID, &rv); NS_ASSERTION(((NS_SUCCEEDED(rv)) && findComponent), "GetService failed for find component."); if (NS_FAILED(rv)) { return rv; } @@ -2860,7 +2861,8 @@ nsEditorShell::Replace() // Get find component. nsresult rv; - NS_WITH_SERVICE(nsIFindComponent, findComponent, NS_IFINDCOMPONENT_CONTRACTID, &rv); + nsCOMPtr findComponent = + do_GetService(NS_IFINDCOMPONENT_CONTRACTID, &rv); NS_ASSERTION(((NS_SUCCEEDED(rv)) && findComponent), "GetService failed for find component."); if (NS_FAILED(rv)) { return rv; } @@ -4508,7 +4510,7 @@ nsEditorShell::InitSpellChecker() PRUnichar *dictName = nsnull; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &result)); if (NS_SUCCEEDED(result) && prefs) result = prefs->CopyUnicharPref("spellchecker.dictionary", &dictName); @@ -4795,7 +4797,7 @@ nsEditorShell::UninitSpellChecker() if (mEditor) { // Save the last used dictionary to the user's preferences. - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &result)); if (NS_SUCCEEDED(result) && prefs) { @@ -5341,7 +5343,7 @@ nsEditorShell::CheckPrefAndNormalizeTable() if (htmlEditor) { - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &res)); if (NS_FAILED(res)) return NS_OK; PRBool normalizeTable = PR_FALSE; diff --git a/mozilla/editor/base/nsHTMLDataTransfer.cpp b/mozilla/editor/base/nsHTMLDataTransfer.cpp index 888b31c696b..6d5881ecd33 100644 --- a/mozilla/editor/base/nsHTMLDataTransfer.cpp +++ b/mozilla/editor/base/nsHTMLDataTransfer.cpp @@ -696,7 +696,8 @@ NS_IMETHODIMP nsHTMLEditor::InsertFromDrop(nsIDOMEvent* aDropEvent) ForceCompositionEnd(); nsresult rv; - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr dragSession; @@ -941,7 +942,8 @@ NS_IMETHODIMP nsHTMLEditor::DoDrag(nsIDOMEvent *aDragEvent) return NS_ERROR_OUT_OF_MEMORY; /* get the drag service */ - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); if (NS_FAILED(rv)) return rv; /* create html flavor transferable */ @@ -1047,7 +1049,7 @@ NS_IMETHODIMP nsHTMLEditor::Paste(PRInt32 aSelectionType) // Get Clipboard Service nsresult rv; - NS_WITH_SERVICE ( nsIClipboard, clipboard, kCClipboardCID, &rv ); + nsCOMPtr clipboard( do_GetService( kCClipboardCID, &rv ) ); if ( NS_FAILED(rv) ) return rv; @@ -1115,7 +1117,7 @@ NS_IMETHODIMP nsHTMLEditor::CanPaste(PRInt32 aSelectionType, PRBool *aCanPaste) return NS_OK; nsresult rv; - NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv); + nsCOMPtr clipboard(do_GetService(kCClipboardCID, &rv)); if (NS_FAILED(rv)) return rv; // the flavors that we can deal with @@ -1237,7 +1239,7 @@ NS_IMETHODIMP nsHTMLEditor::PasteAsPlaintextQuotation(PRInt32 aSelectionType) { // Get Clipboard Service nsresult rv; - NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv); + nsCOMPtr clipboard(do_GetService(kCClipboardCID, &rv)); if (NS_FAILED(rv)) return rv; // Create generic Transferable for getting the data diff --git a/mozilla/editor/base/nsHTMLEditRules.cpp b/mozilla/editor/base/nsHTMLEditRules.cpp index d7c6233a6b5..90713f7cd58 100644 --- a/mozilla/editor/base/nsHTMLEditRules.cpp +++ b/mozilla/editor/base/nsHTMLEditRules.cpp @@ -210,7 +210,7 @@ nsHTMLEditRules::Init(nsPlaintextEditor *aEditor, PRUint32 aFlags) if (NS_FAILED(res)) return res; // cache any prefs we care about - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &res)); if (NS_FAILED(res)) return res; char *returnInEmptyLIKillsList = 0; diff --git a/mozilla/editor/base/nsPlaintextDataTransfer.cpp b/mozilla/editor/base/nsPlaintextDataTransfer.cpp index 5cb7476005c..8dcf08fa3a4 100644 --- a/mozilla/editor/base/nsPlaintextDataTransfer.cpp +++ b/mozilla/editor/base/nsPlaintextDataTransfer.cpp @@ -184,7 +184,8 @@ NS_IMETHODIMP nsPlaintextEditor::InsertFromDrop(nsIDOMEvent* aDropEvent) ForceCompositionEnd(); nsresult rv; - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr dragSession; @@ -425,7 +426,8 @@ NS_IMETHODIMP nsPlaintextEditor::DoDrag(nsIDOMEvent *aDragEvent) return NS_ERROR_OUT_OF_MEMORY; /* get the drag service */ - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); if (NS_FAILED(rv)) return rv; /* create html flavor transferable */ @@ -531,7 +533,7 @@ NS_IMETHODIMP nsPlaintextEditor::Paste(PRInt32 aSelectionType) // Get Clipboard Service nsresult rv; - NS_WITH_SERVICE ( nsIClipboard, clipboard, kCClipboardCID, &rv ); + nsCOMPtr clipboard( do_GetService( kCClipboardCID, &rv ) ); if ( NS_FAILED(rv) ) return rv; @@ -562,7 +564,7 @@ NS_IMETHODIMP nsPlaintextEditor::CanPaste(PRInt32 aSelectionType, PRBool *aCanPa return NS_OK; nsresult rv; - NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv); + nsCOMPtr clipboard(do_GetService(kCClipboardCID, &rv)); if (NS_FAILED(rv)) return rv; // the flavors that we can deal with diff --git a/mozilla/editor/base/nsPlaintextEditor.cpp b/mozilla/editor/base/nsPlaintextEditor.cpp index bfeebdc1169..cbd24cb03bd 100644 --- a/mozilla/editor/base/nsPlaintextEditor.cpp +++ b/mozilla/editor/base/nsPlaintextEditor.cpp @@ -1588,7 +1588,7 @@ nsPlaintextEditor::PasteAsQuotation(PRInt32 aSelectionType) { // Get Clipboard Service nsresult rv; - NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv); + nsCOMPtr clipboard(do_GetService(kCClipboardCID, &rv)); if (NS_FAILED(rv)) return rv; // Create generic Transferable for getting the data @@ -1650,7 +1650,7 @@ static nsICiter* MakeACiter() // Make a citer of an appropriate type nsICiter* citer = 0; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (NS_FAILED(rv)) return 0; char *citationType = 0; diff --git a/mozilla/editor/base/nsTextEditRules.cpp b/mozilla/editor/base/nsTextEditRules.cpp index d09ab2070ea..5fd45238f4b 100644 --- a/mozilla/editor/base/nsTextEditRules.cpp +++ b/mozilla/editor/base/nsTextEditRules.cpp @@ -529,7 +529,7 @@ nsTextEditRules::WillInsertText(PRInt32 aAction, }; PRInt32 singleLineNewlineBehavior = 1; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv) && prefs) rv = prefs->GetIntPref("editor.singleLine.pasteNewlines", &singleLineNewlineBehavior); diff --git a/mozilla/editor/composer/src/nsEditorShell.cpp b/mozilla/editor/composer/src/nsEditorShell.cpp index cf90ea457eb..f9d9b3b5b77 100644 --- a/mozilla/editor/composer/src/nsEditorShell.cpp +++ b/mozilla/editor/composer/src/nsEditorShell.cpp @@ -2158,7 +2158,7 @@ nsEditorShell::GetLocalFileURL(nsIDOMWindowInternal *parent, const PRUnichar *fi #if 0 // get default directory from preference - NS_WITH_SERVICE( nsIPref, prefs, NS_PREF_CONTRACTID, &res ); + nsCOMPtr prefs( do_GetService( NS_PREF_CONTRACTID, &res ) ); if (prefs) { nsCOMPtr defaultDir; @@ -2815,7 +2815,8 @@ nsEditorShell::DoFind(PRBool aFindNext) // Get find component. nsresult rv; - NS_WITH_SERVICE(nsIFindComponent, findComponent, NS_IFINDCOMPONENT_CONTRACTID, &rv); + nsCOMPtr findComponent = + do_GetService(NS_IFINDCOMPONENT_CONTRACTID, &rv); NS_ASSERTION(((NS_SUCCEEDED(rv)) && findComponent), "GetService failed for find component."); if (NS_FAILED(rv)) { return rv; } @@ -2860,7 +2861,8 @@ nsEditorShell::Replace() // Get find component. nsresult rv; - NS_WITH_SERVICE(nsIFindComponent, findComponent, NS_IFINDCOMPONENT_CONTRACTID, &rv); + nsCOMPtr findComponent = + do_GetService(NS_IFINDCOMPONENT_CONTRACTID, &rv); NS_ASSERTION(((NS_SUCCEEDED(rv)) && findComponent), "GetService failed for find component."); if (NS_FAILED(rv)) { return rv; } @@ -4508,7 +4510,7 @@ nsEditorShell::InitSpellChecker() PRUnichar *dictName = nsnull; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &result)); if (NS_SUCCEEDED(result) && prefs) result = prefs->CopyUnicharPref("spellchecker.dictionary", &dictName); @@ -4795,7 +4797,7 @@ nsEditorShell::UninitSpellChecker() if (mEditor) { // Save the last used dictionary to the user's preferences. - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &result)); if (NS_SUCCEEDED(result) && prefs) { @@ -5341,7 +5343,7 @@ nsEditorShell::CheckPrefAndNormalizeTable() if (htmlEditor) { - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &res)); if (NS_FAILED(res)) return NS_OK; PRBool normalizeTable = PR_FALSE; diff --git a/mozilla/editor/libeditor/base/nsEditor.cpp b/mozilla/editor/libeditor/base/nsEditor.cpp index b411803fa02..8a481b1a0af 100644 --- a/mozilla/editor/libeditor/base/nsEditor.cpp +++ b/mozilla/editor/libeditor/base/nsEditor.cpp @@ -956,7 +956,7 @@ nsEditor::GetWrapWidth(PRInt32 *aWrapColumn) *aWrapColumn = 72; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv) && prefs) (void) prefs->GetIntPref("editor.htmlWrapColumn", aWrapColumn); return NS_OK; @@ -990,7 +990,7 @@ nsEditor::SaveFile(nsIFile *aFileSpec, PRBool aReplaceExisting, else { // Should we prettyprint? Check the pref - NS_WITH_SERVICE(nsIPref, prefService, kPrefServiceCID, &rv); + nsCOMPtr prefService(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED(rv) && prefService) { PRBool prettyprint = PR_FALSE;; @@ -5069,8 +5069,8 @@ nsEditor::CreateHTMLContent(const nsAReadableString& aTag, nsIContent** aContent { nsresult rv; - NS_WITH_SERVICE(nsIElementFactory, elementFactory, - NS_ELEMENT_FACTORY_CONTRACTID_PREFIX"http://www.w3.org/1999/xhtml" , &rv); + nsCOMPtr elementFactory = + do_GetService(NS_ELEMENT_FACTORY_CONTRACTID_PREFIX"http://www.w3.org/1999/xhtml", &rv); if (!elementFactory) return NS_ERROR_FAILURE; diff --git a/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp b/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp index 888b31c696b..6d5881ecd33 100644 --- a/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp @@ -696,7 +696,8 @@ NS_IMETHODIMP nsHTMLEditor::InsertFromDrop(nsIDOMEvent* aDropEvent) ForceCompositionEnd(); nsresult rv; - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr dragSession; @@ -941,7 +942,8 @@ NS_IMETHODIMP nsHTMLEditor::DoDrag(nsIDOMEvent *aDragEvent) return NS_ERROR_OUT_OF_MEMORY; /* get the drag service */ - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); if (NS_FAILED(rv)) return rv; /* create html flavor transferable */ @@ -1047,7 +1049,7 @@ NS_IMETHODIMP nsHTMLEditor::Paste(PRInt32 aSelectionType) // Get Clipboard Service nsresult rv; - NS_WITH_SERVICE ( nsIClipboard, clipboard, kCClipboardCID, &rv ); + nsCOMPtr clipboard( do_GetService( kCClipboardCID, &rv ) ); if ( NS_FAILED(rv) ) return rv; @@ -1115,7 +1117,7 @@ NS_IMETHODIMP nsHTMLEditor::CanPaste(PRInt32 aSelectionType, PRBool *aCanPaste) return NS_OK; nsresult rv; - NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv); + nsCOMPtr clipboard(do_GetService(kCClipboardCID, &rv)); if (NS_FAILED(rv)) return rv; // the flavors that we can deal with @@ -1237,7 +1239,7 @@ NS_IMETHODIMP nsHTMLEditor::PasteAsPlaintextQuotation(PRInt32 aSelectionType) { // Get Clipboard Service nsresult rv; - NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv); + nsCOMPtr clipboard(do_GetService(kCClipboardCID, &rv)); if (NS_FAILED(rv)) return rv; // Create generic Transferable for getting the data diff --git a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp index d7c6233a6b5..90713f7cd58 100644 --- a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp @@ -210,7 +210,7 @@ nsHTMLEditRules::Init(nsPlaintextEditor *aEditor, PRUint32 aFlags) if (NS_FAILED(res)) return res; // cache any prefs we care about - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &res)); if (NS_FAILED(res)) return res; char *returnInEmptyLIKillsList = 0; diff --git a/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp b/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp index f88626512c6..5c7c3af0b2e 100644 --- a/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp +++ b/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp @@ -382,7 +382,7 @@ nsTextEditorMouseListener::MouseClick(nsIDOMEvent* aMouseEvent) if (button == 1) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefService, kPrefServiceCID, &rv); + nsCOMPtr prefService(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED(rv) && prefService) { PRBool doMiddleMousePaste = PR_FALSE;; @@ -643,7 +643,8 @@ nsresult nsTextEditorDragListener::DragOver(nsIDOMEvent* aDragEvent) { nsresult rv; - NS_WITH_SERVICE ( nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv ); + nsCOMPtr dragService = + do_GetService( "@mozilla.org/widget/dragservice;1", &rv ); if ( NS_SUCCEEDED(rv) ) { nsCOMPtr dragSession; dragService->GetCurrentSession(getter_AddRefs(dragSession)); @@ -690,7 +691,8 @@ nsTextEditorDragListener::DragDrop(nsIDOMEvent* aMouseEvent) if ( mEditor ) { nsresult rv; - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); if (NS_FAILED(rv)) return rv; PRUint32 flags; @@ -1075,7 +1077,8 @@ nsTextEditorFocusListener::Focus(nsIDOMEvent* aEvent) PRInt32 pixelWidth; nsresult result; - NS_WITH_SERVICE(nsILookAndFeel, look, kLookAndFeelCID, &result); + nsCOMPtr look = + do_GetService(kLookAndFeelCID, &result); if (NS_SUCCEEDED(result) && look) { diff --git a/mozilla/editor/libeditor/text/nsPlaintextDataTransfer.cpp b/mozilla/editor/libeditor/text/nsPlaintextDataTransfer.cpp index 5cb7476005c..8dcf08fa3a4 100644 --- a/mozilla/editor/libeditor/text/nsPlaintextDataTransfer.cpp +++ b/mozilla/editor/libeditor/text/nsPlaintextDataTransfer.cpp @@ -184,7 +184,8 @@ NS_IMETHODIMP nsPlaintextEditor::InsertFromDrop(nsIDOMEvent* aDropEvent) ForceCompositionEnd(); nsresult rv; - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr dragSession; @@ -425,7 +426,8 @@ NS_IMETHODIMP nsPlaintextEditor::DoDrag(nsIDOMEvent *aDragEvent) return NS_ERROR_OUT_OF_MEMORY; /* get the drag service */ - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); if (NS_FAILED(rv)) return rv; /* create html flavor transferable */ @@ -531,7 +533,7 @@ NS_IMETHODIMP nsPlaintextEditor::Paste(PRInt32 aSelectionType) // Get Clipboard Service nsresult rv; - NS_WITH_SERVICE ( nsIClipboard, clipboard, kCClipboardCID, &rv ); + nsCOMPtr clipboard( do_GetService( kCClipboardCID, &rv ) ); if ( NS_FAILED(rv) ) return rv; @@ -562,7 +564,7 @@ NS_IMETHODIMP nsPlaintextEditor::CanPaste(PRInt32 aSelectionType, PRBool *aCanPa return NS_OK; nsresult rv; - NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv); + nsCOMPtr clipboard(do_GetService(kCClipboardCID, &rv)); if (NS_FAILED(rv)) return rv; // the flavors that we can deal with diff --git a/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp b/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp index bfeebdc1169..cbd24cb03bd 100644 --- a/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp +++ b/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp @@ -1588,7 +1588,7 @@ nsPlaintextEditor::PasteAsQuotation(PRInt32 aSelectionType) { // Get Clipboard Service nsresult rv; - NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv); + nsCOMPtr clipboard(do_GetService(kCClipboardCID, &rv)); if (NS_FAILED(rv)) return rv; // Create generic Transferable for getting the data @@ -1650,7 +1650,7 @@ static nsICiter* MakeACiter() // Make a citer of an appropriate type nsICiter* citer = 0; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (NS_FAILED(rv)) return 0; char *citationType = 0; diff --git a/mozilla/editor/libeditor/text/nsTextEditRules.cpp b/mozilla/editor/libeditor/text/nsTextEditRules.cpp index d09ab2070ea..5fd45238f4b 100644 --- a/mozilla/editor/libeditor/text/nsTextEditRules.cpp +++ b/mozilla/editor/libeditor/text/nsTextEditRules.cpp @@ -529,7 +529,7 @@ nsTextEditRules::WillInsertText(PRInt32 aAction, }; PRInt32 singleLineNewlineBehavior = 1; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv) && prefs) rv = prefs->GetIntPref("editor.singleLine.pasteNewlines", &singleLineNewlineBehavior); diff --git a/mozilla/embedding/base/nsEmbedWin32.cpp b/mozilla/embedding/base/nsEmbedWin32.cpp index a73fbc5a525..44bd80f652b 100644 --- a/mozilla/embedding/base/nsEmbedWin32.cpp +++ b/mozilla/embedding/base/nsEmbedWin32.cpp @@ -39,7 +39,7 @@ static NS_DEFINE_CID(kTimerManagerCID, NS_TIMERMANAGER_CID); nsresult NS_DoIdleEmbeddingStuff() { nsresult rv = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsITimerQueue, timerQueue, kTimerManagerCID, &rv); + nsCOMPtr timerQueue(do_GetService(kTimerManagerCID, &rv)); if (NS_FAILED(rv)) { return NS_ERROR_FAILURE; diff --git a/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp b/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp index dbfad6f48e9..aae7f898e4b 100644 --- a/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp +++ b/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp @@ -903,7 +903,8 @@ HRESULT CMozillaBrowser::Initialize() } // Set the profile which the control will use - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); if (NS_FAILED(rv)) { return E_FAIL; @@ -1329,7 +1330,8 @@ HRESULT CMozillaBrowser::PrintDocument(BOOL promptUser) nsresult rv; PRBool oldPrintSilent = PR_FALSE; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (printService) { printService->GetPrintSilent(&oldPrintSilent); diff --git a/mozilla/embedding/browser/photon/src/PtMozilla.cpp b/mozilla/embedding/browser/photon/src/PtMozilla.cpp index 9a67de65393..0be9194dad5 100644 --- a/mozilla/embedding/browser/photon/src/PtMozilla.cpp +++ b/mozilla/embedding/browser/photon/src/PtMozilla.cpp @@ -529,7 +529,8 @@ static void mozilla_modify( PtWidget_t *widget, PtArg_t const *argt ) { PpPrintContext_t *pc = moz_construct_print_context( pPageInfo ); nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); printService->SetEndPageRange( (PRInt32) pc ); /* use SetEndPageRange/GetEndPageRange to convey the print context */ print->Print( window, printService, moz->MyBrowser->WebBrowserContainer ); } diff --git a/mozilla/embedding/browser/powerplant/source/CAppFileLocationProvider.cpp b/mozilla/embedding/browser/powerplant/source/CAppFileLocationProvider.cpp index ce1a538f75e..eb833c29fd2 100755 --- a/mozilla/embedding/browser/powerplant/source/CAppFileLocationProvider.cpp +++ b/mozilla/embedding/browser/powerplant/source/CAppFileLocationProvider.cpp @@ -159,7 +159,8 @@ NS_METHOD CAppFileLocationProvider::CloneMozBinDirectory(nsILocalFile **aLocalFi // This will be set if a directory was passed to NS_InitXPCOM // 2. If that doesn't work, set it to be the current process directory - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; @@ -198,7 +199,8 @@ NS_METHOD CAppFileLocationProvider::GetProductDirectory(nsILocalFile **aLocalFil PRBool exists; nsCOMPtr localDir; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = directoryService->Get(NS_MAC_DOCUMENTS_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(localDir)); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/embedding/browser/powerplant/source/CBrowserApp.cp b/mozilla/embedding/browser/powerplant/source/CBrowserApp.cp index eb9cd078956..d13f64bb615 100644 --- a/mozilla/embedding/browser/powerplant/source/CBrowserApp.cp +++ b/mozilla/embedding/browser/powerplant/source/CBrowserApp.cp @@ -211,7 +211,7 @@ CBrowserApp::CBrowserApp() CBrowserApp::~CBrowserApp() { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv) && prefs) prefs->SavePrefFile(nsnull); @@ -232,7 +232,8 @@ CBrowserApp::StartUp() #if USE_PROFILES // Register for profile changes - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); ThrowIfNil_(observerService); observerService->AddObserver(this, NS_LITERAL_STRING("profile-approve-change").get()); observerService->AddObserver(this, NS_LITERAL_STRING("profile-change-teardown").get()); @@ -256,7 +257,7 @@ CBrowserApp::StartUp() rv = locationProvider->Initialize(rootDir, "guest"); ThrowIfError_(rv); - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); ThrowIfNil_(prefs); // Needed because things read default prefs during startup prefs->ResetPrefs(); @@ -500,7 +501,7 @@ Boolean CBrowserApp::AttemptQuitSelf(SInt32 inSaveOption) nsresult CBrowserApp::InitializePrefs() { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv)) { // We are using the default prefs from mozilla. If you were diff --git a/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp b/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp index df24d490f99..fe399102dc6 100644 --- a/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp +++ b/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp @@ -310,7 +310,8 @@ Boolean CBrowserShell::ObeyCommand(PP_PowerPlant::CommandT inCommand, void* ioPa nsCOMPtr domWindow; nsCOMPtr domWindowInternal; - NS_WITH_SERVICE(nsIWalletService, walletService, NS_WALLETSERVICE_CONTRACTID, &rv); + nsCOMPtr walletService = + do_GetService(NS_WALLETSERVICE_CONTRACTID, &rv); ThrowIfError_(rv); rv = mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindow)); ThrowIfError_(rv); @@ -326,7 +327,8 @@ Boolean CBrowserShell::ObeyCommand(PP_PowerPlant::CommandT inCommand, void* ioPa nsCOMPtr domWindow; nsCOMPtr domWindowInternal; - NS_WITH_SERVICE(nsIWalletService, walletService, NS_WALLETSERVICE_CONTRACTID, &rv); + nsCOMPtr walletService = + do_GetService(NS_WALLETSERVICE_CONTRACTID, &rv); ThrowIfError_(rv); rv = mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindow)); ThrowIfError_(rv); diff --git a/mozilla/embedding/browser/powerplant/source/CProfileManager.cpp b/mozilla/embedding/browser/powerplant/source/CProfileManager.cpp index 306501a0ff8..6849b81e2fe 100755 --- a/mozilla/embedding/browser/powerplant/source/CProfileManager.cpp +++ b/mozilla/embedding/browser/powerplant/source/CProfileManager.cpp @@ -70,7 +70,8 @@ void CProfileManager::StartUp() { nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); ThrowIfNil_(profileService); PRInt32 profileCount; @@ -158,7 +159,8 @@ void CProfileManager::DoManageProfilesDialog() StDialogHandler theHandler(dlog_ManageProfiles, LCommander::GetTopCommander()); LWindow *theDialog = theHandler.GetDialog(); - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); ThrowIfNil_(profileService); // Set up the dialog by filling the list of current profiles @@ -313,7 +315,8 @@ void CProfileManager::DoLogout() enum { iPersist = 1, iCancel, iCleanse }; nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); ThrowIfNil_(profileService); nsXPIDLString currentProfile; diff --git a/mozilla/embedding/browser/powerplant/source/UMacUnicode.cpp b/mozilla/embedding/browser/powerplant/source/UMacUnicode.cpp index a53273225eb..38f14d12933 100644 --- a/mozilla/embedding/browser/powerplant/source/UMacUnicode.cpp +++ b/mozilla/embedding/browser/powerplant/source/UMacUnicode.cpp @@ -67,7 +67,8 @@ CPlatformUCSConversion::PreparePlatformCharset() if (mPlatformCharset.Length() == 0) { - NS_WITH_SERVICE(nsIPlatformCharset, pcharset, NS_PLATFORMCHARSET_CONTRACTID, &res); + nsCOMPtr pcharset = + do_GetService(NS_PLATFORMCHARSET_CONTRACTID, &res); if (!(NS_SUCCEEDED(res) && pcharset)) { NS_WARNING("cannot get platform charset"); } @@ -88,8 +89,8 @@ CPlatformUCSConversion::PrepareEncoder() { res = PreparePlatformCharset(); if(NS_SUCCEEDED(res)) { - NS_WITH_SERVICE(nsICharsetConverterManager, - ucmgr, NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res); + nsCOMPtr ucmgr = + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res); NS_ASSERTION((NS_SUCCEEDED(res) && ucmgr), "cannot get charset converter manager "); if(NS_SUCCEEDED(res) && ucmgr) @@ -111,8 +112,8 @@ CPlatformUCSConversion::PrepareDecoder() { res = PreparePlatformCharset(); if(NS_SUCCEEDED(res)) { - NS_WITH_SERVICE(nsICharsetConverterManager, - ucmgr, NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res); + nsCOMPtr ucmgr = + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res); NS_ASSERTION((NS_SUCCEEDED(res) && ucmgr), "cannot get charset converter manager "); if(NS_SUCCEEDED(res) && ucmgr) diff --git a/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp b/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp index 08f1b3a0905..9be8d4ab31b 100644 --- a/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp +++ b/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp @@ -291,7 +291,8 @@ NS_IMETHODIMP nsWebBrowser::EnableGlobalHistory(PRBool aEnable) if (NS_FAILED(rv)) return rv; if (aEnable) { - NS_WITH_SERVICE(nsIGlobalHistory, history, NS_GLOBALHISTORY_CONTRACTID, &rv); + nsCOMPtr history = + do_GetService(NS_GLOBALHISTORY_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = dsHistory->SetGlobalHistory(history); } @@ -1611,7 +1612,8 @@ NS_IMETHODIMP nsWebBrowser::Print(nsIDOMWindow *aDOMWindow, NS_IMETHODIMP nsWebBrowser::Cancel(void) { nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv) && printService) { return printService->SetIsCancelled(PR_TRUE); } diff --git a/mozilla/embedding/browser/webBrowser/nsWebBrowserPersist.cpp b/mozilla/embedding/browser/webBrowser/nsWebBrowserPersist.cpp index ed930a70a07..e671097910b 100644 --- a/mozilla/embedding/browser/webBrowser/nsWebBrowserPersist.cpp +++ b/mozilla/embedding/browser/webBrowser/nsWebBrowserPersist.cpp @@ -160,7 +160,8 @@ NS_IMETHODIMP nsWebBrowserPersist::SaveURI(nsIURI *aURI, nsIInputStream *aPostDa } NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID); - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) { diff --git a/mozilla/embedding/qa/testembed/ProfileMgr.cpp b/mozilla/embedding/qa/testembed/ProfileMgr.cpp index 8bad6249fd4..d153a455492 100644 --- a/mozilla/embedding/qa/testembed/ProfileMgr.cpp +++ b/mozilla/embedding/qa/testembed/ProfileMgr.cpp @@ -57,7 +57,8 @@ nsresult CProfileMgr::StartUp() { nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; PRInt32 profileCount; @@ -115,7 +116,8 @@ nsresult CProfileMgr::DoManageProfilesDialog(PRBool bAtStartUp) { SetShowDialogOnStart(dialog.m_bAskAtStartUp); - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) rv = profileService->SetCurrentProfile(dialog.m_SelectedProfile.get()); } diff --git a/mozilla/embedding/qa/testembed/ProfilesDlg.cpp b/mozilla/embedding/qa/testembed/ProfilesDlg.cpp index 73db97a45ec..446301fd86a 100644 --- a/mozilla/embedding/qa/testembed/ProfilesDlg.cpp +++ b/mozilla/embedding/qa/testembed/ProfilesDlg.cpp @@ -25,7 +25,8 @@ static void ValidateProfileName(const CString& profileName, CDataExchange* pDX) PRBool exists = FALSE; { - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); rv = profileService->ProfileExists(T2W(profileName), &exists); } @@ -183,7 +184,8 @@ BOOL CProfilesDlg::OnInitDialog() // Fill the list of profiles nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); profileService->GetCurrentProfile(getter_Copies(curProfileName)); PRInt32 selectedRow = 0; @@ -218,7 +220,8 @@ void CProfilesDlg::OnNewProfile() { nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); ASSERT(NS_SUCCEEDED(rv)); if (NS_SUCCEEDED(rv)) { @@ -253,7 +256,8 @@ void CProfilesDlg::OnRenameProfile() nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); ASSERT(NS_SUCCEEDED(rv)); if (NS_SUCCEEDED(rv)) { @@ -274,7 +278,8 @@ void CProfilesDlg::OnDeleteProfile() m_ProfileList.GetText(itemIndex, selectedProfile); nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); ASSERT(NS_SUCCEEDED(rv)); if (NS_SUCCEEDED(rv)) { diff --git a/mozilla/embedding/qa/testembed/TestEmbed.cpp b/mozilla/embedding/qa/testembed/TestEmbed.cpp index 6a55a609dcb..f2d384f7586 100644 --- a/mozilla/embedding/qa/testembed/TestEmbed.cpp +++ b/mozilla/embedding/qa/testembed/TestEmbed.cpp @@ -432,7 +432,7 @@ void CTestEmbedApp::OnEditPreferences() // Save these changes to disk now nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv)) { prefs->SetIntPref("browser.startup.page", m_iStartupPage); @@ -452,7 +452,8 @@ BOOL CTestEmbedApp::InitializeProfiles() return FALSE; nsresult rv; - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); observerService->AddObserver(this, NS_LITERAL_STRING("profile-approve-change").get()); observerService->AddObserver(this, NS_LITERAL_STRING("profile-change-teardown").get()); observerService->AddObserver(this, NS_LITERAL_STRING("profile-after-change").get()); @@ -483,7 +484,7 @@ BOOL CTestEmbedApp::CreateHiddenWindow() nsresult CTestEmbedApp::InitializePrefs() { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv)) { // We are using the default prefs from mozilla. If you were diff --git a/mozilla/embedding/qa/testembed/Tests.cpp b/mozilla/embedding/qa/testembed/Tests.cpp index 679528c92bf..70b49372dff 100644 --- a/mozilla/embedding/qa/testembed/Tests.cpp +++ b/mozilla/embedding/qa/testembed/Tests.cpp @@ -251,7 +251,8 @@ void CTests::OnTestsCreateprofile() if (myDialog.DoModal() == IDOK) { -// NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); +// nsCOMPtr profileService = +// do_GetService(NS_PROFILE_CONTRACTID, &rv); nsCOMPtr theProfServ(do_GetService(NS_PROFILE_CONTRACTID)); if (!theProfServ) { diff --git a/mozilla/embedding/qa/testembed/winEmbedFileLocProvider.cpp b/mozilla/embedding/qa/testembed/winEmbedFileLocProvider.cpp index cf10580fe9e..96c4d472829 100644 --- a/mozilla/embedding/qa/testembed/winEmbedFileLocProvider.cpp +++ b/mozilla/embedding/qa/testembed/winEmbedFileLocProvider.cpp @@ -167,7 +167,8 @@ NS_METHOD winEmbedFileLocProvider::CloneMozBinDirectory(nsILocalFile **aLocalFil // This will be set if a directory was passed to NS_InitXPCOM // 2. If that doesn't work, set it to be the current process directory - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; @@ -206,7 +207,8 @@ NS_METHOD winEmbedFileLocProvider::GetProductDirectory(nsILocalFile **aLocalFile PRBool exists; nsCOMPtr localDir; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = directoryService->Get(NS_WIN_APPDATA_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(localDir)); if (NS_SUCCEEDED(rv)) diff --git a/mozilla/embedding/tests/mfcembed/MfcEmbed.cpp b/mozilla/embedding/tests/mfcembed/MfcEmbed.cpp index b0e96a44c86..a4ccf665ee8 100644 --- a/mozilla/embedding/tests/mfcembed/MfcEmbed.cpp +++ b/mozilla/embedding/tests/mfcembed/MfcEmbed.cpp @@ -415,7 +415,7 @@ void CMfcEmbedApp::OnEditPreferences() // Save these changes to disk now nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv)) { prefs->SetIntPref("browser.startup.page", m_iStartupPage); @@ -435,7 +435,8 @@ BOOL CMfcEmbedApp::InitializeProfiles() return FALSE; nsresult rv; - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); observerService->AddObserver(this, NS_LITERAL_STRING("profile-approve-change").get()); observerService->AddObserver(this, NS_LITERAL_STRING("profile-change-teardown").get()); observerService->AddObserver(this, NS_LITERAL_STRING("profile-after-change").get()); @@ -466,7 +467,7 @@ BOOL CMfcEmbedApp::CreateHiddenWindow() nsresult CMfcEmbedApp::InitializePrefs() { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv)) { // We are using the default prefs from mozilla. If you were diff --git a/mozilla/embedding/tests/mfcembed/ProfileMgr.cpp b/mozilla/embedding/tests/mfcembed/ProfileMgr.cpp index 11ef829ac4a..779ee643f39 100644 --- a/mozilla/embedding/tests/mfcembed/ProfileMgr.cpp +++ b/mozilla/embedding/tests/mfcembed/ProfileMgr.cpp @@ -57,7 +57,8 @@ nsresult CProfileMgr::StartUp() { nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; PRInt32 profileCount; @@ -115,7 +116,8 @@ nsresult CProfileMgr::DoManageProfilesDialog(PRBool bAtStartUp) { SetShowDialogOnStart(dialog.m_bAskAtStartUp); - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) rv = profileService->SetCurrentProfile(dialog.m_SelectedProfile.get()); } diff --git a/mozilla/embedding/tests/mfcembed/ProfilesDlg.cpp b/mozilla/embedding/tests/mfcembed/ProfilesDlg.cpp index 611461bed60..9041769aa51 100644 --- a/mozilla/embedding/tests/mfcembed/ProfilesDlg.cpp +++ b/mozilla/embedding/tests/mfcembed/ProfilesDlg.cpp @@ -25,7 +25,8 @@ static void ValidateProfileName(const CString& profileName, CDataExchange* pDX) PRBool exists = FALSE; { - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); rv = profileService->ProfileExists(T2W(profileName), &exists); } @@ -183,7 +184,8 @@ BOOL CProfilesDlg::OnInitDialog() // Fill the list of profiles nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); profileService->GetCurrentProfile(getter_Copies(curProfileName)); PRInt32 selectedRow = 0; @@ -218,7 +220,8 @@ void CProfilesDlg::OnNewProfile() { nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); ASSERT(NS_SUCCEEDED(rv)); if (NS_SUCCEEDED(rv)) { @@ -253,7 +256,8 @@ void CProfilesDlg::OnRenameProfile() nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); ASSERT(NS_SUCCEEDED(rv)); if (NS_SUCCEEDED(rv)) { @@ -274,7 +278,8 @@ void CProfilesDlg::OnDeleteProfile() m_ProfileList.GetText(itemIndex, selectedProfile); nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); ASSERT(NS_SUCCEEDED(rv)); if (NS_SUCCEEDED(rv)) { diff --git a/mozilla/embedding/tests/mfcembed/winEmbedFileLocProvider.cpp b/mozilla/embedding/tests/mfcembed/winEmbedFileLocProvider.cpp index cf10580fe9e..96c4d472829 100644 --- a/mozilla/embedding/tests/mfcembed/winEmbedFileLocProvider.cpp +++ b/mozilla/embedding/tests/mfcembed/winEmbedFileLocProvider.cpp @@ -167,7 +167,8 @@ NS_METHOD winEmbedFileLocProvider::CloneMozBinDirectory(nsILocalFile **aLocalFil // This will be set if a directory was passed to NS_InitXPCOM // 2. If that doesn't work, set it to be the current process directory - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; @@ -206,7 +207,8 @@ NS_METHOD winEmbedFileLocProvider::GetProductDirectory(nsILocalFile **aLocalFile PRBool exists; nsCOMPtr localDir; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = directoryService->Get(NS_WIN_APPDATA_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(localDir)); if (NS_SUCCEEDED(rv)) diff --git a/mozilla/embedding/tests/winEmbed/winEmbed.cpp b/mozilla/embedding/tests/winEmbed/winEmbed.cpp index 7793dfa6d57..60e261b59e7 100644 --- a/mozilla/embedding/tests/winEmbed/winEmbed.cpp +++ b/mozilla/embedding/tests/winEmbed/winEmbed.cpp @@ -855,7 +855,8 @@ LRESULT CALLBACK BrowserWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l BOOL ChooseNewProfile(BOOL bShowForMultipleProfilesOnly, const char *szDefaultProfile) { nsresult rv; - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); if (NS_FAILED(rv)) { return FALSE; @@ -917,7 +918,8 @@ LRESULT CALLBACK ChooseProfileDlgProc(HWND hDlg, UINT message, WPARAM wParam, LP { HWND hwndProfileList = GetDlgItem(hDlg, IDC_PROFILELIST); - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); // Get the list of profile names and add them to the list box PRUint32 listLen = 0; @@ -965,7 +967,8 @@ LRESULT CALLBACK ChooseProfileDlgProc(HWND hDlg, UINT message, WPARAM wParam, LP INT currentProfileIndex = SendMessage(hwndProfileList, LB_GETCURSEL, 0, 0); if (currentProfileIndex != LB_ERR) { - NS_WITH_SERVICE(nsIProfile, profileService, NS_PROFILE_CONTRACTID, &rv); + nsCOMPtr profileService = + do_GetService(NS_PROFILE_CONTRACTID, &rv); // Convert TCHAR name to unicode and make it current INT profileNameLen = SendMessage(hwndProfileList, LB_GETTEXTLEN, currentProfileIndex, 0); TCHAR *profileName = new TCHAR[profileNameLen + 1]; diff --git a/mozilla/extensions/cookie/nsCookieService.cpp b/mozilla/extensions/cookie/nsCookieService.cpp index aad852c75cf..1b1499c63db 100644 --- a/mozilla/extensions/cookie/nsCookieService.cpp +++ b/mozilla/extensions/cookie/nsCookieService.cpp @@ -63,14 +63,16 @@ nsresult nsCookieService::Init() COOKIE_Read(); nsresult rv; - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (observerService) { observerService->AddObserver(this, NS_LITERAL_STRING("profile-before-change").get()); observerService->AddObserver(this, NS_LITERAL_STRING("profile-do-change").get()); } // Register as an observer for the document loader - NS_WITH_SERVICE(nsIDocumentLoader, docLoaderService, kDocLoaderServiceCID, &rv) + nsCOMPtr docLoaderService = + do_GetService(kDocLoaderServiceCID, &rv); if (NS_SUCCEEDED(rv) && docLoaderService) { nsCOMPtr progress(do_QueryInterface(docLoaderService)); if (progress) diff --git a/mozilla/extensions/cookie/nsCookies.cpp b/mozilla/extensions/cookie/nsCookies.cpp index 3df462ae7d9..0e25fc8644c 100644 --- a/mozilla/extensions/cookie/nsCookies.cpp +++ b/mozilla/extensions/cookie/nsCookies.cpp @@ -320,7 +320,7 @@ MODULE_PRIVATE int PR_CALLBACK cookie_BehaviorPrefChanged(const char * newpref, void * data) { PRInt32 n; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_FAILED(prefs->GetIntPref(cookie_behaviorPref, &n))) { n = PERMISSION_Accept; } @@ -332,7 +332,7 @@ MODULE_PRIVATE int PR_CALLBACK cookie_WarningPrefChanged(const char * newpref, void * data) { PRBool x; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_FAILED(prefs->GetBoolPref(cookie_warningPref, &x))) { x = PR_FALSE; } @@ -344,7 +344,7 @@ MODULE_PRIVATE int PR_CALLBACK cookie_LifetimeOptPrefChanged(const char * newpref, void * data) { PRInt32 n; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_FAILED(prefs->GetIntPref(cookie_lifetimePref, &n))) { n = COOKIE_Normal; } @@ -356,7 +356,7 @@ MODULE_PRIVATE int PR_CALLBACK cookie_LifetimeLimitPrefChanged(const char * newpref, void * data) { PRInt32 n; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (!NS_FAILED(prefs->GetIntPref(cookie_lifetimeValue, &n))) { cookie_SetLifetimeLimit(n); } @@ -371,7 +371,7 @@ COOKIE_RegisterPrefCallbacks(void) { PRInt32 n; PRBool x; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); // Initialize for cookie_behaviorPref if (NS_FAILED(prefs->GetIntPref(cookie_behaviorPref, &n))) { @@ -841,7 +841,7 @@ cookie_SetCookieString(char * curURL, nsIPrompt *aPrompter, const char * setCook * */ nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_FAILED(prefs->GetBoolPref(cookie_strictDomainsPref, &pref_scd))) { pref_scd = PR_FALSE; } diff --git a/mozilla/extensions/cookie/nsImages.cpp b/mozilla/extensions/cookie/nsImages.cpp index 843152cad30..9884733394c 100644 --- a/mozilla/extensions/cookie/nsImages.cpp +++ b/mozilla/extensions/cookie/nsImages.cpp @@ -70,7 +70,7 @@ MODULE_PRIVATE int PR_CALLBACK image_BehaviorPrefChanged(const char * newpref, void * data) { PRInt32 n; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_FAILED(prefs->GetIntPref(image_behaviorPref, &n))) { image_SetBehaviorPref(PERMISSION_Accept); } else { @@ -83,7 +83,7 @@ MODULE_PRIVATE int PR_CALLBACK image_WarningPrefChanged(const char * newpref, void * data) { PRBool x; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_FAILED(prefs->GetBoolPref(image_warningPref, &x))) { x = PR_FALSE; } @@ -96,7 +96,7 @@ IMAGE_RegisterPrefCallbacks(void) { PRInt32 n; PRBool x; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); // Initialize for image_behaviorPref if (NS_FAILED(prefs->GetIntPref(image_behaviorPref, &n))) { @@ -120,7 +120,7 @@ IMAGE_CheckForPermission /* exit if imageblocker is not enabled */ nsresult rv; PRBool prefvalue = PR_FALSE; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_FAILED(rv) || NS_FAILED(prefs->GetBoolPref("imageblocker.enabled", &prefvalue)) || !prefvalue) { diff --git a/mozilla/extensions/cookie/nsPermissionManager.cpp b/mozilla/extensions/cookie/nsPermissionManager.cpp index d80786577ff..2e30bf9c038 100644 --- a/mozilla/extensions/cookie/nsPermissionManager.cpp +++ b/mozilla/extensions/cookie/nsPermissionManager.cpp @@ -104,7 +104,8 @@ nsresult nsPermissionManager::Init() PERMISSION_Read(); nsresult rv; - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (observerService) { observerService->AddObserver(this, NS_LITERAL_STRING("profile-before-change").get()); observerService->AddObserver(this, NS_LITERAL_STRING("profile-do-change").get()); diff --git a/mozilla/extensions/cookie/nsUtils.cpp b/mozilla/extensions/cookie/nsUtils.cpp index c38c2c9e371..a617c507728 100644 --- a/mozilla/extensions/cookie/nsUtils.cpp +++ b/mozilla/extensions/cookie/nsUtils.cpp @@ -266,7 +266,8 @@ PRUnichar * CKutil_Localize(const PRUnichar *genericString) { nsresult ret; PRUnichar *ptrv = nsnull; - NS_WITH_SERVICE(nsIStringBundleService, pStringService, kStringBundleServiceCID, &ret); + nsCOMPtr pStringService = + do_GetService(kStringBundleServiceCID, &ret); if (NS_SUCCEEDED(ret) && (nsnull != pStringService)) { nsCOMPtr bundle; ret = pStringService->CreateBundle(LOCALIZATION, getter_AddRefs(bundle)); diff --git a/mozilla/extensions/cookie/tests/TestCookie.cpp b/mozilla/extensions/cookie/tests/TestCookie.cpp index cd5cd5f26ab..abd9806878e 100644 --- a/mozilla/extensions/cookie/tests/TestCookie.cpp +++ b/mozilla/extensions/cookie/tests/TestCookie.cpp @@ -77,7 +77,8 @@ int main(PRInt32 argc, char *argv[]) if (NS_FAILED(rv)) return -1; // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return -1; rv = eventQService->CreateThreadEventQueue(); @@ -85,7 +86,8 @@ int main(PRInt32 argc, char *argv[]) eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, &gEventQ); - NS_WITH_SERVICE(nsIStringBundleService, bundleService, NS_STRINGBUNDLE_CONTRACTID, &rv); + nsCOMPtr bundleService = + do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsCOMPtr stringBundle; @@ -93,7 +95,8 @@ int main(PRInt32 argc, char *argv[]) rv = bundleService->CreateBundle(propertyURL, getter_AddRefs(stringBundle)); } - NS_WITH_SERVICE(nsICookieService, cookieService, kCookieServiceCID, &rv); + nsCOMPtr cookieService = + do_GetService(kCookieServiceCID, &rv); if (NS_FAILED(rv)) return -1; SetACookie(cookieService, "http://www.blah.com", "myCookie=yup; path=/"); diff --git a/mozilla/extensions/datetime/nsDateTimeChannel.cpp b/mozilla/extensions/datetime/nsDateTimeChannel.cpp index cc0e4673791..caa75b8e617 100644 --- a/mozilla/extensions/datetime/nsDateTimeChannel.cpp +++ b/mozilla/extensions/datetime/nsDateTimeChannel.cpp @@ -162,7 +162,8 @@ nsDateTimeChannel::Open(nsIInputStream **_retval) if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv); + nsCOMPtr socketService = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr transport; @@ -183,7 +184,8 @@ nsDateTimeChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt) if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv); + nsCOMPtr socketService = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr transport; diff --git a/mozilla/extensions/finger/nsFingerChannel.cpp b/mozilla/extensions/finger/nsFingerChannel.cpp index c443b111c87..d9fe1684832 100644 --- a/mozilla/extensions/finger/nsFingerChannel.cpp +++ b/mozilla/extensions/finger/nsFingerChannel.cpp @@ -192,7 +192,8 @@ nsFingerChannel::Open(nsIInputStream **_retval) if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv); + nsCOMPtr socketService = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = socketService->CreateTransport(mHost, mPort, nsnull, -1, BUFFER_SEG_SIZE, @@ -214,7 +215,8 @@ nsFingerChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt) if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv); + nsCOMPtr socketService = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = socketService->CreateTransport(mHost, mPort, nsnull, -1, BUFFER_SEG_SIZE, @@ -364,8 +366,8 @@ nsFingerChannel::OnStopRequest(nsIRequest *aRequest, nsISupports* aContext, mActAsObserver = PR_FALSE; nsCOMPtr converterListener; - NS_WITH_SERVICE(nsIStreamConverterService, StreamConvService, - kStreamConverterServiceCID, &rv); + nsCOMPtr StreamConvService = + do_GetService(kStreamConverterServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsAutoString fromStr; fromStr.AssignWithConversion("text/plain"); diff --git a/mozilla/extensions/pics/src/nsPICSElementObserver.cpp b/mozilla/extensions/pics/src/nsPICSElementObserver.cpp index b31ea179e2e..83e603afe84 100644 --- a/mozilla/extensions/pics/src/nsPICSElementObserver.cpp +++ b/mozilla/extensions/pics/src/nsPICSElementObserver.cpp @@ -153,7 +153,7 @@ NS_IMETHODIMP nsPICSElementObserver::Notify(PRUint32 aDocumentID, char *label = theValue2.ToNewCString(); if (valueArray[numOfAttributes]) { const nsString& theURLValue=valueArray[numOfAttributes]; - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv); + nsCOMPtr service(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsIURI *uri = nsnull; diff --git a/mozilla/extensions/psm-glue/src/nsCrypto.cpp b/mozilla/extensions/psm-glue/src/nsCrypto.cpp index 673b354e9b1..abe7a21db4d 100644 --- a/mozilla/extensions/psm-glue/src/nsCrypto.cpp +++ b/mozilla/extensions/psm-glue/src/nsCrypto.cpp @@ -583,8 +583,8 @@ cryptojs_DestroyCRMFRequests(PCMT_CONTROL control, CMUint32 *rsrcids, nsIEventQueue* getUIEventQueue() { nsresult rv; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, - NS_EVENTQUEUESERVICE_CONTRACTID, &rv); + nsCOMPtr eventQService = + do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return nsnull; diff --git a/mozilla/extensions/psm-glue/src/nsPSMComponent.cpp b/mozilla/extensions/psm-glue/src/nsPSMComponent.cpp index 7cc2cb52e81..cd382c8bce0 100644 --- a/mozilla/extensions/psm-glue/src/nsPSMComponent.cpp +++ b/mozilla/extensions/psm-glue/src/nsPSMComponent.cpp @@ -100,7 +100,8 @@ nsPSMComponent::~nsPSMComponent() if (mCertContentListener) { nsresult rv = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIURILoader, dispatcher, NS_URI_LOADER_CONTRACTID, &rv); + nsCOMPtr dispatcher = + do_GetService(NS_URI_LOADER_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { rv = dispatcher->UnRegisterContentListener(mCertContentListener); } @@ -146,7 +147,8 @@ nsPSMComponent::RegisterCertContentListener() { nsresult rv = NS_OK; if (mCertContentListener == nsnull) { - NS_WITH_SERVICE(nsIURILoader, dispatcher, NS_URI_LOADER_CONTRACTID, &rv); + nsCOMPtr dispatcher = + do_GetService(NS_URI_LOADER_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { mCertContentListener = do_CreateInstance(NS_CERTCONTENTLISTEN_CONTRACTID); rv = dispatcher->RegisterContentListener(mCertContentListener); @@ -159,7 +161,8 @@ nsresult nsPSMComponent::RegisterProfileChangeObserver() { nsresult rv; - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); NS_ASSERTION(observerService, "could not get observer service"); if (observerService) { // Our refcnt must be > 0 when we call AddObserver or we'll get deleted. @@ -520,7 +523,8 @@ nsPSMComponent::GetControlConnection( CMT_CONTROL * *_retval ) if (mControl == nsnull) { nsCOMPtr psmAppFile; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; directoryService->Get( NS_XPCOM_CURRENT_PROCESS_DIR, @@ -549,7 +553,8 @@ nsPSMComponent::GetControlConnection( CMT_CONTROL * *_retval ) if (mControl == nsnull) { nsCOMPtr psmAppFile; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; directoryService->Get( NS_XPCOM_CURRENT_PROCESS_DIR, @@ -612,7 +617,7 @@ nsPSMComponent::GetControlConnection( CMT_CONTROL * *_retval ) profileSpec->Create(nsIFile::DIRECTORY_TYPE, 0); #endif - NS_WITH_SERVICE(nsIProfile, profile, kProfileCID, &rv); + nsCOMPtr profile(do_GetService(kProfileCID, &rv)); if (NS_SUCCEEDED(rv)) { rv = profile->GetCurrentProfile(getter_Copies(profileName)); @@ -1171,8 +1176,8 @@ nsPSMComponent::VerifySignature(const char* aRSABuf, PRUint32 aRSABufLen, //-- Get a principal nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv) + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; rv = secMan->GetCertificatePrincipal((const char*)fingerprint.data, aPrincipal); diff --git a/mozilla/extensions/psm-glue/src/nsSecureBrowserUIImpl.cpp b/mozilla/extensions/psm-glue/src/nsSecureBrowserUIImpl.cpp index 26765f0bd52..52cd99ed6b5 100644 --- a/mozilla/extensions/psm-glue/src/nsSecureBrowserUIImpl.cpp +++ b/mozilla/extensions/psm-glue/src/nsSecureBrowserUIImpl.cpp @@ -164,7 +164,8 @@ nsSecureBrowserUIImpl::Init(nsIDOMWindow *window, nsIDOMElement *button) getter_AddRefs(mPref)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIStringBundleService, service, kCStringBundleServiceCID, &rv); + nsCOMPtr service = + do_GetService(kCStringBundleServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = service->CreateBundle(SECURITY_STRING_BUNDLE_URL, getter_AddRefs(mStringBundle)); @@ -205,7 +206,8 @@ NS_IMETHODIMP nsSecureBrowserUIImpl::DisplayPageInfoUI() { nsresult res; - NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_CONTRACTID, &res); + nsCOMPtr psm = + do_GetService(PSM_COMPONENT_CONTRACTID, &res); if (NS_FAILED(res)) return res; @@ -563,7 +565,8 @@ nsSecureBrowserUIImpl::IsURLfromPSM(nsIURI* aURL, PRBool* value) if ( PL_strncasecmp(host, "127.0.0.1", 9) == 0 ) { nsresult res; - NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_CONTRACTID, &res); + nsCOMPtr psm = + do_GetService(PSM_COMPONENT_CONTRACTID, &res); if (NS_FAILED(res)) return res; @@ -648,7 +651,8 @@ nsSecureBrowserUIImpl::CheckProtocolContextSwitch( nsISecurityEventSink* eventSi if (!outCheckValue) { mPref->SetBoolPref(LEAVE_SITE_PREF, PR_FALSE); - NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_CONTRACTID, &res); + nsCOMPtr psm = + do_GetService(PSM_COMPONENT_CONTRACTID, &res); if (NS_FAILED(res)) return res; psm->PassPrefs(); @@ -686,7 +690,8 @@ nsSecureBrowserUIImpl::CheckProtocolContextSwitch( nsISecurityEventSink* eventSi if (!outCheckValue) { mPref->SetBoolPref(ENTER_SITE_PREF, PR_FALSE); - NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_CONTRACTID, &res); + nsCOMPtr psm = + do_GetService(PSM_COMPONENT_CONTRACTID, &res); if (NS_FAILED(res)) return res; psm->PassPrefs(); @@ -759,7 +764,8 @@ nsSecureBrowserUIImpl::CheckMixedContext(nsISecurityEventSink *eventSink, nsIReq if (!outCheckValue) { mPref->SetBoolPref(MIXEDCONTENT_PREF, PR_FALSE); - NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_CONTRACTID, &rv); + nsCOMPtr psm = + do_GetService(PSM_COMPONENT_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; psm->PassPrefs(); @@ -833,7 +839,8 @@ nsSecureBrowserUIImpl::CheckPost(nsIURI *actionURL, PRBool *okayToPost) if (!outCheckValue) { mPref->SetBoolPref(INSECURE_SUBMIT_PREF, PR_FALSE); - NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_CONTRACTID, &rv); + nsCOMPtr psm = + do_GetService(PSM_COMPONENT_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; return psm->PassPrefs(); diff --git a/mozilla/extensions/python/xpcom/src/xpcom.cpp b/mozilla/extensions/python/xpcom/src/xpcom.cpp index 2d5f4a04e7a..9abfac7ecef 100644 --- a/mozilla/extensions/python/xpcom/src/xpcom.cpp +++ b/mozilla/extensions/python/xpcom/src/xpcom.cpp @@ -355,10 +355,8 @@ PyXPCOMMethod_GetProxyForObject(PyObject *self, PyObject *args) nsresult rv_proxy; nsISupports *presult = nsnull; Py_BEGIN_ALLOW_THREADS; - NS_WITH_SERVICE(nsIProxyObjectManager, - proxyMgr, - kProxyObjectManagerCID, - &rv_proxy); + nsCOMPtr proxyMgr = + do_GetService(kProxyObjectManagerCID, &rv_proxy); if ( NS_SUCCEEDED(rv_proxy) ) { rv_proxy = proxyMgr->GetProxyForObject(pQueue, diff --git a/mozilla/extensions/transformiix/source/xml/parser/nsSyncLoader.cpp b/mozilla/extensions/transformiix/source/xml/parser/nsSyncLoader.cpp index 62f1dbc6e68..12caf0e38b2 100644 --- a/mozilla/extensions/transformiix/source/xml/parser/nsSyncLoader.cpp +++ b/mozilla/extensions/transformiix/source/xml/parser/nsSyncLoader.cpp @@ -238,7 +238,7 @@ nsSyncLoader::LoadDocument(nsIURI* documentURI, nsIDOMDocument **_retval) nsCOMPtr eventQService; nsCOMPtr cc; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_SUCCEEDED(rv)) { rv = xpc->GetCurrentNativeCallContext(getter_AddRefs(cc)); } @@ -249,7 +249,8 @@ nsSyncLoader::LoadDocument(nsIURI* documentURI, nsIDOMDocument **_retval) if (NS_FAILED(rv)) return NS_ERROR_FAILURE; } else { - NS_WITH_SERVICE(nsIAppShellService, appshellSvc, kAppShellServiceCID, &rv); + nsCOMPtr appshellSvc = + do_GetService(kAppShellServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr junk; rv = appshellSvc->GetHiddenWindowAndJSContext(getter_AddRefs(junk), &cx); diff --git a/mozilla/extensions/wallet/cookieviewer/nsCookieViewer.cpp b/mozilla/extensions/wallet/cookieviewer/nsCookieViewer.cpp index bce6ec14690..38443f269eb 100644 --- a/mozilla/extensions/wallet/cookieviewer/nsCookieViewer.cpp +++ b/mozilla/extensions/wallet/cookieviewer/nsCookieViewer.cpp @@ -58,7 +58,8 @@ CookieViewerImpl::GetCookieValue(char** aValue) } nsresult res; - NS_WITH_SERVICE(nsICookieService, cookieservice, kCookieServiceCID, &res); + nsCOMPtr 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 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 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 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 cookieservice = + do_GetService(kCookieServiceCID, &rv); if (NS_FAILED(rv)) { return rv; } diff --git a/mozilla/extensions/wallet/editor/nsWalletEditor.cpp b/mozilla/extensions/wallet/editor/nsWalletEditor.cpp index f214d4dee33..1ee11477abe 100644 --- a/mozilla/extensions/wallet/editor/nsWalletEditor.cpp +++ b/mozilla/extensions/wallet/editor/nsWalletEditor.cpp @@ -55,7 +55,8 @@ WalletEditorImpl::GetValue(PRUnichar** aValue) return NS_ERROR_NULL_POINTER; } nsresult res; - NS_WITH_SERVICE(nsIWalletService, walletservice, kWalletServiceCID, &res); + nsCOMPtr 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 walletservice = + do_GetService(kWalletServiceCID, &res); if (NS_FAILED(res)) return res; nsAutoString walletList( aValue ); res = walletservice->WALLET_PostEdit(walletList); diff --git a/mozilla/extensions/wallet/signonviewer/nsSignonViewer.cpp b/mozilla/extensions/wallet/signonviewer/nsSignonViewer.cpp index 00e577d238f..f924b648bc6 100644 --- a/mozilla/extensions/wallet/signonviewer/nsSignonViewer.cpp +++ b/mozilla/extensions/wallet/signonviewer/nsSignonViewer.cpp @@ -55,7 +55,8 @@ SignonViewerImpl::GetNopreviewValue(PRUnichar** aValue) return NS_ERROR_NULL_POINTER; } nsresult res; - NS_WITH_SERVICE(nsIWalletService, walletservice, kWalletServiceCID, &res); + nsCOMPtr 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 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 walletservice = + do_GetService(kWalletServiceCID, &res); if (NS_FAILED(res)) return res; nsAutoString walletList( aValue ); res = walletservice->SI_SignonViewerReturn(walletList); diff --git a/mozilla/extensions/wallet/src/htmldlgs.h b/mozilla/extensions/wallet/src/htmldlgs.h index 657a2723cf0..284666aeb23 100644 --- a/mozilla/extensions/wallet/src/htmldlgs.h +++ b/mozilla/extensions/wallet/src/htmldlgs.h @@ -170,7 +170,7 @@ XP_MakeHTMLDialog2(XPDialogInfo *dialogInfo) { char* separator; nsresult res; - NS_WITH_SERVICE(nsIIOService, netservice, kIOServiceCID, &res); + nsCOMPtr netservice(do_GetService(kIOServiceCID, &res)); if ((NS_SUCCEEDED(res)) && (nsnull != netservice)) { const nsAutoString html_dlgs = nsAutoString(HTML_DLGS_URL); diff --git a/mozilla/extensions/wallet/src/nsWalletService.cpp b/mozilla/extensions/wallet/src/nsWalletService.cpp index b300e8517ce..e532511691a 100644 --- a/mozilla/extensions/wallet/src/nsWalletService.cpp +++ b/mozilla/extensions/wallet/src/nsWalletService.cpp @@ -217,7 +217,8 @@ nsresult nsWalletlibService::Init() { nsresult rv; - NS_WITH_SERVICE(nsIObserverService, svc, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr 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 docLoaderService = + do_GetService(kDocLoaderServiceCID, &rv); if (NS_SUCCEEDED(rv) && docLoaderService) { nsCOMPtr progress(do_QueryInterface(docLoaderService, &rv)); if (NS_SUCCEEDED(rv)) diff --git a/mozilla/extensions/wallet/src/wallet.cpp b/mozilla/extensions/wallet/src/wallet.cpp index 5001a83f196..8f06bdb3cd1 100644 --- a/mozilla/extensions/wallet/src/wallet.cpp +++ b/mozilla/extensions/wallet/src/wallet.cpp @@ -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 psm = + do_GetService(PSM_COMPONENT_CONTRACTID, &res); if (NS_SUCCEEDED(res)) { nsXPIDLCString password; if (NS_SUCCEEDED(aURL->GetPassword(getter_Copies(password))) && password) { diff --git a/mozilla/extensions/wallet/walletpreview/nsWalletPreview.cpp b/mozilla/extensions/wallet/walletpreview/nsWalletPreview.cpp index b7b89158791..a0a783edb92 100644 --- a/mozilla/extensions/wallet/walletpreview/nsWalletPreview.cpp +++ b/mozilla/extensions/wallet/walletpreview/nsWalletPreview.cpp @@ -58,7 +58,8 @@ WalletPreviewImpl::GetPrefillValue(PRUnichar** aValue) return NS_ERROR_NULL_POINTER; } nsresult res; - NS_WITH_SERVICE(nsIWalletService, walletservice, kWalletServiceCID, &res); + nsCOMPtr 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 walletservice = + do_GetService(kWalletServiceCID, &res); if (NS_FAILED(res)) return res; nsAutoString walletList( aValue ); res = walletservice->WALLET_PrefillReturn(walletList); diff --git a/mozilla/extensions/wallet/walletpreview/nsWalletPreviewFactory.cpp b/mozilla/extensions/wallet/walletpreview/nsWalletPreviewFactory.cpp index c83ec5867db..7c2a0547ffb 100644 --- a/mozilla/extensions/wallet/walletpreview/nsWalletPreviewFactory.cpp +++ b/mozilla/extensions/wallet/walletpreview/nsWalletPreviewFactory.cpp @@ -177,7 +177,8 @@ NSRegisterSelf(nsISupports* aServMgr , const char* aPath) nsCOMPtr servMgr(do_QueryInterface(aServMgr, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; rv = compMgr->RegisterComponent(kWalletPreviewCID, @@ -199,7 +200,8 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* aPath) nsCOMPtr servMgr(do_QueryInterface(aServMgr, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; rv = compMgr->UnregisterComponent(kWalletPreviewCID, aPath); diff --git a/mozilla/extensions/webservices/soap/src/nsDefaultSOAPEncoder.cpp b/mozilla/extensions/webservices/soap/src/nsDefaultSOAPEncoder.cpp index 21e85c62b84..5e362b1d8a6 100644 --- a/mozilla/extensions/webservices/soap/src/nsDefaultSOAPEncoder.cpp +++ b/mozilla/extensions/webservices/soap/src/nsDefaultSOAPEncoder.cpp @@ -304,7 +304,7 @@ nsDefaultSOAPEncoder::SerializeJavaScriptArray(JSObject* arrayobj, { nsresult rv; nsCOMPtr cc; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr 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 diff --git a/mozilla/extensions/webservices/soap/src/nsSOAPCall.cpp b/mozilla/extensions/webservices/soap/src/nsSOAPCall.cpp index 3e774e976bf..78b27a8f959 100644 --- a/mozilla/extensions/webservices/soap/src/nsSOAPCall.cpp +++ b/mozilla/extensions/webservices/soap/src/nsSOAPCall.cpp @@ -598,7 +598,7 @@ NS_IMETHODIMP nsSOAPCall::SetParameters() } nsCOMPtr cc; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_SUCCEEDED(rv)) { rv = xpc->GetCurrentNativeCallContext(getter_AddRefs(cc)); } @@ -739,7 +739,7 @@ nsSOAPCall::GetScriptListener(nsISupports* aObject, nsresult rv; nsCOMPtr cc; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_SUCCEEDED(rv)) { rv = xpc->GetCurrentNativeCallContext(getter_AddRefs(cc)); } diff --git a/mozilla/extensions/webservices/soap/src/nsSOAPUtils.cpp b/mozilla/extensions/webservices/soap/src/nsSOAPUtils.cpp index 27365a0dd54..463cf5c7b89 100644 --- a/mozilla/extensions/webservices/soap/src/nsSOAPUtils.cpp +++ b/mozilla/extensions/webservices/soap/src/nsSOAPUtils.cpp @@ -159,8 +159,8 @@ nsSOAPUtils::GetSafeContext() { // Get the "safe" JSContext: our JSContext of last resort nsresult rv; - NS_WITH_SERVICE(nsIJSContextStack, stack, "@mozilla.org/js/xpc/ContextStack;1", - &rv); + nsCOMPtr stack = + do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv); if (NS_FAILED(rv)) return nsnull; nsCOMPtr tcs = do_QueryInterface(stack); @@ -176,8 +176,8 @@ nsSOAPUtils::GetCurrentContext() { // Get JSContext from stack. nsresult rv; - NS_WITH_SERVICE(nsIJSContextStack, stack, "@mozilla.org/js/xpc/ContextStack;1", - &rv); + nsCOMPtr stack = + do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv); if (NS_FAILED(rv)) return nsnull; JSContext *cx; diff --git a/mozilla/extensions/xmlextras/base/src/nsDOMParser.cpp b/mozilla/extensions/xmlextras/base/src/nsDOMParser.cpp index 7ab73a698ae..426aa9e37a5 100644 --- a/mozilla/extensions/xmlextras/base/src/nsDOMParser.cpp +++ b/mozilla/extensions/xmlextras/base/src/nsDOMParser.cpp @@ -285,10 +285,8 @@ ConvertWStringToStream(const PRUnichar* aStr, char* charBuf; // We want to encode the string as utf-8, so get the right encoder - NS_WITH_SERVICE(nsICharsetConverterManager, - charsetConv, - kCharsetConverterManagerCID, - &rv); + nsCOMPtr charsetConv = + do_GetService(kCharsetConverterManagerCID, &rv); NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); charsetStr.AssignWithConversion("UTF-8"); @@ -381,7 +379,7 @@ nsDOMParser::ParseFromStream(nsIInputStream *stream, // First try to find a base URI for the document we're creating nsCOMPtr cc; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_SUCCEEDED(rv)) { rv = xpc->GetCurrentNativeCallContext(getter_AddRefs(cc)); } @@ -391,8 +389,8 @@ nsDOMParser::ParseFromStream(nsIInputStream *stream, rv = cc->GetJSContext(&cx); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { rv = secMan->GetSubjectPrincipal(getter_AddRefs(principal)); if (NS_SUCCEEDED(rv)) { diff --git a/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp b/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp index 4f9df0a640b..0f574646af7 100644 --- a/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp +++ b/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp @@ -676,7 +676,7 @@ nsXMLHttpRequest::Open(const char *method, const char *url) char* password = nsnull; nsCOMPtr cc; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_SUCCEEDED(rv)) { rv = xpc->GetCurrentNativeCallContext(getter_AddRefs(cc)); } @@ -694,8 +694,8 @@ nsXMLHttpRequest::Open(const char *method, const char *url) rv = cc->GetJSContext(&cx); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; nsCOMPtr principal; @@ -717,7 +717,7 @@ nsXMLHttpRequest::Open(const char *method, const char *url) // Security check failed. The above call set a JS exception. The // following lines ensure that the exception is propagated. - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); nsCOMPtr cc; if(NS_SUCCEEDED(rv)) xpc->GetCurrentNativeCallContext(getter_AddRefs(cc)); @@ -765,10 +765,8 @@ nsXMLHttpRequest::GetStreamForWString(const PRUnichar* aStr, char* postData; // We want to encode the string as utf-8, so get the right encoder - NS_WITH_SERVICE(nsICharsetConverterManager, - charsetConv, - kCharsetConverterManagerCID, - &rv); + nsCOMPtr charsetConv = + do_GetService(kCharsetConverterManagerCID, &rv); NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); charsetStr.AssignWithConversion("UTF-8"); @@ -1023,7 +1021,7 @@ nsXMLHttpRequest::Send(nsISupports *body) if (!mAsync) { nsCOMPtr cc; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_SUCCEEDED(rv)) { rv = xpc->GetCurrentNativeCallContext(getter_AddRefs(cc)); } diff --git a/mozilla/extensions/xmlextras/soap/src/nsDefaultSOAPEncoder.cpp b/mozilla/extensions/xmlextras/soap/src/nsDefaultSOAPEncoder.cpp index 21e85c62b84..5e362b1d8a6 100644 --- a/mozilla/extensions/xmlextras/soap/src/nsDefaultSOAPEncoder.cpp +++ b/mozilla/extensions/xmlextras/soap/src/nsDefaultSOAPEncoder.cpp @@ -304,7 +304,7 @@ nsDefaultSOAPEncoder::SerializeJavaScriptArray(JSObject* arrayobj, { nsresult rv; nsCOMPtr cc; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr 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 diff --git a/mozilla/extensions/xmlextras/soap/src/nsSOAPCall.cpp b/mozilla/extensions/xmlextras/soap/src/nsSOAPCall.cpp index 3e774e976bf..78b27a8f959 100644 --- a/mozilla/extensions/xmlextras/soap/src/nsSOAPCall.cpp +++ b/mozilla/extensions/xmlextras/soap/src/nsSOAPCall.cpp @@ -598,7 +598,7 @@ NS_IMETHODIMP nsSOAPCall::SetParameters() } nsCOMPtr cc; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_SUCCEEDED(rv)) { rv = xpc->GetCurrentNativeCallContext(getter_AddRefs(cc)); } @@ -739,7 +739,7 @@ nsSOAPCall::GetScriptListener(nsISupports* aObject, nsresult rv; nsCOMPtr cc; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_SUCCEEDED(rv)) { rv = xpc->GetCurrentNativeCallContext(getter_AddRefs(cc)); } diff --git a/mozilla/extensions/xmlextras/soap/src/nsSOAPUtils.cpp b/mozilla/extensions/xmlextras/soap/src/nsSOAPUtils.cpp index 27365a0dd54..463cf5c7b89 100644 --- a/mozilla/extensions/xmlextras/soap/src/nsSOAPUtils.cpp +++ b/mozilla/extensions/xmlextras/soap/src/nsSOAPUtils.cpp @@ -159,8 +159,8 @@ nsSOAPUtils::GetSafeContext() { // Get the "safe" JSContext: our JSContext of last resort nsresult rv; - NS_WITH_SERVICE(nsIJSContextStack, stack, "@mozilla.org/js/xpc/ContextStack;1", - &rv); + nsCOMPtr stack = + do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv); if (NS_FAILED(rv)) return nsnull; nsCOMPtr tcs = do_QueryInterface(stack); @@ -176,8 +176,8 @@ nsSOAPUtils::GetCurrentContext() { // Get JSContext from stack. nsresult rv; - NS_WITH_SERVICE(nsIJSContextStack, stack, "@mozilla.org/js/xpc/ContextStack;1", - &rv); + nsCOMPtr stack = + do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv); if (NS_FAILED(rv)) return nsnull; JSContext *cx; diff --git a/mozilla/extensions/xmlterm/base/mozXMLTermFactory.cpp b/mozilla/extensions/xmlterm/base/mozXMLTermFactory.cpp index fe0447c2529..c48ee222eee 100644 --- a/mozilla/extensions/xmlterm/base/mozXMLTermFactory.cpp +++ b/mozilla/extensions/xmlterm/base/mozXMLTermFactory.cpp @@ -252,7 +252,8 @@ NSRegisterSelf(nsISupports* aServMgr , const char* aPath) nsCOMPtr servMgr(do_QueryInterface(aServMgr, &result)); if (NS_FAILED(result)) return result; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &result); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &result); if (NS_FAILED(result)) return result; printf("Registering lineterm interface\n"); @@ -285,7 +286,8 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* aPath) nsCOMPtr servMgr(do_QueryInterface(aServMgr, &result)); if (NS_FAILED(result)) return result; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &result); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &result); if (NS_FAILED(result)) return result; result = compMgr->UnregisterComponent(kLineTermCID, aPath); diff --git a/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp b/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp index 05e14f3fdbd..f9487065345 100644 --- a/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp +++ b/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp @@ -752,7 +752,7 @@ NS_IMETHODIMP mozXMLTerminal::ShowCaret(void) PRInt32 pixelWidth; nsresult result; - NS_WITH_SERVICE(nsILookAndFeel, look, kLookAndFeelCID, &result); + nsCOMPtr look(do_GetService(kLookAndFeelCID, &result)); if (NS_SUCCEEDED(result) && look) { look->GetMetric(nsILookAndFeel::eMetric_SingleLineCaretWidth, pixelWidth); @@ -791,7 +791,7 @@ NS_IMETHODIMP mozXMLTerminal::Paste() XMLT_LOG(mozXMLTerminal::Paste,20,("\n")); // Get Clipboard service - NS_WITH_SERVICE (nsIClipboard, clipboard, kCClipboardCID, &result); + nsCOMPtr clipboard(do_GetService(kCClipboardCID, &result)); if ( NS_FAILED(result) ) return result; diff --git a/mozilla/gfx/src/beos/nsDeviceContextBeOS.cpp b/mozilla/gfx/src/beos/nsDeviceContextBeOS.cpp index 5c0fed433dd..09047905d3b 100644 --- a/mozilla/gfx/src/beos/nsDeviceContextBeOS.cpp +++ b/mozilla/gfx/src/beos/nsDeviceContextBeOS.cpp @@ -107,7 +107,7 @@ NS_IMETHODIMP nsDeviceContextBeOS::Init(nsNativeWidget aNativeWidget) PRInt32 prefVal = -1; nsresult res; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (NS_SUCCEEDED(res) && prefs) { res = prefs->GetIntPref("browser.display.screen_resolution", &prefVal); if (! NS_SUCCEEDED(res)) { @@ -474,7 +474,7 @@ int nsDeviceContextBeOS::prefChanged(const char *aPref, void *aClosure) if (nsCRT::strcmp(aPref, "browser.display.screen_resolution")==0) { PRInt32 dpi; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); rv = prefs->GetIntPref(aPref, &dpi); if (NS_SUCCEEDED(rv)) context->SetDPI(dpi); diff --git a/mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp b/mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp index 277909f6f82..4437239bdb5 100644 --- a/mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp +++ b/mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp @@ -147,7 +147,7 @@ NS_IMETHODIMP nsDeviceContextGTK::Init(nsNativeWidget aNativeWidget) // If it's positive, we use it as the logical resolution nsresult res; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (NS_SUCCEEDED(res) && prefs) { res = prefs->GetIntPref("browser.display.screen_resolution", &prefVal); if (NS_FAILED(res)) { @@ -557,7 +557,7 @@ int nsDeviceContextGTK::prefChanged(const char *aPref, void *aClosure) if (nsCRT::strcmp(aPref, "browser.display.screen_resolution")==0) { PRInt32 dpi; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); rv = prefs->GetIntPref(aPref, &dpi); if (NS_SUCCEEDED(rv)) context->SetDPI(dpi); diff --git a/mozilla/gfx/src/mac/nsDeviceContextMac.cpp b/mozilla/gfx/src/mac/nsDeviceContextMac.cpp index d9cf88933b6..b22cec59f22 100644 --- a/mozilla/gfx/src/mac/nsDeviceContextMac.cpp +++ b/mozilla/gfx/src/mac/nsDeviceContextMac.cpp @@ -1040,7 +1040,7 @@ PRUint32 nsDeviceContextMac::GetScreenResolution() initialized = PR_TRUE; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { PRInt32 intVal; if (NS_SUCCEEDED(prefs->GetIntPref("browser.display.screen_resolution", &intVal))) { @@ -1066,7 +1066,7 @@ PRBool nsDeviceContextMac::DisplayVerySmallFonts() initialized = PR_TRUE; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { PRBool boolVal; if (NS_SUCCEEDED(prefs->GetBoolPref("browser.display_very_small_fonts", &boolVal))) { diff --git a/mozilla/gfx/src/mac/nsDeviceContextSpecMac.cpp b/mozilla/gfx/src/mac/nsDeviceContextSpecMac.cpp index ff61244b9cd..6b342208d44 100644 --- a/mozilla/gfx/src/mac/nsDeviceContextSpecMac.cpp +++ b/mozilla/gfx/src/mac/nsDeviceContextSpecMac.cpp @@ -344,7 +344,8 @@ PDlgInitUPP theInitProcPtr; // about to put up the dialog, so get the initial settings nsresult rv = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (printService) { gCurrOptions = printService; } else { diff --git a/mozilla/gfx/src/nsDeviceContext.cpp b/mozilla/gfx/src/nsDeviceContext.cpp index bf34afad4ea..8e5abb12d0f 100644 --- a/mozilla/gfx/src/nsDeviceContext.cpp +++ b/mozilla/gfx/src/nsDeviceContext.cpp @@ -702,14 +702,15 @@ DeviceContextImpl::GetLocalizedBundle(const char * aPropFileName, nsIStringBundl // Create a URL for the string resource file // Create a bundle for the localization - NS_WITH_SERVICE(nsIIOService, pNetService, kIOServiceCID, &rv); + nsCOMPtr pNetService(do_GetService(kIOServiceCID, &rv)); if (NS_SUCCEEDED(rv) && pNetService) { nsCOMPtr uri; rv = pNetService->NewURI(aPropFileName, nsnull, getter_AddRefs(uri)); if (NS_SUCCEEDED(rv) && uri) { // Create bundle - NS_WITH_SERVICE(nsIStringBundleService, stringService, kStringBundleServiceCID, &rv); + nsCOMPtr stringService = + do_GetService(kStringBundleServiceCID, &rv); if (NS_SUCCEEDED(rv) && stringService) { nsXPIDLCString spec; rv = uri->GetSpec(getter_Copies(spec)); diff --git a/mozilla/gfx/src/nsImageManager.cpp b/mozilla/gfx/src/nsImageManager.cpp index 393f763bc93..1a8e83df5ca 100644 --- a/mozilla/gfx/src/nsImageManager.cpp +++ b/mozilla/gfx/src/nsImageManager.cpp @@ -77,7 +77,7 @@ ImageManagerImpl::ImageManagerImpl() PRInt32 cacheSize = (1024L * 2048L); nsresult res = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (prefs) { PRInt32 tempSize; diff --git a/mozilla/gfx/src/nsImageNetContextSync.cpp b/mozilla/gfx/src/nsImageNetContextSync.cpp index eb759f2e53f..3a8df4532b7 100644 --- a/mozilla/gfx/src/nsImageNetContextSync.cpp +++ b/mozilla/gfx/src/nsImageNetContextSync.cpp @@ -196,7 +196,7 @@ ImageNetContextSyncImpl::GetURL(ilIURL* aURL, nsresult res; // Get a network service interface which we'll use to create a stream - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &res); + nsCOMPtr service(do_GetService(kIOServiceCID, &res)); if (NS_SUCCEEDED(res)) { nsIInputStream* stream = nsnull; diff --git a/mozilla/gfx/src/os2/nsDeviceContextOS2.cpp b/mozilla/gfx/src/os2/nsDeviceContextOS2.cpp index b4f2f506adc..a46f63e34a9 100644 --- a/mozilla/gfx/src/os2/nsDeviceContextOS2.cpp +++ b/mozilla/gfx/src/os2/nsDeviceContextOS2.cpp @@ -85,7 +85,7 @@ nsDeviceContextOS2 :: nsDeviceContextOS2() #ifndef XP_OS2 nsresult res = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (NS_SUCCEEDED(res)) { static PRBool roundingInitialized = PR_FALSE; if (!roundingInitialized) { diff --git a/mozilla/gfx/src/photon/nsDeviceContextPh.cpp b/mozilla/gfx/src/photon/nsDeviceContextPh.cpp index ae1b6a7f674..c664d59a3df 100644 --- a/mozilla/gfx/src/photon/nsDeviceContextPh.cpp +++ b/mozilla/gfx/src/photon/nsDeviceContextPh.cpp @@ -192,7 +192,7 @@ void nsDeviceContextPh :: CommonInit( nsNativeDeviceContext aDC ) { PRInt32 prefVal = -1; nsresult res; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if( NS_SUCCEEDED( res ) && prefs ) { res = prefs->GetIntPref("browser.display.screen_resolution", &prefVal); if( !NS_SUCCEEDED( res ) ) { @@ -520,7 +520,7 @@ int nsDeviceContextPh::prefChanged( const char *aPref, void *aClosure ) { if( nsCRT::strcmp(aPref, "browser.display.screen_resolution")==0 ) { PRInt32 dpi; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); rv = prefs->GetIntPref(aPref, &dpi); if( NS_SUCCEEDED( rv ) ) context->SetDPI( dpi ); } diff --git a/mozilla/gfx/src/photon/nsDeviceContextSpecFactoryP.cpp b/mozilla/gfx/src/photon/nsDeviceContextSpecFactoryP.cpp index 3ad3ccaf637..40e6a59a773 100644 --- a/mozilla/gfx/src/photon/nsDeviceContextSpecFactoryP.cpp +++ b/mozilla/gfx/src/photon/nsDeviceContextSpecFactoryP.cpp @@ -63,7 +63,8 @@ NS_IMETHODIMP nsDeviceContextSpecFactoryPh :: CreateDeviceContextSpec(nsIWidget NS_ENSURE_ARG_POINTER(aWidget); nsresult rv = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); nsIDeviceContextSpec *devSpec = nsnull; diff --git a/mozilla/gfx/src/photon/nsDeviceContextSpecPh.cpp b/mozilla/gfx/src/photon/nsDeviceContextSpecPh.cpp index f729e60c95a..6596aa0aa71 100644 --- a/mozilla/gfx/src/photon/nsDeviceContextSpecPh.cpp +++ b/mozilla/gfx/src/photon/nsDeviceContextSpecPh.cpp @@ -57,7 +57,8 @@ NS_IMETHODIMP nsDeviceContextSpecPh :: Init(PRBool aQuiet) if( aQuiet ) { // no dialogs - NS_WITH_SERVICE( nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); PRInt32 value; printService->GetEndPageRange( &value ); /* use SetEndPageRange/GetEndPageRange to convey the print context */ mPC = ( PpPrintContext_t * ) value; diff --git a/mozilla/gfx/src/qt/nsDeviceContextQT.cpp b/mozilla/gfx/src/qt/nsDeviceContextQT.cpp index 2a07f18027a..232a7d6fa21 100644 --- a/mozilla/gfx/src/qt/nsDeviceContextQT.cpp +++ b/mozilla/gfx/src/qt/nsDeviceContextQT.cpp @@ -127,7 +127,7 @@ NS_IMETHODIMP nsDeviceContextQT::Init(nsNativeWidget aNativeWidget) PRInt32 prefVal = -1; nsresult res; - NS_WITH_SERVICE(nsIPref,prefs,kPrefCID,&res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (NS_SUCCEEDED(res) && prefs) { res = prefs->GetIntPref("browser.display.screen_resolution",&prefVal); if (! NS_SUCCEEDED(res)) { @@ -500,7 +500,7 @@ int nsDeviceContextQT::prefChanged(const char *aPref,void *aClosure) if (nsCRT::strcmp(aPref,"browser.display.screen_resolution") == 0) { PRInt32 dpi; - NS_WITH_SERVICE(nsIPref,prefs,kPrefCID,&rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); rv = prefs->GetIntPref(aPref, &dpi); if (NS_SUCCEEDED(rv)) context->SetDPI(dpi); diff --git a/mozilla/gfx/src/qt/nsDeviceContextSpecQT.cpp b/mozilla/gfx/src/qt/nsDeviceContextSpecQT.cpp index e3861f944f9..32fd7452f93 100644 --- a/mozilla/gfx/src/qt/nsDeviceContextSpecQT.cpp +++ b/mozilla/gfx/src/qt/nsDeviceContextSpecQT.cpp @@ -122,7 +122,7 @@ NS_IMETHODIMP nsDeviceContextSpecQT::QueryInterface(REFNSIID aIID, NS_IMETHODIMP nsDeviceContextSpecQT::Init(PRBool aQuiet) { nsresult rv = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPrintOptions,printService,kPrintOptionsCID,&rv); + nsCOMPtr printService(do_GetService(kPrintOptionsCID, &rv)); // if there is a current selection then enable the "Selection" radio button if (NS_SUCCEEDED(rv) && printService) { diff --git a/mozilla/gfx/src/windows/nsDeviceContextSpecFactoryW.cpp b/mozilla/gfx/src/windows/nsDeviceContextSpecFactoryW.cpp index 3b6a51711e8..801efba0871 100644 --- a/mozilla/gfx/src/windows/nsDeviceContextSpecFactoryW.cpp +++ b/mozilla/gfx/src/windows/nsDeviceContextSpecFactoryW.cpp @@ -445,7 +445,8 @@ NS_IMETHODIMP nsDeviceContextSpecFactoryWin :: CreateDeviceContextSpec(nsIWidget NS_ENSURE_ARG_POINTER(aWidget); nsresult rv = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); gDialogWasExtended = PR_FALSE; diff --git a/mozilla/gfx/src/windows/nsDeviceContextWin.cpp b/mozilla/gfx/src/windows/nsDeviceContextWin.cpp index 6d39796ea6a..5981abdb701 100644 --- a/mozilla/gfx/src/windows/nsDeviceContextWin.cpp +++ b/mozilla/gfx/src/windows/nsDeviceContextWin.cpp @@ -64,7 +64,7 @@ nsDeviceContextWin :: nsDeviceContextWin() mCachedFullRect = PR_FALSE; nsresult res = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (NS_SUCCEEDED(res)) { static PRBool roundingInitialized = PR_FALSE; if (!roundingInitialized) { @@ -94,7 +94,7 @@ nsDeviceContextWin :: ~nsDeviceContextWin() NS_IF_RELEASE(mSpec); nsresult res = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (NS_SUCCEEDED(res)) { prefs->UnregisterCallback(nav4rounding, PrefChanged, this); } @@ -901,7 +901,7 @@ int nsDeviceContextWin :: PrefChanged(const char* aPref, void* aClosure) { nsresult res = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (NS_SUCCEEDED(res)) { prefs->GetBoolPref(nav4rounding, &gRound); nsDeviceContextWin* deviceContext = (nsDeviceContextWin*) aClosure; diff --git a/mozilla/gfx/src/xlib/nsDeviceContextXlib.cpp b/mozilla/gfx/src/xlib/nsDeviceContextXlib.cpp index e21545a4b1f..45e7b7084d8 100644 --- a/mozilla/gfx/src/xlib/nsDeviceContextXlib.cpp +++ b/mozilla/gfx/src/xlib/nsDeviceContextXlib.cpp @@ -142,7 +142,7 @@ nsDeviceContextXlib::CommonInit(void) if (!initialized) { initialized = 1; nsresult res; - NS_WITH_SERVICE(nsIPref,prefs,kPrefCID,&res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (NS_SUCCEEDED(res) && prefs) { PRInt32 intVal = 96; res = prefs->GetIntPref("browser.display.screen_resolution", &intVal); diff --git a/mozilla/htmlparser/robot/nsDebugRobot.cpp b/mozilla/htmlparser/robot/nsDebugRobot.cpp index 72cf1e343cd..573cbdf0622 100644 --- a/mozilla/htmlparser/robot/nsDebugRobot.cpp +++ b/mozilla/htmlparser/robot/nsDebugRobot.cpp @@ -242,7 +242,7 @@ extern "C" NS_EXPORT int DebugRobot( // Create url nsIURI* url; nsresult rv; - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv); + nsCOMPtr service(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsIURI *uri = nsnull; diff --git a/mozilla/htmlparser/robot/nsRobotSink.cpp b/mozilla/htmlparser/robot/nsRobotSink.cpp index 8d086e3046f..8164ffd5330 100644 --- a/mozilla/htmlparser/robot/nsRobotSink.cpp +++ b/mozilla/htmlparser/robot/nsRobotSink.cpp @@ -347,7 +347,7 @@ void RobotSink::ProcessLink(const nsString& aLink) if (nsnull != docURL) { nsIURI* absurl; nsresult rv; - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv); + nsCOMPtr service(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return; nsIURI *uri = nsnull, *baseUri = nsnull; diff --git a/mozilla/htmlparser/src/CNavDTD.cpp b/mozilla/htmlparser/src/CNavDTD.cpp index e9d1fecef29..2a2bd7cc64e 100644 --- a/mozilla/htmlparser/src/CNavDTD.cpp +++ b/mozilla/htmlparser/src/CNavDTD.cpp @@ -1565,7 +1565,8 @@ nsresult CNavDTD::HandleKeyGen(nsIParserNode* aNode) { if(aNode) { - NS_WITH_SERVICE(nsIFormProcessor, theFormProcessor, kFormProcessorCID, &result) + nsCOMPtr theFormProcessor = + do_GetService(kFormProcessorCID, &result); if(NS_SUCCEEDED(result)) { PRInt32 theAttrCount=aNode->GetAttributeCount(); diff --git a/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp b/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp index 88cf9752b7f..6ea19d913cc 100644 --- a/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp +++ b/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp @@ -222,7 +222,7 @@ nsHTMLContentSinkStream::InitEncoders() if (mStream) { nsAutoString charsetName; charsetName.Assign(mCharsetOverride); - NS_WITH_SERVICE(nsICharsetAlias, calias, kCharsetAliasCID, &res); + nsCOMPtr calias(do_GetService(kCharsetAliasCID, &res)); if (NS_SUCCEEDED(res) && calias) { nsAutoString temp; temp.Assign(mCharsetOverride); res = calias->GetPreferred(temp, charsetName); diff --git a/mozilla/htmlparser/src/nsParser.cpp b/mozilla/htmlparser/src/nsParser.cpp index dac563cc84d..ebf279b61e8 100644 --- a/mozilla/htmlparser/src/nsParser.cpp +++ b/mozilla/htmlparser/src/nsParser.cpp @@ -357,7 +357,8 @@ nsParser::nsParser(nsITokenObserver* anObserver) { nsresult rv = NS_OK; if (mEventQueue == nsnull) { // Cache the event queue of the current UI thread - NS_WITH_SERVICE(nsIEventQueueService, eventService, kEventQueueServiceCID, &rv); + nsCOMPtr eventService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv) && (eventService)) { // XXX this implies that the UI is the current thread. rv = eventService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(mEventQueue)); } diff --git a/mozilla/htmlparser/src/nsScanner.cpp b/mozilla/htmlparser/src/nsScanner.cpp index 1d21666be98..e573a1463b5 100644 --- a/mozilla/htmlparser/src/nsScanner.cpp +++ b/mozilla/htmlparser/src/nsScanner.cpp @@ -153,7 +153,7 @@ nsresult nsScanner::SetDocumentCharset(const nsString& aCharset , nsCharsetSourc if( aSource < mCharsetSource) // priority is lower the the current one , just return res; - NS_WITH_SERVICE(nsICharsetAlias, calias, kCharsetAliasCID, &res); + nsCOMPtr calias(do_GetService(kCharsetAliasCID, &res)); NS_ASSERTION( nsnull != calias, "cannot find charset alias"); nsAutoString charsetName; charsetName.Assign(aCharset); if( NS_SUCCEEDED(res) && (nsnull != calias)) @@ -175,7 +175,8 @@ nsresult nsScanner::SetDocumentCharset(const nsString& aCharset , nsCharsetSourc mCharset = charsetName; mCharsetSource = aSource; - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &res); if(NS_SUCCEEDED(res) && (nsnull != ccm)) { nsIUnicodeDecoder * decoder = nsnull; diff --git a/mozilla/htmlparser/tests/grabpage/grabpage.cpp b/mozilla/htmlparser/tests/grabpage/grabpage.cpp index 07a224ece41..2f6e23d09a8 100644 --- a/mozilla/htmlparser/tests/grabpage/grabpage.cpp +++ b/mozilla/htmlparser/tests/grabpage/grabpage.cpp @@ -224,7 +224,7 @@ PageGrabber::Grab(const nsString& aURL) nsIURI* url = NULL; nsresult rv; - rv = NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + rv = nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsIChannel *channel = nsnull; diff --git a/mozilla/intl/chardet/src/nsMetaCharsetObserver.cpp b/mozilla/intl/chardet/src/nsMetaCharsetObserver.cpp index 710e6f9866b..06819322ee1 100644 --- a/mozilla/intl/chardet/src/nsMetaCharsetObserver.cpp +++ b/mozilla/intl/chardet/src/nsMetaCharsetObserver.cpp @@ -45,7 +45,7 @@ nsMetaCharsetObserver::nsMetaCharsetObserver() bMetaCharsetObserverStarted = PR_FALSE; nsresult res; mAlias = nsnull; - NS_WITH_SERVICE(nsICharsetAlias, calias, kCharsetAliasCID, &res); + nsCOMPtr calias(do_GetService(kCharsetAliasCID, &res)); if(NS_SUCCEEDED(res)) { mAlias = calias; } @@ -341,7 +341,8 @@ NS_IMETHODIMP nsMetaCharsetObserver::Start() bMetaCharsetObserverStarted = PR_TRUE; // get the observer service - NS_WITH_SERVICE(nsIObserverService, anObserverService, NS_OBSERVERSERVICE_CONTRACTID, &res); + nsCOMPtr anObserverService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &res); if (NS_FAILED(res)) return res; nsAutoString htmlTopic; htmlTopic.AssignWithConversion(kHTMLTextContentType); @@ -359,7 +360,8 @@ NS_IMETHODIMP nsMetaCharsetObserver::End() if (bMetaCharsetObserverStarted == PR_TRUE) { bMetaCharsetObserverStarted = PR_FALSE; - NS_WITH_SERVICE(nsIObserverService, anObserverService, NS_OBSERVERSERVICE_CONTRACTID, &res); + nsCOMPtr anObserverService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &res); if (NS_FAILED(res)) return res; nsAutoString htmlTopic; htmlTopic.AssignWithConversion(kHTMLTextContentType); diff --git a/mozilla/intl/locale/src/mac/nsCollationMac.cpp b/mozilla/intl/locale/src/mac/nsCollationMac.cpp index 78dae208425..06230aaa5d3 100644 --- a/mozilla/intl/locale/src/mac/nsCollationMac.cpp +++ b/mozilla/intl/locale/src/mac/nsCollationMac.cpp @@ -149,7 +149,8 @@ nsresult nsCollationMac::Initialize(nsILocale* locale) // get locale string, use app default if no locale specified if (locale == nsnull) { - NS_WITH_SERVICE(nsILocaleService, localeService, kLocaleServiceCID, &res); + nsCOMPtr localeService = + do_GetService(kLocaleServiceCID, &res); if (NS_SUCCEEDED(res)) { nsILocale *appLocale; res = localeService->GetApplicationLocale(&appLocale); diff --git a/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.cpp b/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.cpp index ec2ed1e70b8..3711073ac8e 100644 --- a/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.cpp +++ b/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.cpp @@ -253,7 +253,8 @@ nsresult nsDateTimeFormatMac::Initialize(nsILocale* locale) // get application locale - NS_WITH_SERVICE(nsILocaleService, localeService, kLocaleServiceCID, &res); + nsCOMPtr localeService = + do_GetService(kLocaleServiceCID, &res); if (NS_SUCCEEDED(res)) { nsILocale *appLocale; res = localeService->GetApplicationLocale(&appLocale); diff --git a/mozilla/intl/locale/src/nsScriptableDateFormat.cpp b/mozilla/intl/locale/src/nsScriptableDateFormat.cpp index b1d7ecdc70a..7926df2a979 100644 --- a/mozilla/intl/locale/src/nsScriptableDateFormat.cpp +++ b/mozilla/intl/locale/src/nsScriptableDateFormat.cpp @@ -94,7 +94,8 @@ NS_IMETHODIMP nsScriptableDateFormat::FormatDateTime( // get locale service - NS_WITH_SERVICE(nsILocaleService, localeService, kLocaleServiceCID, &rv); + nsCOMPtr localeService = + do_GetService(kLocaleServiceCID, &rv); if (NS_SUCCEEDED(rv)) { rv = localeName.Length() ? localeService->NewLocale(localeName.get(), &aLocale) : localeService->GetApplicationLocale(&aLocale); diff --git a/mozilla/intl/locale/src/os2/nsCollationOS2.cpp b/mozilla/intl/locale/src/os2/nsCollationOS2.cpp index f14543ff028..2af5283b597 100644 --- a/mozilla/intl/locale/src/os2/nsCollationOS2.cpp +++ b/mozilla/intl/locale/src/os2/nsCollationOS2.cpp @@ -93,7 +93,8 @@ nsresult nsCollationOS2::Initialize(nsILocale *locale) // get locale string, use app default if no locale specified if (locale == nsnull) { - NS_WITH_SERVICE(nsILocaleService, localeService, kLocaleServiceCID, &res); + nsCOMPtr localeService = + do_GetService(kLocaleServiceCID, &res); if (NS_SUCCEEDED(res)) { nsILocale *appLocale; res = localeService->GetApplicationLocale(&appLocale); diff --git a/mozilla/intl/locale/src/unix/nsCollationUnix.cpp b/mozilla/intl/locale/src/unix/nsCollationUnix.cpp index e958339c70e..99b6ce7b7bf 100644 --- a/mozilla/intl/locale/src/unix/nsCollationUnix.cpp +++ b/mozilla/intl/locale/src/unix/nsCollationUnix.cpp @@ -109,7 +109,8 @@ nsresult nsCollationUnix::Initialize(nsILocale* locale) // get locale string, use app default if no locale specified if (locale == nsnull) { - NS_WITH_SERVICE(nsILocaleService, localeService, kLocaleServiceCID, &res); + nsCOMPtr localeService = + do_GetService(kLocaleServiceCID, &res); if (NS_SUCCEEDED(res)) { nsILocale *appLocale; res = localeService->GetApplicationLocale(&appLocale); diff --git a/mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp b/mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp index e465862b789..8cfcd9787bd 100644 --- a/mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp +++ b/mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp @@ -71,7 +71,8 @@ nsresult nsDateTimeFormatUnix::Initialize(nsILocale* locale) // get locale name string, use app default if no locale specified if (NULL == locale) { - NS_WITH_SERVICE(nsILocaleService, localeService, kLocaleServiceCID, &res); + nsCOMPtr localeService = + do_GetService(kLocaleServiceCID, &res); if (NS_SUCCEEDED(res)) { nsILocale *appLocale; res = localeService->GetApplicationLocale(&appLocale); diff --git a/mozilla/intl/locale/src/windows/nsCollationWin.cpp b/mozilla/intl/locale/src/windows/nsCollationWin.cpp index e2a48e832d7..68884c62452 100644 --- a/mozilla/intl/locale/src/windows/nsCollationWin.cpp +++ b/mozilla/intl/locale/src/windows/nsCollationWin.cpp @@ -89,7 +89,8 @@ nsresult nsCollationWin::Initialize(nsILocale* locale) // get locale string, use app default if no locale specified if (locale == nsnull) { - NS_WITH_SERVICE(nsILocaleService, localeService, kLocaleServiceCID, &res); + nsCOMPtr localeService = + do_GetService(kLocaleServiceCID, &res); if (NS_SUCCEEDED(res)) { nsILocale *appLocale; res = localeService->GetApplicationLocale(&appLocale); diff --git a/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.cpp b/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.cpp index 2c193f875f0..4c2e235b1c5 100644 --- a/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.cpp +++ b/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.cpp @@ -83,7 +83,8 @@ nsresult nsDateTimeFormatWin::Initialize(nsILocale* locale) // get locale string, use app default if no locale specified if (NULL == locale) { - NS_WITH_SERVICE(nsILocaleService, localeService, kLocaleServiceCID, &res); + nsCOMPtr localeService = + do_GetService(kLocaleServiceCID, &res); if (NS_SUCCEEDED(res)) { nsILocale *appLocale; res = localeService->GetApplicationLocale(&appLocale); diff --git a/mozilla/intl/strres/src/nsAcceptLang.cpp b/mozilla/intl/strres/src/nsAcceptLang.cpp index 86172923dd1..e2beb843be3 100644 --- a/mozilla/intl/strres/src/nsAcceptLang.cpp +++ b/mozilla/intl/strres/src/nsAcceptLang.cpp @@ -79,7 +79,8 @@ nsAcceptLang::GetAcceptLangFromLocale(const PRUnichar *aLocale, PRUnichar **_ret nsresult res; - NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res); + nsCOMPtr sBundleService = + do_GetService(kStringBundleServiceCID, &res); if (NS_FAILED(res) || (nsnull == sBundleService)) { return NS_ERROR_FAILURE; } @@ -173,7 +174,8 @@ nsAcceptLang::GetLocaleFromAcceptLang(const PRUnichar *aName, PRUnichar **_retva } /* lang only */ - NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res); + nsCOMPtr sBundleService = + do_GetService(kStringBundleServiceCID, &res); if (NS_FAILED(res) || (nsnull == sBundleService)) { #ifdef DEBUG printf("\n** nsAcceptLang::GetLocaleFromAcceptLang: failed to get nsIStringBundleService!! **\n"); diff --git a/mozilla/intl/uconv/public/nsICharsetConverterManager.h b/mozilla/intl/uconv/public/nsICharsetConverterManager.h index a64e6aedc43..7b1b835ee6d 100644 --- a/mozilla/intl/uconv/public/nsICharsetConverterManager.h +++ b/mozilla/intl/uconv/public/nsICharsetConverterManager.h @@ -72,7 +72,8 @@ nsUConverterRegSelf( const char* aFromCharset, \ nsRegistryKey key; \ char buff[1024]; \ PRBool isOpen = PR_FALSE; \ - NS_WITH_SERVICE( nsIRegistry, registry, NS_REGISTRY_CONTRACTID, &res); \ + nsCOMPtr registry = \ + do_GetService(NS_REGISTRY_CONTRACTID, &res); \ if (NS_FAILED(res)) \ goto done; \ res = registry->IsOpen(&isOpen); \ diff --git a/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp b/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp index 0f1728a662a..a748c7093a0 100644 --- a/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp +++ b/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp @@ -188,7 +188,7 @@ nsresult nsCharsetConverterManager::RegisterConverterManagerData() { nsresult res = NS_OK; - NS_WITH_SERVICE(nsIRegistry, registry, kRegistryCID, &res); + nsCOMPtr registry(do_GetService(kRegistryCID, &res)); if (NS_FAILED(res)) return res; // open registry if necessary @@ -251,7 +251,8 @@ nsresult nsCharsetConverterManager::LoadExtensibleBundle( { nsresult res = NS_OK; - NS_WITH_SERVICE(nsIStringBundleService, sbServ, kStringBundleServiceCID, &res); + nsCOMPtr sbServ = + do_GetService(kStringBundleServiceCID, &res); if (NS_FAILED(res)) return res; res = sbServ->CreateExtensibleBundle(aRegistryKey, aResult); @@ -309,7 +310,7 @@ nsresult nsCharsetConverterManager::GetRegistryEnumeration( if (NS_FAILED(res)) return res; // get the registry - NS_WITH_SERVICE(nsIRegistry, registry, kRegistryCID, &res); + nsCOMPtr registry(do_GetService(kRegistryCID, &res)); if (NS_FAILED(res)) return res; // open registry if necessary @@ -381,7 +382,7 @@ nsresult nsCharsetConverterManager::GetRegistryEnumeration2( if (NS_FAILED(res)) return res; // get the registry - NS_WITH_SERVICE(nsIRegistry, registry, kRegistryCID, &res); + nsCOMPtr registry(do_GetService(kRegistryCID, &res)); if (NS_FAILED(res)) return res; // open registry if necessary @@ -624,7 +625,7 @@ NS_IMETHODIMP nsCharsetConverterManager::GetCharsetAtom( // We try to obtain the preferred name for this charset from the charset // aliases. If we don't get it from there, we just use the original string nsAutoString charset(aCharset); - NS_WITH_SERVICE(nsICharsetAlias, csAlias, kCharsetAliasCID, &res); + nsCOMPtr csAlias(do_GetService(kCharsetAliasCID, &res)); NS_ASSERTION(NS_SUCCEEDED(res), "failed to get the CharsetAlias service"); if (NS_SUCCEEDED(res)) { nsAutoString pref; diff --git a/mozilla/intl/uconv/src/nsCharsetMenu.cpp b/mozilla/intl/uconv/src/nsCharsetMenu.cpp index 90d20e99f57..caf678b35d5 100644 --- a/mozilla/intl/uconv/src/nsCharsetMenu.cpp +++ b/mozilla/intl/uconv/src/nsCharsetMenu.cpp @@ -1530,7 +1530,8 @@ nsresult nsCharsetMenu::GetCollation(nsICollation ** aCollation) nsCOMPtr locale = nsnull; nsICollationFactory * collationFactory = nsnull; - NS_WITH_SERVICE(nsILocaleService, localeServ, kLocaleServiceCID, &res); + nsCOMPtr localeServ = + do_GetService(kLocaleServiceCID, &res); if (NS_FAILED(res)) return res; res = localeServ->GetApplicationLocale(getter_AddRefs(locale)); diff --git a/mozilla/intl/uconv/src/nsTextToSubURI.cpp b/mozilla/intl/uconv/src/nsTextToSubURI.cpp index 7479b1908dc..da6b9257c8d 100644 --- a/mozilla/intl/uconv/src/nsTextToSubURI.cpp +++ b/mozilla/intl/uconv/src/nsTextToSubURI.cpp @@ -118,7 +118,8 @@ NS_IMETHODIMP nsTextToSubURI::UnEscapeAndConvert( NS_ASSERTION(unescaped, "nsUnescape returned null"); // Convert from the charset to unicode - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { nsAutoString charsetStr; charsetStr.AssignWithConversion(charset); nsIUnicodeDecoder *decoder; diff --git a/mozilla/intl/uconv/tests/TestUConv.cpp b/mozilla/intl/uconv/tests/TestUConv.cpp index fba3628b3cc..a38063c1dfc 100644 --- a/mozilla/intl/uconv/tests/TestUConv.cpp +++ b/mozilla/intl/uconv/tests/TestUConv.cpp @@ -222,7 +222,8 @@ nsresult nsTestUConv::TestCharsetManager() const PRUnichar * name; nsCOMPtr csAtom; - NS_WITH_SERVICE(nsICharsetConverterManager2, ccMan, kCharsetConverterManagerCID, &res); + nsCOMPtr ccMan = + do_GetService(kCharsetConverterManagerCID, &res); if (NS_FAILED(res)) { mLog.PrintError("NS_WITH_SERVICE", res); return res; @@ -273,7 +274,8 @@ nsresult nsTestUConv::DisplayDetectors() mLog.AddTrace(trace); nsresult res = NS_OK; - NS_WITH_SERVICE(nsICharsetConverterManager2, ccMan, kCharsetConverterManagerCID, &res); + nsCOMPtr ccMan = + do_GetService(kCharsetConverterManagerCID, &res); if (NS_FAILED(res)) { mLog.PrintError("NS_WITH_SERVICE", res); return res; @@ -338,7 +340,8 @@ nsresult nsTestUConv::DisplayCharsets() mLog.AddTrace(trace); nsresult res = NS_OK; - NS_WITH_SERVICE(nsICharsetConverterManager2, ccMan, kCharsetConverterManagerCID, &res); + nsCOMPtr ccMan = + do_GetService(kCharsetConverterManagerCID, &res); if (NS_FAILED(res)) { mLog.PrintError("NS_WITH_SERVICE", res); return res; @@ -469,7 +472,8 @@ nsresult nsTestUConv::Encode(PRUnichar ** aSrc, PRUnichar * aSrcEnd, mLog.AddTrace(trace); nsresult res = NS_OK; - NS_WITH_SERVICE(nsICharsetConverterManager, ccMan, kCharsetConverterManagerCID, &res); + nsCOMPtr ccMan = + do_GetService(kCharsetConverterManagerCID, &res); if (NS_FAILED(res)) { mLog.PrintError("NS_WITH_SERVICE", res); return res; diff --git a/mozilla/intl/uconv/ucvja/nsJapaneseToUnicode.cpp b/mozilla/intl/uconv/ucvja/nsJapaneseToUnicode.cpp index b2eda3f8415..5e3d0a2062e 100644 --- a/mozilla/intl/uconv/ucvja/nsJapaneseToUnicode.cpp +++ b/mozilla/intl/uconv/ucvja/nsJapaneseToUnicode.cpp @@ -738,8 +738,8 @@ NS_IMETHODIMP nsISO2022JPToUnicodeV2::Convert( // creating a delegate converter (GB2312) nsresult rv; nsString tmpCharset; - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, - kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (!NS_FAILED(rv)) { tmpCharset.AssignWithConversion("GB2312"); rv = ccm->GetUnicodeDecoder(&tmpCharset, &mGB2312Decoder); @@ -792,8 +792,8 @@ NS_IMETHODIMP nsISO2022JPToUnicodeV2::Convert( // creating a delegate converter (EUC-KR) nsresult rv; nsString tmpCharset; - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, - kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (!NS_FAILED(rv)) { tmpCharset.AssignWithConversion("EUC-KR"); rv = ccm->GetUnicodeDecoder(&tmpCharset, &mEUCKRDecoder); @@ -865,8 +865,8 @@ NS_IMETHODIMP nsISO2022JPToUnicodeV2::Convert( // creating a delegate converter (ISO-8859-7) nsresult rv; nsString tmpCharset; - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, - kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (!NS_FAILED(rv)) { tmpCharset.AssignWithConversion("ISO-8859-7"); rv = ccm->GetUnicodeDecoder(&tmpCharset, &mISO88597Decoder); diff --git a/mozilla/intl/unicharutil/src/nsSaveAsCharset.cpp b/mozilla/intl/unicharutil/src/nsSaveAsCharset.cpp index 8789aea4717..415b6944f26 100644 --- a/mozilla/intl/unicharutil/src/nsSaveAsCharset.cpp +++ b/mozilla/intl/unicharutil/src/nsSaveAsCharset.cpp @@ -75,7 +75,8 @@ nsSaveAsCharset::Init(const char *charset, PRUint32 attr, PRUint32 entityVersion mEntityVersion = entityVersion; // set up unicode encoder - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_FAILED(rv)) return rv; rv = ccm->GetUnicodeEncoder(&aCharset, &mEncoder); diff --git a/mozilla/js/src/xpconnect/sample/xpcsample1.cpp b/mozilla/js/src/xpconnect/sample/xpcsample1.cpp index 22957df1d98..9df88ed91fd 100644 --- a/mozilla/js/src/xpconnect/sample/xpcsample1.cpp +++ b/mozilla/js/src/xpconnect/sample/xpcsample1.cpp @@ -238,7 +238,7 @@ nsXPCSample_HookerUpper::CreateSampleObjectAtGlobalScope(const char *name, PRInt // get the xpconnect service nsresult rv; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_FAILED(rv)) return NS_ERROR_FAILURE; diff --git a/mozilla/js/src/xpconnect/src/nsXPConnect.cpp b/mozilla/js/src/xpconnect/src/nsXPConnect.cpp index 22c8afe9260..348bf9c3629 100644 --- a/mozilla/js/src/xpconnect/src/nsXPConnect.cpp +++ b/mozilla/js/src/xpconnect/src/nsXPConnect.cpp @@ -312,7 +312,8 @@ nsXPConnect::CreateRuntime() { NS_ASSERTION(!mRuntime,"CreateRuntime called but mRuntime already init'd"); nsresult rv; - NS_WITH_SERVICE(nsIJSRuntimeService, rtsvc, XPC_RUNTIME_CONTRACTID, &rv); + nsCOMPtr rtsvc = + do_GetService(XPC_RUNTIME_CONTRACTID, &rv); if(NS_SUCCEEDED(rv) && rtsvc) { mRuntime = XPCJSRuntime::newXPCJSRuntime(this, rtsvc); @@ -1058,7 +1059,8 @@ nsXPConnect::DebugDumpJSStack(PRBool showArgs, #ifdef DEBUG JSContext* cx; nsresult rv; - NS_WITH_SERVICE(nsIThreadJSContextStack, stack, XPC_CONTEXT_STACK_CONTRACTID, &rv); + nsCOMPtr stack = + do_GetService(XPC_CONTEXT_STACK_CONTRACTID, &rv); if(NS_FAILED(rv) || !stack) printf("failed to get nsIThreadJSContextStack service!\n"); else if(NS_FAILED(stack->Peek(&cx))) @@ -1078,7 +1080,8 @@ nsXPConnect::DebugDumpEvalInJSStackFrame(PRUint32 aFrameNumber, const char *aSou #ifdef DEBUG JSContext* cx; nsresult rv; - NS_WITH_SERVICE(nsIThreadJSContextStack, stack, XPC_CONTEXT_STACK_CONTRACTID, &rv); + nsCOMPtr stack = + do_GetService(XPC_CONTEXT_STACK_CONTRACTID, &rv); if(NS_FAILED(rv) || !stack) printf("failed to get nsIThreadJSContextStack service!\n"); else if(NS_FAILED(stack->Peek(&cx))) @@ -1097,7 +1100,7 @@ JS_BEGIN_EXTERN_C void DumpJSStack() { nsresult rv; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_SUCCEEDED(rv) && xpc) xpc->DebugDumpJSStack(PR_TRUE, PR_TRUE, PR_FALSE); else @@ -1107,7 +1110,7 @@ void DumpJSStack() void DumpJSEval(PRUint32 frameno, const char* text) { nsresult rv; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_SUCCEEDED(rv) && xpc) xpc->DebugDumpEvalInJSStackFrame(frameno, text); else diff --git a/mozilla/js/src/xpconnect/tests/TestXPC.cpp b/mozilla/js/src/xpconnect/tests/TestXPC.cpp index 1498cc89075..0b92f62a36b 100644 --- a/mozilla/js/src/xpconnect/tests/TestXPC.cpp +++ b/mozilla/js/src/xpconnect/tests/TestXPC.cpp @@ -509,7 +509,8 @@ TestThreadJSContextStack(JSContext* jscontext) printf("ThreadJSContextStack tests...\n"); nsresult rv; - NS_WITH_SERVICE(nsIJSContextStack, stack, "@mozilla.org/js/xpc/ContextStack;1", &rv); + nsCOMPtr stack = + do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv); if(NS_SUCCEEDED(rv)) { @@ -564,7 +565,7 @@ TestThreadJSContextStack(JSContext* jscontext) static void ShowXPCException() { nsresult rv; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_SUCCEEDED(rv) && xpc) { nsCOMPtr e; @@ -619,7 +620,8 @@ static void TestCategoryManmager() printf("\n"); nsresult rv; - NS_WITH_SERVICE(nsICategoryManager, catman, "@mozilla.org/categorymanager;1", &rv); + nsCOMPtr catman = + do_GetService("@mozilla.org/categorymanager;1", &rv); if(NS_SUCCEEDED(rv) && catman) { printf("got category manager\n"); @@ -678,7 +680,8 @@ int main() SetupRegistry(); // get the JSRuntime from the runtime svc, if possible - NS_WITH_SERVICE(nsIJSRuntimeService, rtsvc, "@mozilla.org/js/xpc/RuntimeService;1", &rv); + nsCOMPtr rtsvc = + do_GetService("@mozilla.org/js/xpc/RuntimeService;1", &rv); if(NS_FAILED(rv) || NS_FAILED(rtsvc->GetRuntime(&rt)) || !rt) DIE("FAILED to get a JSRuntime"); @@ -688,11 +691,12 @@ int main() JS_SetErrorReporter(jscontext, my_ErrorReporter); - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(!xpc) DIE("FAILED to get xpconnect service\n"); - NS_WITH_SERVICE(nsIJSContextStack, cxstack, "@mozilla.org/js/xpc/ContextStack;1", &rv); + nsCOMPtr cxstack = + do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv); if(NS_FAILED(rv)) DIE("FAILED to get the nsThreadJSContextStack service!\n"); diff --git a/mozilla/js/src/xpconnect/tests/components/xpctest_echo.cpp b/mozilla/js/src/xpconnect/tests/components/xpctest_echo.cpp index 097cc2b73ab..4b4d544f280 100644 --- a/mozilla/js/src/xpconnect/tests/components/xpctest_echo.cpp +++ b/mozilla/js/src/xpconnect/tests/components/xpctest_echo.cpp @@ -273,7 +273,7 @@ xpctestEcho::GetStack(nsIStackFrame **_retval) return NS_ERROR_NULL_POINTER; nsresult rv; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_SUCCEEDED(rv)) { nsIStackFrame* jsstack; @@ -337,7 +337,7 @@ NS_IMETHODIMP xpctestEcho::DebugDumpJSStack() { nsresult rv; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_SUCCEEDED(rv)) { rv = xpc->DebugDumpJSStack(JS_TRUE, JS_TRUE, JS_TRUE); @@ -378,7 +378,7 @@ xpctestEcho::SetAString(const char * aAString) #define GET_CALL_CONTEXT \ nsresult rv; \ nsCOMPtr cc; \ - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); \ + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); \ if(NS_SUCCEEDED(rv)) \ rv = xpc->GetCurrentNativeCallContext(getter_AddRefs(cc)) /* no ';' */ diff --git a/mozilla/js/src/xpconnect/tools/src/nsXPCToolsCompiler.cpp b/mozilla/js/src/xpconnect/tools/src/nsXPCToolsCompiler.cpp index 33d7502f42e..98e283af774 100644 --- a/mozilla/js/src/xpconnect/tools/src/nsXPCToolsCompiler.cpp +++ b/mozilla/js/src/xpconnect/tools/src/nsXPCToolsCompiler.cpp @@ -83,7 +83,7 @@ NS_IMETHODIMP nsXPCToolsCompiler::CompileFile(nsILocalFile *aFile, PRBool strict // get the xpconnect service nsresult rv; - NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv); + nsCOMPtr xpc(do_GetService(nsIXPConnect::GetCID(), &rv)); if(NS_FAILED(rv)) return NS_ERROR_FAILURE; diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index 40deca6f626..c35db34b499 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -3417,7 +3417,8 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsIPresShell* aPresShell, if (!display->mBinding.IsEmpty()) { // Get the XBL loader. nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if (!xblService) return rv; @@ -7226,7 +7227,8 @@ nsCSSFrameConstructor::ConstructFrameInternal( nsIPresShell* aPresShe if (!display->mBinding.IsEmpty()) { // Get the XBL loader. nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if (!xblService) return rv; diff --git a/mozilla/layout/base/nsDocumentViewer.cpp b/mozilla/layout/base/nsDocumentViewer.cpp index 06cbb966a8d..693f4d9a715 100644 --- a/mozilla/layout/base/nsDocumentViewer.cpp +++ b/mozilla/layout/base/nsDocumentViewer.cpp @@ -2164,7 +2164,8 @@ DocumentViewerImpl::PrintPage(nsIPresContext* aPresContext, PRINT_DEBUG_MSG3("------ In DV::PrintPage PO: %p (%s)\n", aPO, gFrameTypesStr[aPO->mFrameType]); nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv) && printService) { PRBool isCancelled; printService->GetIsCancelled(&isCancelled); @@ -2445,7 +2446,8 @@ void DocumentViewerImpl::CalcPageFrameLocation(nsIPresShell * aPresShell, // The PageFrame or Seq frame has the margins set // these need to be removed nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv) && printService) { nsMargin margin(0,0,0,0); printService->GetMarginInTwips(margin); @@ -2791,7 +2793,8 @@ DocumentViewerImpl::ReflowPrintObject(PrintObject * aPO) // put it keeps it from page breaking in the middle of your print of the selection // (see also nsSimplePageSequence.cpp) PRInt16 printRangeType = nsIPrintOptions::kRangeAllPages; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv)) { printService->GetPrintRange(&printRangeType); } @@ -3011,7 +3014,8 @@ DocumentViewerImpl::EnablePOsForPrinting() mPrt->mSelectedPO = nsnull; nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_FAILED(rv)) { return rv; } @@ -3325,7 +3329,8 @@ DocumentViewerImpl::DoPrint(PrintObject * aPO, PRBool aDoSyncPrinting, PRBool& a PRInt16 printRangeType = nsIPrintOptions::kRangeAllPages; nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv) && printService) { printService->GetPrintRange(&printRangeType); } @@ -3692,7 +3697,8 @@ void DocumentViewerImpl::Notify(nsIImageGroup *aImageGroup, nsCOMPtr eventQ; // Get the event queue of the current thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueService, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueService, &rv); if (NS_FAILED(rv)) return; rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, @@ -3791,7 +3797,8 @@ DocumentViewerImpl::CreateStyleSet(nsIDocument* aDocument, } } - NS_WITH_SERVICE(nsIChromeRegistry, chromeRegistry, "@mozilla.org/chrome/chrome-registry;1", &rv); + nsCOMPtr chromeRegistry = + do_GetService("@mozilla.org/chrome/chrome-registry;1", &rv); if (NS_SUCCEEDED(rv) && chromeRegistry) { nsCOMPtr sheets; @@ -4394,7 +4401,8 @@ nsresult rv; // Setup print options for UI rv = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv) && printService) { if (mPrt->mIsParentAFrameSet) { if (mPrt->mCurrentFocusWin) { diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp index 3499d301728..1348adcf80d 100644 --- a/mozilla/layout/base/nsPresShell.cpp +++ b/mozilla/layout/base/nsPresShell.cpp @@ -1567,7 +1567,8 @@ PresShell::Init(nsIDocument* aDocument, } // Cache the event queue of the current UI thread - NS_WITH_SERVICE(nsIEventQueueService, eventService, kEventQueueServiceCID, &result); + nsCOMPtr eventService = + do_GetService(kEventQueueServiceCID, &result); if (NS_SUCCEEDED(result)) // XXX this implies that the UI is the current thread. result = eventService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(mEventQueue)); @@ -1578,7 +1579,7 @@ PresShell::Init(nsIDocument* aDocument, gAsyncReflowDuringDocLoad = PR_TRUE; // Get the prefs service - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &result)); if (NS_SUCCEEDED(result)) { prefs->GetIntPref("layout.reflow.timeslice", &gMaxRCProcessingTime); prefs->GetBoolPref("layout.reflow.async.duringDocLoad", &gAsyncReflowDuringDocLoad); @@ -1603,7 +1604,7 @@ PresShell::Init(nsIDocument* aDocument, #ifdef MOZ_REFLOW_PERF // Get the prefs service - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &result)); if (NS_SUCCEEDED(result)) { if (mReflowCountMgr != nsnull) { PRBool paintFrameCounts = PR_FALSE; diff --git a/mozilla/layout/base/src/nsCopySupport.cpp b/mozilla/layout/base/src/nsCopySupport.cpp index f5a14edbb33..9c08f4715dc 100644 --- a/mozilla/layout/base/src/nsCopySupport.cpp +++ b/mozilla/layout/base/src/nsCopySupport.cpp @@ -162,7 +162,7 @@ nsresult nsCopySupport::HTMLCopy(nsISelection *aSel, nsIDocument *aDoc, PRInt16 #endif // IBMBIDI // Get the Clipboard - NS_WITH_SERVICE(nsIClipboard, clipboard, kCClipboardCID, &rv); + nsCOMPtr clipboard(do_GetService(kCClipboardCID, &rv)); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/layout/base/src/nsPrintPreviewContext.cpp b/mozilla/layout/base/src/nsPrintPreviewContext.cpp index 7c806a1c37e..58b1f089201 100644 --- a/mozilla/layout/base/src/nsPrintPreviewContext.cpp +++ b/mozilla/layout/base/src/nsPrintPreviewContext.cpp @@ -101,7 +101,8 @@ PrintPreviewContext::GetPageDim(nsRect* aActualRect, nsRect* aAdjRect) // XXX maybe we get the size of the default printer instead nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); // Setting what would be the "default" case here, because // getting the PrintService could fail aActualRect->width = (nscoord) NS_INCHES_TO_TWIPS(8.5); diff --git a/mozilla/layout/forms/nsFormControlHelper.cpp b/mozilla/layout/forms/nsFormControlHelper.cpp index 09dce905d30..fc9b42c0a0e 100644 --- a/mozilla/layout/forms/nsFormControlHelper.cpp +++ b/mozilla/layout/forms/nsFormControlHelper.cpp @@ -885,14 +885,15 @@ nsFormControlHelper::GetLocalizedString(const char * aPropFileName, const char* // Create a URL for the string resource file // Create a bundle for the localization - NS_WITH_SERVICE(nsIIOService, pNetService, kIOServiceCID, &rv); + nsCOMPtr pNetService(do_GetService(kIOServiceCID, &rv)); if (NS_SUCCEEDED(rv) && pNetService) { nsCOMPtr uri; rv = pNetService->NewURI(aPropFileName, nsnull, getter_AddRefs(uri)); if (NS_SUCCEEDED(rv) && uri) { // Create bundle - NS_WITH_SERVICE(nsIStringBundleService, stringService, kStringBundleServiceCID, &rv); + nsCOMPtr stringService = + do_GetService(kStringBundleServiceCID, &rv); if (NS_SUCCEEDED(rv) && stringService) { nsXPIDLCString spec; rv = uri->GetSpec(getter_Copies(spec)); diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index d9e2b0d5601..1ba09b01c5f 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -827,7 +827,8 @@ nsFrame::HandleEvent(nsIPresContext* aPresContext, // if(content) { //nsCOMPtr node = do_QueryInterface(content); nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIAccessibilityService, accService, "@mozilla.org/accessibilityService;1", &rv); + nsCOMPtr accService = + do_GetService("@mozilla.org/accessibilityService;1", &rv); if (accService) { // get an accessible for the dom node nsISupports* f = (nsISupports*)(nsIFrame*)this; diff --git a/mozilla/layout/generic/nsFrameFrame.cpp b/mozilla/layout/generic/nsFrameFrame.cpp index 91925347755..80f2d7f73f0 100644 --- a/mozilla/layout/generic/nsFrameFrame.cpp +++ b/mozilla/layout/generic/nsFrameFrame.cpp @@ -1190,8 +1190,8 @@ nsHTMLFrameInnerFrame::DoLoadURL(nsIPresContext* aPresContext) NS_NewURI(getter_AddRefs(uri), absURL, nsnull); // Check for security - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); // Get base URL diff --git a/mozilla/layout/generic/nsGfxScrollFrame.cpp b/mozilla/layout/generic/nsGfxScrollFrame.cpp index 35b26d82003..0cf3f261612 100644 --- a/mozilla/layout/generic/nsGfxScrollFrame.cpp +++ b/mozilla/layout/generic/nsGfxScrollFrame.cpp @@ -396,10 +396,8 @@ nsGfxScrollFrame::CreateAnonymousContent(nsIPresContext* aPresContext, // create horzontal scrollbar nsresult rv; - NS_WITH_SERVICE(nsIElementFactory, elementFactory, - NS_ELEMENT_FACTORY_CONTRACTID_PREFIX - "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", - &rv); + nsCOMPtr elementFactory = + do_GetService(NS_ELEMENT_FACTORY_CONTRACTID_PREFIX "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", &rv); if (!elementFactory) return NS_ERROR_FAILURE; diff --git a/mozilla/layout/generic/nsHTMLFrame.cpp b/mozilla/layout/generic/nsHTMLFrame.cpp index c344f3ff210..08604da00a8 100644 --- a/mozilla/layout/generic/nsHTMLFrame.cpp +++ b/mozilla/layout/generic/nsHTMLFrame.cpp @@ -235,7 +235,7 @@ CanvasFrame::Init(nsIPresContext* aPresContext, // Get the prefs service nsresult result; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &result)); if (NS_SUCCEEDED(result)) { prefs->GetBoolPref("layout.reflow.showframecounts", &mShowFocusPrefOn); } diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp index acc45b18553..e1caea70928 100644 --- a/mozilla/layout/generic/nsImageFrame.cpp +++ b/mozilla/layout/generic/nsImageFrame.cpp @@ -1100,8 +1100,8 @@ nsImageFrame::TriggerLink(nsIPresContext* aPresContext, // Check that this page is allowed to load this URI. // Almost a copy of the similarly named method in nsGenericElement nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); nsCOMPtr ps; if (NS_SUCCEEDED(rv)) diff --git a/mozilla/layout/generic/nsPageFrame.cpp b/mozilla/layout/generic/nsPageFrame.cpp index 7b84c459b53..00ba09f1f16 100644 --- a/mozilla/layout/generic/nsPageFrame.cpp +++ b/mozilla/layout/generic/nsPageFrame.cpp @@ -444,7 +444,8 @@ nsPageFrame::Paint(nsIPresContext* aPresContext, if (printOptBits & nsIPrintOptions::kOptPrintDatePrinted) { // Get Locale for Formating DateTime nsCOMPtr locale; - NS_WITH_SERVICE(nsILocaleService, localeSvc, kLocaleServiceCID, &rv); + nsCOMPtr localeSvc = + do_GetService(kLocaleServiceCID, &rv); if (NS_SUCCEEDED(rv)) { rv = localeSvc->GetApplicationLocale(getter_AddRefs(locale)); diff --git a/mozilla/layout/generic/nsSelection.cpp b/mozilla/layout/generic/nsSelection.cpp index ea94e482925..c5a9883b9e5 100644 --- a/mozilla/layout/generic/nsSelection.cpp +++ b/mozilla/layout/generic/nsSelection.cpp @@ -912,14 +912,15 @@ nsSelection::nsSelection() // Check to see if the autocopy pref is enabled // and add the autocopy listener if it is nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, "@mozilla.org/preferences;1", &rv); + nsCOMPtr prefs(do_GetService("@mozilla.org/preferences;1", &rv)); if (NS_SUCCEEDED(rv) && prefs) { static char pref[] = "clipboard.autocopy"; PRBool autoCopy = PR_FALSE; if (NS_SUCCEEDED(prefs->GetBoolPref(pref, &autoCopy)) && autoCopy) { - NS_WITH_SERVICE(nsIAutoCopyService, autoCopyService, "@mozilla.org/autocopy;1", &rv); + nsCOMPtr autoCopyService = + do_GetService("@mozilla.org/autocopy;1", &rv); if (NS_SUCCEEDED(rv) && autoCopyService) { diff --git a/mozilla/layout/generic/nsSimplePageSequence.cpp b/mozilla/layout/generic/nsSimplePageSequence.cpp index 09922e20e0e..6111b1f67ee 100644 --- a/mozilla/layout/generic/nsSimplePageSequence.cpp +++ b/mozilla/layout/generic/nsSimplePageSequence.cpp @@ -95,7 +95,8 @@ nsSimplePageSequenceFrame::nsSimplePageSequenceFrame() : // XXX this code and the object data member "mIsPrintingSelection" is only needed // for the hack for printing selection where we make the page the max size nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv) && printService) { PRInt16 printType; printService->GetPrintRange(&printType); diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp index d9e2b0d5601..1ba09b01c5f 100644 --- a/mozilla/layout/html/base/src/nsFrame.cpp +++ b/mozilla/layout/html/base/src/nsFrame.cpp @@ -827,7 +827,8 @@ nsFrame::HandleEvent(nsIPresContext* aPresContext, // if(content) { //nsCOMPtr node = do_QueryInterface(content); nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIAccessibilityService, accService, "@mozilla.org/accessibilityService;1", &rv); + nsCOMPtr accService = + do_GetService("@mozilla.org/accessibilityService;1", &rv); if (accService) { // get an accessible for the dom node nsISupports* f = (nsISupports*)(nsIFrame*)this; diff --git a/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp b/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp index 35b26d82003..0cf3f261612 100644 --- a/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp +++ b/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp @@ -396,10 +396,8 @@ nsGfxScrollFrame::CreateAnonymousContent(nsIPresContext* aPresContext, // create horzontal scrollbar nsresult rv; - NS_WITH_SERVICE(nsIElementFactory, elementFactory, - NS_ELEMENT_FACTORY_CONTRACTID_PREFIX - "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", - &rv); + nsCOMPtr elementFactory = + do_GetService(NS_ELEMENT_FACTORY_CONTRACTID_PREFIX "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", &rv); if (!elementFactory) return NS_ERROR_FAILURE; diff --git a/mozilla/layout/html/base/src/nsHTMLFrame.cpp b/mozilla/layout/html/base/src/nsHTMLFrame.cpp index c344f3ff210..08604da00a8 100644 --- a/mozilla/layout/html/base/src/nsHTMLFrame.cpp +++ b/mozilla/layout/html/base/src/nsHTMLFrame.cpp @@ -235,7 +235,7 @@ CanvasFrame::Init(nsIPresContext* aPresContext, // Get the prefs service nsresult result; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &result)); if (NS_SUCCEEDED(result)) { prefs->GetBoolPref("layout.reflow.showframecounts", &mShowFocusPrefOn); } diff --git a/mozilla/layout/html/base/src/nsImageFrame.cpp b/mozilla/layout/html/base/src/nsImageFrame.cpp index acc45b18553..e1caea70928 100644 --- a/mozilla/layout/html/base/src/nsImageFrame.cpp +++ b/mozilla/layout/html/base/src/nsImageFrame.cpp @@ -1100,8 +1100,8 @@ nsImageFrame::TriggerLink(nsIPresContext* aPresContext, // Check that this page is allowed to load this URI. // Almost a copy of the similarly named method in nsGenericElement nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); nsCOMPtr ps; if (NS_SUCCEEDED(rv)) diff --git a/mozilla/layout/html/base/src/nsPageFrame.cpp b/mozilla/layout/html/base/src/nsPageFrame.cpp index 7b84c459b53..00ba09f1f16 100644 --- a/mozilla/layout/html/base/src/nsPageFrame.cpp +++ b/mozilla/layout/html/base/src/nsPageFrame.cpp @@ -444,7 +444,8 @@ nsPageFrame::Paint(nsIPresContext* aPresContext, if (printOptBits & nsIPrintOptions::kOptPrintDatePrinted) { // Get Locale for Formating DateTime nsCOMPtr locale; - NS_WITH_SERVICE(nsILocaleService, localeSvc, kLocaleServiceCID, &rv); + nsCOMPtr localeSvc = + do_GetService(kLocaleServiceCID, &rv); if (NS_SUCCEEDED(rv)) { rv = localeSvc->GetApplicationLocale(getter_AddRefs(locale)); diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp index 3499d301728..1348adcf80d 100644 --- a/mozilla/layout/html/base/src/nsPresShell.cpp +++ b/mozilla/layout/html/base/src/nsPresShell.cpp @@ -1567,7 +1567,8 @@ PresShell::Init(nsIDocument* aDocument, } // Cache the event queue of the current UI thread - NS_WITH_SERVICE(nsIEventQueueService, eventService, kEventQueueServiceCID, &result); + nsCOMPtr eventService = + do_GetService(kEventQueueServiceCID, &result); if (NS_SUCCEEDED(result)) // XXX this implies that the UI is the current thread. result = eventService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(mEventQueue)); @@ -1578,7 +1579,7 @@ PresShell::Init(nsIDocument* aDocument, gAsyncReflowDuringDocLoad = PR_TRUE; // Get the prefs service - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &result)); if (NS_SUCCEEDED(result)) { prefs->GetIntPref("layout.reflow.timeslice", &gMaxRCProcessingTime); prefs->GetBoolPref("layout.reflow.async.duringDocLoad", &gAsyncReflowDuringDocLoad); @@ -1603,7 +1604,7 @@ PresShell::Init(nsIDocument* aDocument, #ifdef MOZ_REFLOW_PERF // Get the prefs service - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &result)); if (NS_SUCCEEDED(result)) { if (mReflowCountMgr != nsnull) { PRBool paintFrameCounts = PR_FALSE; diff --git a/mozilla/layout/html/base/src/nsSimplePageSequence.cpp b/mozilla/layout/html/base/src/nsSimplePageSequence.cpp index 09922e20e0e..6111b1f67ee 100644 --- a/mozilla/layout/html/base/src/nsSimplePageSequence.cpp +++ b/mozilla/layout/html/base/src/nsSimplePageSequence.cpp @@ -95,7 +95,8 @@ nsSimplePageSequenceFrame::nsSimplePageSequenceFrame() : // XXX this code and the object data member "mIsPrintingSelection" is only needed // for the hack for printing selection where we make the page the max size nsresult rv; - NS_WITH_SERVICE(nsIPrintOptions, printService, kPrintOptionsCID, &rv); + nsCOMPtr printService = + do_GetService(kPrintOptionsCID, &rv); if (NS_SUCCEEDED(rv) && printService) { PRInt16 printType; printService->GetPrintRange(&printType); diff --git a/mozilla/layout/html/document/src/nsFrameFrame.cpp b/mozilla/layout/html/document/src/nsFrameFrame.cpp index 91925347755..80f2d7f73f0 100644 --- a/mozilla/layout/html/document/src/nsFrameFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameFrame.cpp @@ -1190,8 +1190,8 @@ nsHTMLFrameInnerFrame::DoLoadURL(nsIPresContext* aPresContext) NS_NewURI(getter_AddRefs(uri), absURL, nsnull); // Check for security - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); // Get base URL diff --git a/mozilla/layout/html/forms/src/nsFormControlHelper.cpp b/mozilla/layout/html/forms/src/nsFormControlHelper.cpp index 09dce905d30..fc9b42c0a0e 100644 --- a/mozilla/layout/html/forms/src/nsFormControlHelper.cpp +++ b/mozilla/layout/html/forms/src/nsFormControlHelper.cpp @@ -885,14 +885,15 @@ nsFormControlHelper::GetLocalizedString(const char * aPropFileName, const char* // Create a URL for the string resource file // Create a bundle for the localization - NS_WITH_SERVICE(nsIIOService, pNetService, kIOServiceCID, &rv); + nsCOMPtr pNetService(do_GetService(kIOServiceCID, &rv)); if (NS_SUCCEEDED(rv) && pNetService) { nsCOMPtr uri; rv = pNetService->NewURI(aPropFileName, nsnull, getter_AddRefs(uri)); if (NS_SUCCEEDED(rv) && uri) { // Create bundle - NS_WITH_SERVICE(nsIStringBundleService, stringService, kStringBundleServiceCID, &rv); + nsCOMPtr stringService = + do_GetService(kStringBundleServiceCID, &rv); if (NS_SUCCEEDED(rv) && stringService) { nsXPIDLCString spec; rv = uri->GetSpec(getter_Copies(spec)); diff --git a/mozilla/layout/html/forms/src/nsFormFrame.cpp b/mozilla/layout/html/forms/src/nsFormFrame.cpp index df97b1b83a3..95ba26d8cf3 100644 --- a/mozilla/layout/html/forms/src/nsFormFrame.cpp +++ b/mozilla/layout/html/forms/src/nsFormFrame.cpp @@ -723,7 +723,8 @@ nsFormFrame::OnSubmit(nsIPresContext* aPresContext, nsIFrame* aFrame) // Get a service to process the value part of the form data // If one doesn't exist, that fine. It's not required. nsresult result = NS_OK; - NS_WITH_SERVICE(nsIFormProcessor, formProcessor, kFormProcessorCID, &result) + nsCOMPtr formProcessor = + do_GetService(kFormProcessorCID, &result); nsString data; // this could be more efficient, by allocating a larger buffer @@ -807,8 +808,8 @@ nsFormFrame::OnSubmit(nsIPresContext* aPresContext, nsIFrame* aFrame) } } else { // Get security manager, check to see if access to action URI is allowed. - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &result); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &result); nsCOMPtr actionURL; if (NS_FAILED(result)) return result; @@ -882,7 +883,8 @@ nsFormFrame::OnSubmit(nsIPresContext* aPresContext, nsIFrame* aFrame) // Notify observers that the form is being submitted. result = NS_OK; - NS_WITH_SERVICE(nsIObserverService, service, NS_OBSERVERSERVICE_CONTRACTID, &result); + nsCOMPtr service = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &result); if (NS_FAILED(result)) return result; nsString theTopic; theTopic.AssignWithConversion(NS_FORMSUBMIT_SUBJECT); @@ -1095,7 +1097,7 @@ void nsFormFrame::GetSubmitCharset(nsString& oCharset) PRInt32 offset=0; PRInt32 spPos=0; // get charset from charsets one by one - NS_WITH_SERVICE(nsICharsetAlias, calias, kCharsetAliasCID, &rv); + nsCOMPtr calias(do_GetService(kCharsetAliasCID, &rv)); if(NS_SUCCEEDED(rv) && (nsnull != calias)) { do { spPos = acceptCharsetValue.FindChar(PRUnichar(' '),PR_TRUE, offset); @@ -1198,7 +1200,8 @@ NS_IMETHODIMP nsFormFrame::GetPlatformEncoder(nsIUnicodeEncoder** encoder) } // get unicode converter mgr - //NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + //nsCOMPtr ccm = + // do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeEncoder(&localeCharset, encoder); diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp index 40deca6f626..c35db34b499 100644 --- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp @@ -3417,7 +3417,8 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsIPresShell* aPresShell, if (!display->mBinding.IsEmpty()) { // Get the XBL loader. nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if (!xblService) return rv; @@ -7226,7 +7227,8 @@ nsCSSFrameConstructor::ConstructFrameInternal( nsIPresShell* aPresShe if (!display->mBinding.IsEmpty()) { // Get the XBL loader. nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if (!xblService) return rv; diff --git a/mozilla/layout/html/tests/TestCSSParser.cpp b/mozilla/layout/html/tests/TestCSSParser.cpp index 642d7664f7d..4364e20f3ff 100644 --- a/mozilla/layout/html/tests/TestCSSParser.cpp +++ b/mozilla/layout/html/tests/TestCSSParser.cpp @@ -143,7 +143,7 @@ int main(int argc, char** argv) char* urlName = argv[i]; // Create url object nsIURI* url; - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv); + nsCOMPtr service(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return -1; nsIURI *uri = nsnull; diff --git a/mozilla/layout/html/tests/TestCSSScanner.cpp b/mozilla/layout/html/tests/TestCSSScanner.cpp index c1337aff621..38be6c4bf00 100644 --- a/mozilla/layout/html/tests/TestCSSScanner.cpp +++ b/mozilla/layout/html/tests/TestCSSScanner.cpp @@ -43,7 +43,7 @@ int main(int argc, char** argv) char* urlName = argv[1]; nsIURI* url; nsresult rv; - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv); + nsCOMPtr service(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return -1; nsIURI *uri = nsnull; diff --git a/mozilla/layout/mathml/base/src/nsMathMLChar.cpp b/mozilla/layout/mathml/base/src/nsMathMLChar.cpp index 1bbccfcc492..2ac583966bb 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLChar.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLChar.cpp @@ -720,7 +720,8 @@ nsresult nsGlyphTableList::Initialize() { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIObserverService, obs, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr obs = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsAutoString topic; topic.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID); rv = obs->AddObserver(this, topic.get()); @@ -734,7 +735,8 @@ nsGlyphTableList::Finalize() { // Remove our observer from the observer service nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIObserverService, obs, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr obs = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsAutoString topic; topic.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID); rv = obs->RemoveObserver(this, topic.get()); diff --git a/mozilla/layout/style/nsCSSLoader.cpp b/mozilla/layout/style/nsCSSLoader.cpp index 292e134107d..9f529c08907 100644 --- a/mozilla/layout/style/nsCSSLoader.cpp +++ b/mozilla/layout/style/nsCSSLoader.cpp @@ -614,7 +614,8 @@ SheetLoadData::OnStreamComplete(nsIStreamLoader* aLoader, (void)mLoader->SetCharset(strHTTPHeaderData, strStyleDataUndecoded); // bug 66190: ignore errors { // now get the decoder - NS_WITH_SERVICE(nsICharsetConverterManager,ccm,kCharsetConverterManagerCID,&result); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &result); if (NS_SUCCEEDED(result) && ccm) { nsString charset; mLoader->GetCharset(charset); @@ -1318,7 +1319,8 @@ CSSLoaderImpl::LoadStyleLink(nsIContent* aElement, } if (!isForViewSource) { nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; nsIURI* docURI; rv = mDocument->GetBaseURL(docURI); @@ -1587,7 +1589,7 @@ NS_IMETHODIMP CSSLoaderImpl::SetCharset(/*in*/ const nsString &aCharsetSrc) if (aCharsetSrc.Length() == 0) { mCharset.AssignWithConversion("ISO-8859-1"); } else { - NS_WITH_SERVICE(nsICharsetAlias, calias, kCharsetAliasCID, &rv); + nsCOMPtr calias(do_GetService(kCharsetAliasCID, &rv)); NS_ASSERTION(calias, "cannot find charset alias"); nsAutoString charsetName(aCharsetSrc); if( NS_SUCCEEDED(rv) && (nsnull != calias)) diff --git a/mozilla/layout/style/nsStyleUtil.cpp b/mozilla/layout/style/nsStyleUtil.cpp index 07cc0d5a628..737fc15b1d2 100644 --- a/mozilla/layout/style/nsStyleUtil.cpp +++ b/mozilla/layout/style/nsStyleUtil.cpp @@ -208,7 +208,7 @@ static PRBool gNavAlgorithmPref = PR_FALSE; static int PR_CALLBACK NavAlgorithmPrefChangedCallback(const char * name, void * closure) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { prefs->GetBoolPref(name, &gNavAlgorithmPref); } @@ -229,7 +229,7 @@ static PRBool UseNewFontAlgorithm() once = PR_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { prefs->GetBoolPref("font.size.nav4algorithm", &gNavAlgorithmPref); prefs->RegisterCallback("font.size.nav4algorithm", NavAlgorithmPrefChangedCallback, NULL); diff --git a/mozilla/layout/xul/base/src/nsMenuBarListener.cpp b/mozilla/layout/xul/base/src/nsMenuBarListener.cpp index 2e48dcc1d95..9c84bbb076d 100644 --- a/mozilla/layout/xul/base/src/nsMenuBarListener.cpp +++ b/mozilla/layout/xul/base/src/nsMenuBarListener.cpp @@ -102,7 +102,7 @@ void nsMenuBarListener::InitAccessKey() // Get the menu access key value from prefs, overriding the default: nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { rv = prefs->GetIntPref("ui.key.menuAccessKey", &mAccessKey); diff --git a/mozilla/layout/xul/base/src/nsMenuFrame.cpp b/mozilla/layout/xul/base/src/nsMenuFrame.cpp index 933992a3c3d..38934c43890 100644 --- a/mozilla/layout/xul/base/src/nsMenuFrame.cpp +++ b/mozilla/layout/xul/base/src/nsMenuFrame.cpp @@ -837,7 +837,8 @@ void nsMenuFrame::GetMenuChildrenElement(nsIContent** aResult) { nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); PRInt32 dummy; PRInt32 count; mContent->ChildCount(count); @@ -1379,7 +1380,7 @@ nsMenuFrame::BuildAcceleratorText(nsString& aAccelString) // Get the accelerator key value from prefs, overriding the default: nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv) && prefs) rv = prefs->GetIntPref("ui.key.accelKey", &accelKey); } diff --git a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp index f5539702173..d94ef46cb08 100644 --- a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp +++ b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp @@ -866,7 +866,8 @@ nsSplitterFrameInner::MouseDown(nsIDOMEvent* aMouseEvent) childFrame->GetContent(getter_AddRefs(content)); nsCOMPtr atom; nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if (NS_SUCCEEDED(rv) && xblService) { PRInt32 dummy; diff --git a/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp b/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp index 369a5621780..f8f69aeb272 100644 --- a/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp +++ b/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.cpp @@ -2667,7 +2667,8 @@ nsOutlinerBodyFrame :: OnDragEnter ( nsIDOMEvent* inEvent ) // cache the drag session nsresult rv; - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); nsCOMPtr dragSession; dragService->GetCurrentSession(getter_AddRefs(mDragSession)); NS_ASSERTION ( mDragSession, "can't get drag session" ); diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp index 369a5621780..f8f69aeb272 100644 --- a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp +++ b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp @@ -2667,7 +2667,8 @@ nsOutlinerBodyFrame :: OnDragEnter ( nsIDOMEvent* inEvent ) // cache the drag session nsresult rv; - NS_WITH_SERVICE(nsIDragService, dragService, "@mozilla.org/widget/dragservice;1", &rv); + nsCOMPtr dragService = + do_GetService("@mozilla.org/widget/dragservice;1", &rv); nsCOMPtr dragSession; dragService->GetCurrentSession(getter_AddRefs(mDragSession)); NS_ASSERTION ( mDragSession, "can't get drag session" ); diff --git a/mozilla/mailnews/absync/src/nsABSyncDriver.cpp b/mozilla/mailnews/absync/src/nsABSyncDriver.cpp index a2625f4627d..0217096b6c7 100644 --- a/mozilla/mailnews/absync/src/nsABSyncDriver.cpp +++ b/mozilla/mailnews/absync/src/nsABSyncDriver.cpp @@ -184,7 +184,7 @@ NS_IMETHODIMP nsAbSyncDriver::KickIt(nsIMsgStatusFeedback *aStatus, nsIDOMWindow { nsresult rv = NS_OK; PRInt32 stateVar; - NS_WITH_SERVICE(nsIAbSync, sync, kAbSync, &rv); + nsCOMPtr sync(do_GetService(kAbSync, &rv)); if (NS_FAILED(rv) || !sync) return rv; @@ -230,7 +230,8 @@ nsAbSyncDriver::GetString(const PRUnichar *aStringName) { char *propertyURL = AB_STRING_URL; - NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res); + nsCOMPtr sBundleService = + do_GetService(kStringBundleServiceCID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(mStringBundle)); @@ -255,7 +256,7 @@ NS_IMETHODIMP nsAbSyncDriver::CancelIt() PRInt32 stateVar; mCancelled = PR_TRUE; - NS_WITH_SERVICE(nsIAbSync, sync, kAbSync, &rv); + nsCOMPtr sync(do_GetService(kAbSync, &rv)); if (NS_FAILED(rv) || !sync) return rv; diff --git a/mozilla/mailnews/absync/src/nsAbSync.cpp b/mozilla/mailnews/absync/src/nsAbSync.cpp index 4698fae118d..6f4bf98d5a2 100644 --- a/mozilla/mailnews/absync/src/nsAbSync.cpp +++ b/mozilla/mailnews/absync/src/nsAbSync.cpp @@ -607,7 +607,7 @@ NS_IMETHODIMP nsAbSync::PerformAbSync(nsIDOMWindowInternal *aDOMWindow, PRInt32 // this request as well as the local address book we will be // syncing with... // - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); prefs->CopyCharPref("mail.absync.address_book", &mAbSyncAddressBook); @@ -712,7 +712,8 @@ nsAbSync::OpenAB(char *aAbName, nsIAddrDatabase **aDatabase) nsresult rv = NS_OK; nsFileSpec* dbPath = nsnull; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->GetUserProfileDirectory(&dbPath); @@ -723,7 +724,8 @@ nsAbSync::OpenAB(char *aAbName, nsIAddrDatabase **aDatabase) else (*dbPath) += aAbName; - NS_WITH_SERVICE(nsIAddrDatabase, addrDBFactory, kAddressBookDBCID, &rv); + nsCOMPtr addrDBFactory = + do_GetService(kAddressBookDBCID, &rv); if (NS_SUCCEEDED(rv) && addrDBFactory) rv = addrDBFactory->Open(dbPath, PR_TRUE, aDatabase, PR_TRUE); @@ -1542,7 +1544,7 @@ nsAbSync::AnalyzeTheLocalAddressBook() return rv; // Get the RDF service... - NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv); + nsCOMPtr rdfService(do_GetService(kRDFServiceCID, &rv)); if (NS_FAILED(rv)) goto EarlyExit; @@ -1801,7 +1803,7 @@ nsAbSync::DeleteCardByServerID(PRInt32 aServerID) return rv; // Get the RDF service... - NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv); + nsCOMPtr rdfService(do_GetService(kRDFServiceCID, &rv)); if (NS_FAILED(rv)) goto EarlyExit; @@ -2254,7 +2256,7 @@ nsAbSync::ProcessServerResponse(const char *aProtocolResponse) ExitEarly: if (mLastChangeNum > 1) { - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { prefs->SetIntPref("mail.absync.last_change", mLastChangeNum); @@ -2562,7 +2564,7 @@ nsAbSync::AddNewUsers() return rv; // Get the RDF service... - NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv); + nsCOMPtr rdfService(do_GetService(kRDFServiceCID, &rv)); if (NS_FAILED(rv)) goto EarlyExit; @@ -2995,7 +2997,8 @@ nsAbSync::GetString(const PRUnichar *aStringName) { char *propertyURL = AB_STRING_URL; - NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res); + nsCOMPtr sBundleService = + do_GetService(kStringBundleServiceCID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(mStringBundle)); diff --git a/mozilla/mailnews/absync/src/nsAbSyncPostEngine.cpp b/mozilla/mailnews/absync/src/nsAbSyncPostEngine.cpp index ddc6ee250f4..155aa123b42 100644 --- a/mozilla/mailnews/absync/src/nsAbSyncPostEngine.cpp +++ b/mozilla/mailnews/absync/src/nsAbSyncPostEngine.cpp @@ -472,7 +472,7 @@ nsAbSyncPostEngine::OnStopRequest(nsIRequest *request, nsISupports * /* ctxt */, if (NS_SUCCEEDED(rv)) { // Before we really get started...lets let sync know who is doing this... - NS_WITH_SERVICE(nsIAbSync, sync, kAbSync, &rv); + nsCOMPtr sync(do_GetService(kAbSync, &rv)); if (NS_SUCCEEDED(rv) || sync) sync->SetAbSyncUser(mUser); @@ -673,7 +673,7 @@ nsEngineNewURI(nsIURI** aInstancePtrResult, const char *aSpec, nsIURI *aBase) if (nsnull == aInstancePtrResult) return NS_ERROR_NULL_POINTER; - NS_WITH_SERVICE(nsIIOService, pService, kIOServiceCID, &res); + nsCOMPtr pService(do_GetService(kIOServiceCID, &res)); if (NS_FAILED(res)) return NS_ERROR_FACTORY_NOT_REGISTERED; diff --git a/mozilla/mailnews/addrbook/src/nsABSyncDriver.cpp b/mozilla/mailnews/addrbook/src/nsABSyncDriver.cpp index 5da3db8df4a..be97324627e 100644 --- a/mozilla/mailnews/addrbook/src/nsABSyncDriver.cpp +++ b/mozilla/mailnews/addrbook/src/nsABSyncDriver.cpp @@ -69,7 +69,7 @@ NS_IMETHODIMP nsAbSyncDriver::OnStopOperation(PRInt32 aTransactionID, nsresult a NS_IMETHODIMP nsAbSyncDriver::KickIt() { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIAbSync, sync, kAbSync, &rv); + nsCOMPtr sync(do_GetService(kAbSync, &rv)); NS_ENSURE_SUCCESS(rv, rv); // Add ourselves to the party! diff --git a/mozilla/mailnews/addrbook/src/nsAbAddressCollecter.cpp b/mozilla/mailnews/addrbook/src/nsAbAddressCollecter.cpp index 49eff75e165..a770474ec6c 100644 --- a/mozilla/mailnews/addrbook/src/nsAbAddressCollecter.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbAddressCollecter.cpp @@ -91,7 +91,7 @@ NS_IMETHODIMP nsAbAddressCollecter::CollectAddress(const char *address) nsresult rv; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); if(sizeLimitEnabled == -1){ @@ -217,7 +217,8 @@ nsresult nsAbAddressCollecter::OpenHistoryAB(nsIAddrDatabase **aDatabase) nsresult rv = NS_OK; nsFileSpec* dbPath = nsnull; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->GetUserProfileDirectory(&dbPath); @@ -225,13 +226,14 @@ nsresult nsAbAddressCollecter::OpenHistoryAB(nsIAddrDatabase **aDatabase) { (*dbPath) += kCollectedAddressbook; - NS_WITH_SERVICE(nsIAddrDatabase, addrDBFactory, kAddressBookDBCID, &rv); + nsCOMPtr addrDBFactory = + do_GetService(kAddressBookDBCID, &rv); if (NS_SUCCEEDED(rv) && addrDBFactory) rv = addrDBFactory->Open(dbPath, PR_TRUE, aDatabase, PR_TRUE); delete dbPath; } - NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv); + nsCOMPtr rdfService(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr resource; @@ -352,7 +354,7 @@ int PR_CALLBACK nsAbAddressCollecter::collectEmailAddressEnableSizeLimitPrefChanged(const char *newpref, void *data){ nsresult rv; nsAbAddressCollecter *adCol = (nsAbAddressCollecter *) data; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if(NS_FAILED(pPref->GetBoolPref(PREF_COLLECT_EMAIL_ADDRESS_ENABLE_SIZE_LIMIT, &adCol->sizeLimitEnabled))){ adCol->sizeLimitEnabled = PR_TRUE; } @@ -366,7 +368,7 @@ nsAbAddressCollecter::collectEmailAddressSizeLimitPrefChanged(const char *newpre nsresult rv; PRInt32 max = 0; nsAbAddressCollecter *adCol = (nsAbAddressCollecter *) data; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if(NS_FAILED(pPref->GetIntPref(PREF_COLLECT_EMAIL_ADDRESS_SIZE_LIMIT, &max))){ adCol->maxCABsize = 0; } else @@ -377,7 +379,7 @@ nsAbAddressCollecter::collectEmailAddressSizeLimitPrefChanged(const char *newpre void nsAbAddressCollecter::setupPrefs(void){ nsresult rv; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return; diff --git a/mozilla/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp b/mozilla/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp index df7c2ab2e52..262f6e4e949 100644 --- a/mozilla/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp @@ -384,7 +384,7 @@ nsresult nsAbAutoCompleteSession::SearchCards(nsIAbDirectory* directory, nsAbAut nsresult nsAbAutoCompleteSession::SearchDirectory(nsString& fileName, nsAbAutoCompleteSearchString* searchStr, nsIAutoCompleteResults* results, PRBool searchSubDirectory) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv); + nsCOMPtr rdfService(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr resource; @@ -501,7 +501,7 @@ NS_IMETHODIMP nsAbAutoCompleteSession::OnStartLookup(const PRUnichar *uSearchStr PRBool enableAutocomplete = PR_TRUE; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); pPref->GetBoolPref("mail.enable_autocomplete", &enableAutocomplete); diff --git a/mozilla/mailnews/addrbook/src/nsAbBSDirectory.cpp b/mozilla/mailnews/addrbook/src/nsAbBSDirectory.cpp index c062f10eb6b..27255cc6651 100644 --- a/mozilla/mailnews/addrbook/src/nsAbBSDirectory.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbBSDirectory.cpp @@ -78,7 +78,7 @@ nsresult nsAbBSDirectory::AddDirectory(const char *uriName, nsIAbDirectory **chi return NS_ERROR_NULL_POINTER; nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr res; @@ -98,7 +98,8 @@ nsresult nsAbBSDirectory::AddDirectory(const char *uriName, nsIAbDirectory **chi nsresult nsAbBSDirectory::NotifyItemAdded(nsISupports *item) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->NotifyDirectoryItemAdded(this, item); return NS_OK; @@ -107,7 +108,8 @@ nsresult nsAbBSDirectory::NotifyItemAdded(nsISupports *item) nsresult nsAbBSDirectory::NotifyItemDeleted(nsISupports *item) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->NotifyDirectoryItemDeleted(this, item); @@ -173,7 +175,8 @@ NS_IMETHODIMP nsAbBSDirectory::GetChildNodes(nsIEnumerator* *result) nsresult rv = NS_OK; nsCOMPtr listDatabase; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if (NS_SUCCEEDED(rv)) { nsFileSpec* dbPath; @@ -182,7 +185,8 @@ NS_IMETHODIMP nsAbBSDirectory::GetChildNodes(nsIEnumerator* *result) nsAutoString file; file.AssignWithConversion(server->fileName); (*dbPath) += file; - NS_WITH_SERVICE(nsIAddrDatabase, addrDBFactory, kAddressBookDBCID, &rv); + nsCOMPtr addrDBFactory = + do_GetService(kAddressBookDBCID, &rv); if (NS_SUCCEEDED(rv) && addrDBFactory) rv = addrDBFactory->Open(dbPath, PR_TRUE, getter_AddRefs(listDatabase), PR_TRUE); diff --git a/mozilla/mailnews/addrbook/src/nsAbCard.cpp b/mozilla/mailnews/addrbook/src/nsAbCard.cpp index e56923cb6e6..b660f0eb345 100644 --- a/mozilla/mailnews/addrbook/src/nsAbCard.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbCard.cpp @@ -165,7 +165,8 @@ nsresult nsAbCard::NotifyPropertyChanged(char *property, PRUnichar* oldValue, PR { //Notify listeners who listen to every folder nsresult rv; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->NotifyItemPropertyChanged(supports, property, oldValue, newValue); } @@ -179,7 +180,7 @@ nsresult nsAbCard::AddSubNode(nsAutoString name, nsIAbCard **childCard) return NS_ERROR_NULL_POINTER; nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); nsCAutoString uri; diff --git a/mozilla/mailnews/addrbook/src/nsAbCardProperty.cpp b/mozilla/mailnews/addrbook/src/nsAbCardProperty.cpp index 06d1c49402d..250e7a75811 100644 --- a/mozilla/mailnews/addrbook/src/nsAbCardProperty.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbCardProperty.cpp @@ -629,7 +629,7 @@ nsAbCardProperty::GetName(PRUnichar * *aName) nsresult rv = NS_OK; // get name depend on "mail.addr_book.lastnamefirst" // 0= displayname, 1= lastname first, 2=firstname first - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); PRInt32 lastNameFirst = 0; @@ -777,7 +777,7 @@ NS_IMETHODIMP nsAbCardProperty::Copy(nsIAbCard* srcCard) NS_IMETHODIMP nsAbCardProperty::AddCardToDatabase(const char *uri, nsIAbCard **_retval) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr res; @@ -798,7 +798,7 @@ NS_IMETHODIMP nsAbCardProperty::AddCardToDatabase(const char *uri, nsIAbCard **_ NS_IMETHODIMP nsAbCardProperty::DropCardToDatabase(const char *uri, nsIAbCard **_retval) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr res; diff --git a/mozilla/mailnews/addrbook/src/nsAbDirProperty.cpp b/mozilla/mailnews/addrbook/src/nsAbDirProperty.cpp index 80b10e12d62..eaffd9764f6 100644 --- a/mozilla/mailnews/addrbook/src/nsAbDirProperty.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbDirProperty.cpp @@ -185,7 +185,7 @@ NS_IMETHODIMP nsAbDirProperty::SetAddressLists(nsISupportsArray * aAddressLists) NS_IMETHODIMP nsAbDirProperty::AddMailListToDatabase(const char *uri) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr res; diff --git a/mozilla/mailnews/addrbook/src/nsAbDirectory.cpp b/mozilla/mailnews/addrbook/src/nsAbDirectory.cpp index 6ff8a5facec..902e76bb3ef 100644 --- a/mozilla/mailnews/addrbook/src/nsAbDirectory.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbDirectory.cpp @@ -62,7 +62,7 @@ nsAbDirectory::~nsAbDirectory(void) nsresult rv = NS_OK; nsCOMPtr database; - NS_WITH_SERVICE(nsIAddressBook, addressBook, kAddrBookCID, &rv); + nsCOMPtr addressBook(do_GetService(kAddrBookCID, &rv)); if (NS_SUCCEEDED(rv) && addressBook) { rv = addressBook->GetAbDatabaseFromURI(mURI, getter_AddRefs(database)); @@ -96,7 +96,7 @@ NS_IMETHODIMP nsAbDirectory::OnCardEntryChange nsresult rv = NS_OK; if (abCode == AB_NotifyInserted && card) { - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); char* cardURI = nsnull; @@ -205,7 +205,8 @@ NS_IMETHODIMP nsAbDirectory::GetChildNodes(nsIEnumerator* *result) nsresult rv = NS_OK; nsCOMPtr listDatabase; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if (NS_SUCCEEDED(rv)) { nsFileSpec* dbPath; @@ -214,7 +215,8 @@ NS_IMETHODIMP nsAbDirectory::GetChildNodes(nsIEnumerator* *result) nsAutoString file; file.AssignWithConversion(server->fileName); (*dbPath) += file; - NS_WITH_SERVICE(nsIAddrDatabase, addrDBFactory, kAddressBookDBCID, &rv); + nsCOMPtr addrDBFactory = + do_GetService(kAddressBookDBCID, &rv); if (NS_SUCCEEDED(rv) && addrDBFactory) rv = addrDBFactory->Open(dbPath, PR_TRUE, getter_AddRefs(listDatabase), PR_TRUE); @@ -239,7 +241,7 @@ NS_IMETHODIMP nsAbDirectory::AddDirectory(const char *uriName, nsIAbDirectory ** return NS_ERROR_NULL_POINTER; nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr res; @@ -262,7 +264,7 @@ nsresult nsAbDirectory::AddMailList(const char *uriName) return NS_ERROR_NULL_POINTER; nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr res; @@ -314,7 +316,7 @@ NS_IMETHODIMP nsAbDirectory::CreateNewDirectory(const PRUnichar *dirName, const if (uri) { nsCOMPtr database; - NS_WITH_SERVICE(nsIAddressBook, addresBook, kAddrBookCID, &rv); + nsCOMPtr addresBook(do_GetService(kAddrBookCID, &rv)); if (NS_SUCCEEDED(rv)) rv = addresBook->GetAbDatabaseFromURI(uri, getter_AddRefs(database)); @@ -344,7 +346,7 @@ NS_IMETHODIMP nsAbDirectory::CreateNewMailingList(const char* uri, nsIAbDirector if (NS_SUCCEEDED(rv) && newList) { nsCOMPtr listDatabase; - NS_WITH_SERVICE(nsIAddressBook, addresBook, kAddrBookCID, &rv); + nsCOMPtr addresBook(do_GetService(kAddrBookCID, &rv)); if (NS_SUCCEEDED(rv)) rv = addresBook->GetAbDatabaseFromURI(uri, getter_AddRefs(listDatabase)); if (listDatabase) @@ -368,7 +370,7 @@ NS_IMETHODIMP nsAbDirectory::AddChildCards(const char *uriName, nsIAbCard **chil return NS_ERROR_NULL_POINTER; nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr res; @@ -511,7 +513,8 @@ NS_IMETHODIMP nsAbDirectory::DeleteCards(nsISupportsArray *cards) if (listUri) { rv = NS_OK; - NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv); + nsCOMPtr rdfService = + do_GetService(kRDFServiceCID, &rv); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr listResource; rv = rdfService->GetResource(listUri, getter_AddRefs(listResource)); @@ -548,7 +551,8 @@ nsresult nsAbDirectory::DeleteDirectoryCards(nsIAbDirectory* directory, DIR_Serv nsCOMPtr database; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->GetUserProfileDirectory(&dbPath); @@ -557,7 +561,8 @@ nsresult nsAbDirectory::DeleteDirectoryCards(nsIAbDirectory* directory, DIR_Serv (*dbPath) += server->fileName; // close file before delete it - NS_WITH_SERVICE(nsIAddrDatabase, addrDBFactory, kAddressBookDBCID, &rv); + nsCOMPtr addrDBFactory = + do_GetService(kAddressBookDBCID, &rv); if (NS_SUCCEEDED(rv) && addrDBFactory) rv = addrDBFactory->Open(dbPath, PR_FALSE, getter_AddRefs(database), PR_TRUE); @@ -664,7 +669,7 @@ NS_IMETHODIMP nsAbDirectory::DeleteDirectory(nsIAbDirectory *directory) NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr database; - NS_WITH_SERVICE(nsIAddressBook, addresBook, kAddrBookCID, &rv); + nsCOMPtr addresBook(do_GetService(kAddrBookCID, &rv)); if (NS_SUCCEEDED(rv)) { rv = addresBook->GetAbDatabaseFromURI((const char *)uri, getter_AddRefs(database)); @@ -716,7 +721,7 @@ NS_IMETHODIMP nsAbDirectory::HasDirectory(nsIAbDirectory *dir, PRBool *hasDir) rv = dir->GetDirUri(getter_Copies(uri)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr database; - NS_WITH_SERVICE(nsIAddressBook, addresBook, kAddrBookCID, &rv); + nsCOMPtr addresBook(do_GetService(kAddrBookCID, &rv)); if (NS_SUCCEEDED(rv)) { rv = addresBook->GetAbDatabaseFromURI((const char *)uri, getter_AddRefs(database)); @@ -743,7 +748,8 @@ nsresult nsAbDirectory::NotifyPropertyChanged(char *property, PRUnichar* oldValu { //Notify listeners who listen to every folder nsresult rv; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->NotifyItemPropertyChanged(supports, property, oldValue, newValue); } @@ -754,7 +760,8 @@ nsresult nsAbDirectory::NotifyPropertyChanged(char *property, PRUnichar* oldValu nsresult nsAbDirectory::NotifyItemAdded(nsISupports *item) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->NotifyDirectoryItemAdded(this, item); return NS_OK; @@ -763,7 +770,8 @@ nsresult nsAbDirectory::NotifyItemAdded(nsISupports *item) nsresult nsAbDirectory::NotifyItemDeleted(nsISupports *item) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->NotifyDirectoryItemDeleted(this, item); diff --git a/mozilla/mailnews/addrbook/src/nsAbMDBCard.cpp b/mozilla/mailnews/addrbook/src/nsAbMDBCard.cpp index a23ea9b0c02..078fbf4cfcc 100644 --- a/mozilla/mailnews/addrbook/src/nsAbMDBCard.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbMDBCard.cpp @@ -185,7 +185,8 @@ nsresult nsAbMDBCard::NotifyPropertyChanged(char *property, PRUnichar* oldValue, { //Notify listeners who listen to every folder nsresult rv; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->NotifyItemPropertyChanged(supports, property, oldValue, newValue); } @@ -199,7 +200,7 @@ nsresult nsAbMDBCard::AddSubNode(nsAutoString name, nsIAbCard **childCard) return NS_ERROR_NULL_POINTER; nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); nsCAutoString uri; diff --git a/mozilla/mailnews/addrbook/src/nsAbMDBCardProperty.cpp b/mozilla/mailnews/addrbook/src/nsAbMDBCardProperty.cpp index bd03622a931..91f7736d11c 100644 --- a/mozilla/mailnews/addrbook/src/nsAbMDBCardProperty.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbMDBCardProperty.cpp @@ -507,7 +507,8 @@ nsresult nsAbMDBCardProperty::GetCardDatabase(const char *uri) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if (NS_SUCCEEDED(rv)) { nsFileSpec* dbPath; @@ -519,7 +520,8 @@ nsresult nsAbMDBCardProperty::GetCardDatabase(const char *uri) if (dbPath->Exists()) { - NS_WITH_SERVICE(nsIAddrDatabase, addrDBFactory, kAddressBookDBCID, &rv); + nsCOMPtr addrDBFactory = + do_GetService(kAddressBookDBCID, &rv); if (NS_SUCCEEDED(rv) && addrDBFactory) rv = addrDBFactory->Open(dbPath, PR_TRUE, getter_AddRefs(mCardDatabase), PR_TRUE); diff --git a/mozilla/mailnews/addrbook/src/nsAbMDBDirProperty.cpp b/mozilla/mailnews/addrbook/src/nsAbMDBDirProperty.cpp index 031852eb2f9..2b763dc19dc 100644 --- a/mozilla/mailnews/addrbook/src/nsAbMDBDirProperty.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbMDBDirProperty.cpp @@ -147,7 +147,7 @@ NS_IMETHODIMP nsAbMDBDirProperty::EditMailListToDatabase(const char *uri) nsCOMPtr listDatabase; - NS_WITH_SERVICE(nsIAddressBook, addresBook, kAddrBookCID, &rv); + nsCOMPtr addresBook(do_GetService(kAddrBookCID, &rv)); if (NS_SUCCEEDED(rv)) rv = addresBook->GetAbDatabaseFromURI(uri, getter_AddRefs(listDatabase)); diff --git a/mozilla/mailnews/addrbook/src/nsAbMDBDirectory.cpp b/mozilla/mailnews/addrbook/src/nsAbMDBDirectory.cpp index 99bfded3e63..b299f95e272 100644 --- a/mozilla/mailnews/addrbook/src/nsAbMDBDirectory.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbMDBDirectory.cpp @@ -64,7 +64,7 @@ nsAbMDBDirectory::~nsAbMDBDirectory(void) nsresult rv = NS_OK; nsCOMPtr database; - NS_WITH_SERVICE(nsIAddressBook, addressBook, kAddrBookCID, &rv); + nsCOMPtr addressBook(do_GetService(kAddrBookCID, &rv)); if (NS_SUCCEEDED(rv) && addressBook) { rv = addressBook->GetAbDatabaseFromURI(mURI, getter_AddRefs(database)); @@ -96,7 +96,7 @@ nsresult nsAbMDBDirectory::AddMailList(const char *uriName) return NS_ERROR_NULL_POINTER; nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr res; @@ -160,7 +160,7 @@ NS_IMETHODIMP nsAbMDBDirectory::DeleteDirectory(nsIAbDirectory *directory) NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr database; - NS_WITH_SERVICE(nsIAddressBook, addresBook, kAddrBookCID, &rv); + nsCOMPtr addresBook(do_GetService(kAddrBookCID, &rv)); if (NS_SUCCEEDED(rv)) { rv = addresBook->GetAbDatabaseFromURI((const char *)uri, getter_AddRefs(database)); @@ -189,7 +189,8 @@ nsresult nsAbMDBDirectory::NotifyPropertyChanged(char *property, PRUnichar* oldV { //Notify listeners who listen to every folder nsresult rv; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->NotifyItemPropertyChanged(supports, property, oldValue, newValue); } @@ -200,7 +201,8 @@ nsresult nsAbMDBDirectory::NotifyPropertyChanged(char *property, PRUnichar* oldV nsresult nsAbMDBDirectory::NotifyItemAdded(nsISupports *item) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->NotifyDirectoryItemAdded(this, item); return NS_OK; @@ -209,7 +211,8 @@ nsresult nsAbMDBDirectory::NotifyItemAdded(nsISupports *item) nsresult nsAbMDBDirectory::NotifyItemDeleted(nsISupports *item) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->NotifyDirectoryItemDeleted(this, item); @@ -267,7 +270,7 @@ NS_IMETHODIMP nsAbMDBDirectory::AddChildCards(const char *uriName, nsIAbCard **c return NS_ERROR_NULL_POINTER; nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr res; @@ -295,7 +298,7 @@ NS_IMETHODIMP nsAbMDBDirectory::AddDirectory(const char *uriName, nsIAbDirectory return NS_ERROR_NULL_POINTER; nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr res; @@ -376,7 +379,8 @@ nsresult nsAbMDBDirectory::DeleteDirectoryCards(nsIAbDirectory* directory, DIR_S nsCOMPtr database; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->GetUserProfileDirectory(&dbPath); @@ -385,7 +389,8 @@ nsresult nsAbMDBDirectory::DeleteDirectoryCards(nsIAbDirectory* directory, DIR_S (*dbPath) += server->fileName; // close file before delete it - NS_WITH_SERVICE(nsIAddrDatabase, addrDBFactory, kAddressBookDBCID, &rv); + nsCOMPtr addrDBFactory = + do_GetService(kAddressBookDBCID, &rv); if (NS_SUCCEEDED(rv) && addrDBFactory) rv = addrDBFactory->Open(dbPath, PR_FALSE, getter_AddRefs(database), PR_TRUE); @@ -506,7 +511,8 @@ NS_IMETHODIMP nsAbMDBDirectory::DeleteCards(nsISupportsArray *cards) if (listUri) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv); + nsCOMPtr rdfService = + do_GetService(kRDFServiceCID, &rv); if(NS_SUCCEEDED(rv)) { @@ -585,7 +591,7 @@ NS_IMETHODIMP nsAbMDBDirectory::HasDirectory(nsIAbDirectory *dir, PRBool *hasDir rv = dbdir->GetDirUri(getter_Copies(uri)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr database; - NS_WITH_SERVICE(nsIAddressBook, addresBook, kAddrBookCID, &rv); + nsCOMPtr addresBook(do_GetService(kAddrBookCID, &rv)); if (NS_SUCCEEDED(rv)) { rv = addresBook->GetAbDatabaseFromURI((const char *)uri, getter_AddRefs(database)); @@ -689,7 +695,7 @@ NS_IMETHODIMP nsAbMDBDirectory::AddCard(nsIAbCard* card, nsIAbCard **_retval) // Return the RDF resource instance of the card // which was added to the database // - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); nsXPIDLCString uri; @@ -749,7 +755,7 @@ NS_IMETHODIMP nsAbMDBDirectory::DropCard(nsIAbCard* card, nsIAbCard **_retval) // Return the RDF resource instance of the card // which was added to the database // - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); nsXPIDLCString uri; @@ -786,7 +792,7 @@ NS_IMETHODIMP nsAbMDBDirectory::OnCardEntryChange nsresult rv = NS_OK; if (abCode == AB_NotifyInserted && card) { - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr dbcard(do_QueryInterface(card, &rv)); diff --git a/mozilla/mailnews/addrbook/src/nsAbMDBRDFResource.cpp b/mozilla/mailnews/addrbook/src/nsAbMDBRDFResource.cpp index 4bbc7a43d31..5904ee73ab4 100644 --- a/mozilla/mailnews/addrbook/src/nsAbMDBRDFResource.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbMDBRDFResource.cpp @@ -85,7 +85,8 @@ nsresult nsAbMDBRDFResource::GetAbDatabase() { nsFileSpec* dbPath = nsnull; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->GetUserProfileDirectory(&dbPath); @@ -95,7 +96,8 @@ nsresult nsAbMDBRDFResource::GetAbDatabase() file.Truncate(pos); (*dbPath) += file; - NS_WITH_SERVICE(nsIAddrDatabase, addrDBFactory, kAddressBookDBCID, &rv); + nsCOMPtr addrDBFactory = + do_GetService(kAddressBookDBCID, &rv); if (NS_SUCCEEDED(rv) && addrDBFactory) rv = addrDBFactory->Open(dbPath, PR_TRUE, getter_AddRefs(mDatabase), PR_TRUE); diff --git a/mozilla/mailnews/addrbook/src/nsAbRDFDataSource.cpp b/mozilla/mailnews/addrbook/src/nsAbRDFDataSource.cpp index 562a3340475..39d8445ad23 100644 --- a/mozilla/mailnews/addrbook/src/nsAbRDFDataSource.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbRDFDataSource.cpp @@ -61,7 +61,7 @@ nsresult nsAbRDFDataSource::createNode(nsString& str, nsIRDFNode **node) { *node = nsnull; nsresult rv; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); // always check this before proceeding nsCOMPtr value; rv = rdf->GetLiteral(str.get(), getter_AddRefs(value)); diff --git a/mozilla/mailnews/addrbook/src/nsAbRDFResource.cpp b/mozilla/mailnews/addrbook/src/nsAbRDFResource.cpp index 1682214658b..cffa2267378 100644 --- a/mozilla/mailnews/addrbook/src/nsAbRDFResource.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbRDFResource.cpp @@ -86,7 +86,8 @@ nsresult nsAbRDFResource::GetAbDatabase() { nsFileSpec* dbPath = nsnull; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->GetUserProfileDirectory(&dbPath); @@ -96,7 +97,8 @@ nsresult nsAbRDFResource::GetAbDatabase() file.Truncate(pos); (*dbPath) += file; - NS_WITH_SERVICE(nsIAddrDatabase, addrDBFactory, kAddressBookDBCID, &rv); + nsCOMPtr addrDBFactory = + do_GetService(kAddressBookDBCID, &rv); if (NS_SUCCEEDED(rv) && addrDBFactory) rv = addrDBFactory->Open(dbPath, PR_TRUE, getter_AddRefs(mDatabase), PR_TRUE); diff --git a/mozilla/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp b/mozilla/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp index e274a251eca..95bf28a59a2 100644 --- a/mozilla/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp +++ b/mozilla/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp @@ -216,7 +216,8 @@ nsAddbookProtocolHandler::OpenAB(char *aAbName, nsIAddrDatabase **aDatabase) nsresult rv = NS_OK; nsFileSpec* dbPath = nsnull; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->GetUserProfileDirectory(&dbPath); @@ -227,7 +228,8 @@ nsAddbookProtocolHandler::OpenAB(char *aAbName, nsIAddrDatabase **aDatabase) else (*dbPath) += aAbName; - NS_WITH_SERVICE(nsIAddrDatabase, addrDBFactory, kAddressBookDBCID, &rv); + nsCOMPtr addrDBFactory = + do_GetService(kAddressBookDBCID, &rv); if (NS_SUCCEEDED(rv) && addrDBFactory) rv = addrDBFactory->Open(dbPath, PR_TRUE, aDatabase, PR_TRUE); @@ -324,7 +326,7 @@ nsAddbookProtocolHandler::GeneratePrintOutput(nsIAddbookUrl *addbookUrl, rv = NS_OK; // Get the RDF service... - NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv); + nsCOMPtr rdfService(do_GetService(kRDFServiceCID, &rv)); if (NS_FAILED(rv)) goto EarlyExit; @@ -359,7 +361,7 @@ nsAddbookProtocolHandler::GeneratePrintOutput(nsIAddbookUrl *addbookUrl, if (!charAb) goto EarlyExit; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) goto EarlyExit; diff --git a/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp b/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp index 242011be4e2..9739c5c6716 100644 --- a/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp +++ b/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp @@ -715,7 +715,8 @@ NS_IMETHODIMP nsAddrDatabase::OpenAnonymousDB(nsIAddrDatabase **pCardDB) nsresult rv = NS_OK; nsCOMPtr database; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if (NS_SUCCEEDED(rv)) { nsFileSpec* dbPath; @@ -1715,7 +1716,8 @@ nsresult nsAddrDatabase::AddListCardColumnsToRow if (file) { cardURI = PR_smprintf("%s%s/Card%ld", kMDBCardRoot, file, cardOid.mOid_Id); - NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &err); + nsCOMPtr rdfService = + do_GetService(kRDFServiceCID, &err); if (NS_SUCCEEDED(err) && cardURI) { nsCOMPtr cardResource; @@ -2486,7 +2488,7 @@ NS_IMETHODIMP nsAddrDatabase::EditMailList(nsIAbDirectory *mailList, PRBool noti char* file = nsnull; file = m_dbName.GetLeafName(); listCardURI = PR_smprintf("%s%s/ListCard%ld", kMDBCardRoot, file, rowOid.mOid_Id); - NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &err); + nsCOMPtr rdfService(do_GetService(kRDFServiceCID, &err)); if(NS_FAILED(err)) return err; nsCOMPtr listCardResource; @@ -3931,7 +3933,8 @@ nsresult nsAddrDatabase::GetCollationKeyGenerator() { nsCOMPtr locale; - NS_WITH_SERVICE(nsILocaleService, localeSvc, kLocaleServiceCID, &rv); + nsCOMPtr localeSvc = + do_GetService(kLocaleServiceCID, &rv); NS_ENSURE_SUCCESS(rv, rv); rv = localeSvc->GetApplicationLocale(getter_AddRefs(locale)); @@ -3997,7 +4000,8 @@ NS_IMETHODIMP nsAddrDatabase::AddListDirNode(nsIMdbRow * listRow) { nsresult rv = NS_OK; - NS_WITH_SERVICE( nsIProxyObjectManager, proxyMgr, kProxyObjectManagerCID, &rv); + nsCOMPtr proxyMgr = + do_GetService(kProxyObjectManagerCID, &rv); NS_ENSURE_SUCCESS(rv, rv); NS_WITH_PROXIED_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, NS_UI_THREAD_EVENTQ, &rv); diff --git a/mozilla/mailnews/addrbook/src/nsAddressBook.cpp b/mozilla/mailnews/addrbook/src/nsAddressBook.cpp index bfdfc5dc55e..cbf02137bee 100644 --- a/mozilla/mailnews/addrbook/src/nsAddressBook.cpp +++ b/mozilla/mailnews/addrbook/src/nsAddressBook.cpp @@ -164,7 +164,7 @@ NS_IMETHODIMP nsAddressBook::NewAddressBook return NS_ERROR_NULL_POINTER; nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv); + nsCOMPtr rdfService(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr parentResource; @@ -189,7 +189,7 @@ NS_IMETHODIMP nsAddressBook::DeleteAddressBooks return NS_ERROR_NULL_POINTER; nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv); + nsCOMPtr rdfService(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr resourceArray; @@ -206,7 +206,7 @@ nsresult nsAddressBook::DoCommand(nsIRDFCompositeDataSource* db, char *command, nsresult rv; - NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv); + nsCOMPtr rdfService(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr commandResource; @@ -297,7 +297,8 @@ NS_IMETHODIMP nsAddressBook::GetAbDatabaseFromURI(const char *uri, nsIAddrDataba { nsFileSpec* dbPath = nsnull; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->GetUserProfileDirectory(&dbPath); @@ -307,7 +308,8 @@ NS_IMETHODIMP nsAddressBook::GetAbDatabaseFromURI(const char *uri, nsIAddrDataba file.Truncate(pos); (*dbPath) += file; - NS_WITH_SERVICE(nsIAddrDatabase, addrDBFactory, kAddressBookDBCID, &rv); + nsCOMPtr addrDBFactory = + do_GetService(kAddressBookDBCID, &rv); if (NS_SUCCEEDED(rv) && addrDBFactory) rv = addrDBFactory->Open(dbPath, PR_TRUE, getter_AddRefs(database), PR_TRUE); @@ -333,14 +335,16 @@ nsresult nsAddressBook::GetAbDatabaseFromFile(char* pDbFile, nsIAddrDatabase **d { nsFileSpec* dbPath = nsnull; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->GetUserProfileDirectory(&dbPath); nsAutoString file; file.AssignWithConversion(pDbFile); (*dbPath) += file; - NS_WITH_SERVICE(nsIAddrDatabase, addrDBFactory, kAddressBookDBCID, &rv); + nsCOMPtr addrDBFactory = + do_GetService(kAddressBookDBCID, &rv); if (NS_SUCCEEDED(rv) && addrDBFactory) rv = addrDBFactory->Open(dbPath, PR_TRUE, getter_AddRefs(database), PR_TRUE); @@ -531,7 +535,8 @@ nsresult AddressBookParser::ParseFile() nsFileSpec* dbPath = nsnull; char* fileName = PR_smprintf("%s.mab", leafName); - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->GetUserProfileDirectory(&dbPath); @@ -539,7 +544,8 @@ nsresult AddressBookParser::ParseFile() if (dbPath) { (*dbPath) += fileName; - NS_WITH_SERVICE(nsIAddrDatabase, addrDBFactory, kAddressBookDBCID, &rv); + nsCOMPtr addrDBFactory = + do_GetService(kAddressBookDBCID, &rv); if (NS_SUCCEEDED(rv) && addrDBFactory) rv = addrDBFactory->Open(dbPath, PR_TRUE, getter_AddRefs(mDatabase), PR_TRUE); } @@ -547,7 +553,7 @@ nsresult AddressBookParser::ParseFile() delete dbPath; - NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv); + nsCOMPtr rdfService(do_GetService(kRDFServiceCID, &rv)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr parentResource; char *parentUri = PR_smprintf("%s", kAllDirectoryRoot); @@ -561,7 +567,7 @@ nsresult AddressBookParser::ParseFile() if (PL_strcmp(fileName, kPersonalAddressbook) == 0) { // This is the personal address book, get name from prefs - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return nsnull; PRUnichar *dirName = nsnull; diff --git a/mozilla/mailnews/addrbook/src/nsCardDataSource.cpp b/mozilla/mailnews/addrbook/src/nsCardDataSource.cpp index 7ebe1311fdb..fb0c9d05661 100644 --- a/mozilla/mailnews/addrbook/src/nsCardDataSource.cpp +++ b/mozilla/mailnews/addrbook/src/nsCardDataSource.cpp @@ -128,7 +128,8 @@ nsAbCardDataSource::~nsAbCardDataSource (void) } nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->RemoveAddressBookListener(this); @@ -205,7 +206,8 @@ nsresult nsAbCardDataSource::Init() (nsISupports**) &mRDFService); // XXX probably need shutdown listener here NS_ENSURE_SUCCESS(rv, rv); - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if (NS_SUCCEEDED(rv)) abSession->AddAddressBookListener(this); diff --git a/mozilla/mailnews/addrbook/src/nsDirPrefs.cpp b/mozilla/mailnews/addrbook/src/nsDirPrefs.cpp index 95173e6eee6..7aa4327bcdf 100644 --- a/mozilla/mailnews/addrbook/src/nsDirPrefs.cpp +++ b/mozilla/mailnews/addrbook/src/nsDirPrefs.cpp @@ -330,7 +330,7 @@ nsresult DIR_GetDirServers() if (!dir_ServerList) { - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return NS_ERROR_FAILURE; @@ -408,7 +408,7 @@ static nsresult dir_ConvertToMabFileName() nsresult DIR_ShutDown() /* FEs should call this when the app is shutting down. It frees all DIR_Servers regardless of ref count values! */ { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return NS_ERROR_FAILURE; pPref->SavePrefFile(nsnull); @@ -483,7 +483,7 @@ nsresult DIR_AddNewAddressBook(const PRUnichar *dirName, const char *fileName, P // save new address book into pref file nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return NS_ERROR_FAILURE; pPref->SavePrefFile(nsnull); @@ -1050,7 +1050,7 @@ PRBool DIR_SortServersByPosition(nsVoidArray *wholeList) PRBool DIR_SetServerPosition(nsVoidArray *wholeList, DIR_Server *server, PRInt32 position) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return PR_FALSE; @@ -1305,7 +1305,7 @@ static PRBool dir_ValidateAndAddNewServer(nsVoidArray *wholeList, const char *fu static PRInt32 PR_CALLBACK dir_ServerPrefCallback(const char *prefname, void *inst_data) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return NS_ERROR_FAILURE; @@ -1981,7 +1981,8 @@ nsresult DIR_DeleteServerFromList(DIR_Server *server) nsresult rv = NS_OK; nsFileSpec* dbPath = nsnull; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->GetUserProfileDirectory(&dbPath); @@ -1992,7 +1993,8 @@ nsresult DIR_DeleteServerFromList(DIR_Server *server) (*dbPath) += server->fileName; // close file before delete it - NS_WITH_SERVICE(nsIAddrDatabase, addrDBFactory, kAddressBookDBCID, &rv); + nsCOMPtr addrDBFactory = + do_GetService(kAddressBookDBCID, &rv); if (NS_SUCCEEDED(rv) && addrDBFactory) rv = addrDBFactory->Open(dbPath, PR_FALSE, getter_AddRefs(database), PR_TRUE); @@ -2009,7 +2011,7 @@ nsresult DIR_DeleteServerFromList(DIR_Server *server) DIR_DeleteServer(server); rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return NS_ERROR_FAILURE; pPref->SavePrefFile(nsnull); @@ -2151,7 +2153,7 @@ nsresult DIR_GetPersonalAddressBook(nsVoidArray *wholeList, DIR_Server **pab) static char *DIR_GetStringPref(const char *prefRoot, const char *prefLeaf, char *scratch, const char *defaultValue) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return nsnull; @@ -2193,7 +2195,7 @@ static char *DIR_GetLocalizedStringPref (const char *prefRoot, const char *prefLeaf, char *scratch, const char *defaultValue) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return nsnull; @@ -2220,7 +2222,7 @@ static char *DIR_GetLocalizedStringPref static PRInt32 DIR_GetIntPref(const char *prefRoot, const char *prefLeaf, char *scratch, PRInt32 defaultValue) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return defaultValue; @@ -2239,7 +2241,7 @@ static PRInt32 DIR_GetIntPref(const char *prefRoot, const char *prefLeaf, char * static PRBool DIR_GetBoolPref(const char *prefRoot, const char *prefLeaf, char *scratch, PRBool defaultValue) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return defaultValue; @@ -2549,7 +2551,7 @@ nsresult DIR_GetAttributeIDsForColumns(DIR_Server *server, DIR_AttributeId ** id static nsresult dir_CreateTokenListFromWholePref(const char *pref, char ***outList, PRInt32 *outCount) { nsresult result = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &result); + nsCOMPtr pPref(do_GetService(kPrefCID, &result)); if (NS_FAILED(result)) return result; @@ -2657,7 +2659,7 @@ static void dir_GetReplicationInfo(const char *prefstring, DIR_Server *server, c static nsresult DIR_GetCustomAttributePrefs(const char *prefstring, DIR_Server *server, char *scratch) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return NS_ERROR_FAILURE; @@ -2720,7 +2722,7 @@ static nsresult DIR_GetCustomAttributePrefs(const char *prefstring, DIR_Server * static nsresult DIR_GetCustomFilterPrefs(const char *prefstring, DIR_Server *server, char *scratch) { nsresult status = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &status); + nsCOMPtr pPref(do_GetService(kPrefCID, &status)); if (NS_FAILED(status) || !pPref) return NS_ERROR_FAILURE; @@ -2807,7 +2809,8 @@ void DIR_SetFileName(char** fileName, const char* defaultName) nsresult rv = NS_OK; nsFileSpec* dbPath = nsnull; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->GetUserProfileDirectory(&dbPath); if (dbPath) @@ -2955,7 +2958,7 @@ void DIR_GetServerFileName(char** filename, const char* leafName) char *DIR_CreateServerPrefName (DIR_Server *server, char *name) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return nsnull; @@ -3011,7 +3014,7 @@ char *DIR_CreateServerPrefName (DIR_Server *server, char *name) void DIR_GetPrefsForOneServer (DIR_Server *server, PRBool reinitialize, PRBool oldstyle /* 4.0 Branch */) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return; @@ -3150,7 +3153,7 @@ void DIR_GetPrefsForOneServer (DIR_Server *server, PRBool reinitialize, PRBool o static PRInt32 dir_GetPrefsFrom40Branch(nsVoidArray **list) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return -1; @@ -3201,7 +3204,7 @@ static PRInt32 dir_GetPrefsFrom40Branch(nsVoidArray **list) static nsresult dir_GetPrefsFrom45Branch(nsVoidArray **list, nsVoidArray **obsoleteList) { nsresult result = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &result); + nsCOMPtr pPref(do_GetService(kPrefCID, &result)); if (NS_FAILED(result) || !pPref) return NS_ERROR_FAILURE; @@ -3267,7 +3270,7 @@ static nsresult dir_GetPrefsFrom45Branch(nsVoidArray **list, nsVoidArray **obsol nsresult DIR_GetServerPreferences(nsVoidArray** list) { nsresult err = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &err); + nsCOMPtr pPref(do_GetService(kPrefCID, &err)); if (NS_FAILED(err) || !pPref) return NS_ERROR_FAILURE; @@ -3468,7 +3471,7 @@ nsresult DIR_GetServerPreferences(nsVoidArray** list) void DIR_ClearPrefBranch(const char *branch) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return; @@ -3479,7 +3482,7 @@ void DIR_ClearPrefBranch(const char *branch) static void DIR_ClearIntPref (const char *pref) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return; @@ -3494,7 +3497,7 @@ static void DIR_ClearIntPref (const char *pref) static void DIR_ClearStringPref (const char *pref) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return; @@ -3510,7 +3513,7 @@ static void DIR_ClearStringPref (const char *pref) static void DIR_ClearBoolPref (const char *pref) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return; @@ -3525,7 +3528,7 @@ static void DIR_ClearBoolPref (const char *pref) static void DIR_SetStringPref (const char *prefRoot, const char *prefLeaf, char *scratch, const char *value, const char *defaultValue) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return; @@ -3577,7 +3580,7 @@ static void DIR_SetStringPref (const char *prefRoot, const char *prefLeaf, char static void DIR_SetIntPref (const char *prefRoot, const char *prefLeaf, char *scratch, PRInt32 value, PRInt32 defaultValue) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return; @@ -3617,7 +3620,7 @@ static void DIR_SetIntPref (const char *prefRoot, const char *prefLeaf, char *sc static void DIR_SetBoolPref (const char *prefRoot, const char *prefLeaf, char *scratch, PRBool value, PRBool defaultValue) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return; @@ -3958,7 +3961,7 @@ nsresult DIR_SaveServerPreferences (nsVoidArray *wholeList) if (wholeList) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !pPref) return NS_ERROR_FAILURE; diff --git a/mozilla/mailnews/addrbook/src/nsDirectoryDataSource.cpp b/mozilla/mailnews/addrbook/src/nsDirectoryDataSource.cpp index 0ab031ad60c..4ac22023284 100644 --- a/mozilla/mailnews/addrbook/src/nsDirectoryDataSource.cpp +++ b/mozilla/mailnews/addrbook/src/nsDirectoryDataSource.cpp @@ -95,7 +95,8 @@ nsAbDirectoryDataSource::~nsAbDirectoryDataSource (void) } nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if(NS_SUCCEEDED(rv)) abSession->RemoveAddressBookListener(this); @@ -125,7 +126,8 @@ nsAbDirectoryDataSource::Init() (nsISupports**) &mRDFService); NS_ENSURE_SUCCESS(rv, rv); - NS_WITH_SERVICE(nsIAddrBookSession, abSession, kAddrBookSessionCID, &rv); + nsCOMPtr abSession = + do_GetService(kAddrBookSessionCID, &rv); if (NS_SUCCEEDED(rv)) abSession->AddAddressBookListener(this); diff --git a/mozilla/mailnews/base/search/src/nsMsgFilter.cpp b/mozilla/mailnews/base/search/src/nsMsgFilter.cpp index 709149f0029..552add50047 100644 --- a/mozilla/mailnews/base/search/src/nsMsgFilter.cpp +++ b/mozilla/mailnews/base/search/src/nsMsgFilter.cpp @@ -421,8 +421,8 @@ nsresult nsMsgFilter::ConvertMoveToFolderValue(nsCString &moveValue) } else { - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, - NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); + nsCOMPtr accountManager = + do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsCOMPtr server; diff --git a/mozilla/mailnews/base/search/src/nsMsgSearchAdapter.cpp b/mozilla/mailnews/base/search/src/nsMsgSearchAdapter.cpp index 862f6a02188..b2f599019a2 100644 --- a/mozilla/mailnews/base/search/src/nsMsgSearchAdapter.cpp +++ b/mozilla/mailnews/base/search/src/nsMsgSearchAdapter.cpp @@ -341,7 +341,7 @@ nsMsgSearchAdapter::GetSearchCharsets(nsString &srcCharset, nsString& dstCharset PRBool forceAscii = PR_FALSE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED(rv)) { diff --git a/mozilla/mailnews/base/search/tests/filterTest.cpp b/mozilla/mailnews/base/search/tests/filterTest.cpp index 9265e4dd2b5..5802f744646 100644 --- a/mozilla/mailnews/base/search/tests/filterTest.cpp +++ b/mozilla/mailnews/base/search/tests/filterTest.cpp @@ -276,8 +276,9 @@ int main() { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); - NS_WITH_SERVICE(nsIMsgFilterService, filterService, kMsgFilterServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); + nsCOMPtr filterService = + do_GetService(kMsgFilterServiceCID, &rv); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/mailnews/base/src/nsMessenger.cpp b/mozilla/mailnews/base/src/nsMessenger.cpp index 642b587c024..df55c18bed6 100644 --- a/mozilla/mailnews/base/src/nsMessenger.cpp +++ b/mozilla/mailnews/base/src/nsMessenger.cpp @@ -999,7 +999,7 @@ nsMessenger::DoCommand(nsIRDFCompositeDataSource* db, char *command, nsresult rv; - NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv); + nsCOMPtr rdfService(do_GetService(kRDFServiceCID, &rv)); if(NS_FAILED(rv)) return rv; @@ -1143,7 +1143,7 @@ nsMessenger::RenameFolder(nsIRDFCompositeDataSource* db, folderArray->AppendElement(folderResource); rv = NS_NewISupportsArray(getter_AddRefs(argsArray)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv); + nsCOMPtr rdfService(do_GetService(kRDFServiceCID, &rv)); if(NS_SUCCEEDED(rv)) { nsCOMPtr nameLiteral; @@ -1510,7 +1510,7 @@ nsSaveMsgListener::OnStopRunningUrl(nsIURI* url, nsresult exitCode) m_fileSpec->CloseStream(); if (NS_FAILED(rv)) goto done; if (m_templateUri) { // ** save as template goes here - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); if (NS_FAILED(rv)) goto done; nsCOMPtr res; rv = rdf->GetResource(m_templateUri, getter_AddRefs(res)); @@ -1785,8 +1785,8 @@ nsMessenger::InitStringBundle() { char *propertyURL = MESSENGER_STRING_URL; - NS_WITH_SERVICE(nsIStringBundleService, sBundleService, - kStringBundleServiceCID, &res); + nsCOMPtr sBundleService = + do_GetService(kStringBundleServiceCID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { res = sBundleService->CreateBundle(propertyURL, diff --git a/mozilla/mailnews/base/src/nsMessengerBootstrap.cpp b/mozilla/mailnews/base/src/nsMessengerBootstrap.cpp index 8eaf4981bde..070d2b86193 100644 --- a/mozilla/mailnews/base/src/nsMessengerBootstrap.cpp +++ b/mozilla/mailnews/base/src/nsMessengerBootstrap.cpp @@ -62,7 +62,7 @@ NS_IMETHODIMP nsMessengerBootstrap::GetChromeUrlForTask(char **aChromeUrlForTask { if (!aChromeUrlForTask) return NS_ERROR_FAILURE; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefService, kPrefServiceCID, &rv); + nsCOMPtr prefService(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED(rv)) { PRInt32 layout; diff --git a/mozilla/mailnews/base/src/nsMessengerMigrator.cpp b/mozilla/mailnews/base/src/nsMessengerMigrator.cpp index 8a39a28d3ee..6c6c07bd769 100644 --- a/mozilla/mailnews/base/src/nsMessengerMigrator.cpp +++ b/mozilla/mailnews/base/src/nsMessengerMigrator.cpp @@ -347,7 +347,8 @@ nsMessengerMigrator::~nsMessengerMigrator() Shutdown(); //Don't remove from Observer service in Shutdown because Shutdown also gets called //from xpcom shutdown observer. And we don't want to remove from the service in that case. - NS_WITH_SERVICE (nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsAutoString topic; topic.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID); @@ -360,7 +361,8 @@ nsresult nsMessengerMigrator::Init() { nsresult rv; - NS_WITH_SERVICE (nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsAutoString topic; topic.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID); @@ -489,7 +491,8 @@ NS_IMETHODIMP nsMessengerMigrator::CreateLocalMailAccount(PRBool migrating) { nsresult rv; - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, kMsgAccountManagerCID, &rv); + nsCOMPtr accountManager = + do_GetService(kMsgAccountManagerCID, &rv); if (NS_FAILED(rv)) return rv; // create the account @@ -618,7 +621,8 @@ nsMessengerMigrator::UpgradePrefs() } #endif - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, kMsgAccountManagerCID, &rv); + nsCOMPtr accountManager = + do_GetService(kMsgAccountManagerCID, &rv); if (NS_FAILED(rv)) return rv; // create a dummy identity, for migration only @@ -631,7 +635,8 @@ nsMessengerMigrator::UpgradePrefs() if (NS_FAILED(rv)) return rv; nsCOMPtr smtpServer; - NS_WITH_SERVICE(nsISmtpService, smtpService, kSmtpServiceCID, &rv); + nsCOMPtr smtpService = + do_GetService(kSmtpServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = smtpService->GetDefaultServer(getter_AddRefs(smtpServer)); @@ -1063,7 +1068,8 @@ nsresult nsMessengerMigrator::MigrateLocalMailAccount() { nsresult rv; - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, kMsgAccountManagerCID, &rv); + nsCOMPtr accountManager = + do_GetService(kMsgAccountManagerCID, &rv); if (NS_FAILED(rv)) return rv; // create the account @@ -1183,7 +1189,8 @@ nsMessengerMigrator::MigrateMovemailAccount(nsIMsgIdentity *identity) nsCOMPtr account; nsCOMPtr server; - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, kMsgAccountManagerCID, &rv); + nsCOMPtr accountManager = + do_GetService(kMsgAccountManagerCID, &rv); if (NS_FAILED(rv)) return rv; rv = accountManager->CreateAccount(getter_AddRefs(account)); @@ -1292,7 +1299,8 @@ nsresult nsMessengerMigrator::MigratePopAccount(nsIMsgIdentity *identity) { nsresult rv; - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, kMsgAccountManagerCID, &rv); + nsCOMPtr accountManager = + do_GetService(kMsgAccountManagerCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr account; @@ -1555,7 +1563,8 @@ nsMessengerMigrator::MigrateImapAccount(nsIMsgIdentity *identity, const char *ho { nsresult rv; - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, kMsgAccountManagerCID, &rv); + nsCOMPtr accountManager = + do_GetService(kMsgAccountManagerCID, &rv); if (NS_FAILED(rv)) return rv; if (!hostAndPort) return NS_ERROR_NULL_POINTER; @@ -2213,7 +2222,8 @@ nsresult nsMessengerMigrator::MigrateNewsAccount(nsIMsgIdentity *identity, const char *hostAndPort, nsFileSpec & newsrcfile, nsFileSpec & newsHostsDir, PRBool isSecure) { nsresult rv; - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, kMsgAccountManagerCID, &rv); + nsCOMPtr accountManager = + do_GetService(kMsgAccountManagerCID, &rv); if (NS_FAILED(rv)) return rv; nsFileSpec thisNewsHostsDir = newsHostsDir; diff --git a/mozilla/mailnews/base/src/nsMsgAccount.cpp b/mozilla/mailnews/base/src/nsMsgAccount.cpp index 031cfaad29d..bf240f2963d 100644 --- a/mozilla/mailnews/base/src/nsMsgAccount.cpp +++ b/mozilla/mailnews/base/src/nsMsgAccount.cpp @@ -149,8 +149,8 @@ nsMsgAccount::createIncomingServer() #endif // get the server from the account manager - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, - NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); + nsCOMPtr accountManager = + do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr server; @@ -244,8 +244,8 @@ nsMsgAccount::createIdentities() #endif // get the server from the account manager - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, - NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); + nsCOMPtr accountManager = + do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/mailnews/base/src/nsMsgAccountManager.cpp b/mozilla/mailnews/base/src/nsMsgAccountManager.cpp index e4bef79aff9..e8d524960e7 100644 --- a/mozilla/mailnews/base/src/nsMsgAccountManager.cpp +++ b/mozilla/mailnews/base/src/nsMsgAccountManager.cpp @@ -141,7 +141,8 @@ nsMsgAccountManager::~nsMsgAccountManager() Shutdown(); //Don't remove from Observer service in Shutdown because Shutdown also gets called //from xpcom shutdown observer. And we don't want to remove from the service in that case. - NS_WITH_SERVICE (nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsAutoString topic; topic.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID); @@ -164,7 +165,8 @@ nsresult nsMsgAccountManager::Init() rv = NS_NewISupportsArray(getter_AddRefs(mFolderListeners)); - NS_WITH_SERVICE (nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsAutoString topic; topic.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID); @@ -930,11 +932,11 @@ PRBool PR_CALLBACK nsMsgAccountManager::cleanupOnExit(nsHashKey *aKey, void *aDa nsCRT::strlen((const char*) passwd))))) { nsCOMPtr urlListener; - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, - kMsgAccountManagerCID, &rv); + nsCOMPtr accountManager = + do_GetService(kMsgAccountManagerCID, &rv); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIEventQueueService, pEventQService, - kEventQueueServiceCID, &rv); + nsCOMPtr pEventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr eventQueue; pEventQService->GetThreadEventQueue(NS_CURRENT_THREAD, @@ -1198,7 +1200,8 @@ nsMsgAccountManager::LoadAccounts() kDefaultServerAtom = NS_NewAtom("DefaultServer"); //Ensure biff service has started - NS_WITH_SERVICE(nsIMsgBiffManager, biffService, kMsgBiffManagerCID, &rv); + nsCOMPtr biffService = + do_GetService(kMsgBiffManagerCID, &rv); // mail.accountmanager.accounts is the main entry point for all accounts @@ -1286,7 +1289,7 @@ NS_IMETHODIMP nsMsgAccountManager::SetSpecialFoldersForIdentities() { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); if(NS_FAILED(rv)) return rv; diff --git a/mozilla/mailnews/base/src/nsMsgBiffManager.cpp b/mozilla/mailnews/base/src/nsMsgBiffManager.cpp index 8b347536037..e6d830b53f5 100644 --- a/mozilla/mailnews/base/src/nsMsgBiffManager.cpp +++ b/mozilla/mailnews/base/src/nsMsgBiffManager.cpp @@ -69,7 +69,8 @@ nsMsgBiffManager::~nsMsgBiffManager() Shutdown(); //Don't remove from Observer service in Shutdown because Shutdown also gets called //from xpcom shutdown observer. And we don't want to remove from the service in that case. - NS_WITH_SERVICE (nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsAutoString topic; topic.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID); @@ -86,13 +87,15 @@ nsresult nsMsgBiffManager::Init() if(!mBiffArray) return NS_ERROR_OUT_OF_MEMORY; - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, kMsgAccountManagerCID, &rv); + nsCOMPtr accountManager = + do_GetService(kMsgAccountManagerCID, &rv); if (NS_SUCCEEDED(rv)) { accountManager->AddIncomingServerListener(this); } - NS_WITH_SERVICE (nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsAutoString topic; topic.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID); @@ -101,7 +104,8 @@ nsresult nsMsgBiffManager::Init() //Ensure status bar biff service has started - NS_WITH_SERVICE(nsStatusBarBiffManager, statusBarBiffService, kStatusBarBiffManagerCID, &rv); + nsCOMPtr statusBarBiffService = + do_GetService(kStatusBarBiffManagerCID, &rv); return NS_OK; } @@ -109,7 +113,8 @@ nsresult nsMsgBiffManager::Init() nsresult nsMsgBiffManager::Shutdown() { nsresult rv; - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, kMsgAccountManagerCID, &rv); + nsCOMPtr accountManager = + do_GetService(kMsgAccountManagerCID, &rv); if (NS_SUCCEEDED(rv)) { accountManager->RemoveIncomingServerListener(this); diff --git a/mozilla/mailnews/base/src/nsMsgFolderCompactor.cpp b/mozilla/mailnews/base/src/nsMsgFolderCompactor.cpp index ad2f3fb67cd..6cb990d56fe 100644 --- a/mozilla/mailnews/base/src/nsMsgFolderCompactor.cpp +++ b/mozilla/mailnews/base/src/nsMsgFolderCompactor.cpp @@ -209,8 +209,8 @@ nsresult nsFolderCompactState::GetStatusFromMsgName(const char *statusMsgName, P nsresult res = NS_OK; char *propertyURL = MESSENGER_STRING_URL; - NS_WITH_SERVICE(nsIStringBundleService, sBundleService, - kStringBundleServiceCID, &res); + nsCOMPtr sBundleService = + do_GetService(kStringBundleServiceCID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(stringBundle)); diff --git a/mozilla/mailnews/base/src/nsMsgFolderDataSource.cpp b/mozilla/mailnews/base/src/nsMsgFolderDataSource.cpp index b58b9071457..b1bad036a54 100644 --- a/mozilla/mailnews/base/src/nsMsgFolderDataSource.cpp +++ b/mozilla/mailnews/base/src/nsMsgFolderDataSource.cpp @@ -245,7 +245,8 @@ nsresult nsMsgFolderDataSource::Init() if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIMsgMailSession, mailSession, kMsgMailSessionCID, &rv); + nsCOMPtr mailSession = + do_GetService(kMsgMailSessionCID, &rv); if(NS_SUCCEEDED(rv)) mailSession->AddFolderListener(this); @@ -1742,7 +1743,8 @@ nsresult nsMsgFolderDataSource::DoCopyToFolder(nsIMsgFolder *dstFolder, nsISuppo } //Call copyservice with dstFolder, srcFolder, messages, isMove, and txnManager - NS_WITH_SERVICE(nsIMsgCopyService, copyService, kMsgCopyServiceCID, &rv); + nsCOMPtr copyService = + do_GetService(kMsgCopyServiceCID, &rv); if(NS_SUCCEEDED(rv)) { rv = copyService->CopyMessages(srcFolder, messageArray, dstFolder, isMove, diff --git a/mozilla/mailnews/base/src/nsMsgMailSession.cpp b/mozilla/mailnews/base/src/nsMsgMailSession.cpp index 8831abee5b6..6ab84c7f7b0 100644 --- a/mozilla/mailnews/base/src/nsMsgMailSession.cpp +++ b/mozilla/mailnews/base/src/nsMsgMailSession.cpp @@ -345,8 +345,8 @@ NS_IMETHODIMP nsMsgMailSession::RemoveMsgWindow(nsIMsgWindow *msgWindow) if (count == 0) { nsresult rv; - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, - kMsgAccountManagerCID, &rv); + nsCOMPtr accountManager = + do_GetService(kMsgAccountManagerCID, &rv); if (NS_FAILED(rv)) return rv; accountManager->CleanupOnExit(); } diff --git a/mozilla/mailnews/base/src/nsMsgNotificationManager.cpp b/mozilla/mailnews/base/src/nsMsgNotificationManager.cpp index cab7cf33aa3..c1b95daab2d 100644 --- a/mozilla/mailnews/base/src/nsMsgNotificationManager.cpp +++ b/mozilla/mailnews/base/src/nsMsgNotificationManager.cpp @@ -130,14 +130,15 @@ nsresult nsMsgNotificationManager::Init() if(NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIMsgMailSession, mailSession, kMsgMailSessionCID, &rv); + nsCOMPtr mailSession = + do_GetService(kMsgMailSessionCID, &rv); if(NS_SUCCEEDED(rv)) rv = mailSession->AddFolderListener(this); if(NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv); + nsCOMPtr rdfService(do_GetService(kRDFServiceCID, &rv)); if(NS_FAILED(rv)) return rv; @@ -260,7 +261,7 @@ nsMsgNotificationManager::OnItemEvent(nsIFolder *folder, nsIAtom *aEvent) nsresult nsMsgNotificationManager::AddNewMailNotification(nsIMsgFolder *folder) { nsresult rv; - NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv); + nsCOMPtr rdfService(do_GetService(kRDFServiceCID, &rv)); if(NS_FAILED(rv)) return rv; @@ -352,7 +353,7 @@ nsresult nsMsgNotificationManager::AddNewMailNotification(nsIMsgFolder *folder) nsresult nsMsgNotificationManager::RemoveNewMailNotification(nsIMsgFolder *folder) { nsresult rv; - NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv); + nsCOMPtr rdfService(do_GetService(kRDFServiceCID, &rv)); if(NS_FAILED(rv)) return rv; diff --git a/mozilla/mailnews/base/src/nsMsgOfflineManager.cpp b/mozilla/mailnews/base/src/nsMsgOfflineManager.cpp index 25c46563741..6e4ee03a146 100644 --- a/mozilla/mailnews/base/src/nsMsgOfflineManager.cpp +++ b/mozilla/mailnews/base/src/nsMsgOfflineManager.cpp @@ -184,7 +184,7 @@ nsresult nsMsgOfflineManager::AdvanceToNextState(nsresult exitStatus) nsresult nsMsgOfflineManager::SynchronizeOfflineImapChanges() { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService(do_GetService(kCImapService, &rv)); NS_ENSURE_SUCCESS(rv, rv); return imapService->PlaybackAllOfflineOperations(m_window, this); } @@ -196,7 +196,8 @@ nsresult nsMsgOfflineManager::SendUnsentMessages() ShowStatus("sendingUnsent"); nsCOMPtr pMsgSendLater = do_CreateInstance(kMsgSendLaterCID, &rv); NS_ENSURE_SUCCESS(rv, rv); - NS_WITH_SERVICE(nsIMsgAccountManager,accountManager,kCMsgAccountManagerCID,&rv); + nsCOMPtr accountManager = + do_GetService(kCMsgAccountManagerCID, &rv); NS_ENSURE_SUCCESS(rv, rv); // now we have to iterate over the identities, finding the *unique* unsent messages folder // for each one, determine if they have unsent messages, and if so, add them to the list @@ -261,8 +262,8 @@ nsresult nsMsgOfflineManager::ShowStatus(const char *statusMsgName) { char *propertyURL = MESSENGER_STRING_URL; - NS_WITH_SERVICE(nsIStringBundleService, sBundleService, - kStringBundleServiceCID, &res); + nsCOMPtr sBundleService = + do_GetService(kStringBundleServiceCID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(mStringBundle)); @@ -283,7 +284,7 @@ nsresult nsMsgOfflineManager::DownloadOfflineNewsgroups() { nsresult rv; ShowStatus("downloadingNewsgroups"); - NS_WITH_SERVICE(nsINntpService, nntpService, kNntpServiceCID, &rv); + nsCOMPtr nntpService(do_GetService(kNntpServiceCID, &rv)); if (NS_SUCCEEDED(rv) && nntpService) rv = nntpService->DownloadNewsgroupsForOffline(m_window, this); @@ -296,7 +297,7 @@ nsresult nsMsgOfflineManager::DownloadMail() { nsresult rv = NS_OK; ShowStatus("downloadingMail"); - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService(do_GetService(kCImapService, &rv)); NS_ENSURE_SUCCESS(rv, rv); return imapService->DownloadAllOffineImapFolders(m_window, this); // ### we should do get new mail on pop servers, and download imap messages for offline use. @@ -342,7 +343,7 @@ NS_IMETHODIMP nsMsgOfflineManager::SynchronizeForOffline(PRBool downloadNews, PR nsresult nsMsgOfflineManager::SetOnlineState(PRBool online) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, netService, kIOServiceCID, &rv); + nsCOMPtr netService(do_GetService(kIOServiceCID, &rv)); if (NS_SUCCEEDED(rv) && netService) { rv = netService->SetOffline(!online); diff --git a/mozilla/mailnews/base/src/nsMsgPrintEngine.cpp b/mozilla/mailnews/base/src/nsMsgPrintEngine.cpp index 2afd4b34e29..a05b6923686 100644 --- a/mozilla/mailnews/base/src/nsMsgPrintEngine.cpp +++ b/mozilla/mailnews/base/src/nsMsgPrintEngine.cpp @@ -402,7 +402,8 @@ nsMsgPrintEngine::GetString(const PRUnichar *aStringName) { char *propertyURL = MESSENGER_STRING_URL; - NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res); + nsCOMPtr sBundleService = + do_GetService(kStringBundleServiceCID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(mStringBundle)); diff --git a/mozilla/mailnews/base/src/nsMsgWindow.cpp b/mozilla/mailnews/base/src/nsMsgWindow.cpp index 85290ee2f03..115dd2273f8 100644 --- a/mozilla/mailnews/base/src/nsMsgWindow.cpp +++ b/mozilla/mailnews/base/src/nsMsgWindow.cpp @@ -76,12 +76,14 @@ nsresult nsMsgWindow::Init() { // register ourselves as a content listener with the uri dispatcher service nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIURILoader, dispatcher, NS_URI_LOADER_CONTRACTID, &rv); + nsCOMPtr dispatcher = + do_GetService(NS_URI_LOADER_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) rv = dispatcher->RegisterContentListener(this); // create Undo/Redo Transaction Manager - NS_WITH_SERVICE (nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_SUCCEEDED(rv)) { @@ -136,7 +138,8 @@ NS_IMETHODIMP nsMsgWindow::SelectMessage(const char *messageUri) NS_IMETHODIMP nsMsgWindow::CloseWindow() { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIURILoader, dispatcher, NS_URI_LOADER_CONTRACTID, &rv); + nsCOMPtr dispatcher = + do_GetService(NS_URI_LOADER_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) rv = dispatcher->UnRegisterContentListener(this); diff --git a/mozilla/mailnews/base/src/nsStatusBarBiffManager.cpp b/mozilla/mailnews/base/src/nsStatusBarBiffManager.cpp index 492299544c2..510a41a64da 100644 --- a/mozilla/mailnews/base/src/nsStatusBarBiffManager.cpp +++ b/mozilla/mailnews/base/src/nsStatusBarBiffManager.cpp @@ -77,7 +77,8 @@ nsresult nsStatusBarBiffManager::Init() kBiffStateAtom = NS_NewAtom("BiffState"); - NS_WITH_SERVICE(nsIMsgMailSession, mailSession, kMsgMailSessionCID, &rv); + nsCOMPtr mailSession = + do_GetService(kMsgMailSessionCID, &rv); if(NS_SUCCEEDED(rv)) mailSession->AddFolderListener(this); @@ -154,7 +155,8 @@ nsresult nsStatusBarBiffManager::PerformStatusBarBiff(PRUint32 newBiffFlag) } } - NS_WITH_SERVICE(nsIWindowMediator, windowMediator, kWindowMediatorCID, &rv); + nsCOMPtr windowMediator = + do_GetService(kWindowMediatorCID, &rv); nsCOMPtr windowEnumerator; // why use DOM window enumerator instead of XUL window...???? diff --git a/mozilla/mailnews/base/util/nsMsgDBFolder.cpp b/mozilla/mailnews/base/util/nsMsgDBFolder.cpp index 44faee49d2c..cfc9ed1a876 100644 --- a/mozilla/mailnews/base/util/nsMsgDBFolder.cpp +++ b/mozilla/mailnews/base/util/nsMsgDBFolder.cpp @@ -354,7 +354,8 @@ nsresult nsMsgDBFolder::GetFolderCacheElemFromFileSpec(nsIFileSpec *fileSpec, ns PRBool exists; NS_ASSERTION(NS_SUCCEEDED(fileSpec->Exists(&exists)) && exists, "whoops, file doesn't exist, mac will break"); #endif - NS_WITH_SERVICE(nsIMsgAccountManager, accountMgr, kMsgAccountManagerCID, &result); + nsCOMPtr accountMgr = + do_GetService(kMsgAccountManagerCID, &result); if(NS_SUCCEEDED(result)) { result = accountMgr->GetFolderCache(getter_AddRefs(folderCache)); @@ -517,7 +518,8 @@ NS_IMETHODIMP nsMsgDBFolder::GetOfflineFileTransport(nsMsgKey msgKey, PRUint32 * if (NS_SUCCEEDED(rv) && localStore) { NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID); - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; @@ -963,8 +965,8 @@ nsresult nsMsgDBFolder::GetFolderCacheKey(nsIFileSpec **aFileSpec) nsresult nsMsgDBFolder::FlushToFolderCache() { nsresult rv; - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, - NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); + nsCOMPtr accountManager = + do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); if (NS_SUCCEEDED(rv) && accountManager) { nsCOMPtr folderCache; diff --git a/mozilla/mailnews/base/util/nsMsgFolder.cpp b/mozilla/mailnews/base/util/nsMsgFolder.cpp index 92e990d93de..5ddb47fb01b 100644 --- a/mozilla/mailnews/base/util/nsMsgFolder.cpp +++ b/mozilla/mailnews/base/util/nsMsgFolder.cpp @@ -346,7 +346,7 @@ NS_IMETHODIMP nsMsgFolder::FindSubFolder(const char *subFolderName, nsIFolder **aFolder) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); if(NS_FAILED(rv)) return rv; @@ -536,7 +536,7 @@ nsMsgFolder::parseURI(PRBool needServer) rv = url->SetSpec(mURI); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIIOService, ioServ, kIOServiceCID, &rv); + nsCOMPtr ioServ(do_GetService(kIOServiceCID, &rv)); // // pull some info out of the URI @@ -605,8 +605,8 @@ nsMsgFolder::parseURI(PRBool needServer) // turn it back into a server: - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, - NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); + nsCOMPtr accountManager = + do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; #ifdef DEBUG_alecf @@ -1453,11 +1453,11 @@ NS_IMETHODIMP nsMsgFolder::SetPrefFlag() // same uri will get us the cached rdf resouce which should have the folder // flag set appropriately. nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, - NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); + nsCOMPtr accountManager = + do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); if(NS_FAILED(rv)) return rv; @@ -2211,7 +2211,8 @@ nsMsgFolder::NotifyPropertyChanged(nsIAtom *property, //Notify listeners who listen to every folder nsresult rv; - NS_WITH_SERVICE(nsIFolderListener, folderListenerManager, kMsgFolderListenerManagerCID, &rv); + nsCOMPtr folderListenerManager = + do_GetService(kMsgFolderListenerManagerCID, &rv); if(NS_SUCCEEDED(rv)) folderListenerManager->OnItemPropertyChanged(supports, property, oldValue, newValue); @@ -2240,7 +2241,8 @@ nsMsgFolder::NotifyUnicharPropertyChanged(nsIAtom *property, } // Notify listeners who listen to every folder - NS_WITH_SERVICE(nsIFolderListener, folderListenerManager, kMsgFolderListenerManagerCID, &rv); + nsCOMPtr folderListenerManager = + do_GetService(kMsgFolderListenerManagerCID, &rv); if (NS_SUCCEEDED(rv)) rv = folderListenerManager->OnItemUnicharPropertyChanged(supports, property, @@ -2268,7 +2270,8 @@ nsresult nsMsgFolder::NotifyIntPropertyChanged(nsIAtom *property, PRInt32 oldVal //Notify listeners who listen to every folder nsresult rv; - NS_WITH_SERVICE(nsIFolderListener, folderListenerManager, kMsgFolderListenerManagerCID, &rv); + nsCOMPtr folderListenerManager = + do_GetService(kMsgFolderListenerManagerCID, &rv); if(NS_SUCCEEDED(rv)) folderListenerManager->OnItemIntPropertyChanged(supports, property, oldValue, newValue); @@ -2295,7 +2298,8 @@ nsMsgFolder::NotifyBoolPropertyChanged(nsIAtom* property, //Notify listeners who listen to every folder nsresult rv; - NS_WITH_SERVICE(nsIFolderListener, folderListenerManager, kMsgFolderListenerManagerCID, &rv); + nsCOMPtr folderListenerManager = + do_GetService(kMsgFolderListenerManagerCID, &rv); if(NS_SUCCEEDED(rv)) folderListenerManager->OnItemBoolPropertyChanged(supports, property, oldValue, newValue); @@ -2319,7 +2323,8 @@ nsMsgFolder::NotifyPropertyFlagChanged(nsISupports *item, nsIAtom *property, //Notify listeners who listen to every folder nsresult rv; - NS_WITH_SERVICE(nsIFolderListener, folderListenerManager, kMsgFolderListenerManagerCID, &rv); + nsCOMPtr folderListenerManager = + do_GetService(kMsgFolderListenerManagerCID, &rv); if(NS_SUCCEEDED(rv)) folderListenerManager->OnItemPropertyFlagChanged(item, property, oldValue, newValue); @@ -2343,7 +2348,8 @@ nsresult nsMsgFolder::NotifyItemAdded(nsISupports *parentItem, nsISupports *item //Notify listeners who listen to every folder nsresult rv; - NS_WITH_SERVICE(nsIFolderListener, folderListenerManager, kMsgFolderListenerManagerCID, &rv); + nsCOMPtr folderListenerManager = + do_GetService(kMsgFolderListenerManagerCID, &rv); if(NS_SUCCEEDED(rv)) folderListenerManager->OnItemAdded(parentItem, item, viewString); @@ -2363,7 +2369,8 @@ nsresult nsMsgFolder::NotifyItemDeleted(nsISupports *parentItem, nsISupports *it } //Notify listeners who listen to every folder nsresult rv; - NS_WITH_SERVICE(nsIFolderListener, folderListenerManager, kMsgFolderListenerManagerCID, &rv); + nsCOMPtr folderListenerManager = + do_GetService(kMsgFolderListenerManagerCID, &rv); if(NS_SUCCEEDED(rv)) folderListenerManager->OnItemRemoved(parentItem, item, viewString); @@ -2383,7 +2390,8 @@ nsresult nsMsgFolder::NotifyFolderEvent(nsIAtom* aEvent) } //Notify listeners who listen to every folder nsresult rv; - NS_WITH_SERVICE(nsIFolderListener, folderListenerManager, kMsgFolderListenerManagerCID, &rv); + nsCOMPtr folderListenerManager = + do_GetService(kMsgFolderListenerManagerCID, &rv); if(NS_SUCCEEDED(rv)) folderListenerManager->OnItemEvent(this, aEvent); diff --git a/mozilla/mailnews/base/util/nsMsgI18N.cpp b/mozilla/mailnews/base/util/nsMsgI18N.cpp index 20585b17046..196c3e95497 100644 --- a/mozilla/mailnews/base/util/nsMsgI18N.cpp +++ b/mozilla/mailnews/base/util/nsMsgI18N.cpp @@ -235,7 +235,7 @@ nsresult ConvertFromUnicode(const nsString& aCharset, nsresult res; // Resolve charset alias - NS_WITH_SERVICE(nsICharsetAlias, calias, kCharsetAliasCID, &res); + nsCOMPtr calias(do_GetService(kCharsetAliasCID, &res)); if (NS_SUCCEEDED(res)) { nsAutoString aAlias(aCharset); if (aAlias.Length()) { @@ -243,7 +243,8 @@ nsresult ConvertFromUnicode(const nsString& aCharset, } } - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &res); if(NS_SUCCEEDED(res)) { nsIUnicodeEncoder* encoder = nsnull; @@ -313,7 +314,7 @@ nsresult ConvertToUnicode(const nsString& aCharset, nsresult res; // Resolve charset alias - NS_WITH_SERVICE(nsICharsetAlias, calias, kCharsetAliasCID, &res); + nsCOMPtr calias(do_GetService(kCharsetAliasCID, &res)); if (NS_SUCCEEDED(res)) { nsAutoString aAlias(aCharset); if (aAlias.Length()) { @@ -326,7 +327,8 @@ nsresult ConvertToUnicode(const nsString& aCharset, res = NS_OK; } - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &res); if(NS_SUCCEEDED(res) && (nsnull != ccm)) { nsIUnicodeDecoder* decoder = nsnull; @@ -410,7 +412,7 @@ char * nsMsgI18NGetDefaultMailCharset() { nsresult res = NS_OK; char * retVal = nsnull; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (nsnull != prefs && NS_SUCCEEDED(res)) { PRUnichar *prefValue; @@ -638,7 +640,7 @@ nsresult nsMsgI18NSaveAsCharset(const char* contentType, const char *charset, co // Resolve charset alias nsAutoString aCharset; aCharset.AssignWithConversion(charset); - NS_WITH_SERVICE(nsICharsetAlias, calias, kCharsetAliasCID, &res); + nsCOMPtr calias(do_GetService(kCharsetAliasCID, &res)); if (NS_SUCCEEDED(res)) { nsAutoString aAlias(aCharset); if (aAlias.Length()) { @@ -674,7 +676,7 @@ nsresult nsMsgI18NSaveAsCharset(const char* contentType, const char *charset, co if (NS_SUCCEEDED(res)) { // Mapping characters in a certain range (required for Japanese only) if (!nsCRT::strcasecmp("ISO-2022-JP", charset)) { - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (nsnull != prefs && NS_SUCCEEDED(res)) { PRBool return_val; @@ -719,7 +721,7 @@ nsMsgI18NGetAcceptLanguage(void) static char lang[32]; nsresult res; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (nsnull != prefs && NS_SUCCEEDED(res)) { nsXPIDLString prefValue; diff --git a/mozilla/mailnews/base/util/nsMsgIdentity.cpp b/mozilla/mailnews/base/util/nsMsgIdentity.cpp index 5fcd926d228..e545e3c045f 100644 --- a/mozilla/mailnews/base/util/nsMsgIdentity.cpp +++ b/mozilla/mailnews/base/util/nsMsgIdentity.cpp @@ -465,7 +465,7 @@ nsMsgIdentity::setFolderPref(const char *prefname, const char *value) nsCOMPtr res; nsCOMPtr folder; PRUint32 folderflag; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); if (nsCRT::strcmp(prefname, "fcc_folder") == 0) folderflag = MSG_FOLDER_FLAG_SENTMAIL; diff --git a/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp b/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp index 874a72c7a83..f19114fba3b 100644 --- a/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp +++ b/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp @@ -275,8 +275,7 @@ nsMsgIncomingServer::CreateRootFolder() rv = GetServerURI(getter_Copies(serverUri)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIRDFService, rdf, - kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); // get the corresponding RDF resource // RDF will create the server resource if it doesn't already exist @@ -747,7 +746,8 @@ nsMsgIncomingServer::StorePassword() rv = GetPassword(getter_Copies(pwd)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIWalletService, walletservice, kWalletServiceCID, &rv); + nsCOMPtr walletservice = + do_GetService(kWalletServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsXPIDLCString serverUri; @@ -763,7 +763,8 @@ NS_IMETHODIMP nsMsgIncomingServer::ForgetPassword() { nsresult rv; - NS_WITH_SERVICE(nsIWalletService, walletservice, kWalletServiceCID, &rv); + nsCOMPtr walletservice = + do_GetService(kWalletServiceCID, &rv); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp b/mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp index b8b770b290c..07442670dba 100644 --- a/mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp +++ b/mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp @@ -169,8 +169,8 @@ NS_IMETHODIMP nsMsgMailNewsUrl::GetServer(nsIMsgIncomingServer ** aIncomingServe { if (nsCRT::strcmp((const char *)scheme, "pop") == 0) scheme.Adopt(nsCRT::strdup("pop3")); - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, - NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); + nsCOMPtr accountManager = + do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr server; @@ -197,7 +197,8 @@ NS_IMETHODIMP nsMsgMailNewsUrl::GetMsgWindow(nsIMsgWindow **aMsgWindow) // it's possible the url really doesn't have msg window if (!m_msgWindow) { -// NS_WITH_SERVICE(nsIMsgMailSession, mailSession, kMsgMailSessionCID, &rv); +// nsCOMPtr mailSession = +// do_GetService(kMsgMailSessionCID, &rv); // if(NS_SUCCEEDED(rv)) // mailSession->GetTemporaryMsgStatusFeedback(getter_AddRefs(m_statusFeedback)); diff --git a/mozilla/mailnews/base/util/nsMsgProtocol.cpp b/mozilla/mailnews/base/util/nsMsgProtocol.cpp index d1c738770ea..cbacc46806f 100644 --- a/mozilla/mailnews/base/util/nsMsgProtocol.cpp +++ b/mozilla/mailnews/base/util/nsMsgProtocol.cpp @@ -169,7 +169,8 @@ nsresult nsMsgProtocol::OpenFileSocket(nsIURI * aURL, PRUint32 aStartPosition, P rv = GetFileFromURL(aURL, getter_AddRefs(file)); NS_ENSURE_SUCCESS(rv, rv); - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = fts->CreateTransport(file, PR_RDWR | PR_CREATE_FILE, @@ -804,7 +805,8 @@ nsresult nsMsgFilePostHelper::Init(nsIOutputStream * aOutStream, nsMsgAsyncWrite mProtInstance = aProtInstance; // mscott work out ref counting issue - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr transport; @@ -1190,7 +1192,8 @@ PRUnichar *GetStringByID(PRInt32 stringID) nsresult rv; nsCOMPtr sBundle = nsnull; - NS_WITH_SERVICE (nsIStringBundleService, sBundleService, kStringBundleServiceCID, &rv); + nsCOMPtr sBundleService = + do_GetService(kStringBundleServiceCID, &rv); if (NS_FAILED(rv) || (nsnull == sBundleService)) return nsnull; diff --git a/mozilla/mailnews/base/util/nsMsgUtf7Utils.cpp b/mozilla/mailnews/base/util/nsMsgUtf7Utils.cpp index 6efe0c1e5d6..1146874801f 100644 --- a/mozilla/mailnews/base/util/nsMsgUtf7Utils.cpp +++ b/mozilla/mailnews/base/util/nsMsgUtf7Utils.cpp @@ -39,7 +39,8 @@ CreateUtf7ConvertedString(const char * aSourceString, PRInt32 dstLength = 0; char *convertedString = NULL; - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &res); if(NS_SUCCEEDED(res) && (nsnull != ccm)) { @@ -119,7 +120,8 @@ CreateUtf7ConvertedStringFromUnicode(const PRUnichar * aSourceString) char *dstPtr = nsnull; PRInt32 dstLength = 0; - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &res); if(NS_SUCCEEDED(res) && (nsnull != ccm)) { @@ -167,7 +169,8 @@ nsresult CreateUnicodeStringFromUtf7(const char *aSourceString, PRUnichar **aUni PRUnichar *convertedString = NULL; nsresult res; - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &res); if(NS_SUCCEEDED(res) && (nsnull != ccm)) { diff --git a/mozilla/mailnews/compose/src/nsMsgAttachmentHandler.cpp b/mozilla/mailnews/compose/src/nsMsgAttachmentHandler.cpp index 55f2efbd26a..35c3b35ce00 100644 --- a/mozilla/mailnews/compose/src/nsMsgAttachmentHandler.cpp +++ b/mozilla/mailnews/compose/src/nsMsgAttachmentHandler.cpp @@ -199,7 +199,7 @@ int nsMsgAttachmentHandler::PickEncoding(const char *charset, nsIMsgSend *mime_delivery_state) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); // use the boolean so we only have to test for uuencode vs base64 once PRBool needsB64 = PR_FALSE; @@ -989,7 +989,7 @@ nsMsgAttachmentHandler::UrlExit(nsresult status, const PRUnichar* aMsg) // PRInt32 width = 72; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) prefs->GetIntPref("mailnews.wraplength", &width); // Let sanity reign! diff --git a/mozilla/mailnews/compose/src/nsMsgCompPrefs.cpp b/mozilla/mailnews/compose/src/nsMsgCompPrefs.cpp index 11760b7cb10..0ff521a6604 100644 --- a/mozilla/mailnews/compose/src/nsMsgCompPrefs.cpp +++ b/mozilla/mailnews/compose/src/nsMsgCompPrefs.cpp @@ -35,7 +35,7 @@ nsMsgCompPrefs::nsMsgCompPrefs() m_wrapColumn = 72; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (NS_SUCCEEDED(res) && prefs) { res = prefs->GetIntPref("mail.wraplength", &m_wrapColumn); diff --git a/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp b/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp index cf0607a893b..6c2120756f4 100644 --- a/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp +++ b/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp @@ -117,7 +117,7 @@ nsMsgMIMESetConformToStandard (PRBool conform_p) mime_headers_use_quoted_printable_p = PR_TRUE; else { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { rv = prefs->GetBoolPref("mail.strictly_mime_headers", &mime_headers_use_quoted_printable_p); } @@ -211,7 +211,7 @@ mime_generate_headers (nsMsgCompFields *fields, nsresult rv; *status = 0; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) { *status = rv; return nsnull; @@ -433,7 +433,8 @@ mime_generate_headers (nsMsgCompFields *fields, } - NS_WITH_SERVICE(nsIHttpProtocolHandler, pHTTPHandler, kHTTPHandlerCID, &rv); + nsCOMPtr pHTTPHandler = + do_GetService(kHTTPHandlerCID, &rv); if (NS_SUCCEEDED(rv) && pHTTPHandler) { nsXPIDLCString userAgentString; @@ -762,7 +763,7 @@ mime_generate_attachment_headers (const char *type, const char *encoding, PRBool aBodyDocument) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); PRInt32 buffer_size = 2048 + (base_url ? 2*PL_strlen(base_url) : 0); char *buffer = (char *) PR_Malloc (buffer_size); @@ -1487,7 +1488,7 @@ void msg_pick_real_name (nsMsgAttachmentHandler *attachment, const char *charset) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); const char *s, *s2; char *s3; nsXPIDLCString url; @@ -1634,7 +1635,7 @@ nsMsgNewURL(nsIURI** aInstancePtrResult, const char * aSpec) nsresult rv = NS_OK; if (nsnull == aInstancePtrResult) return NS_ERROR_NULL_POINTER; - NS_WITH_SERVICE(nsIIOService, pNetService, kIOServiceCID, &rv); + nsCOMPtr pNetService(do_GetService(kIOServiceCID, &rv)); if (NS_SUCCEEDED(rv) && pNetService) { if (PL_strstr(aSpec, "://") == nsnull) @@ -1866,7 +1867,7 @@ GetFolderURIFromUserPrefs(nsMsgDeliverMode aMode, if (aMode == nsIMsgSend::nsMsgQueueForLater) // QueueForLater (Outbox) { - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !prefs) return nsnull; rv = prefs->CopyCharPref("mail.default_sendlater_uri", &uri); @@ -2065,7 +2066,7 @@ PRBool UseFormatFlowed(const char *charset) PRBool disableForCertainCharsets = PR_TRUE; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return PR_FALSE; diff --git a/mozilla/mailnews/compose/src/nsMsgComposeContentHandler.cpp b/mozilla/mailnews/compose/src/nsMsgComposeContentHandler.cpp index a920ee14c9e..0993c034ccc 100644 --- a/mozilla/mailnews/compose/src/nsMsgComposeContentHandler.cpp +++ b/mozilla/mailnews/compose/src/nsMsgComposeContentHandler.cpp @@ -57,7 +57,8 @@ NS_IMETHODIMP nsMsgComposeContentHandler::HandleContent(const char * aContentTyp rv = aChannel->GetURI(getter_AddRefs(aUri)); if (aUri) { - NS_WITH_SERVICE(nsIMsgComposeService, composeService, kMsgComposeServiceCID, &rv) + nsCOMPtr composeService = + do_GetService(kMsgComposeServiceCID, &rv); if (NS_SUCCEEDED(rv)) rv = composeService->OpenComposeWindowWithURI(nsnull, aUri); } diff --git a/mozilla/mailnews/compose/src/nsMsgCopy.cpp b/mozilla/mailnews/compose/src/nsMsgCopy.cpp index 618aa27e090..45aa26cc643 100644 --- a/mozilla/mailnews/compose/src/nsMsgCopy.cpp +++ b/mozilla/mailnews/compose/src/nsMsgCopy.cpp @@ -276,8 +276,8 @@ nsMsgCopy::DoCopy(nsIFileSpec *aDiskFile, nsIMsgFolder *dstFolder, { nsCOMPtr imapFolder = do_QueryInterface(dstFolder); - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, - NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); + nsCOMPtr accountManager = + do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; PRBool shutdownInProgress = PR_FALSE; rv = accountManager->GetShutdownInProgress(&shutdownInProgress); @@ -288,8 +288,8 @@ nsMsgCopy::DoCopy(nsIFileSpec *aDiskFile, nsIMsgFolder *dstFolder, // process mCopyListener->mCopyObject = do_QueryInterface(tPtr); mCopyListener->mCopyInProgress = PR_TRUE; - NS_WITH_SERVICE(nsIEventQueueService, pEventQService, - kEventQueueServiceCID, &rv); + nsCOMPtr pEventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; pEventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(eventQueue)); @@ -419,7 +419,7 @@ LocateMessageFolder(nsIMsgIdentity *userIdentity, // as long as it doesn't start with anyfolder:// if (PL_strncasecmp(ANY_SERVER, aFolderURI, PL_strlen(aFolderURI)) != 0) { - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); if (NS_FAILED(rv)) return rv; // get the corresponding RDF resource @@ -448,8 +448,8 @@ LocateMessageFolder(nsIMsgIdentity *userIdentity, return NS_ERROR_INVALID_ARG; // get the account manager - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, - NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); + nsCOMPtr accountManager = + do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; // if anyfolder will do, go look for one. diff --git a/mozilla/mailnews/compose/src/nsMsgQuote.cpp b/mozilla/mailnews/compose/src/nsMsgQuote.cpp index aae9406e640..06269eca88b 100644 --- a/mozilla/mailnews/compose/src/nsMsgQuote.cpp +++ b/mozilla/mailnews/compose/src/nsMsgQuote.cpp @@ -172,7 +172,7 @@ nsMsgQuote::QuoteMessage(const char *msgURI, PRBool quoteHeaders, nsIStreamListe nsCAutoString modifiedUrlSpec(urlSpec); PRBool bAutoQuote = PR_TRUE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv)) prefs->GetBoolPref("mail.auto_quote", &bAutoQuote); @@ -203,13 +203,14 @@ nsMsgQuote::QuoteMessage(const char *msgURI, PRBool quoteHeaders, nsIStreamListe // now we want to create a necko channel for this url and we want to open it mQuoteChannel = null_nsCOMPtr(); - NS_WITH_SERVICE(nsIIOService, netService, kIOServiceCID, &rv); + nsCOMPtr netService(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; rv = netService->NewChannelFromURI(aURL, getter_AddRefs(mQuoteChannel)); if (NS_FAILED(rv)) return rv; nsCOMPtr ctxt = do_QueryInterface(aURL); - NS_WITH_SERVICE(nsIStreamConverterService, streamConverterService, kIStreamConverterServiceCID, &rv); + nsCOMPtr streamConverterService = + do_GetService(kIStreamConverterServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr convertedListener; diff --git a/mozilla/mailnews/compose/src/nsMsgSend.cpp b/mozilla/mailnews/compose/src/nsMsgSend.cpp index 78f2bf9f833..38a4de74cd9 100644 --- a/mozilla/mailnews/compose/src/nsMsgSend.cpp +++ b/mozilla/mailnews/compose/src/nsMsgSend.cpp @@ -1301,7 +1301,7 @@ nsMsgComposeAndSend::GetBodyFromEditor() { PRUint32 whattodo = mozITXTToHTMLConv::kURLs; PRBool enable_structs = PR_FALSE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { rv = prefs->GetBoolPref(PREF_MAIL_SEND_STRUCT,&enable_structs); @@ -2727,7 +2727,7 @@ nsMsgComposeAndSend::Init( // Needed for mime encoding! // PRBool strictly_mime = PR_TRUE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { rv = prefs->GetBoolPref(PREF_MAIL_STRICTLY_MIME, &strictly_mime); @@ -2934,15 +2934,15 @@ nsMsgComposeAndSend::DeliverFileAsMail() nsresult rv; PRBool collectOutgoingAddresses = PR_TRUE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { prefs->GetBoolPref(PREF_MAIL_COLLECT_EMAIL_ADDRESS_OUTGOING,&collectOutgoingAddresses); } - NS_WITH_SERVICE(nsIAbAddressCollecter, addressCollecter, - kCAddressCollecter, &rv); + nsCOMPtr addressCollecter = + do_GetService(kCAddressCollecter, &rv); if (!NS_SUCCEEDED(rv)) addressCollecter = nsnull; @@ -2989,7 +2989,7 @@ nsMsgComposeAndSend::DeliverFileAsMail() buf = convbuf; } - NS_WITH_SERVICE(nsISmtpService, smtpService, kSmtpServiceCID, &rv); + nsCOMPtr smtpService(do_GetService(kSmtpServiceCID, &rv)); if (NS_SUCCEEDED(rv) && smtpService) { nsMsgDeliveryListener * aListener = new nsMsgDeliveryListener(SendDeliveryCallback, nsMailDelivery, this); @@ -3041,7 +3041,7 @@ nsMsgComposeAndSend::DeliverFileAsNews() nsCOMPtr promptObject; GetDefaultPrompt(getter_AddRefs(promptObject)); - NS_WITH_SERVICE(nsINntpService, nntpService, kNntpServiceCID, &rv); + nsCOMPtr nntpService(do_GetService(kNntpServiceCID, &rv)); if (NS_SUCCEEDED(rv) && nntpService) { diff --git a/mozilla/mailnews/compose/src/nsMsgSendLater.cpp b/mozilla/mailnews/compose/src/nsMsgSendLater.cpp index 02c3109176a..3849280cb06 100644 --- a/mozilla/mailnews/compose/src/nsMsgSendLater.cpp +++ b/mozilla/mailnews/compose/src/nsMsgSendLater.cpp @@ -397,7 +397,7 @@ SendOperationListener::OnStopSending(const char *aMsgID, nsresult aStatus, const // // Now delete the message from the outbox folder. // - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) prefs->GetBoolPref("mail.really_delete_draft", &deleteMsgs); @@ -624,7 +624,7 @@ nsMsgSendLater::GetUnsentMessagesFolder(nsIMsgIdentity *userIdentity, nsIMsgFold char *uri = nsnull; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv) || !prefs) return nsnull; @@ -1184,7 +1184,8 @@ nsMsgSendLater::DealWithTheIdentityMojo(nsIMsgIdentity *identity, if (mIdentityKey) { // get the account manager - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); + nsCOMPtr accountManager = + do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; @@ -1235,7 +1236,8 @@ nsMsgSendLater::DealWithTheIdentityMojo(nsIMsgIdentity *identity, if ( (!tIdentity) && (!identity) ) { // get the account manager - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); + nsCOMPtr accountManager = + do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/mailnews/compose/src/nsSmtpServer.cpp b/mozilla/mailnews/compose/src/nsSmtpServer.cpp index c1500285b98..7590e66361c 100644 --- a/mozilla/mailnews/compose/src/nsSmtpServer.cpp +++ b/mozilla/mailnews/compose/src/nsSmtpServer.cpp @@ -70,7 +70,7 @@ nsSmtpServer::GetHostname(char * *aHostname) { nsresult rv; nsCAutoString pref; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); getPrefString("hostname", pref); rv = prefs->CopyCharPref(pref, aHostname); if (NS_FAILED(rv)) *aHostname=nsnull; @@ -82,7 +82,7 @@ nsSmtpServer::SetHostname(const char * aHostname) { nsresult rv; nsCAutoString pref; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); getPrefString("hostname", pref); if (aHostname) return prefs->SetCharPref(pref, aHostname); @@ -97,7 +97,7 @@ nsSmtpServer::GetTrySSL(PRInt32 *trySSL) nsresult rv; nsCAutoString pref; NS_ENSURE_ARG_POINTER(trySSL); - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_FAILED(rv)) return rv; *trySSL= 0; getPrefString("try_ssl", pref); @@ -112,7 +112,7 @@ nsSmtpServer::SetTrySSL(PRInt32 trySSL) { nsresult rv; nsCAutoString pref; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_FAILED(rv)) return rv; getPrefString("try_ssl", pref); return prefs->SetIntPref(pref, trySSL); @@ -124,7 +124,7 @@ nsSmtpServer::GetAuthMethod(PRInt32 *authMethod) nsresult rv; nsCAutoString pref; NS_ENSURE_ARG_POINTER(authMethod); - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_FAILED(rv)) return rv; *authMethod = 1; getPrefString("auth_method", pref); @@ -159,7 +159,7 @@ nsSmtpServer::SetAuthMethod(PRInt32 authMethod) { nsresult rv; nsCAutoString pref; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_FAILED(rv)) return rv; getPrefString("auth_method", pref); return prefs->SetIntPref(pref, authMethod); @@ -170,7 +170,7 @@ nsSmtpServer::GetUsername(char * *aUsername) { nsresult rv; nsCAutoString pref; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); getPrefString("username", pref); rv = prefs->CopyCharPref(pref, aUsername); if (NS_FAILED(rv)) *aUsername = nsnull; @@ -182,7 +182,7 @@ nsSmtpServer::SetUsername(const char * aUsername) { nsresult rv; nsCAutoString pref; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); getPrefString("username", pref); if (aUsername) return prefs->SetCharPref(pref, aUsername); @@ -309,7 +309,8 @@ NS_IMETHODIMP nsSmtpServer::ForgetPassword() { nsresult rv; - NS_WITH_SERVICE(nsIWalletService, walletservice, kWalletServiceCID, &rv); + nsCOMPtr walletservice = + do_GetService(kWalletServiceCID, &rv); if (NS_FAILED(rv)) return rv; @@ -379,7 +380,7 @@ nsSmtpServer::SetRedirectorType(const char *aRedirectorType) { nsresult rv; nsCAutoString pref; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); getPrefString("redirector_type", pref); if (aRedirectorType) return prefs->SetCharPref(pref, aRedirectorType); @@ -393,7 +394,7 @@ nsSmtpServer::GetRedirectorType(char **aResult) { nsresult rv; nsCAutoString pref; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); getPrefString("redirector_type", pref); rv = prefs->CopyCharPref(pref, aResult); if (NS_FAILED(rv)) *aResult=nsnull; diff --git a/mozilla/mailnews/compose/src/nsSmtpService.cpp b/mozilla/mailnews/compose/src/nsSmtpService.cpp index 58fedb0ec0c..6db004e0d73 100644 --- a/mozilla/mailnews/compose/src/nsSmtpService.cpp +++ b/mozilla/mailnews/compose/src/nsSmtpService.cpp @@ -523,7 +523,7 @@ nsSmtpService::loadSmtpServers() if (mSmtpServersLoaded) return NS_OK; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_FAILED(rv)) return rv; nsXPIDLCString serverList; @@ -553,7 +553,7 @@ nsresult nsSmtpService::saveKeyList() { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_FAILED(rv)) return rv; return prefs->SetCharPref("mail.smtpservers", mServerKeyList); @@ -576,7 +576,7 @@ nsSmtpService::createKeyedServer(const char *key, nsISmtpServer** aResult) server->SetKey(NS_CONST_CAST(char *,key)); mSmtpServers->AppendElement(server); - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_SUCCEEDED(rv)) { if (mServerKeyList.IsEmpty()) mServerKeyList = key; @@ -625,7 +625,7 @@ nsSmtpService::GetDefaultServer(nsISmtpServer **aServer) *aServer = nsnull; // always returns NS_OK, just leaving *aServer at nsnull if (!mDefaultSmtpServer) { - NS_WITH_SERVICE(nsIPref, pref, NS_PREF_CONTRACTID, &rv); + nsCOMPtr pref(do_GetService(NS_PREF_CONTRACTID, &rv)); if (NS_FAILED(rv)) return rv; // try to get it from the prefs @@ -685,7 +685,7 @@ nsSmtpService::SetDefaultServer(nsISmtpServer *aServer) rv = aServer->GetKey(getter_Copies(serverKey)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIPref, pref, NS_PREF_CONTRACTID, &rv); + nsCOMPtr pref(do_GetService(NS_PREF_CONTRACTID, &rv)); pref->SetCharPref("mail.smtp.defaultserver", serverKey); return NS_OK; } diff --git a/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp b/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp index ab458ea90e9..5dd72f47d86 100644 --- a/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp +++ b/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp @@ -1075,8 +1075,8 @@ NS_IMETHODIMP nsMsgDatabase::Commit(nsMsgDBCommit commitType) GetEnv()->ClearErrors(); nsresult rv; - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, - NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); + nsCOMPtr accountManager = + do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); if (NS_SUCCEEDED(rv) && accountManager) { nsCOMPtr folderCache; @@ -3460,7 +3460,7 @@ nsresult nsMsgDatabase::GetBoolPref(const char *prefName, PRBool *result) { PRBool prefValue = PR_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { rv = prefs->GetBoolPref(prefName, &prefValue); diff --git a/mozilla/mailnews/imap/src/nsIMAPBodyShell.cpp b/mozilla/mailnews/imap/src/nsIMAPBodyShell.cpp index 933d512eb85..b5bb872b4b8 100644 --- a/mozilla/mailnews/imap/src/nsIMAPBodyShell.cpp +++ b/mozilla/mailnews/imap/src/nsIMAPBodyShell.cpp @@ -66,7 +66,7 @@ nsIMAPBodyShell::nsIMAPBodyShell(nsImapProtocol *protocolConnection, const char if (gMaxDepth == 0) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) // one-time initialization prefs->GetIntPref("mail.imap.mime_parts_on_demand_max_depth", &gMaxDepth); diff --git a/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp b/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp index 56bea13aa79..2df289f1a7f 100644 --- a/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp +++ b/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp @@ -130,7 +130,8 @@ NS_IMETHODIMP nsImapIncomingServer::SetKey(const char * aKey) // override nsMsg // host session list!! nsresult rv; - NS_WITH_SERVICE(nsIImapHostSessionList, hostSession, kCImapHostSessionList, &rv); + nsCOMPtr hostSession = + do_GetService(kCImapHostSessionList, &rv); if (NS_FAILED(rv)) return rv; hostSession->AddHostToList(aKey, this); @@ -182,8 +183,8 @@ nsImapIncomingServer::GetConstructedPrettyName(PRUnichar **retval) nsXPIDLCString hostName; nsresult rv; - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, - NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); + nsCOMPtr accountManager = + do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv; @@ -252,8 +253,8 @@ nsImapIncomingServer::SetServerDirectory(const char *serverDirectory) nsresult rv = GetKey(getter_Copies(serverKey)); if (NS_SUCCEEDED(rv)) { - NS_WITH_SERVICE(nsIImapHostSessionList, hostSession, - kCImapHostSessionList, &rv); + nsCOMPtr hostSession = + do_GetService(kCImapHostSessionList, &rv); if (NS_SUCCEEDED(rv)) hostSession->SetOnlineDirForHost(serverKey, dirString.get()); } @@ -275,8 +276,8 @@ nsImapIncomingServer::SetOverrideNamespaces(PRBool bVal) if (serverKey) { nsresult rv; - NS_WITH_SERVICE(nsIImapHostSessionList, hostSession, - kCImapHostSessionList, &rv); + nsCOMPtr hostSession = + do_GetService(kCImapHostSessionList, &rv); if (NS_SUCCEEDED(rv)) hostSession->SetNamespacesOverridableForHost(serverKey, bVal); } @@ -297,8 +298,8 @@ nsImapIncomingServer::SetUsingSubscription(PRBool bVal) if (serverKey) { nsresult rv; - NS_WITH_SERVICE(nsIImapHostSessionList, hostSession, - kCImapHostSessionList, &rv); + nsCOMPtr hostSession = + do_GetService(kCImapHostSessionList, &rv); if (NS_SUCCEEDED(rv)) hostSession->SetHostIsUsingSubscription(serverKey, bVal); } @@ -729,8 +730,8 @@ nsImapIncomingServer::CreateProtocolInstance(nsIEventQueue *aEventQueue, (void **) &protocolInstance); if (NS_SUCCEEDED(rv) && protocolInstance) { - NS_WITH_SERVICE(nsIImapHostSessionList, hostSession, - kCImapHostSessionList, &rv); + nsCOMPtr hostSession = + do_GetService(kCImapHostSessionList, &rv); if (NS_SUCCEEDED(rv)) rv = protocolInstance->Initialize(hostSession, aEventQueue); } @@ -848,7 +849,8 @@ nsImapIncomingServer::PerformExpand(nsIMsgWindow *aMsgWindow) if (!imapService) return NS_ERROR_FAILURE; nsCOMPtr queue; // get the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, pEventQService, kEventQueueServiceCID, &rv); + nsCOMPtr pEventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; if (!pEventQService) return NS_ERROR_FAILURE; @@ -947,7 +949,7 @@ NS_IMETHODIMP nsImapIncomingServer::GetPFC(PRBool createIfMissing, nsIMsgFolder // get the URI from the incoming server nsCOMPtr res; nsCOMPtr pfcFileSpec; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); rv = rdf->GetResource((const char *)folderUri, getter_AddRefs(res)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr parentToCreate = do_QueryInterface(res, &rv); @@ -998,7 +1000,7 @@ nsresult nsImapIncomingServer::GetPFCForStringId(PRBool createIfMissing, PRInt32 { // get the URI from the incoming server nsCOMPtr res; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); rv = rdf->GetResource((const char *)pfcMailUri, getter_AddRefs(res)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr parentToCreate = do_QueryInterface(res, &rv); @@ -1368,7 +1370,7 @@ nsresult nsImapIncomingServer::GetFolder(const char* name, nsIMsgFolder** pFolde nsAutoString uriAutoString; uriAutoString.AssignWithConversion(uri); uriAutoString.AppendWithConversion('/'); uriAutoString.AppendWithConversion(name); - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); if (NS_FAILED(rv)) return rv; char* uriString = uriAutoString.ToNewCString(); nsCOMPtr res; @@ -2187,7 +2189,8 @@ NS_IMETHODIMP nsImapIncomingServer::CommitNamespaces() { nsresult rv; - NS_WITH_SERVICE(nsIImapHostSessionList, hostSession, kCImapHostSessionList, &rv); + nsCOMPtr hostSession = + do_GetService(kCImapHostSessionList, &rv); if (NS_FAILED(rv)) return rv; @@ -2435,7 +2438,8 @@ NS_IMETHODIMP nsImapIncomingServer::OnLogonRedirectionError(const PRUnichar *pEr nsCOMPtr imapProtocol; nsCOMPtr aEventQueue; // Get current thread envent queue - NS_WITH_SERVICE(nsIEventQueueService, pEventQService, kEventQueueServiceCID, &rv); + nsCOMPtr pEventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv) && pEventQService) pEventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(aEventQueue)); @@ -2477,7 +2481,8 @@ NS_IMETHODIMP nsImapIncomingServer::OnLogonRedirectionReply(const PRUnichar *pHo nsCOMPtr aEventQueue; nsCAutoString cookie(pCookieData, pCookieSize); // Get current thread envent queue - NS_WITH_SERVICE(nsIEventQueueService, pEventQService, kEventQueueServiceCID, &rv); + nsCOMPtr pEventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv) && pEventQService) pEventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(aEventQueue)); @@ -2822,7 +2827,8 @@ nsImapIncomingServer::SubscribeToFolder(const PRUnichar *aName, PRBool subscribe nsCOMPtr queue; // get the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, pEventQService, kEventQueueServiceCID, &rv); + nsCOMPtr pEventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = pEventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(queue)); diff --git a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp index af3982d636f..f3e9890ff16 100644 --- a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp +++ b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp @@ -178,7 +178,8 @@ nsImapMailFolder::nsImapMailFolder() : // Get current thread envent queue - NS_WITH_SERVICE(nsIEventQueueService, pEventQService, kEventQueueServiceCID, &rv); + nsCOMPtr pEventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv) && pEventQService) pEventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(m_eventQueue)); @@ -274,7 +275,7 @@ NS_IMETHODIMP nsImapMailFolder::AddSubfolderWithPath(nsAutoString *name, nsIFile return NS_ERROR_NULL_POINTER; nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); if(NS_FAILED(rv)) return rv; @@ -573,7 +574,7 @@ nsImapMailFolder::UpdateFolder(nsIMsgWindow *msgWindow) nsresult rv = NS_ERROR_NULL_POINTER; PRBool selectFolder = PR_FALSE; - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService(do_GetService(kCImapService, &rv)); if (NS_FAILED(rv)) return rv; @@ -619,7 +620,8 @@ nsImapMailFolder::UpdateFolder(nsIMsgWindow *msgWindow) if (NS_SUCCEEDED(rv) && !m_urlRunning && selectFolder) { nsCOMPtr eventQ; - NS_WITH_SERVICE(nsIEventQueueService, pEventQService, kEventQueueServiceCID, &rv); + nsCOMPtr pEventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv) && pEventQService) pEventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(eventQ)); @@ -668,7 +670,7 @@ NS_IMETHODIMP nsImapMailFolder::CreateSubfolder(const PRUnichar* folderName, nsI return NS_MSG_FOLDER_EXISTS; } - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService(do_GetService(kCImapService, &rv)); if (NS_SUCCEEDED(rv)) rv = imapService->CreateFolder(m_eventQueue, this, folderName, this, nsnull); @@ -723,7 +725,7 @@ NS_IMETHODIMP nsImapMailFolder::CreateClientSubfolderInfo(const char *folderName PRInt32 folderStart = leafName.FindChar('/'); if (folderStart > 0) { - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); nsCOMPtr res; nsCOMPtr parentFolder; nsCAutoString uri (mURI); @@ -832,7 +834,7 @@ NS_IMETHODIMP nsImapMailFolder::CreateClientSubfolderInfo(const char *folderName NS_IMETHODIMP nsImapMailFolder::List() { nsresult rv; - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService(do_GetService(kCImapService, &rv)); if (NS_FAILED(rv)) return rv; rv = imapService->ListFolder(m_eventQueue, this, nsnull, nsnull); @@ -879,7 +881,7 @@ NS_IMETHODIMP nsImapMailFolder::CreateStorageIfMissing(nsIUrlListener* urlListen parentName.Truncate(leafPos); // get the corresponding RDF resource // RDF will create the folder resource if it doesn't already exist - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &status); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &status)); if (NS_FAILED(status)) return status; nsCOMPtr resource; status = rdf->GetResource(parentName, getter_AddRefs(resource)); @@ -893,7 +895,7 @@ NS_IMETHODIMP nsImapMailFolder::CreateStorageIfMissing(nsIUrlListener* urlListen nsXPIDLString folderName; GetName(getter_Copies(folderName)); nsresult rv; - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService(do_GetService(kCImapService, &rv)); if (NS_SUCCEEDED(rv) && imapService) { nsCOMPtr uri; @@ -1023,7 +1025,7 @@ NS_IMETHODIMP nsImapMailFolder::Compact(nsIUrlListener *aListener, nsIMsgWindow } else { - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService(do_GetService(kCImapService, &rv)); if (NS_SUCCEEDED(rv) && imapService) { rv = imapService->Expunge(m_eventQueue, this, aListener, nsnull); @@ -1045,7 +1047,8 @@ NS_IMETHODIMP nsImapMailFolder::EmptyTrash(nsIMsgWindow *msgWindow, rv = GetTrashFolder(getter_AddRefs(trashFolder)); if (NS_SUCCEEDED(rv)) { - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, kMsgAccountManagerCID, &rv); + nsCOMPtr accountManager = + do_GetService(kMsgAccountManagerCID, &rv); if (accountManager) { // if we are emptying trash on exit and we are an aol server then don't perform @@ -1090,7 +1093,8 @@ NS_IMETHODIMP nsImapMailFolder::EmptyTrash(nsIMsgWindow *msgWindow, rv = trashFolder->Delete(); // delete summary spec rv = trashFolder->GetMsgDatabase(msgWindow, getter_AddRefs(trashDB)); - NS_WITH_SERVICE (nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService = + do_GetService(kCImapService, &rv); if (NS_SUCCEEDED(rv)) { if (aListener) @@ -1180,7 +1184,7 @@ NS_IMETHODIMP nsImapMailFolder::Rename (const PRUnichar *newName, nsIMsgWindow * if (incomingImapServer) RecursiveCloseActiveConnections(incomingImapServer); - NS_WITH_SERVICE (nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService(do_GetService(kCImapService, &rv)); if (NS_SUCCEEDED(rv)) rv = imapService->RenameLeaf(m_eventQueue, this, newName, this, nsnull); @@ -1945,7 +1949,7 @@ nsImapMailFolder::DeleteSubFolders(nsISupportsArray* folders, nsIMsgWindow *msgW PRBool deleteNoTrash = TrashOrDescendentOfTrash(this);; PRBool confirmed = PR_FALSE; - NS_WITH_SERVICE (nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService(do_GetService(kCImapService, &rv)); if (NS_SUCCEEDED(rv)) { rv = folders->Count(&folderCount); @@ -2606,7 +2610,8 @@ NS_IMETHODIMP nsImapMailFolder::EndCopy(PRBool copySucceeded) nsCOMPtr urlListener; m_copyState->m_tmpFileSpec->Flush(); m_copyState->m_tmpFileSpec->CloseStream(); - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService = + do_GetService(kCImapService, &rv); if (NS_FAILED(rv)) return rv; rv = QueryInterface(NS_GET_IID(nsIUrlListener), getter_AddRefs(urlListener)); @@ -2803,7 +2808,7 @@ NS_IMETHODIMP nsImapMailFolder::ApplyFilterHit(nsIMsgFilter *filter, PRBool *app NS_IMETHODIMP nsImapMailFolder::SetImapFlags(const char *uids, PRInt32 flags, nsIURI **url) { nsresult rv; - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService(do_GetService(kCImapService, &rv)); if (NS_SUCCEEDED(rv)) { rv = imapService->SetMessageFlags(m_eventQueue, this, this, @@ -2817,7 +2822,7 @@ NS_IMETHODIMP nsImapMailFolder::PlaybackOfflineFolderCreate(const PRUnichar *fol { nsresult rv = NS_ERROR_NULL_POINTER; if (!folderName) return rv; - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService(do_GetService(kCImapService, &rv)); if (NS_SUCCEEDED(rv)) rv = imapService->CreateFolder(m_eventQueue, this, folderName, this, url); @@ -2828,7 +2833,7 @@ NS_IMETHODIMP nsImapMailFolder::ReplayOfflineMoveCopy(nsMsgKey *msgKeys, PRInt32 nsIUrlListener *aUrlListener, nsIMsgWindow *aWindow) { nsresult rv; - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService(do_GetService(kCImapService, &rv)); if (NS_SUCCEEDED(rv)) { nsCAutoString uids; @@ -2851,7 +2856,7 @@ NS_IMETHODIMP nsImapMailFolder::StoreImapFlags(PRInt32 flags, PRBool addFlags, n nsresult rv = NS_OK; if (!WeAreOffline()) { - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService(do_GetService(kCImapService, &rv)); if (NS_SUCCEEDED(rv)) { nsCAutoString msgIds; @@ -2929,7 +2934,7 @@ NS_IMETHODIMP nsImapMailFolder::StoreImapFlags(PRInt32 flags, PRBool addFlags, n NS_IMETHODIMP nsImapMailFolder::LiteSelect(nsIUrlListener *aUrlListener) { nsresult rv; - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService(do_GetService(kCImapService, &rv)); if (NS_SUCCEEDED(rv)) rv = imapService->LiteSelectFolder(m_eventQueue, this, aUrlListener, nsnull); return rv; @@ -2945,7 +2950,7 @@ nsresult nsImapMailFolder::MoveIncorporatedMessage(nsIMsgDBHdr *mailHdr, if (m_moveCoalescer) { - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &err); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &err)); nsCOMPtr res; err = rdf->GetResource(destFolderUri, getter_AddRefs(res)); if (NS_FAILED(err)) @@ -3252,7 +3257,7 @@ NS_IMETHODIMP nsImapMailFolder::DownloadMessagesForOffline(nsISupportsArray *mes #endif nsresult rv = BuildIdsAndKeyArray(messages, messageIds, srcKeyArray); if (NS_FAILED(rv) || messageIds.Length() == 0) return rv; - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService(do_GetService(kCImapService, &rv)); if (NS_FAILED(rv)) return rv; SetNotifyDownloadedLines(PR_TRUE); // ### TODO need to clear this when we've finished @@ -3276,7 +3281,7 @@ NS_IMETHODIMP nsImapMailFolder::DownloadAllForOffline(nsIUrlListener *listener, m_downloadingFolderForOfflineUse = PR_TRUE; SetNotifyDownloadedLines(PR_TRUE); - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService(do_GetService(kCImapService, &rv)); if (NS_FAILED(rv)) return rv; // selecting the folder with m_downloadingFolderForOfflineUse true will cause // us to fetch any message bodies we don't have. @@ -3403,15 +3408,16 @@ nsImapMailFolder::OnlineCopyCompleted(nsIImapProtocol *aProtocol, ImapOnlineCopy if (NS_FAILED(rv)) return rv; nsCOMPtr queue; // get the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, pEventQService, - kEventQueueServiceCID, &rv); + nsCOMPtr pEventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = pEventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(queue)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService = + do_GetService(kCImapService, &rv); if (NS_FAILED(rv)) return rv; rv = imapService->AddMessageFlags(queue, this, nsnull, nsnull, @@ -3592,8 +3598,8 @@ nsImapMailFolder::NotifyMessageDeleted(const char *onlineFolderName,PRBool delet PRBool nsImapMailFolder::ShowDeletedMessages() { nsresult err; - NS_WITH_SERVICE(nsIImapHostSessionList, hostSession, - kCImapHostSessionList, &err); + nsCOMPtr hostSession = + do_GetService(kCImapHostSessionList, &err); PRBool showDeleted = PR_FALSE; if (NS_SUCCEEDED(err) && hostSession) @@ -3636,8 +3642,8 @@ PRBool nsImapMailFolder::ShowDeletedMessages() PRBool nsImapMailFolder::DeleteIsMoveToTrash() { nsresult err; - NS_WITH_SERVICE(nsIImapHostSessionList, hostSession, - kCImapHostSessionList, &err); + nsCOMPtr hostSession = + do_GetService(kCImapHostSessionList, &err); PRBool rv = PR_TRUE; if (NS_SUCCEEDED(err) && hostSession) @@ -3774,7 +3780,8 @@ nsImapMailFolder::OnStopRunningUrl(nsIURI *aUrl, nsresult aExitCode) m_urlRunning = PR_FALSE; m_downloadingFolderForOfflineUse = PR_FALSE; SetNotifyDownloadedLines(PR_FALSE); - NS_WITH_SERVICE(nsIMsgMailSession, session, kMsgMailSessionCID, &rv); + nsCOMPtr session = + do_GetService(kMsgMailSessionCID, &rv); nsCOMPtr listener; if (aUrl) { @@ -4287,7 +4294,8 @@ nsImapMailFolder::HeaderFetchCompleted(nsIImapProtocol* aProtocol) if (m_moveCoalescer) { nsCOMPtr eventQ; - NS_WITH_SERVICE(nsIEventQueueService, pEventQService, kEventQueueServiceCID, &rv); + nsCOMPtr pEventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv) && pEventQService) pEventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(eventQ)); @@ -4698,7 +4706,7 @@ nsresult nsImapMailFolder::GetClearedOriginalOp(nsIMsgOfflineImapOperation *op, nsCOMPtr res; nsresult rv; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); if (NS_FAILED(rv)) return rv; rv = rdf->GetResource(sourceFolderURI, getter_AddRefs(res)); @@ -4746,7 +4754,7 @@ nsresult nsImapMailFolder::GetOriginalOp(nsIMsgOfflineImapOperation *op, nsIMsgO nsCOMPtr res; nsresult rv; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); if (NS_FAILED(rv)) return rv; rv = rdf->GetResource(sourceFolderURI, getter_AddRefs(res)); @@ -5124,7 +5132,7 @@ nsImapMailFolder::CopyMessages(nsIMsgFolder* srcFolder, if (WeAreOffline()) return CopyMessagesOffline(srcFolder, messages, isMove, msgWindow, listener); - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService(do_GetService(kCImapService, &rv)); if (!srcFolder || !messages) return NS_ERROR_NULL_POINTER; nsCOMPtr srcServer; @@ -5261,7 +5269,7 @@ nsImapMailFolder::CopyFileMessage(nsIFileSpec* fileSpec, rv = NS_NewISupportsArray(getter_AddRefs(messages)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService(do_GetService(kCImapService, &rv)); if (NS_FAILED(rv)) return rv; rv = QueryInterface(NS_GET_IID(nsIUrlListener), getter_AddRefs(urlListener)); @@ -5426,8 +5434,8 @@ nsImapMailFolder::ClearCopyState(nsresult rv) nsCOMPtr srcSupport = do_QueryInterface(m_copyState->m_srcSupport); m_copyState = null_nsCOMPtr(); nsresult result; - NS_WITH_SERVICE(nsIMsgCopyService, copyService, - kMsgCopyServiceCID, &result); + nsCOMPtr copyService = + do_GetService(kMsgCopyServiceCID, &result); if (NS_SUCCEEDED(result)) copyService->NotifyCompletion(srcSupport, this, rv); } @@ -5590,7 +5598,8 @@ NS_IMETHODIMP nsImapMailFolder::PerformExpand(nsIMsgWindow *aMsgWindow) rv = imapServer->GetUsingSubscription(&usingSubscription); if (NS_SUCCEEDED(rv) && !usingSubscription) { - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService = + do_GetService(kCImapService, &rv); if (NS_SUCCEEDED(rv)) rv = imapService->DiscoverChildren(m_eventQueue, this, this, m_onlineFolderName, diff --git a/mozilla/mailnews/imap/src/nsImapMoveCoalescer.cpp b/mozilla/mailnews/imap/src/nsImapMoveCoalescer.cpp index b84171fb0aa..7b1ae69de9a 100644 --- a/mozilla/mailnews/imap/src/nsImapMoveCoalescer.cpp +++ b/mozilla/mailnews/imap/src/nsImapMoveCoalescer.cpp @@ -98,7 +98,8 @@ nsresult nsImapMoveCoalescer::PlaybackMoves(nsIEventQueue *eventQueue) { nsCOMPtr destSupports = getter_AddRefs(m_destFolders->ElementAt(i)); nsCOMPtr destFolder(do_QueryInterface(destSupports)); - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService = + do_GetService(kCImapService, &rv); if (NS_SUCCEEDED(rv) && imapService) { nsMsgKeyArray *keysToAdd = (nsMsgKeyArray *) m_sourceKeyArrays.ElementAt(i); diff --git a/mozilla/mailnews/imap/src/nsImapOfflineSync.cpp b/mozilla/mailnews/imap/src/nsImapOfflineSync.cpp index 5e6bb4308bd..6112ec66f99 100644 --- a/mozilla/mailnews/imap/src/nsImapOfflineSync.cpp +++ b/mozilla/mailnews/imap/src/nsImapOfflineSync.cpp @@ -101,8 +101,8 @@ nsresult nsImapOfflineSync::AdvanceToNextServer() if (!m_allServers) { - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, - NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); + nsCOMPtr accountManager = + do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); NS_ASSERTION(accountManager && NS_SUCCEEDED(rv), "couldn't get account mgr"); if (!accountManager || NS_FAILED(rv)) return rv; @@ -351,7 +351,7 @@ void nsImapOfflineSync::ProcessMoveOperation(nsIMsgOfflineImapOperation *current nsresult rv; nsCOMPtr res; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); if (NS_FAILED(rv)) return ; // ### return error code. rv = rdf->GetResource(moveDestination, getter_AddRefs(res)); if (NS_SUCCEEDED(rv)) @@ -432,7 +432,7 @@ void nsImapOfflineSync::ProcessCopyOperation(nsIMsgOfflineImapOperation *current nsresult rv; nsCOMPtr res; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); if (NS_FAILED(rv)) return ; // ### return error code. rv = rdf->GetResource(copyDestination, getter_AddRefs(res)); if (NS_SUCCEEDED(rv)) @@ -864,7 +864,8 @@ nsresult nsImapOfflineDownloader::ProcessNextOperation() m_mailboxupdatesStarted = PR_TRUE; // Update the INBOX first so the updates on the remaining // folders pickup the results of any filter moves. - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, kMsgAccountManagerCID, &rv); + nsCOMPtr accountManager = + do_GetService(kMsgAccountManagerCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr servers; diff --git a/mozilla/mailnews/imap/src/nsImapProtocol.cpp b/mozilla/mailnews/imap/src/nsImapProtocol.cpp index dd8392ab4a9..a7f425dbf15 100644 --- a/mozilla/mailnews/imap/src/nsImapProtocol.cpp +++ b/mozilla/mailnews/imap/src/nsImapProtocol.cpp @@ -182,7 +182,7 @@ static PRBool gUseEnvelopeCmd = PR_FALSE; nsresult nsImapProtocol::GlobalInitialization() { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { prefs->GetIntPref("mail.imap.chunk_fast", &gTooFastTime); // secs we read too little too fast @@ -599,7 +599,8 @@ nsresult nsImapProtocol::SetupWithUrl(nsIURI * aURL, nsISupports* aConsumer) nsXPIDLCString hostName; - NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv); + nsCOMPtr socketService = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_SUCCEEDED(rv) && aURL) { aURL->GetPort(&port); @@ -716,7 +717,8 @@ NS_IMETHODIMP nsImapProtocol::Run() } - NS_WITH_SERVICE(nsIEventQueueService, pEventQService, kEventQueueServiceCID, &result); + nsCOMPtr pEventQService = + do_GetService(kEventQueueServiceCID, &result); if (NS_FAILED(result)) return result; @@ -4201,7 +4203,8 @@ PRUnichar * nsImapProtocol::CreatePRUnicharStringFromUTF7(const char * aSourceSt PRUnichar *convertedString = NULL; nsresult res; - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &res); if(NS_SUCCEEDED(res) && (nsnull != ccm)) { @@ -4375,7 +4378,7 @@ void nsImapProtocol::Language() // extract the desired language attribute from prefs nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); nsXPIDLString acceptLanguages; if (NS_SUCCEEDED(rv) && prefs) prefs->GetLocalizedUnicharPref("intl.accept_languages", getter_Copies(acceptLanguages)); @@ -6579,7 +6582,7 @@ PRBool nsImapProtocol::TryToLogon() PRBool lastReportingErrors = GetServerStateParser().GetReportingErrors(); GetServerStateParser().SetReportingErrors(PR_FALSE); // turn off errors - we'll put up our own. - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) prefs->GetBoolPref("mail.auth_login", &prefBool); diff --git a/mozilla/mailnews/imap/src/nsImapService.cpp b/mozilla/mailnews/imap/src/nsImapService.cpp index e452e1848eb..3deba6fff6e 100644 --- a/mozilla/mailnews/imap/src/nsImapService.cpp +++ b/mozilla/mailnews/imap/src/nsImapService.cpp @@ -102,7 +102,7 @@ nsImapService::nsImapService() if (!gInitialized) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { prefs->GetBoolPref("mail.imap.mime_parts_on_demand", &gMIMEOnDemand); @@ -678,7 +678,8 @@ nsresult nsImapService::FetchMimePart(nsIImapUrl * aImapUrl, #endif nsCOMPtr queue; // get the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, pEventQService, kEventQueueServiceCID, &rv); + nsCOMPtr pEventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; @@ -834,7 +835,8 @@ NS_IMETHODIMP nsImapService::Search(nsIMsgSearchSession *aSearchSession, nsIMsgW { nsCOMPtr queue; // get the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, pEventQService, kEventQueueServiceCID, &rv); + nsCOMPtr pEventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; @@ -1060,7 +1062,8 @@ nsImapService::FetchMessage(nsIImapUrl * aImapUrl, #endif nsCOMPtr queue; // get the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, pEventQService, kEventQueueServiceCID, &rv); + nsCOMPtr pEventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; @@ -3022,8 +3025,8 @@ NS_IMETHODIMP nsImapService::NewURI(const char *aSpec, nsIURI *aBaseURI, nsIURI aImapUrl->CreateCanonicalSourceFolderPathString(getter_Copies(folderName)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, - NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); + nsCOMPtr accountManager = + do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr server; @@ -3107,7 +3110,7 @@ NS_IMETHODIMP nsImapService::SetDefaultLocalPath(nsIFileSpec *aPath) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return rv; rv = prefs->SetFilePref(PREF_MAIL_ROOT_IMAP, aPath, PR_FALSE /* set default */); @@ -3121,7 +3124,7 @@ nsImapService::GetDefaultLocalPath(nsIFileSpec ** aResult) *aResult = nsnull; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return rv; PRBool havePref = PR_FALSE; @@ -3268,7 +3271,8 @@ nsImapService::GetListOfFoldersWithPath(nsIImapIncomingServer *aServer, nsIMsgWi nsCOMPtr queue; // get the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, pEventQService, kEventQueueServiceCID, &rv); + nsCOMPtr pEventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = pEventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(queue)); @@ -3302,7 +3306,8 @@ nsImapService::GetListOfFoldersOnServer(nsIImapIncomingServer *aServer, nsIMsgWi nsCOMPtr queue; // get the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, pEventQService, kEventQueueServiceCID, &rv); + nsCOMPtr pEventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = pEventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(queue)); diff --git a/mozilla/mailnews/imap/src/nsImapStringBundle.cpp b/mozilla/mailnews/imap/src/nsImapStringBundle.cpp index e044bfb0ede..002d64a3ca5 100644 --- a/mozilla/mailnews/imap/src/nsImapStringBundle.cpp +++ b/mozilla/mailnews/imap/src/nsImapStringBundle.cpp @@ -43,7 +43,8 @@ IMAPGetStringByID(PRInt32 stringID) propertyURL = IMAP_MSGS_URL; - NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res); + nsCOMPtr sBundleService = + do_GetService(kStringBundleServiceCID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { nsIStringBundle* sBundle = nsnull; diff --git a/mozilla/mailnews/imap/src/nsImapUndoTxn.cpp b/mozilla/mailnews/imap/src/nsImapUndoTxn.cpp index 5dbd0127cc1..3c2be9d0a28 100644 --- a/mozilla/mailnews/imap/src/nsImapUndoTxn.cpp +++ b/mozilla/mailnews/imap/src/nsImapUndoTxn.cpp @@ -148,7 +148,7 @@ NS_IMETHODIMP nsImapMoveCopyMsgTxn::UndoTransaction(void) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService(do_GetService(kCImapService, &rv)); if (NS_FAILED(rv)) return rv; if (m_isMove || !m_dstFolder) { @@ -203,7 +203,7 @@ NS_IMETHODIMP nsImapMoveCopyMsgTxn::RedoTransaction(void) { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService(do_GetService(kCImapService, &rv)); if (NS_FAILED(rv)) return rv; if (m_isMove) { @@ -378,8 +378,8 @@ PRBool nsImapMoveCopyMsgTxn::DeleteIsMoveToTrash(nsIMsgFolder *folder) rv = server->GetKey(getter_Copies(serverKey)); if (NS_FAILED(rv) || !serverKey) return PR_FALSE; - NS_WITH_SERVICE(nsIImapHostSessionList, hostSession, - kCImapHostSessionList, &rv); + nsCOMPtr hostSession = + do_GetService(kCImapHostSessionList, &rv); if (NS_FAILED(rv) || !hostSession) return PR_FALSE; rv = hostSession->GetDeleteIsMoveToTrashForHost((const char*) serverKey, retVal); diff --git a/mozilla/mailnews/imap/src/nsImapUrl.cpp b/mozilla/mailnews/imap/src/nsImapUrl.cpp index efafee2dbb7..cefea1242f9 100644 --- a/mozilla/mailnews/imap/src/nsImapUrl.cpp +++ b/mozilla/mailnews/imap/src/nsImapUrl.cpp @@ -712,8 +712,8 @@ NS_IMETHODIMP nsImapUrl::AddOnlineDirectoryIfNecessary(const char *onlineMailbox nsCOMPtr server; char *newOnlineName = nsnull; - NS_WITH_SERVICE(nsIImapHostSessionList, hostSessionList, - kCImapHostSessionListCID, &rv); + nsCOMPtr hostSessionList = + do_GetService(kCImapHostSessionListCID, &rv); if (NS_FAILED(rv)) return rv; rv = GetServer(getter_AddRefs(server)); if (NS_FAILED(rv)) return rv; @@ -900,8 +900,8 @@ NS_IMETHODIMP nsImapUrl::AllocateCanonicalPath(const char *serverPath, char onli char *onlineDir = nsnull; nsCOMPtr server; - NS_WITH_SERVICE(nsIImapHostSessionList, hostSessionList, - kCImapHostSessionListCID, &rv); + nsCOMPtr hostSessionList = + do_GetService(kCImapHostSessionListCID, &rv); *allocatedPath = nsnull; diff --git a/mozilla/mailnews/imap/src/nsImapUtils.cpp b/mozilla/mailnews/imap/src/nsImapUtils.cpp index 11373353a58..fc8d22ff37d 100644 --- a/mozilla/mailnews/imap/src/nsImapUtils.cpp +++ b/mozilla/mailnews/imap/src/nsImapUtils.cpp @@ -95,8 +95,8 @@ nsImapURI2Path(const char* rootURI, const char* uriStr, nsFileSpec& pathResult) } nsCOMPtr server; - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, - NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); + nsCOMPtr accountManager = + do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); if(NS_FAILED(rv)) return rv; char *unescapedUserName = username.ToNewCString(); diff --git a/mozilla/mailnews/import/eudora/src/nsEudoraCompose.cpp b/mozilla/mailnews/import/eudora/src/nsEudoraCompose.cpp index 1d4c95d7e6a..2d5a3349cbe 100644 --- a/mozilla/mailnews/import/eudora/src/nsEudoraCompose.cpp +++ b/mozilla/mailnews/import/eudora/src/nsEudoraCompose.cpp @@ -246,7 +246,8 @@ nsresult nsEudoraCompose::CreateComponents( void) if (!m_pMsgSend) { rv = nsComponentManager::CreateInstance( kMsgSendCID, nsnull, NS_GET_IID( nsIMsgSend), (void **) &m_pMsgSend); if (NS_SUCCEEDED( rv) && m_pMsgSend) { - NS_WITH_SERVICE( nsIProxyObjectManager, proxyMgr, kProxyObjectManagerCID, &rv); + nsCOMPtr proxyMgr = + do_GetService(kProxyObjectManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = proxyMgr->GetProxyForObject( NS_UI_THREAD_EVENTQ, NS_GET_IID(nsIMsgSend), m_pMsgSend, PROXY_SYNC, (void**)&m_pSendProxy); diff --git a/mozilla/mailnews/import/eudora/src/nsEudoraImport.cpp b/mozilla/mailnews/import/eudora/src/nsEudoraImport.cpp index 2dd7c6f5c56..a463359101b 100644 --- a/mozilla/mailnews/import/eudora/src/nsEudoraImport.cpp +++ b/mozilla/mailnews/import/eudora/src/nsEudoraImport.cpp @@ -282,7 +282,7 @@ NS_IMETHODIMP nsEudoraImport::GetImportInterface( const char *pImportType, nsISu nsIImportGeneric *pGeneric = nsnull; rv = ImportEudoraMailImpl::Create( &pMail); if (NS_SUCCEEDED( rv)) { - NS_WITH_SERVICE( nsIImportService, impSvc, kImportServiceCID, &rv); + nsCOMPtr impSvc(do_GetService(kImportServiceCID, &rv)); if (NS_SUCCEEDED( rv)) { rv = impSvc->CreateNewGenericMail( &pGeneric); if (NS_SUCCEEDED( rv)) { @@ -305,7 +305,7 @@ NS_IMETHODIMP nsEudoraImport::GetImportInterface( const char *pImportType, nsISu nsIImportGeneric * pGeneric = nsnull; rv = ImportEudoraAddressImpl::Create( &pAddress); if (NS_SUCCEEDED( rv)) { - NS_WITH_SERVICE( nsIImportService, impSvc, kImportServiceCID, &rv); + nsCOMPtr impSvc(do_GetService(kImportServiceCID, &rv)); if (NS_SUCCEEDED( rv)) { rv = impSvc->CreateNewGenericAddressBooks( &pGeneric); if (NS_SUCCEEDED( rv)) { diff --git a/mozilla/mailnews/import/eudora/src/nsEudoraMac.cpp b/mozilla/mailnews/import/eudora/src/nsEudoraMac.cpp index be1258b0aaa..d9d8d73993f 100644 --- a/mozilla/mailnews/import/eudora/src/nsEudoraMac.cpp +++ b/mozilla/mailnews/import/eudora/src/nsEudoraMac.cpp @@ -202,7 +202,7 @@ nsresult nsEudoraMac::FindMailboxes( nsIFileSpec *pRoot, nsISupportsArray **ppAr return( rv); } - NS_WITH_SERVICE( nsIImportService, impSvc, kImportServiceCID, &rv); + nsCOMPtr impSvc(do_GetService(kImportServiceCID, &rv)); if (NS_FAILED( rv)) return( rv); @@ -601,7 +601,8 @@ PRBool nsEudoraMac::ImportSettings( nsIFileSpec *pIniFile, nsIMsgAccount **local PRBool result = PR_FALSE; nsresult rv; - NS_WITH_SERVICE( nsIMsgAccountManager, accMgr, kMsgAccountMgrCID, &rv); + nsCOMPtr accMgr = + do_GetService(kMsgAccountMgrCID, &rv); if (NS_FAILED(rv)) { IMPORT_LOG0( "*** Failed to create a account manager!\n"); return( PR_FALSE); @@ -832,7 +833,7 @@ void nsEudoraMac::SetSmtpServer( nsIMsgAccountManager *pMgr, nsIMsgAccount *pAcc { nsresult rv; - NS_WITH_SERVICE(nsISmtpService, smtpService, kSmtpServiceCID, &rv); + nsCOMPtr smtpService(do_GetService(kSmtpServiceCID, &rv)); if (NS_SUCCEEDED(rv) && smtpService) { nsCOMPtr foundServer; @@ -1086,7 +1087,7 @@ nsresult nsEudoraMac::FindAddressBooks( nsIFileSpec *pRoot, nsISupportsArray **p return( rv); } - NS_WITH_SERVICE( nsIImportService, impSvc, kImportServiceCID, &rv); + nsCOMPtr impSvc(do_GetService(kImportServiceCID, &rv)); if (NS_FAILED( rv)) return( rv); diff --git a/mozilla/mailnews/import/eudora/src/nsEudoraStringBundle.cpp b/mozilla/mailnews/import/eudora/src/nsEudoraStringBundle.cpp index 23554e8609f..995b0d7064e 100644 --- a/mozilla/mailnews/import/eudora/src/nsEudoraStringBundle.cpp +++ b/mozilla/mailnews/import/eudora/src/nsEudoraStringBundle.cpp @@ -43,7 +43,8 @@ nsIStringBundle *nsEudoraStringBundle::GetStringBundle( void) nsIStringBundle* sBundle = nsnull; - NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &rv); + nsCOMPtr sBundleService = + do_GetService(kStringBundleServiceCID, &rv); if (NS_SUCCEEDED(rv) && (nsnull != sBundleService)) { rv = sBundleService->CreateBundle(propertyURL, &sBundle); } @@ -60,7 +61,8 @@ nsIStringBundle *nsEudoraStringBundle::GetStringBundleProxy( void) nsIStringBundle *strProxy = nsnull; nsresult rv; // create a proxy object if we aren't on the same thread? - NS_WITH_SERVICE( nsIProxyObjectManager, proxyMgr, kProxyObjectManagerCID, &rv); + nsCOMPtr proxyMgr = + do_GetService(kProxyObjectManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = proxyMgr->GetProxyForObject( NS_UI_THREAD_EVENTQ, NS_GET_IID(nsIStringBundle), m_pBundle, PROXY_SYNC | PROXY_ALWAYS, (void **) &strProxy); diff --git a/mozilla/mailnews/import/eudora/src/nsEudoraWin32.cpp b/mozilla/mailnews/import/eudora/src/nsEudoraWin32.cpp index 7d74f0fbefa..b65167261e9 100644 --- a/mozilla/mailnews/import/eudora/src/nsEudoraWin32.cpp +++ b/mozilla/mailnews/import/eudora/src/nsEudoraWin32.cpp @@ -182,7 +182,7 @@ nsresult nsEudoraWin32::FindMailboxes( nsIFileSpec *pRoot, nsISupportsArray **pp return( rv); } - NS_WITH_SERVICE( nsIImportService, impSvc, kImportServiceCID, &rv); + nsCOMPtr impSvc(do_GetService(kImportServiceCID, &rv)); if (NS_FAILED( rv)) return( rv); @@ -551,7 +551,8 @@ PRBool nsEudoraWin32::ImportSettings( nsIFileSpec *pIniFile, nsIMsgAccount **loc PRBool result = PR_FALSE; nsresult rv; - NS_WITH_SERVICE( nsIMsgAccountManager, accMgr, kMsgAccountMgrCID, &rv); + nsCOMPtr accMgr = + do_GetService(kMsgAccountMgrCID, &rv); if (NS_FAILED(rv)) { IMPORT_LOG0( "*** Failed to create a account manager!\n"); return( PR_FALSE); @@ -883,7 +884,7 @@ void nsEudoraWin32::SetSmtpServer( nsIMsgAccountManager *pMgr, nsIMsgAccount *pA { nsresult rv; - NS_WITH_SERVICE(nsISmtpService, smtpService, kSmtpServiceCID, &rv); + nsCOMPtr smtpService(do_GetService(kSmtpServiceCID, &rv)); if (NS_SUCCEEDED(rv) && smtpService) { nsCOMPtr foundServer; @@ -1179,7 +1180,7 @@ nsresult nsEudoraWin32::FindAddressBooks( nsIFileSpec *pRoot, nsISupportsArray * return( rv); } - NS_WITH_SERVICE( nsIImportService, impSvc, kImportServiceCID, &rv); + nsCOMPtr impSvc(do_GetService(kImportServiceCID, &rv)); if (NS_FAILED( rv)) return( rv); diff --git a/mozilla/mailnews/import/oexpress/nsOEAddressIterator.cpp b/mozilla/mailnews/import/oexpress/nsOEAddressIterator.cpp index 5a64fa48bc6..b3d3c74738b 100644 --- a/mozilla/mailnews/import/oexpress/nsOEAddressIterator.cpp +++ b/mozilla/mailnews/import/oexpress/nsOEAddressIterator.cpp @@ -262,7 +262,7 @@ PRBool nsOEAddressIterator::BuildCard( const PRUnichar * pName, nsIMdbRow *newRo nsresult rv; // Create a field map - NS_WITH_SERVICE( nsIImportService, impSvc, kImportServiceCID, &rv); + nsCOMPtr impSvc(do_GetService(kImportServiceCID, &rv)); if (NS_SUCCEEDED( rv)) { nsIImportFieldMap * pFieldMap = nsnull; rv = impSvc->CreateNewFieldMap( &pFieldMap); diff --git a/mozilla/mailnews/import/oexpress/nsOEImport.cpp b/mozilla/mailnews/import/oexpress/nsOEImport.cpp index 29aa1fa5b3a..5c5a06ed7a9 100644 --- a/mozilla/mailnews/import/oexpress/nsOEImport.cpp +++ b/mozilla/mailnews/import/oexpress/nsOEImport.cpp @@ -244,7 +244,7 @@ NS_IMETHODIMP nsOEImport::GetImportInterface( const char *pImportType, nsISuppor nsIImportGeneric *pGeneric = nsnull; rv = ImportOEMailImpl::Create( &pMail); if (NS_SUCCEEDED( rv)) { - NS_WITH_SERVICE( nsIImportService, impSvc, kImportServiceCID, &rv); + nsCOMPtr impSvc(do_GetService(kImportServiceCID, &rv)); if (NS_SUCCEEDED( rv)) { rv = impSvc->CreateNewGenericMail( &pGeneric); if (NS_SUCCEEDED( rv)) { @@ -267,7 +267,7 @@ NS_IMETHODIMP nsOEImport::GetImportInterface( const char *pImportType, nsISuppor nsIImportGeneric * pGeneric = nsnull; rv = ImportOEAddressImpl::Create( &pAddress); if (NS_SUCCEEDED( rv)) { - NS_WITH_SERVICE( nsIImportService, impSvc, kImportServiceCID, &rv); + nsCOMPtr impSvc(do_GetService(kImportServiceCID, &rv)); if (NS_SUCCEEDED( rv)) { rv = impSvc->CreateNewGenericAddressBooks( &pGeneric); if (NS_SUCCEEDED( rv)) { @@ -583,7 +583,7 @@ NS_IMETHODIMP ImportOEAddressImpl::FindAddressBooks(nsIFileSpec *location, nsISu if (m_pWab->Loaded()) { // create a new nsIImportABDescriptor and add it to the array - NS_WITH_SERVICE( nsIImportService, impSvc, kImportServiceCID, &rv); + nsCOMPtr impSvc(do_GetService(kImportServiceCID, &rv)); if (NS_SUCCEEDED( rv)) { rv = impSvc->CreateNewABDescriptor( &pID); if (NS_SUCCEEDED( rv)) { diff --git a/mozilla/mailnews/import/oexpress/nsOEScanBoxes.cpp b/mozilla/mailnews/import/oexpress/nsOEScanBoxes.cpp index f3132c4d482..0f68afe7452 100644 --- a/mozilla/mailnews/import/oexpress/nsOEScanBoxes.cpp +++ b/mozilla/mailnews/import/oexpress/nsOEScanBoxes.cpp @@ -694,7 +694,7 @@ void nsOEScanBoxes::BuildMailboxList( MailboxEntry *pBox, nsIFileSpec * root, PR nsISupports * pInterface; PRUint32 size; - NS_WITH_SERVICE( nsIImportService, impSvc, kImportServiceCID, &rv); + nsCOMPtr impSvc(do_GetService(kImportServiceCID, &rv)); if (NS_FAILED( rv)) return; diff --git a/mozilla/mailnews/import/oexpress/nsOESettings.cpp b/mozilla/mailnews/import/oexpress/nsOESettings.cpp index 224e68201dc..0a45b67b6ff 100644 --- a/mozilla/mailnews/import/oexpress/nsOESettings.cpp +++ b/mozilla/mailnews/import/oexpress/nsOESettings.cpp @@ -210,7 +210,8 @@ PRBool OESettings::DoImport( nsIMsgAccount **ppAccount) nsresult rv; - NS_WITH_SERVICE( nsIMsgAccountManager, accMgr, kMsgAccountMgrCID, &rv); + nsCOMPtr accMgr = + do_GetService(kMsgAccountMgrCID, &rv); if (NS_FAILED(rv)) { IMPORT_LOG0( "*** Failed to create a account manager!\n"); return( PR_FALSE); @@ -538,7 +539,7 @@ void OESettings::SetSmtpServer( nsIMsgAccountManager *pMgr, nsIMsgAccount *pAcc, nsresult rv; - NS_WITH_SERVICE(nsISmtpService, smtpService, kSmtpServiceCID, &rv); + nsCOMPtr smtpService(do_GetService(kSmtpServiceCID, &rv)); if (NS_SUCCEEDED(rv) && smtpService) { nsCOMPtr foundServer; diff --git a/mozilla/mailnews/import/oexpress/nsOEStringBundle.cpp b/mozilla/mailnews/import/oexpress/nsOEStringBundle.cpp index 4d52c6e5d8e..6ff4b1c7816 100644 --- a/mozilla/mailnews/import/oexpress/nsOEStringBundle.cpp +++ b/mozilla/mailnews/import/oexpress/nsOEStringBundle.cpp @@ -46,7 +46,8 @@ nsIStringBundle *nsOEStringBundle::GetStringBundle( void) nsIStringBundle* sBundle = nsnull; - NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &rv); + nsCOMPtr sBundleService = + do_GetService(kStringBundleServiceCID, &rv); if (NS_SUCCEEDED(rv) && (nsnull != sBundleService)) { rv = sBundleService->CreateBundle(propertyURL, &sBundle); } @@ -64,7 +65,8 @@ nsIStringBundle *nsOEStringBundle::GetStringBundleProxy( void) nsIStringBundle *strProxy = nsnull; nsresult rv; // create a proxy object if we aren't on the same thread? - NS_WITH_SERVICE( nsIProxyObjectManager, proxyMgr, kProxyObjectManagerCID, &rv); + nsCOMPtr proxyMgr = + do_GetService(kProxyObjectManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = proxyMgr->GetProxyForObject( NS_UI_THREAD_EVENTQ, NS_GET_IID(nsIStringBundle), m_pBundle, PROXY_SYNC | PROXY_ALWAYS, (void **) &strProxy); diff --git a/mozilla/mailnews/import/outlook/src/nsOutlookCompose.cpp b/mozilla/mailnews/import/outlook/src/nsOutlookCompose.cpp index b1b7cd41431..1ae01d35279 100644 --- a/mozilla/mailnews/import/outlook/src/nsOutlookCompose.cpp +++ b/mozilla/mailnews/import/outlook/src/nsOutlookCompose.cpp @@ -243,7 +243,8 @@ nsresult nsOutlookCompose::CreateComponents( void) if (!m_pMsgSend) { rv = nsComponentManager::CreateInstance( kMsgSendCID, nsnull, NS_GET_IID( nsIMsgSend), (void **) &m_pMsgSend); if (NS_SUCCEEDED( rv) && m_pMsgSend) { - NS_WITH_SERVICE( nsIProxyObjectManager, proxyMgr, kProxyObjectManagerCID, &rv); + nsCOMPtr proxyMgr = + do_GetService(kProxyObjectManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = proxyMgr->GetProxyForObject( NS_UI_THREAD_EVENTQ, NS_GET_IID(nsIMsgSend), m_pMsgSend, PROXY_SYNC, (void **)&m_pSendProxy); diff --git a/mozilla/mailnews/import/outlook/src/nsOutlookImport.cpp b/mozilla/mailnews/import/outlook/src/nsOutlookImport.cpp index d55703624e8..b0bb515d672 100644 --- a/mozilla/mailnews/import/outlook/src/nsOutlookImport.cpp +++ b/mozilla/mailnews/import/outlook/src/nsOutlookImport.cpp @@ -246,7 +246,7 @@ NS_IMETHODIMP nsOutlookImport::GetImportInterface( const char *pImportType, nsIS nsIImportGeneric *pGeneric = nsnull; rv = ImportOutlookMailImpl::Create( &pMail); if (NS_SUCCEEDED( rv)) { - NS_WITH_SERVICE( nsIImportService, impSvc, kImportServiceCID, &rv); + nsCOMPtr impSvc(do_GetService(kImportServiceCID, &rv)); if (NS_SUCCEEDED( rv)) { rv = impSvc->CreateNewGenericMail( &pGeneric); if (NS_SUCCEEDED( rv)) { @@ -269,7 +269,7 @@ NS_IMETHODIMP nsOutlookImport::GetImportInterface( const char *pImportType, nsIS nsIImportGeneric * pGeneric = nsnull; rv = ImportOutlookAddressImpl::Create( &pAddress); if (NS_SUCCEEDED( rv)) { - NS_WITH_SERVICE( nsIImportService, impSvc, kImportServiceCID, &rv); + nsCOMPtr impSvc(do_GetService(kImportServiceCID, &rv)); if (NS_SUCCEEDED( rv)) { rv = impSvc->CreateNewGenericAddressBooks( &pGeneric); if (NS_SUCCEEDED( rv)) { diff --git a/mozilla/mailnews/import/outlook/src/nsOutlookMail.cpp b/mozilla/mailnews/import/outlook/src/nsOutlookMail.cpp index 584605e64ec..26dc15c860e 100644 --- a/mozilla/mailnews/import/outlook/src/nsOutlookMail.cpp +++ b/mozilla/mailnews/import/outlook/src/nsOutlookMail.cpp @@ -135,7 +135,7 @@ nsresult nsOutlookMail::GetMailFolders( nsISupportsArray **pArray) return( rv); } - NS_WITH_SERVICE( nsIImportService, impSvc, kImportServiceCID, &rv); + nsCOMPtr impSvc(do_GetService(kImportServiceCID, &rv)); if (NS_FAILED( rv)) return( rv); @@ -239,7 +239,7 @@ nsresult nsOutlookMail::GetAddressBooks( nsISupportsArray **pArray) return( rv); } - NS_WITH_SERVICE( nsIImportService, impSvc, kImportServiceCID, &rv); + nsCOMPtr impSvc(do_GetService(kImportServiceCID, &rv)); if (NS_FAILED( rv)) return( rv); @@ -900,7 +900,7 @@ nsresult nsOutlookMail::ImportAddresses( PRUint32 *pCount, PRUint32 *pTotal, con nsCOMPtr pFieldMap; - NS_WITH_SERVICE( nsIImportService, impSvc, kImportServiceCID, &rv); + nsCOMPtr impSvc(do_GetService(kImportServiceCID, &rv)); if (NS_SUCCEEDED( rv)) { rv = impSvc->CreateNewFieldMap( getter_AddRefs( pFieldMap)); } diff --git a/mozilla/mailnews/import/outlook/src/nsOutlookSettings.cpp b/mozilla/mailnews/import/outlook/src/nsOutlookSettings.cpp index 31d384c1b9b..7e0093b97ad 100644 --- a/mozilla/mailnews/import/outlook/src/nsOutlookSettings.cpp +++ b/mozilla/mailnews/import/outlook/src/nsOutlookSettings.cpp @@ -163,7 +163,8 @@ PRBool OutlookSettings::DoImport( nsIMsgAccount **ppAccount) nsresult rv; - NS_WITH_SERVICE( nsIMsgAccountManager, accMgr, kMsgAccountMgrCID, &rv); + nsCOMPtr accMgr = + do_GetService(kMsgAccountMgrCID, &rv); if (NS_FAILED(rv)) { IMPORT_LOG0( "*** Failed to create a account manager!\n"); return( PR_FALSE); @@ -497,7 +498,7 @@ void OutlookSettings::SetSmtpServer( nsIMsgAccountManager *pMgr, nsIMsgAccount * nsresult rv; - NS_WITH_SERVICE(nsISmtpService, smtpService, kSmtpServiceCID, &rv); + nsCOMPtr smtpService(do_GetService(kSmtpServiceCID, &rv)); if (NS_SUCCEEDED(rv) && smtpService) { nsCOMPtr foundServer; diff --git a/mozilla/mailnews/import/outlook/src/nsOutlookStringBundle.cpp b/mozilla/mailnews/import/outlook/src/nsOutlookStringBundle.cpp index ef4439aca07..097b8cee57e 100644 --- a/mozilla/mailnews/import/outlook/src/nsOutlookStringBundle.cpp +++ b/mozilla/mailnews/import/outlook/src/nsOutlookStringBundle.cpp @@ -46,7 +46,8 @@ nsIStringBundle *nsOutlookStringBundle::GetStringBundle( void) nsIStringBundle* sBundle = nsnull; - NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &rv); + nsCOMPtr sBundleService = + do_GetService(kStringBundleServiceCID, &rv); if (NS_SUCCEEDED(rv) && (nsnull != sBundleService)) { rv = sBundleService->CreateBundle(propertyURL, &sBundle); } @@ -64,7 +65,8 @@ nsIStringBundle *nsOutlookStringBundle::GetStringBundleProxy( void) nsIStringBundle *strProxy = nsnull; nsresult rv; // create a proxy object if we aren't on the same thread? - NS_WITH_SERVICE( nsIProxyObjectManager, proxyMgr, kProxyObjectManagerCID, &rv); + nsCOMPtr proxyMgr = + do_GetService(kProxyObjectManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = proxyMgr->GetProxyForObject( NS_UI_THREAD_EVENTQ, NS_GET_IID(nsIStringBundle), m_pBundle, PROXY_SYNC | PROXY_ALWAYS, (void **) &strProxy); diff --git a/mozilla/mailnews/import/src/nsImportAddressBooks.cpp b/mozilla/mailnews/import/src/nsImportAddressBooks.cpp index 0a79ad2f904..0a659400513 100644 --- a/mozilla/mailnews/import/src/nsImportAddressBooks.cpp +++ b/mozilla/mailnews/import/src/nsImportAddressBooks.cpp @@ -449,7 +449,7 @@ void nsImportGenericAddressBooks::GetDefaultFieldMap( void) NS_IF_RELEASE( m_pFieldMap); nsresult rv; - NS_WITH_SERVICE(nsIImportService, impSvc, kImportServiceCID, &rv); + nsCOMPtr impSvc(do_GetService(kImportServiceCID, &rv)); if (NS_FAILED(rv)) { IMPORT_LOG0( "*** Unable to get nsIImportService.\n"); return; @@ -764,7 +764,8 @@ nsIAddrDatabase *GetAddressBook( const PRUnichar *name, PRBool makeNew) IMPORT_LOG0( "In GetAddressBook\n"); - NS_WITH_SERVICE( nsIProxyObjectManager, proxyMgr, kProxyObjectManagerCID, &rv); + nsCOMPtr proxyMgr = + do_GetService(kProxyObjectManagerCID, &rv); if (NS_FAILED( rv)) { IMPORT_LOG0( "*** Error: Unable to get proxy manager\n"); return( nsnull); diff --git a/mozilla/mailnews/import/src/nsImportMail.cpp b/mozilla/mailnews/import/src/nsImportMail.cpp index b131bdea721..97474098e2f 100644 --- a/mozilla/mailnews/import/src/nsImportMail.cpp +++ b/mozilla/mailnews/import/src/nsImportMail.cpp @@ -826,7 +826,8 @@ ImportMailThread( void *stuff) nsCOMPtr bundle( dont_AddRef( nsImportStringBundle::GetStringBundleProxy())); // Initialize the curFolder proxy object - NS_WITH_SERVICE( nsIProxyObjectManager, proxyMgr, kProxyObjectManagerCID, &rv); + nsCOMPtr proxyMgr = + do_GetService(kProxyObjectManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = proxyMgr->GetProxyForObject( NS_UI_THREAD_EVENTQ, NS_GET_IID(nsIMsgFolder), curFolder, PROXY_SYNC | PROXY_ALWAYS, getter_AddRefs( curProxy)); diff --git a/mozilla/mailnews/import/src/nsImportService.cpp b/mozilla/mailnews/import/src/nsImportService.cpp index 37f6fe9d3aa..c8b4a6e51a9 100644 --- a/mozilla/mailnews/import/src/nsImportService.cpp +++ b/mozilla/mailnews/import/src/nsImportService.cpp @@ -630,7 +630,8 @@ nsresult nsImportService::LoadModuleInfo( const char *pClsId, const char *pSuppo // load the component and get all of the info we need from it.... // then call AddModule nsresult rv; - NS_WITH_SERVICE( nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; nsCID clsId; @@ -675,7 +676,8 @@ nsIImportModule *ImportModuleDesc::GetModule( PRBool keepLoaded) } nsresult rv; - NS_WITH_SERVICE( nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return nsnull; rv = compMgr->CreateInstance( m_cid, nsnull, NS_GET_IID(nsIImportModule), (void **) &m_pModule); diff --git a/mozilla/mailnews/import/src/nsImportStringBundle.cpp b/mozilla/mailnews/import/src/nsImportStringBundle.cpp index fda810a0ad0..f99348e5006 100644 --- a/mozilla/mailnews/import/src/nsImportStringBundle.cpp +++ b/mozilla/mailnews/import/src/nsImportStringBundle.cpp @@ -46,7 +46,8 @@ nsIStringBundle *nsImportStringBundle::GetStringBundle( void) nsIStringBundle* sBundle = nsnull; - NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &rv); + nsCOMPtr sBundleService = + do_GetService(kStringBundleServiceCID, &rv); if (NS_SUCCEEDED(rv) && (nsnull != sBundleService)) { rv = sBundleService->CreateBundle(propertyURL, &sBundle); } @@ -63,7 +64,8 @@ nsIStringBundle *nsImportStringBundle::GetStringBundleProxy( void) nsIStringBundle *strProxy = nsnull; nsresult rv; // create a proxy object if we aren't on the same thread? - NS_WITH_SERVICE( nsIProxyObjectManager, proxyMgr, kProxyObjectManagerCID, &rv); + nsCOMPtr proxyMgr = + do_GetService(kProxyObjectManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = proxyMgr->GetProxyForObject( NS_UI_THREAD_EVENTQ, NS_GET_IID(nsIStringBundle), m_pBundle, PROXY_SYNC | PROXY_ALWAYS, (void **) &strProxy); diff --git a/mozilla/mailnews/import/text/src/nsTextImport.cpp b/mozilla/mailnews/import/text/src/nsTextImport.cpp index 873c1456937..0cb77f7fa21 100644 --- a/mozilla/mailnews/import/text/src/nsTextImport.cpp +++ b/mozilla/mailnews/import/text/src/nsTextImport.cpp @@ -206,7 +206,7 @@ NS_IMETHODIMP nsTextImport::GetImportInterface( const char *pImportType, nsISupp nsIImportGeneric * pGeneric = nsnull; rv = ImportAddressImpl::Create( &pAddress); if (NS_SUCCEEDED( rv)) { - NS_WITH_SERVICE( nsIImportService, impSvc, kImportServiceCID, &rv); + nsCOMPtr impSvc(do_GetService(kImportServiceCID, &rv)); if (NS_SUCCEEDED( rv)) { rv = impSvc->CreateNewGenericAddressBooks( &pGeneric); if (NS_SUCCEEDED( rv)) { @@ -340,7 +340,7 @@ NS_IMETHODIMP ImportAddressImpl::FindAddressBooks(nsIFileSpec *pLoc, nsISupports return( rv); } - NS_WITH_SERVICE( nsIImportService, impSvc, kImportServiceCID, &rv); + nsCOMPtr impSvc(do_GetService(kImportServiceCID, &rv)); if (NS_FAILED( rv)) { IMPORT_LOG0( "*** Failed to obtain the import service\n"); return( rv); @@ -633,7 +633,7 @@ NS_IMETHODIMP ImportAddressImpl::GetSampleData( PRInt32 index, PRBool *pFound, P PRInt32 bufSz = 10240; char *pLine = new char[bufSz]; - NS_WITH_SERVICE( nsIImportService, impSvc, kImportServiceCID, &rv); + nsCOMPtr impSvc(do_GetService(kImportServiceCID, &rv)); rv = nsTextAddress::ReadRecordNumber( m_fileLoc, pLine, bufSz, m_delim, &lineLen, index); if (NS_SUCCEEDED( rv)) { @@ -702,7 +702,7 @@ NS_IMETHODIMP ImportAddressImpl::InitFieldMap(nsIFileSpec *location, nsIImportFi // from the same file format. nsresult rv; - NS_WITH_SERVICE( nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED( rv)) { nsXPIDLCString prefStr; rv = prefs->CopyCharPref( "mailnews.import.text.fieldmap", getter_Copies(prefStr)); @@ -781,7 +781,7 @@ void ImportAddressImpl::SaveFieldMap( nsIImportFieldMap *pMap) PRBool done = PR_FALSE; nsresult rv; // NS_WITH_PROXIED_SERVICE( nsIPref, prefs, kPrefServiceCID, NS_UI_THREAD_EVENTQ, &rv); - NS_WITH_SERVICE( nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED( rv)) { nsXPIDLCString prefStr; diff --git a/mozilla/mailnews/import/text/src/nsTextStringBundle.cpp b/mozilla/mailnews/import/text/src/nsTextStringBundle.cpp index e24f720872e..96af4fd54ac 100644 --- a/mozilla/mailnews/import/text/src/nsTextStringBundle.cpp +++ b/mozilla/mailnews/import/text/src/nsTextStringBundle.cpp @@ -43,7 +43,8 @@ nsIStringBundle *nsTextStringBundle::GetStringBundle( void) nsIStringBundle* sBundle = nsnull; - NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &rv); + nsCOMPtr sBundleService = + do_GetService(kStringBundleServiceCID, &rv); if (NS_SUCCEEDED(rv) && (nsnull != sBundleService)) { rv = sBundleService->CreateBundle(propertyURL, &sBundle); } @@ -61,7 +62,8 @@ nsIStringBundle *nsTextStringBundle::GetStringBundleProxy( void) nsIStringBundle *strProxy = nsnull; nsresult rv; // create a proxy object if we aren't on the same thread? - NS_WITH_SERVICE( nsIProxyObjectManager, proxyMgr, kProxyObjectManagerCID, &rv); + nsCOMPtr proxyMgr = + do_GetService(kProxyObjectManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = proxyMgr->GetProxyForObject( NS_UI_THREAD_EVENTQ, NS_GET_IID(nsIStringBundle), m_pBundle, PROXY_SYNC | PROXY_ALWAYS, (void **) &strProxy); diff --git a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp index 7301d5ce413..f44c06c1a8a 100644 --- a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp +++ b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp @@ -244,7 +244,7 @@ NS_IMETHODIMP nsMsgLocalMailFolder::AddSubfolder(nsAutoString *name, PRInt32 flags = 0; nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); if(NS_FAILED(rv)) return rv; @@ -329,8 +329,8 @@ NS_IMETHODIMP nsMsgLocalMailFolder::ParseFolder(nsIMsgWindow *aMsgWindow, nsIUrl if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIMailboxService, mailboxService, - kMailboxServiceCID, &rv); + nsCOMPtr mailboxService = + do_GetService(kMailboxServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsMsgMailboxParser *parser = new nsMsgMailboxParser; @@ -706,7 +706,7 @@ NS_IMETHODIMP nsMsgLocalMailFolder::CreateStorageIfMissing(nsIUrlListener* urlLi parentName.Truncate(leafPos); // get the corresponding RDF resource // RDF will create the folder resource if it doesn't already exist - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &status); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &status)); if (NS_FAILED(status)) return status; nsCOMPtr resource; status = rdf->GetResource(parentName, getter_AddRefs(resource)); @@ -1494,8 +1494,8 @@ nsMsgLocalMailFolder::DeleteMessages(nsISupportsArray *messages, rv = GetTrashFolder(getter_AddRefs(trashFolder)); if (NS_SUCCEEDED(rv)) { - NS_WITH_SERVICE(nsIMsgCopyService, copyService, kMsgCopyServiceCID, - &rv); + nsCOMPtr copyService = + do_GetService(kMsgCopyServiceCID, &rv); if (NS_SUCCEEDED(rv)) { return copyService->CopyMessages(this, messages, trashFolder, @@ -2456,8 +2456,8 @@ NS_IMETHODIMP nsMsgLocalMailFolder::EndCopy(PRBool copySucceeded) if (mCopyState->m_isFolder) DoNextSubFolder(this, srcFolder, nsnull, nsnull); //Copy all subfolders then notify completion - NS_WITH_SERVICE(nsIMsgCopyService, copyService, - kMsgCopyServiceCID, &result); + nsCOMPtr copyService = + do_GetService(kMsgCopyServiceCID, &result); if (mTxnMgr && NS_SUCCEEDED(rv) && mCopyState->m_undoMsgTxn) mTxnMgr->DoTransaction(mCopyState->m_undoMsgTxn); @@ -2898,8 +2898,8 @@ nsMsgLocalMailFolder::GetIncomingServerType() if ((const char *) hostName) nsUnescape(NS_CONST_CAST(char*,(const char*)hostName)); - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, - NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); + nsCOMPtr accountManager = + do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return ""; nsCOMPtr server; @@ -2989,7 +2989,8 @@ nsMsgLocalMailFolder::OnStopRunningUrl(nsIURI * aUrl, nsresult aExitCode) rv = popurl->GetMessageUri(getter_Copies(messageuri)); if (NS_SUCCEEDED(rv)) { - NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv); + nsCOMPtr rdfService = + do_GetService(kRDFServiceCID, &rv); if(NS_SUCCEEDED(rv)) { nsCOMPtr msgDBHdr; diff --git a/mozilla/mailnews/local/src/nsLocalUndoTxn.cpp b/mozilla/mailnews/local/src/nsLocalUndoTxn.cpp index 95316976c7f..beb1b6e6af0 100644 --- a/mozilla/mailnews/local/src/nsLocalUndoTxn.cpp +++ b/mozilla/mailnews/local/src/nsLocalUndoTxn.cpp @@ -150,7 +150,8 @@ nsLocalMoveCopyMsgTxn::UndoImapDeleteFlag(nsIMsgFolder* folder, nsresult rv = NS_ERROR_FAILURE; if (m_srcIsImap4) { - NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv); + nsCOMPtr imapService = + do_GetService(kCImapService, &rv); if (NS_SUCCEEDED(rv)) { nsCOMPtr urlListener; @@ -166,8 +167,8 @@ nsLocalMoveCopyMsgTxn::UndoImapDeleteFlag(nsIMsgFolder* folder, msgIds.AppendInt((PRInt32) keyArray.GetAt(i)); } nsCOMPtr eventQueue; - NS_WITH_SERVICE(nsIEventQueueService, pEventQService, - kEventQueueServiceCID, &rv); + nsCOMPtr pEventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv) && pEventQService) { pEventQService->GetThreadEventQueue(NS_CURRENT_THREAD, diff --git a/mozilla/mailnews/local/src/nsLocalUtils.cpp b/mozilla/mailnews/local/src/nsLocalUtils.cpp index 842f6f39268..f61cf4fe6f5 100644 --- a/mozilla/mailnews/local/src/nsLocalUtils.cpp +++ b/mozilla/mailnews/local/src/nsLocalUtils.cpp @@ -50,8 +50,8 @@ nsGetMailboxServer(const char *username, const char *hostname, nsIMsgIncomingSer nsUnescape(NS_CONST_CAST(char*,username)); nsUnescape(NS_CONST_CAST(char*,hostname)); // retrieve the AccountManager - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, - NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); + nsCOMPtr accountManager = + do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; // find all local mail "no servers" matching the given hostname diff --git a/mozilla/mailnews/local/src/nsMailboxProtocol.cpp b/mozilla/mailnews/local/src/nsMailboxProtocol.cpp index dd22b9df6ce..35fda1fcbd5 100644 --- a/mozilla/mailnews/local/src/nsMailboxProtocol.cpp +++ b/mozilla/mailnews/local/src/nsMailboxProtocol.cpp @@ -127,7 +127,8 @@ nsresult nsMailboxProtocol::OpenFileSocketForReuse(nsIURI * aURL, PRUint32 aStar NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID); - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr fileStream = do_CreateInstance(NS_LOCALFILEINPUTSTREAM_CONTRACTID, &rv); diff --git a/mozilla/mailnews/local/src/nsMailboxService.cpp b/mozilla/mailnews/local/src/nsMailboxService.cpp index 7d4093ab2d2..f4eb5df13a0 100644 --- a/mozilla/mailnews/local/src/nsMailboxService.cpp +++ b/mozilla/mailnews/local/src/nsMailboxService.cpp @@ -468,7 +468,8 @@ NS_IMETHODIMP nsMailboxService::NewURI(const char *aSpec, nsIURI *aBaseURI, nsIU nsresult rv = NS_OK; if (PL_strstr(aSpec, "?uidl=") || PL_strstr(aSpec, "&uidl=")) { - NS_WITH_SERVICE(nsIPop3Service, pop3Service, kCPop3ServiceCID, &rv); + nsCOMPtr pop3Service = + do_GetService(kCPop3ServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr handler = do_QueryInterface(pop3Service, &rv); diff --git a/mozilla/mailnews/local/src/nsMailboxUrl.cpp b/mozilla/mailnews/local/src/nsMailboxUrl.cpp index 75411c78a5b..4f9fa941e81 100644 --- a/mozilla/mailnews/local/src/nsMailboxUrl.cpp +++ b/mozilla/mailnews/local/src/nsMailboxUrl.cpp @@ -63,8 +63,8 @@ static char *nsMailboxGetURI(const char *nativepath) nsresult rv; char *uri = nsnull; - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, - NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); + nsCOMPtr accountManager = + do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return nsnull; nsCOMPtr serverArray; diff --git a/mozilla/mailnews/local/src/nsMovemailIncomingServer.cpp b/mozilla/mailnews/local/src/nsMovemailIncomingServer.cpp index 791bac28795..452ddc7f6a5 100644 --- a/mozilla/mailnews/local/src/nsMovemailIncomingServer.cpp +++ b/mozilla/mailnews/local/src/nsMovemailIncomingServer.cpp @@ -168,8 +168,8 @@ nsMovemailIncomingServer::GetNewMail(nsIMsgWindow *aMsgWindow, { nsresult rv; - NS_WITH_SERVICE(nsIMovemailService, movemailService, - kCMovemailServiceCID, &rv); + nsCOMPtr movemailService = + do_GetService(kCMovemailServiceCID, &rv); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/mailnews/local/src/nsMovemailService.cpp b/mozilla/mailnews/local/src/nsMovemailService.cpp index aa16c4bc383..e668f95829b 100644 --- a/mozilla/mailnews/local/src/nsMovemailService.cpp +++ b/mozilla/mailnews/local/src/nsMovemailService.cpp @@ -526,7 +526,7 @@ NS_IMETHODIMP nsMovemailService::SetDefaultLocalPath(nsIFileSpec *aPath) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return rv; rv = prefs->SetFilePref(PREF_MAIL_ROOT_MOVEMAIL, aPath, PR_FALSE /* set default */); @@ -540,7 +540,7 @@ nsMovemailService::GetDefaultLocalPath(nsIFileSpec ** aResult) *aResult = nsnull; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return rv; PRBool havePref = PR_FALSE; diff --git a/mozilla/mailnews/local/src/nsNoneService.cpp b/mozilla/mailnews/local/src/nsNoneService.cpp index 502220cee33..037dbc4ef3d 100644 --- a/mozilla/mailnews/local/src/nsNoneService.cpp +++ b/mozilla/mailnews/local/src/nsNoneService.cpp @@ -59,7 +59,7 @@ NS_IMETHODIMP nsNoneService::SetDefaultLocalPath(nsIFileSpec *aPath) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return rv; rv = prefs->SetFilePref(PREF_MAIL_ROOT_NONE, aPath, PR_FALSE /* set default */); @@ -73,7 +73,7 @@ nsNoneService::GetDefaultLocalPath(nsIFileSpec ** aResult) *aResult = nsnull; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return rv; PRBool havePref = PR_FALSE; diff --git a/mozilla/mailnews/local/src/nsParseMailbox.cpp b/mozilla/mailnews/local/src/nsParseMailbox.cpp index 4ea48592b53..3100e1d3cc6 100644 --- a/mozilla/mailnews/local/src/nsParseMailbox.cpp +++ b/mozilla/mailnews/local/src/nsParseMailbox.cpp @@ -86,7 +86,7 @@ NS_IMETHODIMP nsMsgMailboxParser::OnStartRequest(nsIRequest *request, nsISupport // we have an error. nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIIOService, ioServ, kIOServiceCID, &rv); + nsCOMPtr ioServ(do_GetService(kIOServiceCID, &rv)); nsCOMPtr runningUrl = do_QueryInterface(ctxt, &rv); @@ -1736,7 +1736,7 @@ nsresult nsParseNewMailState::MoveIncorporatedMessage(nsIMsgDBHdr *mailHdr, nsresult err = 0; nsIOFileStream *destFile; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &err); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &err)); nsCOMPtr res; err = rdf->GetResource(destFolderUri, getter_AddRefs(res)); if (NS_FAILED(err)) diff --git a/mozilla/mailnews/local/src/nsPop3IncomingServer.cpp b/mozilla/mailnews/local/src/nsPop3IncomingServer.cpp index 8ce9240610c..d59d2e0508f 100644 --- a/mozilla/mailnews/local/src/nsPop3IncomingServer.cpp +++ b/mozilla/mailnews/local/src/nsPop3IncomingServer.cpp @@ -163,7 +163,7 @@ NS_IMETHODIMP nsPop3IncomingServer::PerformBiff() { nsresult rv; - NS_WITH_SERVICE(nsIPop3Service, pop3Service, kCPop3ServiceCID, &rv); + nsCOMPtr pop3Service(do_GetService(kCPop3ServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsCOMPtr inbox; @@ -183,7 +183,8 @@ NS_IMETHODIMP nsPop3IncomingServer::PerformBiff() } //Biff just needs to give status in one of the windows. so do it in topmost window. - NS_WITH_SERVICE(nsIMsgMailSession, mailSession, kCMsgMailSessionCID, &rv); + nsCOMPtr mailSession = + do_GetService(kCMsgMailSessionCID, &rv); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/mailnews/local/src/nsPop3Service.cpp b/mozilla/mailnews/local/src/nsPop3Service.cpp index 66d61d43416..ef08cb6b17f 100644 --- a/mozilla/mailnews/local/src/nsPop3Service.cpp +++ b/mozilla/mailnews/local/src/nsPop3Service.cpp @@ -335,7 +335,7 @@ NS_IMETHODIMP nsPop3Service::NewURI(const char *aSpec, nsIURI *aBaseURI, nsIURI if (offset) folderUri.Truncate(offset); - NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv); + nsCOMPtr rdfService(do_GetService(kRDFServiceCID, &rv)); if (NS_FAILED(rv)) return rv; rv = rdfService->GetResource(folderUri.get(), getter_AddRefs(resource)); @@ -439,7 +439,7 @@ NS_IMETHODIMP nsPop3Service::SetDefaultLocalPath(nsIFileSpec *aPath) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return rv; rv = prefs->SetFilePref(PREF_MAIL_ROOT_POP3, aPath, PR_FALSE /* set default */); @@ -453,7 +453,7 @@ nsPop3Service::GetDefaultLocalPath(nsIFileSpec ** aResult) *aResult = nsnull; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return rv; PRBool havePref = PR_FALSE; diff --git a/mozilla/mailnews/mime/cthandlers/vcard/mimevcrd.cpp b/mozilla/mailnews/mime/cthandlers/vcard/mimevcrd.cpp index cb0b82c14f7..25420395231 100644 --- a/mozilla/mailnews/mime/cthandlers/vcard/mimevcrd.cpp +++ b/mozilla/mailnews/mime/cthandlers/vcard/mimevcrd.cpp @@ -1863,7 +1863,8 @@ nsCOMPtr stringBundle = nsnull; propertyURL = VCARD_URL; - NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res); + nsCOMPtr sBundleService = + do_GetService(kStringBundleServiceCID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(stringBundle)); diff --git a/mozilla/mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp b/mozilla/mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp index 49725870c93..0717ef1dc05 100644 --- a/mozilla/mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp +++ b/mozilla/mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp @@ -190,7 +190,8 @@ nsMimeBaseEmitter::MimeGetStringByName(const char *aHeaderName) propertyURL = MIME_URL; - NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res); + nsCOMPtr sBundleService = + do_GetService(kStringBundleServiceCID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(m_stringBundle)); diff --git a/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp b/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp index d8ea615941a..fde545ffa85 100644 --- a/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp +++ b/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp @@ -147,7 +147,8 @@ nsMimeXULEmitter::BuildListOfStatusProviders() nsCOMPtr components; miscStatusType *newInfo = nsnull; - NS_WITH_SERVICE(nsIRegistry, registry, NS_REGISTRY_CONTRACTID, &rv); + nsCOMPtr registry = + do_GetService(NS_REGISTRY_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; @@ -211,7 +212,8 @@ nsMimeXULEmitter::GetStatusObjForContractID(nsCString aContractID) nsresult rv = NS_OK; nsISupports *obj = nsnull; - NS_WITH_SERVICE(nsIComponentManager, comMgr, kComponentManagerCID, &rv); + nsCOMPtr comMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return nsnull; @@ -272,8 +274,8 @@ nsMimeXULEmitter::DoSpecialSenderProcessing(const char *field, const char *value nsresult rv = NS_OK; if (!nsCRT::strcmp(field, "From")) { - NS_WITH_SERVICE(nsIAbAddressCollecter, addressCollecter, - kCAddressCollecter, &rv); + nsCOMPtr addressCollecter = + do_GetService(kCAddressCollecter, &rv); if (NS_SUCCEEDED(rv) && addressCollecter) addressCollecter->CollectAddress(value); } diff --git a/mozilla/mailnews/mime/src/comi18n.cpp b/mozilla/mailnews/mime/src/comi18n.cpp index 250f4fd48a7..0d85f39378d 100644 --- a/mozilla/mailnews/mime/src/comi18n.cpp +++ b/mozilla/mailnews/mime/src/comi18n.cpp @@ -1326,7 +1326,7 @@ PRInt32 MimeCharsetConverterClass::Initialize(const char* from_charset, const ch mMaxNumCharsDetect = maxNumCharsDetect; // Resolve charset alias - NS_WITH_SERVICE(nsICharsetAlias, calias, kCharsetAliasCID, &res); + nsCOMPtr calias(do_GetService(kCharsetAliasCID, &res)); if (NS_SUCCEEDED(res)) { nsString aAlias(mInputCharset); if (aAlias.Length()) { @@ -1349,7 +1349,7 @@ PRInt32 MimeCharsetConverterClass::Initialize(const char* from_charset, const ch PRUnichar* detector_name = nsnull; PL_strcpy(detector_contractid, NS_STRCDETECTOR_CONTRACTID_BASE); - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (NS_SUCCEEDED(res)) { if (NS_SUCCEEDED(prefs->CopyUnicharPref("mail.charset.detector", &detector_name))) { PL_strcat(detector_contractid, NS_ConvertUCS2toUTF8(detector_name).get()); @@ -1383,7 +1383,8 @@ PRInt32 MimeCharsetConverterClass::Initialize(const char* from_charset, const ch } // Set up charset converters. - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &res); if (NS_SUCCEEDED(res)) { // create a decoder (conv to unicode), ok if failed if we do auto detection @@ -1443,7 +1444,8 @@ PRInt32 MimeCharsetConverterClass::Convert(const char* inBuffer, const PRInt32 i return -1; } else { - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &res); if (NS_SUCCEEDED(res)) { NS_IF_RELEASE(mDecoderDetected); mDecoderDetected = nsnull; diff --git a/mozilla/mailnews/mime/src/mimedrft.cpp b/mozilla/mailnews/mime/src/mimedrft.cpp index c39b44d9049..ac9164dd62e 100644 --- a/mozilla/mailnews/mime/src/mimedrft.cpp +++ b/mozilla/mailnews/mime/src/mimedrft.cpp @@ -238,8 +238,8 @@ mime_dump_attachments ( attachmentList ); } } - NS_WITH_SERVICE(nsIMsgComposeService, msgComposeService, - kCMsgComposeServiceCID, &rv); + nsCOMPtr msgComposeService = + do_GetService(kCMsgComposeServiceCID, &rv); if ((NS_FAILED(rv)) || (!msgComposeService)) return rv; @@ -370,7 +370,7 @@ GetMailXlateionPreference(void) nsresult res; PRBool xlate = PR_FALSE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (NS_SUCCEEDED(res) && prefs) res = prefs->GetBoolPref("mail.unknown", &xlate); @@ -385,7 +385,7 @@ GetMailSigningPreference(void) nsresult res; PRBool signit = PR_FALSE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (NS_SUCCEEDED(res) && prefs) res = prefs->GetBoolPref("mail.unknown", &signit); @@ -1111,7 +1111,7 @@ mime_insert_forwarded_message_headers(char **body, } } - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); + nsCOMPtr prefs(do_GetService(kPrefCID, &res)); if (NS_SUCCEEDED(res) && prefs) res = prefs->GetIntPref("mail.show_headers", &show_headers); diff --git a/mozilla/mailnews/mime/src/mimemoz2.cpp b/mozilla/mailnews/mime/src/mimemoz2.cpp index 5894661b507..b487974974c 100644 --- a/mozilla/mailnews/mime/src/mimemoz2.cpp +++ b/mozilla/mailnews/mime/src/mimemoz2.cpp @@ -605,7 +605,7 @@ nsMimeNewURI(nsIURI** aInstancePtrResult, const char *aSpec, nsIURI *aBase) if (nsnull == aInstancePtrResult) return NS_ERROR_NULL_POINTER; - NS_WITH_SERVICE(nsIIOService, pService, kIOServiceCID, &res); + nsCOMPtr pService(do_GetService(kIOServiceCID, &res)); if (NS_FAILED(res)) return NS_ERROR_FACTORY_NOT_REGISTERED; @@ -1825,7 +1825,8 @@ MimeGetStringByID(PRInt32 stringID) propertyURL = MIME_URL; - NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res); + nsCOMPtr sBundleService = + do_GetService(kStringBundleServiceCID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(stringBundle)); diff --git a/mozilla/mailnews/mime/src/mimetext.cpp b/mozilla/mailnews/mime/src/mimetext.cpp index 141d3ebb3ac..a32fc1d5aa8 100644 --- a/mozilla/mailnews/mime/src/mimetext.cpp +++ b/mozilla/mailnews/mime/src/mimetext.cpp @@ -112,7 +112,7 @@ MimeInlineText_initialize (MimeObject *obj) { // New change for falling back to a default view charset nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if ( NS_SUCCEEDED(rv) && prefs) { PRUnichar* value; diff --git a/mozilla/mailnews/mime/src/nsStreamConverter.cpp b/mozilla/mailnews/mime/src/nsStreamConverter.cpp index 309c1b77555..2de64f846d0 100644 --- a/mozilla/mailnews/mime/src/nsStreamConverter.cpp +++ b/mozilla/mailnews/mime/src/nsStreamConverter.cpp @@ -686,7 +686,7 @@ NS_IMETHODIMP nsStreamConverter::Init(nsIURI *aURI, nsIStreamListener * aOutList PRBool enable_emoticons = PR_TRUE; PRBool enable_structs = PR_TRUE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { rv = prefs->GetBoolPref(PREF_MAIL_DISPLAY_GLYPH,&enable_emoticons); diff --git a/mozilla/mailnews/news/src/nsNNTPProtocol.cpp b/mozilla/mailnews/news/src/nsNNTPProtocol.cpp index c173285be56..e8844ec37b0 100644 --- a/mozilla/mailnews/news/src/nsNNTPProtocol.cpp +++ b/mozilla/mailnews/news/src/nsNNTPProtocol.cpp @@ -4278,7 +4278,8 @@ PRInt32 nsNNTPProtocol::DoCancel() NNTP_LOG_NOTE("CANCELCHK not supported"); // get the current identity from the news session.... - NS_WITH_SERVICE(nsIMsgAccountManager,accountManager,kCMsgAccountManagerCID,&rv); + nsCOMPtr accountManager = + do_GetService(kCMsgAccountManagerCID, &rv); if (NS_SUCCEEDED(rv) && accountManager) { nsCOMPtr identities; rv = accountManager->GetAllIdentities(getter_AddRefs(identities)); diff --git a/mozilla/mailnews/news/src/nsNewsDownloader.cpp b/mozilla/mailnews/news/src/nsNewsDownloader.cpp index 3e6df52661b..c6e06143133 100644 --- a/mozilla/mailnews/news/src/nsNewsDownloader.cpp +++ b/mozilla/mailnews/news/src/nsNewsDownloader.cpp @@ -379,8 +379,8 @@ nsresult nsMsgDownloadAllNewsgroups::AdvanceToNextServer(PRBool *done) *done = PR_TRUE; if (!m_allServers) { - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, - NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); + nsCOMPtr accountManager = + do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); NS_ASSERTION(accountManager && NS_SUCCEEDED(rv), "couldn't get account mgr"); if (!accountManager || NS_FAILED(rv)) return rv; diff --git a/mozilla/mailnews/news/src/nsNewsFolder.cpp b/mozilla/mailnews/news/src/nsNewsFolder.cpp index 660cb6d9196..9e721a981c1 100644 --- a/mozilla/mailnews/news/src/nsNewsFolder.cpp +++ b/mozilla/mailnews/news/src/nsNewsFolder.cpp @@ -1325,7 +1325,8 @@ nsresult nsMsgNewsFolder::CreateNewsgroupUrlForSignon(const char *inUriStr, cons NS_IMETHODIMP nsMsgNewsFolder::ForgetGroupUsername() { nsresult rv; - NS_WITH_SERVICE(nsIWalletService, walletservice, kWalletServiceCID, &rv); + nsCOMPtr walletservice = + do_GetService(kWalletServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = SetGroupUsername(nsnull); @@ -1342,7 +1343,8 @@ NS_IMETHODIMP nsMsgNewsFolder::ForgetGroupUsername() NS_IMETHODIMP nsMsgNewsFolder::ForgetGroupPassword() { nsresult rv; - NS_WITH_SERVICE(nsIWalletService, walletservice, kWalletServiceCID, &rv); + nsCOMPtr walletservice = + do_GetService(kWalletServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = SetGroupPassword(nsnull); diff --git a/mozilla/mailnews/news/src/nsNewsUtils.cpp b/mozilla/mailnews/news/src/nsNewsUtils.cpp index 2b8453976a0..ef716cba634 100644 --- a/mozilla/mailnews/news/src/nsNewsUtils.cpp +++ b/mozilla/mailnews/news/src/nsNewsUtils.cpp @@ -49,8 +49,8 @@ nsGetNewsServer(const char* username, const char *hostname, nsresult rv = NS_OK; // retrieve the AccountManager - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, - NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); + nsCOMPtr accountManager = + do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; // find the news host @@ -205,7 +205,7 @@ nsresult nsGetNewsGroupFromUri(const char *uri, nsIMsgNewsFolder **aFolder) NS_ENSURE_ARG(uri); nsresult rv; - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); if (NS_FAILED(rv)) return(rv); nsCOMPtr resource; diff --git a/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp b/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp index 002732a0a9c..af6ff8e2e79 100644 --- a/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp +++ b/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp @@ -201,7 +201,7 @@ nsNntpIncomingServer::SetNewsrcRootPath(nsIFileSpec *aNewsrcRootPath) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { rv = prefs->SetFilePref(PREF_MAIL_NEWSRC_ROOT,aNewsrcRootPath, PR_FALSE /* set default */); return rv; @@ -218,7 +218,7 @@ nsNntpIncomingServer::GetNewsrcRootPath(nsIFileSpec **aNewsrcRootPath) *aNewsrcRootPath = nsnull; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (NS_FAILED(rv)) return rv; PRBool havePref = PR_FALSE; diff --git a/mozilla/mailnews/news/src/nsNntpService.cpp b/mozilla/mailnews/news/src/nsNntpService.cpp index 9dc71219421..060be714eef 100644 --- a/mozilla/mailnews/news/src/nsNntpService.cpp +++ b/mozilla/mailnews/news/src/nsNntpService.cpp @@ -1105,7 +1105,7 @@ PRBool nsNntpService::WeAreOffline() nsresult rv = NS_OK; PRBool offline = PR_FALSE; - NS_WITH_SERVICE(nsIIOService, netService, kIOServiceCID, &rv); + nsCOMPtr netService(do_GetService(kIOServiceCID, &rv)); if (NS_SUCCEEDED(rv) && netService) { netService->GetOffline(&offline); @@ -1275,7 +1275,7 @@ NS_IMETHODIMP nsNntpService::SetDefaultLocalPath(nsIFileSpec *aPath) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kCPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kCPrefServiceCID, &rv)); if (NS_FAILED(rv)) return rv; rv = prefs->SetFilePref(PREF_MAIL_ROOT_NNTP, aPath, PR_FALSE /* set default */); @@ -1289,7 +1289,7 @@ nsNntpService::GetDefaultLocalPath(nsIFileSpec ** aResult) *aResult = nsnull; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kCPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kCPrefServiceCID, &rv)); if (NS_FAILED(rv)) return rv; PRBool havePref = PR_FALSE; @@ -1521,7 +1521,7 @@ NS_IMETHODIMP nsNntpService::GetChromeUrlForTask(char **aChromeUrlForTask) { if (!aChromeUrlForTask) return NS_ERROR_FAILURE; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefService, kCPrefServiceCID, &rv); + nsCOMPtr prefService(do_GetService(kCPrefServiceCID, &rv)); if (NS_SUCCEEDED(rv)) { PRInt32 layout; diff --git a/mozilla/modules/libimg/src/if.cpp b/mozilla/modules/libimg/src/if.cpp index 4c199f5dba1..56ffc884567 100644 --- a/mozilla/modules/libimg/src/if.cpp +++ b/mozilla/modules/libimg/src/if.cpp @@ -1812,7 +1812,7 @@ PRBool il_PermitLoad(const char * image_url, nsIImageRequestObserver * aObserver } /* check to see if we need to block image from loading */ - NS_WITH_SERVICE(nsIImgManager, imgmanager, kImgManagerCID, &rv); + nsCOMPtr imgmanager(do_GetService(kImgManagerCID, &rv)); if (NS_FAILED(rv)) { Recycle(host); Recycle(firstHost); diff --git a/mozilla/modules/libjar/nsJAR.cpp b/mozilla/modules/libjar/nsJAR.cpp index 39bedaf94b0..cc8c08cf376 100644 --- a/mozilla/modules/libjar/nsJAR.cpp +++ b/mozilla/modules/libjar/nsJAR.cpp @@ -356,7 +356,8 @@ nsJAR::GetCertificatePrincipal(const char* aFilename, nsIPrincipal** aPrincipal) //-- Get the signature verifier service nsresult rv; - NS_WITH_SERVICE(nsISignatureVerifier, verifier, SIGNATURE_VERIFIER_CONTRACTID, &rv); + nsCOMPtr verifier = + do_GetService(SIGNATURE_VERIFIER_CONTRACTID, &rv); if (NS_FAILED(rv)) // No signature verifier available return NS_OK; @@ -1137,7 +1138,8 @@ nsZipReaderCache::Init(PRUint32 cacheSize) #endif // Register as a memory pressure observer - NS_WITH_SERVICE(nsIObserverService, os, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr os = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { rv = os->AddObserver(this, NS_MEMORY_PRESSURE_TOPIC); diff --git a/mozilla/modules/libjar/nsJARChannel.cpp b/mozilla/modules/libjar/nsJARChannel.cpp index 5cbcc160ee0..c03ecf2f731 100644 --- a/mozilla/modules/libjar/nsJARChannel.cpp +++ b/mozilla/modules/libjar/nsJARChannel.cpp @@ -329,7 +329,8 @@ nsJARChannel::AsyncReadJARElement() nsAutoMonitor monitor(mMonitor); - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr jarTransport; @@ -482,8 +483,8 @@ nsJARChannel::GetOwner(nsISupports* *aOwner) if (NS_FAILED(rv)) return rv; if (certificate) { // Get the codebase principal - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - kScriptSecurityManagerCID, &rv); + nsCOMPtr secMan = + do_GetService(kScriptSecurityManagerCID, &rv); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; nsCOMPtr codebase; rv = secMan->GetCodebasePrincipal(mJARBaseURI, diff --git a/mozilla/modules/libjar/nsJARURI.cpp b/mozilla/modules/libjar/nsJARURI.cpp index 1f1be0a13a2..e451e8a5bf9 100644 --- a/mozilla/modules/libjar/nsJARURI.cpp +++ b/mozilla/modules/libjar/nsJARURI.cpp @@ -105,7 +105,7 @@ NS_IMETHODIMP nsJARURI::SetSpec(const char * aSpec) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; PRUint32 startPos, endPos; @@ -320,7 +320,7 @@ nsJARURI::Resolve(const char *relativePath, char **result) if (!relativePath) return NS_ERROR_NULL_POINTER; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsXPIDLCString scheme; @@ -383,7 +383,7 @@ NS_IMETHODIMP nsJARURI::SetJAREntry(const char* entryPath) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; if (mJAREntry) diff --git a/mozilla/modules/libpref/src/nsPref.cpp b/mozilla/modules/libpref/src/nsPref.cpp index 7b324418440..017aae37a56 100644 --- a/mozilla/modules/libpref/src/nsPref.cpp +++ b/mozilla/modules/libpref/src/nsPref.cpp @@ -139,7 +139,8 @@ nsPref::nsPref() PR_AtomicIncrement(&g_InstanceCount); NS_INIT_REFCNT(); - NS_WITH_SERVICE(nsIPrefService, pService, NS_PREFSERVICE_CONTRACTID, &rv); + nsCOMPtr pService = + do_GetService(NS_PREFSERVICE_CONTRACTID, &rv); mPrefService = pService; mPrefService->GetDefaultBranch("", &pBranch); diff --git a/mozilla/modules/libpref/src/nsPrefBranch.cpp b/mozilla/modules/libpref/src/nsPrefBranch.cpp index 86264fb5399..c5f09699064 100644 --- a/mozilla/modules/libpref/src/nsPrefBranch.cpp +++ b/mozilla/modules/libpref/src/nsPrefBranch.cpp @@ -693,7 +693,8 @@ nsresult nsPrefBranch::QueryObserver(const char *aPrefName) PL_strncasecmp(aPrefName, capabilityPrefix, sizeof(capabilityPrefix)-1) == 0) { nsresult rv; - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, kSecurityManagerCID, &rv); + nsCOMPtr secMan = + do_GetService(kSecurityManagerCID, &rv); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; PRBool enabled; rv = secMan->IsCapabilityEnabled("CapabilityPreferencesAccess", &enabled); diff --git a/mozilla/modules/libpref/src/nsPrefService.cpp b/mozilla/modules/libpref/src/nsPrefService.cpp index 95058da088d..53bcf176b95 100644 --- a/mozilla/modules/libpref/src/nsPrefService.cpp +++ b/mozilla/modules/libpref/src/nsPrefService.cpp @@ -110,7 +110,8 @@ nsresult nsPrefService::Init() nsresult rv = NS_OK; if (PREF_Init(nsnull) == PR_TRUE) { - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (observerService) { // Our refcnt must be > 0 when we call this, or we'll get deleted! ++mRefCnt; @@ -713,7 +714,8 @@ extern "C" JSRuntime* PREF_GetJSRuntime() { nsresult rv; - NS_WITH_SERVICE(nsIJSRuntimeService, rtsvc, "@mozilla.org/js/xpc/RuntimeService;1", &rv); + nsCOMPtr rtsvc = + do_GetService("@mozilla.org/js/xpc/RuntimeService;1", &rv); if (NS_SUCCEEDED(rv)) { JSRuntime* rt; rv = rtsvc->GetRuntime(&rt); diff --git a/mozilla/modules/mpfilelocprovider/src/nsMPFileLocProvider.cpp b/mozilla/modules/mpfilelocprovider/src/nsMPFileLocProvider.cpp index 3906fff0b94..a14421a09fc 100755 --- a/mozilla/modules/mpfilelocprovider/src/nsMPFileLocProvider.cpp +++ b/mozilla/modules/mpfilelocprovider/src/nsMPFileLocProvider.cpp @@ -118,7 +118,8 @@ nsresult nsMPFileLocProvider::Initialize(nsIFile* profileParentDir, const char * sApp_NewsDirectory50 = NS_NewAtom(NS_APP_NEWS_50_DIR); sApp_MessengerFolderCache50 = NS_NewAtom(NS_APP_MESSENGER_FOLDER_CACHE_50_DIR); - NS_WITH_SERVICE(nsIDirectoryService, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) directoryService->RegisterProvider(this); diff --git a/mozilla/modules/oji/src/nsCSecurityContext.cpp b/mozilla/modules/oji/src/nsCSecurityContext.cpp index 5233eaa0bce..41e7eb13a5c 100644 --- a/mozilla/modules/oji/src/nsCSecurityContext.cpp +++ b/mozilla/modules/oji/src/nsCSecurityContext.cpp @@ -107,8 +107,8 @@ nsCSecurityContext::GetOrigin(char* buf, int buflen) // Get the Script Security Manager. nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv) + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv) || !secMan) return NS_ERROR_FAILURE; @@ -180,8 +180,8 @@ nsCSecurityContext::GetCertificateID(char* buf, int buflen) // Get the Script Security Manager. nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv) + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv) || !secMan) return NS_ERROR_FAILURE; @@ -227,8 +227,8 @@ nsCSecurityContext::nsCSecurityContext(JSContext* cx) // Get the Script Security Manager. nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv) + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv) || !secMan) return; @@ -271,8 +271,8 @@ nsCSecurityContext::nsCSecurityContext(nsIPrincipal *principal) // Get the Script Security Manager. nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv) + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv) || !secMan) return; nsCOMPtr sysprincipal; diff --git a/mozilla/modules/oji/src/nsJVMManager.cpp b/mozilla/modules/oji/src/nsJVMManager.cpp index 150e6b1f682..dbfd9d2b20e 100644 --- a/mozilla/modules/oji/src/nsJVMManager.cpp +++ b/mozilla/modules/oji/src/nsJVMManager.cpp @@ -260,7 +260,8 @@ NS_METHOD nsJVMManager::PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) { nsresult rv; - NS_WITH_SERVICE(nsIEventQueueService, eventService, kEventQueueServiceCID, &rv); + nsCOMPtr eventService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr eventQueue = NULL; @@ -572,7 +573,8 @@ nsJVMManager::StartupJVM(void) // beard: Now uses the nsIPluginHost to load the plugin factory for NS_JVM_MIME_TYPE. nsresult err; - NS_WITH_SERVICE(nsIPluginHost, pluginHost, kPluginManagerCID, &err); + nsCOMPtr pluginHost = + do_GetService(kPluginManagerCID, &err); if (NS_FAILED(err)) { fStatus = nsJVMStatus_Failed; @@ -595,9 +597,8 @@ nsJVMManager::StartupJVM(void) nsIPlugin* pluginFactory = NULL; // this code is the correct way to obtain pluggable JVM - NS_WITH_SERVICE(nsIPlugin, f, - NS_INLINE_PLUGIN_CONTRACTID_PREFIX NS_JVM_MIME_TYPE, - &err); + nsCOMPtr f = + do_GetService(NS_INLINE_PLUGIN_CONTRACTID_PREFIX NS_JVM_MIME_TYPE, &err); if (NS_FAILED(err) || !f) { err = pluginHost->GetPluginFactory(NS_JVM_MIME_TYPE, &pluginFactory); } @@ -849,8 +850,8 @@ nsJVMManager::IsAllPermissionGranted( // Get the Script Security Manager. - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv) + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv) || !secMan) return PR_FALSE; // Ask the Script Security Manager to make a Certificate Principal. @@ -892,14 +893,15 @@ nsJVMManager::IsAppletTrusted( nsresult rv = NS_OK; //-- Get the signature verifier service - NS_WITH_SERVICE(nsISignatureVerifier, verifier, SIGNATURE_VERIFIER_CONTRACTID, &rv); + nsCOMPtr verifier = + do_GetService(SIGNATURE_VERIFIER_CONTRACTID, &rv); if (NS_FAILED(rv)) // No signature verifier available return NS_OK; // Get the Script Security Manager. - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv) + nsCOMPtr secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv) || !secMan) return PR_FALSE; diff --git a/mozilla/modules/oji/tests/src/TM/PostEvent.cpp b/mozilla/modules/oji/tests/src/TM/PostEvent.cpp index 186d3e1f67f..35b4d56db68 100755 --- a/mozilla/modules/oji/tests/src/TM/PostEvent.cpp +++ b/mozilla/modules/oji/tests/src/TM/PostEvent.cpp @@ -112,7 +112,8 @@ TM_OJIAPITest(ThreadManager_PostEvent_6) { nsresult rv, lrc, lrc1; static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID); - NS_WITH_SERVICE(nsIEventQueueService, eventService, kEventQueueServiceCID, &rv); + nsCOMPtr eventService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) nsresult rc = rv; nsIEventQueue *nq; @@ -196,7 +197,8 @@ TM_OJIAPITest(ThreadManager_PostEvent_7) { nsresult rv, lrc, lrc1; static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID); - NS_WITH_SERVICE(nsIEventQueueService, eventService, kEventQueueServiceCID, &rv); + nsCOMPtr eventService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) nsresult rc = rv; nsIEventQueue *nq; diff --git a/mozilla/modules/plugin/SanePlugin/nsSanePlugin.cpp b/mozilla/modules/plugin/SanePlugin/nsSanePlugin.cpp index eff2a999cbc..1259cb9561b 100644 --- a/mozilla/modules/plugin/SanePlugin/nsSanePlugin.cpp +++ b/mozilla/modules/plugin/SanePlugin/nsSanePlugin.cpp @@ -2515,8 +2515,8 @@ void PR_CALLBACK scanimage_thread_routine( void * arg ) nsCOMPtr eventQ; // Get the event queue of the current thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, - kEventQueueService, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueService, &rv); if (NS_FAILED(rv)) { NS_ERROR("Unable to get event queue service!\n"); return; diff --git a/mozilla/modules/plugin/SanePlugin/nsSanePluginFactory.cpp b/mozilla/modules/plugin/SanePlugin/nsSanePluginFactory.cpp index b7c88b2ae0d..1e7d6c27498 100644 --- a/mozilla/modules/plugin/SanePlugin/nsSanePluginFactory.cpp +++ b/mozilla/modules/plugin/SanePlugin/nsSanePluginFactory.cpp @@ -253,7 +253,8 @@ NSRegisterSelf( nsISupports* aServMgr, const char* aPath ) if ( NS_FAILED( rv ) ) return rv; - NS_WITH_SERVICE( nsIComponentManager, compMgr, kComponentManagerCID, &rv ); + nsCOMPtr compMgr = + do_GetService( kComponentManagerCID, &rv ); if ( NS_FAILED( rv ) ) return rv; @@ -292,7 +293,8 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* aPath) nsCOMPtr servMgr(do_QueryInterface(aServMgr, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; rv = compMgr->UnregisterComponent(knsSanePluginControlCID, aPath); diff --git a/mozilla/modules/plugin/base/src/ns4xPlugin.cpp b/mozilla/modules/plugin/base/src/ns4xPlugin.cpp index 870c5971042..e2ed6e6cf73 100644 --- a/mozilla/modules/plugin/base/src/ns4xPlugin.cpp +++ b/mozilla/modules/plugin/base/src/ns4xPlugin.cpp @@ -1089,7 +1089,7 @@ _getvalue(NPP npp, NPNVariable variable, void *result) { *(NPBool*)result = PR_TRUE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &res)); if(NS_SUCCEEDED(res) && (nsnull != prefs)) { PRBool js; diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index f851c7ebbce..984d8304ee7 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -2875,7 +2875,8 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType, // notify Java DOM component nsresult res; - NS_WITH_SERVICE(nsIPluginInstanceOwner, javaDOM, "@mozilla.org/blackwood/java-dom;1", &res); + nsCOMPtr javaDOM = + do_GetService("@mozilla.org/blackwood/java-dom;1", &res); if (NS_SUCCEEDED(res) && javaDOM) javaDOM->SetInstance(instance); @@ -2961,7 +2962,8 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType, // notify Java DOM component nsresult res; - NS_WITH_SERVICE(nsIPluginInstanceOwner, javaDOM, "@mozilla.org/blackwood/java-dom;1", &res); + nsCOMPtr javaDOM = + do_GetService("@mozilla.org/blackwood/java-dom;1", &res); if (NS_SUCCEEDED(res) && javaDOM) javaDOM->SetInstance(instance); @@ -3262,7 +3264,8 @@ NS_IMETHODIMP nsPluginHostImpl::SetUpPluginInstance(const char *aMimeType, } if (NS_FAILED(result)) { - NS_WITH_SERVICE(nsIPlugin, bwPlugin, "@mozilla.org/blackwood/pluglet-engine;1",&result); + nsCOMPtr bwPlugin = + do_GetService("@mozilla.org/blackwood/pluglet-engine;1", &result); if (NS_SUCCEEDED(result)) { result = bwPlugin->CreatePluginInstance(NULL, @@ -3763,7 +3766,8 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi // should we also look for a 'carb' resource? if (PR_FindSymbol(pluginTag->mLibrary, "mainRD") != NULL) { - NS_WITH_SERVICE(nsIClassicPluginFactory, factory, NS_CLASSIC_PLUGIN_FACTORY_CONTRACTID, &rv); + nsCOMPtr factory = + do_GetService(NS_CLASSIC_PLUGIN_FACTORY_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) rv = factory->CreatePlugin(serviceManager, pluginTag->mFileName, @@ -4826,13 +4830,14 @@ NS_IMETHODIMP nsPluginHostImpl::GetCookie(const char* inCookieURL, void* inOutCo return NS_ERROR_INVALID_ARG; } - NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv) || (nsnull == ioService)) { return rv; } - NS_WITH_SERVICE(nsICookieService, cookieService, kCookieServiceCID, &rv); + nsCOMPtr cookieService = + do_GetService(kCookieServiceCID, &rv); if (NS_FAILED(rv) || (nsnull == cookieService)) { return NS_ERROR_INVALID_ARG; @@ -4868,13 +4873,14 @@ NS_IMETHODIMP nsPluginHostImpl::SetCookie(const char* inCookieURL, const void* i return NS_ERROR_INVALID_ARG; } - NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv) || (nsnull == ioService)) { return rv; } - NS_WITH_SERVICE(nsICookieService, cookieService, kCookieServiceCID, &rv); + nsCOMPtr cookieService = + do_GetService(kCookieServiceCID, &rv); if (NS_FAILED(rv) || (nsnull == cookieService)) { return NS_ERROR_FAILURE; diff --git a/mozilla/modules/plugin/base/src/nsPluginSafety.h b/mozilla/modules/plugin/base/src/nsPluginSafety.h index d34524b6160..6bea2fb99cd 100644 --- a/mozilla/modules/plugin/base/src/nsPluginSafety.h +++ b/mozilla/modules/plugin/base/src/nsPluginSafety.h @@ -33,7 +33,7 @@ PR_BEGIN_MACRO \ nsresult res; \ PRBool dontdoit = PR_FALSE; \ - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res);\ + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &res));\ if(NS_SUCCEEDED(res) && (prefs != nsnull)) \ { \ res = prefs->GetBoolPref("plugin.dont_try_safe_calls", &dontdoit);\ @@ -50,7 +50,7 @@ PR_BEGIN_MACRO \ } \ catch(...) \ { \ - NS_WITH_SERVICE(nsIPluginHost, host, kCPluginManagerCID, &res);\ + nsCOMPtr host(do_GetService(kCPluginManagerCID, &res));\ if(NS_SUCCEEDED(res) && (host != nsnull)) \ host->HandleBadPlugin(library); \ ret = (NPError)NS_ERROR_FAILURE; \ @@ -62,7 +62,7 @@ PR_END_MACRO PR_BEGIN_MACRO \ nsresult res; \ PRBool dontdoit = PR_FALSE; \ - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res);\ + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &res));\ if(NS_SUCCEEDED(res) && (prefs != nsnull))\ { \ res = prefs->GetBoolPref("plugin.dont_try_safe_calls", &dontdoit);\ @@ -79,7 +79,7 @@ PR_BEGIN_MACRO \ } \ catch(...) \ { \ - NS_WITH_SERVICE(nsIPluginHost, host, kCPluginManagerCID, &res);\ + nsCOMPtr host(do_GetService(kCPluginManagerCID, &res));\ if(NS_SUCCEEDED(res) && (host != nsnull))\ host->HandleBadPlugin(library); \ } \ diff --git a/mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp b/mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp index 870c5971042..e2ed6e6cf73 100644 --- a/mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp +++ b/mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp @@ -1089,7 +1089,7 @@ _getvalue(NPP npp, NPNVariable variable, void *result) { *(NPBool*)result = PR_TRUE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &res)); if(NS_SUCCEEDED(res) && (nsnull != prefs)) { PRBool js; diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp index f851c7ebbce..984d8304ee7 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp @@ -2875,7 +2875,8 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType, // notify Java DOM component nsresult res; - NS_WITH_SERVICE(nsIPluginInstanceOwner, javaDOM, "@mozilla.org/blackwood/java-dom;1", &res); + nsCOMPtr javaDOM = + do_GetService("@mozilla.org/blackwood/java-dom;1", &res); if (NS_SUCCEEDED(res) && javaDOM) javaDOM->SetInstance(instance); @@ -2961,7 +2962,8 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType, // notify Java DOM component nsresult res; - NS_WITH_SERVICE(nsIPluginInstanceOwner, javaDOM, "@mozilla.org/blackwood/java-dom;1", &res); + nsCOMPtr javaDOM = + do_GetService("@mozilla.org/blackwood/java-dom;1", &res); if (NS_SUCCEEDED(res) && javaDOM) javaDOM->SetInstance(instance); @@ -3262,7 +3264,8 @@ NS_IMETHODIMP nsPluginHostImpl::SetUpPluginInstance(const char *aMimeType, } if (NS_FAILED(result)) { - NS_WITH_SERVICE(nsIPlugin, bwPlugin, "@mozilla.org/blackwood/pluglet-engine;1",&result); + nsCOMPtr bwPlugin = + do_GetService("@mozilla.org/blackwood/pluglet-engine;1", &result); if (NS_SUCCEEDED(result)) { result = bwPlugin->CreatePluginInstance(NULL, @@ -3763,7 +3766,8 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi // should we also look for a 'carb' resource? if (PR_FindSymbol(pluginTag->mLibrary, "mainRD") != NULL) { - NS_WITH_SERVICE(nsIClassicPluginFactory, factory, NS_CLASSIC_PLUGIN_FACTORY_CONTRACTID, &rv); + nsCOMPtr factory = + do_GetService(NS_CLASSIC_PLUGIN_FACTORY_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) rv = factory->CreatePlugin(serviceManager, pluginTag->mFileName, @@ -4826,13 +4830,14 @@ NS_IMETHODIMP nsPluginHostImpl::GetCookie(const char* inCookieURL, void* inOutCo return NS_ERROR_INVALID_ARG; } - NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv) || (nsnull == ioService)) { return rv; } - NS_WITH_SERVICE(nsICookieService, cookieService, kCookieServiceCID, &rv); + nsCOMPtr cookieService = + do_GetService(kCookieServiceCID, &rv); if (NS_FAILED(rv) || (nsnull == cookieService)) { return NS_ERROR_INVALID_ARG; @@ -4868,13 +4873,14 @@ NS_IMETHODIMP nsPluginHostImpl::SetCookie(const char* inCookieURL, const void* i return NS_ERROR_INVALID_ARG; } - NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv) || (nsnull == ioService)) { return rv; } - NS_WITH_SERVICE(nsICookieService, cookieService, kCookieServiceCID, &rv); + nsCOMPtr cookieService = + do_GetService(kCookieServiceCID, &rv); if (NS_FAILED(rv) || (nsnull == cookieService)) { return NS_ERROR_FAILURE; diff --git a/mozilla/modules/plugin/nglsrc/nsPluginSafety.h b/mozilla/modules/plugin/nglsrc/nsPluginSafety.h index d34524b6160..6bea2fb99cd 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginSafety.h +++ b/mozilla/modules/plugin/nglsrc/nsPluginSafety.h @@ -33,7 +33,7 @@ PR_BEGIN_MACRO \ nsresult res; \ PRBool dontdoit = PR_FALSE; \ - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res);\ + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &res));\ if(NS_SUCCEEDED(res) && (prefs != nsnull)) \ { \ res = prefs->GetBoolPref("plugin.dont_try_safe_calls", &dontdoit);\ @@ -50,7 +50,7 @@ PR_BEGIN_MACRO \ } \ catch(...) \ { \ - NS_WITH_SERVICE(nsIPluginHost, host, kCPluginManagerCID, &res);\ + nsCOMPtr host(do_GetService(kCPluginManagerCID, &res));\ if(NS_SUCCEEDED(res) && (host != nsnull)) \ host->HandleBadPlugin(library); \ ret = (NPError)NS_ERROR_FAILURE; \ @@ -62,7 +62,7 @@ PR_END_MACRO PR_BEGIN_MACRO \ nsresult res; \ PRBool dontdoit = PR_FALSE; \ - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res);\ + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &res));\ if(NS_SUCCEEDED(res) && (prefs != nsnull))\ { \ res = prefs->GetBoolPref("plugin.dont_try_safe_calls", &dontdoit);\ @@ -79,7 +79,7 @@ PR_BEGIN_MACRO \ } \ catch(...) \ { \ - NS_WITH_SERVICE(nsIPluginHost, host, kCPluginManagerCID, &res);\ + nsCOMPtr host(do_GetService(kCPluginManagerCID, &res));\ if(NS_SUCCEEDED(res) && (host != nsnull))\ host->HandleBadPlugin(library); \ } \ diff --git a/mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp b/mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp index eff2a999cbc..1259cb9561b 100644 --- a/mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp +++ b/mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp @@ -2515,8 +2515,8 @@ void PR_CALLBACK scanimage_thread_routine( void * arg ) nsCOMPtr eventQ; // Get the event queue of the current thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, - kEventQueueService, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueService, &rv); if (NS_FAILED(rv)) { NS_ERROR("Unable to get event queue service!\n"); return; diff --git a/mozilla/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp b/mozilla/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp index b7c88b2ae0d..1e7d6c27498 100644 --- a/mozilla/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp +++ b/mozilla/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp @@ -253,7 +253,8 @@ NSRegisterSelf( nsISupports* aServMgr, const char* aPath ) if ( NS_FAILED( rv ) ) return rv; - NS_WITH_SERVICE( nsIComponentManager, compMgr, kComponentManagerCID, &rv ); + nsCOMPtr compMgr = + do_GetService( kComponentManagerCID, &rv ); if ( NS_FAILED( rv ) ) return rv; @@ -292,7 +293,8 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* aPath) nsCOMPtr servMgr(do_QueryInterface(aServMgr, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; rv = compMgr->UnregisterComponent(knsSanePluginControlCID, aPath); diff --git a/mozilla/netwerk/base/src/nsAsyncStreamListener.cpp b/mozilla/netwerk/base/src/nsAsyncStreamListener.cpp index 5701f19c613..37b65520af1 100644 --- a/mozilla/netwerk/base/src/nsAsyncStreamListener.cpp +++ b/mozilla/netwerk/base/src/nsAsyncStreamListener.cpp @@ -163,7 +163,8 @@ nsAsyncStreamObserver::Init(nsIRequestObserver* aObserver, nsIEventQueue* aEvent NS_ASSERTION(aObserver, "null observer"); mReceiver = aObserver; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueService, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueService, &rv); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/netwerk/base/src/nsDownloader.cpp b/mozilla/netwerk/base/src/nsDownloader.cpp index 77bfdd9a2c7..f4e30fb23c2 100644 --- a/mozilla/netwerk/base/src/nsDownloader.cpp +++ b/mozilla/netwerk/base/src/nsDownloader.cpp @@ -67,8 +67,8 @@ nsDownloader::Init(nsIURI* aURL, // in a recursive situation and breaks the asynchronous // semantics of nsIDownloader nsresult rv2 = NS_OK; - NS_WITH_SERVICE(nsIProxyObjectManager, pIProxyObjectManager, - kProxyObjectManagerCID, &rv); + nsCOMPtr pIProxyObjectManager = + do_GetService(kProxyObjectManagerCID, &rv); if (NS_FAILED(rv2)) return rv2; nsCOMPtr pObserver; rv2 = pIProxyObjectManager->GetProxyForObject(NS_CURRENT_EVENTQ, diff --git a/mozilla/netwerk/base/src/nsFileTransport.cpp b/mozilla/netwerk/base/src/nsFileTransport.cpp index 6f8b42c61c7..33bd8c993e2 100644 --- a/mozilla/netwerk/base/src/nsFileTransport.cpp +++ b/mozilla/netwerk/base/src/nsFileTransport.cpp @@ -1082,8 +1082,8 @@ nsFileTransport::SetNotificationCallbacks(nsIInterfaceRequestor *aCallbacks, // Otherwise, generate a proxied event sink nsresult rv; - NS_WITH_SERVICE(nsIProxyObjectManager, - proxyMgr, kProxyObjectManagerCID, &rv); + nsCOMPtr proxyMgr = + do_GetService(kProxyObjectManagerCID, &rv); if (NS_FAILED(rv)) return rv; return proxyMgr->GetProxyForObject(NS_CURRENT_EVENTQ, // calling thread diff --git a/mozilla/netwerk/base/src/nsIOService.cpp b/mozilla/netwerk/base/src/nsIOService.cpp index 9cc9479535e..d64be634129 100644 --- a/mozilla/netwerk/base/src/nsIOService.cpp +++ b/mozilla/netwerk/base/src/nsIOService.cpp @@ -187,7 +187,7 @@ nsIOService::Init() } // Lets make it really easy to block extra ports: - NS_WITH_SERVICE(nsIPref, prefService, kPrefServiceCID, &rv); + nsCOMPtr prefService(do_GetService(kPrefServiceCID, &rv)); if (NS_FAILED(rv) && !prefService) { NS_ASSERTION(0, "Prefs not found!"); return NS_ERROR_FAILURE; diff --git a/mozilla/netwerk/base/src/nsInputStreamChannel.cpp b/mozilla/netwerk/base/src/nsInputStreamChannel.cpp index 9029f8c6693..89c6fd01d2c 100644 --- a/mozilla/netwerk/base/src/nsInputStreamChannel.cpp +++ b/mozilla/netwerk/base/src/nsInputStreamChannel.cpp @@ -294,7 +294,8 @@ nsStreamIOChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt) } if (mFileTransport == nsnull) { - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) goto done; rv = fts->CreateTransportFromStreamIO(mStreamIO, getter_AddRefs(mFileTransport)); diff --git a/mozilla/netwerk/base/src/nsNetModRegEntry.cpp b/mozilla/netwerk/base/src/nsNetModRegEntry.cpp index aca606ec91e..9ffcdb45300 100644 --- a/mozilla/netwerk/base/src/nsNetModRegEntry.cpp +++ b/mozilla/netwerk/base/src/nsNetModRegEntry.cpp @@ -145,7 +145,8 @@ nsNetModRegEntry::nsNetModRegEntry(const char *aTopic, mSyncProxy = nsnull; mRealNotifier = aNotify; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, result); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, result); if (NS_FAILED(*result)) return; @@ -162,7 +163,8 @@ nsNetModRegEntry::BuildProxy(PRBool sync) nsresult result; - NS_WITH_SERVICE( nsIProxyObjectManager, proxyManager, kProxyObjectManagerCID, &result); + nsCOMPtr proxyManager = + do_GetService(kProxyObjectManagerCID, &result); if (NS_FAILED(result)) return result; diff --git a/mozilla/netwerk/base/src/nsProtocolProxyService.cpp b/mozilla/netwerk/base/src/nsProtocolProxyService.cpp index b4794cd4db6..0beabf97475 100644 --- a/mozilla/netwerk/base/src/nsProtocolProxyService.cpp +++ b/mozilla/netwerk/base/src/nsProtocolProxyService.cpp @@ -302,7 +302,7 @@ void PR_CALLBACK nsProtocolProxyService::HandlePACLoadEvent(PLEvent* aEvent) return; } - NS_WITH_SERVICE(nsIIOService, pIOService, kIOServiceCID, &rv); + nsCOMPtr pIOService(do_GetService(kIOServiceCID, &rv)); if (!pIOService || NS_FAILED(rv)) { NS_ERROR("Cannot get IO Service"); return; diff --git a/mozilla/netwerk/base/src/nsSocketTransport.cpp b/mozilla/netwerk/base/src/nsSocketTransport.cpp index c05870c7736..5bfa236ca37 100644 --- a/mozilla/netwerk/base/src/nsSocketTransport.cpp +++ b/mozilla/netwerk/base/src/nsSocketTransport.cpp @@ -613,10 +613,7 @@ nsresult nsSocketTransport::doResolveHost(void) // mNetAddress.ipv6.port = PR_htons(((mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort)); - NS_WITH_SERVICE(nsIDNSService, - pDNSService, - kDNSService, - &rv); + nsCOMPtr pDNSService(do_GetService(kDNSService, &rv)); if (NS_FAILED(rv)) return rv; // @@ -696,10 +693,8 @@ nsresult nsSocketTransport::doConnection(PRInt16 aSelectFlags) if (!mSocketTypeCount) mSocketFD = PR_OpenTCPSocket(PR_AF_INET6); else { - NS_WITH_SERVICE(nsISocketProviderService, - pProviderService, - kSocketProviderService, - &rv); + nsCOMPtr pProviderService = + do_GetService(kSocketProviderService, &rv); char * destHost = mHostName; PRInt32 destPort = mPort; @@ -886,10 +881,7 @@ nsSocketTransport::doBlockingConnection() // The hostname has not been resolved yet... // if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) { - NS_WITH_SERVICE(nsIDNSService, - pDNSService, - kDNSService, - &rv); + nsCOMPtr pDNSService(do_GetService(kDNSService, &rv)); if (NS_FAILED(rv)) return rv; nsXPIDLCString result; @@ -1269,8 +1261,8 @@ nsSocketTransport::SetNotificationCallbacks(nsIInterfaceRequestor *aCallbacks, // Otherwise, generate a proxied event sink nsresult rv; - NS_WITH_SERVICE(nsIProxyObjectManager, - proxyMgr, kProxyObjectManagerCID, &rv); + nsCOMPtr proxyMgr = + do_GetService(kProxyObjectManagerCID, &rv); if (NS_FAILED(rv)) return rv; return proxyMgr->GetProxyForObject(NS_CURRENT_EVENTQ, // calling thread diff --git a/mozilla/netwerk/base/src/nsSocketTransportService.cpp b/mozilla/netwerk/base/src/nsSocketTransportService.cpp index 973911c9e65..795760cce22 100644 --- a/mozilla/netwerk/base/src/nsSocketTransportService.cpp +++ b/mozilla/netwerk/base/src/nsSocketTransportService.cpp @@ -528,7 +528,7 @@ nsSocketTransportService::CreateTransportOfTypes(PRUint32 socketTypeCount, { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIIOService, ios, kIOServiceCID, &rv); + nsCOMPtr ios(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; PRBool offline; rv = ios->GetOffline(&offline); diff --git a/mozilla/netwerk/base/src/nsStreamLoader.cpp b/mozilla/netwerk/base/src/nsStreamLoader.cpp index 8559eedd9d4..889bb77c01d 100644 --- a/mozilla/netwerk/base/src/nsStreamLoader.cpp +++ b/mozilla/netwerk/base/src/nsStreamLoader.cpp @@ -46,8 +46,8 @@ nsStreamLoader::Init(nsIURI* aURL, // in a recursive situation and breaks the asynchronous // semantics of nsIStreamLoader nsresult rv2 = NS_OK; - NS_WITH_SERVICE(nsIProxyObjectManager, pIProxyObjectManager, - kProxyObjectManagerCID, &rv2); + nsCOMPtr pIProxyObjectManager = + do_GetService(kProxyObjectManagerCID, &rv2); if (NS_FAILED(rv2)) return rv2; nsCOMPtr pObserver; diff --git a/mozilla/netwerk/cache/filecache/nsDiskCacheRecordChannel.cpp b/mozilla/netwerk/cache/filecache/nsDiskCacheRecordChannel.cpp index 02bd079f55a..81d7e482e67 100644 --- a/mozilla/netwerk/cache/filecache/nsDiskCacheRecordChannel.cpp +++ b/mozilla/netwerk/cache/filecache/nsDiskCacheRecordChannel.cpp @@ -342,7 +342,8 @@ nsDiskCacheRecordChannel::OpenInputStream(PRUint32 offset, PRUint32 count, PRUin if(mFileTransport) return NS_ERROR_IN_PROGRESS; - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if(NS_FAILED(rv)) return rv; rv = fts->CreateTransport(mSpec, PR_RDONLY, PR_IRUSR | PR_IWUSR, @@ -371,7 +372,8 @@ nsDiskCacheRecordChannel::OpenOutputStream(PRUint32 offset, PRUint32 count, PRUi nsCOMPtr outputStream; - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if(NS_FAILED(rv)) return rv; rv = fts->CreateTransport(mSpec, PR_WRONLY | PR_CREATE_FILE, PR_IRUSR | PR_IWUSR, @@ -410,7 +412,8 @@ nsDiskCacheRecordChannel::AsyncRead(nsIStreamListener *aListener, nsISupports *a } - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = fts->CreateTransport(mSpec, PR_RDONLY, PR_IRUSR | PR_IWUSR, diff --git a/mozilla/netwerk/cache/filecache/nsNetDiskCache.cpp b/mozilla/netwerk/cache/filecache/nsNetDiskCache.cpp index 3ec7a24271b..48ee8638569 100644 --- a/mozilla/netwerk/cache/filecache/nsNetDiskCache.cpp +++ b/mozilla/netwerk/cache/filecache/nsNetDiskCache.cpp @@ -80,7 +80,7 @@ static const char * const CACHE_ENABLE_PREF = "browser.cache.disk.enable"; static int PR_CALLBACK folderChanged(const char *pref, void *closure) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if ( NS_FAILED (rv ) ) return rv; @@ -94,7 +94,7 @@ static int PR_CALLBACK folderChanged(const char *pref, void *closure) static int PR_CALLBACK enableChanged(const char *pref, void *closure) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if ( NS_FAILED (rv ) ) return rv; @@ -128,7 +128,7 @@ nsNetDiskCache::~nsNetDiskCache() ShutdownDB(); nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if ( NS_SUCCEEDED (rv ) ) { prefs->UnregisterCallback( CACHE_DIR_PREF, folderChanged, this ); @@ -253,7 +253,7 @@ NS_IMETHODIMP nsNetDiskCache::Init(void) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if ( NS_FAILED (rv ) ) return rv; rv = prefs->RegisterCallback( CACHE_DIR_PREF, folderChanged, this); diff --git a/mozilla/netwerk/cache/filecache/test/diskcache.cpp b/mozilla/netwerk/cache/filecache/test/diskcache.cpp index 4ceec73a544..bb6e13b9ea3 100644 --- a/mozilla/netwerk/cache/filecache/test/diskcache.cpp +++ b/mozilla/netwerk/cache/filecache/test/diskcache.cpp @@ -265,7 +265,8 @@ nsresult InitQueue() { nsresult rv; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue service"); rv = eventQService->CreateThreadEventQueue(); @@ -738,7 +739,7 @@ nsresult NS_AutoregisterComponents() PRBool initPref () { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefPtr, kPrefCID, &rv); + nsCOMPtr prefPtr(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return false; diff --git a/mozilla/netwerk/cache/memcache/nsMemCacheChannel.cpp b/mozilla/netwerk/cache/memcache/nsMemCacheChannel.cpp index 82a4dbad013..6194a662fb2 100644 --- a/mozilla/netwerk/cache/memcache/nsMemCacheChannel.cpp +++ b/mozilla/netwerk/cache/memcache/nsMemCacheChannel.cpp @@ -228,10 +228,11 @@ public: mContext = aContext; mDownstreamListener = aListener; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueService, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueService, &rv); if (NS_FAILED(rv)) return rv; rv = eventQService->GetThreadEventQueue(PR_CurrentThread(), &eventQ); diff --git a/mozilla/netwerk/cache/mgr/nsCacheEntryChannel.cpp b/mozilla/netwerk/cache/mgr/nsCacheEntryChannel.cpp index 5a7559e3458..96ef029aad9 100644 --- a/mozilla/netwerk/cache/mgr/nsCacheEntryChannel.cpp +++ b/mozilla/netwerk/cache/mgr/nsCacheEntryChannel.cpp @@ -253,7 +253,7 @@ nsCacheEntryChannel::GetURI(nsIURI * *aURI) rv = mCacheEntry->GetUriSpec(&spec); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; rv = serv->NewURI(spec, nsnull, aURI); diff --git a/mozilla/netwerk/cache/mgr/nsCacheManager.cpp b/mozilla/netwerk/cache/mgr/nsCacheManager.cpp index 1f0a8623c95..7192bae35c1 100644 --- a/mozilla/netwerk/cache/mgr/nsCacheManager.cpp +++ b/mozilla/netwerk/cache/mgr/nsCacheManager.cpp @@ -52,7 +52,7 @@ const char* CACHE_DISK_CAPACITY = "browser.cache.disk_cache_size"; static int PR_CALLBACK diskCacheSizeChanged(const char *pref, void *closure) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); PRInt32 capacity = DEFAULT_DISK_CACHE_CAPACITY; if ( NS_SUCCEEDED (rv ) ) { @@ -65,7 +65,7 @@ static int PR_CALLBACK memCacheSizeChanged(const char *pref, void *closure) { nsresult rv; PRInt32 capacity = DEFAULT_MEMORY_CACHE_CAPACITY ; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if ( NS_SUCCEEDED (rv ) ) { rv = prefs->GetIntPref(CACHE_MEM_CAPACITY, &capacity ); @@ -99,14 +99,15 @@ nsCacheManager::~nsCacheManager() delete mMemSpaceManager; delete mDiskSpaceManager; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if ( NS_SUCCEEDED (rv ) ) { prefs->UnregisterCallback( CACHE_DISK_CAPACITY, diskCacheSizeChanged, this); prefs->UnregisterCallback( CACHE_MEM_CAPACITY, memCacheSizeChanged, this); } // Unregister this memory pressure observer - NS_WITH_SERVICE(nsIObserverService, os, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr os = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { rv = os->RemoveObserver(this, NS_MEMORY_PRESSURE_TOPIC); } @@ -117,7 +118,7 @@ nsCacheManager::~nsCacheManager() nsresult nsCacheManager::InitPrefs() { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv); + nsCOMPtr prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); if ( NS_FAILED (rv ) ) return rv; rv = prefs->RegisterCallback( CACHE_DISK_CAPACITY, diskCacheSizeChanged, this); @@ -143,7 +144,8 @@ nsCacheManager::Init() return NS_ERROR_OUT_OF_MEMORY; // Register as a memory pressure observer - NS_WITH_SERVICE(nsIObserverService, os, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr os = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { rv = os->AddObserver(this, NS_MEMORY_PRESSURE_TOPIC); } diff --git a/mozilla/netwerk/mime/src/nsXMLMIMEDataSource.cpp b/mozilla/netwerk/mime/src/nsXMLMIMEDataSource.cpp index 82933a024ff..774673540b7 100644 --- a/mozilla/netwerk/mime/src/nsXMLMIMEDataSource.cpp +++ b/mozilla/netwerk/mime/src/nsXMLMIMEDataSource.cpp @@ -290,7 +290,8 @@ nsXMLMIMEDataSource::Serialize() { nsresult rv = NS_OK; nsCOMPtr transport; - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv) ; + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv) ; if(NS_FAILED(rv)) return rv ; rv = fts->CreateTransport(mFile, PR_WRONLY|PR_CREATE_FILE, PR_IRWXU, getter_AddRefs(transport)) ; @@ -688,7 +689,8 @@ nsXMLMIMEDataSource::InitFromFile( nsIFile* aFile ) nsresult rv; nsCOMPtr transport; - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv) ; + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv) ; if(NS_FAILED(rv)) return rv ; // Made second parameter 0 since I really don't know what it is used for rv = fts->CreateTransport(aFile, PR_RDONLY, PR_IRWXU, getter_AddRefs(transport)) ; diff --git a/mozilla/netwerk/protocol/about/src/mzAboutMozilla.cpp b/mozilla/netwerk/protocol/about/src/mzAboutMozilla.cpp index ab33d5b20fe..443cb0b3308 100644 --- a/mozilla/netwerk/protocol/about/src/mzAboutMozilla.cpp +++ b/mozilla/netwerk/protocol/about/src/mzAboutMozilla.cpp @@ -37,7 +37,7 @@ NS_IMETHODIMP mzAboutMozilla::NewChannel(nsIURI *aURI, nsIChannel **result) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; rv = ioService->NewChannel(kCreditsPage, nsnull, result); diff --git a/mozilla/netwerk/protocol/about/src/nsAboutCache.cpp b/mozilla/netwerk/protocol/about/src/nsAboutCache.cpp index c006a1ff8e0..e906248d4ca 100644 --- a/mozilla/netwerk/protocol/about/src/nsAboutCache.cpp +++ b/mozilla/netwerk/protocol/about/src/nsAboutCache.cpp @@ -84,8 +84,8 @@ nsAboutCache::NewChannel(nsIURI *aURI, nsIChannel **result) } */ // Get the cache manager service - NS_WITH_SERVICE(nsICacheService, cacheService, - NS_CACHESERVICE_CONTRACTID, &rv); + nsCOMPtr cacheService = + do_GetService(NS_CACHESERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr storageStream; diff --git a/mozilla/netwerk/protocol/about/src/nsAboutCredits.cpp b/mozilla/netwerk/protocol/about/src/nsAboutCredits.cpp index c1dcf834973..d8e5d54e117 100644 --- a/mozilla/netwerk/protocol/about/src/nsAboutCredits.cpp +++ b/mozilla/netwerk/protocol/about/src/nsAboutCredits.cpp @@ -37,7 +37,7 @@ NS_IMETHODIMP nsAboutCredits::NewChannel(nsIURI *aURI, nsIChannel **result) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; rv = ioService->NewChannel(kCreditsPage, nsnull, result); diff --git a/mozilla/netwerk/protocol/about/src/nsAboutPlugins.cpp b/mozilla/netwerk/protocol/about/src/nsAboutPlugins.cpp index 71f366f7ba7..44f665408d4 100755 --- a/mozilla/netwerk/protocol/about/src/nsAboutPlugins.cpp +++ b/mozilla/netwerk/protocol/about/src/nsAboutPlugins.cpp @@ -38,7 +38,7 @@ NS_IMETHODIMP nsAboutPlugins::NewChannel(nsIURI *aURI, nsIChannel **result) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; rv = ioService->NewChannel(kPluginsPage, nsnull, result); diff --git a/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp b/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp index 216517e370e..440fbae772d 100644 --- a/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp +++ b/mozilla/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp @@ -141,7 +141,7 @@ nsAboutProtocolHandler::NewChannel(nsIURI* uri, nsIChannel* *result) what.BeginReading(begin); contractID.Append(Substring(begin, end)); - NS_WITH_SERVICE(nsIAboutModule, aboutMod, contractID.get(), &rv); + nsCOMPtr aboutMod(do_GetService(contractID.get(), &rv)); if (NS_SUCCEEDED(rv)) { // The standard return case: return aboutMod->NewChannel(uri, result); diff --git a/mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp b/mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp index 85dff521f44..b0d2a915d68 100644 --- a/mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp +++ b/mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp @@ -50,7 +50,7 @@ nsAboutRedirector::NewChannel(nsIURI *aURI, nsIChannel **result) nsXPIDLCString path; (void)aURI->GetPath(getter_Copies(path)); nsresult rv; - NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; @@ -66,8 +66,8 @@ nsAboutRedirector::NewChannel(nsIURI *aURI, nsIChannel **result) if (NS_SUCCEEDED(rv) && result && !PL_strncasecmp(kRedirMap[i][1], kChromePrefix, sizeof(kChromePrefix)-1)) { - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/netwerk/protocol/data/src/nsDataChannel.cpp b/mozilla/netwerk/protocol/data/src/nsDataChannel.cpp index 121f61d5a75..77810830335 100644 --- a/mozilla/netwerk/protocol/data/src/nsDataChannel.cpp +++ b/mozilla/netwerk/protocol/data/src/nsDataChannel.cpp @@ -313,7 +313,8 @@ nsDataChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt) nsCOMPtr eventQ; nsCOMPtr listener; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(eventQ)); diff --git a/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.cpp b/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.cpp index cc0e4673791..caa75b8e617 100644 --- a/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.cpp +++ b/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.cpp @@ -162,7 +162,8 @@ nsDateTimeChannel::Open(nsIInputStream **_retval) if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv); + nsCOMPtr socketService = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr transport; @@ -183,7 +184,8 @@ nsDateTimeChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt) if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv); + nsCOMPtr socketService = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr transport; diff --git a/mozilla/netwerk/protocol/file/src/nsFileChannel.cpp b/mozilla/netwerk/protocol/file/src/nsFileChannel.cpp index ed793c049d7..d668b7cdfc8 100644 --- a/mozilla/netwerk/protocol/file/src/nsFileChannel.cpp +++ b/mozilla/netwerk/protocol/file/src/nsFileChannel.cpp @@ -226,7 +226,8 @@ nsFileChannel::EnsureTransport() if (!exist) return NS_ERROR_FILE_NOT_FOUND; - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = fts->CreateTransport(mFile, mIOFlags, mPerm, diff --git a/mozilla/netwerk/protocol/finger/src/nsFingerChannel.cpp b/mozilla/netwerk/protocol/finger/src/nsFingerChannel.cpp index c443b111c87..d9fe1684832 100644 --- a/mozilla/netwerk/protocol/finger/src/nsFingerChannel.cpp +++ b/mozilla/netwerk/protocol/finger/src/nsFingerChannel.cpp @@ -192,7 +192,8 @@ nsFingerChannel::Open(nsIInputStream **_retval) if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv); + nsCOMPtr socketService = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = socketService->CreateTransport(mHost, mPort, nsnull, -1, BUFFER_SEG_SIZE, @@ -214,7 +215,8 @@ nsFingerChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt) if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv); + nsCOMPtr socketService = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = socketService->CreateTransport(mHost, mPort, nsnull, -1, BUFFER_SEG_SIZE, @@ -364,8 +366,8 @@ nsFingerChannel::OnStopRequest(nsIRequest *aRequest, nsISupports* aContext, mActAsObserver = PR_FALSE; nsCOMPtr converterListener; - NS_WITH_SERVICE(nsIStreamConverterService, StreamConvService, - kStreamConverterServiceCID, &rv); + nsCOMPtr StreamConvService = + do_GetService(kStreamConverterServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsAutoString fromStr; fromStr.AssignWithConversion("text/plain"); diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp index e1b8ee6aa27..33039e8b59e 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp +++ b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp @@ -315,7 +315,7 @@ nsFtpState::nsFtpState() { mGenerateRawContent = mGenerateHTMLContent = PR_FALSE; nsresult rv; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) || pPref) { pPref->GetBoolPref("network.dir.generate_html", &mGenerateHTMLContent); pPref->GetBoolPref("network.ftp.raw_output", &mGenerateRawContent); @@ -951,7 +951,7 @@ nsFtpState::S_pass() { if (mAnonymous) { char* anonPassword; - NS_WITH_SERVICE(nsIPref, pPref, kPrefCID, &rv); + nsCOMPtr pPref(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) || pPref) rv = pPref->CopyCharPref("network.ftp.anonymous_password", &anonPassword); if (NS_SUCCEEDED(rv) && anonPassword && *anonPassword != '\0') { @@ -1027,7 +1027,8 @@ nsFtpState::R_pass() { // kick back out to S_pass() and ask the user again. nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIWalletService, walletService, kWalletServiceCID, &rv); + nsCOMPtr walletService = + do_GetService(kWalletServiceCID, &rv); if (NS_FAILED(rv)) return FTP_ERROR; nsXPIDLCString uri; @@ -1906,10 +1907,8 @@ nsFtpState::BuildStreamConverter(nsIStreamListener** convertStreamListener) nsCOMPtr converterListener; nsCOMPtr listener = do_QueryInterface(mChannel); - NS_WITH_SERVICE(nsIStreamConverterService, - scs, - kStreamConverterServiceCID, - &rv); + nsCOMPtr scs = + do_GetService(kStreamConverterServiceCID, &rv); if (NS_FAILED(rv)) return rv; @@ -1964,10 +1963,8 @@ nsFtpState::CreateTransport(const char * host, PRInt32 port, PRUint32 bufferSegm { nsresult rv; - NS_WITH_SERVICE(nsISocketTransportService, - sts, - kSocketTransportServiceCID, - &rv); + nsCOMPtr sts = + do_GetService(kSocketTransportServiceCID, &rv); return sts->CreateTransport(host, port, nsnull, PRUint32(-1), bufferSegmentSize, diff --git a/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.cpp b/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.cpp index 52566af614f..d796cee5671 100644 --- a/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.cpp +++ b/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.cpp @@ -237,10 +237,8 @@ nsGopherChannel::Open(nsIInputStream **_retval) if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsISocketTransportService, - socketService, - kSocketTransportServiceCID, - &rv); + nsCOMPtr socketService = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = socketService->CreateTransport(mHost, @@ -279,10 +277,8 @@ nsGopherChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt) mListener = aListener; mResponseContext = ctxt; - NS_WITH_SERVICE(nsISocketTransportService, - socketService, - kSocketTransportServiceCID, - &rv); + nsCOMPtr socketService = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = socketService->CreateTransport(mHost, @@ -503,8 +499,8 @@ nsGopherChannel::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext, nsCOMPtr converterListener; - NS_WITH_SERVICE(nsIStreamConverterService, StreamConvService, - kStreamConverterServiceCID, &rv); + nsCOMPtr StreamConvService = + do_GetService(kStreamConverterServiceCID, &rv); if (NS_FAILED(rv)) return rv; // What we now do depends on what type of file we have diff --git a/mozilla/netwerk/protocol/jar/src/nsJARChannel.cpp b/mozilla/netwerk/protocol/jar/src/nsJARChannel.cpp index 5cbcc160ee0..c03ecf2f731 100644 --- a/mozilla/netwerk/protocol/jar/src/nsJARChannel.cpp +++ b/mozilla/netwerk/protocol/jar/src/nsJARChannel.cpp @@ -329,7 +329,8 @@ nsJARChannel::AsyncReadJARElement() nsAutoMonitor monitor(mMonitor); - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr jarTransport; @@ -482,8 +483,8 @@ nsJARChannel::GetOwner(nsISupports* *aOwner) if (NS_FAILED(rv)) return rv; if (certificate) { // Get the codebase principal - NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, - kScriptSecurityManagerCID, &rv); + nsCOMPtr secMan = + do_GetService(kScriptSecurityManagerCID, &rv); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; nsCOMPtr codebase; rv = secMan->GetCodebasePrincipal(mJARBaseURI, diff --git a/mozilla/netwerk/protocol/jar/src/nsJARURI.cpp b/mozilla/netwerk/protocol/jar/src/nsJARURI.cpp index 1f1be0a13a2..e451e8a5bf9 100644 --- a/mozilla/netwerk/protocol/jar/src/nsJARURI.cpp +++ b/mozilla/netwerk/protocol/jar/src/nsJARURI.cpp @@ -105,7 +105,7 @@ NS_IMETHODIMP nsJARURI::SetSpec(const char * aSpec) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; PRUint32 startPos, endPos; @@ -320,7 +320,7 @@ nsJARURI::Resolve(const char *relativePath, char **result) if (!relativePath) return NS_ERROR_NULL_POINTER; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsXPIDLCString scheme; @@ -383,7 +383,7 @@ NS_IMETHODIMP nsJARURI::SetJAREntry(const char* entryPath) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; if (mJAREntry) diff --git a/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp b/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp index 16f5339f4ab..7148c6e0c50 100644 --- a/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp +++ b/mozilla/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp @@ -44,7 +44,7 @@ nsKeywordProtocolHandler::nsKeywordProtocolHandler() { nsresult nsKeywordProtocolHandler::Init() { nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsXPIDLCString url; @@ -169,7 +169,7 @@ nsKeywordProtocolHandler::NewChannel(nsIURI* uri, nsIChannel* *result) char *httpSpec = MangleKeywordIntoHTTPURL(path, mKeywordURL.get()); if (!httpSpec) return NS_ERROR_OUT_OF_MEMORY; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; // now we have an HTTP url, give the user an HTTP channel diff --git a/mozilla/netwerk/protocol/res/src/nsResChannel.cpp b/mozilla/netwerk/protocol/res/src/nsResChannel.cpp index 6ede48701b4..e0ea024721b 100644 --- a/mozilla/netwerk/protocol/res/src/nsResChannel.cpp +++ b/mozilla/netwerk/protocol/res/src/nsResChannel.cpp @@ -273,7 +273,7 @@ nsResChannel::EnsureNextResolvedChannel() nsresult rv; nsXPIDLCString resolvedURI; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) goto done; rv = mSubstitutions.Next(getter_Copies(resolvedURI)); diff --git a/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp b/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp index 3a83a542707..24c96b49c70 100644 --- a/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp +++ b/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp @@ -403,7 +403,8 @@ nsresult nsFTPDirListingConv::Init() { // Grab the nsILocale for date parsing. nsresult rv; - NS_WITH_SERVICE(nsILocaleService, localeSvc, kLocaleServiceCID, &rv); + nsCOMPtr localeSvc = + do_GetService(kLocaleServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = localeSvc->GetApplicationLocale(&mLocale); diff --git a/mozilla/netwerk/streamconv/test/TestStreamConv.cpp b/mozilla/netwerk/streamconv/test/TestStreamConv.cpp index 2843fec2a45..a8edc25cfa9 100644 --- a/mozilla/netwerk/streamconv/test/TestStreamConv.cpp +++ b/mozilla/netwerk/streamconv/test/TestStreamConv.cpp @@ -127,7 +127,8 @@ main(int argc, char* argv[]) nsresult rv; // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = eventQService->CreateThreadEventQueue(); @@ -185,7 +186,8 @@ main(int argc, char* argv[]) count++; } - NS_WITH_SERVICE(nsIStreamConverterService, StreamConvService, kStreamConverterServiceCID, &rv); + nsCOMPtr StreamConvService = + do_GetService(kStreamConverterServiceCID, &rv); if (NS_FAILED(rv)) return rv; // Define the *from* content type and *to* content-type for conversion. diff --git a/mozilla/netwerk/test/TestCacheMgr.cpp b/mozilla/netwerk/test/TestCacheMgr.cpp index d785d7f0eb2..fb7d7d7ff2d 100644 --- a/mozilla/netwerk/test/TestCacheMgr.cpp +++ b/mozilla/netwerk/test/TestCacheMgr.cpp @@ -255,7 +255,8 @@ nsresult InitQueue() { nsresult rv; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue service"); rv = eventQService->CreateThreadEventQueue(); diff --git a/mozilla/netwerk/test/TestCacheService.cpp b/mozilla/netwerk/test/TestCacheService.cpp index d2e8abca701..b5b661c1185 100644 --- a/mozilla/netwerk/test/TestCacheService.cpp +++ b/mozilla/netwerk/test/TestCacheService.cpp @@ -62,7 +62,8 @@ MakeCacheSession(const char * clientID, nsICacheSession **session) nsresult rv; if (!gCacheService) { - // NS_WITH_SERVICE(nsICacheService, cacheService, kCacheServiceCID, &rv); + // nsCOMPtr cacheService = + // do_GetService(kCacheServiceCID, &rv); gCacheService = do_GetService(kCacheServiceCID, &rv); if (NS_FAILED(rv) || !gCacheService) { printf("do_GetService(kCacheServiceCID) failed : %x\n", rv); @@ -188,7 +189,8 @@ main(int argc, char* argv[]) /** * Create event queue for this thread */ - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) goto error_exit; rv = eventQService->CreateThreadEventQueue(); diff --git a/mozilla/netwerk/test/TestCallbacks.cpp b/mozilla/netwerk/test/TestCallbacks.cpp index 67d024cba20..253bd548f0b 100644 --- a/mozilla/netwerk/test/TestCallbacks.cpp +++ b/mozilla/netwerk/test/TestCallbacks.cpp @@ -237,8 +237,8 @@ int main(int argc, char *argv[]) { if (NS_FAILED(rv)) return rv; // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, - kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = eventQService->CreateThreadEventQueue(); diff --git a/mozilla/netwerk/test/TestFileInput.cpp b/mozilla/netwerk/test/TestFileInput.cpp index fe65148686c..2070f35107d 100644 --- a/mozilla/netwerk/test/TestFileInput.cpp +++ b/mozilla/netwerk/test/TestFileInput.cpp @@ -92,7 +92,8 @@ public: PRThread* prthread; thread->GetPRThread(&prthread); PR_EnterMonitor(mMonitor); - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv)) { rv = eventQService->CreateThreadEventQueue(); @@ -397,7 +398,8 @@ main(int argc, char* argv[]) rv = NS_AutoregisterComponents(); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; SerialReadTest(dirName); diff --git a/mozilla/netwerk/test/TestFileTransport.cpp b/mozilla/netwerk/test/TestFileTransport.cpp index 154f5068af7..84208404f41 100644 --- a/mozilla/netwerk/test/TestFileTransport.cpp +++ b/mozilla/netwerk/test/TestFileTransport.cpp @@ -179,7 +179,8 @@ TestAsyncRead(const char* fileName, PRUint32 offset, PRInt32 length) PRINTF(("TestAsyncRead\n")); - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsITransport* fileTrans; @@ -230,7 +231,8 @@ TestAsyncWrite(const char* fileName, PRUint32 offset, PRInt32 length) PRINTF(("TestAsyncWrite\n")); - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCAutoString outFile(fileName); @@ -346,7 +348,8 @@ main(int argc, char* argv[]) rv = NS_AutoregisterComponents(); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = eventQService->CreateThreadEventQueue(); diff --git a/mozilla/netwerk/test/TestHttp.cpp b/mozilla/netwerk/test/TestHttp.cpp index 8f836e223e1..b04b8e1bb4e 100644 --- a/mozilla/netwerk/test/TestHttp.cpp +++ b/mozilla/netwerk/test/TestHttp.cpp @@ -142,7 +142,8 @@ int main(int argc, char **argv) RETURN_IF_FAILED(rv, "NS_AutoregisterComponents"); // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, eqs, kEventQueueServiceCID, &rv); + nsCOMPtr eqs = + do_GetService(kEventQueueServiceCID, &rv); RETURN_IF_FAILED(rv, "do_GetService(EventQueueService)"); rv = eqs->CreateMonitoredThreadEventQueue(); diff --git a/mozilla/netwerk/test/TestMCTransport.cpp b/mozilla/netwerk/test/TestMCTransport.cpp index 6ba6316a277..12bd4f3e041 100644 --- a/mozilla/netwerk/test/TestMCTransport.cpp +++ b/mozilla/netwerk/test/TestMCTransport.cpp @@ -149,7 +149,7 @@ nsresult TestMCTransport(const char *filename) if (NS_FAILED(rv)) return rv; #else - NS_WITH_SERVICE(nsICacheService, serv, kCacheServiceCID, &rv); + nsCOMPtr serv(do_GetService(kCacheServiceCID, &rv)); if (NS_FAILED(rv)) return rv; rv = serv->CreateSession("TestMCTransport", @@ -216,7 +216,8 @@ int main(int argc, char **argv) return -1; } - NS_WITH_SERVICE(nsIEventQueueService, eqs, kEventQueueServiceCID, &rv); + nsCOMPtr eqs = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) { printf("failed to create event queue service: rv=%x\n", rv); return -1; diff --git a/mozilla/netwerk/test/TestMakeAbs.cpp b/mozilla/netwerk/test/TestMakeAbs.cpp index 6f3270e8e00..392d6200a25 100644 --- a/mozilla/netwerk/test/TestMakeAbs.cpp +++ b/mozilla/netwerk/test/TestMakeAbs.cpp @@ -37,7 +37,7 @@ nsresult NS_AutoregisterComponents() nsresult ServiceMakeAbsolute(nsIURI *baseURI, char *relativeInfo, char **_retval) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; return serv->MakeAbsolute(relativeInfo, baseURI, _retval); @@ -63,7 +63,7 @@ main(int argc, char* argv[]) rv = NS_AutoregisterComponents(); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsCOMPtr uri; diff --git a/mozilla/netwerk/test/TestOverlappedIO.cpp b/mozilla/netwerk/test/TestOverlappedIO.cpp index b2ac136d001..05060d4d606 100644 --- a/mozilla/netwerk/test/TestOverlappedIO.cpp +++ b/mozilla/netwerk/test/TestOverlappedIO.cpp @@ -270,7 +270,8 @@ main(int argc, char* argv[]) int port = 80; // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) { NS_WARNING("failed to create: event queue service!"); return rv; @@ -285,7 +286,8 @@ main(int argc, char* argv[]) eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, &gEventQ); // Create the Socket transport service... - NS_WITH_SERVICE(nsISocketTransportService, sts, kSocketTransportServiceCID, &rv); + nsCOMPtr sts = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_FAILED(rv)) { NS_WARNING("failed to create: socket transport service!"); return rv; diff --git a/mozilla/netwerk/test/TestPageLoad.cpp b/mozilla/netwerk/test/TestPageLoad.cpp index 8a1d2f3c0c7..62a9b7e6986 100644 --- a/mozilla/netwerk/test/TestPageLoad.cpp +++ b/mozilla/netwerk/test/TestPageLoad.cpp @@ -354,7 +354,8 @@ int main(int argc, char **argv) RETURN_IF_FAILED(rv, "NS_AutoregisterComponents"); // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, eqs, kEventQueueServiceCID, &rv); + nsCOMPtr eqs = + do_GetService(kEventQueueServiceCID, &rv); RETURN_IF_FAILED(rv, "do_GetService(EventQueueService)"); rv = eqs->CreateMonitoredThreadEventQueue(); diff --git a/mozilla/netwerk/test/TestProtocols.cpp b/mozilla/netwerk/test/TestProtocols.cpp index cb38e405b8c..94ef7572c34 100644 --- a/mozilla/netwerk/test/TestProtocols.cpp +++ b/mozilla/netwerk/test/TestProtocols.cpp @@ -379,7 +379,7 @@ nsresult StartLoadingURL(const char* aUrlString) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, pService, kIOServiceCID, &rv); + nsCOMPtr pService(do_GetService(kIOServiceCID, &rv)); if (pService) { nsCOMPtr pURL; @@ -526,7 +526,8 @@ main(int argc, char* argv[]) // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = eventQService->CreateThreadEventQueue(); @@ -539,7 +540,8 @@ main(int argc, char* argv[]) // I'm doing this using the serviceManager for convenience's sake. // Presumably an application will init it's own cookie service a // different way (this way works too though). - NS_WITH_SERVICE(nsICookieService, cookieService, nsCookieServiceCID, &rv); + nsCOMPtr cookieService = + do_GetService(nsCookieServiceCID, &rv); if (NS_FAILED(rv)) return rv; #endif // NECKO diff --git a/mozilla/netwerk/test/TestRawCache.cpp b/mozilla/netwerk/test/TestRawCache.cpp index 8bc2c7743d4..5b4c927c7d0 100644 --- a/mozilla/netwerk/test/TestRawCache.cpp +++ b/mozilla/netwerk/test/TestRawCache.cpp @@ -263,7 +263,8 @@ nsresult InitQueue() { nsresult rv; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue service"); rv = eventQService->CreateThreadEventQueue(); @@ -692,7 +693,7 @@ nsresult NS_AutoregisterComponents() PRBool initPref () { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefPtr, kPrefCID, &rv); + nsCOMPtr prefPtr(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return false; diff --git a/mozilla/netwerk/test/TestRes.cpp b/mozilla/netwerk/test/TestRes.cpp index a93103cdf1b..f57df255d28 100644 --- a/mozilla/netwerk/test/TestRes.cpp +++ b/mozilla/netwerk/test/TestRes.cpp @@ -41,7 +41,7 @@ SetupMapping() { nsresult rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsCOMPtr ph; @@ -67,7 +67,7 @@ TestOpenInputStream(const char* url) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsCOMPtr channel; @@ -189,7 +189,8 @@ TestAsyncRead(const char* url) { nsresult rv; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = eventQService->CreateThreadEventQueue(); @@ -198,7 +199,7 @@ TestAsyncRead(const char* url) rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, &gEventQ); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsCOMPtr channel; diff --git a/mozilla/netwerk/test/TestSocketIO.cpp b/mozilla/netwerk/test/TestSocketIO.cpp index 509725b6dfa..5fbcff5a5dc 100644 --- a/mozilla/netwerk/test/TestSocketIO.cpp +++ b/mozilla/netwerk/test/TestSocketIO.cpp @@ -274,7 +274,8 @@ main(int argc, char* argv[]) int port = 80; // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) { NS_WARNING("failed to create: event queue service!"); return rv; @@ -289,7 +290,8 @@ main(int argc, char* argv[]) eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, &gEventQ); // Create the Socket transport service... - NS_WITH_SERVICE(nsISocketTransportService, sts, kSocketTransportServiceCID, &rv); + nsCOMPtr sts = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_FAILED(rv)) { NS_WARNING("failed to create: socket transport service!"); return rv; diff --git a/mozilla/netwerk/test/TestSocketInput.cpp b/mozilla/netwerk/test/TestSocketInput.cpp index 99de484ad94..d4d348a772a 100644 --- a/mozilla/netwerk/test/TestSocketInput.cpp +++ b/mozilla/netwerk/test/TestSocketInput.cpp @@ -147,7 +147,8 @@ main(int argc, char* argv[]) if (NS_FAILED(rv)) return rv; // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = eventQService->CreateThreadEventQueue(); @@ -157,7 +158,8 @@ main(int argc, char* argv[]) rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(eventQ)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsISocketTransportService, sts, kSocketTransportServiceCID, &rv); + nsCOMPtr sts = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsITransport* transport; diff --git a/mozilla/netwerk/test/TestSocketTransport.cpp b/mozilla/netwerk/test/TestSocketTransport.cpp index 1ada9ce0e99..c5e8e664236 100644 --- a/mozilla/netwerk/test/TestSocketTransport.cpp +++ b/mozilla/netwerk/test/TestSocketTransport.cpp @@ -301,7 +301,8 @@ TestConnection::TestConnection(const char* aHostName, PRInt32 aPort, mOutStream = nsnull; // Create a socket transport... - NS_WITH_SERVICE(nsISocketTransportService, sts, kSocketTransportServiceCID, &rv); + nsCOMPtr sts = + do_GetService(kSocketTransportServiceCID, &rv); if (NS_SUCCEEDED(rv)) { rv = sts->CreateTransport(aHostName, aPort, nsnull, -1, 0, 0, &mTransport); if (NS_SUCCEEDED(rv)) { @@ -353,7 +354,8 @@ TestConnection::Run(void) nsresult rv = NS_OK; // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = eventQService->CreateThreadEventQueue(); @@ -622,7 +624,8 @@ main(int argc, char* argv[]) if (NS_FAILED(rv)) return rv; // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = eventQService->CreateThreadEventQueue(); diff --git a/mozilla/netwerk/test/TestThreadedIO.cpp b/mozilla/netwerk/test/TestThreadedIO.cpp index 81729fd8b0b..35f8c962937 100644 --- a/mozilla/netwerk/test/TestThreadedIO.cpp +++ b/mozilla/netwerk/test/TestThreadedIO.cpp @@ -41,7 +41,8 @@ createEventQueue() { nsCOMPtr result; // Get event queue service. nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIEventQueueService, eqs, NS_EVENTQUEUESERVICE_CONTRACTID, &rv); + nsCOMPtr eqs = + do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv); if ( NS_SUCCEEDED( rv ) ) { // Have service create us an event queue. rv = eqs->CreateThreadEventQueue(); diff --git a/mozilla/netwerk/test/TestWriteStream.cpp b/mozilla/netwerk/test/TestWriteStream.cpp index 50234197a3e..1794291964e 100644 --- a/mozilla/netwerk/test/TestWriteStream.cpp +++ b/mozilla/netwerk/test/TestWriteStream.cpp @@ -109,7 +109,8 @@ TestSyncWrite(char* filename, PRUint32 startPosition, PRInt32 length) RandomStream *randomStream; char buf[500]; - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv) ; + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv) ; if (NS_FAILED(rv)) return rv ; nsCOMPtr fs; diff --git a/mozilla/netwerk/test/urltest.cpp b/mozilla/netwerk/test/urltest.cpp index 5a9f4381b43..ac6d50eae48 100644 --- a/mozilla/netwerk/test/urltest.cpp +++ b/mozilla/netwerk/test/urltest.cpp @@ -69,7 +69,8 @@ int writeoutto(const char* i_pURL, char** o_Result, PRBool bUseStd = PR_TRUE) } else { - NS_WITH_SERVICE(nsIIOService, pService, kIOServiceCID, &result); + nsCOMPtr pService = + do_GetService(kIOServiceCID, &result); if (NS_FAILED(result)) { cout << "Service failed!" << endl; diff --git a/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp b/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp index 72cf1e343cd..573cbdf0622 100644 --- a/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp +++ b/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp @@ -242,7 +242,7 @@ extern "C" NS_EXPORT int DebugRobot( // Create url nsIURI* url; nsresult rv; - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv); + nsCOMPtr service(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsIURI *uri = nsnull; diff --git a/mozilla/parser/htmlparser/robot/nsRobotSink.cpp b/mozilla/parser/htmlparser/robot/nsRobotSink.cpp index 8d086e3046f..8164ffd5330 100644 --- a/mozilla/parser/htmlparser/robot/nsRobotSink.cpp +++ b/mozilla/parser/htmlparser/robot/nsRobotSink.cpp @@ -347,7 +347,7 @@ void RobotSink::ProcessLink(const nsString& aLink) if (nsnull != docURL) { nsIURI* absurl; nsresult rv; - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv); + nsCOMPtr service(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return; nsIURI *uri = nsnull, *baseUri = nsnull; diff --git a/mozilla/parser/htmlparser/src/CNavDTD.cpp b/mozilla/parser/htmlparser/src/CNavDTD.cpp index e9d1fecef29..2a2bd7cc64e 100644 --- a/mozilla/parser/htmlparser/src/CNavDTD.cpp +++ b/mozilla/parser/htmlparser/src/CNavDTD.cpp @@ -1565,7 +1565,8 @@ nsresult CNavDTD::HandleKeyGen(nsIParserNode* aNode) { if(aNode) { - NS_WITH_SERVICE(nsIFormProcessor, theFormProcessor, kFormProcessorCID, &result) + nsCOMPtr theFormProcessor = + do_GetService(kFormProcessorCID, &result); if(NS_SUCCEEDED(result)) { PRInt32 theAttrCount=aNode->GetAttributeCount(); diff --git a/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp b/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp index 88cf9752b7f..6ea19d913cc 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp +++ b/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp @@ -222,7 +222,7 @@ nsHTMLContentSinkStream::InitEncoders() if (mStream) { nsAutoString charsetName; charsetName.Assign(mCharsetOverride); - NS_WITH_SERVICE(nsICharsetAlias, calias, kCharsetAliasCID, &res); + nsCOMPtr calias(do_GetService(kCharsetAliasCID, &res)); if (NS_SUCCEEDED(res) && calias) { nsAutoString temp; temp.Assign(mCharsetOverride); res = calias->GetPreferred(temp, charsetName); diff --git a/mozilla/parser/htmlparser/src/nsParser.cpp b/mozilla/parser/htmlparser/src/nsParser.cpp index dac563cc84d..ebf279b61e8 100644 --- a/mozilla/parser/htmlparser/src/nsParser.cpp +++ b/mozilla/parser/htmlparser/src/nsParser.cpp @@ -357,7 +357,8 @@ nsParser::nsParser(nsITokenObserver* anObserver) { nsresult rv = NS_OK; if (mEventQueue == nsnull) { // Cache the event queue of the current UI thread - NS_WITH_SERVICE(nsIEventQueueService, eventService, kEventQueueServiceCID, &rv); + nsCOMPtr eventService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv) && (eventService)) { // XXX this implies that the UI is the current thread. rv = eventService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(mEventQueue)); } diff --git a/mozilla/parser/htmlparser/src/nsScanner.cpp b/mozilla/parser/htmlparser/src/nsScanner.cpp index 1d21666be98..e573a1463b5 100644 --- a/mozilla/parser/htmlparser/src/nsScanner.cpp +++ b/mozilla/parser/htmlparser/src/nsScanner.cpp @@ -153,7 +153,7 @@ nsresult nsScanner::SetDocumentCharset(const nsString& aCharset , nsCharsetSourc if( aSource < mCharsetSource) // priority is lower the the current one , just return res; - NS_WITH_SERVICE(nsICharsetAlias, calias, kCharsetAliasCID, &res); + nsCOMPtr calias(do_GetService(kCharsetAliasCID, &res)); NS_ASSERTION( nsnull != calias, "cannot find charset alias"); nsAutoString charsetName; charsetName.Assign(aCharset); if( NS_SUCCEEDED(res) && (nsnull != calias)) @@ -175,7 +175,8 @@ nsresult nsScanner::SetDocumentCharset(const nsString& aCharset , nsCharsetSourc mCharset = charsetName; mCharsetSource = aSource; - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &res); if(NS_SUCCEEDED(res) && (nsnull != ccm)) { nsIUnicodeDecoder * decoder = nsnull; diff --git a/mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp b/mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp index 07a224ece41..2f6e23d09a8 100644 --- a/mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp +++ b/mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp @@ -224,7 +224,7 @@ PageGrabber::Grab(const nsString& aURL) nsIURI* url = NULL; nsresult rv; - rv = NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + rv = nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsIChannel *channel = nsnull; diff --git a/mozilla/profile/Acct/nsAccount.cpp b/mozilla/profile/Acct/nsAccount.cpp index 8fa2e895586..bdc94bfe3ec 100644 --- a/mozilla/profile/Acct/nsAccount.cpp +++ b/mozilla/profile/Acct/nsAccount.cpp @@ -336,7 +336,7 @@ int nsAccount::GetNCIValues(nsString MiddleValue) nsString Trial; Trial.AssignWithConversion("resource:/res/acct/NCI_Dir/"); Trial = Trial + MiddleValue; printf("this is the trial value %s \n", Trial.ToNewCString()); - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &ret); + nsCOMPtr service(do_GetService(kIOServiceCID, &ret)); if (NS_FAILED(ret)) return ret; @@ -418,7 +418,7 @@ int nsAccount::GetConfigValues(nsString fileName) nsString Trial; Trial.AssignWithConversion("resource:/res/acct/NCI_Dir/"); Trial = Trial + fileName; printf("this is the trial value %s \n", Trial.ToNewCString()); - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &ret); + nsCOMPtr service(do_GetService(kIOServiceCID, &ret)); if (NS_FAILED(ret)) return ret; diff --git a/mozilla/profile/Acctidl/nsAccountServicesFactory.cpp b/mozilla/profile/Acctidl/nsAccountServicesFactory.cpp index 858269c8cce..021da10b210 100644 --- a/mozilla/profile/Acctidl/nsAccountServicesFactory.cpp +++ b/mozilla/profile/Acctidl/nsAccountServicesFactory.cpp @@ -177,7 +177,8 @@ NSRegisterSelf(nsISupports* aServMgr , const char* aPath) nsCOMPtr servMgr(do_QueryInterface(aServMgr, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; rv = compMgr->RegisterComponent(kAccountServicesCID, @@ -199,7 +200,8 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* aPath) nsCOMPtr servMgr(do_QueryInterface(aServMgr, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; rv = compMgr->UnregisterComponent(kAccountServicesCID, aPath); diff --git a/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp b/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp index 37bce7ae829..8f1aef8d916 100644 --- a/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp +++ b/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp @@ -275,10 +275,11 @@ nsPrefMigration::getPrefService() // get the prefs service nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, pIMyService, kPrefServiceCID, &rv); + nsCOMPtr pIMyService(do_GetService(kPrefServiceCID, &rv)); if(NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIProxyObjectManager, pIProxyObjectManager, kProxyObjectManagerCID, &rv); + nsCOMPtr pIProxyObjectManager = + do_GetService(kProxyObjectManagerCID, &rv); if(NS_FAILED(rv)) return rv; @@ -364,7 +365,8 @@ extern "C" void ProfileMigrationController(void *data) return; } - NS_WITH_SERVICE(nsIProxyObjectManager, pIProxyObjectManager, kProxyObjectManagerCID, &rv); + nsCOMPtr pIProxyObjectManager = + do_GetService(kProxyObjectManagerCID, &rv); if(NS_FAILED(rv)) { migrator->mErrorCode = rv; @@ -2084,7 +2086,8 @@ ConvertStringToUTF8(nsAutoString& aCharset, const char* inString, char** outStri nsresult rv; // convert result to unicode - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if(NS_SUCCEEDED(rv)) { nsCOMPtr decoder; // this may be cached @@ -2221,7 +2224,7 @@ nsPrefConverter::ConvertPrefsToUTF8() nsCStringArray prefsToMigrate; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if(NS_FAILED(rv)) return rv; if (!prefs) return NS_ERROR_FAILURE; diff --git a/mozilla/profile/src/nsProfile.cpp b/mozilla/profile/src/nsProfile.cpp index 359c73b7fa1..67f4182c522 100644 --- a/mozilla/profile/src/nsProfile.cpp +++ b/mozilla/profile/src/nsProfile.cpp @@ -291,7 +291,8 @@ nsProfile::nsProfile() sApp_MessengerFolderCache50 = NS_NewAtom(NS_APP_MESSENGER_FOLDER_CACHE_50_DIR); nsresult rv; - NS_WITH_SERVICE(nsIDirectoryService, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) directoryService->RegisterProvider(this); } @@ -468,7 +469,7 @@ nsProfile::LoadDefaultProfileDir(nsCString & profileURLStr, PRBool canInteract) PRInt32 numProfiles=0; nsXPIDLString currentProfileStr; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return rv; GetProfileCount(&numProfiles); @@ -561,7 +562,8 @@ nsProfile::LoadDefaultProfileDir(nsCString & profileURLStr, PRBool canInteract) if (NS_FAILED(rv)) return rv; } - NS_WITH_SERVICE(nsICategoryManager, catman, NS_CATEGORYMANAGER_CONTRACTID, &rv); + nsCOMPtr catman = + do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv); if(NS_SUCCEEDED(rv) && catman) { @@ -828,7 +830,7 @@ nsProfile::ProcessArgs(nsICmdLineService *cmdLineArgs, } else if (num4xProfiles == 1 && numProfiles == 0) { PRBool confirmAutomigration = PR_FALSE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv) + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && prefs) { rv = prefs->GetBoolPref(PREF_CONFIRM_AUTOMIGRATION, &confirmAutomigration); @@ -1001,7 +1003,8 @@ nsProfile::SetCurrentProfile(const PRUnichar * aCurrentProfile) else isSwitch = PR_FALSE; - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); NS_ENSURE_TRUE(observerService, NS_ERROR_FAILURE); nsISupports *subject = (nsISupports *)((nsIProfile *)this); @@ -1025,7 +1028,8 @@ nsProfile::SetCurrentProfile(const PRUnichar * aCurrentProfile) } // Flush the stringbundle cache - NS_WITH_SERVICE(nsIStringBundleService, bundleService, NS_STRINGBUNDLE_CONTRACTID, &rv); + nsCOMPtr bundleService = + do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { rv = bundleService->FlushBundles(); NS_ASSERTION(NS_SUCCEEDED(rv), "failed to flush bundle cache"); @@ -1080,7 +1084,8 @@ NS_IMETHODIMP nsProfile::ShutDownCurrentProfile(PRUint32 shutDownType) { nsresult rv; - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); NS_ENSURE_TRUE(observerService, NS_ERROR_FAILURE); nsISupports *subject = (nsISupports *)((nsIProfile *)this); @@ -1732,7 +1737,7 @@ NS_IMETHODIMP nsProfile::StartApprunner(const PRUnichar* profileName) nsresult nsProfile::LoadNewProfilePrefs() { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return rv; prefs->ResetUserPrefs(); @@ -1844,14 +1849,16 @@ nsProfile::DefineLocaleDefaultsDir() { nsresult rv; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); NS_ENSURE_TRUE(directoryService, NS_ERROR_FAILURE); nsCOMPtr localeDefaults; rv = directoryService->Get(NS_APP_PROFILE_DEFAULTS_NLOC_50_DIR, NS_GET_IID(nsIFile), getter_AddRefs(localeDefaults)); if (NS_SUCCEEDED(rv)) { - NS_WITH_SERVICE(nsIChromeRegistry, chromeRegistry, kChromeRegistryCID, &rv); + nsCOMPtr chromeRegistry = + do_GetService(kChromeRegistryCID, &rv); if (NS_SUCCEEDED(rv)) { nsXPIDLString localeName; @@ -1869,7 +1876,8 @@ nsresult nsProfile::UndefineFileLocations() { nsresult rv; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); NS_ENSURE_TRUE(directoryService, NS_ERROR_FAILURE); (void) directoryService->Undefine(NS_APP_PREFS_50_DIR); diff --git a/mozilla/profile/src/nsProfileAccess.cpp b/mozilla/profile/src/nsProfileAccess.cpp index 04956a6b257..91bdf2a17e7 100644 --- a/mozilla/profile/src/nsProfileAccess.cpp +++ b/mozilla/profile/src/nsProfileAccess.cpp @@ -138,7 +138,8 @@ ConvertStringToUnicode(nsAutoString& aCharset, const char* inString, nsAutoStrin { nsresult rv; // convert result to unicode - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if(NS_SUCCEEDED(rv)) { nsCOMPtr decoder; // this may be cached diff --git a/mozilla/rdf/chrome/src/nsChromeProtocolHandler.cpp b/mozilla/rdf/chrome/src/nsChromeProtocolHandler.cpp index e5204b7e10e..5ee8f08f1de 100644 --- a/mozilla/rdf/chrome/src/nsChromeProtocolHandler.cpp +++ b/mozilla/rdf/chrome/src/nsChromeProtocolHandler.cpp @@ -565,7 +565,7 @@ nsChromeProtocolHandler::NewChannel(nsIURI* aURI, // Canonify the "chrome:" URL; e.g., so that we collapse // "chrome://navigator/content/navigator.xul" and "chrome://navigator/content" // and "chrome://navigator/content/navigator.xul". - NS_WITH_SERVICE(nsIChromeRegistry, reg, kChromeRegistryCID, &rv); + nsCOMPtr reg(do_GetService(kChromeRegistryCID, &rv)); if (NS_FAILED(rv)) return rv; rv = reg->Canonify(aURI); @@ -573,7 +573,8 @@ nsChromeProtocolHandler::NewChannel(nsIURI* aURI, // Check the prototype cache to see if we've already got the // document in the cache. - NS_WITH_SERVICE(nsIXULPrototypeCache, cache, kXULPrototypeCacheCID, &rv); + nsCOMPtr cache = + do_GetService(kXULPrototypeCacheCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr proto; @@ -601,7 +602,7 @@ nsChromeProtocolHandler::NewChannel(nsIURI* aURI, rv = reg->ConvertChromeURL(chromeURI, getter_Copies(spec)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv); + nsCOMPtr serv(do_GetService(kIOServiceCID, &rv)); if (NS_FAILED(rv)) return rv; rv = serv->NewURI(spec, nsnull, getter_AddRefs(chromeURI)); @@ -639,8 +640,8 @@ nsChromeProtocolHandler::NewChannel(nsIURI* aURI, if (PL_strcasecmp(fileExtension, "xul") == 0 || PL_strcasecmp(fileExtension, "html") == 0 || PL_strcasecmp(fileExtension, "xml") == 0) { - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr principal; diff --git a/mozilla/rdf/chrome/src/nsChromeRegistry.cpp b/mozilla/rdf/chrome/src/nsChromeRegistry.cpp index 32883dd3713..87b4db110b4 100644 --- a/mozilla/rdf/chrome/src/nsChromeRegistry.cpp +++ b/mozilla/rdf/chrome/src/nsChromeRegistry.cpp @@ -339,7 +339,8 @@ nsChromeRegistry::Init() rv = mRDFService->GetResource(kURICHROME_packageVersion, getter_AddRefs(mPackageVersion)); NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get RDF resource"); - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (observerService) { observerService->AddObserver(this, NS_LITERAL_STRING("profile-before-change").get()); observerService->AddObserver(this, NS_LITERAL_STRING("profile-do-change").get()); @@ -1094,7 +1095,8 @@ NS_IMETHODIMP nsChromeRegistry::RefreshSkins() if (NS_FAILED(rv)) return rv; // Get the window mediator - NS_WITH_SERVICE(nsIWindowMediator, windowMediator, kWindowMediatorCID, &rv); + nsCOMPtr windowMediator = + do_GetService(kWindowMediatorCID, &rv); if (NS_SUCCEEDED(rv)) { nsCOMPtr windowEnumerator; @@ -1129,18 +1131,21 @@ nsresult nsChromeRegistry::FlushCaches() // Flush the style sheet cache completely. // XXX For now flush everything. need a better call that only flushes style sheets. - NS_WITH_SERVICE(nsIXULPrototypeCache, xulCache, "@mozilla.org/xul/xul-prototype-cache;1", &rv); + nsCOMPtr xulCache = + do_GetService("@mozilla.org/xul/xul-prototype-cache;1", &rv); if (NS_SUCCEEDED(rv) && xulCache) { xulCache->Flush(); } // Flush the old image cache. - NS_WITH_SERVICE(nsIImageManager, imageManager, kImageManagerCID, &rv); + nsCOMPtr imageManager = + do_GetService(kImageManagerCID, &rv); if (imageManager) rv = imageManager->FlushCache(1); // Flush the new imagelib image chrome cache. - NS_WITH_SERVICE(imgICache, imageCache, "@mozilla.org/image/cache;1", &rv); + nsCOMPtr imageCache = + do_GetService("@mozilla.org/image/cache;1", &rv); if (NS_SUCCEEDED(rv) && imageCache) { imageCache->ClearCache(PR_TRUE); } @@ -2976,7 +2981,8 @@ nsChromeRegistry::CheckForNewChrome() // open the installed-chrome file nsCOMPtr listFile; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = directoryService->Get(NS_APP_CHROME_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(listFile)); diff --git a/mozilla/rdf/datasource/src/nsFileSystemDataSource.cpp b/mozilla/rdf/datasource/src/nsFileSystemDataSource.cpp index 55abbd26950..ff902704269 100644 --- a/mozilla/rdf/datasource/src/nsFileSystemDataSource.cpp +++ b/mozilla/rdf/datasource/src/nsFileSystemDataSource.cpp @@ -263,7 +263,8 @@ FileSystemDataSource::FileSystemDataSource(void) gRDFService->GetResource(NC_NAMESPACE_URI "IEFavorite", &kNC_IEFavoriteObject); gRDFService->GetResource(NC_NAMESPACE_URI "IEFavoriteFolder", &kNC_IEFavoriteFolder); /* - NS_WITH_SERVICE(nsIPlatformCharset, platformCharset, kPlatformCharsetCID, &rv); + nsCOMPtr platformCharset = + do_GetService(kPlatformCharsetCID, &rv); if (NS_SUCCEEDED(rv) && (platformCharset)) { nsAutoString defaultCharset; @@ -272,8 +273,8 @@ FileSystemDataSource::FileSystemDataSource(void) { // found the default platform charset // now try and get a decoder from it to Unicode - NS_WITH_SERVICE(nsICharsetConverterManager, charsetConv, - kCharsetConverterManagerCID, &rv); + nsCOMPtr charsetConv = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv) && (charsetConv)) { rv = charsetConv->GetUnicodeDecoder(&defaultCharset, diff --git a/mozilla/rdf/tests/domds/nsRDFDOMViewerUtils.cpp b/mozilla/rdf/tests/domds/nsRDFDOMViewerUtils.cpp index ea6d76da6c5..4562bc3c4f2 100644 --- a/mozilla/rdf/tests/domds/nsRDFDOMViewerUtils.cpp +++ b/mozilla/rdf/tests/domds/nsRDFDOMViewerUtils.cpp @@ -52,7 +52,8 @@ nsDOMViewerObject::SetTargetLiteral(nsIRDFResource *aProperty, nsString& str) { nsresult rv; - NS_WITH_SERVICE(nsIRDFService, rdf, NS_RDF_CONTRACTID "/rdf-service;1", &rv); + nsCOMPtr rdf = + do_GetService(NS_RDF_CONTRACTID "/rdf-service;1", &rv); PRUnichar* uniStr = str.ToNewUnicode(); nsCOMPtr literal; diff --git a/mozilla/rdf/tests/dsds/nsRDFDataSourceDS.cpp b/mozilla/rdf/tests/dsds/nsRDFDataSourceDS.cpp index 5f399facea1..d3a7e35b724 100644 --- a/mozilla/rdf/tests/dsds/nsRDFDataSourceDS.cpp +++ b/mozilla/rdf/tests/dsds/nsRDFDataSourceDS.cpp @@ -150,7 +150,7 @@ nsRDFDataSourceDataSource::Init(const char *uri) // get RDF resources - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); if (!kNC_Name) { rdf->GetResource(NC_RDF_Name, &kNC_Name); rdf->GetResource(NC_RDF_Child, &kNC_Child); @@ -384,7 +384,7 @@ nsRDFDataSourceDataSource::ArcLabelsOut(nsIRDFResource *aSource, #ifdef DEBUG_alecf printf("Ahah! This is a datasource node. Setting the datasource.."); #endif - NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv); + nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); rv = rdf->GetDataSource((const char*)sourceval, &mDataSource); #ifdef DEBUG_alecf diff --git a/mozilla/rdf/tests/dsds/nsRDFDataSourceFactory.cpp b/mozilla/rdf/tests/dsds/nsRDFDataSourceFactory.cpp index 20daeda69f3..53372dea588 100644 --- a/mozilla/rdf/tests/dsds/nsRDFDataSourceFactory.cpp +++ b/mozilla/rdf/tests/dsds/nsRDFDataSourceFactory.cpp @@ -60,12 +60,8 @@ nsresult NSRegisterSelf(nsISupports* aServMgr, const char* aPath) { nsresult rv; - NS_WITH_SERVICE1(nsIComponentManager, - compMgr, - aServMgr, - kComponentManagerCID, - &rv); - + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, aServMgr, &rv); if (NS_FAILED(rv)) return rv; rv = compMgr->RegisterComponent(kRDFDataSourceCID, @@ -80,12 +76,12 @@ NSRegisterSelf(nsISupports* aServMgr, const char* aPath) nsresult NSUnregisterSelf(nsISupports* aServMgr, const char* aPath) { - nsresult rv; - NS_WITH_SERVICE1(nsIComponentManager, compMgr, - aServMgr, kComponentManagerCID, &rv); - if (NS_FAILED(rv)) return rv; + nsresult rv; + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, aServMgr, &rv); + if (NS_FAILED(rv)) return rv; - rv = compMgr->UnregisterComponent(kRDFDataSourceCID, aPath); + rv = compMgr->UnregisterComponent(kRDFDataSourceCID, aPath); - return rv; + return rv; } diff --git a/mozilla/rdf/tests/rdfcat/rdfcat.cpp b/mozilla/rdf/tests/rdfcat/rdfcat.cpp index 7973fffc5fa..20701d476ea 100644 --- a/mozilla/rdf/tests/rdfcat/rdfcat.cpp +++ b/mozilla/rdf/tests/rdfcat/rdfcat.cpp @@ -152,7 +152,8 @@ main(int argc, char** argv) NS_SetupRegistry(); // Get netlib off the floor... - NS_WITH_SERVICE(nsIEventQueueService, theEventQueueService, kEventQueueServiceCID, &rv); + nsCOMPtr theEventQueueService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = theEventQueueService->CreateThreadEventQueue(); diff --git a/mozilla/rdf/tests/rdfpoll/rdfpoll.cpp b/mozilla/rdf/tests/rdfpoll/rdfpoll.cpp index 17d6b1db6c5..6c3ecd51baf 100644 --- a/mozilla/rdf/tests/rdfpoll/rdfpoll.cpp +++ b/mozilla/rdf/tests/rdfpoll/rdfpoll.cpp @@ -281,7 +281,8 @@ main(int argc, char** argv) SetupRegistry(); // Get netlib off the floor... - NS_WITH_SERVICE(nsIEventQueueService, theEventQueueService, kEventQueueServiceCID, &rv); + nsCOMPtr theEventQueueService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; rv = theEventQueueService->CreateThreadEventQueue(); diff --git a/mozilla/uriloader/base/nsDocLoader.cpp b/mozilla/uriloader/base/nsDocLoader.cpp index 3251ef2cbc2..fc2bcdf5f0f 100644 --- a/mozilla/uriloader/base/nsDocLoader.cpp +++ b/mozilla/uriloader/base/nsDocLoader.cpp @@ -1254,8 +1254,8 @@ NS_IMETHODIMP nsDocLoaderImpl::OnRedirect(nsIHttpChannel *aOldChannel, nsIChanne if (NS_FAILED(rv)) return rv; // verify that this is a legal redirect - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = securityManager->CheckLoadURI(oldURI, newURI, nsIScriptSecurityManager::DISALLOW_FROM_MAIL); diff --git a/mozilla/uriloader/base/nsURILoader.cpp b/mozilla/uriloader/base/nsURILoader.cpp index c04ff041826..e0a0975ba22 100644 --- a/mozilla/uriloader/base/nsURILoader.cpp +++ b/mozilla/uriloader/base/nsURILoader.cpp @@ -380,7 +380,8 @@ nsresult nsDocumentOpenInfo::RetargetOutput(nsIRequest *request, const char * aS // because we said we could handle "*/*" in our accept headers if (aOutContentType && *aOutContentType && nsCRT::strcasecmp(aSrcContentType, aOutContentType) && nsCRT::strcmp(aSrcContentType, "*/*")) { - NS_WITH_SERVICE(nsIStreamConverterService, StreamConvService, kStreamConverterServiceCID, &rv); + nsCOMPtr StreamConvService = + do_GetService(kStreamConverterServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsAutoString from_w; from_w.AssignWithConversion (aSrcContentType); nsAutoString to_w; to_w.AssignWithConversion (aOutContentType); diff --git a/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp b/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp index b5963908d14..615347ff28f 100644 --- a/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -868,7 +868,8 @@ nsresult nsExternalAppHandler::SetUpTempFile(nsIChannel * aChannel) mTempFile->CreateUnique(nsnull, nsIFile::NORMAL_FILE_TYPE, 0644); NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID); - NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv); + nsCOMPtr fts = + do_GetService(kFileTransportServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr fileTransport; diff --git a/mozilla/view/src/nsViewManager.cpp b/mozilla/view/src/nsViewManager.cpp index acc7c6ba7fd..01d4e6fbc4d 100644 --- a/mozilla/view/src/nsViewManager.cpp +++ b/mozilla/view/src/nsViewManager.cpp @@ -592,7 +592,8 @@ NS_IMETHODIMP nsViewManager::Init(nsIDeviceContext* aContext, nscoord aX, nscoor if (nsnull == mEventQueue) { // Cache the event queue of the current UI thread - NS_WITH_SERVICE(nsIEventQueueService, eventService, kEventQueueServiceCID, &rv); + nsCOMPtr eventService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv) && (nsnull != eventService)) { // XXX this implies that the UI is the current thread. rv = eventService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(mEventQueue)); } diff --git a/mozilla/view/src/nsViewManager2.cpp b/mozilla/view/src/nsViewManager2.cpp index 4a2f9e10161..fcc3cd06804 100755 --- a/mozilla/view/src/nsViewManager2.cpp +++ b/mozilla/view/src/nsViewManager2.cpp @@ -382,7 +382,8 @@ NS_IMETHODIMP nsViewManager2::Init(nsIDeviceContext* aContext, nscoord aX, nscoo if (nsnull == mEventQueue) { // Cache the event queue of the current UI thread - NS_WITH_SERVICE(nsIEventQueueService, eventService, kEventQueueServiceCID, &rv); + nsCOMPtr eventService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv) && (nsnull != eventService)) { // XXX this implies that the UI is the current thread. rv = eventService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(mEventQueue)); } diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp index ca70eebc4a7..cb87d8907ef 100644 --- a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp +++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp @@ -1020,7 +1020,7 @@ nsBrowserWindow::DispatchMenuItem(PRInt32 aID) (nsISupports **)&walletservice); if ((NS_OK == res) && (nsnull != walletservice)) { nsIURI * url; - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &res); + nsCOMPtr service(do_GetService(kIOServiceCID, &res)); if (NS_FAILED(res)) return nsEventStatus_eIgnore; nsIURI *uri = nsnull; @@ -1280,7 +1280,7 @@ GetTitleSuffix(void) return suffix; } nsIURI* url = nsnull; - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &ret); + nsCOMPtr service(do_GetService(kIOServiceCID, &ret)); if (NS_FAILED(ret)) return ret; nsIURI *uri = nsnull; diff --git a/mozilla/webshell/tests/viewer/nsMacMain.cpp b/mozilla/webshell/tests/viewer/nsMacMain.cpp index f34f01ffb00..d9b516756d7 100644 --- a/mozilla/webshell/tests/viewer/nsMacMain.cpp +++ b/mozilla/webshell/tests/viewer/nsMacMain.cpp @@ -354,7 +354,8 @@ nsNativeBrowserWindow::DispatchMenuItem(PRInt32 aID) case cmd_DumpLeaks: { nsresult rv; - NS_WITH_SERVICE(nsILeakDetector, leakDetector, "@mozilla.org/xpcom/leakdetector;1", &rv) + nsCOMPtr leakDetector = + do_GetService("@mozilla.org/xpcom/leakdetector;1", &rv); if (NS_SUCCEEDED(rv)) leakDetector->DumpLeaks(); } diff --git a/mozilla/webshell/tests/viewer/nsViewerApp.cpp b/mozilla/webshell/tests/viewer/nsViewerApp.cpp index 9bcaf7f5aed..d1cbb9d01a1 100644 --- a/mozilla/webshell/tests/viewer/nsViewerApp.cpp +++ b/mozilla/webshell/tests/viewer/nsViewerApp.cpp @@ -261,7 +261,8 @@ nsViewerApp::SetupRegistry() NS_RELEASE(bwf); // register the cookie manager - NS_WITH_SERVICE(nsICookieService, cookieService, kCookieServiceCID, &rv); + nsCOMPtr cookieService = + do_GetService(kCookieServiceCID, &rv); if (NS_FAILED(rv) || (nsnull == cookieService)) { #ifdef DEBUG printf("Unable to instantiate Cookie Manager\n"); diff --git a/mozilla/webshell/tests/viewer/nsWinMain.cpp b/mozilla/webshell/tests/viewer/nsWinMain.cpp index 5b4ac2e3ce9..081cd36005c 100644 --- a/mozilla/webshell/tests/viewer/nsWinMain.cpp +++ b/mozilla/webshell/tests/viewer/nsWinMain.cpp @@ -58,7 +58,7 @@ nsNativeViewerApp::Run() int keepGoing = 1; nsresult rv; - NS_WITH_SERVICE(nsITimerQueue, queue, kTimerManagerCID, &rv); + nsCOMPtr queue(do_GetService(kTimerManagerCID, &rv)); if (NS_FAILED(rv)) return 0; // Pump all messages diff --git a/mozilla/widget/src/beos/nsDragService.cpp b/mozilla/widget/src/beos/nsDragService.cpp index aab49a2d537..888973e9c86 100644 --- a/mozilla/widget/src/beos/nsDragService.cpp +++ b/mozilla/widget/src/beos/nsDragService.cpp @@ -112,7 +112,7 @@ void nsDragService::SetTopLevelView(BView *v) // Get the DragService from the service manager. nsresult rv; - NS_WITH_SERVICE(nsIDragService, dragService, kCDragServiceCID, &rv); + nsCOMPtr dragService(do_GetService(kCDragServiceCID, &rv)); if (NS_FAILED(rv)) { return; diff --git a/mozilla/widget/src/beos/nsFilePicker.cpp b/mozilla/widget/src/beos/nsFilePicker.cpp index 3bdfe06591b..5aa94742bc4 100644 --- a/mozilla/widget/src/beos/nsFilePicker.cpp +++ b/mozilla/widget/src/beos/nsFilePicker.cpp @@ -333,7 +333,8 @@ char * nsFilePicker::ConvertToFileSystemCharset(const PRUnichar *inString) nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeEncoder(&fileSystemCharset, &mUnicodeEncoder); } @@ -370,7 +371,8 @@ PRUnichar * nsFilePicker::ConvertFromFileSystemCharset(const char *inString) nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeDecoder(&fileSystemCharset, &mUnicodeDecoder); } diff --git a/mozilla/widget/src/gtk/nsFileWidget.cpp b/mozilla/widget/src/gtk/nsFileWidget.cpp index dd4af7660fd..b3997115908 100644 --- a/mozilla/widget/src/gtk/nsFileWidget.cpp +++ b/mozilla/widget/src/gtk/nsFileWidget.cpp @@ -438,7 +438,8 @@ NS_IMETHODIMP nsFileWidget::Create(nsIWidget *aParent, } // get an unicode converter - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeEncoder(&localeCharset, &gUnicodeEncoder); } diff --git a/mozilla/widget/src/gtk/nsGtkIMEHelper.cpp b/mozilla/widget/src/gtk/nsGtkIMEHelper.cpp index df725cfd6e1..d3ef59eac81 100644 --- a/mozilla/widget/src/gtk/nsGtkIMEHelper.cpp +++ b/mozilla/widget/src/gtk/nsGtkIMEHelper.cpp @@ -87,8 +87,8 @@ void nsGtkIMEHelper::SetupUnicodeDecoder() { mDecoder = nsnull; nsresult result = NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPlatformCharset, platform, NS_PLATFORMCHARSET_CONTRACTID, - &result); + nsCOMPtr platform = + do_GetService(NS_PLATFORMCHARSET_CONTRACTID, &result); if (platform && NS_SUCCEEDED(result)) { nsAutoString charset; charset.AssignWithConversion(""); @@ -1173,7 +1173,7 @@ nsIMEGtkIC::GetInputStyle() { return ret_style; #endif - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (!NS_FAILED(rv) && (prefs)) { char *input_style; rv = prefs->CopyCharPref(PREF_XIM_INPUTSTYLE, &input_style); diff --git a/mozilla/widget/src/gtk/nsGtkMozRemoteHelper.cpp b/mozilla/widget/src/gtk/nsGtkMozRemoteHelper.cpp index 863c076bfc0..4ed102912ec 100644 --- a/mozilla/widget/src/gtk/nsGtkMozRemoteHelper.cpp +++ b/mozilla/widget/src/gtk/nsGtkMozRemoteHelper.cpp @@ -648,7 +648,7 @@ nsGtkMozRemoteHelper::OpenURL (const char *aURL, PRBool aNewWindow, PRBoo nsString newURL; nsCString navChromeURL; nsXPIDLCString tempString; - NS_WITH_SERVICE(nsIPref, prefs, "@mozilla.org/preferences;1", &rv); + nsCOMPtr prefs(do_GetService("@mozilla.org/preferences;1", &rv)); if (NS_SUCCEEDED(rv)) prefs->CopyCharPref("browser.chromeURL", getter_Copies(tempString)); // make a copy for the auto string @@ -767,8 +767,8 @@ nsGtkMozRemoteHelper::MailTo (const PRUnichar *aToList) #ifdef MOZ_MAIL_NEWS nsresult rv; // get the messenger compose service - NS_WITH_SERVICE(nsIMsgComposeService, composeService, - "@mozilla.org/messengercompose;1", &rv); + nsCOMPtr composeService = + do_GetService("@mozilla.org/messengercompose;1", &rv); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; if (aToList) @@ -833,7 +833,8 @@ NS_METHOD nsGtkMozRemoteHelper::GetLastBrowserWindow (nsIDOMWindow **_retval) browserString.AssignWithConversion("navigator:browser"); // get the window mediator service - NS_WITH_SERVICE(nsIWindowMediator, windowMediator, kWindowMediatorCID, &rv); + nsCOMPtr windowMediator = + do_GetService(kWindowMediatorCID, &rv); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/widget/src/gtk/nsWidget.cpp b/mozilla/widget/src/gtk/nsWidget.cpp index 7669c68d7ec..14ab63b560e 100644 --- a/mozilla/widget/src/gtk/nsWidget.cpp +++ b/mozilla/widget/src/gtk/nsWidget.cpp @@ -2606,7 +2606,7 @@ static void debugSetupWindow (void) nsresult rv; debugCheckedDebugWindow = PR_TRUE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (!NS_FAILED(rv) && (prefs)) { rv = prefs->GetBoolPref(debugPrefName, &enable_window); if (!NS_FAILED(rv) && enable_window) { @@ -2643,7 +2643,7 @@ static int debugWindowPrefChanged (const char *newpref, void *data) { PRBool enable_window; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (!NS_FAILED(rv) && (prefs)) { rv = prefs->GetBoolPref(debugPrefName, &enable_window); if (!NS_FAILED(rv) && enable_window) { @@ -2668,7 +2668,7 @@ static void debugRegisterCallback (void) // make sure we don't call in here again debugCallbackRegistered = PR_TRUE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefServiceCID, &rv)); if (!NS_FAILED(rv)) { rv = prefs->RegisterCallback(debugPrefName, debugWindowPrefChanged, NULL); } diff --git a/mozilla/widget/src/gtk/nsWindow.cpp b/mozilla/widget/src/gtk/nsWindow.cpp index 9e1c8181176..7a824b26344 100644 --- a/mozilla/widget/src/gtk/nsWindow.cpp +++ b/mozilla/widget/src/gtk/nsWindow.cpp @@ -2211,7 +2211,8 @@ NS_IMETHODIMP nsWindow::SetTitle(const nsString& aTitle) platformCharset.AssignWithConversion("ISO-8859-1"); // get the encoder - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); + nsCOMPtr ccm = + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); rv = ccm->GetUnicodeEncoder(&platformCharset, getter_AddRefs(encoder)); // Estimate out length and allocate the buffer based on a worst-case estimate, then do diff --git a/mozilla/widget/src/mac/nsMacControl.cpp b/mozilla/widget/src/mac/nsMacControl.cpp index af0ba3ad41f..bc1184cbb3d 100644 --- a/mozilla/widget/src/mac/nsMacControl.cpp +++ b/mozilla/widget/src/mac/nsMacControl.cpp @@ -398,7 +398,8 @@ void nsMacControl::StringToStr255(const nsString& aText, Str255& aStr255) nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeEncoder(&fileSystemCharset, &mUnicodeEncoder); } @@ -436,7 +437,8 @@ void nsMacControl::Str255ToString(const Str255& aStr255, nsString& aText) nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeDecoder(&fileSystemCharset, &mUnicodeDecoder); } diff --git a/mozilla/widget/src/mac/nsMenu.cpp b/mozilla/widget/src/mac/nsMenu.cpp index 5c692722b85..9182b9b3de0 100644 --- a/mozilla/widget/src/mac/nsMenu.cpp +++ b/mozilla/widget/src/mac/nsMenu.cpp @@ -1303,7 +1303,8 @@ nsMenu::GetMenuPopupContent(nsIContent** aResult) *aResult = nsnull; nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if ( !xblService ) return; diff --git a/mozilla/widget/src/mac/nsMenuX.cpp b/mozilla/widget/src/mac/nsMenuX.cpp index 340860f95db..7946b06a3c3 100644 --- a/mozilla/widget/src/mac/nsMenuX.cpp +++ b/mozilla/widget/src/mac/nsMenuX.cpp @@ -1154,7 +1154,8 @@ nsMenuX::GetMenuPopupContent(nsIContent** aResult) *aResult = nsnull; nsresult rv; - NS_WITH_SERVICE(nsIXBLService, xblService, "@mozilla.org/xbl;1", &rv); + nsCOMPtr xblService = + do_GetService("@mozilla.org/xbl;1", &rv); if ( !xblService ) return; diff --git a/mozilla/widget/src/motif/app_context/nsMotifAppContextServiceFactory.cpp b/mozilla/widget/src/motif/app_context/nsMotifAppContextServiceFactory.cpp index 5597c08a1a3..4ea1dfa7b1f 100644 --- a/mozilla/widget/src/motif/app_context/nsMotifAppContextServiceFactory.cpp +++ b/mozilla/widget/src/motif/app_context/nsMotifAppContextServiceFactory.cpp @@ -131,7 +131,8 @@ NSRegisterSelf(nsISupports* aServMgr, const char *fullpath) serviceManager(do_QueryInterface(aServMgr, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; rv = compMgr->RegisterComponent(kCMotifAppContextServiceCID, @@ -151,7 +152,8 @@ NSUnregisterSelf(nsISupports *aServMgr, const char *fullpath) serviceManager(do_QueryInterface(aServMgr, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; compMgr->UnregisterComponent(kCMotifAppContextServiceCID, fullpath); diff --git a/mozilla/widget/src/motif/nsAppShell.cpp b/mozilla/widget/src/motif/nsAppShell.cpp index 65ae615a203..4f0874c80f4 100644 --- a/mozilla/widget/src/motif/nsAppShell.cpp +++ b/mozilla/widget/src/motif/nsAppShell.cpp @@ -82,7 +82,8 @@ NS_METHOD nsAppShell::Create(int* bac, char ** bav) nsresult rv; - NS_WITH_SERVICE(nsICmdLineService, cmdLineArgs, kCmdLineServiceCID, &rv); + nsCOMPtr cmdLineArgs = + do_GetService(kCmdLineServiceCID, &rv); if (NS_SUCCEEDED(rv)) { rv = cmdLineArgs->GetArgc(&argc); @@ -140,7 +141,8 @@ NS_METHOD nsAppShell::Run() nsIEventQueue * EQueue = nsnull; // Get the event queue service - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) { NS_ASSERTION("Could not obtain event queue service", PR_FALSE); return rv; diff --git a/mozilla/widget/src/os2/nsAppShell.cpp b/mozilla/widget/src/os2/nsAppShell.cpp index ade916b79c4..48ffbb9dd87 100644 --- a/mozilla/widget/src/os2/nsAppShell.cpp +++ b/mozilla/widget/src/os2/nsAppShell.cpp @@ -155,7 +155,7 @@ nsresult nsAppShell::Run() #if 0 nsresult rv; - NS_WITH_SERVICE(nsITimerQueue, queue, kTimerManagerCID, &rv); + nsCOMPtr queue(do_GetService(kTimerManagerCID, &rv)); if (NS_FAILED(rv)) return rv; #endif @@ -245,7 +245,7 @@ nsresult nsAppShell::GetNativeEvent( PRBool &aRealEvent, void *&aEvent) #if 0 nsresult rv; - NS_WITH_SERVICE(nsITimerQueue, queue, kTimerManagerCID, &rv); + nsCOMPtr queue(do_GetService(kTimerManagerCID, &rv)); if (NS_FAILED(rv)) return rv; #endif diff --git a/mozilla/widget/src/os2/nsFilePicker.cpp b/mozilla/widget/src/os2/nsFilePicker.cpp index dbd2c1ad152..1dd2dbea50a 100644 --- a/mozilla/widget/src/os2/nsFilePicker.cpp +++ b/mozilla/widget/src/os2/nsFilePicker.cpp @@ -320,7 +320,8 @@ char * nsFilePicker::ConvertToFileSystemCharset(const PRUnichar *inString) nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeEncoder(&fileSystemCharset, &mUnicodeEncoder); } @@ -357,7 +358,8 @@ PRUnichar * nsFilePicker::ConvertFromFileSystemCharset(const char *inString) nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeDecoder(&fileSystemCharset, &mUnicodeDecoder); } diff --git a/mozilla/widget/src/os2/nsFileWidget.cpp b/mozilla/widget/src/os2/nsFileWidget.cpp index 2c9ef49d74d..4638f5cced8 100644 --- a/mozilla/widget/src/os2/nsFileWidget.cpp +++ b/mozilla/widget/src/os2/nsFileWidget.cpp @@ -375,7 +375,8 @@ char * nsFileWidget::ConvertToFileSystemCharset(const PRUnichar *inString, PRInt nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeEncoder(&fileSystemCharset, &mUnicodeEncoder); } diff --git a/mozilla/widget/src/photon/nsAppShell.cpp b/mozilla/widget/src/photon/nsAppShell.cpp index 6951f3983a8..23dfb7cbae7 100644 --- a/mozilla/widget/src/photon/nsAppShell.cpp +++ b/mozilla/widget/src/photon/nsAppShell.cpp @@ -144,7 +144,8 @@ NS_IMETHODIMP nsAppShell::Create(int *bac, char **bav) nsresult rv; - NS_WITH_SERVICE(nsICmdLineService, cmdLineArgs, kCmdLineServiceCID, &rv); + nsCOMPtr cmdLineArgs = + do_GetService(kCmdLineServiceCID, &rv); if (NS_SUCCEEDED(rv)) { rv = cmdLineArgs->GetArgc(&argc); diff --git a/mozilla/widget/src/windows/nsAppShell.cpp b/mozilla/widget/src/windows/nsAppShell.cpp index 8cc72d40ab6..e631ec8953a 100644 --- a/mozilla/widget/src/windows/nsAppShell.cpp +++ b/mozilla/widget/src/windows/nsAppShell.cpp @@ -84,7 +84,7 @@ NS_METHOD nsAppShell::Run(void) int keepGoing = 1; nsresult rv; - NS_WITH_SERVICE(nsITimerQueue, queue, kTimerManagerCID, &rv); + nsCOMPtr queue(do_GetService(kTimerManagerCID, &rv)); if (NS_FAILED(rv)) return rv; gKeepGoing = 1; @@ -152,7 +152,7 @@ nsAppShell::GetNativeEvent(PRBool &aRealEvent, void *&aEvent) BOOL gotMessage = false; nsresult rv; - NS_WITH_SERVICE(nsITimerQueue, queue, kTimerManagerCID, &rv); + nsCOMPtr queue(do_GetService(kTimerManagerCID, &rv)); if (NS_FAILED(rv)) return rv; do { diff --git a/mozilla/widget/src/windows/nsFilePicker.cpp b/mozilla/widget/src/windows/nsFilePicker.cpp index cc41557707c..a93a6848d31 100644 --- a/mozilla/widget/src/windows/nsFilePicker.cpp +++ b/mozilla/widget/src/windows/nsFilePicker.cpp @@ -365,7 +365,8 @@ char * nsFilePicker::ConvertToFileSystemCharset(const PRUnichar *inString) nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeEncoder(&fileSystemCharset, &mUnicodeEncoder); } @@ -402,7 +403,8 @@ PRUnichar * nsFilePicker::ConvertFromFileSystemCharset(const char *inString) nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeDecoder(&fileSystemCharset, &mUnicodeDecoder); } diff --git a/mozilla/widget/src/windows/nsFileWidget.cpp b/mozilla/widget/src/windows/nsFileWidget.cpp index aa11702f84d..4d26855b0b2 100644 --- a/mozilla/widget/src/windows/nsFileWidget.cpp +++ b/mozilla/widget/src/windows/nsFileWidget.cpp @@ -408,7 +408,8 @@ char * nsFileWidget::ConvertToFileSystemCharset(const PRUnichar *inString, PRInt nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeEncoder(&fileSystemCharset, &mUnicodeEncoder); } @@ -446,7 +447,8 @@ PRUnichar * nsFileWidget::ConvertFromFileSystemCharset(const char *inString) nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeDecoder(&fileSystemCharset, &mUnicodeDecoder); } diff --git a/mozilla/widget/src/windows/nsWindow.cpp b/mozilla/widget/src/windows/nsWindow.cpp index 650365a2b38..186519e650f 100644 --- a/mozilla/widget/src/windows/nsWindow.cpp +++ b/mozilla/widget/src/windows/nsWindow.cpp @@ -2955,7 +2955,8 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM wParam, LPARAM lParam, LRESULT case WM_ENTERIDLE: { nsresult rv; - NS_WITH_SERVICE(nsITimerQueue, queue, kTimerManagerCID, &rv); + nsCOMPtr queue = + do_GetService(kTimerManagerCID, &rv); if (!NS_FAILED(rv)) { if (queue->HasReadyTimers(NS_PRIORITY_LOWEST)) { diff --git a/mozilla/widget/src/xlib/nsWindow.cpp b/mozilla/widget/src/xlib/nsWindow.cpp index 0fc665681c7..eb5d3f84fa2 100644 --- a/mozilla/widget/src/xlib/nsWindow.cpp +++ b/mozilla/widget/src/xlib/nsWindow.cpp @@ -777,7 +777,8 @@ NS_IMETHODIMP nsWindow::SetTitle(const nsString& aTitle) platformCharset.AssignWithConversion("ISO-8859-1"); /* get the encoder */ - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); + nsCOMPtr ccm = + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); rv = ccm->GetUnicodeEncoder(&platformCharset, getter_AddRefs(encoder)); /* Estimate out length and allocate the buffer based on a worst-case estimate, then do diff --git a/mozilla/widget/src/xlib/window_service/nsXlibWindowServiceFactory.cpp b/mozilla/widget/src/xlib/window_service/nsXlibWindowServiceFactory.cpp index 486237808fd..ac0ec4cf6e8 100644 --- a/mozilla/widget/src/xlib/window_service/nsXlibWindowServiceFactory.cpp +++ b/mozilla/widget/src/xlib/window_service/nsXlibWindowServiceFactory.cpp @@ -132,7 +132,8 @@ NSRegisterSelf(nsISupports* aServMgr, const char *fullpath) serviceManager(do_QueryInterface(aServMgr, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; rv = compMgr->RegisterComponent(kCXlibWindowServiceCID, @@ -152,7 +153,8 @@ NSUnregisterSelf(nsISupports *aServMgr, const char *fullpath) serviceManager(do_QueryInterface(aServMgr, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; compMgr->UnregisterComponent(kCXlibWindowServiceCID, fullpath); diff --git a/mozilla/widget/src/xpwidgets/nsPrimitiveHelpers.cpp b/mozilla/widget/src/xpwidgets/nsPrimitiveHelpers.cpp index 80b40602181..99905e218ce 100644 --- a/mozilla/widget/src/xpwidgets/nsPrimitiveHelpers.cpp +++ b/mozilla/widget/src/xpwidgets/nsPrimitiveHelpers.cpp @@ -152,7 +152,8 @@ nsPrimitiveHelpers :: ConvertUnicodeToPlatformPlainText ( PRUnichar* inUnicode, #if 0 // get the encoder - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); + nsCOMPtr ccm = + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); rv = ccm->GetUnicodeEncoder(&platformCharset, getter_AddRefs(encoder)); // Estimate out length and allocate the buffer based on a worst-case estimate, then do @@ -218,7 +219,8 @@ nsPrimitiveHelpers :: ConvertPlatformPlainTextToUnicode ( const char* inText, PR platformCharset.AssignWithConversion("ISO-8859-1"); // get the decoder - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); + nsCOMPtr ccm = + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); rv = ccm->GetUnicodeDecoder(&platformCharset, getter_AddRefs(decoder)); hasConverter = PR_TRUE; diff --git a/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.cpp b/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.cpp index cdf308ae334..6a0c9bcf184 100644 --- a/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.cpp +++ b/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.cpp @@ -216,7 +216,7 @@ static int PR_CALLBACK intPrefChanged (const char *newpref, void *data) if (np) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefService, kPrefServiceCID, &rv); + nsCOMPtr prefService(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED(rv) && prefService) { PRInt32 intpref; @@ -240,7 +240,7 @@ static int PR_CALLBACK floatPrefChanged (const char *newpref, void *data) if (np) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefService, kPrefServiceCID, &rv); + nsCOMPtr prefService(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED(rv) && prefService) { PRInt32 intpref; @@ -264,7 +264,7 @@ static int PR_CALLBACK colorPrefChanged (const char *newpref, void *data) if (np) { nsresult rv; - NS_WITH_SERVICE(nsIPref, prefService, kPrefServiceCID, &rv); + nsCOMPtr prefService(do_GetService(kPrefServiceCID, &rv)); if (NS_SUCCEEDED(rv) && prefService) { char *colorStr = 0; @@ -352,7 +352,7 @@ nsXPLookAndFeel::Init() sInitialized = PR_TRUE; nsresult rv; - NS_WITH_SERVICE(nsIPref, prefService, kPrefServiceCID, &rv); + nsCOMPtr prefService(do_GetService(kPrefServiceCID, &rv)); if (NS_FAILED(rv) || !prefService) return; diff --git a/mozilla/widget/timer/src/unix/motif/nsTimerMotifFactory.cpp b/mozilla/widget/timer/src/unix/motif/nsTimerMotifFactory.cpp index a52648098f7..fa59c34ec98 100644 --- a/mozilla/widget/timer/src/unix/motif/nsTimerMotifFactory.cpp +++ b/mozilla/widget/timer/src/unix/motif/nsTimerMotifFactory.cpp @@ -140,7 +140,8 @@ NSRegisterSelf(nsISupports* aServMgr, const char *fullpath) serviceManager(do_QueryInterface(aServMgr, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; rv = compMgr->RegisterComponent(kCTimerMotif, @@ -162,7 +163,8 @@ NSUnregisterSelf(nsISupports* aServMgr, const char *fullpath) serviceManager(do_QueryInterface(aServMgr, &rv)); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIComponentManager, compMgr, kComponentManagerCID, &rv); + nsCOMPtr compMgr = + do_GetService(kComponentManagerCID, &rv); if (NS_FAILED(rv)) return rv; compMgr->UnregisterComponent(kCTimerMotif, fullpath); diff --git a/mozilla/xpcom/build/nsXPComInit.cpp b/mozilla/xpcom/build/nsXPComInit.cpp index 34348185147..51f22428b15 100644 --- a/mozilla/xpcom/build/nsXPComInit.cpp +++ b/mozilla/xpcom/build/nsXPComInit.cpp @@ -439,7 +439,8 @@ nsresult NS_COM NS_ShutdownXPCOM(nsIServiceManager* servMgr) { // Block it so that the COMPtr will get deleted before we hit // servicemanager shutdown - NS_WITH_SERVICE (nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsIServiceManager *mgr; // NO COMPtr as we dont release the service manager @@ -456,8 +457,8 @@ nsresult NS_COM NS_ShutdownXPCOM(nsIServiceManager* servMgr) // grab the event queue so that we can process events one last time before exiting nsCOMPtr currentQ; { - NS_WITH_SERVICE(nsIEventQueueService, eventQService, - kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (eventQService) { eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(currentQ)); diff --git a/mozilla/xpcom/components/nsComponentManager.cpp b/mozilla/xpcom/components/nsComponentManager.cpp index 17696b74bfe..05fe9a20a89 100644 --- a/mozilla/xpcom/components/nsComponentManager.cpp +++ b/mozilla/xpcom/components/nsComponentManager.cpp @@ -2001,7 +2001,8 @@ nsComponentManagerImpl::AutoRegisterImpl(PRInt32 when, nsIFile *inDirSpec) dir = inDirSpec; // Set components' directory for AutoRegisterInterfces to query - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; // Don't care if undefining fails @@ -2012,7 +2013,8 @@ nsComponentManagerImpl::AutoRegisterImpl(PRInt32 when, nsIFile *inDirSpec) else { // Do default components directory - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = directoryService->Get(NS_XPCOM_COMPONENT_DIR, NS_GET_IID(nsIFile), getter_AddRefs(dir)); @@ -2026,7 +2028,8 @@ nsComponentManagerImpl::AutoRegisterImpl(PRInt32 when, nsIFile *inDirSpec) return NS_ERROR_UNEXPECTED; // Notify observers of xpcom autoregistration start - NS_WITH_SERVICE (nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) { diff --git a/mozilla/xpcom/components/nsIServiceManager.h b/mozilla/xpcom/components/nsIServiceManager.h index c17ba1da7d3..21579dea0d3 100644 --- a/mozilla/xpcom/components/nsIServiceManager.h +++ b/mozilla/xpcom/components/nsIServiceManager.h @@ -379,45 +379,6 @@ CallGetService( const char *aContractID, nsnull); } -//////////////////////////////////////////////////////////////////////////////// -// NS_WITH_SERVICE: macro to make using services easier. -// -// Services can be used with COMPtrs. GetService() is used to get a service. -// NS_RELEASE() can be called on the service got to release it. -// -// NOTE: ReleaseService() is OBSOLETE. -// -// NOTE: NS_WITH_SERVICE is deprecated. This: -// { -// nsCOMPtr service( do_GetService(NS_MYSERVICE_CONTRACTID, &rv) ); -// if (NS_FAILED(rv)) return rv; -// service->Doit(...); // use my service -// } -// is preferred over either of the blocks of code below. -// -// Back when NS_WITH_SERVICE wasn't deprecated you could replace this: -// { -// nsIMyService* service; -// rv = nsServiceManager::GetService(kMyServiceCID, NS_GET_IID(nsIMyService), -// &service); -// if (NS_FAILED(rv)) return rv; -// service->Doit(...); // use my service -// rv = nsServiceManager::ReleaseService(kMyServiceCID, service); -// } -// with this: -// { -// NS_WITH_SERVICE(nsIMyService, service, kMyServiceCID, &rv); -// if (NS_FAILED(rv)) return rv; -// service->Doit(...); // use my service -// } -// and the automatic destructor from COMPtr will take care of releasing the service. -//////////////////////////////////////////////////////////////////////////////// -#define NS_WITH_SERVICE(T, var, cid, rvAddr) \ - nsCOMPtr var = do_GetService(cid, rvAddr); - -#define NS_WITH_SERVICE1(T, var, isupportsServMgr, cid, rvAddr) \ - nsCOMPtr var = do_GetService(cid, isupportsServMgr, rvAddr); - //////////////////////////////////////////////////////////////////////////////// // NS_NewServiceManager: For when you want to create a service manager // in a given context. diff --git a/mozilla/xpcom/components/nsNativeComponentLoader.cpp b/mozilla/xpcom/components/nsNativeComponentLoader.cpp index 879cdeb8743..c901412c8ab 100644 --- a/mozilla/xpcom/components/nsNativeComponentLoader.cpp +++ b/mozilla/xpcom/components/nsNativeComponentLoader.cpp @@ -665,7 +665,8 @@ nsNativeComponentLoader::AutoUnregisterComponent(PRInt32 when, if (NS_FAILED(rv)) return rv; // Notify observers, if any, of autoregistration work - NS_WITH_SERVICE (nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsIServiceManager *mgr; // NO COMPtr as we dont release the service manager @@ -821,7 +822,8 @@ nsNativeComponentLoader::AutoRegisterComponent(PRInt32 when, // Notify observers, if any, of autoregistration work - NS_WITH_SERVICE (nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsIServiceManager *mgr; // NO COMPtr as we dont release the service manager diff --git a/mozilla/xpcom/ds/nsIStopwatch.idl b/mozilla/xpcom/ds/nsIStopwatch.idl index c5407f0b54c..92355b3a7a0 100644 --- a/mozilla/xpcom/ds/nsIStopwatch.idl +++ b/mozilla/xpcom/ds/nsIStopwatch.idl @@ -125,7 +125,8 @@ interface nsIStopwatch : nsISupports if (_stopwatch == nsnull) { \ nsresult _rv; \ static NS_DEFINE_CID(kStopwatchServiceCID, NS_STOPWATCHSERVICE_CID); \ - NS_WITH_SERVICE(nsIStopwatchService, _serv, kStopwatchServiceCID, &_rv); \ + nsCOMPtr _serv = \ + do_GetService(kStopwatchServiceCID, &_rv); \ if (NS_SUCCEEDED(_rv)) { \ _rv = _serv->CreateStopwatch(#_stopwatch, _countUnits, _perThread, \ &_stopwatch); \ diff --git a/mozilla/xpcom/io/nsAppFileLocationProvider.cpp b/mozilla/xpcom/io/nsAppFileLocationProvider.cpp index d0d7cb4c3d7..104622ae874 100755 --- a/mozilla/xpcom/io/nsAppFileLocationProvider.cpp +++ b/mozilla/xpcom/io/nsAppFileLocationProvider.cpp @@ -211,7 +211,8 @@ NS_METHOD nsAppFileLocationProvider::CloneMozBinDirectory(nsILocalFile **aLocalF // This will be set if a directory was passed to NS_InitXPCOM // 2. If that doesn't work, set it to be the current process directory - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; @@ -253,7 +254,8 @@ NS_METHOD nsAppFileLocationProvider::GetProductDirectory(nsILocalFile **aLocalFi nsCOMPtr localDir; #if defined(XP_MAC) - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; OSErr err; long response; @@ -262,12 +264,14 @@ NS_METHOD nsAppFileLocationProvider::GetProductDirectory(nsILocalFile **aLocalFi rv = directoryService->Get(prop, NS_GET_IID(nsILocalFile), getter_AddRefs(localDir)); if (NS_FAILED(rv)) return rv; #elif defined(XP_OS2) - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = directoryService->Get(NS_OS2_HOME_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(localDir)); if (NS_FAILED(rv)) return rv; #elif defined(XP_PC) - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = directoryService->Get(NS_WIN_APPDATA_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(localDir)); if (NS_SUCCEEDED(rv)) diff --git a/mozilla/xpcom/io/nsFileSpec.cpp b/mozilla/xpcom/io/nsFileSpec.cpp index 4a2ca07f723..ffc21199655 100644 --- a/mozilla/xpcom/io/nsFileSpec.cpp +++ b/mozilla/xpcom/io/nsFileSpec.cpp @@ -1193,7 +1193,8 @@ PRUnichar * nsFileSpec::ConvertFromFileSystemCharset(const char *inString) nsAutoString fileSystemCharset; GetFileSystemCharset(fileSystemCharset); - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &rv); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = ccm->GetUnicodeDecoder(&fileSystemCharset, &aUnicodeDecoder); } diff --git a/mozilla/xpcom/io/nsIFile.idl b/mozilla/xpcom/io/nsIFile.idl index cd33061feef..9f7f2d17b95 100644 --- a/mozilla/xpcom/io/nsIFile.idl +++ b/mozilla/xpcom/io/nsIFile.idl @@ -329,7 +329,7 @@ NS_GetSpecialDirectory(const char* specialDirName, nsIFile* *result) { nsresult rv; static NS_DEFINE_CID(kDirectoryServiceCID, NS_DIRECTORY_SERVICE_CID); - NS_WITH_SERVICE(nsIProperties, serv, kDirectoryServiceCID, &rv); + nsCOMPtr serv(do_GetService(kDirectoryServiceCID, &rv)); if (NS_FAILED(rv)) return rv; nsCOMPtr dir; diff --git a/mozilla/xpcom/io/nsLocalFileCommon.cpp b/mozilla/xpcom/io/nsLocalFileCommon.cpp index 1107f726115..7376412fdf9 100644 --- a/mozilla/xpcom/io/nsLocalFileCommon.cpp +++ b/mozilla/xpcom/io/nsLocalFileCommon.cpp @@ -136,7 +136,8 @@ nsFSStringConversion::PrepareFSCharset() if(!mFSCharset) { // lazy eval of the file system charset - NS_WITH_SERVICE(nsIPlatformCharset, pcharset, NS_PLATFORMCHARSET_CONTRACTID, &res); + nsCOMPtr pcharset = + do_GetService(NS_PLATFORMCHARSET_CONTRACTID, &res); if (NS_SUCCEEDED(res) && !pcharset) res = NS_ERROR_NULL_POINTER; if (NS_SUCCEEDED(res)) { mFSCharset = new nsString(); @@ -163,8 +164,8 @@ nsFSStringConversion::PrepareEncoder() { res = PrepareFSCharset(); if(NS_SUCCEEDED(res)) { - NS_WITH_SERVICE(nsICharsetConverterManager, - ucmgr, NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res); + nsCOMPtr ucmgr = + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res); NS_ASSERTION((NS_SUCCEEDED(res) && ucmgr), "cannot get charset converter manager "); if(NS_SUCCEEDED(res) && ucmgr) @@ -186,8 +187,8 @@ nsFSStringConversion::PrepareDecoder() { res = PrepareFSCharset(); if(NS_SUCCEEDED(res)) { - NS_WITH_SERVICE(nsICharsetConverterManager, - ucmgr, NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res); + nsCOMPtr ucmgr = + do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &res); NS_ASSERTION((NS_SUCCEEDED(res) && ucmgr), "cannot get charset converter manager "); if(NS_SUCCEEDED(res) && ucmgr) @@ -423,7 +424,7 @@ nsresult nsLocalFile::ParseURL(const char* inURL, char **outHost, char **outDire } } - NS_WITH_SERVICE(nsIURLParser, parser, kStdURLParserCID, &rv); + nsCOMPtr parser(do_GetService(kStdURLParserCID, &rv)); if (NS_FAILED(rv)) return rv; nsXPIDLCString ePath; diff --git a/mozilla/xpcom/io/nsLocalFileMac.cpp b/mozilla/xpcom/io/nsLocalFileMac.cpp index 15ec778e2e1..32407886978 100644 --- a/mozilla/xpcom/io/nsLocalFileMac.cpp +++ b/mozilla/xpcom/io/nsLocalFileMac.cpp @@ -3089,7 +3089,8 @@ nsresult nsLocalFile::SetOSTypeAndCreatorFromExtension(const char* extension) ++extPtr; } - NS_WITH_SERVICE(nsIInternetConfigService, icService, NS_INTERNETCONFIGSERVICE_CONTRACTID, &rv); + nsCOMPtr icService = + do_GetService(NS_INTERNETCONFIGSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { nsCOMPtr mimeInfo; diff --git a/mozilla/xpcom/io/nsUnicharInputStream.cpp b/mozilla/xpcom/io/nsUnicharInputStream.cpp index 3ca1a85f994..6b9d1143ef1 100644 --- a/mozilla/xpcom/io/nsUnicharInputStream.cpp +++ b/mozilla/xpcom/io/nsUnicharInputStream.cpp @@ -151,7 +151,8 @@ NS_NewB2UConverter(nsIUnicodeDecoder** aInstancePtrResult, if (aCharSet == nsnull) aCharSet = &defaultCharset; - NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res); + nsCOMPtr ccm = + do_GetService(kCharsetConverterManagerCID, &res); if (NS_FAILED(res)) return res; return ccm->GetUnicodeDecoder(aCharSet, aInstancePtrResult); diff --git a/mozilla/xpcom/proxy/public/nsProxiedService.h b/mozilla/xpcom/proxy/public/nsProxiedService.h index 8c41e46ed6f..5289c8ff365 100644 --- a/mozilla/xpcom/proxy/public/nsProxiedService.h +++ b/mozilla/xpcom/proxy/public/nsProxiedService.h @@ -33,10 +33,12 @@ // Now you can replace this: // { // nsresult rv; -// NS_WITH_SERVICE(nsIMyService, pIMyService, kMyServiceCID, &rv); +// nsCOMPtr pIMyService = +// do_GetService(kMyServiceCID, &rv); // if(NS_FAILED(rv)) // return; -// NS_WITH_SERVICE(nsIProxyObjectManager, pIProxyObjectManager, kProxyObjectManagerCID, &rv); +// nsCOMPtr pIProxyObjectManager = +// do_GetService(kProxyObjectManagerCID, &rv); // if(NS_FAILED(rv)) // return; // nsIMyService pIProxiedObject = NULL; @@ -90,8 +92,8 @@ class nsProxiedService getter_AddRefs(mService)); if (NS_FAILED(*rv)) return; - NS_WITH_SERVICE(nsIProxyObjectManager, pIProxyObjectManager, - kProxyObjectManagerCID, rv); + nsCOMPtr pIProxyObjectManager = + do_GetService(kProxyObjectManagerCID, rv); if (NS_FAILED(*rv)) return; PRInt32 proxyType = PROXY_SYNC; diff --git a/mozilla/xpcom/proxy/src/nsProxyObjectManager.cpp b/mozilla/xpcom/proxy/src/nsProxyObjectManager.cpp index 8520dd6bf64..e74a2e8da06 100644 --- a/mozilla/xpcom/proxy/src/nsProxyObjectManager.cpp +++ b/mozilla/xpcom/proxy/src/nsProxyObjectManager.cpp @@ -182,7 +182,8 @@ nsProxyObjectManager::GetProxyForObject(nsIEventQueue *destQueue, // check to see if the destination Q is a special case. - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/xpcom/proxy/tests/proxytests.cpp b/mozilla/xpcom/proxy/tests/proxytests.cpp index c0df560aaef..9e424307718 100644 --- a/mozilla/xpcom/proxy/tests/proxytests.cpp +++ b/mozilla/xpcom/proxy/tests/proxytests.cpp @@ -294,7 +294,8 @@ void TestCase_NestedLoop(void *arg) printf("Getting EventQueue...\n"); nsIEventQueue* eventQ; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv)) { rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, &eventQ); @@ -413,7 +414,8 @@ static void PR_CALLBACK EventLoop( void *arg ) printf("Creating EventQueue...\n"); nsIEventQueue* eventQ; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv)) { rv = eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, &eventQ); if (NS_FAILED(rv)) diff --git a/mozilla/xpcom/tests/PropertiesTest.cpp b/mozilla/xpcom/tests/PropertiesTest.cpp index 532c7cb3448..4d94132dfeb 100644 --- a/mozilla/xpcom/tests/PropertiesTest.cpp +++ b/mozilla/xpcom/tests/PropertiesTest.cpp @@ -106,10 +106,11 @@ main(int argc, char* argv[]) nsIInputStream* in = nsnull; - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &ret); + nsCOMPtr service(do_GetService(kIOServiceCID, &ret)); if (NS_FAILED(ret)) return ret; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &ret); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &ret); if (NS_FAILED(ret)) return ret; nsIChannel *channel = nsnull; diff --git a/mozilla/xpcom/tests/windows/TestHelloXPLoop.cpp b/mozilla/xpcom/tests/windows/TestHelloXPLoop.cpp index e4daee8a86d..e99859d1059 100644 --- a/mozilla/xpcom/tests/windows/TestHelloXPLoop.cpp +++ b/mozilla/xpcom/tests/windows/TestHelloXPLoop.cpp @@ -59,7 +59,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prevInstance, LPSTR lpszCmdLine, nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup, nsnull); - NS_WITH_SERVICE(nsINativeApp, nativeAppService, kNativeAppCID, &rv); + nsCOMPtr nativeAppService(do_GetService(kNativeAppCID, &rv)); if(NS_FAILED(rv)) { @@ -131,7 +131,8 @@ LRESULT CALLBACK WndProc(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam) case WM_DESTROY: { nsresult rv; - NS_WITH_SERVICE(nsINativeApp, nativeAppService, kNativeAppCID, &rv); + nsCOMPtr nativeAppService = + do_GetService(kNativeAppCID, &rv); if(NS_FAILED(rv)) { ErrorBox("Could not get NativeAppService"); diff --git a/mozilla/xpfe/appshell/src/nsAbout.cpp b/mozilla/xpfe/appshell/src/nsAbout.cpp index bc9bc11699d..557af5b27da 100644 --- a/mozilla/xpfe/appshell/src/nsAbout.cpp +++ b/mozilla/xpfe/appshell/src/nsAbout.cpp @@ -38,15 +38,15 @@ NS_IMETHODIMP nsAbout::NewChannel(nsIURI *aURI, nsIChannel **result) { nsresult rv; - NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv); + nsCOMPtr ioService(do_GetService(kIOServiceCID, &rv)); if ( NS_FAILED(rv) ) return rv; nsCOMPtr tempChannel; rv = ioService->NewChannel(kURI, nsnull, getter_AddRefs(tempChannel)); - NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); + nsCOMPtr securityManager = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/xpfe/appshell/src/nsAppShellService.cpp b/mozilla/xpfe/appshell/src/nsAppShellService.cpp index 0d9865e1dbb..cb01f9e5c4c 100644 --- a/mozilla/xpfe/appshell/src/nsAppShellService.cpp +++ b/mozilla/xpfe/appshell/src/nsAppShellService.cpp @@ -282,7 +282,8 @@ nsAppShellService::EnumerateComponents( EnumeratorMemberFunction function ) { nsRegistryKey key; nsCOMPtr components; const char *failed = "GetService"; - NS_WITH_SERVICE(nsIRegistry, registry, NS_REGISTRY_CONTRACTID, &rv); + nsCOMPtr registry = + do_GetService(NS_REGISTRY_CONTRACTID, &rv); if ( NS_SUCCEEDED(rv) && ( failed = "Open" ) diff --git a/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp b/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp index 2e6f70694fb..8b893dd4aab 100644 --- a/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp +++ b/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp @@ -323,7 +323,8 @@ OSErr nsMacCommandLine::Quit(TAskSave askSave) //---------------------------------------------------------------------------------------- { nsresult rv; - NS_WITH_SERVICE(nsIAppShellService, appShellService, kAppShellServiceCID, &rv); + nsCOMPtr appShellService = + do_GetService(kAppShellServiceCID, &rv); if (NS_FAILED(rv)) return errAEEventNotHandled; diff --git a/mozilla/xpfe/appshell/src/nsWindowMediator.cpp b/mozilla/xpfe/appshell/src/nsWindowMediator.cpp index 2a0223c0fb2..203c327ed95 100644 --- a/mozilla/xpfe/appshell/src/nsWindowMediator.cpp +++ b/mozilla/xpfe/appshell/src/nsWindowMediator.cpp @@ -983,7 +983,8 @@ nsWindowMediator::Init() (void**) &mInner))) return rv; - NS_WITH_SERVICE(nsIRDFContainerUtils, rdfc, kRDFContainerUtilsCID, &rv); + nsCOMPtr rdfc = + do_GetService(kRDFContainerUtilsCID, &rv); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/xpfe/bootstrap/nsAppRunner.cpp b/mozilla/xpfe/bootstrap/nsAppRunner.cpp index 95620e685e0..cd014f4050c 100644 --- a/mozilla/xpfe/bootstrap/nsAppRunner.cpp +++ b/mozilla/xpfe/bootstrap/nsAppRunner.cpp @@ -1004,7 +1004,8 @@ static nsresult VerifyInstallation(int argc, char **argv) nsresult rv; nsCOMPtr registryFile; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return NS_OK; rv = directoryService->Get(NS_OS_CURRENT_PROCESS_DIR, diff --git a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp index 1c7aeb31e7a..db131c70ff8 100644 --- a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp +++ b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp @@ -219,7 +219,8 @@ public: mBuffer[avail] = '\0'; mCursor = mBuffer; - NS_WITH_SERVICE(nsIObserverService, obsServ, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr obsServ = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; rv = obsServ->AddObserver(this, NS_LITERAL_STRING("EndDocumentLoad").get()); NS_ASSERTION(NS_SUCCEEDED(rv), "unable to add self to observer service"); @@ -246,9 +247,11 @@ public: nsresult rv; // make sure our timer is stopped first StopTimer(); - NS_WITH_SERVICE(nsIAppShellService, appShellServ, kAppShellServiceCID, &rv); + nsCOMPtr appShellServ = + do_GetService(kAppShellServiceCID, &rv); if(NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIProxyObjectManager, pIProxyObjectManager, kProxyObjectManagerCID, &rv); + nsCOMPtr pIProxyObjectManager = + do_GetService(kProxyObjectManagerCID, &rv); if(NS_FAILED(rv)) return rv; nsCOMPtr appShellProxy; rv = pIProxyObjectManager->GetProxyForObject(NS_UI_THREAD_EVENTQ, NS_GET_IID(nsIAppShellService), @@ -635,7 +638,8 @@ nsBrowserInstance::StartPageCycler(PRBool* aIsPageCycling) *aIsPageCycling = PR_FALSE; if (!sCmdLineURLUsed) { - NS_WITH_SERVICE(nsICmdLineService, cmdLineArgs, kCmdLineServiceCID, &rv); + nsCOMPtr cmdLineArgs = + do_GetService(kCmdLineServiceCID, &rv); if (NS_FAILED(rv)) { if (APP_DEBUG) fprintf(stderr, "Could not obtain CmdLine processing service\n"); return NS_ERROR_FAILURE; diff --git a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp index 336ab5439e7..45bab0b76e7 100644 --- a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp +++ b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp @@ -480,14 +480,16 @@ BookmarkParser::Init(nsFileSpec *fileSpec, nsIRDFDataSource *aDataSource, nsresult rv; // determine default platform charset... - NS_WITH_SERVICE(nsIPlatformCharset, platformCharset, kPlatformCharsetCID, &rv); + nsCOMPtr platformCharset = + do_GetService(kPlatformCharsetCID, &rv); if (NS_SUCCEEDED(rv) && (platformCharset)) { nsAutoString defaultCharset; if (NS_SUCCEEDED(rv = platformCharset->GetCharset(kPlatformCharsetSel_4xBookmarkFile, defaultCharset))) { // found the default platform charset, now try and get a decoder from it to Unicode - NS_WITH_SERVICE(nsICharsetConverterManager, charsetConv, kCharsetConverterManagerCID, &rv); + nsCOMPtr charsetConv = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv) && (charsetConv)) { rv = charsetConv->GetUnicodeDecoder(&defaultCharset, getter_AddRefs(mUnicodeDecoder)); @@ -1655,7 +1657,7 @@ nsBookmarksService::Init() // determine what the name of the Personal Toolbar Folder is... // first from user preference, then string bundle, then hard-coded default - NS_WITH_SERVICE(nsIPref, prefServ, kPrefCID, &rv); + nsCOMPtr prefServ(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv) && (prefServ)) { char *prefVal = nsnull; @@ -1684,7 +1686,8 @@ nsBookmarksService::Init() } // Register as an observer of profile changes - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); NS_ASSERTION(observerService, "Could not get observer service."); if (observerService) { observerService->AddObserver(this, NS_LITERAL_STRING("profile-before-change").get()); @@ -2385,7 +2388,8 @@ nsBookmarksService::OnStopRequest(nsIRequest* request, nsISupports *ctxt, if ((openURLFlag == PR_TRUE) || (schedule.Find(NS_ConvertASCIItoUCS2("open"), PR_TRUE, 0) >= 0)) { - NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID, &rv); + nsCOMPtr appShell = + do_GetService(kAppShellServiceCID, &rv); if (NS_SUCCEEDED(rv)) { nsCOMPtr wwatch(do_GetService("@mozilla.org/embedcomp/window-watcher;1")); @@ -3942,7 +3946,7 @@ nsBookmarksService::GetBookmarksFile(nsFileSpec* aResult) // First we see if the user has set a pref for the location of the // bookmarks file. - NS_WITH_SERVICE(nsIPref, prefServ, kPrefCID, &rv); + nsCOMPtr prefServ(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv)) { nsXPIDLCString prefVal; rv = prefServ->CopyCharPref("browser.bookmarks.file", diff --git a/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp b/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp index 892663292c2..1d3475bf3f2 100644 --- a/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp +++ b/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp @@ -494,7 +494,7 @@ nsHTTPIndexParser::OnStartRequest(nsIRequest *request, nsISupports* aContext) // Using XPConnect, wrap the HTTP index object... static NS_DEFINE_CID(kXPConnectCID, NS_XPCONNECT_CID); - NS_WITH_SERVICE(nsIXPConnect, xpc, kXPConnectCID, &rv); + nsCOMPtr xpc(do_GetService(kXPConnectCID, &rv)); if (NS_FAILED(rv)) return rv; nsCOMPtr wrapper; diff --git a/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp b/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp index ae4060af78e..ead38455c0d 100644 --- a/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp +++ b/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp @@ -1095,7 +1095,7 @@ nsGlobalHistory::SaveLastPageVisited(const char *aURL) if (!aURL) return NS_ERROR_FAILURE; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return rv; rv = prefs->SetCharPref(PREF_BROWSER_HISTORY_LAST_PAGE_VISITED, aURL); @@ -1110,7 +1110,7 @@ nsGlobalHistory::GetLastPageVisited(char **_retval) if (!_retval) return NS_ERROR_NULL_POINTER; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return rv; nsXPIDLCString lastPageVisited; @@ -2054,7 +2054,7 @@ nsGlobalHistory::Init() // we'd like to get this pref when we need it, but at that point, // we can't get the pref service. This means if the user changes // this pref, we won't notice until the next time we run. - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_SUCCEEDED(rv)) rv = prefs->GetIntPref(PREF_BROWSER_HISTORY_EXPIRE_DAYS, &mExpireDays); @@ -2094,7 +2094,8 @@ nsGlobalHistory::Init() } // register to observe profile changes - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); NS_ASSERTION(observerService, "failed to get observer service"); if (observerService) { observerService->AddObserver(this, NS_LITERAL_STRING("profile-before-change").get()); @@ -3597,7 +3598,7 @@ nsGlobalHistory::OnStartLookup(const PRUnichar *searchString, nsresult rv = NS_OK; - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); if (NS_FAILED(rv)) return rv; PRBool enabled = PR_FALSE; diff --git a/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp b/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp index 8be4676a576..01430badab0 100644 --- a/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp +++ b/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp @@ -622,7 +622,7 @@ RelatedLinksHandlerImpl::Init() gRDFService->GetResource(NC_NAMESPACE_URI "RelatedLinksTopic", &kNC_RelatedLinksTopic); gRDFService->GetResource(NC_NAMESPACE_URI "child", &kNC_Child); - NS_WITH_SERVICE(nsIPref, prefServ, kPrefCID, &rv); + nsCOMPtr prefServ(do_GetService(kPrefCID, &rv)); mRLServerURL = new nsString(); if (NS_SUCCEEDED(rv) && (prefServ)) { diff --git a/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp b/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp index 450c60ef842..54eacd5a21a 100755 --- a/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp +++ b/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp @@ -884,7 +884,8 @@ InternetSearchDataSource::Init() DeferredInit(); // Register as a profile change obsevrer - NS_WITH_SERVICE(nsIObserverService, observerService, NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (observerService) { observerService->AddObserver(this, NS_LITERAL_STRING("profile-before-change").get()); observerService->AddObserver(this, NS_LITERAL_STRING("profile-do-change").get()); @@ -2426,8 +2427,8 @@ InternetSearchDataSource::GetInternetSearchURL(const char *searchEngineURI, char *utf8data = text.ToNewUTF8String(); if (utf8data) { - NS_WITH_SERVICE(nsITextToSubURI, textToSubURI, - kTextToSubURICID, &rv); + nsCOMPtr textToSubURI = + do_GetService(kTextToSubURICID, &rv); if (NS_SUCCEEDED(rv) && (textToSubURI)) { PRUnichar *uni = nsnull; @@ -3509,8 +3510,8 @@ InternetSearchDataSource::DoSearch(nsIRDFResource *source, nsIRDFResource *engin // "interpret/resultTranslationFont" since we always convert results to Unicode if (resultEncodingStr.Length() > 0) { - NS_WITH_SERVICE(nsICharsetConverterManager, charsetConv, - kCharsetConverterManagerCID, &rv); + nsCOMPtr charsetConv = + do_GetService(kCharsetConverterManagerCID, &rv); if (NS_SUCCEEDED(rv) && (charsetConv)) { rv = charsetConv->GetUnicodeDecoder(&resultEncodingStr, @@ -3535,8 +3536,8 @@ InternetSearchDataSource::DoSearch(nsIRDFResource *source, nsIRDFResource *engin char *utf8data = textTemp.ToNewUTF8String(); if (utf8data) { - NS_WITH_SERVICE(nsITextToSubURI, textToSubURI, - kTextToSubURICID, &rv); + nsCOMPtr textToSubURI = + do_GetService(kTextToSubURICID, &rv); if (NS_SUCCEEDED(rv) && (textToSubURI)) { PRUnichar *uni = nsnull; diff --git a/mozilla/xpfe/components/search/src/nsLocalSearchService.cpp b/mozilla/xpfe/components/search/src/nsLocalSearchService.cpp index e65e7249505..502ef3c6061 100755 --- a/mozilla/xpfe/components/search/src/nsLocalSearchService.cpp +++ b/mozilla/xpfe/components/search/src/nsLocalSearchService.cpp @@ -301,8 +301,8 @@ LocalSearchDataSource::parseResourceIntoFindTokens(nsIRDFResource *u, findTokenP { if (!strcmp(token, "text")) { - NS_WITH_SERVICE(nsITextToSubURI, textToSubURI, - kTextToSubURICID, &rv); + nsCOMPtr textToSubURI = + do_GetService(kTextToSubURICID, &rv); if (NS_SUCCEEDED(rv) && (textToSubURI)) { PRUnichar *uni = nsnull; diff --git a/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp b/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp index 2e6f70694fb..8b893dd4aab 100644 --- a/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp +++ b/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp @@ -323,7 +323,8 @@ OSErr nsMacCommandLine::Quit(TAskSave askSave) //---------------------------------------------------------------------------------------- { nsresult rv; - NS_WITH_SERVICE(nsIAppShellService, appShellService, kAppShellServiceCID, &rv); + nsCOMPtr appShellService = + do_GetService(kAppShellServiceCID, &rv); if (NS_FAILED(rv)) return errAEEventNotHandled; diff --git a/mozilla/xpfe/components/timebomb/nsTimeBomb.cpp b/mozilla/xpfe/components/timebomb/nsTimeBomb.cpp index 407f4121162..78e63f9e2b3 100644 --- a/mozilla/xpfe/components/timebomb/nsTimeBomb.cpp +++ b/mozilla/xpfe/components/timebomb/nsTimeBomb.cpp @@ -49,7 +49,8 @@ static nsresult DisplayURI(const char *urlStr, PRBool block) rv = NS_NewURI(getter_AddRefs(URL), (const char *)urlStr); if (NS_FAILED(rv)) return rv; - NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID, &rv); + nsCOMPtr appShell = + do_GetService(kAppShellServiceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr window; diff --git a/mozilla/xpfe/components/xfer/src/nsStreamTransfer.cpp b/mozilla/xpfe/components/xfer/src/nsStreamTransfer.cpp index 51364d67344..395eb5ea950 100644 --- a/mozilla/xpfe/components/xfer/src/nsStreamTransfer.cpp +++ b/mozilla/xpfe/components/xfer/src/nsStreamTransfer.cpp @@ -229,7 +229,8 @@ nsStreamTransfer::SelectFile( nsIDOMWindowInternal *parent, nsILocalFile **aResu nsCOMPtr startDir; // Pull in the user's preferences and get the default download directory. - NS_WITH_SERVICE( nsIPref, prefs, NS_PREF_CONTRACTID, &rv ); + nsCOMPtr prefs = + do_GetService( NS_PREF_CONTRACTID, &rv ); if ( NS_SUCCEEDED( rv ) && prefs ) { prefs->GetFileXPref( "browser.download.dir", getter_AddRefs( startDir ) ); if ( startDir ) { @@ -244,7 +245,8 @@ nsStreamTransfer::SelectFile( nsIDOMWindowInternal *parent, nsILocalFile **aResu nsAutoString title( NS_ConvertASCIItoUCS2( "Save File" ) ); nsCID cid = NS_STRINGBUNDLESERVICE_CID; - NS_WITH_SERVICE( nsIStringBundleService, bundleService, cid, &rv ); + nsCOMPtr bundleService = + do_GetService( cid, &rv ); if ( NS_SUCCEEDED( rv ) ) { nsCOMPtr bundle; PRUnichar *pString; diff --git a/mozilla/xpfe/components/xfer/src/nsStreamXferOp.cpp b/mozilla/xpfe/components/xfer/src/nsStreamXferOp.cpp index 4b14500a616..9173530c181 100644 --- a/mozilla/xpfe/components/xfer/src/nsStreamXferOp.cpp +++ b/mozilla/xpfe/components/xfer/src/nsStreamXferOp.cpp @@ -148,7 +148,8 @@ nsStreamXferOp::Start( void ) { if ( !mOutputTransport ) { // First, get file transport service. NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID); - NS_WITH_SERVICE( nsIFileTransportService, fts, kFileTransportServiceCID, &rv ); + nsCOMPtr fts = + do_GetService( kFileTransportServiceCID, &rv ); if ( NS_SUCCEEDED( rv ) ) { // Next, create output file channel. diff --git a/mozilla/xpinstall/src/ScheduledTasks.cpp b/mozilla/xpinstall/src/ScheduledTasks.cpp index f4df4f747f4..cc60a04db94 100644 --- a/mozilla/xpinstall/src/ScheduledTasks.cpp +++ b/mozilla/xpinstall/src/ScheduledTasks.cpp @@ -142,7 +142,8 @@ char* GetRegFilePath() nsresult rv; nsCOMPtr iFileUtilityPath; //Get the program directory - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return nsnull; diff --git a/mozilla/xpinstall/src/nsInstall.cpp b/mozilla/xpinstall/src/nsInstall.cpp index 61b9df55076..8038f642b44 100644 --- a/mozilla/xpinstall/src/nsInstall.cpp +++ b/mozilla/xpinstall/src/nsInstall.cpp @@ -1365,7 +1365,8 @@ nsPIXPIProxy* nsInstall::GetUIThreadProxy() if (!mUIThreadProxy) { nsresult rv; - NS_WITH_SERVICE( nsIProxyObjectManager, pmgr, kProxyObjectManagerCID, &rv); + nsCOMPtr pmgr = + do_GetService(kProxyObjectManagerCID, &rv); if (NS_SUCCEEDED(rv)) { nsCOMPtr tmp(do_QueryInterface(new nsXPIProxy())); @@ -2552,7 +2553,8 @@ nsInstall::ExtractFileFromJar(const nsString& aJarfile, nsIFile* aSuggestedName, if (aSuggestedName == nsnull) { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); directoryService->Get(NS_OS_TEMP_DIR, NS_GET_IID(nsIFile), getter_AddRefs(tempFile)); diff --git a/mozilla/xpinstall/src/nsInstallFolder.cpp b/mozilla/xpinstall/src/nsInstallFolder.cpp index 5d390cace2a..441ce6f4bcd 100644 --- a/mozilla/xpinstall/src/nsInstallFolder.cpp +++ b/mozilla/xpinstall/src/nsInstallFolder.cpp @@ -171,7 +171,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 100: /////////////////////////////////////////////////////////// Plugins if (!nsSoftwareUpdate::GetProgramDirectory()) { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_OS_CURRENT_PROCESS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(mFileSpec)); @@ -202,7 +203,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 101: /////////////////////////////////////////////////////////// Program if (!nsSoftwareUpdate::GetProgramDirectory()) //Not in stub installer { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_OS_CURRENT_PROCESS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(mFileSpec)); } @@ -215,7 +217,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 104: /////////////////////////////////////////////////////////// Temporary { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_OS_TEMP_DIR, NS_GET_IID(nsIFile), getter_AddRefs(mFileSpec)); } @@ -224,7 +227,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 106: /////////////////////////////////////////////////////////// Current User { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_APP_USER_PROFILE_50_DIR, NS_GET_IID(nsIFile), getter_AddRefs(mFileSpec)); } @@ -232,7 +236,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 107: /////////////////////////////////////////////////////////// Preferences { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_APP_PREFS_50_DIR, NS_GET_IID(nsIFile), getter_AddRefs(mFileSpec)); } @@ -240,7 +245,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 108: /////////////////////////////////////////////////////////// OS Drive { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_OS_DRIVE_DIR, NS_GET_IID(nsIFile), getter_AddRefs(mFileSpec)); } @@ -276,7 +282,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 110: /////////////////////////////////////////////////////////// Components if (!nsSoftwareUpdate::GetProgramDirectory()) { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_OS_CURRENT_PROCESS_DIR, NS_GET_IID(nsIFile), @@ -311,7 +318,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 111: /////////////////////////////////////////////////////////// Chrome if (!nsSoftwareUpdate::GetProgramDirectory()) { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_OS_CURRENT_PROCESS_DIR, NS_GET_IID(nsIFile), @@ -345,7 +353,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe #if defined(XP_PC) && !defined(XP_OS2) case 200: /////////////////////////////////////////////////////////// Win System { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_OS_SYSTEM_DIR, NS_GET_IID(nsIFile), @@ -356,7 +365,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 201: /////////////////////////////////////////////////////////// Windows { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_WIN_WINDOWS_DIR, NS_GET_IID(nsIFile), @@ -368,7 +378,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe #ifdef XP_MAC case 300: /////////////////////////////////////////////////////////// Mac System { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_OS_SYSTEM_DIR, NS_GET_IID(nsIFile), @@ -378,7 +389,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 301: /////////////////////////////////////////////////////////// Mac Desktop { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_MAC_DESKTOP_DIR, NS_GET_IID(nsIFile), @@ -388,7 +400,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 302: /////////////////////////////////////////////////////////// Mac Trash { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_MAC_TRASH_DIR, NS_GET_IID(nsIFile), @@ -398,7 +411,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 303: /////////////////////////////////////////////////////////// Mac Startup { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_MAC_STARTUP_DIR, NS_GET_IID(nsIFile), @@ -408,7 +422,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 304: /////////////////////////////////////////////////////////// Mac Shutdown { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_MAC_SHUTDOWN_DIR, NS_GET_IID(nsIFile), @@ -418,7 +433,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 305: /////////////////////////////////////////////////////////// Mac Apple Menu { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_MAC_APPLE_MENU_DIR, NS_GET_IID(nsIFile), @@ -428,7 +444,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 306: /////////////////////////////////////////////////////////// Mac Control Panel { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_MAC_CONTROL_PANELS_DIR, NS_GET_IID(nsIFile), @@ -438,7 +455,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 307: /////////////////////////////////////////////////////////// Mac Extension { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_MAC_EXTENSIONS_DIR, NS_GET_IID(nsIFile), @@ -448,7 +466,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 308: /////////////////////////////////////////////////////////// Mac Fonts { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_MAC_FONTS_DIR, NS_GET_IID(nsIFile), @@ -458,7 +477,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 309: /////////////////////////////////////////////////////////// Mac Preferences { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_MAC_PREFS_DIR, NS_GET_IID(nsIFile), @@ -468,7 +488,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 310: /////////////////////////////////////////////////////////// Mac Documents { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_MAC_DOCUMENTS_DIR, NS_GET_IID(nsIFile), @@ -480,7 +501,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe #ifdef XP_UNIX case 400: /////////////////////////////////////////////////////////// Unix Local { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_UNIX_LOCAL_DIR, NS_GET_IID(nsIFile), @@ -490,7 +512,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe case 401: /////////////////////////////////////////////////////////// Unix Lib { - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!directoryService) return; directoryService->Get(NS_UNIX_LIB_DIR, NS_GET_IID(nsIFile), diff --git a/mozilla/xpinstall/src/nsInstallTrigger.cpp b/mozilla/xpinstall/src/nsInstallTrigger.cpp index 68fc2cb719c..0281640d161 100644 --- a/mozilla/xpinstall/src/nsInstallTrigger.cpp +++ b/mozilla/xpinstall/src/nsInstallTrigger.cpp @@ -321,7 +321,8 @@ nsInstallTrigger::InitRegistry(void) nsresult rv; NR_StartupRegistry(); /* startup the registry; if already started, this will essentially be a noop */ - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if(!directoryService) return NS_ERROR_FAILURE; diff --git a/mozilla/xpinstall/src/nsLoggingProgressNotifier.cpp b/mozilla/xpinstall/src/nsLoggingProgressNotifier.cpp index 2bce3edbc9e..06d55e86620 100644 --- a/mozilla/xpinstall/src/nsLoggingProgressNotifier.cpp +++ b/mozilla/xpinstall/src/nsLoggingProgressNotifier.cpp @@ -72,8 +72,8 @@ nsLoggingProgressListener::BeforeJavascriptEvaluation(const PRUnichar *URL) // Not in stub installer if (!nsSoftwareUpdate::GetProgramDirectory()) { - NS_WITH_SERVICE(nsIProperties, dirSvc, - NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr dirSvc = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!dirSvc) return NS_ERROR_FAILURE; dirSvc->Get(NS_OS_CURRENT_PROCESS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(iFile)); @@ -123,8 +123,8 @@ nsLoggingProgressListener::BeforeJavascriptEvaluation(const PRUnichar *URL) { // failed to create the log file in the application directory // so try to create the log file in the user's profile directory - NS_WITH_SERVICE(nsIProperties, dirSvc, - NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr dirSvc = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (!dirSvc) return NS_ERROR_FAILURE; dirSvc->Get(NS_APP_USER_PROFILE_50_DIR, NS_GET_IID(nsIFile), getter_AddRefs(iFile)); diff --git a/mozilla/xpinstall/src/nsSoftwareUpdate.cpp b/mozilla/xpinstall/src/nsSoftwareUpdate.cpp index 7a4b5a05894..05005313e6f 100644 --- a/mozilla/xpinstall/src/nsSoftwareUpdate.cpp +++ b/mozilla/xpinstall/src/nsSoftwareUpdate.cpp @@ -125,7 +125,8 @@ nsSoftwareUpdate::nsSoftwareUpdate() nsresult rv; - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if(!directoryService) return; @@ -144,8 +145,8 @@ nsSoftwareUpdate::nsSoftwareUpdate() /***************************************/ /* Add this as a shutdown observer */ /***************************************/ - NS_WITH_SERVICE(nsIObserverService, observerService, - NS_OBSERVERSERVICE_CONTRACTID, &rv); + nsCOMPtr observerService = + do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) observerService->AddObserver(this, NS_LITERAL_STRING(NS_XPCOM_SHUTDOWN_OBSERVER_ID).get()); @@ -196,7 +197,8 @@ nsSoftwareUpdate::Shutdown() nsresult rv; nsCOMPtr pathToCleanupUtility; //Get the program directory - NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); directoryService->Get(NS_OS_CURRENT_PROCESS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(pathToCleanupUtility)); diff --git a/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp b/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp index dfe1a1fde71..31ed845ad17 100644 --- a/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp +++ b/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp @@ -125,7 +125,8 @@ XPInstallErrorReporter(JSContext *cx, const char *message, JSErrorReport *report nsIXPIListener *listener; // lets set up an eventQ so that our xpcom/proxies will not have to: - NS_WITH_SERVICE(nsISoftwareUpdate, softwareUpdate, kSoftwareUpdateCID, &rv ); + nsCOMPtr softwareUpdate = + do_GetService(kSoftwareUpdateCID, &rv); if (!NS_SUCCEEDED(rv)) @@ -372,14 +373,16 @@ extern "C" void RunInstallOnThread(void *data) // lets set up an eventQ so that our xpcom/proxies will not have to: nsCOMPtr eventQ; - NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv); + nsCOMPtr eventQService = + do_GetService(kEventQueueServiceCID, &rv); if (NS_SUCCEEDED(rv)) { eventQService->CreateMonitoredThreadEventQueue(); eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(eventQ)); } - NS_WITH_SERVICE(nsISoftwareUpdate, softwareUpdate, kSoftwareUpdateCID, &rv ); + nsCOMPtr softwareUpdate = + do_GetService(kSoftwareUpdateCID, &rv); if (!NS_SUCCEEDED(rv)) { @@ -405,7 +408,8 @@ extern "C" void RunInstallOnThread(void *data) { PRBool ownRuntime = PR_FALSE; - NS_WITH_SERVICE(nsIJSRuntimeService, rtsvc, "@mozilla.org/js/xpc/RuntimeService;1", &rv); + nsCOMPtr rtsvc = + do_GetService("@mozilla.org/js/xpc/RuntimeService;1", &rv); if(NS_FAILED(rv) || NS_FAILED(rtsvc->GetRuntime(&rt))) { // service not available (wizard context?) diff --git a/mozilla/xpinstall/src/nsXPITriggerInfo.cpp b/mozilla/xpinstall/src/nsXPITriggerInfo.cpp index 3f8cd6f0c44..0301b269f30 100644 --- a/mozilla/xpinstall/src/nsXPITriggerInfo.cpp +++ b/mozilla/xpinstall/src/nsXPITriggerInfo.cpp @@ -168,7 +168,8 @@ void nsXPITriggerInfo::SendStatus(const PRUnichar* URL, PRInt32 status) if ( mCx && mGlobalWrapper && mCbval ) { - NS_WITH_SERVICE(nsIEventQueueService, EQService, kEventQueueServiceCID, &rv); + nsCOMPtr EQService = + do_GetService(kEventQueueServiceCID, &rv); if ( NS_SUCCEEDED( rv ) ) { rv = EQService->GetThreadEventQueue(mThread, getter_AddRefs(eq)); diff --git a/mozilla/xpinstall/src/nsXPInstallManager.cpp b/mozilla/xpinstall/src/nsXPInstallManager.cpp index 064dcc58b2d..96f93747d1e 100644 --- a/mozilla/xpinstall/src/nsXPInstallManager.cpp +++ b/mozilla/xpinstall/src/nsXPInstallManager.cpp @@ -211,7 +211,8 @@ nsXPInstallManager::InitManager(nsIScriptGlobalObject* aGlobalObject, nsXPITrigg getter_AddRefs(Idlg) ); if (NS_SUCCEEDED(rv)) { - NS_WITH_SERVICE( nsIProxyObjectManager, pmgr, kProxyObjectManagerCID, &rv); + nsCOMPtr pmgr = + do_GetService(kProxyObjectManagerCID, &rv); if (NS_SUCCEEDED(rv)) { rv = pmgr->GetProxyForObject( NS_UI_THREAD_EVENTQ, NS_GET_IID(nsIXPIProgressDlg), @@ -298,8 +299,8 @@ PRBool nsXPInstallManager::ConfirmChromeInstall(nsIScriptGlobalObject* aGlobalOb nsXPIDLString confirmFormat; PRUnichar* confirmText = nsnull; nsCOMPtr xpiBundle; - NS_WITH_SERVICE( nsIStringBundleService, bundleSvc, - kStringBundleServiceCID, &rv ); + nsCOMPtr bundleSvc = + do_GetService( kStringBundleServiceCID, &rv ); if (NS_SUCCEEDED(rv) && bundleSvc) { rv = bundleSvc->CreateBundle( XPINSTALL_BUNDLE_URL, @@ -462,7 +463,8 @@ NS_IMETHODIMP nsXPInstallManager::DownloadNext() if (mDlg) mDlg->StartInstallPhase(); - NS_WITH_SERVICE(nsISoftwareUpdate, softupdate, nsSoftwareUpdate::GetCID(), &rv); + nsCOMPtr softupdate = + do_GetService(nsSoftwareUpdate::GetCID(), &rv); if (NS_SUCCEEDED(rv)) { for (PRUint32 i = 0; i < mTriggers->Size(); ++i) @@ -623,8 +625,8 @@ nsXPInstallManager::GetDestinationFile(nsString& url, nsILocalFile* *file) PRInt32 pos = url.RFindChar('/'); url.Mid( leaf, pos+1, url.Length() ); - NS_WITH_SERVICE(nsIProperties, directoryService, - NS_DIRECTORY_SERVICE_CONTRACTID, &rv); + nsCOMPtr directoryService = + do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); if (mChromeType == 0 ) { @@ -691,7 +693,8 @@ nsXPInstallManager::OnStartRequest(nsIRequest* request, nsISupports *ctxt) NS_ASSERTION( !mItem->mOutStream, "Received double OnStartRequest from Necko"); NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID); - NS_WITH_SERVICE( nsIFileTransportService, fts, kFileTransportServiceCID, &rv ); + nsCOMPtr fts = + do_GetService( kFileTransportServiceCID, &rv ); if (NS_SUCCEEDED(rv) && !mItem->mOutStream) {