From 68faeb5241ea4a4be9cd03600e7556653572fc30 Mon Sep 17 00:00:00 2001 From: "dougt%netscape.com" Date: Sat, 7 Sep 2002 17:13:19 +0000 Subject: [PATCH] 166917. Clean up xpcom SDK includes. r=rpotts@netscape.com, sr=alecf@netscape.com, a=rjesup@wgate.com --- accessible/src/base/nsAccessibilityService.cpp | 2 +- accessible/src/base/nsAccessible.cpp | 2 +- caps/src/nsScriptSecurityManager.cpp | 2 +- caps/src/nsSecurityManagerFactory.cpp | 2 +- chrome/src/nsChromeProtocolHandler.cpp | 4 ++-- chrome/src/nsChromeRegistry.cpp | 4 ++-- chrome/src/nsChromeUIDataSource.cpp | 2 +- content/base/src/nsContentAreaDragDrop.cpp | 2 +- content/base/src/nsContentIterator.cpp | 2 +- content/base/src/nsContentList.cpp | 4 ++-- content/base/src/nsContentPolicy.cpp | 2 +- content/base/src/nsDOMAttribute.cpp | 2 +- content/base/src/nsDOMAttributeMap.cpp | 2 +- content/base/src/nsDOMBuilder.cpp | 2 +- content/base/src/nsDOMDocumentType.cpp | 2 +- content/base/src/nsDocument.cpp | 6 +++--- content/base/src/nsDocumentEncoder.cpp | 2 +- content/base/src/nsDocumentViewer.cpp | 4 ++-- content/base/src/nsGeneratedIterator.cpp | 2 +- content/base/src/nsGenericDOMNodeList.cpp | 2 +- content/base/src/nsGenericElement.cpp | 2 +- content/base/src/nsNameSpaceManager.cpp | 6 +++--- content/base/src/nsNodeInfo.cpp | 2 +- content/base/src/nsNodeInfoManager.cpp | 2 +- content/base/src/nsPrintPreviewListener.cpp | 2 +- content/base/src/nsRange.cpp | 4 ++-- content/base/src/nsSelection.cpp | 8 ++++---- content/base/src/nsStyleSet.cpp | 2 +- content/base/src/nsTextContentChangeData.cpp | 2 +- content/build/nsContentDLF.cpp | 2 +- content/events/src/nsDOMEvent.cpp | 2 +- content/events/src/nsEventListenerManager.cpp | 2 +- content/events/src/nsPrivateTextRange.cpp | 4 ++-- content/html/content/src/nsAttributeContent.cpp | 2 +- .../html/content/src/nsGenericDOMHTMLCollection.cpp | 2 +- content/html/content/src/nsGenericHTMLElement.cpp | 2 +- content/html/content/src/nsHTMLBodyElement.cpp | 2 +- content/html/content/src/nsHTMLFormElement.cpp | 2 +- content/html/document/src/nsHTMLContentSink.cpp | 6 +++--- .../html/document/src/nsHTMLFragmentContentSink.cpp | 2 +- content/html/style/src/nsCSSLoader.cpp | 8 ++++---- content/html/style/src/nsCSSParser.cpp | 2 +- content/html/style/src/nsCSSRule.cpp | 4 ++-- content/html/style/src/nsCSSRules.cpp | 2 +- content/html/style/src/nsCSSStyleRule.cpp | 2 +- content/html/style/src/nsCSSStyleSheet.cpp | 12 ++++++------ content/html/style/src/nsComputedDOMStyle.cpp | 2 +- content/html/style/src/nsDOMCSSDeclaration.cpp | 2 +- content/html/style/src/nsDOMCSSRGBColor.cpp | 2 +- content/html/style/src/nsDOMCSSRect.cpp | 2 +- content/html/style/src/nsDOMCSSValueList.cpp | 2 +- content/html/style/src/nsHTMLCSSStyleSheet.cpp | 2 +- content/html/style/src/nsHTMLStyleSheet.cpp | 6 +++--- content/html/style/src/nsROCSSPrimitiveValue.cpp | 2 +- content/xbl/src/nsBindingManager.cpp | 2 +- content/xbl/src/nsXBLBinding.cpp | 2 +- content/xbl/src/nsXBLDocumentInfo.cpp | 2 +- content/xbl/src/nsXBLEventHandler.cpp | 2 +- content/xbl/src/nsXBLInsertionPoint.cpp | 2 +- content/xbl/src/nsXBLPrototypeBinding.cpp | 6 +++--- content/xbl/src/nsXBLPrototypeHandler.cpp | 4 ++-- content/xbl/src/nsXBLResourceLoader.cpp | 2 +- content/xbl/src/nsXBLService.cpp | 4 ++-- content/xml/content/src/nsXMLNamedNodeMap.cpp | 2 +- content/xml/document/src/nsLoadSaveContentSink.cpp | 2 +- content/xml/document/src/nsXMLContentSink.cpp | 6 +++--- content/xsl/document/src/nsTransformMediator.cpp | 2 +- content/xul/content/src/nsRDFDOMNodeList.cpp | 2 +- content/xul/content/src/nsXULAttributes.cpp | 4 ++-- content/xul/content/src/nsXULElement.cpp | 2 +- content/xul/content/src/nsXULPopupListener.cpp | 2 +- content/xul/document/src/nsXULCommandDispatcher.cpp | 2 +- content/xul/document/src/nsXULContentSink.cpp | 2 +- content/xul/document/src/nsXULControllers.cpp | 2 +- content/xul/document/src/nsXULDocument.cpp | 12 ++++++------ content/xul/document/src/nsXULPrototypeCache.cpp | 4 ++-- content/xul/document/src/nsXULPrototypeDocument.cpp | 4 ++-- content/xul/templates/src/nsXULSortService.cpp | 2 +- content/xul/templates/src/nsXULTemplateBuilder.cpp | 2 +- db/mork/build/nsMorkFactory.cpp | 2 +- db/mork/src/morkObject.cpp | 4 ++-- db/mork/src/orkinRow.cpp | 2 +- docshell/base/nsDSURIContentListener.cpp | 2 +- docshell/base/nsDocShell.cpp | 6 +++--- docshell/base/nsDocShellEnumerator.cpp | 2 +- docshell/base/nsDocShellLoadInfo.cpp | 2 +- docshell/base/nsWebShell.cpp | 2 +- dom/src/base/nsBarProps.cpp | 2 +- dom/src/base/nsDOMClassInfo.cpp | 2 +- dom/src/base/nsDOMWindowList.cpp | 2 +- dom/src/base/nsFocusController.cpp | 2 +- dom/src/base/nsGlobalWindow.cpp | 6 +++--- dom/src/base/nsHistory.cpp | 2 +- dom/src/base/nsJSEnvironment.cpp | 2 +- dom/src/base/nsLocation.cpp | 2 +- dom/src/base/nsScreen.cpp | 2 +- dom/src/build/nsDOMFactory.cpp | 2 +- dom/src/events/nsJSEventListener.cpp | 2 +- dom/src/jsurl/nsJSProtocolHandler.cpp | 2 +- editor/composer/src/nsComposerCommands.cpp | 2 +- editor/composer/src/nsComposerCommandsUpdater.cpp | 2 +- editor/composer/src/nsComposerController.cpp | 2 +- editor/composer/src/nsEditorParserObserver.cpp | 2 +- editor/composer/src/nsEditorShell.cpp | 2 +- editor/composer/src/nsEditorShellMouseListener.cpp | 2 +- editor/composer/src/nsInterfaceState.cpp | 2 +- editor/libeditor/base/EditAggregateTxn.cpp | 2 +- editor/libeditor/base/EditTxn.cpp | 2 +- editor/libeditor/base/nsEditor.cpp | 2 +- editor/libeditor/base/nsEditorCommands.cpp | 2 +- editor/libeditor/base/nsEditorController.cpp | 2 +- editor/libeditor/base/nsEditorService.cpp | 2 +- editor/libeditor/html/TypeInState.cpp | 2 +- editor/libeditor/html/nsEditProperty.cpp | 2 +- editor/libeditor/html/nsHTMLEditor.cpp | 2 +- editor/libeditor/html/nsHTMLEditorMouseListener.cpp | 2 +- editor/libeditor/html/nsHTMLURIRefObject.cpp | 2 +- editor/libeditor/text/nsAOLCiter.cpp | 2 +- editor/libeditor/text/nsEditorEventListeners.cpp | 12 ++++++------ editor/libeditor/text/nsInternetCiter.cpp | 2 +- editor/libeditor/text/nsPlaintextEditor.cpp | 2 +- editor/libeditor/text/nsTextEditRules.cpp | 2 +- editor/txmgr/src/nsTransactionManager.cpp | 2 +- editor/txmgr/tests/TestTXMgr.cpp | 2 +- .../browser/activex/src/control/HelperAppDlg.cpp | 4 ++-- .../browser/activex/src/control/PromptService.cpp | 2 +- .../activex/src/control/WebBrowserContainer.cpp | 2 +- .../browser/activex/src/control/WindowCreator.cpp | 2 +- embedding/browser/gtk/src/EmbedContentListener.cpp | 2 +- embedding/browser/gtk/src/EmbedEventListener.cpp | 2 +- embedding/browser/gtk/src/EmbedProgress.cpp | 2 +- embedding/browser/gtk/src/EmbedStream.cpp | 2 +- embedding/browser/gtk/src/EmbedWindow.cpp | 2 +- embedding/browser/gtk/src/EmbedWindowCreator.cpp | 2 +- .../browser/photon/src/EmbedContentListener.cpp | 2 +- embedding/browser/photon/src/EmbedEventListener.cpp | 2 +- embedding/browser/photon/src/EmbedPrintListener.cpp | 2 +- embedding/browser/photon/src/EmbedProgress.cpp | 2 +- embedding/browser/photon/src/EmbedStream.cpp | 2 +- embedding/browser/photon/src/EmbedWindow.cpp | 2 +- embedding/browser/photon/src/EmbedWindowCreator.cpp | 2 +- embedding/browser/photon/src/PromptService.cpp | 2 +- .../photon/src/nsUnknownContentTypeHandler.cpp | 2 +- .../browser/powerplant/source/CBrowserChrome.cpp | 2 +- .../browser/powerplant/source/CWebBrowserChrome.cpp | 2 +- .../browser/powerplant/source/PromptService.cpp | 2 +- embedding/browser/webBrowser/nsCommandHandler.cpp | 2 +- embedding/browser/webBrowser/nsDocShellTreeOwner.cpp | 8 ++++---- embedding/browser/webBrowser/nsWebBrowser.cpp | 2 +- .../browser/webBrowser/nsWebBrowserContentPolicy.cpp | 2 +- .../src/nsControllerCommandManager.cpp | 2 +- .../components/jsconsole/src/nsJSConsoleService.cpp | 2 +- .../printingui/src/mac/nsPrintingPromptService.cpp | 2 +- .../printingui/src/mac/nsPrintingPromptServiceX.cpp | 2 +- .../printingui/src/os2/nsPrintingPromptService.cpp | 2 +- .../src/unixshared/nsPrintingPromptService.cpp | 2 +- .../printingui/src/win/nsPrintingPromptService.cpp | 2 +- .../webbrowserpersist/src/nsWebBrowserPersist.cpp | 4 ++-- .../windowwatcher/src/nsDialogParamBlock.cpp | 2 +- .../windowwatcher/src/nsPrintingPrompt.cpp | 2 +- embedding/components/windowwatcher/src/nsPrompt.cpp | 2 +- .../components/windowwatcher/src/nsPromptService.cpp | 2 +- .../components/windowwatcher/src/nsWindowWatcher.cpp | 4 ++-- embedding/qa/mozembed/src/mozEmbed.cpp | 4 ++-- embedding/qa/mozembed/src/nsQABrowserChrome.cpp | 2 +- embedding/qa/mozembed/src/nsQABrowserView.cpp | 2 +- embedding/qa/mozembed/src/nsQAWindowCreator.cpp | 2 +- embedding/qa/testembed/components/PromptService.cpp | 2 +- embedding/tests/mfcembed/components/HelperAppDlg.cpp | 4 ++-- .../mfcembed/components/PrintingPromptService.cpp | 2 +- .../tests/mfcembed/components/PromptService.cpp | 2 +- embedding/tests/winEmbed/WebBrowserChrome.cpp | 2 +- embedding/tests/winEmbed/WindowCreator.cpp | 2 +- embedding/tests/winEmbed/winEmbed.cpp | 2 +- .../access-builtin/accessproxy/nsAccessProxy.cpp | 2 +- extensions/cookie/nsCookie.cpp | 4 ++-- extensions/cookie/nsCookieHTTPNotify.cpp | 2 +- extensions/cookie/nsCookieManager.cpp | 4 ++-- extensions/cookie/nsCookieService.cpp | 2 +- extensions/cookie/nsCookies.cpp | 2 +- extensions/cookie/nsImages.cpp | 1 + extensions/cookie/nsImgManager.cpp | 2 +- extensions/cookie/nsPermission.cpp | 4 ++-- extensions/cookie/nsPermissionManager.cpp | 4 ++-- extensions/cookie/nsPermissions.cpp | 1 + extensions/cookie/nsUtils.cpp | 1 + extensions/datetime/nsDateTimeChannel.cpp | 2 +- extensions/datetime/nsDateTimeHandler.cpp | 2 +- extensions/finger/nsFingerChannel.cpp | 2 +- extensions/finger/nsFingerHandler.cpp | 2 +- extensions/inspector/base/src/inBitmap.cpp | 2 +- extensions/inspector/base/src/inBitmapChannel.cpp | 2 +- extensions/inspector/base/src/inBitmapDepot.cpp | 2 +- .../inspector/base/src/inBitmapProtocolHandler.cpp | 2 +- extensions/inspector/base/src/inBitmapURI.cpp | 2 +- extensions/inspector/base/src/inDOMUtils.cpp | 2 +- extensions/inspector/base/src/inDOMView.cpp | 2 +- extensions/inspector/base/src/inDeepTreeWalker.cpp | 2 +- extensions/inspector/base/src/inFlasher.cpp | 2 +- extensions/inspector/base/src/inPNGEncoder.cpp | 2 +- .../inspector/base/src/win/inScreenCapturer.cpp | 2 +- extensions/pics/src/nsPICS.cpp | 2 +- extensions/pics/src/nsPICSElementObserver.cpp | 4 ++-- extensions/pref/autoconfig/src/nsAutoConfig.cpp | 2 +- .../pref/autoconfig/src/nsJSConfigTriggers.cpp | 2 +- extensions/pref/autoconfig/src/nsReadConfig.cpp | 2 +- extensions/python/xpcom/src/PyGBase.cpp | 2 +- extensions/python/xpcom/src/PyGWeakReference.cpp | 2 +- extensions/transformiix/source/base/baseutils.h | 2 +- extensions/typeaheadfind/src/nsTypeAheadFind.cpp | 2 +- .../universalchardet/src/nsUniversalDetector.cpp | 4 ++-- .../universalchardet/tests/UniversalChardetTest.cpp | 2 +- extensions/wallet/cookieviewer/nsCookieViewer.cpp | 2 +- extensions/wallet/editor/nsWalletEditor.cpp | 2 +- extensions/wallet/signonviewer/nsSignonViewer.cpp | 2 +- extensions/wallet/src/nsPassword.cpp | 4 ++-- extensions/wallet/src/nsPasswordManager.cpp | 6 +++--- extensions/wallet/src/nsWalletService.cpp | 5 +++-- extensions/wallet/src/nsWalletService.h | 2 +- extensions/wallet/src/singsign.cpp | 1 + extensions/wallet/src/wallet.cpp | 1 + extensions/wallet/walletpreview/nsWalletPreview.cpp | 2 +- .../wallet/walletpreview/nsWalletPreviewFactory.cpp | 2 +- .../webservices/soap/src/nsSOAPPropertyBag.cpp | 6 +++--- extensions/xmlextras/soap/src/nsSOAPPropertyBag.cpp | 6 +++--- extensions/xmlterm/base/mozLineTerm.cpp | 2 +- extensions/xmlterm/base/mozXMLTermListeners.cpp | 8 ++++---- extensions/xmlterm/base/mozXMLTermShell.cpp | 2 +- extensions/xmlterm/base/mozXMLTermStream.cpp | 2 +- extensions/xmlterm/base/mozXMLTerminal.cpp | 2 +- gfx/public/nsColor.h | 1 + gfx/public/nsColorNames.h | 1 + gfx/public/nsDeviceContext.h | 1 + gfx/public/nsFont.h | 1 + gfx/public/nsRect.h | 1 + gfx/public/nsRenderingContextImpl.h | 1 + gfx/public/nsRepeater.h | 1 + gfx/public/nsTransform2D.h | 1 + gfx/public/nsWatchTask.h | 2 +- gfx/src/beos/nsDeviceContextSpecB.cpp | 4 ++-- gfx/src/beos/nsDeviceContextSpecFactoryB.cpp | 2 +- gfx/src/beos/nsDrawingSurfaceBeOS.cpp | 2 +- gfx/src/beos/nsFontMetricsBeOS.cpp | 4 ++-- gfx/src/beos/nsImageBeOS.cpp | 2 +- gfx/src/beos/nsRegionBeOS.cpp | 2 +- gfx/src/beos/nsRenderingContextBeOS.cpp | 2 +- gfx/src/beos/nsScreenBeOS.cpp | 2 +- gfx/src/beos/nsScreenManagerBeOS.cpp | 2 +- gfx/src/gtk/nsDeviceContextSpecFactoryG.cpp | 2 +- gfx/src/gtk/nsDeviceContextSpecG.cpp | 4 ++-- gfx/src/gtk/nsDrawingSurfaceGTK.cpp | 2 +- gfx/src/gtk/nsFontMetricsGTK.cpp | 4 ++-- gfx/src/gtk/nsImageGTK.cpp | 2 +- gfx/src/gtk/nsRegionGTK.cpp | 2 +- gfx/src/gtk/nsRegionGTK2.cpp | 2 +- gfx/src/gtk/nsRenderingContextGTK.cpp | 2 +- gfx/src/gtk/nsScreenGtk.cpp | 2 +- gfx/src/gtk/nsScreenManagerGtk.cpp | 2 +- gfx/src/mac/nsDeviceContextMac.cpp | 2 +- gfx/src/mac/nsDeviceContextSpecFactoryM.cpp | 2 +- gfx/src/mac/nsDeviceContextSpecMac.cpp | 2 +- gfx/src/mac/nsDeviceContextSpecX.cpp | 2 +- gfx/src/mac/nsDrawingSurfaceMac.cpp | 2 +- gfx/src/mac/nsFontMetricsMac.cpp | 2 +- gfx/src/mac/nsImageMac.cpp | 2 +- gfx/src/mac/nsPrintSettingsMac.cpp | 4 ++-- gfx/src/mac/nsPrintSettingsX.cpp | 4 ++-- gfx/src/mac/nsRegionMac.cpp | 2 +- gfx/src/mac/nsRenderingContextMac.cpp | 2 +- gfx/src/mac/nsScreenMac.cpp | 2 +- gfx/src/mac/nsScreenManagerMac.cpp | 2 +- gfx/src/nsBlender.cpp | 2 +- gfx/src/nsBlender.h | 1 + gfx/src/nsDeviceContext.cpp | 2 +- gfx/src/nsFontList.cpp | 4 ++-- gfx/src/nsFontList.h | 1 + gfx/src/nsPrintOptionsImpl.cpp | 2 +- gfx/src/nsPrintSession.h | 1 + gfx/src/nsRegressionTestFontMetrics.cpp | 2 +- gfx/src/nsScriptableRegion.h | 1 + gfx/src/os2/nsDeviceContextSpecFactoryO.cpp | 2 +- gfx/src/os2/nsDeviceContextSpecOS2.cpp | 4 ++-- gfx/src/os2/nsDrawingSurfaceOS2.cpp | 2 +- gfx/src/os2/nsFontMetricsOS2.cpp | 4 ++-- gfx/src/os2/nsImageOS2.cpp | 2 +- gfx/src/os2/nsRegionOS2.cpp | 2 +- gfx/src/os2/nsRenderingContextOS2.cpp | 2 +- gfx/src/os2/nsScreenManagerOS2.cpp | 2 +- gfx/src/os2/nsScreenOS2.cpp | 2 +- gfx/src/photon/nsDeviceContextSpecFactoryP.cpp | 2 +- gfx/src/photon/nsDeviceContextSpecPh.cpp | 4 ++-- gfx/src/photon/nsDrawingSurfacePh.cpp | 2 +- gfx/src/photon/nsFontMetricsPh.cpp | 4 ++-- gfx/src/photon/nsImagePh.cpp | 2 +- gfx/src/photon/nsRegionPh.cpp | 4 ++-- gfx/src/photon/nsRenderingContextPh.cpp | 2 +- gfx/src/photon/nsScreenManagerPh.cpp | 2 +- gfx/src/photon/nsScreenPh.cpp | 2 +- gfx/src/ps/nsFontMetricsPS.cpp | 2 +- gfx/src/ps/nsRenderingContextPS.cpp | 2 +- gfx/src/qt/nsDeviceContextSpecFactoryQT.cpp | 2 +- gfx/src/qt/nsDeviceContextSpecQT.cpp | 2 +- gfx/src/qt/nsDrawingSurfaceQT.cpp | 2 +- gfx/src/qt/nsFontMetricsQT.cpp | 4 ++-- gfx/src/qt/nsImageQT.cpp | 2 +- gfx/src/qt/nsRegionQT.cpp | 2 +- gfx/src/qt/nsRenderingContextQT.cpp | 2 +- gfx/src/qt/nsScreenManagerQT.cpp | 2 +- gfx/src/qt/nsScreenQT.cpp | 2 +- gfx/src/windows/nsDeviceContextSpecFactoryW.cpp | 2 +- gfx/src/windows/nsDeviceContextSpecWin.cpp | 4 ++-- gfx/src/windows/nsDrawingSurfaceWin.cpp | 2 +- gfx/src/windows/nsFontMetricsWin.cpp | 4 ++-- gfx/src/windows/nsImageWin.cpp | 2 +- gfx/src/windows/nsRegionWin.cpp | 2 +- gfx/src/windows/nsRenderingContextWin.cpp | 2 +- gfx/src/windows/nsScreenManagerWin.cpp | 2 +- gfx/src/windows/nsScreenWin.cpp | 2 +- gfx/src/xlib/nsDeviceContextSpecFactoryX.cpp | 2 +- gfx/src/xlib/nsDeviceContextSpecXlib.cpp | 4 ++-- gfx/src/xlib/nsDrawingSurfaceXlib.cpp | 2 +- gfx/src/xlib/nsFontMetricsXlib.cpp | 4 ++-- gfx/src/xlib/nsGCCache.h | 1 + gfx/src/xlib/nsImageXlib.cpp | 2 +- gfx/src/xlib/nsRegionXlib.cpp | 2 +- gfx/src/xlib/nsRenderingContextXlib.cpp | 2 +- gfx/src/xlib/nsScreenManagerXlib.cpp | 2 +- gfx/src/xlib/nsScreenXlib.cpp | 2 +- gfx/src/xprint/nsXPrintContext.cpp | 2 +- htmlparser/robot/nsDebugRobot.cpp | 4 ++-- htmlparser/src/CNavDTD.cpp | 2 +- htmlparser/src/COtherDTD.cpp | 2 +- htmlparser/src/nsExpatDriver.cpp | 2 +- htmlparser/src/nsHTMLNullSink.cpp | 2 +- htmlparser/src/nsHTMLTokenizer.cpp | 2 +- htmlparser/src/nsLoggingSink.cpp | 2 +- htmlparser/src/nsParser.cpp | 2 +- htmlparser/src/nsParserFactory.cpp | 2 +- htmlparser/src/nsViewSourceHTML.cpp | 2 +- htmlparser/tests/grabpage/grabpage.cpp | 2 +- intl/chardet/src/classic/nsClassicDetectors.cpp | 4 ++-- intl/chardet/src/nsCyrillicDetector.cpp | 4 ++-- intl/chardet/src/nsDebugDetector.cpp | 2 +- intl/chardet/src/nsDetectionAdaptor.cpp | 2 +- intl/chardet/src/nsDetectionAdaptor.h | 2 +- intl/chardet/src/nsDocumentCharsetInfo.cpp | 2 +- intl/chardet/src/nsMetaCharsetObserver.cpp | 2 +- intl/chardet/src/nsPSMDetectors.cpp | 4 ++-- intl/chardet/src/nsXMLEncodingObserver.cpp | 2 +- intl/chardet/src/windows/nsNativeDetectors.cpp | 6 +++--- intl/chardet/tests/DetectCharset.cpp | 2 +- intl/compatibility/src/nsI18nCompatibility.cpp | 2 +- intl/ctl/src/nsUnicodeToSunIndic.cpp | 2 +- intl/ctl/src/nsUnicodeToTIS620.cpp | 2 +- intl/locale/src/mac/nsCollationMac.cpp | 2 +- intl/locale/src/mac/nsCollationMacUC.cpp | 2 +- intl/locale/src/mac/nsDateTimeFormatMac.h | 2 +- intl/locale/src/mac/nsMacLocale.cpp | 2 +- intl/locale/src/nsCollation.h | 2 +- intl/locale/src/nsFontPackageService.cpp | 2 +- intl/locale/src/nsLocale.cpp | 6 +++--- intl/locale/src/nsLocaleService.cpp | 4 ++-- intl/locale/src/nsScriptableDateFormat.cpp | 2 +- intl/locale/src/os2/nsCollationOS2.cpp | 2 +- intl/locale/src/os2/nsDateTimeFormatOS2.h | 2 +- intl/locale/src/os2/nsOS2Locale.cpp | 2 +- intl/locale/src/unix/nsCollationUnix.cpp | 2 +- intl/locale/src/unix/nsDateTimeFormatUnix.h | 2 +- intl/locale/src/unix/nsPosixLocale.cpp | 2 +- intl/locale/src/windows/nsCollationWin.cpp | 2 +- intl/locale/src/windows/nsDateTimeFormatWin.h | 2 +- intl/locale/src/windows/nsIWin32LocaleImpl.cpp | 2 +- intl/lwbrk/public/nsIBreakState.h | 2 +- intl/lwbrk/src/nsJISx4501LineBreaker.cpp | 2 +- intl/lwbrk/src/nsLWBreakerFImp.cpp | 2 +- intl/lwbrk/src/nsSampleWordBreaker.cpp | 2 +- intl/strres/src/nsStringBundle.cpp | 6 +++--- intl/uconv/src/nsCharsetAliasImp.cpp | 2 +- intl/uconv/src/nsCharsetConverterManager.cpp | 2 +- intl/uconv/src/nsConverterInputStream.h | 2 +- intl/uconv/src/nsMacCharset.cpp | 2 +- intl/uconv/src/nsOS2Charset.cpp | 2 +- intl/uconv/src/nsScriptableUConv.cpp | 2 +- intl/uconv/src/nsTextToSubURI.cpp | 2 +- intl/uconv/src/nsUNIXCharset.cpp | 2 +- intl/uconv/src/nsUnicodeDecodeHelper.cpp | 2 +- intl/uconv/src/nsUnicodeEncodeHelper.cpp | 2 +- intl/uconv/src/nsUnicodeToUTF8.h | 2 +- intl/uconv/src/nsWinCharset.cpp | 2 +- intl/uconv/src/unicpriv.h | 1 + intl/uconv/ucvcn/nsISO2022CNToUnicode.h | 2 +- intl/uconv/ucvko/nsUnicodeToX11Johab.cpp | 2 +- intl/uconv/util/nsUCSupport.cpp | 4 ++-- intl/unicharutil/src/nsCaseConversionImp2.cpp | 2 +- intl/unicharutil/src/nsCategoryImp.cpp | 2 +- intl/unicharutil/src/nsCharsOrderIdFormater.cpp | 4 ++-- intl/unicharutil/src/nsEntityConverter.cpp | 2 +- intl/unicharutil/src/nsHankakuToZenkaku.cpp | 2 +- intl/unicharutil/src/nsSaveAsCharset.cpp | 2 +- intl/unicharutil/util/nsUnicharUtils.cpp | 2 +- js/src/liveconnect/nsCLiveconnectFactory.cpp | 2 +- js/src/xpconnect/loader/mozJSComponentLoader.cpp | 2 +- js/src/xpconnect/shell/xpcshell.cpp | 2 +- js/src/xpconnect/src/nsScriptError.cpp | 2 +- js/src/xpconnect/src/xpcstack.cpp | 2 +- js/src/xpconnect/src/xpcwrappedjs.cpp | 2 +- js/src/xpconnect/src/xpcwrappedjsclass.cpp | 2 +- js/src/xpconnect/src/xpcwrappednative.cpp | 2 +- js/src/xpconnect/tests/TestXPC.cpp | 4 ++-- js/src/xpconnect/tests/components/xpctest_array.cpp | 2 +- .../tests/components/xpctest_attributes.cpp | 4 ++-- js/src/xpconnect/tests/components/xpctest_calljs.cpp | 2 +- js/src/xpconnect/tests/components/xpctest_child.cpp | 4 ++-- js/src/xpconnect/tests/components/xpctest_const.cpp | 2 +- .../xpconnect/tests/components/xpctest_domstring.cpp | 2 +- js/src/xpconnect/tests/components/xpctest_echo.cpp | 2 +- js/src/xpconnect/tests/components/xpctest_in.cpp | 2 +- js/src/xpconnect/tests/components/xpctest_inout.cpp | 2 +- .../xpconnect/tests/components/xpctest_multiple.cpp | 12 ++++++------ js/src/xpconnect/tests/components/xpctest_noisy.cpp | 2 +- js/src/xpconnect/tests/components/xpctest_out.cpp | 2 +- .../tests/components/xpctest_overloaded.cpp | 2 +- js/src/xpconnect/tests/components/xpctest_string.cpp | 2 +- js/src/xpconnect/tests/js/old/xpctest_enum_create.js | 2 +- layout/base/nsAutoCopy.cpp | 2 +- layout/base/nsCSSFrameConstructor.cpp | 2 +- layout/base/nsCaret.cpp | 2 +- layout/base/nsDocumentViewer.cpp | 4 ++-- layout/base/nsFrameContentIterator.cpp | 2 +- layout/base/nsFrameManager.cpp | 2 +- layout/base/nsFrameTraversal.cpp | 2 +- layout/base/nsLayoutDebugger.cpp | 2 +- layout/base/nsLayoutHistoryState.cpp | 2 +- layout/base/nsPresContext.cpp | 2 +- layout/base/nsPresShell.cpp | 2 +- layout/base/src/nsAutoCopy.cpp | 2 +- layout/base/src/nsCaret.cpp | 2 +- layout/base/src/nsFrameTraversal.cpp | 2 +- layout/base/src/nsFrameUtil.cpp | 2 +- layout/base/src/nsIntervalSet.h | 1 + layout/base/src/nsLayoutDebugger.cpp | 2 +- layout/base/src/nsLayoutHistoryState.cpp | 2 +- layout/base/src/nsPresContext.cpp | 2 +- layout/build/nsContentDLF.cpp | 2 +- layout/forms/nsListControlFrame.cpp | 2 +- layout/forms/nsTextControlFrame.cpp | 4 ++-- layout/generic/nsFrameFrame.cpp | 2 +- layout/generic/nsFrameUtil.cpp | 2 +- layout/generic/nsGfxScrollFrame.cpp | 2 +- layout/generic/nsImageMap.cpp | 2 +- layout/generic/nsIntervalSet.h | 1 + layout/generic/nsLineBox.cpp | 2 +- layout/generic/nsObjectFrame.cpp | 4 ++-- layout/generic/nsSelection.cpp | 8 ++++---- layout/generic/nsTextFrame.cpp | 2 +- layout/html/base/src/nsFrameManager.cpp | 2 +- layout/html/base/src/nsGfxScrollFrame.cpp | 2 +- layout/html/base/src/nsImageMap.cpp | 2 +- layout/html/base/src/nsLineBox.cpp | 2 +- layout/html/base/src/nsObjectFrame.cpp | 4 ++-- layout/html/base/src/nsPresShell.cpp | 2 +- layout/html/base/src/nsTextFrame.cpp | 2 +- layout/html/document/src/nsFrameFrame.cpp | 2 +- layout/html/forms/src/nsListControlFrame.cpp | 2 +- layout/html/forms/src/nsTextControlFrame.cpp | 4 ++-- layout/html/style/src/nsCSSFrameConstructor.cpp | 2 +- layout/html/style/src/nsFrameContentIterator.cpp | 2 +- layout/printing/nsPrintPreviewListener.cpp | 2 +- layout/style/nsCSSLoader.cpp | 8 ++++---- layout/style/nsCSSParser.cpp | 2 +- layout/style/nsCSSRule.cpp | 4 ++-- layout/style/nsCSSRules.cpp | 2 +- layout/style/nsCSSStyleRule.cpp | 2 +- layout/style/nsCSSStyleSheet.cpp | 12 ++++++------ layout/style/nsComputedDOMStyle.cpp | 2 +- layout/style/nsDOMCSSDeclaration.cpp | 2 +- layout/style/nsDOMCSSRGBColor.cpp | 2 +- layout/style/nsDOMCSSRect.cpp | 2 +- layout/style/nsDOMCSSValueList.cpp | 2 +- layout/style/nsHTMLCSSStyleSheet.cpp | 2 +- layout/style/nsHTMLStyleSheet.cpp | 6 +++--- layout/style/nsROCSSPrimitiveValue.cpp | 2 +- layout/style/nsStyleSet.cpp | 2 +- layout/xul/base/src/nsListBoxBodyFrame.cpp | 2 +- layout/xul/base/src/nsMenuBarListener.cpp | 2 +- layout/xul/base/src/nsMenuDismissalListener.cpp | 2 +- layout/xul/base/src/nsMenuListener.cpp | 2 +- layout/xul/base/src/nsRepeatService.cpp | 2 +- layout/xul/base/src/nsSplitterFrame.cpp | 2 +- layout/xul/base/src/nsXULTooltipListener.cpp | 2 +- mailnews/absync/src/nsAbSyncPostEngine.cpp | 2 +- mailnews/addrbook/src/nsAbAutoCompleteSession.h | 2 +- mailnews/base/search/src/nsMsgFilter.cpp | 3 ++- mailnews/base/search/src/nsMsgFilterList.cpp | 3 ++- mailnews/base/search/src/nsMsgFilterService.cpp | 2 +- mailnews/base/search/src/nsMsgSearchTerm.cpp | 10 +++++----- mailnews/base/search/src/nsMsgSearchValue.cpp | 1 + mailnews/base/src/nsCopyMessageStreamListener.cpp | 2 +- mailnews/base/src/nsMessenger.cpp | 7 ++++--- mailnews/base/src/nsMessengerBootstrap.cpp | 2 +- mailnews/base/src/nsMessengerMigrator.cpp | 2 +- mailnews/base/src/nsMsgAccount.cpp | 4 ++-- mailnews/base/src/nsMsgAccountManager.cpp | 2 +- mailnews/base/src/nsMsgBiffManager.cpp | 2 +- mailnews/base/src/nsMsgCopyService.cpp | 2 +- mailnews/base/src/nsMsgCopyService.h | 1 + mailnews/base/src/nsMsgFolderCache.cpp | 2 +- mailnews/base/src/nsMsgFolderCacheElement.cpp | 3 ++- mailnews/base/src/nsMsgMailSession.cpp | 2 +- mailnews/base/src/nsMsgNotificationManager.cpp | 2 +- mailnews/base/src/nsMsgOfflineManager.cpp | 2 +- mailnews/base/src/nsMsgPrintEngine.cpp | 2 +- mailnews/base/src/nsMsgRDFDataSource.cpp | 2 +- mailnews/base/src/nsMsgServiceProvider.cpp | 2 +- mailnews/base/src/nsMsgStatusFeedback.cpp | 2 +- mailnews/base/src/nsMsgWindow.cpp | 2 +- mailnews/base/src/nsSubscribableServer.cpp | 2 +- mailnews/base/src/nsSubscribeDataSource.cpp | 2 +- mailnews/base/src/nsUrlListenerManager.cpp | 2 +- mailnews/base/util/nsMsgFolder.cpp | 2 +- mailnews/base/util/nsMsgIdentity.cpp | 3 ++- mailnews/base/util/nsMsgIncomingServer.cpp | 3 ++- mailnews/base/util/nsMsgMailNewsUrl.cpp | 4 ++-- mailnews/base/util/nsMsgProtocol.cpp | 6 +++--- mailnews/base/util/nsMsgTxn.cpp | 2 +- mailnews/compose/src/nsMsgCompFields.cpp | 2 +- mailnews/compose/src/nsMsgCompUtils.h | 1 + mailnews/compose/src/nsMsgCompose.cpp | 8 ++++---- mailnews/compose/src/nsMsgComposeContentHandler.cpp | 2 +- mailnews/compose/src/nsMsgComposeParams.cpp | 2 +- mailnews/compose/src/nsMsgComposeService.cpp | 2 +- mailnews/compose/src/nsMsgCopy.cpp | 4 ++-- mailnews/compose/src/nsMsgCreate.cpp | 2 +- mailnews/compose/src/nsMsgDeliveryListener.cpp | 2 +- mailnews/compose/src/nsMsgQuote.cpp | 4 ++-- mailnews/compose/src/nsMsgRecipientArray.cpp | 2 +- mailnews/compose/src/nsMsgSend.cpp | 2 +- mailnews/compose/src/nsMsgSendLater.cpp | 4 ++-- mailnews/compose/src/nsSmtpDelegateFactory.cpp | 2 +- mailnews/compose/src/nsSmtpServer.cpp | 2 +- mailnews/compose/src/nsSmtpService.cpp | 2 +- mailnews/compose/src/nsSmtpUrl.cpp | 1 + mailnews/compose/src/nsURLFetcher.cpp | 2 +- mailnews/db/msgdb/src/nsDBFolderInfo.cpp | 3 ++- mailnews/db/msgdb/src/nsMailDatabase.cpp | 2 +- mailnews/db/msgdb/src/nsMsgDatabase.cpp | 6 +++--- mailnews/db/msgdb/src/nsMsgHdr.cpp | 2 +- mailnews/db/msgdb/src/nsMsgThread.cpp | 4 ++-- mailnews/imap/src/nsIMAPHostSessionList.cpp | 2 +- mailnews/imap/src/nsImapFlagAndUidState.cpp | 4 ++-- mailnews/imap/src/nsImapIncomingServer.cpp | 3 ++- mailnews/imap/src/nsImapMailFolder.cpp | 2 +- mailnews/imap/src/nsImapOfflineSync.cpp | 2 +- mailnews/imap/src/nsImapProtocol.cpp | 5 +++-- mailnews/imap/src/nsImapProxyEvent.cpp | 4 ++-- mailnews/imap/src/nsImapService.cpp | 2 +- mailnews/imap/src/nsImapStringBundle.h | 1 + mailnews/imap/src/nsImapUrl.cpp | 1 + mailnews/imap/src/nsImapUtils.cpp | 3 ++- mailnews/import/comm4x/src/nsComm4xMailImport.cpp | 4 ++-- mailnews/import/eudora/src/nsEudoraCompose.cpp | 2 +- mailnews/import/eudora/src/nsEudoraImport.cpp | 6 +++--- mailnews/import/eudora/src/nsEudoraSettings.cpp | 2 +- mailnews/import/oexpress/nsOEImport.cpp | 6 +++--- mailnews/import/oexpress/nsOESettings.cpp | 2 +- mailnews/import/outlook/src/nsOutlookCompose.cpp | 2 +- mailnews/import/outlook/src/nsOutlookImport.cpp | 6 +++--- mailnews/import/outlook/src/nsOutlookSettings.cpp | 2 +- mailnews/import/src/nsImportAddressBooks.cpp | 2 +- mailnews/import/src/nsImportMail.cpp | 2 +- mailnews/import/src/nsImportService.cpp | 2 +- mailnews/import/text/src/nsTextImport.cpp | 4 ++-- mailnews/local/src/nsLocalMailFolder.cpp | 2 +- mailnews/local/src/nsMailboxService.cpp | 2 +- mailnews/local/src/nsMailboxUrl.cpp | 1 + mailnews/local/src/nsMailboxUrl.h | 1 + mailnews/local/src/nsMovemailIncomingServer.cpp | 2 +- mailnews/local/src/nsMovemailService.cpp | 2 +- mailnews/local/src/nsNoIncomingServer.cpp | 2 +- mailnews/local/src/nsNoneService.cpp | 2 +- mailnews/local/src/nsParseMailbox.cpp | 4 ++-- mailnews/local/src/nsPop3IncomingServer.cpp | 2 +- mailnews/local/src/nsPop3Service.cpp | 2 +- mailnews/local/src/nsPop3Sink.cpp | 2 +- mailnews/mapi/mapihook/src/msgMapiHook.cpp | 2 +- .../cthandlers/glue/nsMimeContentTypeHandler.cpp | 2 +- mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp | 2 +- mailnews/mime/src/nsMimeObjectClassAccess.cpp | 2 +- mailnews/mime/src/nsMsgHeaderParser.cpp | 2 +- mailnews/mime/src/nsStreamConverter.cpp | 2 +- mailnews/news/src/nsNNTPArticleList.cpp | 2 +- mailnews/news/src/nsNNTPNewsgroupList.cpp | 2 +- mailnews/news/src/nsNNTPNewsgroupPost.cpp | 4 +++- mailnews/news/src/nsNNTPNewsgroupPost.h | 2 +- mailnews/news/src/nsNNTPProtocol.cpp | 2 +- mailnews/news/src/nsNewsDownloadDialogArgs.cpp | 2 +- mailnews/news/src/nsNewsDownloader.cpp | 4 ++-- mailnews/news/src/nsNewsFolder.cpp | 2 +- mailnews/news/src/nsNntpIncomingServer.cpp | 2 +- mailnews/news/src/nsNntpService.cpp | 3 ++- mailnews/news/src/nsNntpUrl.cpp | 2 ++ modules/libimg/gifcom/nsGIFDecoder.cpp | 2 +- modules/libjar/nsJAR.cpp | 6 +++--- modules/libjar/nsJARChannel.cpp | 2 +- modules/libjar/nsJARInputStream.cpp | 2 +- modules/libjar/nsJARProtocolHandler.cpp | 2 +- modules/libjar/nsJARURI.cpp | 2 +- modules/libjar/test/TestJarCache.cpp | 2 +- modules/libpr0n/decoders/icon/mac/nsIconChannel.cpp | 2 +- .../libpr0n/decoders/icon/nsIconProtocolHandler.cpp | 2 +- modules/libpr0n/decoders/icon/nsIconURI.cpp | 2 +- modules/libpr0n/decoders/icon/os2/nsIconChannel.cpp | 2 +- modules/libpr0n/decoders/icon/win/nsIconChannel.cpp | 2 +- modules/libpref/src/nsPref.cpp | 2 +- modules/libpref/src/nsPrefBranch.cpp | 2 +- modules/libpref/src/nsPrefService.cpp | 2 +- modules/libreg/xpcom/nsRegistry.cpp | 10 +++++----- .../mpfilelocprovider/src/nsMPFileLocProvider.cpp | 2 +- modules/oji/src/nsCNullSecurityContext.h | 2 +- modules/oji/src/nsCSecurityContext.cpp | 4 ++-- modules/oji/tests/src/TestLoader/OJITestLoader.cpp | 2 +- .../tests/src/TestLoader/OJITestLoaderFactory.cpp | 2 +- modules/plugin/base/src/ns4xPlugin.cpp | 2 +- modules/plugin/base/src/ns4xPluginInstance.cpp | 4 ++-- modules/plugin/base/src/nsPluginHostImpl.cpp | 10 +++++----- modules/plugin/base/src/nsPluginInstancePeer.cpp | 4 ++-- modules/plugin/base/src/nsPluginStreamPeer.cpp | 2 +- modules/plugin/base/src/nsPluginViewer.cpp | 6 +++--- modules/plugin/samples/SanePlugin/nsSanePlugin.cpp | 4 ++-- .../samples/SanePlugin/nsSanePluginFactory.cpp | 2 +- modules/plugin/samples/backward/badapter.cpp | 8 ++++---- modules/plugin/samples/simple/npsimple.cpp | 4 ++-- modules/plugin/samples/testevents/npevents.cpp | 4 ++-- modules/staticmod/macbuild/nsMetaModule_crypto.cpp | 2 +- modules/staticmod/macbuild/nsMetaModule_mail.cpp | 2 +- netwerk/base/src/nsAsyncStreamListener.h | 2 +- netwerk/base/src/nsBufferedStreams.cpp | 2 +- netwerk/base/src/nsDirectoryIndexStream.cpp | 2 +- netwerk/base/src/nsDownloader.h | 2 +- netwerk/base/src/nsFileStreams.cpp | 4 ++-- netwerk/base/src/nsFileTransportService.cpp | 2 +- netwerk/base/src/nsIOService.cpp | 2 +- netwerk/base/src/nsInputStreamChannel.cpp | 4 ++-- netwerk/base/src/nsNetModRegEntry.cpp | 2 +- netwerk/base/src/nsNetModuleMgr.cpp | 2 +- netwerk/base/src/nsProtocolProxyService.cpp | 2 +- netwerk/base/src/nsProtocolProxyService.h | 2 +- netwerk/base/src/nsSocketTransport.cpp | 2 +- netwerk/base/src/nsSocketTransportService.cpp | 2 +- netwerk/base/src/nsStreamLoader.h | 2 +- netwerk/base/src/nsSyncStreamListener.h | 2 +- netwerk/base/src/nsURIChecker.cpp | 2 +- netwerk/base/src/nsUnicharStreamLoader.h | 2 +- netwerk/base/tests/urltest.cpp | 2 +- netwerk/cache/src/nsCacheService.cpp | 2 +- netwerk/dns/src/nsDnsService.cpp | 6 +++--- netwerk/mime/src/nsMIMEInfoImpl.cpp | 4 ++-- netwerk/mime/src/nsMIMEService.cpp | 2 +- netwerk/mime/src/nsXMLMIMEDataSource.cpp | 2 +- netwerk/protocol/about/src/nsAboutBlank.h | 2 +- netwerk/protocol/about/src/nsAboutBloat.h | 2 +- netwerk/protocol/about/src/nsAboutCache.h | 2 +- .../protocol/about/src/nsAboutProtocolHandler.cpp | 2 +- netwerk/protocol/about/src/nsAboutRedirector.h | 2 +- netwerk/protocol/data/src/nsDataChannel.cpp | 2 +- netwerk/protocol/data/src/nsDataHandler.cpp | 2 +- netwerk/protocol/file/src/nsFileChannel.cpp | 2 +- netwerk/protocol/file/src/nsFileProtocolHandler.cpp | 2 +- netwerk/protocol/ftp/src/nsFTPChannel.cpp | 2 +- netwerk/protocol/ftp/src/nsFtpControlConnection.cpp | 2 +- netwerk/protocol/gopher/src/nsGopherChannel.cpp | 2 +- netwerk/protocol/gopher/src/nsGopherHandler.cpp | 2 +- netwerk/protocol/jar/src/nsJARChannel.cpp | 2 +- netwerk/protocol/jar/src/nsJARProtocolHandler.cpp | 2 +- netwerk/protocol/jar/src/nsJARURI.cpp | 2 +- .../keyword/src/nsKeywordProtocolHandler.cpp | 2 +- netwerk/protocol/res/src/nsResProtocolHandler.cpp | 2 +- .../protocol/viewsource/src/nsViewSourceChannel.cpp | 2 +- .../protocol/viewsource/src/nsViewSourceHandler.cpp | 2 +- netwerk/socket/base/nsSOCKS4SocketProvider.cpp | 2 +- netwerk/socket/base/nsSOCKSIOLayer.cpp | 2 +- netwerk/socket/base/nsSOCKSSocketProvider.cpp | 2 +- netwerk/socket/base/nsSocketProviderService.cpp | 2 +- netwerk/streamconv/converters/nsDirIndex.cpp | 3 ++- netwerk/streamconv/converters/nsDirIndexParser.cpp | 2 +- netwerk/streamconv/converters/nsTXTToHTMLConv.cpp | 2 +- netwerk/test/TestCacheMgr.cpp | 2 +- netwerk/test/TestCallbacks.cpp | 4 ++-- netwerk/test/TestFileInput.cpp | 2 +- netwerk/test/TestFileInput2.cpp | 4 ++-- netwerk/test/TestFileTransport.cpp | 4 ++-- netwerk/test/TestProtocols.cpp | 8 ++++---- netwerk/test/TestRawCache.cpp | 2 +- netwerk/test/TestRes.cpp | 2 +- netwerk/test/TestSocketInput.cpp | 2 +- netwerk/test/TestSocketTransport.cpp | 4 ++-- netwerk/test/TestThreadedIO.cpp | 2 +- netwerk/test/TestUpload.cpp | 2 +- parser/htmlparser/robot/nsDebugRobot.cpp | 4 ++-- parser/htmlparser/src/CNavDTD.cpp | 2 +- parser/htmlparser/src/COtherDTD.cpp | 2 +- parser/htmlparser/src/nsExpatDriver.cpp | 2 +- parser/htmlparser/src/nsHTMLNullSink.cpp | 2 +- parser/htmlparser/src/nsHTMLTokenizer.cpp | 2 +- parser/htmlparser/src/nsLoggingSink.cpp | 2 +- parser/htmlparser/src/nsParser.cpp | 2 +- parser/htmlparser/src/nsParserFactory.cpp | 2 +- parser/htmlparser/src/nsViewSourceHTML.cpp | 2 +- parser/htmlparser/tests/grabpage/grabpage.cpp | 2 +- plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp | 10 +++++----- .../plugin/Source/EmbeddedFramePluginInstance.cpp | 2 +- .../MRJ/plugin/Source/LiveConnectNativeMethods.cpp | 2 +- .../plugin/Source/EmbeddedFramePluginInstance.cpp | 2 +- .../plugin/Source/LiveConnectNativeMethods.cpp | 2 +- profile/pref-migrator/src/nsPrefMigration.cpp | 4 ++-- profile/src/nsProfile.cpp | 2 +- rdf/base/src/nsCompositeDataSource.cpp | 4 ++-- rdf/base/src/nsContainerEnumerator.cpp | 2 +- rdf/base/src/nsInMemoryDataSource.cpp | 4 ++-- rdf/base/src/nsRDFContainer.cpp | 2 +- rdf/base/src/nsRDFContainerUtils.cpp | 2 +- rdf/base/src/nsRDFContentSink.cpp | 2 +- rdf/base/src/nsRDFService.cpp | 10 +++++----- rdf/base/src/nsRDFXMLDataSource.cpp | 4 ++-- rdf/base/src/nsRDFXMLParser.cpp | 2 +- rdf/base/src/nsRDFXMLSerializer.cpp | 2 +- rdf/chrome/src/nsChromeProtocolHandler.cpp | 4 ++-- rdf/chrome/src/nsChromeRegistry.cpp | 4 ++-- rdf/chrome/src/nsChromeUIDataSource.cpp | 2 +- rdf/datasource/src/nsFileSystemDataSource.cpp | 2 +- rdf/tests/dsds/nsRDFDataSourceDS.cpp | 2 +- rdf/tests/rdfcat/rdfcat.cpp | 2 +- rdf/tests/rdfpoll/rdfpoll.cpp | 2 +- rdf/tests/rdfsink/rdfsink.cpp | 2 +- rdf/util/src/nsRDFResource.cpp | 2 +- security/manager/pki/src/nsPKIParamBlock.cpp | 2 +- security/manager/ssl/src/nsCrypto.cpp | 10 +++++----- security/manager/ssl/src/nsKeygenHandler.cpp | 2 +- uriloader/base/nsDocLoader.cpp | 2 +- uriloader/exthandler/mac/nsInternetConfigService.cpp | 2 +- uriloader/exthandler/mac/nsMacMIMEDataSource.cpp | 2 +- uriloader/exthandler/nsExternalProtocolHandler.cpp | 2 +- uriloader/exthandler/nsMIMEInfoImpl.cpp | 4 ++-- view/src/nsViewManager.cpp | 2 +- webshell/tests/viewer/nsBrowserWindow.cpp | 2 +- webshell/tests/viewer/nsThrobber.cpp | 2 +- webshell/tests/viewer/nsViewerApp.cpp | 5 +++-- webshell/tests/viewer/nsWebBrowserChrome.cpp | 2 +- webshell/tests/viewer/nsWebCrawler.cpp | 2 +- webshell/tests/viewer/nsWindowCreator.cpp | 2 +- webshell/tests/viewer/nsXPBaseWindow.cpp | 2 +- webshell/tests/viewer/os2/nsButton.cpp | 2 +- webshell/tests/viewer/os2/nsCheckButton.cpp | 2 +- webshell/tests/viewer/os2/nsLabel.cpp | 2 +- webshell/tests/viewer/os2/nsTextWidget.cpp | 2 +- webshell/tests/viewer/windows/nsButton.cpp | 2 +- webshell/tests/viewer/windows/nsCheckButton.cpp | 2 +- webshell/tests/viewer/windows/nsLabel.cpp | 2 +- webshell/tests/viewer/windows/nsTextWidget.cpp | 2 +- widget/public/nsWidgetSupport.h | 1 + widget/src/beos/nsAppShell.cpp | 2 +- widget/src/beos/nsBidiKeyboard.cpp | 2 +- widget/src/beos/nsButton.cpp | 2 +- widget/src/beos/nsCheckButton.cpp | 2 +- widget/src/beos/nsClipboard.cpp | 2 +- widget/src/beos/nsDragService.cpp | 2 +- widget/src/beos/nsFilePicker.cpp | 2 +- widget/src/beos/nsLabel.cpp | 2 +- widget/src/beos/nsScrollbar.cpp | 2 +- widget/src/beos/nsSound.cpp | 2 +- widget/src/beos/nsTextWidget.cpp | 2 +- widget/src/beos/nsToolkit.cpp | 2 +- widget/src/beos/nsWindow.cpp | 2 +- widget/src/cocoa/nsBidiKeyboard.cpp | 2 +- widget/src/cocoa/nsFilePicker.cpp | 2 +- widget/src/cocoa/nsMenuBarX.cpp | 2 +- widget/src/cocoa/nsMenuItemX.cpp | 2 +- widget/src/cocoa/nsMenuX.cpp | 4 ++-- widget/src/cocoa/nsRegionMac.cpp | 2 +- widget/src/gtk/nsAppShell.cpp | 2 +- widget/src/gtk/nsBidiKeyboard.cpp | 2 +- widget/src/gtk/nsCheckButton.cpp | 2 +- widget/src/gtk/nsClipboard.cpp | 2 +- widget/src/gtk/nsLabel.cpp | 2 +- widget/src/gtk/nsScrollbar.cpp | 2 +- widget/src/gtk/nsSound.cpp | 2 +- widget/src/gtk/nsToolkit.cpp | 2 +- widget/src/gtk2/nsAppShell.cpp | 2 +- widget/src/gtk2/nsBidiKeyboard.cpp | 2 +- widget/src/gtk2/nsClipboard.cpp | 2 +- widget/src/gtk2/nsToolkit.cpp | 2 +- widget/src/mac/nsBidiKeyboard.cpp | 2 +- widget/src/mac/nsButton.cpp | 2 +- widget/src/mac/nsCheckButton.cpp | 2 +- widget/src/mac/nsFilePicker.cpp | 2 +- widget/src/mac/nsLabel.cpp | 2 +- widget/src/mac/nsMenu.cpp | 4 ++-- widget/src/mac/nsMenuBar.cpp | 2 +- widget/src/mac/nsMenuBarX.cpp | 2 +- widget/src/mac/nsMenuItem.cpp | 2 +- widget/src/mac/nsMenuItemX.cpp | 2 +- widget/src/mac/nsMenuX.cpp | 4 ++-- widget/src/mac/nsTextWidget.cpp | 2 +- widget/src/mac/nsToolkit.cpp | 2 +- widget/src/os2/nsAppShell.cpp | 2 +- widget/src/os2/nsBidiKeyboard.cpp | 2 +- widget/src/os2/nsFilePicker.cpp | 2 +- widget/src/os2/nsScrollbar.cpp | 2 +- widget/src/os2/nsSound.cpp | 2 +- widget/src/os2/nsToolkit.cpp | 2 +- widget/src/os2/nsWindow.cpp | 2 +- widget/src/photon/nsAppShell.cpp | 2 +- widget/src/photon/nsBidiKeyboard.cpp | 2 +- widget/src/photon/nsButton.cpp | 2 +- widget/src/photon/nsCheckButton.cpp | 2 +- widget/src/photon/nsClipboard.cpp | 2 +- widget/src/photon/nsDragService.cpp | 2 +- widget/src/photon/nsLabel.cpp | 2 +- widget/src/photon/nsScrollbar.cpp | 2 +- widget/src/photon/nsSound.cpp | 2 +- widget/src/photon/nsTextWidget.cpp | 2 +- widget/src/photon/nsToolkit.cpp | 2 +- widget/src/photon/nsWidget.cpp | 2 +- widget/src/qt/nsAppShell.cpp | 2 +- widget/src/qt/nsBidiKeyboard.cpp | 2 +- widget/src/qt/nsCheckButton.cpp | 2 +- widget/src/qt/nsClipboard.cpp | 2 +- widget/src/qt/nsDragService.cpp | 2 +- widget/src/qt/nsLabel.cpp | 2 +- widget/src/qt/nsToolkit.cpp | 2 +- widget/src/windows/nsAppShell.cpp | 2 +- widget/src/windows/nsBidiKeyboard.cpp | 2 +- widget/src/windows/nsClipboard.cpp | 2 +- widget/src/windows/nsDragService.cpp | 2 +- widget/src/windows/nsFilePicker.cpp | 2 +- widget/src/windows/nsScrollbar.cpp | 2 +- widget/src/windows/nsSound.cpp | 2 +- widget/src/windows/nsToolkit.cpp | 2 +- widget/src/windows/nsWindow.cpp | 2 +- widget/src/xlib/nsBidiKeyboard.cpp | 2 +- widget/src/xpwidgets/nsBaseClipboard.cpp | 2 +- widget/src/xpwidgets/nsBaseDragService.cpp | 2 +- widget/src/xpwidgets/nsBasePointerService.cpp | 2 +- widget/src/xpwidgets/nsBaseWidget.cpp | 4 ++-- widget/src/xpwidgets/nsDataFlavor.cpp | 2 +- widget/src/xpwidgets/nsHTMLFormatConverter.cpp | 2 +- widget/src/xpwidgets/nsTransferable.cpp | 2 +- widget/src/xpwidgets/nsXPLookAndFeel.cpp | 2 +- xpcom/base/Makefile.in | 2 +- xpcom/base/nsAgg.h | 2 +- xpcom/base/nsConsoleService.cpp | 2 +- xpcom/base/nsLeakDetector.cpp | 2 +- xpcom/base/nsMemoryImpl.cpp | 4 ++-- xpcom/base/nsSystemInfo.cpp | 2 +- xpcom/base/nscore.h | 8 +------- xpcom/components/nsCategoryManager.cpp | 4 ++-- xpcom/components/nsComponentManager.cpp | 4 ++-- xpcom/components/nsNativeComponentLoader.cpp | 2 +- xpcom/components/nsRegistry.cpp | 10 +++++----- xpcom/components/nsStaticComponentLoader.cpp | 2 +- xpcom/components/nsXPComFactory.h | 2 +- xpcom/ds/nsArena.cpp | 2 +- xpcom/ds/nsByteBuffer.cpp | 2 +- xpcom/ds/nsEnumeratorUtils.cpp | 6 +++--- xpcom/ds/nsHashtableEnumerator.cpp | 2 +- xpcom/ds/nsObserverList.cpp | 2 +- xpcom/ds/nsObserverService.cpp | 2 +- xpcom/ds/nsPersistentProperties.cpp | 2 +- xpcom/ds/nsSizeOfHandler.cpp | 2 +- xpcom/ds/nsSupportsArray.cpp | 2 +- xpcom/ds/nsSupportsArrayEnumerator.cpp | 2 +- xpcom/ds/nsUnicharBuffer.cpp | 2 +- xpcom/glue/Makefile.in | 5 +---- xpcom/glue/nsISupportsUtils.h | 4 ---- xpcom/io/nsAppFileLocationProvider.cpp | 2 +- xpcom/io/nsBinaryStream.cpp | 4 ++-- xpcom/io/nsByteArrayInputStream.cpp | 2 +- xpcom/io/nsDirectoryService.cpp | 2 +- xpcom/io/nsFastLoadService.cpp | 2 +- xpcom/io/nsIFileStream.cpp | 4 ++-- xpcom/io/nsLocalFileMac.cpp | 8 ++++---- xpcom/io/nsLocalFileOS2.cpp | 4 ++-- xpcom/io/nsLocalFileUnix.cpp | 4 ++-- xpcom/io/nsLocalFileWin.cpp | 4 ++-- xpcom/io/nsPipe2.cpp | 2 +- xpcom/io/nsScriptableInputStream.h | 2 +- xpcom/io/nsStorageStream.cpp | 4 ++-- xpcom/io/nsStringStream.cpp | 2 +- xpcom/io/nsUnicharInputStream.cpp | 4 ++-- xpcom/proxy/src/nsProxyEvent.cpp | 4 ++-- xpcom/proxy/src/nsProxyEventClass.cpp | 2 +- xpcom/proxy/src/nsProxyEventObject.cpp | 2 +- xpcom/proxy/src/nsProxyObjectManager.cpp | 4 ++-- xpcom/proxy/tests/proxytests.cpp | 4 ++-- xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp | 6 +++--- xpcom/reflect/xptinfo/src/xptiprivate.h | 2 +- xpcom/tests/TestBuffers.cpp | 2 +- xpcom/tests/TestFactory.cpp | 4 ++-- xpcom/tests/TestObserverService.cpp | 2 +- xpcom/tests/TestPipes.cpp | 8 ++++---- xpcom/tests/TestThreads.cpp | 6 +++--- xpcom/tests/dynamic/TestDynamic.cpp | 2 +- xpcom/tests/services/MyService.cpp | 2 +- xpcom/tests/windows/TestCOM.cpp | 4 ++-- xpcom/threads/TimerThread.cpp | 2 +- xpcom/threads/nsAutoLock.h | 1 + xpcom/threads/nsEventQueue.cpp | 2 +- xpcom/threads/nsEventQueueService.cpp | 2 +- xpcom/threads/nsThread.cpp | 6 +++--- xpcom/threads/nsTimerImpl.cpp | 4 ++-- xpfe/appshell/public/nsICmdLineService.idl | 2 ++ xpfe/appshell/public/nsIDOMXPConnectFactory.h | 1 + xpfe/appshell/src/nsAbout.h | 2 +- xpfe/appshell/src/nsAppShellService.cpp | 2 +- xpfe/appshell/src/nsAppShellWindowEnumerator.cpp | 2 +- xpfe/appshell/src/nsChromeTreeOwner.cpp | 2 +- xpfe/appshell/src/nsCommandLineService.cpp | 2 +- xpfe/appshell/src/nsContentTreeOwner.cpp | 4 ++-- xpfe/appshell/src/nsInternetConfigService.cpp | 2 +- xpfe/appshell/src/nsMacMIMEDataSource.cpp | 2 +- xpfe/appshell/src/nsUserInfoMac.cpp | 2 +- xpfe/appshell/src/nsUserInfoOS2.cpp | 2 +- xpfe/appshell/src/nsUserInfoUnix.cpp | 2 +- xpfe/appshell/src/nsUserInfoWin.cpp | 2 +- xpfe/appshell/src/nsWebShellWindow.cpp | 2 +- xpfe/appshell/src/nsWindowMediator.cpp | 2 +- xpfe/appshell/src/nsXULWindow.cpp | 2 +- xpfe/bootstrap/appleevents/nsAppleEventsService.cpp | 2 +- xpfe/bootstrap/nsNativeAppSupportBeOS.cpp | 2 +- xpfe/bootstrap/nsNativeAppSupportMac.cpp | 2 +- xpfe/bootstrap/nsWindowCreator.cpp | 2 +- xpfe/browser/src/nsBrowserInstance.cpp | 4 ++-- xpfe/components/bookmarks/src/nsBookmarksService.cpp | 2 +- xpfe/components/directory/nsDirectoryViewer.cpp | 6 +++--- xpfe/components/history/src/nsGlobalHistory.cpp | 4 ++-- xpfe/components/intl/nsCharsetMenu.cpp | 2 +- xpfe/components/regviewer/nsRegistryDataSource.cpp | 4 ++-- .../components/related/src/nsRelatedLinksHandler.cpp | 4 ++-- .../search/src/nsInternetSearchService.cpp | 2 +- xpfe/components/search/src/nsLocalSearchService.cpp | 2 +- xpfe/components/shistory/src/nsSHEntry.cpp | 2 +- xpfe/components/shistory/src/nsSHTransaction.cpp | 2 +- xpfe/components/shistory/src/nsSHistory.cpp | 4 ++-- xpfe/components/startup/public/nsICmdLineService.idl | 2 ++ xpfe/components/startup/src/nsCommandLineService.cpp | 2 +- xpfe/components/startup/src/nsUserInfoMac.cpp | 2 +- xpfe/components/startup/src/nsUserInfoOS2.cpp | 2 +- xpfe/components/startup/src/nsUserInfoUnix.cpp | 2 +- xpfe/components/startup/src/nsUserInfoWin.cpp | 2 +- xpfe/components/timebomb/nsTimeBomb.cpp | 2 +- .../components/urlbarhistory/src/nsUrlbarHistory.cpp | 2 +- xpinstall/src/nsInstallVersion.cpp | 2 +- xpinstall/src/nsUpdateNotification.cpp | 2 +- 953 files changed, 1235 insertions(+), 1194 deletions(-) diff --git a/accessible/src/base/nsAccessibilityService.cpp b/accessible/src/base/nsAccessibilityService.cpp index 44999d0040d0..811c2c212949 100644 --- a/accessible/src/base/nsAccessibilityService.cpp +++ b/accessible/src/base/nsAccessibilityService.cpp @@ -104,7 +104,7 @@ nsAccessibilityService::nsAccessibilityService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); nsLayoutAtoms::AddRefAtoms(); } diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp index 5fc48b03a008..bca138e55e68 100644 --- a/accessible/src/base/nsAccessible.cpp +++ b/accessible/src/base/nsAccessible.cpp @@ -437,7 +437,7 @@ PRBool nsAccessibleTreeWalker::GetAccessible() //----------------------------------------------------- nsAccessible::nsAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell): mDOMNode(aNode), mPresShell(aShell), mSiblingIndex(eSiblingsUninitialized) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef NS_DEBUG_X { diff --git a/caps/src/nsScriptSecurityManager.cpp b/caps/src/nsScriptSecurityManager.cpp index b090cdcd0658..b0ce1922a8aa 100644 --- a/caps/src/nsScriptSecurityManager.cpp +++ b/caps/src/nsScriptSecurityManager.cpp @@ -2502,7 +2502,7 @@ nsScriptSecurityManager::nsScriptSecurityManager(void) { NS_ASSERTION(sizeof(long) == sizeof(void*), "long and void* have different lengths on this platform. This may cause a security failure."); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); JSContext* cx = GetSafeJSContext(); if (sCallerID == JSVAL_VOID) diff --git a/caps/src/nsSecurityManagerFactory.cpp b/caps/src/nsSecurityManagerFactory.cpp index d2bb41526647..ac6d866a0a78 100644 --- a/caps/src/nsSecurityManagerFactory.cpp +++ b/caps/src/nsSecurityManagerFactory.cpp @@ -77,7 +77,7 @@ public: nsSecurityNameSet::nsSecurityNameSet() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsSecurityNameSet::~nsSecurityNameSet() diff --git a/chrome/src/nsChromeProtocolHandler.cpp b/chrome/src/nsChromeProtocolHandler.cpp index f8f3e96f45f1..adcaa22f3add 100644 --- a/chrome/src/nsChromeProtocolHandler.cpp +++ b/chrome/src/nsChromeProtocolHandler.cpp @@ -180,7 +180,7 @@ nsCachedChromeChannel::Create(nsIURI* aURI, nsIChannel** aResult) nsCachedChromeChannel::nsCachedChromeChannel(nsIURI* aURI) : mURI(aURI), mLoadGroup(nsnull), mLoadFlags (nsIRequest::LOAD_NORMAL), mStatus(NS_OK) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef PR_LOGGING if (! gLog) @@ -495,7 +495,7 @@ nsCachedChromeChannel::DestroyLoadEvent(PLEvent* aEvent) nsChromeProtocolHandler::nsChromeProtocolHandler() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult diff --git a/chrome/src/nsChromeRegistry.cpp b/chrome/src/nsChromeRegistry.cpp index 5b2611e4dfd9..22d07cb92795 100644 --- a/chrome/src/nsChromeRegistry.cpp +++ b/chrome/src/nsChromeRegistry.cpp @@ -166,7 +166,7 @@ NS_IMPL_ISUPPORTS1(nsOverlayEnumerator, nsISimpleEnumerator) nsOverlayEnumerator::nsOverlayEnumerator(nsISimpleEnumerator *aInstallArcs, nsISimpleEnumerator *aProfileArcs) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mInstallArcs = aInstallArcs; mProfileArcs = aProfileArcs; mCurrentArcs = mInstallArcs; @@ -254,7 +254,7 @@ nsChromeRegistry::nsChromeRegistry() : mRDFService(nsnull), mBatchInstallFlushes(PR_FALSE), mSearchedForOverride(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); nsCOMPtr prefService(do_GetService(kPrefServiceCID)); if (prefService) diff --git a/chrome/src/nsChromeUIDataSource.cpp b/chrome/src/nsChromeUIDataSource.cpp index 295bcd4b0ece..03a42d03eeb5 100644 --- a/chrome/src/nsChromeUIDataSource.cpp +++ b/chrome/src/nsChromeUIDataSource.cpp @@ -64,7 +64,7 @@ static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); nsChromeUIDataSource::nsChromeUIDataSource(nsIRDFDataSource* aComposite) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mComposite = aComposite; mComposite->AddObserver(this); diff --git a/content/base/src/nsContentAreaDragDrop.cpp b/content/base/src/nsContentAreaDragDrop.cpp index 464fc3b38ff9..e7f5b6085639 100644 --- a/content/base/src/nsContentAreaDragDrop.cpp +++ b/content/base/src/nsContentAreaDragDrop.cpp @@ -115,7 +115,7 @@ NS_INTERFACE_MAP_END nsContentAreaDragDrop::nsContentAreaDragDrop ( ) : mListenerInstalled(PR_FALSE), mNavigator(nsnull), mOverrideDrag(nsnull), mOverrideDrop(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } // ctor diff --git a/content/base/src/nsContentIterator.cpp b/content/base/src/nsContentIterator.cpp index 0d2da606a8c0..0e18c97e7795 100644 --- a/content/base/src/nsContentIterator.cpp +++ b/content/base/src/nsContentIterator.cpp @@ -263,7 +263,7 @@ nsContentIterator::nsContentIterator() : // don't need to explicitly initialize |nsCOMPtr|s, they will automatically be NULL mCachedIndex(0), mIsDone(PR_FALSE), mPre(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/content/base/src/nsContentList.cpp b/content/base/src/nsContentList.cpp index c493b90ecd6e..e54b630120f6 100644 --- a/content/base/src/nsContentList.cpp +++ b/content/base/src/nsContentList.cpp @@ -60,7 +60,7 @@ static nsIContentList *gCachedContentList; nsBaseContentList::nsBaseContentList() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsBaseContentList::~nsBaseContentList() @@ -223,7 +223,7 @@ nsFormContentList::nsFormContentList(nsIDOMHTMLFormElement *aForm, nsBaseContentList& aContentList) : nsBaseContentList() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // move elements that belong to mForm into this content list diff --git a/content/base/src/nsContentPolicy.cpp b/content/base/src/nsContentPolicy.cpp index 2cac56920690..dfd86bbf7f7d 100644 --- a/content/base/src/nsContentPolicy.cpp +++ b/content/base/src/nsContentPolicy.cpp @@ -47,7 +47,7 @@ NS_NewContentPolicy(nsIContentPolicy **aResult) */ nsContentPolicy::nsContentPolicy() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); nsresult rv; nsCOMPtr catman = do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv); diff --git a/content/base/src/nsDOMAttribute.cpp b/content/base/src/nsDOMAttribute.cpp index 233c77d3c48a..419a7e17ffe4 100644 --- a/content/base/src/nsDOMAttribute.cpp +++ b/content/base/src/nsDOMAttribute.cpp @@ -55,7 +55,7 @@ nsDOMAttribute::nsDOMAttribute(nsIContent* aContent, nsINodeInfo *aNodeInfo, { NS_ABORT_IF_FALSE(mNodeInfo, "We must get a nodeinfo here!"); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // We don't add a reference to our content. It will tell us // to drop our reference when it goes away. diff --git a/content/base/src/nsDOMAttributeMap.cpp b/content/base/src/nsDOMAttributeMap.cpp index ef9a25af9789..f9fcc587da8d 100644 --- a/content/base/src/nsDOMAttributeMap.cpp +++ b/content/base/src/nsDOMAttributeMap.cpp @@ -49,7 +49,7 @@ nsDOMAttributeMap::nsDOMAttributeMap(nsIContent* aContent) : mContent(aContent) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // We don't add a reference to our content. If it goes away, // we'll be told to drop our reference } diff --git a/content/base/src/nsDOMBuilder.cpp b/content/base/src/nsDOMBuilder.cpp index 1798b00c395c..556403a2a396 100644 --- a/content/base/src/nsDOMBuilder.cpp +++ b/content/base/src/nsDOMBuilder.cpp @@ -63,7 +63,7 @@ nsDOMBuilder::nsDOMBuilder(PRUint16 aMode, const nsAString& aSchemaType, nsIDOMDOMImplementation* aDOMImplementation) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mDOMImplementation = aDOMImplementation; } diff --git a/content/base/src/nsDOMDocumentType.cpp b/content/base/src/nsDOMDocumentType.cpp index cae777eba736..238c1641db22 100644 --- a/content/base/src/nsDOMDocumentType.cpp +++ b/content/base/src/nsDOMDocumentType.cpp @@ -77,7 +77,7 @@ nsDOMDocumentType::nsDOMDocumentType(const nsAString& aName, mSystemId(aSystemId), mInternalSubset(aInternalSubset) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mEntities = aEntities; mNotations = aNotations; diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index 83c403ccca54..5c45d1976006 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -159,7 +159,7 @@ struct nsRadioGroupStruct nsDOMStyleSheetList::nsDOMStyleSheetList(nsIDocument *aDocument) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mLength = -1; // Not reference counted to avoid circular references. // The document will tell us when its going away. @@ -337,7 +337,7 @@ NS_NewDOMImplementation(nsIDOMDOMImplementation** aInstancePtrResult) nsDOMImplementation::nsDOMImplementation(nsIURI* aBaseURI) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mBaseURI = aBaseURI; } @@ -516,7 +516,7 @@ nsDocument::nsDocument() : mSubDocuments(nsnull), mCSSLoader(nsnull), mXPathDocument(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mArena = nsnull; mDocumentURL = nsnull; diff --git a/content/base/src/nsDocumentEncoder.cpp b/content/base/src/nsDocumentEncoder.cpp index e738303b0a83..076ca1b8a2c0 100644 --- a/content/base/src/nsDocumentEncoder.cpp +++ b/content/base/src/nsDocumentEncoder.cpp @@ -184,7 +184,7 @@ NS_INTERFACE_MAP_END nsDocumentEncoder::nsDocumentEncoder() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mMimeType.Assign(NS_LITERAL_STRING("text/plain")); diff --git a/content/base/src/nsDocumentViewer.cpp b/content/base/src/nsDocumentViewer.cpp index a468d1cc23a7..07911c9f144c 100644 --- a/content/base/src/nsDocumentViewer.cpp +++ b/content/base/src/nsDocumentViewer.cpp @@ -269,7 +269,7 @@ public: , mGotSelectionState(PR_FALSE) , mSelectionWasCollapsed(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } virtual ~nsDocViewerSelectionListener() {} @@ -2979,7 +2979,7 @@ NS_IMPL_ISUPPORTS1(nsDocViewerFocusListener, nsIDOMFocusListener); nsDocViewerFocusListener::nsDocViewerFocusListener() :mDocViewer(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDocViewerFocusListener::~nsDocViewerFocusListener(){} diff --git a/content/base/src/nsGeneratedIterator.cpp b/content/base/src/nsGeneratedIterator.cpp index 05aa8f735195..99869c0ca20f 100644 --- a/content/base/src/nsGeneratedIterator.cpp +++ b/content/base/src/nsGeneratedIterator.cpp @@ -251,7 +251,7 @@ nsGeneratedContentIterator::nsGeneratedContentIterator() : // don't need to explicitly initialize |nsCOMPtr|s, they will automatically be NULL mIsDone(PR_FALSE), mPre(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/content/base/src/nsGenericDOMNodeList.cpp b/content/base/src/nsGenericDOMNodeList.cpp index 726330ea7e48..fd251758f0fb 100644 --- a/content/base/src/nsGenericDOMNodeList.cpp +++ b/content/base/src/nsGenericDOMNodeList.cpp @@ -41,7 +41,7 @@ nsGenericDOMNodeList::nsGenericDOMNodeList() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsGenericDOMNodeList::~nsGenericDOMNodeList() diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp index 24a6f2d0c502..f22096393eae 100644 --- a/content/base/src/nsGenericElement.cpp +++ b/content/base/src/nsGenericElement.cpp @@ -797,7 +797,7 @@ nsGenericElement::nsGenericElement() : mDocument(nsnull), mParent(nsnull), mNodeInfo(nsnull), mFlagsOrSlots(GENERIC_ELEMENT_DOESNT_HAVE_DOMSLOTS) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsGenericElement::~nsGenericElement() diff --git a/content/base/src/nsNameSpaceManager.cpp b/content/base/src/nsNameSpaceManager.cpp index 365a8d3e842e..10df09aba1a1 100644 --- a/content/base/src/nsNameSpaceManager.cpp +++ b/content/base/src/nsNameSpaceManager.cpp @@ -219,7 +219,7 @@ NameSpaceImpl::NameSpaceImpl(nsINameSpaceManager* aManager, mPrefix(aPrefix) { NS_ASSERTION(aManager, "null namespace manager"); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF(mManager); NS_IF_ADDREF(mParent); NS_IF_ADDREF(mPrefix); @@ -236,7 +236,7 @@ NameSpaceImpl::NameSpaceImpl(nsINameSpaceManager* aManager, mID(aNameSpaceID) { NS_ASSERTION(aManager, "null namespace manager"); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF(mManager); NS_IF_ADDREF(mParent); NS_IF_ADDREF(mPrefix); @@ -413,7 +413,7 @@ NameSpaceManagerImpl::NameSpaceManagerImpl() NS_ASSERTION(!gNameSpaceManagerWasShutDown, "Namespace manager used past content module shutdown!!!"); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); InitializeNameSpaceManager(); } diff --git a/content/base/src/nsNodeInfo.cpp b/content/base/src/nsNodeInfo.cpp index 44ccc8d025a6..b3235a0aac23 100644 --- a/content/base/src/nsNodeInfo.cpp +++ b/content/base/src/nsNodeInfo.cpp @@ -50,7 +50,7 @@ nsNodeInfo::nsNodeInfo() : nsINodeInfo(), mOwnerManager(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/content/base/src/nsNodeInfoManager.cpp b/content/base/src/nsNodeInfoManager.cpp index 2d0c9afd0a2e..c3bd6019af4a 100644 --- a/content/base/src/nsNodeInfoManager.cpp +++ b/content/base/src/nsNodeInfoManager.cpp @@ -94,7 +94,7 @@ nsNodeInfoManager::NodeInfoInnerKeyCompare(const void *key1, const void *key2) nsNodeInfoManager::nsNodeInfoManager() : mDocument(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (gNodeManagerCount == 1 && gAnonymousNodeInfoManager) { /* diff --git a/content/base/src/nsPrintPreviewListener.cpp b/content/base/src/nsPrintPreviewListener.cpp index 669cb13340db..298c90a610d6 100644 --- a/content/base/src/nsPrintPreviewListener.cpp +++ b/content/base/src/nsPrintPreviewListener.cpp @@ -43,7 +43,7 @@ nsPrintPreviewListener::nsPrintPreviewListener (nsIDOMEventReceiver* aEVRec) : mEventReceiver(aEVRec), mRegFlags(REG_NONE_LISTENER) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); } // ctor diff --git a/content/base/src/nsRange.cpp b/content/base/src/nsRange.cpp index 2608ef094e15..2c569db3fe77 100644 --- a/content/base/src/nsRange.cpp +++ b/content/base/src/nsRange.cpp @@ -322,7 +322,7 @@ NS_NewRangeUtils(nsIRangeUtils** aResult) nsRangeUtils::nsRangeUtils() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsRangeUtils::~nsRangeUtils() @@ -421,7 +421,7 @@ nsRange::nsRange() : mStartParent(), mEndParent() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsRange::~nsRange() diff --git a/content/base/src/nsSelection.cpp b/content/base/src/nsSelection.cpp index 8e8560137fcb..227c7fe07943 100644 --- a/content/base/src/nsSelection.cpp +++ b/content/base/src/nsSelection.cpp @@ -810,7 +810,7 @@ IsValidSelectionPoint(nsSelection *aFrameSel, nsIContent *aContent) nsSelectionIterator::nsSelectionIterator(nsTypedSelection *aList) :mIndex(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (!aList) { NS_NOTREACHED("nsSelection"); @@ -967,7 +967,7 @@ nsSelectionIterator::QueryInterface(REFNSIID aIID, void** aInstancePtr) nsSelection::nsSelection() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); PRInt32 i; for (i = 0;iAddSheet(this); @@ -3288,7 +3288,7 @@ CSSRuleProcessor::CSSRuleProcessor(void) : mSheets(nsnull), mRuleCascades(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } static PRBool diff --git a/content/html/style/src/nsComputedDOMStyle.cpp b/content/html/style/src/nsComputedDOMStyle.cpp index 807d10f2a05e..145b9c45c5a3 100644 --- a/content/html/style/src/nsComputedDOMStyle.cpp +++ b/content/html/style/src/nsComputedDOMStyle.cpp @@ -295,7 +295,7 @@ NS_NewComputedDOMStyle(nsIComputedDOMStyle** aComputedStyle) nsComputedDOMStyle::nsComputedDOMStyle() : mPresShellWeak(nsnull), mT2P(0.0f) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/content/html/style/src/nsDOMCSSDeclaration.cpp b/content/html/style/src/nsDOMCSSDeclaration.cpp index 3670837067bf..83d93ddccc9d 100644 --- a/content/html/style/src/nsDOMCSSDeclaration.cpp +++ b/content/html/style/src/nsDOMCSSDeclaration.cpp @@ -50,7 +50,7 @@ nsDOMCSSDeclaration::nsDOMCSSDeclaration() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDOMCSSDeclaration::~nsDOMCSSDeclaration() diff --git a/content/html/style/src/nsDOMCSSRGBColor.cpp b/content/html/style/src/nsDOMCSSRGBColor.cpp index cd049bf3892c..78fcd6e7daea 100644 --- a/content/html/style/src/nsDOMCSSRGBColor.cpp +++ b/content/html/style/src/nsDOMCSSRGBColor.cpp @@ -48,7 +48,7 @@ nsDOMCSSRGBColor::nsDOMCSSRGBColor(nsIDOMCSSPrimitiveValue* aRed, nsIDOMCSSPrimitiveValue* aBlue) : mRed(aRed), mGreen(aGreen), mBlue(aBlue) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDOMCSSRGBColor::~nsDOMCSSRGBColor(void) diff --git a/content/html/style/src/nsDOMCSSRect.cpp b/content/html/style/src/nsDOMCSSRect.cpp index 139077e18921..2dfc6197ec50 100644 --- a/content/html/style/src/nsDOMCSSRect.cpp +++ b/content/html/style/src/nsDOMCSSRect.cpp @@ -48,7 +48,7 @@ nsDOMCSSRect::nsDOMCSSRect(nsIDOMCSSPrimitiveValue* aTop, nsIDOMCSSPrimitiveValue* aLeft) : mTop(aTop), mRight(aRight), mBottom(aBottom), mLeft(aLeft) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDOMCSSRect::~nsDOMCSSRect(void) diff --git a/content/html/style/src/nsDOMCSSValueList.cpp b/content/html/style/src/nsDOMCSSValueList.cpp index 6cbf32e177f4..25699ec44e3f 100644 --- a/content/html/style/src/nsDOMCSSValueList.cpp +++ b/content/html/style/src/nsDOMCSSValueList.cpp @@ -44,7 +44,7 @@ nsDOMCSSValueList::nsDOMCSSValueList(PRBool aCommaDelimited, PRBool aReadonly) : mCommaDelimited(aCommaDelimited), mReadonly(aReadonly) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDOMCSSValueList::~nsDOMCSSValueList() diff --git a/content/html/style/src/nsHTMLCSSStyleSheet.cpp b/content/html/style/src/nsHTMLCSSStyleSheet.cpp index 0ef67b179e2f..fe941cb29ce3 100644 --- a/content/html/style/src/nsHTMLCSSStyleSheet.cpp +++ b/content/html/style/src/nsHTMLCSSStyleSheet.cpp @@ -84,7 +84,7 @@ public: CSSFirstLineRule::CSSFirstLineRule(nsIHTMLCSSStyleSheet* aSheet) : mSheet(aSheet) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } CSSFirstLineRule::~CSSFirstLineRule() diff --git a/content/html/style/src/nsHTMLStyleSheet.cpp b/content/html/style/src/nsHTMLStyleSheet.cpp index c4b6ed6fb7d1..4ca2a9ad92cf 100644 --- a/content/html/style/src/nsHTMLStyleSheet.cpp +++ b/content/html/style/src/nsHTMLStyleSheet.cpp @@ -110,7 +110,7 @@ protected: HTMLColorRule::HTMLColorRule(nsIHTMLStyleSheet* aSheet) : mSheet(aSheet) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } HTMLColorRule::~HTMLColorRule() @@ -298,7 +298,7 @@ public: GenericTableRule::GenericTableRule(nsIHTMLStyleSheet* aSheet) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mSheet = aSheet; } @@ -865,7 +865,7 @@ HTMLStyleSheetImpl::HTMLStyleSheetImpl(void) mActiveRule(nsnull), mDocumentColorRule(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mMappedAttrTable.ops = nsnull; } diff --git a/content/html/style/src/nsROCSSPrimitiveValue.cpp b/content/html/style/src/nsROCSSPrimitiveValue.cpp index a73c83e2caad..4d328f46b68f 100644 --- a/content/html/style/src/nsROCSSPrimitiveValue.cpp +++ b/content/html/style/src/nsROCSSPrimitiveValue.cpp @@ -49,7 +49,7 @@ nsROCSSPrimitiveValue::nsROCSSPrimitiveValue(float aT2P) : mType(CSS_PX), mT2P(aT2P) { mValue.mTwips = 0; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/content/xbl/src/nsBindingManager.cpp b/content/xbl/src/nsBindingManager.cpp index 93d3938db59e..8a8e708be7cd 100644 --- a/content/xbl/src/nsBindingManager.cpp +++ b/content/xbl/src/nsBindingManager.cpp @@ -411,7 +411,7 @@ NS_IMPL_ISUPPORTS3(nsBindingManager, nsIBindingManager, nsIStyleRuleSupplier, ns // Constructors/Destructors nsBindingManager::nsBindingManager(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mBindingTable = nsnull; mContentListTable = nsnull; diff --git a/content/xbl/src/nsXBLBinding.cpp b/content/xbl/src/nsXBLBinding.cpp index c10a7b6a60be..fe53724f7a21 100644 --- a/content/xbl/src/nsXBLBinding.cpp +++ b/content/xbl/src/nsXBLBinding.cpp @@ -243,7 +243,7 @@ nsXBLBinding::nsXBLBinding(nsIXBLPrototypeBinding* aBinding) mIsStyleBinding(PR_TRUE), mMarkedForDeath(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mPrototypeBinding = aBinding; gRefCnt++; // printf("REF COUNT UP: %d %s\n", gRefCnt, (const char*)mID); diff --git a/content/xbl/src/nsXBLDocumentInfo.cpp b/content/xbl/src/nsXBLDocumentInfo.cpp index ea44c9e48099..f62bb6b78a31 100644 --- a/content/xbl/src/nsXBLDocumentInfo.cpp +++ b/content/xbl/src/nsXBLDocumentInfo.cpp @@ -133,7 +133,7 @@ nsXBLDocGlobalObject::nsXBLDocGlobalObject() : mJSObject(nsnull), mGlobalObjectOwner(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/content/xbl/src/nsXBLEventHandler.cpp b/content/xbl/src/nsXBLEventHandler.cpp index 9135c5a0aeaf..b3ae3ecda121 100644 --- a/content/xbl/src/nsXBLEventHandler.cpp +++ b/content/xbl/src/nsXBLEventHandler.cpp @@ -80,7 +80,7 @@ nsXBLEventHandler::nsXBLEventHandler(nsIDOMEventReceiver* aEventReceiver, nsIXBLPrototypeHandler* aHandler) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mEventReceiver = aEventReceiver; mProtoHandler = aHandler; mNextHandler = nsnull; diff --git a/content/xbl/src/nsXBLInsertionPoint.cpp b/content/xbl/src/nsXBLInsertionPoint.cpp index 400086d78068..761e9a9a3e81 100644 --- a/content/xbl/src/nsXBLInsertionPoint.cpp +++ b/content/xbl/src/nsXBLInsertionPoint.cpp @@ -45,7 +45,7 @@ nsXBLInsertionPoint::nsXBLInsertionPoint(nsIContent* aParentElement, PRUint32 aIndex, nsIContent* aDefaultContent) :mElements(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mParentElement = aParentElement; mIndex = aIndex; mDefaultContentTemplate = aDefaultContent; diff --git a/content/xbl/src/nsXBLPrototypeBinding.cpp b/content/xbl/src/nsXBLPrototypeBinding.cpp index d49cdcfc80e3..fc1a360e45d0 100644 --- a/content/xbl/src/nsXBLPrototypeBinding.cpp +++ b/content/xbl/src/nsXBLPrototypeBinding.cpp @@ -137,7 +137,7 @@ public: protected: nsXBLAttributeEntry(nsIAtom* aSrcAtom, nsIAtom* aDstAtom, nsIContent* aContent) { - NS_INIT_REFCNT(); mSrcAttribute = aSrcAtom; mDstAttribute = aDstAtom; mElement = aContent; + NS_INIT_ISUPPORTS(); mSrcAttribute = aSrcAtom; mDstAttribute = aDstAtom; mElement = aContent; } virtual ~nsXBLAttributeEntry() {} @@ -208,7 +208,7 @@ public: protected: nsXBLInsertionPointEntry(nsIContent* aParent) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mInsertionIndex = 0; mInsertionParent = aParent; }; @@ -266,7 +266,7 @@ nsXBLPrototypeBinding::nsXBLPrototypeBinding(const nsACString& aID, nsIXBLDocume mInsertionPointTable(nsnull), mInterfaceTable(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mID = ToNewCString(aID); diff --git a/content/xbl/src/nsXBLPrototypeHandler.cpp b/content/xbl/src/nsXBLPrototypeHandler.cpp index e6074fb6a034..4f1fd6107b84 100644 --- a/content/xbl/src/nsXBLPrototypeHandler.cpp +++ b/content/xbl/src/nsXBLPrototypeHandler.cpp @@ -99,7 +99,7 @@ nsXBLPrototypeHandler::nsXBLPrototypeHandler(const PRUnichar* aEvent, const PRUn const PRUnichar* aModifiers, const PRUnichar* aButton, const PRUnichar* aClickCount, const PRUnichar* aPreventDefault) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); ++gRefCnt; if (gRefCnt == 1) // Get the primary accelerator key. @@ -113,7 +113,7 @@ nsXBLPrototypeHandler::nsXBLPrototypeHandler(const PRUnichar* aEvent, const PRUn nsXBLPrototypeHandler::nsXBLPrototypeHandler(nsIContent* aHandlerElement) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); ++gRefCnt; if (gRefCnt == 1) diff --git a/content/xbl/src/nsXBLResourceLoader.cpp b/content/xbl/src/nsXBLResourceLoader.cpp index 05f30011c335..3d8f54c03096 100644 --- a/content/xbl/src/nsXBLResourceLoader.cpp +++ b/content/xbl/src/nsXBLResourceLoader.cpp @@ -70,7 +70,7 @@ nsXBLResourceLoader::nsXBLResourceLoader(nsIXBLPrototypeBinding* aBinding, nsXBL mInLoadResourcesFunc(PR_FALSE), mPendingSheets(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsXBLResourceLoader::~nsXBLResourceLoader() diff --git a/content/xbl/src/nsXBLService.cpp b/content/xbl/src/nsXBLService.cpp index e8e876e8ab29..3e1c4fc04521 100644 --- a/content/xbl/src/nsXBLService.cpp +++ b/content/xbl/src/nsXBLService.cpp @@ -478,7 +478,7 @@ private: public: nsProxyStream(void) : mBuffer(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } virtual ~nsProxyStream(void) { @@ -562,7 +562,7 @@ NS_IMPL_ISUPPORTS3(nsXBLService, nsIXBLService, nsIObserver, nsISupportsWeakRefe // Constructors/Destructors nsXBLService::nsXBLService(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mPool.Init("XBL Binding Requests", kBucketSizes, kNumBuckets, kInitialSize); gRefCnt++; diff --git a/content/xml/content/src/nsXMLNamedNodeMap.cpp b/content/xml/content/src/nsXMLNamedNodeMap.cpp index 4d623484866b..a6cf1d5acbc8 100644 --- a/content/xml/content/src/nsXMLNamedNodeMap.cpp +++ b/content/xml/content/src/nsXMLNamedNodeMap.cpp @@ -93,7 +93,7 @@ NS_NewXMLNamedNodeMap(nsIDOMNamedNodeMap** aInstancePtrResult, nsXMLNamedNodeMap::nsXMLNamedNodeMap(nsISupportsArray *aArray) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mArray = aArray; diff --git a/content/xml/document/src/nsLoadSaveContentSink.cpp b/content/xml/document/src/nsLoadSaveContentSink.cpp index b4d2dfdb05a9..823a6aadfede 100644 --- a/content/xml/document/src/nsLoadSaveContentSink.cpp +++ b/content/xml/document/src/nsLoadSaveContentSink.cpp @@ -62,7 +62,7 @@ NS_NewLoadSaveContentSink(nsILoadSaveContentSink** aResult, nsLoadSaveContentSink::nsLoadSaveContentSink() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsLoadSaveContentSink::~nsLoadSaveContentSink() diff --git a/content/xml/document/src/nsXMLContentSink.cpp b/content/xml/document/src/nsXMLContentSink.cpp index d42b117abdfb..64fbf8f64d96 100644 --- a/content/xml/document/src/nsXMLContentSink.cpp +++ b/content/xml/document/src/nsXMLContentSink.cpp @@ -161,7 +161,7 @@ NS_NewXMLContentSink(nsIXMLContentSink** aResult, nsXMLContentSink::nsXMLContentSink() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); gRefCnt++; if (gRefCnt == 1) { #ifdef DEBUG @@ -1514,7 +1514,7 @@ public: XMLElementFactoryImpl::XMLElementFactoryImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } XMLElementFactoryImpl::~XMLElementFactoryImpl() @@ -1575,7 +1575,7 @@ public: MathMLElementFactoryImpl::MathMLElementFactoryImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } MathMLElementFactoryImpl::~MathMLElementFactoryImpl() diff --git a/content/xsl/document/src/nsTransformMediator.cpp b/content/xsl/document/src/nsTransformMediator.cpp index a4a225fba283..fa1042175f33 100644 --- a/content/xsl/document/src/nsTransformMediator.cpp +++ b/content/xsl/document/src/nsTransformMediator.cpp @@ -62,7 +62,7 @@ NS_NewTransformMediator(nsITransformMediator** aInstancePtrResult, nsTransformMediator::nsTransformMediator() : mEnabled(PR_FALSE), mStyleInvalid(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsTransformMediator::~nsTransformMediator() diff --git a/content/xul/content/src/nsRDFDOMNodeList.cpp b/content/xul/content/src/nsRDFDOMNodeList.cpp index e4a8e3af9448..dcc2357936f8 100644 --- a/content/xul/content/src/nsRDFDOMNodeList.cpp +++ b/content/xul/content/src/nsRDFDOMNodeList.cpp @@ -63,7 +63,7 @@ nsRDFDOMNodeList::nsRDFDOMNodeList(void) : //mInner(nsnull), Not being used? mElements(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsRDFDOMNodeList::~nsRDFDOMNodeList(void) diff --git a/content/xul/content/src/nsXULAttributes.cpp b/content/xul/content/src/nsXULAttributes.cpp index 0072a6eebcbb..8bc9fc4730f0 100644 --- a/content/xul/content/src/nsXULAttributes.cpp +++ b/content/xul/content/src/nsXULAttributes.cpp @@ -159,7 +159,7 @@ nsXULAttribute::nsXULAttribute(nsIContent* aContent, : mContent(aContent), mNodeInfo(aNodeInfo) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_IF_ADDREF(aNodeInfo); SetValueInternal(aValue); } @@ -507,7 +507,7 @@ nsXULAttributes::nsXULAttributes(nsIContent* aContent) mClassList(nsnull), mStyleRule(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp index b5eb895b4a63..d18c9e8a0fc0 100644 --- a/content/xul/content/src/nsXULElement.cpp +++ b/content/xul/content/src/nsXULElement.cpp @@ -460,7 +460,7 @@ nsXULElement::nsXULElement() mBindingParent(nsnull), mSlots(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); XUL_PROTOTYPE_ATTRIBUTE_METER(gNumElements); } diff --git a/content/xul/content/src/nsXULPopupListener.cpp b/content/xul/content/src/nsXULPopupListener.cpp index 121d726a8279..6995a3cab56d 100644 --- a/content/xul/content/src/nsXULPopupListener.cpp +++ b/content/xul/content/src/nsXULPopupListener.cpp @@ -146,7 +146,7 @@ private: XULPopupListenerImpl::XULPopupListenerImpl(void) : mElement(nsnull), mPopupContent(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } XULPopupListenerImpl::~XULPopupListenerImpl(void) diff --git a/content/xul/document/src/nsXULCommandDispatcher.cpp b/content/xul/document/src/nsXULCommandDispatcher.cpp index 7c04ab48139d..6a9bffc90cdc 100644 --- a/content/xul/document/src/nsXULCommandDispatcher.cpp +++ b/content/xul/document/src/nsXULCommandDispatcher.cpp @@ -79,7 +79,7 @@ static PRLogModuleInfo* gLog; nsXULCommandDispatcher::nsXULCommandDispatcher(nsIDocument* aDocument) : mFocusController(nsnull), mDocument(aDocument), mUpdaters(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef PR_LOGGING if (! gLog) diff --git a/content/xul/document/src/nsXULContentSink.cpp b/content/xul/document/src/nsXULContentSink.cpp index 0e441e11d810..75f24e26ee8b 100644 --- a/content/xul/document/src/nsXULContentSink.cpp +++ b/content/xul/document/src/nsXULContentSink.cpp @@ -355,7 +355,7 @@ XULContentSinkImpl::XULContentSinkImpl(nsresult& rv) mState(eInProlog), mParser(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (gRefCnt++ == 0) { rv = nsComponentManager::CreateInstance(kNameSpaceManagerCID, diff --git a/content/xul/document/src/nsXULControllers.cpp b/content/xul/document/src/nsXULControllers.cpp index a745cf6e1208..93d6a0672477 100644 --- a/content/xul/document/src/nsXULControllers.cpp +++ b/content/xul/document/src/nsXULControllers.cpp @@ -59,7 +59,7 @@ nsXULControllers::nsXULControllers() : mCurControllerID(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsXULControllers::~nsXULControllers(void) diff --git a/content/xul/document/src/nsXULDocument.cpp b/content/xul/document/src/nsXULDocument.cpp index ac8ca5dd8aa4..057409bc608b 100644 --- a/content/xul/document/src/nsXULDocument.cpp +++ b/content/xul/document/src/nsXULDocument.cpp @@ -243,7 +243,7 @@ private: public: nsProxyLoadStream(void) : mBuffer(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } virtual ~nsProxyLoadStream(void) { @@ -380,7 +380,7 @@ PlaceHolderRequest::Create(nsIRequest** aResult) PlaceHolderRequest::PlaceHolderRequest() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (gRefCnt++ == 0) { nsresult rv; @@ -431,7 +431,7 @@ nsXULDocument::nsXULDocument(void) mCurrentScriptProto(nsnull), mBroadcasterMap(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mCharSetID.Assign(NS_LITERAL_STRING("UTF-8")); // Force initialization. @@ -6951,7 +6951,7 @@ nsXULDocument::CachedChromeStreamListener::CachedChromeStreamListener(nsXULDocum : mDocument(aDocument), mProtoLoaded(aProtoLoaded) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF(mDocument); } @@ -7007,7 +7007,7 @@ nsXULDocument::CachedChromeStreamListener::OnDataAvailable(nsIRequest *request, nsXULDocument::ParserObserver::ParserObserver(nsXULDocument* aDocument) : mDocument(aDocument) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF(mDocument); } @@ -7131,7 +7131,7 @@ PRInt32 XULElementFactoryImpl::kNameSpaceID_XUL; XULElementFactoryImpl::XULElementFactoryImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (!gIsInitialized) { nsCOMPtr nsmgr = diff --git a/content/xul/document/src/nsXULPrototypeCache.cpp b/content/xul/document/src/nsXULPrototypeCache.cpp index 3a71141ec5be..fa78ca52e01e 100644 --- a/content/xul/document/src/nsXULPrototypeCache.cpp +++ b/content/xul/document/src/nsXULPrototypeCache.cpp @@ -194,7 +194,7 @@ nsIFile* nsXULPrototypeCache::gFastLoadFile = nsnull; nsXULPrototypeCache::nsXULPrototypeCache() : mJSRuntime(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } @@ -759,7 +759,7 @@ class nsXULFastLoadFileIO : public nsIFastLoadFileIO public: nsXULFastLoadFileIO(nsIFile* aFile) : mFile(aFile) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); MOZ_COUNT_CTOR(nsXULFastLoadFileIO); } diff --git a/content/xul/document/src/nsXULPrototypeDocument.cpp b/content/xul/document/src/nsXULPrototypeDocument.cpp index 04c32b21ab1e..1f54ad146551 100644 --- a/content/xul/document/src/nsXULPrototypeDocument.cpp +++ b/content/xul/document/src/nsXULPrototypeDocument.cpp @@ -227,7 +227,7 @@ nsXULPrototypeDocument::nsXULPrototypeDocument() mGlobalObject(nsnull), mLoaded(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } @@ -731,7 +731,7 @@ nsXULPDGlobalObject::nsXULPDGlobalObject() : mJSObject(nsnull), mGlobalObjectOwner(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/content/xul/templates/src/nsXULSortService.cpp b/content/xul/templates/src/nsXULSortService.cpp index f7da5ad236b3..37aa40a833c0 100644 --- a/content/xul/templates/src/nsXULSortService.cpp +++ b/content/xul/templates/src/nsXULSortService.cpp @@ -224,7 +224,7 @@ PRInt32 XULSortServiceImpl::kNameSpaceID_RDF; XULSortServiceImpl::XULSortServiceImpl(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (gRefCnt == 0) { kStaticHintAtom = NS_NewAtom("staticHint"); kStaticsSortLastHintAtom = NS_NewAtom("sortStaticsLast"); diff --git a/content/xul/templates/src/nsXULTemplateBuilder.cpp b/content/xul/templates/src/nsXULTemplateBuilder.cpp index f4e3e41fa66b..a54bee2c9326 100644 --- a/content/xul/templates/src/nsXULTemplateBuilder.cpp +++ b/content/xul/templates/src/nsXULTemplateBuilder.cpp @@ -161,7 +161,7 @@ nsXULTemplateBuilder::nsXULTemplateBuilder(void) mFlags(0), mTop(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsXULTemplateBuilder::~nsXULTemplateBuilder(void) diff --git a/db/mork/build/nsMorkFactory.cpp b/db/mork/build/nsMorkFactory.cpp index 10cb927fee26..67f7e3cf38ed 100644 --- a/db/mork/build/nsMorkFactory.cpp +++ b/db/mork/build/nsMorkFactory.cpp @@ -97,7 +97,7 @@ nsMorkFactoryFactory::QueryInterface(REFNSIID iid, void** result) nsMorkFactoryFactory::nsMorkFactoryFactory() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMETHODIMP nsMorkFactoryFactory::GetMdbFactory(nsIMdbFactory **aFactory) diff --git a/db/mork/src/morkObject.cpp b/db/mork/src/morkObject.cpp index d88143d2df60..a18dfe871680 100644 --- a/db/mork/src/morkObject.cpp +++ b/db/mork/src/morkObject.cpp @@ -95,7 +95,7 @@ morkObject::morkObject(const morkUsage& inUsage, nsIMdbHeap* ioHeap, : morkBead(inUsage, ioHeap, inBeadColor) , mObject_Handle( 0 ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mMorkEnv = nsnull; } @@ -107,7 +107,7 @@ morkObject::morkObject(morkEnv* ev, , mObject_Handle( 0 ) { mMorkEnv = ev; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if ( ev->Good() ) { if ( ioHandle ) diff --git a/db/mork/src/orkinRow.cpp b/db/mork/src/orkinRow.cpp index c40769e6313d..c37ae15cba2b 100644 --- a/db/mork/src/orkinRow.cpp +++ b/db/mork/src/orkinRow.cpp @@ -113,7 +113,7 @@ orkinRow::orkinRow(morkEnv* ev, // morkUsage is morkUsage_kPool morkRowObject* ioObject) // must not be nil, the object for this handle : morkHandle(ev, ioFace, ioObject, morkMagic_kRow) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // do not modify mNode_Derived; leave it equal to morkDerived_kHandle } diff --git a/docshell/base/nsDSURIContentListener.cpp b/docshell/base/nsDSURIContentListener.cpp index 0d7b0a260d2d..0620f9e30521 100644 --- a/docshell/base/nsDSURIContentListener.cpp +++ b/docshell/base/nsDSURIContentListener.cpp @@ -34,7 +34,7 @@ nsDSURIContentListener::nsDSURIContentListener() : mDocShell(nsnull), mParentContentListener(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDSURIContentListener::~nsDSURIContentListener() diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index cf04ecb40b1a..72ca1505254a 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -220,7 +220,7 @@ nsDocShell::nsDocShell(): mTreeOwner(nsnull), mChromeEventHandler(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef PR_LOGGING if (! gDocShellLog) gDocShellLog = PR_NewLogModule("nsDocShell"); @@ -6565,7 +6565,7 @@ nsDocShell::IsBeingDestroyed(PRBool *aDoomed) nsRefreshTimer::nsRefreshTimer():mRepeat(PR_FALSE), mDelay(0), mMetaRefresh(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsRefreshTimer::~nsRefreshTimer() @@ -6677,7 +6677,7 @@ nsDocShellFocusController::ClosingDown(nsIDocShell* aDocShell) //***************************************************************************** nsDocShell::InterfaceRequestorProxy::InterfaceRequestorProxy(nsIInterfaceRequestor* p) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (p) { mWeakPtr = getter_AddRefs(NS_GetWeakReference(p)); } diff --git a/docshell/base/nsDocShellEnumerator.cpp b/docshell/base/nsDocShellEnumerator.cpp index 740de2e85f6b..0405e41a994a 100644 --- a/docshell/base/nsDocShellEnumerator.cpp +++ b/docshell/base/nsDocShellEnumerator.cpp @@ -32,7 +32,7 @@ nsDocShellEnumerator::nsDocShellEnumerator(PRInt32 inEnumerationDirection) , mDocShellType(nsIDocShellTreeItem::typeAll) , mEnumerationDirection(inEnumerationDirection) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDocShellEnumerator::~nsDocShellEnumerator() diff --git a/docshell/base/nsDocShellLoadInfo.cpp b/docshell/base/nsDocShellLoadInfo.cpp index 24a315672868..1f1fb0e25e68 100644 --- a/docshell/base/nsDocShellLoadInfo.cpp +++ b/docshell/base/nsDocShellLoadInfo.cpp @@ -31,7 +31,7 @@ nsDocShellLoadInfo::nsDocShellLoadInfo() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mLoadType = nsIDocShellLoadInfo::loadNormal; mInheritOwner = PR_FALSE; } diff --git a/docshell/base/nsWebShell.cpp b/docshell/base/nsWebShell.cpp index d408b3c2212e..1f14ecc0fd93 100644 --- a/docshell/base/nsWebShell.cpp +++ b/docshell/base/nsWebShell.cpp @@ -175,7 +175,7 @@ nsWebShell::nsWebShell() : nsDocShell() printf("WEBSHELL+ = %ld\n", gNumberOfWebShells); #endif - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mThread = nsnull; InitFrameData(); mItemType = typeContent; diff --git a/dom/src/base/nsBarProps.cpp b/dom/src/base/nsBarProps.cpp index 77dc9710fe7d..1527afa4a0c8 100644 --- a/dom/src/base/nsBarProps.cpp +++ b/dom/src/base/nsBarProps.cpp @@ -56,7 +56,7 @@ // BarPropImpl::BarPropImpl() : mBrowserChrome(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } BarPropImpl::~BarPropImpl() diff --git a/dom/src/base/nsDOMClassInfo.cpp b/dom/src/base/nsDOMClassInfo.cpp index e5079f477f43..591c552576ce 100644 --- a/dom/src/base/nsDOMClassInfo.cpp +++ b/dom/src/base/nsDOMClassInfo.cpp @@ -1024,7 +1024,7 @@ nsDOMClassInfo::ThrowJSException(JSContext *cx, nsresult aResult) nsDOMClassInfo::nsDOMClassInfo(nsDOMClassInfoData* aData) : mData(aData) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDOMClassInfo::~nsDOMClassInfo() diff --git a/dom/src/base/nsDOMWindowList.cpp b/dom/src/base/nsDOMWindowList.cpp index 6c91e20c46b3..3426348f5738 100644 --- a/dom/src/base/nsDOMWindowList.cpp +++ b/dom/src/base/nsDOMWindowList.cpp @@ -57,7 +57,7 @@ nsDOMWindowList::nsDOMWindowList(nsIDocShell *aDocShell) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); SetDocShell(aDocShell); } diff --git a/dom/src/base/nsFocusController.cpp b/dom/src/base/nsFocusController.cpp index 6cbcd0545950..a35acb20bfeb 100644 --- a/dom/src/base/nsFocusController.cpp +++ b/dom/src/base/nsFocusController.cpp @@ -61,7 +61,7 @@ nsFocusController::nsFocusController(void) mActive(PR_FALSE), mUpdateWindowWatcher(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsFocusController::~nsFocusController(void) diff --git a/dom/src/base/nsGlobalWindow.cpp b/dom/src/base/nsGlobalWindow.cpp index 68be47fda280..7ef76fae8004 100644 --- a/dom/src/base/nsGlobalWindow.cpp +++ b/dom/src/base/nsGlobalWindow.cpp @@ -205,7 +205,7 @@ GlobalWindowImpl::GlobalWindowImpl() : mDocShell(nsnull), mMutationBits(0), mChromeEventHandler(nsnull), mFrameElement(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // We could have failed the first time through trying // to create the entropy collector, so we should // try to get one until we succeed. @@ -5364,7 +5364,7 @@ NavigatorImpl::NavigatorImpl(nsIDocShell *aDocShell) : mPlugins(nsnull), mDocShell(aDocShell) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NavigatorImpl::~NavigatorImpl() @@ -5911,7 +5911,7 @@ NS_INTERFACE_MAP_END nsDOMWindowController::nsDOMWindowController(nsIDOMWindowInternal *aWindow) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mWindow = aWindow; // Set mBrowseWithCaret so we don't need to check pref every time diff --git a/dom/src/base/nsHistory.cpp b/dom/src/base/nsHistory.cpp index 583d541f6781..0dc5808fd9a2 100644 --- a/dom/src/base/nsHistory.cpp +++ b/dom/src/base/nsHistory.cpp @@ -58,7 +58,7 @@ // HistoryImpl::HistoryImpl(nsIDocShell* aDocShell) : mDocShell(aDocShell) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } HistoryImpl::~HistoryImpl() diff --git a/dom/src/base/nsJSEnvironment.cpp b/dom/src/base/nsJSEnvironment.cpp index 6fe8634ed809..07a6a2cd25a2 100644 --- a/dom/src/base/nsJSEnvironment.cpp +++ b/dom/src/base/nsJSEnvironment.cpp @@ -386,7 +386,7 @@ nsJSContext::JSOptionChangedCallback(const char *pref, void *data) nsJSContext::nsJSContext(JSRuntime *aRuntime) : mGCOnDestruction(PR_TRUE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); ++sContextCount; diff --git a/dom/src/base/nsLocation.cpp b/dom/src/base/nsLocation.cpp index da4e5d2b74a3..bf507aa0941b 100644 --- a/dom/src/base/nsLocation.cpp +++ b/dom/src/base/nsLocation.cpp @@ -106,7 +106,7 @@ static nsresult GetDocumentCharacterSetForURI(const nsAString& aHref, nsACString LocationImpl::LocationImpl(nsIDocShell *aDocShell) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mDocShell = aDocShell; // Weak Reference } diff --git a/dom/src/base/nsScreen.cpp b/dom/src/base/nsScreen.cpp index c520eb610e72..4484b74d0a39 100644 --- a/dom/src/base/nsScreen.cpp +++ b/dom/src/base/nsScreen.cpp @@ -55,7 +55,7 @@ // ScreenImpl::ScreenImpl(nsIDocShell* aDocShell) : mDocShell(aDocShell) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } ScreenImpl::~ScreenImpl() diff --git a/dom/src/build/nsDOMFactory.cpp b/dom/src/build/nsDOMFactory.cpp index 67448b863e7c..5a27d9706f6d 100644 --- a/dom/src/build/nsDOMFactory.cpp +++ b/dom/src/build/nsDOMFactory.cpp @@ -113,7 +113,7 @@ public: nsDOMSOFactory::nsDOMSOFactory() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); nsCOMPtr observerService = do_GetService("@mozilla.org/observer-service;1"); diff --git a/dom/src/events/nsJSEventListener.cpp b/dom/src/events/nsJSEventListener.cpp index 28f1c42c4a5f..02e28b43391c 100644 --- a/dom/src/events/nsJSEventListener.cpp +++ b/dom/src/events/nsJSEventListener.cpp @@ -53,7 +53,7 @@ nsJSEventListener::nsJSEventListener(nsIScriptContext *aContext, nsISupports *aObject) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // mObject is a weak reference. We are guaranteed // because of the ownership model that this object will be diff --git a/dom/src/jsurl/nsJSProtocolHandler.cpp b/dom/src/jsurl/nsJSProtocolHandler.cpp index 13bda2d98691..5557881705ff 100644 --- a/dom/src/jsurl/nsJSProtocolHandler.cpp +++ b/dom/src/jsurl/nsJSProtocolHandler.cpp @@ -711,7 +711,7 @@ nsJSChannel::SetContentLength(PRInt32 aContentLength) nsJSProtocolHandler::nsJSProtocolHandler() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult diff --git a/editor/composer/src/nsComposerCommands.cpp b/editor/composer/src/nsComposerCommands.cpp index ffceca733b38..5fc7cd2aaca1 100644 --- a/editor/composer/src/nsComposerCommands.cpp +++ b/editor/composer/src/nsComposerCommands.cpp @@ -80,7 +80,7 @@ nsresult GetListItemState(nsIEditor *aEditor, PRBool *aMixed, PRUnichar **_retva nsBaseComposerCommand::nsBaseComposerCommand() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsBaseComposerCommand, nsIControllerCommand) diff --git a/editor/composer/src/nsComposerCommandsUpdater.cpp b/editor/composer/src/nsComposerCommandsUpdater.cpp index c9978fbd5901..d1fff99df047 100644 --- a/editor/composer/src/nsComposerCommandsUpdater.cpp +++ b/editor/composer/src/nsComposerCommandsUpdater.cpp @@ -45,7 +45,7 @@ nsComposerCommandsUpdater::nsComposerCommandsUpdater() , mSelectionCollapsed(eStateUninitialized) , mFirstDoOfFirstUndo(PR_TRUE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsComposerCommandsUpdater::~nsComposerCommandsUpdater() diff --git a/editor/composer/src/nsComposerController.cpp b/editor/composer/src/nsComposerController.cpp index 6e6be6ea3ee0..38290918ed2d 100644 --- a/editor/composer/src/nsComposerController.cpp +++ b/editor/composer/src/nsComposerController.cpp @@ -74,7 +74,7 @@ NS_INTERFACE_MAP_END nsComposerController::nsComposerController() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsComposerController::~nsComposerController() diff --git a/editor/composer/src/nsEditorParserObserver.cpp b/editor/composer/src/nsEditorParserObserver.cpp index 2babb5d95cde..62c237853b6b 100644 --- a/editor/composer/src/nsEditorParserObserver.cpp +++ b/editor/composer/src/nsEditorParserObserver.cpp @@ -57,7 +57,7 @@ NS_INTERFACE_MAP_END nsEditorParserObserver::nsEditorParserObserver() : mBadTagFound(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsEditorParserObserver::~nsEditorParserObserver() diff --git a/editor/composer/src/nsEditorShell.cpp b/editor/composer/src/nsEditorShell.cpp index f3dbb14d31a1..5dd58783b073 100644 --- a/editor/composer/src/nsEditorShell.cpp +++ b/editor/composer/src/nsEditorShell.cpp @@ -257,7 +257,7 @@ nsEditorShell::nsEditorShell() , mDictionaryIndex(0) { //TODO:Save last-used display mode in prefs so new window inherits? - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsEditorShell::~nsEditorShell() diff --git a/editor/composer/src/nsEditorShellMouseListener.cpp b/editor/composer/src/nsEditorShellMouseListener.cpp index 2fc24abffe65..fbe4d07d0284 100644 --- a/editor/composer/src/nsEditorShellMouseListener.cpp +++ b/editor/composer/src/nsEditorShellMouseListener.cpp @@ -62,7 +62,7 @@ NS_IMPL_RELEASE(nsEditorShellMouseListener) nsEditorShellMouseListener::nsEditorShellMouseListener() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsEditorShellMouseListener::~nsEditorShellMouseListener() diff --git a/editor/composer/src/nsInterfaceState.cpp b/editor/composer/src/nsInterfaceState.cpp index e03548d23229..e6051d1f80f0 100644 --- a/editor/composer/src/nsInterfaceState.cpp +++ b/editor/composer/src/nsInterfaceState.cpp @@ -63,7 +63,7 @@ nsInterfaceState::nsInterfaceState() , mFirstDoOfFirstUndo(PR_TRUE) , mBatchDepth(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsInterfaceState::~nsInterfaceState() diff --git a/editor/libeditor/base/EditAggregateTxn.cpp b/editor/libeditor/base/EditAggregateTxn.cpp index c499ffa29510..781feae3ed06 100644 --- a/editor/libeditor/base/EditAggregateTxn.cpp +++ b/editor/libeditor/base/EditAggregateTxn.cpp @@ -44,7 +44,7 @@ EditAggregateTxn::EditAggregateTxn() : EditTxn() { - // base class does this: NS_INIT_REFCNT(); + // base class does this: NS_INIT_ISUPPORTS(); nsresult res = NS_NewISupportsArray(getter_AddRefs(mChildren)); NS_POSTCONDITION(NS_SUCCEEDED(res), "EditAggregateTxn failed in constructor"); } diff --git a/editor/libeditor/base/EditTxn.cpp b/editor/libeditor/base/EditTxn.cpp index 4d09bb31d168..599785e0ded1 100644 --- a/editor/libeditor/base/EditTxn.cpp +++ b/editor/libeditor/base/EditTxn.cpp @@ -51,7 +51,7 @@ NS_IMPL_RELEASE(EditTxn) // note that aEditor is not refcounted EditTxn::EditTxn() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } EditTxn::~EditTxn() diff --git a/editor/libeditor/base/nsEditor.cpp b/editor/libeditor/base/nsEditor.cpp index c53c0882a8b4..6ec3b631a62f 100644 --- a/editor/libeditor/base/nsEditor.cpp +++ b/editor/libeditor/base/nsEditor.cpp @@ -173,7 +173,7 @@ nsEditor::nsEditor() , mDocWeak(nsnull) { //initialize member variables here - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); PR_AtomicIncrement(&gInstanceCount); diff --git a/editor/libeditor/base/nsEditorCommands.cpp b/editor/libeditor/base/nsEditorCommands.cpp index 99ea09932d38..38dc0d034f32 100644 --- a/editor/libeditor/base/nsEditorCommands.cpp +++ b/editor/libeditor/base/nsEditorCommands.cpp @@ -55,7 +55,7 @@ nsBaseEditorCommand::nsBaseEditorCommand() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsBaseEditorCommand, nsIControllerCommand) diff --git a/editor/libeditor/base/nsEditorController.cpp b/editor/libeditor/base/nsEditorController.cpp index 9e70a969a06e..a0413bf222e9 100644 --- a/editor/libeditor/base/nsEditorController.cpp +++ b/editor/libeditor/base/nsEditorController.cpp @@ -60,7 +60,7 @@ NS_INTERFACE_MAP_END nsEditorController::nsEditorController() : mCommandRefCon(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsEditorController::~nsEditorController() diff --git a/editor/libeditor/base/nsEditorService.cpp b/editor/libeditor/base/nsEditorService.cpp index dcd9ccf380ce..f18991db32c7 100644 --- a/editor/libeditor/base/nsEditorService.cpp +++ b/editor/libeditor/base/nsEditorService.cpp @@ -42,7 +42,7 @@ nsEditorService::nsEditorService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsEditorService::~nsEditorService() diff --git a/editor/libeditor/html/TypeInState.cpp b/editor/libeditor/html/TypeInState.cpp index 8c3386d7a7f1..5d01665b3350 100644 --- a/editor/libeditor/html/TypeInState.cpp +++ b/editor/libeditor/html/TypeInState.cpp @@ -77,7 +77,7 @@ TypeInState::TypeInState() : ,mRelativeFontSize(0) ,mLastSelectionOffset(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); Reset(); } diff --git a/editor/libeditor/html/nsEditProperty.cpp b/editor/libeditor/html/nsEditProperty.cpp index 884ffe4ed4da..a40220f51ed2 100644 --- a/editor/libeditor/html/nsEditProperty.cpp +++ b/editor/libeditor/html/nsEditProperty.cpp @@ -182,7 +182,7 @@ But what about BODY, TR, TD, TH, CAPTION, COL, COLGROUP, THEAD, TFOOT, LI, DT, D */ nsEditProperty::nsEditProperty() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // inline tags nsIEditProperty::b = NS_NewAtom("b"); nsIEditProperty::big = NS_NewAtom("big"); diff --git a/editor/libeditor/html/nsHTMLEditor.cpp b/editor/libeditor/html/nsHTMLEditor.cpp index e5669848e929..e92568e1ff94 100644 --- a/editor/libeditor/html/nsHTMLEditor.cpp +++ b/editor/libeditor/html/nsHTMLEditor.cpp @@ -176,7 +176,7 @@ nsHTMLEditor::nsHTMLEditor() , mHTMLCSSUtils(nsnull) { // Done in nsEditor -// NS_INIT_REFCNT(); +// NS_INIT_ISUPPORTS(); mBoldAtom = getter_AddRefs(NS_NewAtom("b")); mItalicAtom = getter_AddRefs(NS_NewAtom("i")); mUnderlineAtom = getter_AddRefs(NS_NewAtom("u")); diff --git a/editor/libeditor/html/nsHTMLEditorMouseListener.cpp b/editor/libeditor/html/nsHTMLEditorMouseListener.cpp index 24e6a02ceeb8..730d87936be9 100644 --- a/editor/libeditor/html/nsHTMLEditorMouseListener.cpp +++ b/editor/libeditor/html/nsHTMLEditorMouseListener.cpp @@ -65,7 +65,7 @@ nsHTMLEditorMouseListener::nsHTMLEditorMouseListener() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsHTMLEditorMouseListener::~nsHTMLEditorMouseListener() diff --git a/editor/libeditor/html/nsHTMLURIRefObject.cpp b/editor/libeditor/html/nsHTMLURIRefObject.cpp index cc15d767cf7c..a4ee3756e341 100644 --- a/editor/libeditor/html/nsHTMLURIRefObject.cpp +++ b/editor/libeditor/html/nsHTMLURIRefObject.cpp @@ -111,7 +111,7 @@ nsHTMLURIRefObject::nsHTMLURIRefObject() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mCurAttrIndex = mAttributeCnt = 0; } diff --git a/editor/libeditor/text/nsAOLCiter.cpp b/editor/libeditor/text/nsAOLCiter.cpp index 8607fecebf00..a7e5e0830f74 100644 --- a/editor/libeditor/text/nsAOLCiter.cpp +++ b/editor/libeditor/text/nsAOLCiter.cpp @@ -48,7 +48,7 @@ nsAOLCiter::nsAOLCiter() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsAOLCiter::~nsAOLCiter() diff --git a/editor/libeditor/text/nsEditorEventListeners.cpp b/editor/libeditor/text/nsEditorEventListeners.cpp index 098b788c1901..16bdd7b6c3cd 100644 --- a/editor/libeditor/text/nsEditorEventListeners.cpp +++ b/editor/libeditor/text/nsEditorEventListeners.cpp @@ -100,7 +100,7 @@ NS_IMPL_RELEASE(nsTextEditorKeyListener) nsTextEditorKeyListener::nsTextEditorKeyListener() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } @@ -309,7 +309,7 @@ NS_IMPL_RELEASE(nsTextEditorMouseListener) nsTextEditorMouseListener::nsTextEditorMouseListener() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } @@ -494,7 +494,7 @@ nsTextEditorTextListener::nsTextEditorTextListener() : mCommitText(PR_FALSE), mInTransaction(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } @@ -590,7 +590,7 @@ NS_IMPL_RELEASE(nsTextEditorDragListener) nsTextEditorDragListener::nsTextEditorDragListener() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsTextEditorDragListener::~nsTextEditorDragListener() @@ -818,7 +818,7 @@ nsTextEditorDragListener::DragDrop(nsIDOMEvent* aMouseEvent) nsTextEditorCompositionListener::nsTextEditorCompositionListener() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsTextEditorCompositionListener::~nsTextEditorCompositionListener() @@ -1036,7 +1036,7 @@ NS_IMPL_RELEASE(nsTextEditorFocusListener) nsTextEditorFocusListener::nsTextEditorFocusListener() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsTextEditorFocusListener::~nsTextEditorFocusListener() diff --git a/editor/libeditor/text/nsInternetCiter.cpp b/editor/libeditor/text/nsInternetCiter.cpp index 36df121913bb..c8acecdab6eb 100644 --- a/editor/libeditor/text/nsInternetCiter.cpp +++ b/editor/libeditor/text/nsInternetCiter.cpp @@ -64,7 +64,7 @@ static NS_DEFINE_CID(kLWBrkCID, NS_LWBRK_CID); nsInternetCiter::nsInternetCiter() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsInternetCiter::~nsInternetCiter() diff --git a/editor/libeditor/text/nsPlaintextEditor.cpp b/editor/libeditor/text/nsPlaintextEditor.cpp index ecd3247552aa..d643e12a9c25 100644 --- a/editor/libeditor/text/nsPlaintextEditor.cpp +++ b/editor/libeditor/text/nsPlaintextEditor.cpp @@ -142,7 +142,7 @@ nsPlaintextEditor::nsPlaintextEditor() , mInitTriggerCounter(0) { // Done in nsEditor -// NS_INIT_REFCNT(); +// NS_INIT_ISUPPORTS(); } nsPlaintextEditor::~nsPlaintextEditor() diff --git a/editor/libeditor/text/nsTextEditRules.cpp b/editor/libeditor/text/nsTextEditRules.cpp index ca33189e6d97..eedc0b1062cb 100644 --- a/editor/libeditor/text/nsTextEditRules.cpp +++ b/editor/libeditor/text/nsTextEditRules.cpp @@ -103,7 +103,7 @@ nsTextEditRules::nsTextEditRules() , mLockRulesSniffing(PR_FALSE) , mTheAction(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsTextEditRules::~nsTextEditRules() diff --git a/editor/txmgr/src/nsTransactionManager.cpp b/editor/txmgr/src/nsTransactionManager.cpp index 6e8e7e537a67..ad2d74b1c45f 100644 --- a/editor/txmgr/src/nsTransactionManager.cpp +++ b/editor/txmgr/src/nsTransactionManager.cpp @@ -56,7 +56,7 @@ static NS_DEFINE_IID(kITransactionManagerIID, NS_ITRANSACTIONMANAGER_IID); nsTransactionManager::nsTransactionManager(PRInt32 aMaxTransactionCount) : mMaxTransactionCount(aMaxTransactionCount), mListeners(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mMonitor = ::PR_NewMonitor(); } diff --git a/editor/txmgr/tests/TestTXMgr.cpp b/editor/txmgr/tests/TestTXMgr.cpp index 3feaf05216e9..d2783f1ef245 100644 --- a/editor/txmgr/tests/TestTXMgr.cpp +++ b/editor/txmgr/tests/TestTXMgr.cpp @@ -439,7 +439,7 @@ class TestTransaction : public nsITransaction { public: - TestTransaction() { NS_INIT_REFCNT(); } + TestTransaction() { NS_INIT_ISUPPORTS(); } virtual ~TestTransaction() {} NS_DECL_ISUPPORTS diff --git a/embedding/browser/activex/src/control/HelperAppDlg.cpp b/embedding/browser/activex/src/control/HelperAppDlg.cpp index 7805e493cd94..1f8c8680c53d 100644 --- a/embedding/browser/activex/src/control/HelperAppDlg.cpp +++ b/embedding/browser/activex/src/control/HelperAppDlg.cpp @@ -265,7 +265,7 @@ public: ProgressDlg::ProgressDlg() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } ProgressDlg::~ProgressDlg() @@ -439,7 +439,7 @@ NS_IMPL_ISUPPORTS1(CHelperAppLauncherDlg, nsIHelperAppLauncherDialog) CHelperAppLauncherDlg::CHelperAppLauncherDlg() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } CHelperAppLauncherDlg::~CHelperAppLauncherDlg() diff --git a/embedding/browser/activex/src/control/PromptService.cpp b/embedding/browser/activex/src/control/PromptService.cpp index d1079ee1ae55..195e3b59539e 100644 --- a/embedding/browser/activex/src/control/PromptService.cpp +++ b/embedding/browser/activex/src/control/PromptService.cpp @@ -637,7 +637,7 @@ NS_IMPL_ISUPPORTS1(CPromptService, nsIPromptService) CPromptService::CPromptService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } CPromptService::~CPromptService() diff --git a/embedding/browser/activex/src/control/WebBrowserContainer.cpp b/embedding/browser/activex/src/control/WebBrowserContainer.cpp index 7a8beb838ec5..2fb6ffe8de74 100644 --- a/embedding/browser/activex/src/control/WebBrowserContainer.cpp +++ b/embedding/browser/activex/src/control/WebBrowserContainer.cpp @@ -53,7 +53,7 @@ CWebBrowserContainer::CWebBrowserContainer(CMozillaBrowser *pOwner) : mEvents2(mOwner), mVisible(PR_TRUE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/embedding/browser/activex/src/control/WindowCreator.cpp b/embedding/browser/activex/src/control/WindowCreator.cpp index 598789edbbec..c7485a6ec4e3 100644 --- a/embedding/browser/activex/src/control/WindowCreator.cpp +++ b/embedding/browser/activex/src/control/WindowCreator.cpp @@ -45,7 +45,7 @@ NS_IMPL_ISUPPORTS1(CWindowCreator, nsIWindowCreator) CWindowCreator::CWindowCreator(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } CWindowCreator::~CWindowCreator() diff --git a/embedding/browser/gtk/src/EmbedContentListener.cpp b/embedding/browser/gtk/src/EmbedContentListener.cpp index e0bfbfe16645..eaef980ae49d 100644 --- a/embedding/browser/gtk/src/EmbedContentListener.cpp +++ b/embedding/browser/gtk/src/EmbedContentListener.cpp @@ -29,7 +29,7 @@ EmbedContentListener::EmbedContentListener(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mOwner = nsnull; } diff --git a/embedding/browser/gtk/src/EmbedEventListener.cpp b/embedding/browser/gtk/src/EmbedEventListener.cpp index 95df2142e79a..eebdd5a4ea41 100644 --- a/embedding/browser/gtk/src/EmbedEventListener.cpp +++ b/embedding/browser/gtk/src/EmbedEventListener.cpp @@ -29,7 +29,7 @@ EmbedEventListener::EmbedEventListener(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mOwner = nsnull; } diff --git a/embedding/browser/gtk/src/EmbedProgress.cpp b/embedding/browser/gtk/src/EmbedProgress.cpp index 78c7c66b1599..7338b9299395 100644 --- a/embedding/browser/gtk/src/EmbedProgress.cpp +++ b/embedding/browser/gtk/src/EmbedProgress.cpp @@ -29,7 +29,7 @@ EmbedProgress::EmbedProgress(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mOwner = nsnull; } diff --git a/embedding/browser/gtk/src/EmbedStream.cpp b/embedding/browser/gtk/src/EmbedStream.cpp index 6216001aa0d5..55a86fce9bc7 100644 --- a/embedding/browser/gtk/src/EmbedStream.cpp +++ b/embedding/browser/gtk/src/EmbedStream.cpp @@ -39,7 +39,7 @@ NS_IMPL_ISUPPORTS1(EmbedStream, nsIInputStream) EmbedStream::EmbedStream() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mOwner = nsnull; mOffset = 0; mDoingStream = PR_FALSE; diff --git a/embedding/browser/gtk/src/EmbedWindow.cpp b/embedding/browser/gtk/src/EmbedWindow.cpp index 681d1e5ed8bc..b804f8e60cb4 100644 --- a/embedding/browser/gtk/src/EmbedWindow.cpp +++ b/embedding/browser/gtk/src/EmbedWindow.cpp @@ -35,7 +35,7 @@ GtkWidget *EmbedWindow::sTipWindow = nsnull; EmbedWindow::EmbedWindow(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mOwner = nsnull; mVisibility = PR_FALSE; mIsModal = PR_FALSE; diff --git a/embedding/browser/gtk/src/EmbedWindowCreator.cpp b/embedding/browser/gtk/src/EmbedWindowCreator.cpp index 481488b7e8c8..d5e28341fe66 100644 --- a/embedding/browser/gtk/src/EmbedWindowCreator.cpp +++ b/embedding/browser/gtk/src/EmbedWindowCreator.cpp @@ -28,7 +28,7 @@ EmbedWindowCreator::EmbedWindowCreator(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } EmbedWindowCreator::~EmbedWindowCreator() diff --git a/embedding/browser/photon/src/EmbedContentListener.cpp b/embedding/browser/photon/src/EmbedContentListener.cpp index fbe2382ccad8..959dd25b50eb 100644 --- a/embedding/browser/photon/src/EmbedContentListener.cpp +++ b/embedding/browser/photon/src/EmbedContentListener.cpp @@ -32,7 +32,7 @@ EmbedContentListener::EmbedContentListener(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mOwner = nsnull; } diff --git a/embedding/browser/photon/src/EmbedEventListener.cpp b/embedding/browser/photon/src/EmbedEventListener.cpp index 4828f591cfe4..2a1d94ff2ea3 100644 --- a/embedding/browser/photon/src/EmbedEventListener.cpp +++ b/embedding/browser/photon/src/EmbedEventListener.cpp @@ -30,7 +30,7 @@ EmbedEventListener::EmbedEventListener(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mOwner = nsnull; } diff --git a/embedding/browser/photon/src/EmbedPrintListener.cpp b/embedding/browser/photon/src/EmbedPrintListener.cpp index baa1127e8fd7..df716a4b8478 100644 --- a/embedding/browser/photon/src/EmbedPrintListener.cpp +++ b/embedding/browser/photon/src/EmbedPrintListener.cpp @@ -32,7 +32,7 @@ EmbedPrintListener::EmbedPrintListener(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mOwner = nsnull; } diff --git a/embedding/browser/photon/src/EmbedProgress.cpp b/embedding/browser/photon/src/EmbedProgress.cpp index f99ad45e5048..18acfaba4b65 100644 --- a/embedding/browser/photon/src/EmbedProgress.cpp +++ b/embedding/browser/photon/src/EmbedProgress.cpp @@ -47,7 +47,7 @@ EmbedProgress::EmbedProgress(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mOwner = nsnull; mSkipOnState = mDownloadDocument = 0; } diff --git a/embedding/browser/photon/src/EmbedStream.cpp b/embedding/browser/photon/src/EmbedStream.cpp index 38a46b6a4b4a..6142cb951506 100644 --- a/embedding/browser/photon/src/EmbedStream.cpp +++ b/embedding/browser/photon/src/EmbedStream.cpp @@ -39,7 +39,7 @@ NS_IMPL_ISUPPORTS1(EmbedStream, nsIInputStream) EmbedStream::EmbedStream() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mOwner = nsnull; mOffset = 0; mDoingStream = PR_FALSE; diff --git a/embedding/browser/photon/src/EmbedWindow.cpp b/embedding/browser/photon/src/EmbedWindow.cpp index 8fdad562c89f..1bdca44a32bb 100644 --- a/embedding/browser/photon/src/EmbedWindow.cpp +++ b/embedding/browser/photon/src/EmbedWindow.cpp @@ -51,7 +51,7 @@ PtWidget_t *EmbedWindow::sTipWindow = nsnull; EmbedWindow::EmbedWindow(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mOwner = nsnull; mVisibility = PR_FALSE; mIsModal = PR_FALSE; diff --git a/embedding/browser/photon/src/EmbedWindowCreator.cpp b/embedding/browser/photon/src/EmbedWindowCreator.cpp index b03182c3f4b5..79be3406eb6d 100644 --- a/embedding/browser/photon/src/EmbedWindowCreator.cpp +++ b/embedding/browser/photon/src/EmbedWindowCreator.cpp @@ -29,7 +29,7 @@ EmbedWindowCreator::EmbedWindowCreator(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } EmbedWindowCreator::~EmbedWindowCreator() diff --git a/embedding/browser/photon/src/PromptService.cpp b/embedding/browser/photon/src/PromptService.cpp index 027f8eeff112..229ca40da420 100644 --- a/embedding/browser/photon/src/PromptService.cpp +++ b/embedding/browser/photon/src/PromptService.cpp @@ -84,7 +84,7 @@ NS_IMPL_ISUPPORTS2(CPromptService, nsIPromptService, nsPIPromptService) CPromptService::CPromptService() : mWWatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID)) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } CPromptService::~CPromptService() { diff --git a/embedding/browser/photon/src/nsUnknownContentTypeHandler.cpp b/embedding/browser/photon/src/nsUnknownContentTypeHandler.cpp index 0f55277d1322..d294bef691e7 100644 --- a/embedding/browser/photon/src/nsUnknownContentTypeHandler.cpp +++ b/embedding/browser/photon/src/nsUnknownContentTypeHandler.cpp @@ -52,7 +52,7 @@ #include nsUnknownContentTypeHandler::nsUnknownContentTypeHandler( ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsUnknownContentTypeHandler::~nsUnknownContentTypeHandler( ) { } diff --git a/embedding/browser/powerplant/source/CBrowserChrome.cpp b/embedding/browser/powerplant/source/CBrowserChrome.cpp index 5b587141392a..f982d6223d15 100644 --- a/embedding/browser/powerplant/source/CBrowserChrome.cpp +++ b/embedding/browser/powerplant/source/CBrowserChrome.cpp @@ -85,7 +85,7 @@ CBrowserChrome::CBrowserChrome(CBrowserShell *aShell, mInModalLoop(false), mWindowVisible(false), mInitialLoadComplete(false) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); ThrowIfNil_(mBrowserShell); mBrowserWindow = LWindow::FetchWindowObject(mBrowserShell->GetMacWindow()); diff --git a/embedding/browser/powerplant/source/CWebBrowserChrome.cpp b/embedding/browser/powerplant/source/CWebBrowserChrome.cpp index 8edf0138a253..026df45486a2 100644 --- a/embedding/browser/powerplant/source/CWebBrowserChrome.cpp +++ b/embedding/browser/powerplant/source/CWebBrowserChrome.cpp @@ -62,7 +62,7 @@ CWebBrowserChrome::CWebBrowserChrome() : mBrowserWindow(nsnull), mBrowserShell(nsnull), mPreviousBalloonState(false), mInModalLoop(false) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } CWebBrowserChrome::~CWebBrowserChrome() diff --git a/embedding/browser/powerplant/source/PromptService.cpp b/embedding/browser/powerplant/source/PromptService.cpp index c20e2d17030b..b05d3138ea54 100644 --- a/embedding/browser/powerplant/source/PromptService.cpp +++ b/embedding/browser/powerplant/source/PromptService.cpp @@ -79,7 +79,7 @@ NS_IMPL_ISUPPORTS1(CPromptService, nsIPromptService) CPromptService::CPromptService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } CPromptService::~CPromptService() diff --git a/embedding/browser/webBrowser/nsCommandHandler.cpp b/embedding/browser/webBrowser/nsCommandHandler.cpp index feed6850f891..b330045d2a9c 100644 --- a/embedding/browser/webBrowser/nsCommandHandler.cpp +++ b/embedding/browser/webBrowser/nsCommandHandler.cpp @@ -30,7 +30,7 @@ nsCommandHandler::nsCommandHandler() : mWindow(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsCommandHandler::~nsCommandHandler() diff --git a/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp b/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp index 279596f6d7fe..6ecd8e286de6 100644 --- a/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp +++ b/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp @@ -115,7 +115,7 @@ nsDocShellTreeOwner::nsDocShellTreeOwner() : mChromeTooltipListener(nsnull), mChromeContextMenuListener(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDocShellTreeOwner::~nsDocShellTreeOwner() @@ -881,7 +881,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(DefaultTooltipTextProvider, nsITooltipTextProvider DefaultTooltipTextProvider::DefaultTooltipTextProvider() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // There are certain element types which we don't want to use // as tool tip text. @@ -961,7 +961,7 @@ ChromeTooltipListener :: ChromeTooltipListener ( nsWebBrowser* inBrowser, nsIWeb mMouseClientX(0), mMouseClientY(0), mShowingTooltip(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mTooltipTextProvider = do_GetService(NS_TOOLTIPTEXTPROVIDER_CONTRACTID); if (!mTooltipTextProvider) { @@ -1382,7 +1382,7 @@ ChromeContextMenuListener :: ChromeContextMenuListener ( nsWebBrowser* inBrowser mWebBrowser(inBrowser), mWebBrowserChrome(inChrome) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } // ctor diff --git a/embedding/browser/webBrowser/nsWebBrowser.cpp b/embedding/browser/webBrowser/nsWebBrowser.cpp index bfed7f4889f3..96330de6bf22 100644 --- a/embedding/browser/webBrowser/nsWebBrowser.cpp +++ b/embedding/browser/webBrowser/nsWebBrowser.cpp @@ -89,7 +89,7 @@ nsWebBrowser::nsWebBrowser() : mDocShellTreeOwner(nsnull), mParent(nsnull), mListenerArray(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mInitInfo = new nsWebBrowserInitInfo(); mWWatch = do_GetService(NS_WINDOWWATCHER_CONTRACTID); NS_ASSERTION(mWWatch, "failed to get WindowWatcher"); diff --git a/embedding/browser/webBrowser/nsWebBrowserContentPolicy.cpp b/embedding/browser/webBrowser/nsWebBrowserContentPolicy.cpp index 10d65a9de1d9..f3d341b378bb 100644 --- a/embedding/browser/webBrowser/nsWebBrowserContentPolicy.cpp +++ b/embedding/browser/webBrowser/nsWebBrowserContentPolicy.cpp @@ -27,7 +27,7 @@ nsWebBrowserContentPolicy::nsWebBrowserContentPolicy() { MOZ_COUNT_CTOR(nsWebBrowserContentPolicy); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsWebBrowserContentPolicy::~nsWebBrowserContentPolicy() diff --git a/embedding/components/commandhandler/src/nsControllerCommandManager.cpp b/embedding/components/commandhandler/src/nsControllerCommandManager.cpp index e78727d2a3ac..36729e84c4fc 100644 --- a/embedding/components/commandhandler/src/nsControllerCommandManager.cpp +++ b/embedding/components/commandhandler/src/nsControllerCommandManager.cpp @@ -51,7 +51,7 @@ NS_NewControllerCommandManager(nsIControllerCommandManager** aResult); nsControllerCommandManager::nsControllerCommandManager() : mCommandsTable(NUM_COMMANDS_BOUNDS, PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/embedding/components/jsconsole/src/nsJSConsoleService.cpp b/embedding/components/jsconsole/src/nsJSConsoleService.cpp index 86121c5ee375..0992d5136913 100644 --- a/embedding/components/jsconsole/src/nsJSConsoleService.cpp +++ b/embedding/components/jsconsole/src/nsJSConsoleService.cpp @@ -53,7 +53,7 @@ NS_IMPL_ISUPPORTS1(nsJSConsoleService, nsIJSConsoleService) nsJSConsoleService::nsJSConsoleService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsJSConsoleService::~nsJSConsoleService() diff --git a/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp b/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp index 6bcd47345223..51154552ce67 100644 --- a/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp +++ b/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp @@ -311,7 +311,7 @@ NS_IMPL_ISUPPORTS2(nsPrintingPromptService, nsIPrintingPromptService, nsIWebProg nsPrintingPromptService::nsPrintingPromptService() : mWatcher(do_GetService(NS_WINDOWWATCHER_CONTRACTID)) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsPrintingPromptService::~nsPrintingPromptService() diff --git a/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.cpp b/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.cpp index 96caa4ede74e..ffebc4bee7e6 100644 --- a/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.cpp +++ b/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.cpp @@ -132,7 +132,7 @@ NS_IMPL_ISUPPORTS2(nsPrintingPromptService, nsIPrintingPromptService, nsIWebProg nsPrintingPromptService::nsPrintingPromptService() : mWatcher(do_GetService(NS_WINDOWWATCHER_CONTRACTID)) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsPrintingPromptService::~nsPrintingPromptService() diff --git a/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp b/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp index 55fe17cefd4c..10398e083f48 100644 --- a/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp +++ b/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp @@ -98,7 +98,7 @@ NS_IMPL_ISUPPORTS2(nsPrintingPromptService, nsIPrintingPromptService, nsIWebProg nsPrintingPromptService::nsPrintingPromptService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsPrintingPromptService::~nsPrintingPromptService() diff --git a/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp b/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp index a50f22c65af7..60171181e34d 100644 --- a/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp +++ b/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp @@ -93,7 +93,7 @@ NS_IMPL_ISUPPORTS2(nsPrintingPromptService, nsIPrintingPromptService, nsIWebProg nsPrintingPromptService::nsPrintingPromptService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsPrintingPromptService::~nsPrintingPromptService() diff --git a/embedding/components/printingui/src/win/nsPrintingPromptService.cpp b/embedding/components/printingui/src/win/nsPrintingPromptService.cpp index 11b9ecd91fae..9b8e5c60e348 100644 --- a/embedding/components/printingui/src/win/nsPrintingPromptService.cpp +++ b/embedding/components/printingui/src/win/nsPrintingPromptService.cpp @@ -95,7 +95,7 @@ NS_IMPL_ISUPPORTS2(nsPrintingPromptService, nsIPrintingPromptService, nsIWebProg nsPrintingPromptService::nsPrintingPromptService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } //----------------------------------------------------------- diff --git a/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp b/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp index af2d4d364947..cf9f0a9a78ac 100644 --- a/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp +++ b/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp @@ -203,7 +203,7 @@ nsWebBrowserPersist::nsWebBrowserPersist() : mWrapColumn(72), mEncodingFlags(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsWebBrowserPersist::~nsWebBrowserPersist() @@ -3237,7 +3237,7 @@ nsWebBrowserPersist::SetDocumentBase( nsEncoderNodeFixup::nsEncoderNodeFixup() : mWebBrowserPersist(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/embedding/components/windowwatcher/src/nsDialogParamBlock.cpp b/embedding/components/windowwatcher/src/nsDialogParamBlock.cpp index ea79d49d81d9..6d4e326b840c 100644 --- a/embedding/components/windowwatcher/src/nsDialogParamBlock.cpp +++ b/embedding/components/windowwatcher/src/nsDialogParamBlock.cpp @@ -44,7 +44,7 @@ NS_IMPL_ISUPPORTS1(nsDialogParamBlock, nsIDialogParamBlock) nsDialogParamBlock::nsDialogParamBlock() : mNumStrings(0), mString(NULL) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); for(PRInt32 i = 0; i < kNumInts; i++) mInt[i] = 0; diff --git a/embedding/components/windowwatcher/src/nsPrintingPrompt.cpp b/embedding/components/windowwatcher/src/nsPrintingPrompt.cpp index e0b85924b40e..4caac1978ee3 100644 --- a/embedding/components/windowwatcher/src/nsPrintingPrompt.cpp +++ b/embedding/components/windowwatcher/src/nsPrintingPrompt.cpp @@ -68,7 +68,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsPrintingPrompt, nsIPrintingPrompt) nsPrintingPrompt::nsPrintingPrompt(nsIDOMWindow *aParent) : mParent(aParent) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult diff --git a/embedding/components/windowwatcher/src/nsPrompt.cpp b/embedding/components/windowwatcher/src/nsPrompt.cpp index 49ce953ef786..2e0fc1614f37 100644 --- a/embedding/components/windowwatcher/src/nsPrompt.cpp +++ b/embedding/components/windowwatcher/src/nsPrompt.cpp @@ -103,7 +103,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS2(nsPrompt, nsIPrompt, nsIAuthPrompt) nsPrompt::nsPrompt(nsIDOMWindow *aParent) : mParent(aParent) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult diff --git a/embedding/components/windowwatcher/src/nsPromptService.cpp b/embedding/components/windowwatcher/src/nsPromptService.cpp index 5c7fad117ad8..5b7a27616120 100644 --- a/embedding/components/windowwatcher/src/nsPromptService.cpp +++ b/embedding/components/windowwatcher/src/nsPromptService.cpp @@ -93,7 +93,7 @@ private: NS_IMPL_ISUPPORTS2(nsPromptService, nsIPromptService, nsPIPromptService) nsPromptService::nsPromptService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsPromptService::~nsPromptService() { diff --git a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp index 61de8c846422..8d26a14a7517 100644 --- a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp +++ b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp @@ -198,7 +198,7 @@ nsWatcherWindowEnumerator::nsWatcherWindowEnumerator(nsWindowWatcher *inWatcher) : mWindowWatcher(inWatcher), mCurrentPosition(inWatcher->mOldestWindow) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mWindowWatcher->AddEnumerator(this); mWindowWatcher->AddRef(); } @@ -418,7 +418,7 @@ nsWindowWatcher::nsWindowWatcher() : mActiveWindow(0), mListLock(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsWindowWatcher::~nsWindowWatcher() diff --git a/embedding/qa/mozembed/src/mozEmbed.cpp b/embedding/qa/mozembed/src/mozEmbed.cpp index 5a10f3466714..6f3756568354 100644 --- a/embedding/qa/mozembed/src/mozEmbed.cpp +++ b/embedding/qa/mozembed/src/mozEmbed.cpp @@ -1045,7 +1045,7 @@ PRUint32 AppCallbacks::RunEventLoop(PRBool &aRunCondition) nsQABrowserUIGlue::nsQABrowserUIGlue():mAllowNewWindows(PR_TRUE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsQABrowserUIGlue::~nsQABrowserUIGlue() @@ -1493,4 +1493,4 @@ nsQABrowserUIGlue::CreateNativeWindow(nsIWebBrowserChrome* chrome) gDialogCount++; return (void *) hwndBrowser; -} \ No newline at end of file +} diff --git a/embedding/qa/mozembed/src/nsQABrowserChrome.cpp b/embedding/qa/mozembed/src/nsQABrowserChrome.cpp index b3ecd6348ac9..705f33204cb8 100644 --- a/embedding/qa/mozembed/src/nsQABrowserChrome.cpp +++ b/embedding/qa/mozembed/src/nsQABrowserChrome.cpp @@ -55,7 +55,7 @@ nsQABrowserChrome::nsQABrowserChrome() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mNativeWindow = nsnull; mSizeSet = PR_FALSE; } diff --git a/embedding/qa/mozembed/src/nsQABrowserView.cpp b/embedding/qa/mozembed/src/nsQABrowserView.cpp index 7a0c13fe870a..4841cdf10c46 100644 --- a/embedding/qa/mozembed/src/nsQABrowserView.cpp +++ b/embedding/qa/mozembed/src/nsQABrowserView.cpp @@ -56,7 +56,7 @@ nsQABrowserView::nsQABrowserView():mWebBrowser(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mWebBrowser = nsnull; mWebNav = nsnull; mBaseWindow = nsnull; diff --git a/embedding/qa/mozembed/src/nsQAWindowCreator.cpp b/embedding/qa/mozembed/src/nsQAWindowCreator.cpp index d86da0579210..ef5c7561c93b 100644 --- a/embedding/qa/mozembed/src/nsQAWindowCreator.cpp +++ b/embedding/qa/mozembed/src/nsQAWindowCreator.cpp @@ -37,7 +37,7 @@ WindowCreator::WindowCreator() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } WindowCreator::~WindowCreator() diff --git a/embedding/qa/testembed/components/PromptService.cpp b/embedding/qa/testembed/components/PromptService.cpp index 6536c99f1f0f..57ea3302dbd4 100644 --- a/embedding/qa/testembed/components/PromptService.cpp +++ b/embedding/qa/testembed/components/PromptService.cpp @@ -93,7 +93,7 @@ NS_IMPL_ISUPPORTS1(CPromptService, nsIPromptService) CPromptService::CPromptService() : mWWatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID)) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } CPromptService::~CPromptService() { diff --git a/embedding/tests/mfcembed/components/HelperAppDlg.cpp b/embedding/tests/mfcembed/components/HelperAppDlg.cpp index 0458e97e13e3..213b7263f9df 100644 --- a/embedding/tests/mfcembed/components/HelperAppDlg.cpp +++ b/embedding/tests/mfcembed/components/HelperAppDlg.cpp @@ -163,7 +163,7 @@ NS_IMPL_ISUPPORTS1(CHelperAppLauncherDialog, nsIHelperAppLauncherDialog) CHelperAppLauncherDialog::CHelperAppLauncherDialog() : mWWatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID)) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } CHelperAppLauncherDialog::~CHelperAppLauncherDialog() @@ -510,7 +510,7 @@ CProgressDlg::CProgressDlg(nsIHelperAppLauncher *aLauncher, int aHandleContentOp CString& aFileName, CWnd* pParent /*=NULL*/) : CDialog(CProgressDlg::IDD, pParent) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_HelperAppLauncher = aLauncher; m_HandleContentOp = aHandleContentOp; diff --git a/embedding/tests/mfcembed/components/PrintingPromptService.cpp b/embedding/tests/mfcembed/components/PrintingPromptService.cpp index 24a6a72646a1..2189ed3824bf 100644 --- a/embedding/tests/mfcembed/components/PrintingPromptService.cpp +++ b/embedding/tests/mfcembed/components/PrintingPromptService.cpp @@ -124,7 +124,7 @@ CPrintingPromptService::CPrintingPromptService() : mWWatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID)), m_PPDlg(NULL) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } CPrintingPromptService::~CPrintingPromptService() { diff --git a/embedding/tests/mfcembed/components/PromptService.cpp b/embedding/tests/mfcembed/components/PromptService.cpp index 6536c99f1f0f..57ea3302dbd4 100644 --- a/embedding/tests/mfcembed/components/PromptService.cpp +++ b/embedding/tests/mfcembed/components/PromptService.cpp @@ -93,7 +93,7 @@ NS_IMPL_ISUPPORTS1(CPromptService, nsIPromptService) CPromptService::CPromptService() : mWWatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID)) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } CPromptService::~CPromptService() { diff --git a/embedding/tests/winEmbed/WebBrowserChrome.cpp b/embedding/tests/winEmbed/WebBrowserChrome.cpp index dcb81b2b48b5..e73d6ef5e979 100644 --- a/embedding/tests/winEmbed/WebBrowserChrome.cpp +++ b/embedding/tests/winEmbed/WebBrowserChrome.cpp @@ -55,7 +55,7 @@ WebBrowserChrome::WebBrowserChrome() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mNativeWindow = nsnull; mSizeSet = PR_FALSE; } diff --git a/embedding/tests/winEmbed/WindowCreator.cpp b/embedding/tests/winEmbed/WindowCreator.cpp index c97d4d6836f9..29bfc0675677 100644 --- a/embedding/tests/winEmbed/WindowCreator.cpp +++ b/embedding/tests/winEmbed/WindowCreator.cpp @@ -34,7 +34,7 @@ WindowCreator::WindowCreator() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } WindowCreator::~WindowCreator() diff --git a/embedding/tests/winEmbed/winEmbed.cpp b/embedding/tests/winEmbed/winEmbed.cpp index ecdd7b900c2c..392c6cf9fea4 100644 --- a/embedding/tests/winEmbed/winEmbed.cpp +++ b/embedding/tests/winEmbed/winEmbed.cpp @@ -215,7 +215,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS2(ProfileChangeObserver, nsIObserver, nsISupportsWea ProfileChangeObserver::ProfileChangeObserver() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } // --------------------------------------------------------------------------- diff --git a/extensions/access-builtin/accessproxy/nsAccessProxy.cpp b/extensions/access-builtin/accessproxy/nsAccessProxy.cpp index 08077f2b7720..4664310141e7 100644 --- a/extensions/access-builtin/accessproxy/nsAccessProxy.cpp +++ b/extensions/access-builtin/accessproxy/nsAccessProxy.cpp @@ -68,7 +68,7 @@ nsAccessProxy* nsAccessProxy::mInstance = nsnull; nsAccessProxy::nsAccessProxy() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsAccessProxy::~nsAccessProxy() diff --git a/extensions/cookie/nsCookie.cpp b/extensions/cookie/nsCookie.cpp index f8048a7d7ba3..b86dbb61a92b 100644 --- a/extensions/cookie/nsCookie.cpp +++ b/extensions/cookie/nsCookie.cpp @@ -46,7 +46,7 @@ NS_IMPL_ISUPPORTS2(nsCookie, nsICookie, nsISupportsWeakReference); nsCookie::nsCookie() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsCookie::nsCookie @@ -68,7 +68,7 @@ nsCookie::nsCookie cookieExpires = expires; cookieStatus = status; cookiePolicy = policy; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsCookie::~nsCookie(void) { diff --git a/extensions/cookie/nsCookieHTTPNotify.cpp b/extensions/cookie/nsCookieHTTPNotify.cpp index 7de337f7bd0c..8c6338f4b47e 100644 --- a/extensions/cookie/nsCookieHTTPNotify.cpp +++ b/extensions/cookie/nsCookieHTTPNotify.cpp @@ -128,7 +128,7 @@ nsCookieHTTPNotify::Init() nsCookieHTTPNotify::nsCookieHTTPNotify() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mCookieService = nsnull; #ifdef DEBUG_dp printf("CookieHTTPNotify Created.\n"); diff --git a/extensions/cookie/nsCookieManager.cpp b/extensions/cookie/nsCookieManager.cpp index ea731e2740aa..33e098cd02ab 100644 --- a/extensions/cookie/nsCookieManager.cpp +++ b/extensions/cookie/nsCookieManager.cpp @@ -55,7 +55,7 @@ class nsCookieEnumerator : public nsISimpleEnumerator nsCookieEnumerator() : mCookieCount(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMETHOD HasMoreElements(PRBool *result) @@ -108,7 +108,7 @@ NS_IMPL_ISUPPORTS2(nsCookieManager, nsICookieManager, nsISupportsWeakReference); nsCookieManager::nsCookieManager() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsCookieManager::~nsCookieManager(void) diff --git a/extensions/cookie/nsCookieService.cpp b/extensions/cookie/nsCookieService.cpp index cf061b025988..0476969f5f06 100644 --- a/extensions/cookie/nsCookieService.cpp +++ b/extensions/cookie/nsCookieService.cpp @@ -67,7 +67,7 @@ PRBool gCookieIconVisible = PR_FALSE; nsCookieService::nsCookieService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsCookieService::~nsCookieService(void) diff --git a/extensions/cookie/nsCookies.cpp b/extensions/cookie/nsCookies.cpp index 9d8390f1a545..13644b9561ee 100644 --- a/extensions/cookie/nsCookies.cpp +++ b/extensions/cookie/nsCookies.cpp @@ -53,7 +53,7 @@ #include "nsIURL.h" #include "nsIHttpChannel.h" #include "prnetdb.h" - +#include "nsComObsolete.h" #include #define MAX_NUMBER_OF_COOKIES 300 diff --git a/extensions/cookie/nsImages.cpp b/extensions/cookie/nsImages.cpp index c01b208e3a7a..9c93ad5538b8 100644 --- a/extensions/cookie/nsImages.cpp +++ b/extensions/cookie/nsImages.cpp @@ -46,6 +46,7 @@ #include "nsIServiceManager.h" #include "nsIIOService.h" #include "nsIURI.h" +#include "nsComObsolete.h" #define image_behaviorPref "network.image.imageBehavior" #define image_warningPref "network.image.warnAboutImages" diff --git a/extensions/cookie/nsImgManager.cpp b/extensions/cookie/nsImgManager.cpp index 17db610324f6..57540d879302 100644 --- a/extensions/cookie/nsImgManager.cpp +++ b/extensions/cookie/nsImgManager.cpp @@ -76,7 +76,7 @@ NS_IMPL_ISUPPORTS2(nsImgManager, nsImgManager::nsImgManager() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsImgManager::~nsImgManager(void) diff --git a/extensions/cookie/nsPermission.cpp b/extensions/cookie/nsPermission.cpp index 292aa9c8f8a7..cd948e793835 100644 --- a/extensions/cookie/nsPermission.cpp +++ b/extensions/cookie/nsPermission.cpp @@ -45,7 +45,7 @@ NS_IMPL_ISUPPORTS2(nsPermission, nsIPermission, nsISupportsWeakReference); nsPermission::nsPermission() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsPermission::nsPermission @@ -55,7 +55,7 @@ nsPermission::nsPermission permissionHost = host; permissionType = type; permissionCapability = capability; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsPermission::~nsPermission(void) { diff --git a/extensions/cookie/nsPermissionManager.cpp b/extensions/cookie/nsPermissionManager.cpp index 1a16abcdc17b..a67286b3df85 100644 --- a/extensions/cookie/nsPermissionManager.cpp +++ b/extensions/cookie/nsPermissionManager.cpp @@ -61,7 +61,7 @@ class nsPermissionEnumerator : public nsISimpleEnumerator nsPermissionEnumerator() : mHostCount(0), mTypeCount(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMETHOD HasMoreElements(PRBool *result) @@ -110,7 +110,7 @@ NS_IMPL_ISUPPORTS3(nsPermissionManager, nsIPermissionManager, nsIObserver, nsISu nsPermissionManager::nsPermissionManager() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsPermissionManager::~nsPermissionManager(void) diff --git a/extensions/cookie/nsPermissions.cpp b/extensions/cookie/nsPermissions.cpp index be857d63060e..0357af68efca 100644 --- a/extensions/cookie/nsPermissions.cpp +++ b/extensions/cookie/nsPermissions.cpp @@ -54,6 +54,7 @@ #include "nsNetCID.h" #include "nsTextFormatter.h" #include "nsIObserverService.h" +#include "nsComObsolete.h" static const char *kCookiesPermFileName = "cookperm.txt"; diff --git a/extensions/cookie/nsUtils.cpp b/extensions/cookie/nsUtils.cpp index 07ee4e880643..f82eb0dd0be5 100644 --- a/extensions/cookie/nsUtils.cpp +++ b/extensions/cookie/nsUtils.cpp @@ -44,6 +44,7 @@ #include "nsILocalFile.h" #include "nsAppDirectoryServiceDefs.h" #include "prmem.h" +#include "nsComObsolete.h" static NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); diff --git a/extensions/datetime/nsDateTimeChannel.cpp b/extensions/datetime/nsDateTimeChannel.cpp index 710c05ba9d40..f36f7ccae031 100644 --- a/extensions/datetime/nsDateTimeChannel.cpp +++ b/extensions/datetime/nsDateTimeChannel.cpp @@ -50,7 +50,7 @@ // nsDateTimeChannel methods nsDateTimeChannel::nsDateTimeChannel() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mContentLength = -1; mPort = -1; } diff --git a/extensions/datetime/nsDateTimeHandler.cpp b/extensions/datetime/nsDateTimeHandler.cpp index e91901a5f3d6..4380bd9307ba 100644 --- a/extensions/datetime/nsDateTimeHandler.cpp +++ b/extensions/datetime/nsDateTimeHandler.cpp @@ -52,7 +52,7 @@ static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); //////////////////////////////////////////////////////////////////////////////// nsDateTimeHandler::nsDateTimeHandler() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDateTimeHandler::~nsDateTimeHandler() { diff --git a/extensions/finger/nsFingerChannel.cpp b/extensions/finger/nsFingerChannel.cpp index 9c90298f5bcd..1e0e385525a2 100644 --- a/extensions/finger/nsFingerChannel.cpp +++ b/extensions/finger/nsFingerChannel.cpp @@ -50,7 +50,7 @@ nsFingerChannel::nsFingerChannel() mPort(-1), mStatus(NS_OK) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsFingerChannel::~nsFingerChannel() { diff --git a/extensions/finger/nsFingerHandler.cpp b/extensions/finger/nsFingerHandler.cpp index d8be52b6bfee..332f23803929 100644 --- a/extensions/finger/nsFingerHandler.cpp +++ b/extensions/finger/nsFingerHandler.cpp @@ -37,7 +37,7 @@ static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); //////////////////////////////////////////////////////////////////////////////// nsFingerHandler::nsFingerHandler() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsFingerHandler::~nsFingerHandler() { diff --git a/extensions/inspector/base/src/inBitmap.cpp b/extensions/inspector/base/src/inBitmap.cpp index de5f32ad289c..486035cef27a 100644 --- a/extensions/inspector/base/src/inBitmap.cpp +++ b/extensions/inspector/base/src/inBitmap.cpp @@ -46,7 +46,7 @@ inBitmap::inBitmap() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } inBitmap::~inBitmap() diff --git a/extensions/inspector/base/src/inBitmapChannel.cpp b/extensions/inspector/base/src/inBitmapChannel.cpp index bf5415a70aca..95c9cd10f8a9 100644 --- a/extensions/inspector/base/src/inBitmapChannel.cpp +++ b/extensions/inspector/base/src/inBitmapChannel.cpp @@ -39,7 +39,7 @@ inBitmapChannel::inBitmapChannel() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mStatus = NS_OK; } diff --git a/extensions/inspector/base/src/inBitmapDepot.cpp b/extensions/inspector/base/src/inBitmapDepot.cpp index 850e20e15a0f..eff24409b461 100644 --- a/extensions/inspector/base/src/inBitmapDepot.cpp +++ b/extensions/inspector/base/src/inBitmapDepot.cpp @@ -46,7 +46,7 @@ inBitmapDepot::inBitmapDepot() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } inBitmapDepot::~inBitmapDepot() diff --git a/extensions/inspector/base/src/inBitmapProtocolHandler.cpp b/extensions/inspector/base/src/inBitmapProtocolHandler.cpp index b5a64fa48f1b..1d97d260e6be 100644 --- a/extensions/inspector/base/src/inBitmapProtocolHandler.cpp +++ b/extensions/inspector/base/src/inBitmapProtocolHandler.cpp @@ -34,7 +34,7 @@ inBitmapProtocolHandler::inBitmapProtocolHandler() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } inBitmapProtocolHandler::~inBitmapProtocolHandler() diff --git a/extensions/inspector/base/src/inBitmapURI.cpp b/extensions/inspector/base/src/inBitmapURI.cpp index bb6f8acd4039..d31a2ddcb6ea 100644 --- a/extensions/inspector/base/src/inBitmapURI.cpp +++ b/extensions/inspector/base/src/inBitmapURI.cpp @@ -38,7 +38,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS2(inBitmapURI, inIBitmapURI, nsIURI) inBitmapURI::inBitmapURI() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } inBitmapURI::~inBitmapURI() diff --git a/extensions/inspector/base/src/inDOMUtils.cpp b/extensions/inspector/base/src/inDOMUtils.cpp index 9f6c48bc577b..90b6c8bc27dc 100644 --- a/extensions/inspector/base/src/inDOMUtils.cpp +++ b/extensions/inspector/base/src/inDOMUtils.cpp @@ -60,7 +60,7 @@ static NS_DEFINE_CID(kInspectorCSSUtilsCID, NS_INSPECTORCSSUTILS_CID); inDOMUtils::inDOMUtils() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mCSSUtils = do_GetService(kInspectorCSSUtilsCID); } diff --git a/extensions/inspector/base/src/inDOMView.cpp b/extensions/inspector/base/src/inDOMView.cpp index 620caf2ef77a..80eb2ef83525 100644 --- a/extensions/inspector/base/src/inDOMView.cpp +++ b/extensions/inspector/base/src/inDOMView.cpp @@ -115,7 +115,7 @@ inDOMView::inDOMView() : mFilters(65535) // show all node types by default { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); kAnonymousAtom = NS_NewAtom("anonymous"); kElementNodeAtom = NS_NewAtom("ELEMENT_NODE"); diff --git a/extensions/inspector/base/src/inDeepTreeWalker.cpp b/extensions/inspector/base/src/inDeepTreeWalker.cpp index c9dd8ed9f87e..3ade3d4d7378 100644 --- a/extensions/inspector/base/src/inDeepTreeWalker.cpp +++ b/extensions/inspector/base/src/inDeepTreeWalker.cpp @@ -54,7 +54,7 @@ inDeepTreeWalker::inDeepTreeWalker() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mShowAnonymousContent = PR_FALSE; mShowSubDocuments = PR_FALSE; diff --git a/extensions/inspector/base/src/inFlasher.cpp b/extensions/inspector/base/src/inFlasher.cpp index a58036d7f600..503a57953f59 100644 --- a/extensions/inspector/base/src/inFlasher.cpp +++ b/extensions/inspector/base/src/inFlasher.cpp @@ -50,7 +50,7 @@ static NS_DEFINE_CID(kInspectorCSSUtilsCID, NS_INSPECTORCSSUTILS_CID); inFlasher::inFlasher() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mCSSUtils = do_GetService(kInspectorCSSUtilsCID); } diff --git a/extensions/inspector/base/src/inPNGEncoder.cpp b/extensions/inspector/base/src/inPNGEncoder.cpp index d290275029fb..f2863a921095 100644 --- a/extensions/inspector/base/src/inPNGEncoder.cpp +++ b/extensions/inspector/base/src/inPNGEncoder.cpp @@ -47,7 +47,7 @@ inPNGEncoder::inPNGEncoder() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } inPNGEncoder::~inPNGEncoder() diff --git a/extensions/inspector/base/src/win/inScreenCapturer.cpp b/extensions/inspector/base/src/win/inScreenCapturer.cpp index 387a11f85e4b..f8c0af12c911 100644 --- a/extensions/inspector/base/src/win/inScreenCapturer.cpp +++ b/extensions/inspector/base/src/win/inScreenCapturer.cpp @@ -61,7 +61,7 @@ static NS_DEFINE_CID(kInspectorCSSUtilsCID, NS_INSPECTORCSSUTILS_CID); inScreenCapturer::inScreenCapturer() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mCSSUtils = do_GetService(kInspectorCSSUtilsCID); } diff --git a/extensions/pics/src/nsPICS.cpp b/extensions/pics/src/nsPICS.cpp index 7014a9495e30..29812bf4f1f5 100644 --- a/extensions/pics/src/nsPICS.cpp +++ b/extensions/pics/src/nsPICS.cpp @@ -342,7 +342,7 @@ NS_EXPORT nsresult NS_NewPICS(nsIPICS** aPICS) nsPICS::nsPICS() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mPrefs = nsnull; mPICSElementObserver = nsnull; diff --git a/extensions/pics/src/nsPICSElementObserver.cpp b/extensions/pics/src/nsPICSElementObserver.cpp index 086bdb07cc74..9f3dbb3216b4 100644 --- a/extensions/pics/src/nsPICSElementObserver.cpp +++ b/extensions/pics/src/nsPICSElementObserver.cpp @@ -112,7 +112,7 @@ NS_PICS nsresult NS_NewPICSElementObserver(nsIObserver** anObserver) nsPICSElementObserver::nsPICSElementObserver() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsPICSElementObserver::~nsPICSElementObserver(void) @@ -225,7 +225,7 @@ NS_IMPL_ISUPPORTS1(nsPICSElementObserverFactory, nsIFactory) nsPICSElementObserverFactory::nsPICSElementObserverFactory(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsPICSElementObserverFactory::~nsPICSElementObserverFactory(void) diff --git a/extensions/pref/autoconfig/src/nsAutoConfig.cpp b/extensions/pref/autoconfig/src/nsAutoConfig.cpp index 469c250b09a9..74e1480f5f38 100644 --- a/extensions/pref/autoconfig/src/nsAutoConfig.cpp +++ b/extensions/pref/autoconfig/src/nsAutoConfig.cpp @@ -60,7 +60,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS6(nsAutoConfig, nsIAutoConfig, nsITimerCallback, nsI nsAutoConfig::nsAutoConfig() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult nsAutoConfig::Init() diff --git a/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp b/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp index 495c8eac1930..82f35b639b34 100644 --- a/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp +++ b/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp @@ -63,7 +63,7 @@ NS_IMPL_ISUPPORTS1(AutoConfigSecMan, nsIXPCSecurityManager); AutoConfigSecMan::AutoConfigSecMan() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMETHODIMP diff --git a/extensions/pref/autoconfig/src/nsReadConfig.cpp b/extensions/pref/autoconfig/src/nsReadConfig.cpp index f12c7b2caa71..5e1b3d977667 100644 --- a/extensions/pref/autoconfig/src/nsReadConfig.cpp +++ b/extensions/pref/autoconfig/src/nsReadConfig.cpp @@ -105,7 +105,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS2(nsReadConfig, nsIReadConfig, nsIObserver) nsReadConfig::nsReadConfig() : mRead(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult nsReadConfig::Init() diff --git a/extensions/python/xpcom/src/PyGBase.cpp b/extensions/python/xpcom/src/PyGBase.cpp index cbafa2551350..9579305f01aa 100644 --- a/extensions/python/xpcom/src/PyGBase.cpp +++ b/extensions/python/xpcom/src/PyGBase.cpp @@ -76,7 +76,7 @@ PyG_Base::CreateNew(PyObject *pPyInstance, const nsIID &iid, void **ppResult) PyG_Base::PyG_Base(PyObject *instance, const nsIID &iid) { // Note that "instance" is the _policy_ instance!! - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); PR_AtomicIncrement(&cGateways); m_pBaseObject = GetDefaultGateway(instance); // m_pWeakRef is an nsCOMPtr and needs no init. diff --git a/extensions/python/xpcom/src/PyGWeakReference.cpp b/extensions/python/xpcom/src/PyGWeakReference.cpp index 74073834f88d..be283c8f4fda 100644 --- a/extensions/python/xpcom/src/PyGWeakReference.cpp +++ b/extensions/python/xpcom/src/PyGWeakReference.cpp @@ -33,7 +33,7 @@ PyXPCOM_GatewayWeakReference::PyXPCOM_GatewayWeakReference( PyG_Base *base ) { m_pBase = base; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef NS_BUILD_REFCNT_LOGGING // bloat view uses 40 chars - stick "(WR)" at the end of this position. diff --git a/extensions/transformiix/source/base/baseutils.h b/extensions/transformiix/source/base/baseutils.h index 8b1b661862b9..5096dc35acba 100644 --- a/extensions/transformiix/source/base/baseutils.h +++ b/extensions/transformiix/source/base/baseutils.h @@ -59,7 +59,7 @@ // Mozilla module #include "prtypes.h" #include "nscore.h" - + #include "nsDebug.h" typedef PRBool MBool; #define MB_TRUE PR_TRUE diff --git a/extensions/typeaheadfind/src/nsTypeAheadFind.cpp b/extensions/typeaheadfind/src/nsTypeAheadFind.cpp index 3e17db6f75b7..8e018318b22e 100644 --- a/extensions/typeaheadfind/src/nsTypeAheadFind.cpp +++ b/extensions/typeaheadfind/src/nsTypeAheadFind.cpp @@ -136,7 +136,7 @@ nsTypeAheadFind::nsTypeAheadFind(): mIsMenuBarActive(PR_FALSE), mIsMenuPopupActive(PR_FALSE), mIsFindAllowedInWindow(PR_FALSE), mRepeatingMode(eRepeatingNone), mTimeoutLength(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef DEBUG // There should only ever be one instance of us diff --git a/extensions/universalchardet/src/nsUniversalDetector.cpp b/extensions/universalchardet/src/nsUniversalDetector.cpp index 8653f5ad2e3a..347ad3275479 100644 --- a/extensions/universalchardet/src/nsUniversalDetector.cpp +++ b/extensions/universalchardet/src/nsUniversalDetector.cpp @@ -259,7 +259,7 @@ void nsUniversalDetector::DataEnd() nsUniversalXPCOMDetector:: nsUniversalXPCOMDetector() : nsUniversalDetector() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mObserver = nsnull; } //--------------------------------------------------------------------- @@ -331,7 +331,7 @@ void nsUniversalXPCOMDetector::Report(const char* aCharset) nsUniversalXPCOMStringDetector:: nsUniversalXPCOMStringDetector() : nsUniversalDetector() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } //--------------------------------------------------------------------- nsUniversalXPCOMStringDetector::~nsUniversalXPCOMStringDetector() diff --git a/extensions/universalchardet/tests/UniversalChardetTest.cpp b/extensions/universalchardet/tests/UniversalChardetTest.cpp index 4fec29189509..adc215ef5b1e 100644 --- a/extensions/universalchardet/tests/UniversalChardetTest.cpp +++ b/extensions/universalchardet/tests/UniversalChardetTest.cpp @@ -63,7 +63,7 @@ class nsReporter : public nsICharsetDetectionObserver { NS_DECL_ISUPPORTS public: - nsReporter() { NS_INIT_REFCNT(); }; + nsReporter() { NS_INIT_ISUPPORTS(); }; virtual ~nsReporter() { }; NS_IMETHOD Notify(const char* aCharset, nsDetectionConfident aConf) diff --git a/extensions/wallet/cookieviewer/nsCookieViewer.cpp b/extensions/wallet/cookieviewer/nsCookieViewer.cpp index 7940c7aab174..2e9b17033372 100644 --- a/extensions/wallet/cookieviewer/nsCookieViewer.cpp +++ b/extensions/wallet/cookieviewer/nsCookieViewer.cpp @@ -57,7 +57,7 @@ static NS_DEFINE_IID(kCookieServiceCID, NS_COOKIESERVICE_CID); CookieViewerImpl::CookieViewerImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } CookieViewerImpl::~CookieViewerImpl() diff --git a/extensions/wallet/editor/nsWalletEditor.cpp b/extensions/wallet/editor/nsWalletEditor.cpp index 44d0c017cac6..3f1f03915e58 100644 --- a/extensions/wallet/editor/nsWalletEditor.cpp +++ b/extensions/wallet/editor/nsWalletEditor.cpp @@ -55,7 +55,7 @@ static NS_DEFINE_IID(kWalletServiceCID, NS_WALLETSERVICE_CID); WalletEditorImpl::WalletEditorImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } WalletEditorImpl::~WalletEditorImpl() diff --git a/extensions/wallet/signonviewer/nsSignonViewer.cpp b/extensions/wallet/signonviewer/nsSignonViewer.cpp index 061c70223efd..93d014aaca32 100644 --- a/extensions/wallet/signonviewer/nsSignonViewer.cpp +++ b/extensions/wallet/signonviewer/nsSignonViewer.cpp @@ -55,7 +55,7 @@ static NS_DEFINE_IID(kWalletServiceCID, NS_WALLETSERVICE_CID); SignonViewerImpl::SignonViewerImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } SignonViewerImpl::~SignonViewerImpl() diff --git a/extensions/wallet/src/nsPassword.cpp b/extensions/wallet/src/nsPassword.cpp index e0a412a223f0..7a59e2df72de 100644 --- a/extensions/wallet/src/nsPassword.cpp +++ b/extensions/wallet/src/nsPassword.cpp @@ -46,14 +46,14 @@ NS_IMPL_ISUPPORTS2(nsPassword, nsIPassword, nsISupportsWeakReference); nsPassword::nsPassword() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsPassword::nsPassword(char * host, PRUnichar * user, PRUnichar * pswd) { passwordHost = host; passwordUser = user; passwordPswd = pswd; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsPassword::~nsPassword(void) { diff --git a/extensions/wallet/src/nsPasswordManager.cpp b/extensions/wallet/src/nsPasswordManager.cpp index e0aede43754e..20b3ece1c269 100644 --- a/extensions/wallet/src/nsPasswordManager.cpp +++ b/extensions/wallet/src/nsPasswordManager.cpp @@ -51,7 +51,7 @@ class nsPasswordManagerEnumerator : public nsISimpleEnumerator nsPasswordManagerEnumerator() : mHostCount(0), mUserCount(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMETHOD HasMoreElements(PRBool *result) @@ -107,7 +107,7 @@ class nsPasswordManagerRejectEnumerator : public nsISimpleEnumerator nsPasswordManagerRejectEnumerator() : mRejectCount(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMETHOD HasMoreElements(PRBool *result) @@ -151,7 +151,7 @@ NS_IMPL_ISUPPORTS3(nsPasswordManager, nsIPasswordManager, nsIPasswordManagerInte nsPasswordManager::nsPasswordManager() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsPasswordManager::~nsPasswordManager(void) diff --git a/extensions/wallet/src/nsWalletService.cpp b/extensions/wallet/src/nsWalletService.cpp index d2ac0b980b7b..70596761a2cd 100644 --- a/extensions/wallet/src/nsWalletService.cpp +++ b/extensions/wallet/src/nsWalletService.cpp @@ -67,6 +67,7 @@ #include "nsUnicharUtils.h" #include "nsReadableUtils.h" #include "nsICategoryManager.h" +#include "nsComObsolete.h" // for making the leap from nsIDOMWindowInternal -> nsIPresShell #include "nsIScriptGlobalObject.h" @@ -81,7 +82,7 @@ static NS_DEFINE_IID(kDocLoaderServiceCID, NS_DOCUMENTLOADER_SERVICE_CID); class nsSingleSignOnProfileObserver : public nsIObserver { public: - nsSingleSignOnProfileObserver() { NS_INIT_REFCNT(); } + nsSingleSignOnProfileObserver() { NS_INIT_ISUPPORTS(); } virtual ~nsSingleSignOnProfileObserver() {} NS_DECL_ISUPPORTS @@ -127,7 +128,7 @@ static nsresult EnsureSingleSignOnProfileObserver() nsWalletlibService::nsWalletlibService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsWalletlibService::~nsWalletlibService() diff --git a/extensions/wallet/src/nsWalletService.h b/extensions/wallet/src/nsWalletService.h index 5509e79f6fe4..35b714c0cedb 100644 --- a/extensions/wallet/src/nsWalletService.h +++ b/extensions/wallet/src/nsWalletService.h @@ -98,7 +98,7 @@ public: NS_DECL_NSIAUTHPROMPT NS_DECL_NSIAUTHPROMPTWRAPPER - nsSingleSignOnPrompt() { NS_INIT_REFCNT(); } + nsSingleSignOnPrompt() { NS_INIT_ISUPPORTS(); } virtual ~nsSingleSignOnPrompt() {} nsresult Init(); diff --git a/extensions/wallet/src/singsign.cpp b/extensions/wallet/src/singsign.cpp index 23cea4e0569a..32e247426355 100644 --- a/extensions/wallet/src/singsign.cpp +++ b/extensions/wallet/src/singsign.cpp @@ -42,6 +42,7 @@ #include "singsign.h" #include "wallet.h" #include "nsNetUtil.h" +#include "nsComObsolete.h" #ifdef XP_MAC #include "prpriv.h" /* for NewNamedMonitor */ diff --git a/extensions/wallet/src/wallet.cpp b/extensions/wallet/src/wallet.cpp index f848af2bf44c..5437a237a4b0 100644 --- a/extensions/wallet/src/wallet.cpp +++ b/extensions/wallet/src/wallet.cpp @@ -76,6 +76,7 @@ #include "nsIObserverService.h" #include "nsIWalletService.h" +#include "nsComObsolete.h" #include diff --git a/extensions/wallet/walletpreview/nsWalletPreview.cpp b/extensions/wallet/walletpreview/nsWalletPreview.cpp index f0515eabd088..b26402013dc8 100644 --- a/extensions/wallet/walletpreview/nsWalletPreview.cpp +++ b/extensions/wallet/walletpreview/nsWalletPreview.cpp @@ -58,7 +58,7 @@ static NS_DEFINE_IID(kWalletServiceCID, NS_WALLETSERVICE_CID); WalletPreviewImpl::WalletPreviewImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } WalletPreviewImpl::~WalletPreviewImpl() diff --git a/extensions/wallet/walletpreview/nsWalletPreviewFactory.cpp b/extensions/wallet/walletpreview/nsWalletPreviewFactory.cpp index 0cc17c28584b..3f627dedd1cd 100644 --- a/extensions/wallet/walletpreview/nsWalletPreviewFactory.cpp +++ b/extensions/wallet/walletpreview/nsWalletPreviewFactory.cpp @@ -86,7 +86,7 @@ WalletPreviewFactoryImpl::WalletPreviewFactoryImpl(const nsCID &aClass, const char* contractID) : mClassID(aClass), mClassName(className), mContractID(contractID) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } WalletPreviewFactoryImpl::~WalletPreviewFactoryImpl() diff --git a/extensions/webservices/soap/src/nsSOAPPropertyBag.cpp b/extensions/webservices/soap/src/nsSOAPPropertyBag.cpp index bb9cfe096551..fcc6a19ae860 100644 --- a/extensions/webservices/soap/src/nsSOAPPropertyBag.cpp +++ b/extensions/webservices/soap/src/nsSOAPPropertyBag.cpp @@ -170,7 +170,7 @@ nsSOAPPropertyBagEnumerator::nsSOAPPropertyBagEnumerator(nsSOAPPropertyBag * aPr mCurrent (0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); aPropertyBag->mProperties->Enumerate(&PropertyBagEnumFunc, mProperties); } @@ -205,7 +205,7 @@ NS_IMPL_ISUPPORTS1_CI(nsSOAPProperty, nsIProperty) nsSOAPProperty::nsSOAPProperty(const nsAString & aName, nsIVariant * aValue) : mName(aName), mValue(aValue) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsSOAPProperty::~nsSOAPProperty() { @@ -238,7 +238,7 @@ NS_IMETHODIMP nsSOAPPropertyBagMutator::nsSOAPPropertyBagMutator() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mBag = mSOAPBag = new nsSOAPPropertyBag(); } diff --git a/extensions/xmlextras/soap/src/nsSOAPPropertyBag.cpp b/extensions/xmlextras/soap/src/nsSOAPPropertyBag.cpp index bb9cfe096551..fcc6a19ae860 100644 --- a/extensions/xmlextras/soap/src/nsSOAPPropertyBag.cpp +++ b/extensions/xmlextras/soap/src/nsSOAPPropertyBag.cpp @@ -170,7 +170,7 @@ nsSOAPPropertyBagEnumerator::nsSOAPPropertyBagEnumerator(nsSOAPPropertyBag * aPr mCurrent (0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); aPropertyBag->mProperties->Enumerate(&PropertyBagEnumFunc, mProperties); } @@ -205,7 +205,7 @@ NS_IMPL_ISUPPORTS1_CI(nsSOAPProperty, nsIProperty) nsSOAPProperty::nsSOAPProperty(const nsAString & aName, nsIVariant * aValue) : mName(aName), mValue(aValue) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsSOAPProperty::~nsSOAPProperty() { @@ -238,7 +238,7 @@ NS_IMETHODIMP nsSOAPPropertyBagMutator::nsSOAPPropertyBagMutator() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mBag = mSOAPBag = new nsSOAPPropertyBag(); } diff --git a/extensions/xmlterm/base/mozLineTerm.cpp b/extensions/xmlterm/base/mozLineTerm.cpp index 79ad02b54833..734a63a035a1 100644 --- a/extensions/xmlterm/base/mozLineTerm.cpp +++ b/extensions/xmlterm/base/mozLineTerm.cpp @@ -114,7 +114,7 @@ mozLineTerm::mozLineTerm() : mCookie(nsAutoString()), mLastTime(LL_ZERO) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mLTerm = lterm_new(); } diff --git a/extensions/xmlterm/base/mozXMLTermListeners.cpp b/extensions/xmlterm/base/mozXMLTermListeners.cpp index ba36fdea8236..f38c9c084e60 100644 --- a/extensions/xmlterm/base/mozXMLTermListeners.cpp +++ b/extensions/xmlterm/base/mozXMLTermListeners.cpp @@ -110,7 +110,7 @@ mozXMLTermKeyListener::mozXMLTermKeyListener() : mXMLTerminal(nsnull), mSuspend(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } @@ -435,7 +435,7 @@ mozXMLTermKeyListener::KeyPress(nsIDOMEvent* aKeyEvent) mozXMLTermTextListener::mozXMLTermTextListener() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } @@ -513,7 +513,7 @@ mozXMLTermTextListener::HandleText(nsIDOMEvent* aTextEvent) mozXMLTermMouseListener::mozXMLTermMouseListener() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } @@ -708,7 +708,7 @@ mozXMLTermMouseListener::MouseOut(nsIDOMEvent* aMouseEvent) mozXMLTermDragListener::mozXMLTermDragListener() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/extensions/xmlterm/base/mozXMLTermShell.cpp b/extensions/xmlterm/base/mozXMLTermShell.cpp index 9415f6b5d13d..a5e5c3af264a 100644 --- a/extensions/xmlterm/base/mozXMLTermShell.cpp +++ b/extensions/xmlterm/base/mozXMLTermShell.cpp @@ -121,7 +121,7 @@ mozXMLTermShell::mozXMLTermShell() : mContentAreaDocShell(nsnull), mXMLTerminal(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } mozXMLTermShell::~mozXMLTermShell() diff --git a/extensions/xmlterm/base/mozXMLTermStream.cpp b/extensions/xmlterm/base/mozXMLTermStream.cpp index 69bc4d4bbb54..8ba3ab5403f6 100644 --- a/extensions/xmlterm/base/mozXMLTermStream.cpp +++ b/extensions/xmlterm/base/mozXMLTermStream.cpp @@ -75,7 +75,7 @@ mozXMLTermStream::mozXMLTermStream() : mDOMHTMLDocument( nsnull ) #endif // !NO_WORKAROUND { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/extensions/xmlterm/base/mozXMLTerminal.cpp b/extensions/xmlterm/base/mozXMLTerminal.cpp index 2a0f99c04236..b98825dbbe1a 100644 --- a/extensions/xmlterm/base/mozXMLTerminal.cpp +++ b/extensions/xmlterm/base/mozXMLTerminal.cpp @@ -108,7 +108,7 @@ mozXMLTerminal::mozXMLTerminal() : mMouseListener(nsnull), mDragListener(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/gfx/public/nsColor.h b/gfx/public/nsColor.h index 460daad5bd9a..102410f4700e 100644 --- a/gfx/public/nsColor.h +++ b/gfx/public/nsColor.h @@ -40,6 +40,7 @@ #define nsColor_h___ #include "nscore.h" +#include "nsComObsolete.h" class nsString; class nsAString; diff --git a/gfx/public/nsColorNames.h b/gfx/public/nsColorNames.h index cb65a7453ba9..b8e8d65e090b 100644 --- a/gfx/public/nsColorNames.h +++ b/gfx/public/nsColorNames.h @@ -40,6 +40,7 @@ #define nsColorNames_h___ #include "nsColor.h" +#include "nsComObsolete.h" struct nsStr; class nsAFlatCString; diff --git a/gfx/public/nsDeviceContext.h b/gfx/public/nsDeviceContext.h index d9669f3cfddd..f52c8285cac1 100644 --- a/gfx/public/nsDeviceContext.h +++ b/gfx/public/nsDeviceContext.h @@ -48,6 +48,7 @@ #include "nsIObserver.h" #include "nsIObserverService.h" #include "nsWeakReference.h" +#include "nsComObsolete.h" class nsIImageRequest; class nsHashtable; diff --git a/gfx/public/nsFont.h b/gfx/public/nsFont.h index ecbc54c35119..9fae96d526ab 100644 --- a/gfx/public/nsFont.h +++ b/gfx/public/nsFont.h @@ -40,6 +40,7 @@ #define nsFont_h___ #include "nscore.h" +#include "nsComObsolete.h" #include "nsCoord.h" #include "nsString.h" diff --git a/gfx/public/nsRect.h b/gfx/public/nsRect.h index 00eb666897f5..e8a9a795612c 100644 --- a/gfx/public/nsRect.h +++ b/gfx/public/nsRect.h @@ -46,6 +46,7 @@ #include "nsSize.h" #include "nsMargin.h" #include "nsUnitConversion.h" +#include "nsComObsolete.h" struct NS_GFX nsRect { nscoord x, y; diff --git a/gfx/public/nsRenderingContextImpl.h b/gfx/public/nsRenderingContextImpl.h index 2d937a126cd1..c66a4c7d1155 100644 --- a/gfx/public/nsRenderingContextImpl.h +++ b/gfx/public/nsRenderingContextImpl.h @@ -39,6 +39,7 @@ #ifndef nsRenderingContextImpl_h___ #define nsRenderingContextImpl_h___ +#include "nsComObsolete.h" #include "nsIRenderingContext.h" #include "nsPoint.h" #include "nsSize.h" diff --git a/gfx/public/nsRepeater.h b/gfx/public/nsRepeater.h index 758725e8e45a..3cd0691e5941 100644 --- a/gfx/public/nsRepeater.h +++ b/gfx/public/nsRepeater.h @@ -40,6 +40,7 @@ #define nsRepeater_h___ #include "nscore.h" +#include "nsComObsolete.h" class EventRecord; diff --git a/gfx/public/nsTransform2D.h b/gfx/public/nsTransform2D.h index a2b9985aae4a..266ebb30648e 100644 --- a/gfx/public/nsTransform2D.h +++ b/gfx/public/nsTransform2D.h @@ -42,6 +42,7 @@ #include "nscore.h" #include "nsCoord.h" #include "nsUnitConversion.h" +#include "nsComObsolete.h" #define MG_2DIDENTITY 0 #define MG_2DTRANSLATION 1 diff --git a/gfx/public/nsWatchTask.h b/gfx/public/nsWatchTask.h index 4877c0986596..d69b0f1780ef 100644 --- a/gfx/public/nsWatchTask.h +++ b/gfx/public/nsWatchTask.h @@ -47,7 +47,7 @@ #include #include "prtypes.h" #include "nscore.h" - +#include "nsComObsolete.h" // // class nsWatchTask diff --git a/gfx/src/beos/nsDeviceContextSpecB.cpp b/gfx/src/beos/nsDeviceContextSpecB.cpp index cbbec6e9fe6f..6e76e760fc39 100644 --- a/gfx/src/beos/nsDeviceContextSpecB.cpp +++ b/gfx/src/beos/nsDeviceContextSpecB.cpp @@ -83,7 +83,7 @@ int GlobalPrinters::mGlobalNumPrinters = 0; */ nsDeviceContextSpecBeOS :: nsDeviceContextSpecBeOS() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } /** ------------------------------------------------------- @@ -408,7 +408,7 @@ NS_IMETHODIMP nsDeviceContextSpecBeOS::GetPageSizeInTwips(PRInt32 *aWidth, PRInt // Printer Enumerator nsPrinterEnumeratorBeOS::nsPrinterEnumeratorBeOS() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsPrinterEnumeratorBeOS, nsIPrinterEnumerator) diff --git a/gfx/src/beos/nsDeviceContextSpecFactoryB.cpp b/gfx/src/beos/nsDeviceContextSpecFactoryB.cpp index 6d5d1a2f4293..edfbc75aa7a5 100644 --- a/gfx/src/beos/nsDeviceContextSpecFactoryB.cpp +++ b/gfx/src/beos/nsDeviceContextSpecFactoryB.cpp @@ -48,7 +48,7 @@ */ nsDeviceContextSpecFactoryBeOS :: nsDeviceContextSpecFactoryBeOS() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } /** ------------------------------------------------------- diff --git a/gfx/src/beos/nsDrawingSurfaceBeOS.cpp b/gfx/src/beos/nsDrawingSurfaceBeOS.cpp index 6af0459f8b2e..39e05e4fbe73 100644 --- a/gfx/src/beos/nsDrawingSurfaceBeOS.cpp +++ b/gfx/src/beos/nsDrawingSurfaceBeOS.cpp @@ -47,7 +47,7 @@ static PRTime mLockTime, mUnlockTime; nsDrawingSurfaceBeOS :: nsDrawingSurfaceBeOS() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mView = NULL; mBitmap = nsnull; diff --git a/gfx/src/beos/nsFontMetricsBeOS.cpp b/gfx/src/beos/nsFontMetricsBeOS.cpp index 9c7eb11b4e57..013114a15b8b 100644 --- a/gfx/src/beos/nsFontMetricsBeOS.cpp +++ b/gfx/src/beos/nsFontMetricsBeOS.cpp @@ -63,7 +63,7 @@ static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); nsFontMetricsBeOS::nsFontMetricsBeOS() :mEmulateBold(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsFontMetricsBeOS::~nsFontMetricsBeOS() @@ -460,7 +460,7 @@ nsFontMetricsBeOS::FamilyExists(const nsString& aName) nsFontEnumeratorBeOS::nsFontEnumeratorBeOS() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsFontEnumeratorBeOS, nsIFontEnumerator) diff --git a/gfx/src/beos/nsImageBeOS.cpp b/gfx/src/beos/nsImageBeOS.cpp index eef6765a6f87..b3aa3b830f55 100644 --- a/gfx/src/beos/nsImageBeOS.cpp +++ b/gfx/src/beos/nsImageBeOS.cpp @@ -47,7 +47,7 @@ NS_IMPL_ISUPPORTS1(nsImageBeOS, nsIImage) nsImageBeOS::nsImageBeOS() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mImage = nsnull; mImageBits = nsnull; mWidth = 0; diff --git a/gfx/src/beos/nsRegionBeOS.cpp b/gfx/src/beos/nsRegionBeOS.cpp index 87dac1712b85..8c6811214d09 100644 --- a/gfx/src/beos/nsRegionBeOS.cpp +++ b/gfx/src/beos/nsRegionBeOS.cpp @@ -49,7 +49,7 @@ static NS_DEFINE_IID(kRegionIID, NS_IREGION_IID); nsRegionBeOS :: nsRegionBeOS() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef DEBUG_REGIONS ++nRegions; diff --git a/gfx/src/beos/nsRenderingContextBeOS.cpp b/gfx/src/beos/nsRenderingContextBeOS.cpp index bfface9c4d6c..24bb02cf9e71 100644 --- a/gfx/src/beos/nsRenderingContextBeOS.cpp +++ b/gfx/src/beos/nsRenderingContextBeOS.cpp @@ -52,7 +52,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsRenderingContextBeOS, nsIRenderingContext) static NS_DEFINE_CID(kRegionCID, NS_REGION_CID); nsRenderingContextBeOS::nsRenderingContextBeOS() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mOffscreenSurface = nsnull; mSurface = nsnull; diff --git a/gfx/src/beos/nsScreenBeOS.cpp b/gfx/src/beos/nsScreenBeOS.cpp index 1f0968ac58a4..19f8bb1da39f 100644 --- a/gfx/src/beos/nsScreenBeOS.cpp +++ b/gfx/src/beos/nsScreenBeOS.cpp @@ -42,7 +42,7 @@ nsScreenBeOS :: nsScreenBeOS ( ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // nothing else to do. I guess we could cache a bunch of information // here, but we want to ask the device at runtime in case anything diff --git a/gfx/src/beos/nsScreenManagerBeOS.cpp b/gfx/src/beos/nsScreenManagerBeOS.cpp index 58dd703d8bc9..122ab7c977a5 100644 --- a/gfx/src/beos/nsScreenManagerBeOS.cpp +++ b/gfx/src/beos/nsScreenManagerBeOS.cpp @@ -42,7 +42,7 @@ nsScreenManagerBeOS :: nsScreenManagerBeOS ( ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // nothing else to do. I guess we could cache a bunch of information // here, but we want to ask the device at runtime in case anything diff --git a/gfx/src/gtk/nsDeviceContextSpecFactoryG.cpp b/gfx/src/gtk/nsDeviceContextSpecFactoryG.cpp index 55dd0a7fa1b0..66213affb3eb 100644 --- a/gfx/src/gtk/nsDeviceContextSpecFactoryG.cpp +++ b/gfx/src/gtk/nsDeviceContextSpecFactoryG.cpp @@ -48,7 +48,7 @@ */ nsDeviceContextSpecFactoryGTK :: nsDeviceContextSpecFactoryGTK() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } /** ------------------------------------------------------- diff --git a/gfx/src/gtk/nsDeviceContextSpecG.cpp b/gfx/src/gtk/nsDeviceContextSpecG.cpp index af795dbad608..029da5edf6b6 100644 --- a/gfx/src/gtk/nsDeviceContextSpecG.cpp +++ b/gfx/src/gtk/nsDeviceContextSpecG.cpp @@ -216,7 +216,7 @@ int GlobalPrinters::mGlobalNumPrinters = 0; nsDeviceContextSpecGTK::nsDeviceContextSpecGTK() { DO_PR_DEBUG_LOG(("nsDeviceContextSpecGTK::nsDeviceContextSpecGTK()\n")); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDeviceContextSpecGTK::~nsDeviceContextSpecGTK() @@ -537,7 +537,7 @@ nsresult CopyPrinterCharPref(nsIPref *pref, const char *modulename, const char * // Printer Enumerator nsPrinterEnumeratorGTK::nsPrinterEnumeratorGTK() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsPrinterEnumeratorGTK, nsIPrinterEnumerator) diff --git a/gfx/src/gtk/nsDrawingSurfaceGTK.cpp b/gfx/src/gtk/nsDrawingSurfaceGTK.cpp index cebca4a3de3c..24fc0a1db4cb 100644 --- a/gfx/src/gtk/nsDrawingSurfaceGTK.cpp +++ b/gfx/src/gtk/nsDrawingSurfaceGTK.cpp @@ -51,7 +51,7 @@ static PRTime mLockTime, mUnlockTime; nsDrawingSurfaceGTK :: nsDrawingSurfaceGTK() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); GdkVisual *v; mPixmap = nsnull; diff --git a/gfx/src/gtk/nsFontMetricsGTK.cpp b/gfx/src/gtk/nsFontMetricsGTK.cpp index 855530f9bc9b..4af455f16638 100644 --- a/gfx/src/gtk/nsFontMetricsGTK.cpp +++ b/gfx/src/gtk/nsFontMetricsGTK.cpp @@ -1203,7 +1203,7 @@ nsFontMetricsGTK::nsFontMetricsGTK() // XXX mFontIsGeneric will generally need to be the same size; right now // it's an nsAutoVoidArray. If the average is under 8, that's ok. { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); gFontMetricsGTKCount++; } @@ -5025,7 +5025,7 @@ nsFontMetricsGTK::FindFont(PRUnichar aChar) nsFontEnumeratorGTK::nsFontEnumeratorGTK() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsFontEnumeratorGTK, nsIFontEnumerator) diff --git a/gfx/src/gtk/nsImageGTK.cpp b/gfx/src/gtk/nsImageGTK.cpp index ee7c859c1ba4..580df8c43cb4 100644 --- a/gfx/src/gtk/nsImageGTK.cpp +++ b/gfx/src/gtk/nsImageGTK.cpp @@ -60,7 +60,7 @@ NS_IMPL_ISUPPORTS1(nsImageGTK, nsIImage) nsImageGTK::nsImageGTK() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mImageBits = nsnull; mWidth = 0; mHeight = 0; diff --git a/gfx/src/gtk/nsRegionGTK.cpp b/gfx/src/gtk/nsRegionGTK.cpp index 983604eee58c..e2196c960faa 100644 --- a/gfx/src/gtk/nsRegionGTK.cpp +++ b/gfx/src/gtk/nsRegionGTK.cpp @@ -35,7 +35,7 @@ GdkRegion *nsRegionGTK::copyRegion = nsnull; nsRegionGTK::nsRegionGTK() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef DEBUG_REGIONS ++nRegions; diff --git a/gfx/src/gtk/nsRegionGTK2.cpp b/gfx/src/gtk/nsRegionGTK2.cpp index e4c45203797b..bb2d5c968e77 100644 --- a/gfx/src/gtk/nsRegionGTK2.cpp +++ b/gfx/src/gtk/nsRegionGTK2.cpp @@ -30,7 +30,7 @@ static int nRegions; nsRegionGTK::nsRegionGTK() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef DEBUG_REGIONS ++nRegions; diff --git a/gfx/src/gtk/nsRenderingContextGTK.cpp b/gfx/src/gtk/nsRenderingContextGTK.cpp index 6c395f4e9898..9fbbd681794a 100644 --- a/gfx/src/gtk/nsRenderingContextGTK.cpp +++ b/gfx/src/gtk/nsRenderingContextGTK.cpp @@ -73,7 +73,7 @@ static nsGCCache *gcCache = nsnull; nsRenderingContextGTK::nsRenderingContextGTK() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mFontMetrics = nsnull; mContext = nsnull; diff --git a/gfx/src/gtk/nsScreenGtk.cpp b/gfx/src/gtk/nsScreenGtk.cpp index 94c98ad2588c..60d239339594 100644 --- a/gfx/src/gtk/nsScreenGtk.cpp +++ b/gfx/src/gtk/nsScreenGtk.cpp @@ -44,7 +44,7 @@ nsScreenGtk :: nsScreenGtk ( ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mScreenNum = 0; mXOrg = 0; diff --git a/gfx/src/gtk/nsScreenManagerGtk.cpp b/gfx/src/gtk/nsScreenManagerGtk.cpp index 519907d074cc..ab26b77f8531 100644 --- a/gfx/src/gtk/nsScreenManagerGtk.cpp +++ b/gfx/src/gtk/nsScreenManagerGtk.cpp @@ -53,7 +53,7 @@ extern "C" nsScreenManagerGtk :: nsScreenManagerGtk ( ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // nothing else to do. I guess we could cache a bunch of information // here, but we want to ask the device at runtime in case anything diff --git a/gfx/src/mac/nsDeviceContextMac.cpp b/gfx/src/mac/nsDeviceContextMac.cpp index c0677fa2cc4c..91b0725e653b 100644 --- a/gfx/src/mac/nsDeviceContextMac.cpp +++ b/gfx/src/mac/nsDeviceContextMac.cpp @@ -1064,7 +1064,7 @@ PRBool nsDeviceContextMac::HaveFontManager90() //------------------------------------------------------------------------ nsFontEnumeratorMac::nsFontEnumeratorMac() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsFontEnumeratorMac, nsIFontEnumerator) diff --git a/gfx/src/mac/nsDeviceContextSpecFactoryM.cpp b/gfx/src/mac/nsDeviceContextSpecFactoryM.cpp index 3b7c464a7434..496e4d84290e 100644 --- a/gfx/src/mac/nsDeviceContextSpecFactoryM.cpp +++ b/gfx/src/mac/nsDeviceContextSpecFactoryM.cpp @@ -53,7 +53,7 @@ */ nsDeviceContextSpecFactoryMac :: nsDeviceContextSpecFactoryMac() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } /** ------------------------------------------------------- diff --git a/gfx/src/mac/nsDeviceContextSpecMac.cpp b/gfx/src/mac/nsDeviceContextSpecMac.cpp index 13605e795879..297d1e886d1a 100644 --- a/gfx/src/mac/nsDeviceContextSpecMac.cpp +++ b/gfx/src/mac/nsDeviceContextSpecMac.cpp @@ -50,7 +50,7 @@ nsDeviceContextSpecMac::nsDeviceContextSpecMac() : mPrtRec(nsnull) , mPrintManagerOpen(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } /** ------------------------------------------------------- diff --git a/gfx/src/mac/nsDeviceContextSpecX.cpp b/gfx/src/mac/nsDeviceContextSpecX.cpp index a9ead5ada061..e7793fa756ce 100644 --- a/gfx/src/mac/nsDeviceContextSpecX.cpp +++ b/gfx/src/mac/nsDeviceContextSpecX.cpp @@ -59,7 +59,7 @@ nsDeviceContextSpecX::nsDeviceContextSpecX() , mSavedPort(0) , mBeganPrinting(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } /** ------------------------------------------------------- diff --git a/gfx/src/mac/nsDrawingSurfaceMac.cpp b/gfx/src/mac/nsDrawingSurfaceMac.cpp index 1fa8ec77cf56..6a05ed7c4a6a 100644 --- a/gfx/src/mac/nsDrawingSurfaceMac.cpp +++ b/gfx/src/mac/nsDrawingSurfaceMac.cpp @@ -53,7 +53,7 @@ static NS_DEFINE_IID(kIDrawingSurfaceMacIID, NS_IDRAWING_SURFACE_MAC_IID); */ nsDrawingSurfaceMac::nsDrawingSurfaceMac() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mPort = NULL; mGS = sGraphicStatePool.GetNewGS(); //new nsGraphicState(); diff --git a/gfx/src/mac/nsFontMetricsMac.cpp b/gfx/src/mac/nsFontMetricsMac.cpp index 99e0e8e19a2f..54ab7072591c 100644 --- a/gfx/src/mac/nsFontMetricsMac.cpp +++ b/gfx/src/mac/nsFontMetricsMac.cpp @@ -50,7 +50,7 @@ nsFontMetricsMac :: nsFontMetricsMac() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mFont = nsnull; mFontNum = BAD_FONT_NUM; mFontMapping = nsnull; diff --git a/gfx/src/mac/nsImageMac.cpp b/gfx/src/mac/nsImageMac.cpp index 9c3cdd2999e0..feb0085c5898 100644 --- a/gfx/src/mac/nsImageMac.cpp +++ b/gfx/src/mac/nsImageMac.cpp @@ -107,7 +107,7 @@ nsImageMac::nsImageMac() , mIsTopToBottom(PR_TRUE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); ::memset(&mImagePixmap, 0, sizeof(PixMap)); ::memset(&mMaskPixmap, 0, sizeof(PixMap)); diff --git a/gfx/src/mac/nsPrintSettingsMac.cpp b/gfx/src/mac/nsPrintSettingsMac.cpp index 8921b7486b7d..eceee2707e96 100644 --- a/gfx/src/mac/nsPrintSettingsMac.cpp +++ b/gfx/src/mac/nsPrintSettingsMac.cpp @@ -58,7 +58,7 @@ NS_IMPL_ISUPPORTS_INHERITED1(nsPrintSettingsMac, nsPrintSettingsMac::nsPrintSettingsMac() : mPrintRecord(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } /** --------------------------------------------------- @@ -66,7 +66,7 @@ nsPrintSettingsMac::nsPrintSettingsMac() : nsPrintSettingsMac::nsPrintSettingsMac(const nsPrintSettingsMac& src) : mPrintRecord(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); *this = src; } diff --git a/gfx/src/mac/nsPrintSettingsX.cpp b/gfx/src/mac/nsPrintSettingsX.cpp index 155378b19a4a..aca694d2d2ea 100644 --- a/gfx/src/mac/nsPrintSettingsX.cpp +++ b/gfx/src/mac/nsPrintSettingsX.cpp @@ -63,7 +63,7 @@ nsPrintSettingsX::nsPrintSettingsX() : mPageFormat(kPMNoPageFormat), mPrintSettings(kPMNoPrintSettings) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } /** --------------------------------------------------- @@ -72,7 +72,7 @@ nsPrintSettingsX::nsPrintSettingsX(const nsPrintSettingsX& src) : mPageFormat(kPMNoPageFormat), mPrintSettings(kPMNoPrintSettings) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); *this = src; } diff --git a/gfx/src/mac/nsRegionMac.cpp b/gfx/src/mac/nsRegionMac.cpp index fc96c239a139..f5af86a36d02 100644 --- a/gfx/src/mac/nsRegionMac.cpp +++ b/gfx/src/mac/nsRegionMac.cpp @@ -46,7 +46,7 @@ nsRegionMac::nsRegionMac() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mRegion = nsnull; mRegionType = eRegionComplexity_empty; } diff --git a/gfx/src/mac/nsRenderingContextMac.cpp b/gfx/src/mac/nsRenderingContextMac.cpp index 514f3b74d553..1c579b9d1670 100644 --- a/gfx/src/mac/nsRenderingContextMac.cpp +++ b/gfx/src/mac/nsRenderingContextMac.cpp @@ -81,7 +81,7 @@ nsRenderingContextMac::nsRenderingContextMac() , mRightToLeftText(PR_FALSE) #endif { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mFrontSurface = new nsDrawingSurfaceMac(); NS_IF_ADDREF(mFrontSurface); diff --git a/gfx/src/mac/nsScreenMac.cpp b/gfx/src/mac/nsScreenMac.cpp index 055bdae5ad33..814646274a81 100644 --- a/gfx/src/mac/nsScreenMac.cpp +++ b/gfx/src/mac/nsScreenMac.cpp @@ -46,7 +46,7 @@ nsScreenMac :: nsScreenMac ( GDHandle inScreen ) : mScreen(inScreen) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ASSERTION ( inScreen, "Passing null device to nsScreenMac" ); diff --git a/gfx/src/mac/nsScreenManagerMac.cpp b/gfx/src/mac/nsScreenManagerMac.cpp index 6df8f88223db..1acdf08b0ff0 100644 --- a/gfx/src/mac/nsScreenManagerMac.cpp +++ b/gfx/src/mac/nsScreenManagerMac.cpp @@ -54,7 +54,7 @@ public: nsScreenManagerMac :: nsScreenManagerMac ( ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // nothing else to do. I guess we could cache a bunch of information // here, but we want to ask the device at runtime in case anything diff --git a/gfx/src/nsBlender.cpp b/gfx/src/nsBlender.cpp index 7e18b10ddcef..3967094230a6 100644 --- a/gfx/src/nsBlender.cpp +++ b/gfx/src/nsBlender.cpp @@ -46,7 +46,7 @@ */ nsBlender :: nsBlender() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mContext = nsnull; } diff --git a/gfx/src/nsBlender.h b/gfx/src/nsBlender.h index 987b7017ce9b..aeb069567bc6 100644 --- a/gfx/src/nsBlender.h +++ b/gfx/src/nsBlender.h @@ -24,6 +24,7 @@ #define nsBlender_h___ #include "nsIBlender.h" +#include "nsComObsolete.h" typedef enum { diff --git a/gfx/src/nsDeviceContext.cpp b/gfx/src/nsDeviceContext.cpp index 73c425ba2643..8684fb29c3b2 100644 --- a/gfx/src/nsDeviceContext.cpp +++ b/gfx/src/nsDeviceContext.cpp @@ -39,7 +39,7 @@ NS_IMPL_ISUPPORTS3(DeviceContextImpl, nsIDeviceContext, nsIObserver, nsISupports DeviceContextImpl::DeviceContextImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mFontCache = nsnull; mDevUnitsToAppUnits = 1.0f; mAppUnitsToDevUnits = 1.0f; diff --git a/gfx/src/nsFontList.cpp b/gfx/src/nsFontList.cpp index 6b4f9d99a71b..d4f3db201021 100644 --- a/gfx/src/nsFontList.cpp +++ b/gfx/src/nsFontList.cpp @@ -42,7 +42,7 @@ static NS_DEFINE_IID(kCFontEnumerator, NS_FONT_ENUMERATOR_CID); nsFontList::nsFontList() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsFontList::~nsFontList() @@ -77,7 +77,7 @@ nsFontListEnumerator : public nsISimpleEnumerator nsFontListEnumerator::nsFontListEnumerator() : mFonts(nsnull), mCount(0), mIndex(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsFontListEnumerator::~nsFontListEnumerator() diff --git a/gfx/src/nsFontList.h b/gfx/src/nsFontList.h index e13d02ae0547..84162eba5941 100644 --- a/gfx/src/nsFontList.h +++ b/gfx/src/nsFontList.h @@ -30,6 +30,7 @@ #define _nsFontList_H_ #include "nsIFontList.h" +#include "nsComObsolete.h" #define NS_FONTLIST_CONTRACTID "@mozilla.org/gfx/fontlist;1" diff --git a/gfx/src/nsPrintOptionsImpl.cpp b/gfx/src/nsPrintOptionsImpl.cpp index 465b94cc8d4f..7b4866abdf8e 100644 --- a/gfx/src/nsPrintOptionsImpl.cpp +++ b/gfx/src/nsPrintOptionsImpl.cpp @@ -164,7 +164,7 @@ nsPrinterListEnumerator : public nsISimpleEnumerator nsPrinterListEnumerator::nsPrinterListEnumerator() : mPrinters(nsnull), mCount(0), mIndex(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsPrinterListEnumerator::~nsPrinterListEnumerator() diff --git a/gfx/src/nsPrintSession.h b/gfx/src/nsPrintSession.h index c9e1be8f370e..c9105656c245 100644 --- a/gfx/src/nsPrintSession.h +++ b/gfx/src/nsPrintSession.h @@ -42,6 +42,7 @@ #include "nsIPrintSession.h" #include "nsWeakReference.h" +#include "nsComObsolete.h" //***************************************************************************** //*** nsPrintSession diff --git a/gfx/src/nsRegressionTestFontMetrics.cpp b/gfx/src/nsRegressionTestFontMetrics.cpp index 73ff89b59feb..65f55ad5d3a2 100644 --- a/gfx/src/nsRegressionTestFontMetrics.cpp +++ b/gfx/src/nsRegressionTestFontMetrics.cpp @@ -61,7 +61,7 @@ NS_NewRegressionTestFontMetrics(nsIFontMetrics** aMetrics) nsRegressionTestFontMetrics:: nsRegressionTestFontMetrics() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mFont = nsnull; mDeviceContext = nsnull; diff --git a/gfx/src/nsScriptableRegion.h b/gfx/src/nsScriptableRegion.h index 71bf0eb16b46..3f3cafc0c62a 100755 --- a/gfx/src/nsScriptableRegion.h +++ b/gfx/src/nsScriptableRegion.h @@ -21,6 +21,7 @@ */ #include "nsIScriptableRegion.h" +#include "nsComObsolete.h" class nsIRegion; diff --git a/gfx/src/os2/nsDeviceContextSpecFactoryO.cpp b/gfx/src/os2/nsDeviceContextSpecFactoryO.cpp index 3cea565bb1fc..0c394f4c1f5d 100644 --- a/gfx/src/os2/nsDeviceContextSpecFactoryO.cpp +++ b/gfx/src/os2/nsDeviceContextSpecFactoryO.cpp @@ -44,7 +44,7 @@ nsDeviceContextSpecFactoryOS2 :: nsDeviceContextSpecFactoryOS2() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDeviceContextSpecFactoryOS2 :: ~nsDeviceContextSpecFactoryOS2() diff --git a/gfx/src/os2/nsDeviceContextSpecOS2.cpp b/gfx/src/os2/nsDeviceContextSpecOS2.cpp index 6a0562974477..06a1fe999c8e 100644 --- a/gfx/src/os2/nsDeviceContextSpecOS2.cpp +++ b/gfx/src/os2/nsDeviceContextSpecOS2.cpp @@ -74,7 +74,7 @@ int GlobalPrinters::mGlobalNumPrinters = 0; */ nsDeviceContextSpecOS2 :: nsDeviceContextSpecOS2() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mQueue = nsnull; } @@ -379,7 +379,7 @@ nsresult nsDeviceContextSpecOS2::GetPRTQUEUE( PRTQUEUE *&p) // Printer Enumerator nsPrinterEnumeratorOS2::nsPrinterEnumeratorOS2() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsPrinterEnumeratorOS2, nsIPrinterEnumerator) diff --git a/gfx/src/os2/nsDrawingSurfaceOS2.cpp b/gfx/src/os2/nsDrawingSurfaceOS2.cpp index a7b51c34209a..a92524c466be 100644 --- a/gfx/src/os2/nsDrawingSurfaceOS2.cpp +++ b/gfx/src/os2/nsDrawingSurfaceOS2.cpp @@ -38,7 +38,7 @@ nsDrawingSurfaceOS2::nsDrawingSurfaceOS2() : mNextID(2), mTopID(1), mPS(0), mWidth (0), mHeight (0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mHTFonts = new nsHashtable; } diff --git a/gfx/src/os2/nsFontMetricsOS2.cpp b/gfx/src/os2/nsFontMetricsOS2.cpp index 7afbaf8e380f..c349e3098b7a 100644 --- a/gfx/src/os2/nsFontMetricsOS2.cpp +++ b/gfx/src/os2/nsFontMetricsOS2.cpp @@ -461,7 +461,7 @@ InitGlobals(void) nsFontMetricsOS2::nsFontMetricsOS2() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mTriedAllGenerics = 0; } @@ -2032,7 +2032,7 @@ nsFontMetricsOS2::FindGlobalFont( HPS aPS ) nsFontEnumeratorOS2::nsFontEnumeratorOS2() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsFontEnumeratorOS2, nsIFontEnumerator) diff --git a/gfx/src/os2/nsImageOS2.cpp b/gfx/src/os2/nsImageOS2.cpp index 9fd83802a29a..3e025595c6f0 100644 --- a/gfx/src/os2/nsImageOS2.cpp +++ b/gfx/src/os2/nsImageOS2.cpp @@ -71,7 +71,7 @@ NS_IMPL_ISUPPORTS1(nsImageOS2, nsIImage) //------------------------------------------------------------ nsImageOS2::nsImageOS2() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mInfo = 0; mRowBytes = 0; diff --git a/gfx/src/os2/nsRegionOS2.cpp b/gfx/src/os2/nsRegionOS2.cpp index e945d13166c5..46295cf618a3 100644 --- a/gfx/src/os2/nsRegionOS2.cpp +++ b/gfx/src/os2/nsRegionOS2.cpp @@ -26,7 +26,7 @@ NS_IMPL_ISUPPORTS1(nsRegionOS2, nsIRegion) nsRegionOS2::nsRegionOS2() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } // Do not use GetNativeRegion on OS/2. Regions are device specific. Use GetHRGN () instead. diff --git a/gfx/src/os2/nsRenderingContextOS2.cpp b/gfx/src/os2/nsRenderingContextOS2.cpp index fa3b8ce03b8b..907f4585b5eb 100644 --- a/gfx/src/os2/nsRenderingContextOS2.cpp +++ b/gfx/src/os2/nsRenderingContextOS2.cpp @@ -121,7 +121,7 @@ GraphicsState :: ~GraphicsState() nsRenderingContextOS2::nsRenderingContextOS2() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mContext = nsnull; mSurface = nsnull; diff --git a/gfx/src/os2/nsScreenManagerOS2.cpp b/gfx/src/os2/nsScreenManagerOS2.cpp index 385088472082..74bcbbaca3a3 100644 --- a/gfx/src/os2/nsScreenManagerOS2.cpp +++ b/gfx/src/os2/nsScreenManagerOS2.cpp @@ -42,7 +42,7 @@ nsScreenManagerOS2 :: nsScreenManagerOS2 ( ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // nothing else to do. I guess we could cache a bunch of information // here, but we want to ask the device at runtime in case anything diff --git a/gfx/src/os2/nsScreenOS2.cpp b/gfx/src/os2/nsScreenOS2.cpp index c92ec5ab4399..3f396faac16c 100644 --- a/gfx/src/os2/nsScreenOS2.cpp +++ b/gfx/src/os2/nsScreenOS2.cpp @@ -41,7 +41,7 @@ nsScreenOS2 :: nsScreenOS2 ( ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // nothing else to do. I guess we could cache a bunch of information // here, but we want to ask the device at runtime in case anything diff --git a/gfx/src/photon/nsDeviceContextSpecFactoryP.cpp b/gfx/src/photon/nsDeviceContextSpecFactoryP.cpp index 6eb6f4a6789a..53bfddea0e4e 100644 --- a/gfx/src/photon/nsDeviceContextSpecFactoryP.cpp +++ b/gfx/src/photon/nsDeviceContextSpecFactoryP.cpp @@ -49,7 +49,7 @@ nsDeviceContextSpecFactoryPh :: nsDeviceContextSpecFactoryPh() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDeviceContextSpecFactoryPh :: ~nsDeviceContextSpecFactoryPh() diff --git a/gfx/src/photon/nsDeviceContextSpecPh.cpp b/gfx/src/photon/nsDeviceContextSpecPh.cpp index 8ede7990f838..44a02d0b30b4 100644 --- a/gfx/src/photon/nsDeviceContextSpecPh.cpp +++ b/gfx/src/photon/nsDeviceContextSpecPh.cpp @@ -49,7 +49,7 @@ nsDeviceContextSpecPh :: nsDeviceContextSpecPh() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mPC = nsnull; } @@ -118,7 +118,7 @@ void nsDeviceContextSpecPh :: SetPrintContext(PpPrintContext_t* pc) //*********************************************************** nsPrinterEnumeratorPh::nsPrinterEnumeratorPh() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsPrinterEnumeratorPh::~nsPrinterEnumeratorPh() diff --git a/gfx/src/photon/nsDrawingSurfacePh.cpp b/gfx/src/photon/nsDrawingSurfacePh.cpp index 9ac3f80c0b36..b5478af55149 100644 --- a/gfx/src/photon/nsDrawingSurfacePh.cpp +++ b/gfx/src/photon/nsDrawingSurfacePh.cpp @@ -55,7 +55,7 @@ nsDrawingSurfacePh :: nsDrawingSurfacePh( ) { nsresult rv; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mDrawContext = nsnull; mGC = nsnull; diff --git a/gfx/src/photon/nsFontMetricsPh.cpp b/gfx/src/photon/nsFontMetricsPh.cpp index f2f79a760c8b..2af3ac3b62df 100644 --- a/gfx/src/photon/nsFontMetricsPh.cpp +++ b/gfx/src/photon/nsFontMetricsPh.cpp @@ -64,7 +64,7 @@ static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); nsFontMetricsPh::nsFontMetricsPh() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mDeviceContext = nsnull; mFont = nsnull; @@ -444,7 +444,7 @@ struct nsFontFamily // The Font Enumerator nsFontEnumeratorPh::nsFontEnumeratorPh() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsFontEnumeratorPh, nsIFontEnumerator) diff --git a/gfx/src/photon/nsImagePh.cpp b/gfx/src/photon/nsImagePh.cpp index a02541c528cf..c4154ecae477 100644 --- a/gfx/src/photon/nsImagePh.cpp +++ b/gfx/src/photon/nsImagePh.cpp @@ -184,7 +184,7 @@ NS_IMPL_ISUPPORTS1(nsImagePh, nsIImage) // ---------------------------------------------------------------- nsImagePh :: nsImagePh() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mImageBits = nsnull; mWidth = 0; mHeight = 0; diff --git a/gfx/src/photon/nsRegionPh.cpp b/gfx/src/photon/nsRegionPh.cpp index 45b23d504a1d..bc67214935fc 100644 --- a/gfx/src/photon/nsRegionPh.cpp +++ b/gfx/src/photon/nsRegionPh.cpp @@ -58,13 +58,13 @@ static NS_DEFINE_IID(kRegionIID, NS_IREGION_IID); #define clry c->rect.lr.y nsRegionPh :: nsRegionPh( ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mRegion = NULL; mRegionType = eRegionComplexity_empty; } nsRegionPh :: nsRegionPh( PhTile_t *tiles ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mRegion = tiles; /* assume ownership */ mRegionType = (mRegion == NULL) ? eRegionComplexity_empty : eRegionComplexity_complex; } diff --git a/gfx/src/photon/nsRenderingContextPh.cpp b/gfx/src/photon/nsRenderingContextPh.cpp index 8d62103c8660..056d7cd03674 100644 --- a/gfx/src/photon/nsRenderingContextPh.cpp +++ b/gfx/src/photon/nsRenderingContextPh.cpp @@ -72,7 +72,7 @@ PhGC_t *nsRenderingContextPh::mPtGC = nsnull; nsRenderingContextPh :: nsRenderingContextPh() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mGC = nsnull; mTranMatrix = nsnull; diff --git a/gfx/src/photon/nsScreenManagerPh.cpp b/gfx/src/photon/nsScreenManagerPh.cpp index 7d17c72de266..96e720121c8e 100644 --- a/gfx/src/photon/nsScreenManagerPh.cpp +++ b/gfx/src/photon/nsScreenManagerPh.cpp @@ -42,7 +42,7 @@ #include "nsPhGfxLog.h" nsScreenManagerPh :: nsScreenManagerPh( ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // nothing else to do. I guess we could cache a bunch of information // here, but we want to ask the device at runtime in case anything // has changed. diff --git a/gfx/src/photon/nsScreenPh.cpp b/gfx/src/photon/nsScreenPh.cpp index a98ca4088252..0f13169dc9fd 100644 --- a/gfx/src/photon/nsScreenPh.cpp +++ b/gfx/src/photon/nsScreenPh.cpp @@ -49,7 +49,7 @@ nsScreenPh :: nsScreenPh ( ) { PhRid_t rid; PhRegion_t region; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); /* Initialize the data members */ /* Get the Screen Size and Depth*/ diff --git a/gfx/src/ps/nsFontMetricsPS.cpp b/gfx/src/ps/nsFontMetricsPS.cpp index 04898bdac7cd..05dc8371a912 100644 --- a/gfx/src/ps/nsFontMetricsPS.cpp +++ b/gfx/src/ps/nsFontMetricsPS.cpp @@ -46,7 +46,7 @@ */ nsFontMetricsPS :: nsFontMetricsPS() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } /** --------------------------------------------------- diff --git a/gfx/src/ps/nsRenderingContextPS.cpp b/gfx/src/ps/nsRenderingContextPS.cpp index e57cb77b461e..57dffd6cc2f4 100644 --- a/gfx/src/ps/nsRenderingContextPS.cpp +++ b/gfx/src/ps/nsRenderingContextPS.cpp @@ -138,7 +138,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsRenderingContextPS, nsIRenderingContext) */ nsRenderingContextPS :: nsRenderingContextPS() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mPSObj = nsnull; // local copy of printcontext, will be set on the init process mContext = nsnull; diff --git a/gfx/src/qt/nsDeviceContextSpecFactoryQT.cpp b/gfx/src/qt/nsDeviceContextSpecFactoryQT.cpp index 5e0071d78def..f5fe9de362c5 100644 --- a/gfx/src/qt/nsDeviceContextSpecFactoryQT.cpp +++ b/gfx/src/qt/nsDeviceContextSpecFactoryQT.cpp @@ -62,7 +62,7 @@ nsDeviceContextSpecFactoryQT::nsDeviceContextSpecFactoryQT() mID = gDCSpecFactoryID++; printf("JCG: nsDeviceContextSpecFactoryQT CTOR (%p) ID: %d, Count: %d\n",this,mID,gDCSpecFactoryCount); #endif - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } /** ------------------------------------------------------- diff --git a/gfx/src/qt/nsDeviceContextSpecQT.cpp b/gfx/src/qt/nsDeviceContextSpecQT.cpp index 3be6ca3d348b..52275b7ee3bd 100644 --- a/gfx/src/qt/nsDeviceContextSpecQT.cpp +++ b/gfx/src/qt/nsDeviceContextSpecQT.cpp @@ -63,7 +63,7 @@ nsDeviceContextSpecQT::nsDeviceContextSpecQT() mID = gDCSpecID++; printf("JCG: nsDeviceContextSpecQT CTOR (%p) ID: %d, Count: %d\n",this,mID,gDCSpecCount); #endif - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } /** ------------------------------------------------------- diff --git a/gfx/src/qt/nsDrawingSurfaceQT.cpp b/gfx/src/qt/nsDrawingSurfaceQT.cpp index c68c3ad2420a..e5d4f3a14a76 100644 --- a/gfx/src/qt/nsDrawingSurfaceQT.cpp +++ b/gfx/src/qt/nsDrawingSurfaceQT.cpp @@ -58,7 +58,7 @@ nsDrawingSurfaceQT::nsDrawingSurfaceQT() printf("JCG: nsDrawingSurfaceQT CTOR (%p) ID: %d, Count: %d\n",this,mID,gDSCount); #endif - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mPaintDevice = nsnull; mPixmap = nsnull; mGC = nsnull; diff --git a/gfx/src/qt/nsFontMetricsQT.cpp b/gfx/src/qt/nsFontMetricsQT.cpp index 5d6020c4c556..1e8e391f5b58 100644 --- a/gfx/src/qt/nsFontMetricsQT.cpp +++ b/gfx/src/qt/nsFontMetricsQT.cpp @@ -634,7 +634,7 @@ nsFontMetricsQT::nsFontMetricsQT() mID = gFontMetricsID++; printf("JCG: nsFontMetricsQT CTOR (%p) ID: %d, Count: %d\n",this,mID,gFontMetricsCount); #endif - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); gFontMetricsQTCount++; mDeviceContext = nsnull; mFont = nsnull; @@ -2014,7 +2014,7 @@ nsFontQTUserDefined::GetBoundingMetrics(const PRUnichar *aString, // The Font Enumerator nsFontEnumeratorQT::nsFontEnumeratorQT() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsFontEnumeratorQT, nsIFontEnumerator) diff --git a/gfx/src/qt/nsImageQT.cpp b/gfx/src/qt/nsImageQT.cpp index 7710be4e3ab6..270eb26a9453 100644 --- a/gfx/src/qt/nsImageQT.cpp +++ b/gfx/src/qt/nsImageQT.cpp @@ -61,7 +61,7 @@ nsImageQT::nsImageQT() mID = gImageID++; printf("JCG: nsImageQT CTOR (%p) ID: %d, Count: %d\n",this,mID,gImageCount); #endif - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mImageBits = nsnull; mWidth = 0; mHeight = 0; diff --git a/gfx/src/qt/nsRegionQT.cpp b/gfx/src/qt/nsRegionQT.cpp index b01b75d157ab..990bd160d846 100644 --- a/gfx/src/qt/nsRegionQT.cpp +++ b/gfx/src/qt/nsRegionQT.cpp @@ -56,7 +56,7 @@ nsRegionQT::nsRegionQT() : mRegion() mID = gRegionID++; printf("JCG: nsRegionQT CTOR (%p) ID: %d, Count: %d\n",this,mID,gRegionCount); #endif - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsRegionQT::~nsRegionQT() diff --git a/gfx/src/qt/nsRenderingContextQT.cpp b/gfx/src/qt/nsRenderingContextQT.cpp index 31135ff5671e..ca8ab9f66f9c 100644 --- a/gfx/src/qt/nsRenderingContextQT.cpp +++ b/gfx/src/qt/nsRenderingContextQT.cpp @@ -111,7 +111,7 @@ nsRenderingContextQT::nsRenderingContextQT() mID = gRCID++; printf("JCG: nsRenderingContextQT CTOR (%p) ID: %d, Count: %d\n",this,mID,gRCCount); #endif - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mFontMetrics = nsnull; mContext = nsnull; diff --git a/gfx/src/qt/nsScreenManagerQT.cpp b/gfx/src/qt/nsScreenManagerQT.cpp index 8a2208574f54..98d360fb45e2 100644 --- a/gfx/src/qt/nsScreenManagerQT.cpp +++ b/gfx/src/qt/nsScreenManagerQT.cpp @@ -54,7 +54,7 @@ nsScreenManagerQT::nsScreenManagerQT() mID = gSMID++; printf("JCG: nsScreenManagerQT CTOR (%p) ID: %d, Count: %d\n",this,mID,gSMCount); #endif - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // nothing else to do. I guess we could cache a bunch of information // here, but we want to ask the device at runtime in case anything diff --git a/gfx/src/qt/nsScreenQT.cpp b/gfx/src/qt/nsScreenQT.cpp index cad2c6c4aeaa..948d1a09d964 100644 --- a/gfx/src/qt/nsScreenQT.cpp +++ b/gfx/src/qt/nsScreenQT.cpp @@ -56,7 +56,7 @@ nsScreenQT::nsScreenQT() mID = gScreenID++; printf("JCG: nsScreenQT CTOR (%p) ID: %d, Count: %d\n",this,mID,gScreenCount); #endif - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // nothing else to do. I guess we could cache a bunch of information // here, but we want to ask the device at runtime in case anything // has changed. diff --git a/gfx/src/windows/nsDeviceContextSpecFactoryW.cpp b/gfx/src/windows/nsDeviceContextSpecFactoryW.cpp index 14265c8c47cd..30e8e719d19d 100644 --- a/gfx/src/windows/nsDeviceContextSpecFactoryW.cpp +++ b/gfx/src/windows/nsDeviceContextSpecFactoryW.cpp @@ -42,7 +42,7 @@ nsDeviceContextSpecFactoryWin :: nsDeviceContextSpecFactoryWin() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDeviceContextSpecFactoryWin :: ~nsDeviceContextSpecFactoryWin() diff --git a/gfx/src/windows/nsDeviceContextSpecWin.cpp b/gfx/src/windows/nsDeviceContextSpecWin.cpp index e6183c4404da..94b7cdfa5f81 100644 --- a/gfx/src/windows/nsDeviceContextSpecWin.cpp +++ b/gfx/src/windows/nsDeviceContextSpecWin.cpp @@ -164,7 +164,7 @@ const PRInt32 kNumPaperSizes = 41; //---------------------------------------------------------------------------------- nsDeviceContextSpecWin::nsDeviceContextSpecWin() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mDriverName = nsnull; mDeviceName = nsnull; @@ -779,7 +779,7 @@ nsDeviceContextSpecWin::SetPrintSettingsFromDevMode(nsIPrintSettings* aPrintSett //*********************************************************** nsPrinterEnumeratorWin::nsPrinterEnumeratorWin() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsPrinterEnumeratorWin::~nsPrinterEnumeratorWin() diff --git a/gfx/src/windows/nsDrawingSurfaceWin.cpp b/gfx/src/windows/nsDrawingSurfaceWin.cpp index 3c8e98c74a23..84d0a22412c4 100644 --- a/gfx/src/windows/nsDrawingSurfaceWin.cpp +++ b/gfx/src/windows/nsDrawingSurfaceWin.cpp @@ -69,7 +69,7 @@ nsresult nsDrawingSurfaceWin::mDDrawResult = NS_OK; nsDrawingSurfaceWin :: nsDrawingSurfaceWin() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mDC = NULL; mOrigBitmap = nsnull; diff --git a/gfx/src/windows/nsFontMetricsWin.cpp b/gfx/src/windows/nsFontMetricsWin.cpp index 701f02418c9f..6c6b0f21326d 100644 --- a/gfx/src/windows/nsFontMetricsWin.cpp +++ b/gfx/src/windows/nsFontMetricsWin.cpp @@ -399,7 +399,7 @@ static void CheckFontLangGroup(nsIAtom* lang1, nsIAtom* lang2, const char* lang3 nsFontMetricsWin::nsFontMetricsWin() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsFontMetricsWin::~nsFontMetricsWin() @@ -5107,7 +5107,7 @@ nsFontMetricsWinA::ResolveBackwards(HDC aDC, nsFontEnumeratorWin::nsFontEnumeratorWin() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsFontEnumeratorWin,nsIFontEnumerator) diff --git a/gfx/src/windows/nsImageWin.cpp b/gfx/src/windows/nsImageWin.cpp index 623eeac88466..ad105471afd1 100644 --- a/gfx/src/windows/nsImageWin.cpp +++ b/gfx/src/windows/nsImageWin.cpp @@ -67,7 +67,7 @@ PRInt32 nsImageWin::gPlatform = GetPlatform(); */ nsImageWin :: nsImageWin() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mImageBits = nsnull; diff --git a/gfx/src/windows/nsRegionWin.cpp b/gfx/src/windows/nsRegionWin.cpp index 38e76e1447db..8bc99d0ebe66 100644 --- a/gfx/src/windows/nsRegionWin.cpp +++ b/gfx/src/windows/nsRegionWin.cpp @@ -41,7 +41,7 @@ nsRegionWin :: nsRegionWin() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mRegion = NULL; mRegionType = NULLREGION; diff --git a/gfx/src/windows/nsRenderingContextWin.cpp b/gfx/src/windows/nsRenderingContextWin.cpp index fd1be909ecac..3bf868f6e0c8 100644 --- a/gfx/src/windows/nsRenderingContextWin.cpp +++ b/gfx/src/windows/nsRenderingContextWin.cpp @@ -182,7 +182,7 @@ static HPEN gStockWhitePen = (HPEN)::GetStockObject(WHITE_PEN); nsRenderingContextWin :: nsRenderingContextWin() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // The first time in we initialize gIsWIN95 flag if (NOT_SETUP == gIsWIN95) { diff --git a/gfx/src/windows/nsScreenManagerWin.cpp b/gfx/src/windows/nsScreenManagerWin.cpp index d444ec20454a..d449ac8e0c04 100644 --- a/gfx/src/windows/nsScreenManagerWin.cpp +++ b/gfx/src/windows/nsScreenManagerWin.cpp @@ -81,7 +81,7 @@ nsScreenManagerWin :: nsScreenManagerWin ( ) : mHasMultiMonitorAPIs(PR_FALSE), mGetMonitorInfoProc(nsnull), mMonitorFromRectProc(nsnull), mEnumDisplayMonitorsProc(nsnull), mNumberOfScreens(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // figure out if we can call the multiple monitor APIs that are only // available on Win98/2000. diff --git a/gfx/src/windows/nsScreenWin.cpp b/gfx/src/windows/nsScreenWin.cpp index b4fbe8c556ba..72cdc9715f9a 100644 --- a/gfx/src/windows/nsScreenWin.cpp +++ b/gfx/src/windows/nsScreenWin.cpp @@ -65,7 +65,7 @@ nsScreenWin :: nsScreenWin ( void* inScreen ) : mScreen(inScreen), mHasMultiMonitorAPIs(PR_FALSE), mGetMonitorInfoProc(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef DEBUG HDC hDCScreen = ::GetDC(nsnull); diff --git a/gfx/src/xlib/nsDeviceContextSpecFactoryX.cpp b/gfx/src/xlib/nsDeviceContextSpecFactoryX.cpp index 384929b940a6..ee2711441bd3 100644 --- a/gfx/src/xlib/nsDeviceContextSpecFactoryX.cpp +++ b/gfx/src/xlib/nsDeviceContextSpecFactoryX.cpp @@ -47,7 +47,7 @@ NS_IMPL_ISUPPORTS1(nsDeviceContextSpecFactoryXlib, nsIDeviceContextSpecFactory) nsDeviceContextSpecFactoryXlib::nsDeviceContextSpecFactoryXlib() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDeviceContextSpecFactoryXlib::~nsDeviceContextSpecFactoryXlib() diff --git a/gfx/src/xlib/nsDeviceContextSpecXlib.cpp b/gfx/src/xlib/nsDeviceContextSpecXlib.cpp index b546d763462c..94674248d0cf 100644 --- a/gfx/src/xlib/nsDeviceContextSpecXlib.cpp +++ b/gfx/src/xlib/nsDeviceContextSpecXlib.cpp @@ -216,7 +216,7 @@ int GlobalPrinters::mGlobalNumPrinters = 0; nsDeviceContextSpecXlib::nsDeviceContextSpecXlib() { DO_PR_DEBUG_LOG(("nsDeviceContextSpecXlib::nsDeviceContextSpecXlib()\n")); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDeviceContextSpecXlib::~nsDeviceContextSpecXlib() @@ -546,7 +546,7 @@ nsresult CopyPrinterCharPref(nsIPref *pref, const char *modulename, const char * // Printer Enumerator nsPrinterEnumeratorXlib::nsPrinterEnumeratorXlib() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsPrinterEnumeratorXlib, nsIPrinterEnumerator) diff --git a/gfx/src/xlib/nsDrawingSurfaceXlib.cpp b/gfx/src/xlib/nsDrawingSurfaceXlib.cpp index 21649313c123..d1f585e74885 100644 --- a/gfx/src/xlib/nsDrawingSurfaceXlib.cpp +++ b/gfx/src/xlib/nsDrawingSurfaceXlib.cpp @@ -70,7 +70,7 @@ nsDrawingSurfaceXlibImpl::nsDrawingSurfaceXlibImpl() : mHeight(0), mIsOffscreen(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); PR_LOG(DrawingSurfaceXlibLM, PR_LOG_DEBUG, ("nsDrawingSurfaceXlibImpl::nsDrawingSurfaceXlibImpl()\n")); } diff --git a/gfx/src/xlib/nsFontMetricsXlib.cpp b/gfx/src/xlib/nsFontMetricsXlib.cpp index 8c7f10b96dff..793cb98f9d4b 100644 --- a/gfx/src/xlib/nsFontMetricsXlib.cpp +++ b/gfx/src/xlib/nsFontMetricsXlib.cpp @@ -1412,7 +1412,7 @@ nsFontMetricsXlib::nsFontMetricsXlib() // XXX mFontIsGeneric will generally need to be the same size; right now // it's an nsAutoVoidArray. If the average is under 8, that's ok. { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); gFontMetricsXlibCount++; } @@ -5419,7 +5419,7 @@ nsFontMetricsXlib::FindFont(PRUnichar aChar) nsFontEnumeratorXlib::nsFontEnumeratorXlib() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsFontEnumeratorXlib, nsIFontEnumerator) diff --git a/gfx/src/xlib/nsGCCache.h b/gfx/src/xlib/nsGCCache.h index 1b1a662cec5a..5c6a4e8b6de7 100644 --- a/gfx/src/xlib/nsGCCache.h +++ b/gfx/src/xlib/nsGCCache.h @@ -31,6 +31,7 @@ #include #include "nscore.h" +#include "nsDebug.h" #include "prclist.h" #include diff --git a/gfx/src/xlib/nsImageXlib.cpp b/gfx/src/xlib/nsImageXlib.cpp index 240fb24f5896..0cb64029987c 100644 --- a/gfx/src/xlib/nsImageXlib.cpp +++ b/gfx/src/xlib/nsImageXlib.cpp @@ -68,7 +68,7 @@ Display *nsImageXlib::mDisplay = nsnull; nsImageXlib::nsImageXlib() { PR_LOG(ImageXlibLM, PR_LOG_DEBUG, ("nsImageXlib::nsImageXlib()\n")); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mImageBits = nsnull; mAlphaBits = nsnull; mWidth = 0; diff --git a/gfx/src/xlib/nsRegionXlib.cpp b/gfx/src/xlib/nsRegionXlib.cpp index 20d5a722974f..f08d8e028c22 100644 --- a/gfx/src/xlib/nsRegionXlib.cpp +++ b/gfx/src/xlib/nsRegionXlib.cpp @@ -58,7 +58,7 @@ nsRegionXlib::nsRegionXlib() printf("REGIONS+ = %i\n", nRegions); #endif - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mRegion = nsnull; } diff --git a/gfx/src/xlib/nsRenderingContextXlib.cpp b/gfx/src/xlib/nsRenderingContextXlib.cpp index 1323b46630c0..e0a9693006f4 100644 --- a/gfx/src/xlib/nsRenderingContextXlib.cpp +++ b/gfx/src/xlib/nsRenderingContextXlib.cpp @@ -120,7 +120,7 @@ nsRenderingContextXlib::nsRenderingContextXlib() : mCurrentLineStyle(nsLineStyle_kSolid) { PR_LOG(RenderingContextXlibLM, PR_LOG_DEBUG, ("nsRenderingContextXlib::nsRenderingContextXlib()\n")); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); PushState(); } diff --git a/gfx/src/xlib/nsScreenManagerXlib.cpp b/gfx/src/xlib/nsScreenManagerXlib.cpp index 4fa34c99ec31..224790b80dcb 100644 --- a/gfx/src/xlib/nsScreenManagerXlib.cpp +++ b/gfx/src/xlib/nsScreenManagerXlib.cpp @@ -44,7 +44,7 @@ nsScreenManagerXlib :: nsScreenManagerXlib ( ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // nothing else to do. I guess we could cache a bunch of information // here, but we want to ask the device at runtime in case anything diff --git a/gfx/src/xlib/nsScreenXlib.cpp b/gfx/src/xlib/nsScreenXlib.cpp index bf1cfa4503a9..45dd2bf5d4ce 100644 --- a/gfx/src/xlib/nsScreenXlib.cpp +++ b/gfx/src/xlib/nsScreenXlib.cpp @@ -44,7 +44,7 @@ nsScreenXlib :: nsScreenXlib ( ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // nothing else to do. I guess we could cache a bunch of information // here, but we want to ask the device at runtime in case anything diff --git a/gfx/src/xprint/nsXPrintContext.cpp b/gfx/src/xprint/nsXPrintContext.cpp index 9b6436a319e9..b959bb4d9acb 100644 --- a/gfx/src/xprint/nsXPrintContext.cpp +++ b/gfx/src/xprint/nsXPrintContext.cpp @@ -111,7 +111,7 @@ nsXPrintContext::nsXPrintContext() : mPrintResolution(0L), mContext(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("nsXPrintContext::nsXPrintContext()\n")); } diff --git a/htmlparser/robot/nsDebugRobot.cpp b/htmlparser/robot/nsDebugRobot.cpp index 8fe8096b64dc..5023a01bd23b 100644 --- a/htmlparser/robot/nsDebugRobot.cpp +++ b/htmlparser/robot/nsDebugRobot.cpp @@ -62,7 +62,7 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); class RobotSinkObserver : public nsIRobotSinkObserver { public: RobotSinkObserver() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } virtual ~RobotSinkObserver() { @@ -148,7 +148,7 @@ class CStreamListener: public nsIWebProgressListener, { public: CStreamListener() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/htmlparser/src/CNavDTD.cpp b/htmlparser/src/CNavDTD.cpp index 62eabf762ad5..1370e89a4288 100644 --- a/htmlparser/src/CNavDTD.cpp +++ b/htmlparser/src/CNavDTD.cpp @@ -188,7 +188,7 @@ CNavDTD::CNavDTD() : nsIDTD(), mExpectedCRC32(0) #endif { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mBodyContext=new nsDTDContext(); diff --git a/htmlparser/src/COtherDTD.cpp b/htmlparser/src/COtherDTD.cpp index 068b4cc1579f..f32ec82deef7 100644 --- a/htmlparser/src/COtherDTD.cpp +++ b/htmlparser/src/COtherDTD.cpp @@ -146,7 +146,7 @@ NS_IMPL_RELEASE(COtherDTD) * @return */ COtherDTD::COtherDTD() : nsIDTD() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mSink = 0; mParser=0; mLineNumber=1; diff --git a/htmlparser/src/nsExpatDriver.cpp b/htmlparser/src/nsExpatDriver.cpp index e303b0e72f4d..a5e7d7f0018a 100644 --- a/htmlparser/src/nsExpatDriver.cpp +++ b/htmlparser/src/nsExpatDriver.cpp @@ -309,7 +309,7 @@ nsExpatDriver::nsExpatDriver() mSink(0), mCatalogData(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsExpatDriver::~nsExpatDriver() diff --git a/htmlparser/src/nsHTMLNullSink.cpp b/htmlparser/src/nsHTMLNullSink.cpp index b7227edda0bf..7ec1f204e018 100644 --- a/htmlparser/src/nsHTMLNullSink.cpp +++ b/htmlparser/src/nsHTMLNullSink.cpp @@ -134,7 +134,7 @@ NS_NewHTMLNullSink(nsIContentSink** aInstancePtrResult) * @return */ nsHTMLNullSink::nsHTMLNullSink() : nsIHTMLContentSink() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mNodeStackPos=0; memset(mNodeStack,0,sizeof(mNodeStack)); } diff --git a/htmlparser/src/nsHTMLTokenizer.cpp b/htmlparser/src/nsHTMLTokenizer.cpp index 0db173e323d0..cb033840a682 100644 --- a/htmlparser/src/nsHTMLTokenizer.cpp +++ b/htmlparser/src/nsHTMLTokenizer.cpp @@ -135,7 +135,7 @@ NS_IMPL_RELEASE(nsHTMLTokenizer) eParserCommands aCommand) : nsITokenizer(), mTokenDeque(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (aParseMode==eDTDMode_full_standards || aParseMode==eDTDMode_almost_standards) { diff --git a/htmlparser/src/nsLoggingSink.cpp b/htmlparser/src/nsLoggingSink.cpp index 463be53af525..bb34b7874f7d 100644 --- a/htmlparser/src/nsLoggingSink.cpp +++ b/htmlparser/src/nsLoggingSink.cpp @@ -74,7 +74,7 @@ NS_NewHTMLLoggingSink(nsIContentSink** aInstancePtrResult) } nsLoggingSink::nsLoggingSink() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mOutput = 0; mLevel=-1; mSink=0; diff --git a/htmlparser/src/nsParser.cpp b/htmlparser/src/nsParser.cpp index adacc5aa2945..eeabd2c8c508 100644 --- a/htmlparser/src/nsParser.cpp +++ b/htmlparser/src/nsParser.cpp @@ -294,7 +294,7 @@ static PRBool gDumpContent=PR_FALSE; * @return */ nsParser::nsParser(nsITokenObserver* anObserver) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef NS_DEBUG if(!gDumpContent) { diff --git a/htmlparser/src/nsParserFactory.cpp b/htmlparser/src/nsParserFactory.cpp index 5409231b7fd7..456d6af999fa 100644 --- a/htmlparser/src/nsParserFactory.cpp +++ b/htmlparser/src/nsParserFactory.cpp @@ -73,7 +73,7 @@ class nsParserFactory : public nsIFactory nsParserFactory::nsParserFactory(const nsCID &aClass) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mClassID = aClass; nsHTMLTags::AddRefTable(); nsHTMLEntities::AddRefTable(); diff --git a/htmlparser/src/nsViewSourceHTML.cpp b/htmlparser/src/nsViewSourceHTML.cpp index 7d6a0f20049e..7eb52ac410c4 100644 --- a/htmlparser/src/nsViewSourceHTML.cpp +++ b/htmlparser/src/nsViewSourceHTML.cpp @@ -329,7 +329,7 @@ static const char* const kDumpFileAfterText[] = { * @return */ CViewSourceHTML::CViewSourceHTML() : mFilename(), mTags(), mErrors() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mStartTag = VIEW_SOURCE_START_TAG; mEndTag = VIEW_SOURCE_END_TAG; diff --git a/htmlparser/tests/grabpage/grabpage.cpp b/htmlparser/tests/grabpage/grabpage.cpp index 37b6e65a0c1f..f72588c3ea9c 100644 --- a/htmlparser/tests/grabpage/grabpage.cpp +++ b/htmlparser/tests/grabpage/grabpage.cpp @@ -84,7 +84,7 @@ protected: StreamToFile::StreamToFile(FILE* fp) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mDone = PR_FALSE; mError = PR_FALSE; mFile = fp; diff --git a/intl/chardet/src/classic/nsClassicDetectors.cpp b/intl/chardet/src/classic/nsClassicDetectors.cpp index 2e591cb41430..985a790736f1 100644 --- a/intl/chardet/src/classic/nsClassicDetectors.cpp +++ b/intl/chardet/src/classic/nsClassicDetectors.cpp @@ -218,7 +218,7 @@ NS_IMPL_ISUPPORTS1(nsClassicDetector, nsICharsetDetector) //---------------------------------------------------------- nsClassicDetector::nsClassicDetector(const char* language) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mObserver = nsnull; PL_strcpy(mLanguage, language); } @@ -273,7 +273,7 @@ NS_IMPL_ISUPPORTS1(nsClassicStringDetector, nsIStringCharsetDetector) //---------------------------------------------------------- nsClassicStringDetector::nsClassicStringDetector(const char* language) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); PL_strcpy(mLanguage, language); } //---------------------------------------------------------- diff --git a/intl/chardet/src/nsCyrillicDetector.cpp b/intl/chardet/src/nsCyrillicDetector.cpp index 5d16b65223c9..d54216ee6d3a 100644 --- a/intl/chardet/src/nsCyrillicDetector.cpp +++ b/intl/chardet/src/nsCyrillicDetector.cpp @@ -109,7 +109,7 @@ nsCyrXPCOMDetector:: nsCyrXPCOMDetector(PRUint8 aItems, const char **aCharsets) : nsCyrillicDetector(aItems, aCyrillicClass, aCharsets) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mObserver = nsnull; } @@ -165,7 +165,7 @@ nsCyrXPCOMStringDetector:: nsCyrXPCOMStringDetector(PRUint8 aItems, const char **aCharsets) : nsCyrillicDetector(aItems, aCyrillicClass, aCharsets) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } //--------------------------------------------------------------------- diff --git a/intl/chardet/src/nsDebugDetector.cpp b/intl/chardet/src/nsDebugDetector.cpp index ba122e8ab3d5..b8126a005464 100644 --- a/intl/chardet/src/nsDebugDetector.cpp +++ b/intl/chardet/src/nsDebugDetector.cpp @@ -52,7 +52,7 @@ nsDebugDetector::nsDebugDetector( nsDebugDetectorSel aSel) mBlks = 0; mObserver = nsnull; mStop = PR_FALSE; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } //-------------------------------------------------------------------- nsDebugDetector::~nsDebugDetector() diff --git a/intl/chardet/src/nsDetectionAdaptor.cpp b/intl/chardet/src/nsDetectionAdaptor.cpp index e926851a707f..27feb696cf72 100644 --- a/intl/chardet/src/nsDetectionAdaptor.cpp +++ b/intl/chardet/src/nsDetectionAdaptor.cpp @@ -110,7 +110,7 @@ NS_IMPL_ISUPPORTS1 ( nsMyObserver ,nsICharsetDetectionObserver); //-------------------------------------------------------------- nsDetectionAdaptor::nsDetectionAdaptor( void ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mDontFeedToDetector = PR_TRUE; } //-------------------------------------------------------------- diff --git a/intl/chardet/src/nsDetectionAdaptor.h b/intl/chardet/src/nsDetectionAdaptor.h index c05c059e8028..1dd9ff1a980c 100644 --- a/intl/chardet/src/nsDetectionAdaptor.h +++ b/intl/chardet/src/nsDetectionAdaptor.h @@ -56,7 +56,7 @@ class nsMyObserver : public nsICharsetDetectionObserver public: nsMyObserver( void ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mWebShellSvc = nsnull; mNotifyByReload = PR_FALSE; mWeakRefDocument = nsnull; diff --git a/intl/chardet/src/nsDocumentCharsetInfo.cpp b/intl/chardet/src/nsDocumentCharsetInfo.cpp index c6fabb01e358..ea30f504e249 100644 --- a/intl/chardet/src/nsDocumentCharsetInfo.cpp +++ b/intl/chardet/src/nsDocumentCharsetInfo.cpp @@ -51,7 +51,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsDocumentCharsetInfo, nsIDocumentCharsetInfo); nsDocumentCharsetInfo::nsDocumentCharsetInfo() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mParentCharsetSource = 0; } diff --git a/intl/chardet/src/nsMetaCharsetObserver.cpp b/intl/chardet/src/nsMetaCharsetObserver.cpp index 5ffeaa9bdcea..508c4d63133c 100644 --- a/intl/chardet/src/nsMetaCharsetObserver.cpp +++ b/intl/chardet/src/nsMetaCharsetObserver.cpp @@ -67,7 +67,7 @@ static eHTMLTags gWatchTags[] = //------------------------------------------------------------------------- nsMetaCharsetObserver::nsMetaCharsetObserver() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); bMetaCharsetObserverStarted = PR_FALSE; nsresult res; mAlias = nsnull; diff --git a/intl/chardet/src/nsPSMDetectors.cpp b/intl/chardet/src/nsPSMDetectors.cpp index fb86463b9f75..859456559193 100644 --- a/intl/chardet/src/nsPSMDetectors.cpp +++ b/intl/chardet/src/nsPSMDetectors.cpp @@ -491,7 +491,7 @@ void nsPSMDetector::Sample(const char* aBuf, PRUint32 aLen, PRBool aLastChance) nsXPCOMDetector::nsXPCOMDetector(PRUint8 aItems, nsVerifier **aVer, nsEUCStatistics** aStatisticsSet) : nsPSMDetector( aItems, aVer, aStatisticsSet) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mObserver = nsnull; } //---------------------------------------------------------- @@ -538,7 +538,7 @@ void nsXPCOMDetector::Report(const char* charset) nsXPCOMStringDetector::nsXPCOMStringDetector(PRUint8 aItems, nsVerifier** aVer, nsEUCStatistics** aStatisticsSet) : nsPSMDetector( aItems, aVer, aStatisticsSet) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } //---------------------------------------------------------- nsXPCOMStringDetector::~nsXPCOMStringDetector() diff --git a/intl/chardet/src/nsXMLEncodingObserver.cpp b/intl/chardet/src/nsXMLEncodingObserver.cpp index aa437feccc1c..3ce05794e709 100644 --- a/intl/chardet/src/nsXMLEncodingObserver.cpp +++ b/intl/chardet/src/nsXMLEncodingObserver.cpp @@ -63,7 +63,7 @@ static eHTMLTags gTags[] = //------------------------------------------------------------------------- nsXMLEncodingObserver::nsXMLEncodingObserver() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); bXMLEncodingObserverStarted = PR_FALSE; } //------------------------------------------------------------------------- diff --git a/intl/chardet/src/windows/nsNativeDetectors.cpp b/intl/chardet/src/windows/nsNativeDetectors.cpp index 93b92b6fc11b..d37d6f3fc23b 100644 --- a/intl/chardet/src/windows/nsNativeDetectors.cpp +++ b/intl/chardet/src/windows/nsNativeDetectors.cpp @@ -129,7 +129,7 @@ NS_IMPL_ISUPPORTS1(nsNativeDetector, nsICharsetDetector) nsNativeDetector::nsNativeDetector(PRUint32 aCodePage) { HRESULT hr = CoInitialize(NULL); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mObserver = nsnull; mCodePage = aCodePage; mMultiLanguage = NULL; @@ -220,7 +220,7 @@ NS_IMPL_ISUPPORTS1(nsNativeStringDetector, nsIStringCharsetDetector) nsNativeStringDetector::nsNativeStringDetector(PRUint32 aCodePage) { HRESULT hr = CoInitialize(NULL); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mCodePage = aCodePage; mMultiLanguage = NULL; } @@ -275,7 +275,7 @@ class nsNativeDetectorFactory : public nsIFactory { public: nsNativeDetectorFactory(PRUint32 aCodePage, PRBool stringBase) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mCodePage = aCodePage; mStringBase = stringBase; } diff --git a/intl/chardet/tests/DetectCharset.cpp b/intl/chardet/tests/DetectCharset.cpp index e51b4140f494..a176c2ecc1ea 100644 --- a/intl/chardet/tests/DetectCharset.cpp +++ b/intl/chardet/tests/DetectCharset.cpp @@ -266,7 +266,7 @@ class nsReporter : public nsICharsetDetectionObserver { NS_DECL_ISUPPORTS public: - nsReporter() { NS_INIT_REFCNT(); }; + nsReporter() { NS_INIT_ISUPPORTS(); }; virtual ~nsReporter() { }; NS_IMETHOD Notify(const char* aCharset, nsDetectionConfident aConf) diff --git a/intl/compatibility/src/nsI18nCompatibility.cpp b/intl/compatibility/src/nsI18nCompatibility.cpp index ab7fdcb471c0..035d60d54ec8 100644 --- a/intl/compatibility/src/nsI18nCompatibility.cpp +++ b/intl/compatibility/src/nsI18nCompatibility.cpp @@ -64,7 +64,7 @@ class nsI18nCompatibility : public nsII18nCompatibility { /* wstring CSIDtoCharsetName (in unsigned short csid); */ NS_IMETHOD CSIDtoCharsetName(PRUint16 csid, PRUnichar **_retval); - nsI18nCompatibility() {NS_INIT_REFCNT();} + nsI18nCompatibility() {NS_INIT_ISUPPORTS();} virtual ~nsI18nCompatibility() {} }; diff --git a/intl/ctl/src/nsUnicodeToSunIndic.cpp b/intl/ctl/src/nsUnicodeToSunIndic.cpp index 11a933d79008..e0c0c095783b 100644 --- a/intl/ctl/src/nsUnicodeToSunIndic.cpp +++ b/intl/ctl/src/nsUnicodeToSunIndic.cpp @@ -120,7 +120,7 @@ nsUnicodeToSunIndic::nsUnicodeToSunIndic() static NS_DEFINE_CID(kLECID, NS_ULE_CID); nsresult rv; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mCtlObj = do_CreateInstance(kLECID, &rv); if (NS_FAILED(rv)) { diff --git a/intl/ctl/src/nsUnicodeToTIS620.cpp b/intl/ctl/src/nsUnicodeToTIS620.cpp index 1d59e3313255..16ac1da411a6 100644 --- a/intl/ctl/src/nsUnicodeToTIS620.cpp +++ b/intl/ctl/src/nsUnicodeToTIS620.cpp @@ -131,7 +131,7 @@ nsUnicodeToTIS620::nsUnicodeToTIS620() static NS_DEFINE_CID(kLECID, NS_ULE_CID); nsresult rv; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mCtlObj = do_CreateInstance(kLECID, &rv); if (NS_FAILED(rv)) { diff --git a/intl/locale/src/mac/nsCollationMac.cpp b/intl/locale/src/mac/nsCollationMac.cpp index 4709db560a46..6ed9a6e205f0 100644 --- a/intl/locale/src/mac/nsCollationMac.cpp +++ b/intl/locale/src/mac/nsCollationMac.cpp @@ -128,7 +128,7 @@ NS_IMPL_ISUPPORTS1(nsCollationMac, nsICollation); nsCollationMac::nsCollationMac() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mCollation = NULL; } diff --git a/intl/locale/src/mac/nsCollationMacUC.cpp b/intl/locale/src/mac/nsCollationMacUC.cpp index 9b38934e2390..a31dfb764ffb 100644 --- a/intl/locale/src/mac/nsCollationMacUC.cpp +++ b/intl/locale/src/mac/nsCollationMacUC.cpp @@ -52,7 +52,7 @@ nsCollationMacUC::nsCollationMacUC() : mInit(PR_FALSE) , mHasCollator(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsCollationMacUC::~nsCollationMacUC() diff --git a/intl/locale/src/mac/nsDateTimeFormatMac.h b/intl/locale/src/mac/nsDateTimeFormatMac.h index 8b4257ad4de6..af62e0c19f13 100644 --- a/intl/locale/src/mac/nsDateTimeFormatMac.h +++ b/intl/locale/src/mac/nsDateTimeFormatMac.h @@ -62,7 +62,7 @@ public: const PRExplodedTime* explodedTime, nsString& stringOut); - nsDateTimeFormatMac() {NS_INIT_REFCNT();} + nsDateTimeFormatMac() {NS_INIT_ISUPPORTS();} virtual ~nsDateTimeFormatMac() {} diff --git a/intl/locale/src/mac/nsMacLocale.cpp b/intl/locale/src/mac/nsMacLocale.cpp index 6716da9c4b27..4b5eacee81c4 100644 --- a/intl/locale/src/mac/nsMacLocale.cpp +++ b/intl/locale/src/mac/nsMacLocale.cpp @@ -222,7 +222,7 @@ NS_IMPL_ISUPPORTS1(nsMacLocale,nsIMacLocale) nsMacLocale::nsMacLocale(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMacLocale::~nsMacLocale(void) diff --git a/intl/locale/src/nsCollation.h b/intl/locale/src/nsCollation.h index 3f7689b8f849..6167f0c9aa21 100644 --- a/intl/locale/src/nsCollation.h +++ b/intl/locale/src/nsCollation.h @@ -40,7 +40,7 @@ public: NS_IMETHOD CreateCollation(nsILocale* locale, nsICollation** instancePtr); - nsCollationFactory() {NS_INIT_REFCNT();}; + nsCollationFactory() {NS_INIT_ISUPPORTS();}; }; diff --git a/intl/locale/src/nsFontPackageService.cpp b/intl/locale/src/nsFontPackageService.cpp index 947c8b414f4d..d6897664f9cd 100644 --- a/intl/locale/src/nsFontPackageService.cpp +++ b/intl/locale/src/nsFontPackageService.cpp @@ -61,7 +61,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS2(nsFontPackageService, /* from nsIFontPackageSercice.h */ nsFontPackageService::nsFontPackageService() : mHandler(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); /* member initializers and constructor code */ } diff --git a/intl/locale/src/nsLocale.cpp b/intl/locale/src/nsLocale.cpp index b76ad55899ae..b31b34c24391 100644 --- a/intl/locale/src/nsLocale.cpp +++ b/intl/locale/src/nsLocale.cpp @@ -55,7 +55,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsLocale, nsILocale) nsLocale::nsLocale(void) : fHashtable(nsnull), fCategoryCount(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); fHashtable = PL_NewHashTable(LOCALE_HASH_SIZE,&nsLocale::Hash_HashFunction, &nsLocale::Hash_CompareNSString,&nsLocale::Hash_CompareNSString,NULL,NULL); @@ -65,7 +65,7 @@ nsLocale::nsLocale(void) nsLocale::nsLocale(nsLocale* other) : fHashtable(nsnull), fCategoryCount(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); fHashtable = PL_NewHashTable(LOCALE_HASH_SIZE,&nsLocale::Hash_HashFunction, &nsLocale::Hash_CompareNSString,&nsLocale::Hash_CompareNSString,NULL,NULL); @@ -86,7 +86,7 @@ nsLocale::nsLocale(nsString** categoryList,nsString** valueList, PRUint32 count) PRUint32 i; nsString* key, *value; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); fHashtable = PL_NewHashTable(LOCALE_HASH_SIZE,&nsLocale::Hash_HashFunction, &nsLocale::Hash_CompareNSString,&nsLocale::Hash_CompareNSString,NULL,NULL); diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp index de2e8e9894b3..52301d65576b 100644 --- a/intl/locale/src/nsLocaleService.cpp +++ b/intl/locale/src/nsLocaleService.cpp @@ -159,7 +159,7 @@ protected: nsLocaleService::nsLocaleService(void) : mSystemLocale(nsnull), mApplicationLocale(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #if defined(XP_WIN) nsresult result; nsCOMPtr win32Converter @@ -531,7 +531,7 @@ NS_IMPL_ISUPPORTS1(nsLocaleDefinition,nsILocaleDefinition) nsLocaleDefinition::nsLocaleDefinition(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mLocaleDefinition = new nsLocale; if (mLocaleDefinition) diff --git a/intl/locale/src/nsScriptableDateFormat.cpp b/intl/locale/src/nsScriptableDateFormat.cpp index 268abd660b27..1692c515e5a7 100644 --- a/intl/locale/src/nsScriptableDateFormat.cpp +++ b/intl/locale/src/nsScriptableDateFormat.cpp @@ -83,7 +83,7 @@ class nsScriptableDateFormat : public nsIScriptableDateFormat { {return FormatDateTime(locale, kDateFormatNone, timeFormatSelector, 1999, 1, 1, hour, minute, second, timeString);} - nsScriptableDateFormat() {NS_INIT_REFCNT();} + nsScriptableDateFormat() {NS_INIT_ISUPPORTS();} virtual ~nsScriptableDateFormat() {} private: nsString mStringOut; diff --git a/intl/locale/src/os2/nsCollationOS2.cpp b/intl/locale/src/os2/nsCollationOS2.cpp index 0cc7efdef9ff..69b548ebf88c 100644 --- a/intl/locale/src/os2/nsCollationOS2.cpp +++ b/intl/locale/src/os2/nsCollationOS2.cpp @@ -46,7 +46,7 @@ NS_IMPL_ISUPPORTS1(nsCollationOS2, nsICollation) nsCollationOS2::nsCollationOS2() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mCollation = NULL; } diff --git a/intl/locale/src/os2/nsDateTimeFormatOS2.h b/intl/locale/src/os2/nsDateTimeFormatOS2.h index ed4e4dfb1b81..202c0152a6ac 100644 --- a/intl/locale/src/os2/nsDateTimeFormatOS2.h +++ b/intl/locale/src/os2/nsDateTimeFormatOS2.h @@ -56,7 +56,7 @@ class nsDateTimeFormatOS2 : public nsIDateTimeFormat { const PRExplodedTime* explodedTime, nsString& stringOut); - nsDateTimeFormatOS2() {NS_INIT_REFCNT();} + nsDateTimeFormatOS2() {NS_INIT_ISUPPORTS();} virtual ~nsDateTimeFormatOS2() {} }; diff --git a/intl/locale/src/os2/nsOS2Locale.cpp b/intl/locale/src/os2/nsOS2Locale.cpp index 31388f54a7c8..22c18f44ffd4 100644 --- a/intl/locale/src/os2/nsOS2Locale.cpp +++ b/intl/locale/src/os2/nsOS2Locale.cpp @@ -47,7 +47,7 @@ NS_IMPL_ISUPPORTS1(nsOS2Locale,nsIOS2Locale) nsOS2Locale::nsOS2Locale(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsOS2Locale::~nsOS2Locale(void) diff --git a/intl/locale/src/unix/nsCollationUnix.cpp b/intl/locale/src/unix/nsCollationUnix.cpp index c89b3c89f535..5cbdcee50181 100644 --- a/intl/locale/src/unix/nsCollationUnix.cpp +++ b/intl/locale/src/unix/nsCollationUnix.cpp @@ -70,7 +70,7 @@ inline void nsCollationUnix::DoRestoreLocale() nsCollationUnix::nsCollationUnix() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mCollation = NULL; mUseCodePointOrder = PR_FALSE; } diff --git a/intl/locale/src/unix/nsDateTimeFormatUnix.h b/intl/locale/src/unix/nsDateTimeFormatUnix.h index 0b810b78c431..80e544cf0e23 100644 --- a/intl/locale/src/unix/nsDateTimeFormatUnix.h +++ b/intl/locale/src/unix/nsDateTimeFormatUnix.h @@ -65,7 +65,7 @@ public: nsString& stringOut); - nsDateTimeFormatUnix() {NS_INIT_REFCNT(); + nsDateTimeFormatUnix() {NS_INIT_ISUPPORTS(); mLocale.Truncate();mAppLocale.Truncate();} virtual ~nsDateTimeFormatUnix() {} diff --git a/intl/locale/src/unix/nsPosixLocale.cpp b/intl/locale/src/unix/nsPosixLocale.cpp index 7416ca01c691..b642fbbe4b73 100644 --- a/intl/locale/src/unix/nsPosixLocale.cpp +++ b/intl/locale/src/unix/nsPosixLocale.cpp @@ -50,7 +50,7 @@ NS_IMPL_ISUPPORTS1(nsPosixLocale, nsIPosixLocale) nsPosixLocale::nsPosixLocale(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsPosixLocale::~nsPosixLocale(void) diff --git a/intl/locale/src/windows/nsCollationWin.cpp b/intl/locale/src/windows/nsCollationWin.cpp index c9c898870bb6..3a7c26175e9e 100644 --- a/intl/locale/src/windows/nsCollationWin.cpp +++ b/intl/locale/src/windows/nsCollationWin.cpp @@ -56,7 +56,7 @@ NS_IMPL_ISUPPORTS1(nsCollationWin, nsICollation); nsCollationWin::nsCollationWin() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mCollation = NULL; } diff --git a/intl/locale/src/windows/nsDateTimeFormatWin.h b/intl/locale/src/windows/nsDateTimeFormatWin.h index 5fd18cf5f390..f0441717dcdd 100644 --- a/intl/locale/src/windows/nsDateTimeFormatWin.h +++ b/intl/locale/src/windows/nsDateTimeFormatWin.h @@ -63,7 +63,7 @@ public: const PRExplodedTime* explodedTime, nsString& stringOut); - nsDateTimeFormatWin() {NS_INIT_REFCNT(); + nsDateTimeFormatWin() {NS_INIT_ISUPPORTS(); mLocale.SetLength(0);mAppLocale.SetLength(0);} diff --git a/intl/locale/src/windows/nsIWin32LocaleImpl.cpp b/intl/locale/src/windows/nsIWin32LocaleImpl.cpp index 98663be2d6a6..9f7dcf55598d 100644 --- a/intl/locale/src/windows/nsIWin32LocaleImpl.cpp +++ b/intl/locale/src/windows/nsIWin32LocaleImpl.cpp @@ -410,7 +410,7 @@ NS_IMPL_ISUPPORTS1(nsIWin32LocaleImpl,nsIWin32Locale) nsIWin32LocaleImpl::nsIWin32LocaleImpl(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsIWin32LocaleImpl::~nsIWin32LocaleImpl(void) diff --git a/intl/lwbrk/public/nsIBreakState.h b/intl/lwbrk/public/nsIBreakState.h index 48f2ec800b3f..8fe0f8e6b44d 100644 --- a/intl/lwbrk/public/nsIBreakState.h +++ b/intl/lwbrk/public/nsIBreakState.h @@ -71,7 +71,7 @@ public: class name : public nsIBreakState { \ NS_DECL_ISUPPORTS \ name (const PRUnichar *aText, PRUint32 aLen) { \ - NS_INIT_REFCNT(); \ + NS_INIT_ISUPPORTS(); \ mText = aText; mLen = aLen; \ mPos = 0; mPriv = 0; mDone = PR_FALSE; \ } ; \ diff --git a/intl/lwbrk/src/nsJISx4501LineBreaker.cpp b/intl/lwbrk/src/nsJISx4501LineBreaker.cpp index d1aaa14a88a2..0ff98302903c 100644 --- a/intl/lwbrk/src/nsJISx4501LineBreaker.cpp +++ b/intl/lwbrk/src/nsJISx4501LineBreaker.cpp @@ -331,7 +331,7 @@ nsJISx4501LineBreaker::nsJISx4501LineBreaker( const PRUnichar* aNoEnd, PRInt32 aNoEndLen ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsJISx4501LineBreaker::~nsJISx4501LineBreaker() { diff --git a/intl/lwbrk/src/nsLWBreakerFImp.cpp b/intl/lwbrk/src/nsLWBreakerFImp.cpp index e9acb29cf8ec..149be761a382 100644 --- a/intl/lwbrk/src/nsLWBreakerFImp.cpp +++ b/intl/lwbrk/src/nsLWBreakerFImp.cpp @@ -45,7 +45,7 @@ #include "nsSampleWordBreaker.h" nsLWBreakerFImp::nsLWBreakerFImp() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsLWBreakerFImp::~nsLWBreakerFImp() { diff --git a/intl/lwbrk/src/nsSampleWordBreaker.cpp b/intl/lwbrk/src/nsSampleWordBreaker.cpp index b4342853c28e..a674924a9dd7 100644 --- a/intl/lwbrk/src/nsSampleWordBreaker.cpp +++ b/intl/lwbrk/src/nsSampleWordBreaker.cpp @@ -43,7 +43,7 @@ #include "nsLWBRKDll.h" nsSampleWordBreaker::nsSampleWordBreaker() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsSampleWordBreaker::~nsSampleWordBreaker() { diff --git a/intl/strres/src/nsStringBundle.cpp b/intl/strres/src/nsStringBundle.cpp index 478231567ed5..712250d1aff2 100644 --- a/intl/strres/src/nsStringBundle.cpp +++ b/intl/strres/src/nsStringBundle.cpp @@ -136,7 +136,7 @@ nsStringBundle::nsStringBundle(const char* aURLSpec) : mAttemptedLoad(PR_FALSE), mLoaded(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult @@ -473,7 +473,7 @@ NS_IMPL_ISUPPORTS1(nsExtensibleStringBundle, nsIStringBundle) nsExtensibleStringBundle::nsExtensibleStringBundle() :mBundle(NULL) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mLoaded = PR_FALSE; @@ -656,7 +656,7 @@ nsStringBundleService::nsStringBundleService() : #ifdef DEBUG_tao_ printf("\n++ nsStringBundleService::nsStringBundleService ++\n"); #endif - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); PR_INIT_CLIST(&mBundleCache); PL_InitArenaPool(&mCacheEntryPool, "srEntries", diff --git a/intl/uconv/src/nsCharsetAliasImp.cpp b/intl/uconv/src/nsCharsetAliasImp.cpp index 2857da69f8ef..0f9361b1e496 100644 --- a/intl/uconv/src/nsCharsetAliasImp.cpp +++ b/intl/uconv/src/nsCharsetAliasImp.cpp @@ -56,7 +56,7 @@ NS_IMPL_ISUPPORTS1(nsCharsetAlias2, nsICharsetAlias); //-------------------------------------------------------------- nsCharsetAlias2::nsCharsetAlias2() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mDelegate = nsnull; // delay the load of mDelegate untill we need it. } //-------------------------------------------------------------- diff --git a/intl/uconv/src/nsCharsetConverterManager.cpp b/intl/uconv/src/nsCharsetConverterManager.cpp index 554b9e85171d..d9f30a0b4c72 100644 --- a/intl/uconv/src/nsCharsetConverterManager.cpp +++ b/intl/uconv/src/nsCharsetConverterManager.cpp @@ -78,7 +78,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS2(nsCharsetConverterManager, nsCharsetConverterManager::nsCharsetConverterManager() :mDataBundle(NULL), mTitleBundle(NULL) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsCharsetConverterManager::~nsCharsetConverterManager() diff --git a/intl/uconv/src/nsConverterInputStream.h b/intl/uconv/src/nsConverterInputStream.h index 2b0356ed578a..8de1858e78b2 100644 --- a/intl/uconv/src/nsConverterInputStream.h +++ b/intl/uconv/src/nsConverterInputStream.h @@ -70,7 +70,7 @@ class nsConverterInputStream : nsIConverterInputStream { mLeftOverBytes(0), mUnicharDataOffset(0), mUnicharDataLength(0), - mRecoverFromErrors(PR_FALSE) { NS_INIT_REFCNT(); } + mRecoverFromErrors(PR_FALSE) { NS_INIT_ISUPPORTS(); } virtual ~nsConverterInputStream() {} diff --git a/intl/uconv/src/nsMacCharset.cpp b/intl/uconv/src/nsMacCharset.cpp index 8cd832767c27..889fe664b24d 100644 --- a/intl/uconv/src/nsMacCharset.cpp +++ b/intl/uconv/src/nsMacCharset.cpp @@ -56,7 +56,7 @@ NS_IMPL_ISUPPORTS1(nsPlatformCharset, nsIPlatformCharset); nsPlatformCharset::nsPlatformCharset() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); PR_AtomicIncrement(&gCnt); } nsPlatformCharset::~nsPlatformCharset() diff --git a/intl/uconv/src/nsOS2Charset.cpp b/intl/uconv/src/nsOS2Charset.cpp index 322bee2e95b7..33428f0fd5c3 100644 --- a/intl/uconv/src/nsOS2Charset.cpp +++ b/intl/uconv/src/nsOS2Charset.cpp @@ -41,7 +41,7 @@ NS_IMPL_ISUPPORTS1(nsPlatformCharset, nsIPlatformCharset); nsPlatformCharset::nsPlatformCharset() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); PR_AtomicIncrement(&gCnt); // count for gInfo // XXX We should make the following block critical section diff --git a/intl/uconv/src/nsScriptableUConv.cpp b/intl/uconv/src/nsScriptableUConv.cpp index 1cb3f24a1c36..8996102f7dbe 100644 --- a/intl/uconv/src/nsScriptableUConv.cpp +++ b/intl/uconv/src/nsScriptableUConv.cpp @@ -60,7 +60,7 @@ NS_IMPL_ISUPPORTS1(nsScriptableUnicodeConverter, nsIScriptableUnicodeConverter) nsScriptableUnicodeConverter::nsScriptableUnicodeConverter() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); PR_AtomicIncrement(&gInstanceCount); } diff --git a/intl/uconv/src/nsTextToSubURI.cpp b/intl/uconv/src/nsTextToSubURI.cpp index 871168404299..b47146f5a7bf 100644 --- a/intl/uconv/src/nsTextToSubURI.cpp +++ b/intl/uconv/src/nsTextToSubURI.cpp @@ -54,7 +54,7 @@ static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CI nsTextToSubURI::nsTextToSubURI() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsTextToSubURI::~nsTextToSubURI() { diff --git a/intl/uconv/src/nsUNIXCharset.cpp b/intl/uconv/src/nsUNIXCharset.cpp index b3e00e292fa0..4c365aeac409 100644 --- a/intl/uconv/src/nsUNIXCharset.cpp +++ b/intl/uconv/src/nsUNIXCharset.cpp @@ -82,7 +82,7 @@ static PRStatus InitLock(void) nsPlatformCharset::nsPlatformCharset() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); PR_AtomicIncrement(&gCnt); static PRCallOnceType once; PR_CallOnce(&once, InitLock); diff --git a/intl/uconv/src/nsUnicodeDecodeHelper.cpp b/intl/uconv/src/nsUnicodeDecodeHelper.cpp index 9e45af71ed25..6da5296d3e63 100644 --- a/intl/uconv/src/nsUnicodeDecodeHelper.cpp +++ b/intl/uconv/src/nsUnicodeDecodeHelper.cpp @@ -52,7 +52,7 @@ NS_IMPL_ISUPPORTS1(nsUnicodeDecodeHelper, nsIUnicodeDecodeHelper) nsUnicodeDecodeHelper::nsUnicodeDecodeHelper() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsUnicodeDecodeHelper::~nsUnicodeDecodeHelper() diff --git a/intl/uconv/src/nsUnicodeEncodeHelper.cpp b/intl/uconv/src/nsUnicodeEncodeHelper.cpp index 61743ca1e86f..aa6ba2633407 100644 --- a/intl/uconv/src/nsUnicodeEncodeHelper.cpp +++ b/intl/uconv/src/nsUnicodeEncodeHelper.cpp @@ -52,7 +52,7 @@ NS_IMPL_ISUPPORTS1(nsUnicodeEncodeHelper, nsIUnicodeEncodeHelper) nsUnicodeEncodeHelper::nsUnicodeEncodeHelper() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsUnicodeEncodeHelper::~nsUnicodeEncodeHelper() diff --git a/intl/uconv/src/nsUnicodeToUTF8.h b/intl/uconv/src/nsUnicodeToUTF8.h index cd1c93400f7b..faf89b6299a3 100644 --- a/intl/uconv/src/nsUnicodeToUTF8.h +++ b/intl/uconv/src/nsUnicodeToUTF8.h @@ -67,7 +67,7 @@ public: /** * Class constructor. */ - nsUnicodeToUTF8() {NS_INIT_REFCNT(); mHighSurrogate = 0;}; + nsUnicodeToUTF8() {NS_INIT_ISUPPORTS(); mHighSurrogate = 0;}; NS_IMETHOD FillInfo(PRUint32* aInfo); diff --git a/intl/uconv/src/nsWinCharset.cpp b/intl/uconv/src/nsWinCharset.cpp index 1cb4c8066fe6..ecad21600f6a 100644 --- a/intl/uconv/src/nsWinCharset.cpp +++ b/intl/uconv/src/nsWinCharset.cpp @@ -57,7 +57,7 @@ NS_IMPL_ISUPPORTS1(nsPlatformCharset, nsIPlatformCharset) nsPlatformCharset::nsPlatformCharset() { NS_TIMELINE_START_TIMER("nsPlatformCharset()"); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); UINT acp = ::GetACP(); PRInt32 acpint = (PRInt32)(acp & 0x00FFFF); diff --git a/intl/uconv/src/unicpriv.h b/intl/uconv/src/unicpriv.h index d3b5ebc911d9..7cded3e4a995 100644 --- a/intl/uconv/src/unicpriv.h +++ b/intl/uconv/src/unicpriv.h @@ -41,6 +41,7 @@ #include "ubase.h" #include "umap.h" #include "uconvutil.h" +#include "nsComObsolete.h" #ifdef __cplusplus extern "C" { diff --git a/intl/uconv/ucvcn/nsISO2022CNToUnicode.h b/intl/uconv/ucvcn/nsISO2022CNToUnicode.h index bac23636cf6f..11787273f1ca 100644 --- a/intl/uconv/ucvcn/nsISO2022CNToUnicode.h +++ b/intl/uconv/ucvcn/nsISO2022CNToUnicode.h @@ -56,7 +56,7 @@ class nsISO2022CNToUnicode : public nsBasicDecoderSupport public: nsISO2022CNToUnicode() : mState(eState_ASCII), - mPlaneID(0) { NS_INIT_REFCNT(); }; + mPlaneID(0) { NS_INIT_ISUPPORTS(); }; virtual ~nsISO2022CNToUnicode() {}; diff --git a/intl/uconv/ucvko/nsUnicodeToX11Johab.cpp b/intl/uconv/ucvko/nsUnicodeToX11Johab.cpp index 9141e20ae156..a5014c414100 100644 --- a/intl/uconv/ucvko/nsUnicodeToX11Johab.cpp +++ b/intl/uconv/ucvko/nsUnicodeToX11Johab.cpp @@ -150,7 +150,7 @@ nsUnicodeToX11Johab::nsUnicodeToX11Johab() l = 0x5f; v = 0; t = 0; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsUnicodeToX11Johab::~nsUnicodeToX11Johab() diff --git a/intl/uconv/util/nsUCSupport.cpp b/intl/uconv/util/nsUCSupport.cpp index ba7125e3e2bd..79bce43cf412 100644 --- a/intl/uconv/util/nsUCSupport.cpp +++ b/intl/uconv/util/nsUCSupport.cpp @@ -54,7 +54,7 @@ static NS_DEFINE_CID(kUnicodeDecodeHelperCID, NS_UNICODEDECODEHELPER_CID); nsBasicDecoderSupport::nsBasicDecoderSupport() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsBasicDecoderSupport::~nsBasicDecoderSupport() @@ -358,7 +358,7 @@ NS_IMETHODIMP nsOneByteDecoderSupport::Reset() // Class nsBasicEncoder [implementation] nsBasicEncoder::nsBasicEncoder() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsBasicEncoder::~nsBasicEncoder() diff --git a/intl/unicharutil/src/nsCaseConversionImp2.cpp b/intl/unicharutil/src/nsCaseConversionImp2.cpp index 3d06e27c0683..27ff636a390f 100644 --- a/intl/unicharutil/src/nsCaseConversionImp2.cpp +++ b/intl/unicharutil/src/nsCaseConversionImp2.cpp @@ -470,7 +470,7 @@ nsCaseConversionImp2::nsCaseConversionImp2() gUpperMap = new nsCompressedMap(NS_REINTERPRET_CAST(PRUnichar*, &gToUpper[0]), gToUpperItems); gLowerMap = new nsCompressedMap(NS_REINTERPRET_CAST(PRUnichar*, &gToLower[0]), gToLowerItems); } - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsCaseConversionImp2::~nsCaseConversionImp2() diff --git a/intl/unicharutil/src/nsCategoryImp.cpp b/intl/unicharutil/src/nsCategoryImp.cpp index 4e3d068be4d0..002b12568762 100644 --- a/intl/unicharutil/src/nsCategoryImp.cpp +++ b/intl/unicharutil/src/nsCategoryImp.cpp @@ -48,7 +48,7 @@ NS_IMPL_ISUPPORTS1(nsCategoryImp, nsIUGenCategory); nsCategoryImp::nsCategoryImp() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsCategoryImp::~nsCategoryImp() diff --git a/intl/unicharutil/src/nsCharsOrderIdFormater.cpp b/intl/unicharutil/src/nsCharsOrderIdFormater.cpp index 9c8c81f3ed4e..733ee8d79034 100644 --- a/intl/unicharutil/src/nsCharsOrderIdFormater.cpp +++ b/intl/unicharutil/src/nsCharsOrderIdFormater.cpp @@ -43,7 +43,7 @@ nsCharsOrderIdFormater::nsCharsOrderIdFormater( nsCharsList* aList) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mList = aList; mBase = aList->Length(); } @@ -75,7 +75,7 @@ class nsCharsOrderIdFormaterFactory : public nsIFactory { NS_DECL_ISUPPORTS public: nsCharsOrderIdFormaterFactory(const nsCID &aCID) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mCID = aCID; }; virtual ~nsCharsOrderIdFormaterFactory() { diff --git a/intl/unicharutil/src/nsEntityConverter.cpp b/intl/unicharutil/src/nsEntityConverter.cpp index 81c8441f9135..a47aeccfe319 100644 --- a/intl/unicharutil/src/nsEntityConverter.cpp +++ b/intl/unicharutil/src/nsEntityConverter.cpp @@ -53,7 +53,7 @@ nsEntityConverter::nsEntityConverter() : mVersionList(NULL), mVersionListLength(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsEntityConverter::~nsEntityConverter() diff --git a/intl/unicharutil/src/nsHankakuToZenkaku.cpp b/intl/unicharutil/src/nsHankakuToZenkaku.cpp index 5466f6b0ac16..257af6f202e7 100644 --- a/intl/unicharutil/src/nsHankakuToZenkaku.cpp +++ b/intl/unicharutil/src/nsHankakuToZenkaku.cpp @@ -145,7 +145,7 @@ NS_IMPL_ISUPPORTS1(nsHankakuToZenkaku, nsITextTransform) nsHankakuToZenkaku::nsHankakuToZenkaku() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsHankakuToZenkaku::~nsHankakuToZenkaku() { diff --git a/intl/unicharutil/src/nsSaveAsCharset.cpp b/intl/unicharutil/src/nsSaveAsCharset.cpp index 7035e5399a8f..68fa84011c06 100644 --- a/intl/unicharutil/src/nsSaveAsCharset.cpp +++ b/intl/unicharutil/src/nsSaveAsCharset.cpp @@ -58,7 +58,7 @@ NS_IMPL_ISUPPORTS1(nsSaveAsCharset, nsISaveAsCharset) // nsSaveAsCharset::nsSaveAsCharset() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mAttribute = attr_htmlTextDefault; mEntityVersion = 0; diff --git a/intl/unicharutil/util/nsUnicharUtils.cpp b/intl/unicharutil/util/nsUnicharUtils.cpp index 711fe11f48da..d70619303570 100644 --- a/intl/unicharutil/util/nsUnicharUtils.cpp +++ b/intl/unicharutil/util/nsUnicharUtils.cpp @@ -53,7 +53,7 @@ static nsICaseConversion *gCaseConv = nsnull; class nsShutdownObserver : public nsIObserver { public: - nsShutdownObserver() { NS_INIT_REFCNT(); } + nsShutdownObserver() { NS_INIT_ISUPPORTS(); } virtual ~nsShutdownObserver() {} NS_DECL_ISUPPORTS diff --git a/js/src/liveconnect/nsCLiveconnectFactory.cpp b/js/src/liveconnect/nsCLiveconnectFactory.cpp index 0bf89ec24e81..ec5a2214614f 100644 --- a/js/src/liveconnect/nsCLiveconnectFactory.cpp +++ b/js/src/liveconnect/nsCLiveconnectFactory.cpp @@ -151,7 +151,7 @@ nsCLiveconnectFactory::LockFactory(PRBool aLock) nsCLiveconnectFactory::nsCLiveconnectFactory(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsCLiveconnectFactory::~nsCLiveconnectFactory() diff --git a/js/src/xpconnect/loader/mozJSComponentLoader.cpp b/js/src/xpconnect/loader/mozJSComponentLoader.cpp index 63a97ee8f231..124516458017 100644 --- a/js/src/xpconnect/loader/mozJSComponentLoader.cpp +++ b/js/src/xpconnect/loader/mozJSComponentLoader.cpp @@ -395,7 +395,7 @@ mozJSComponentLoader::mozJSComponentLoader() mGlobals(nsnull), mInitialized(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } static PRIntn PR_CALLBACK diff --git a/js/src/xpconnect/shell/xpcshell.cpp b/js/src/xpconnect/shell/xpcshell.cpp index a675ac5914fa..cbdbff5a580d 100644 --- a/js/src/xpconnect/shell/xpcshell.cpp +++ b/js/src/xpconnect/shell/xpcshell.cpp @@ -670,7 +670,7 @@ NS_IMPL_ISUPPORTS1(FullTrustSecMan, nsIXPCSecurityManager); FullTrustSecMan::FullTrustSecMan() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMETHODIMP diff --git a/js/src/xpconnect/src/nsScriptError.cpp b/js/src/xpconnect/src/nsScriptError.cpp index 3ea5579fbc71..09d7e9b1ba70 100644 --- a/js/src/xpconnect/src/nsScriptError.cpp +++ b/js/src/xpconnect/src/nsScriptError.cpp @@ -55,7 +55,7 @@ nsScriptError::nsScriptError() mFlags(0), mCategory(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsScriptError::~nsScriptError() {}; diff --git a/js/src/xpconnect/src/xpcstack.cpp b/js/src/xpconnect/src/xpcstack.cpp index 2fa656727a1b..1758a84a1437 100644 --- a/js/src/xpconnect/src/xpcstack.cpp +++ b/js/src/xpconnect/src/xpcstack.cpp @@ -110,7 +110,7 @@ XPCJSStackFrame::XPCJSStackFrame() mLineno(0), mLanguage(nsIProgrammingLanguage::UNKNOWN) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } XPCJSStackFrame::~XPCJSStackFrame() diff --git a/js/src/xpconnect/src/xpcwrappedjs.cpp b/js/src/xpconnect/src/xpcwrappedjs.cpp index 9ceacee50cfb..24d9b92bf830 100644 --- a/js/src/xpconnect/src/xpcwrappedjs.cpp +++ b/js/src/xpconnect/src/xpcwrappedjs.cpp @@ -312,7 +312,7 @@ nsXPCWrappedJS::nsXPCWrappedJS(XPCCallContext& ccx, printf("//////// %d instances of nsXPCWrappedJS created\n", count); #endif - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // intensionally do double addref - see Release(). NS_ADDREF_THIS(); NS_ADDREF_THIS(); diff --git a/js/src/xpconnect/src/xpcwrappedjsclass.cpp b/js/src/xpconnect/src/xpcwrappedjsclass.cpp index bf0c685f2f94..e417895e92af 100644 --- a/js/src/xpconnect/src/xpcwrappedjsclass.cpp +++ b/js/src/xpconnect/src/xpcwrappedjsclass.cpp @@ -160,7 +160,7 @@ nsXPCWrappedJSClass::nsXPCWrappedJSClass(XPCCallContext& ccx, REFNSIID aIID, mDescriptors(nsnull) { NS_ADDREF(mInfo); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); { // scoped lock diff --git a/js/src/xpconnect/src/xpcwrappednative.cpp b/js/src/xpconnect/src/xpcwrappednative.cpp index 057debd15f79..c414a5d0a79a 100644 --- a/js/src/xpconnect/src/xpcwrappednative.cpp +++ b/js/src/xpconnect/src/xpcwrappednative.cpp @@ -2954,7 +2954,7 @@ XPCJSObjectHolder::GetJSObject(JSObject** aJSObj) XPCJSObjectHolder::XPCJSObjectHolder(JSContext* cx, JSObject* obj) : mRuntime(JS_GetRuntime(cx)), mJSObj(obj) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); JS_AddNamedRoot(cx, &mJSObj, "XPCJSObjectHolder::mJSObj"); } diff --git a/js/src/xpconnect/tests/TestXPC.cpp b/js/src/xpconnect/tests/TestXPC.cpp index 47610b8a5b36..9354b381aac1 100644 --- a/js/src/xpconnect/tests/TestXPC.cpp +++ b/js/src/xpconnect/tests/TestXPC.cpp @@ -180,7 +180,7 @@ NS_IMPL_ISUPPORTS2(nsTestXPCFoo, nsITestXPCFoo, nsITestXPCFoo2) nsTestXPCFoo::nsTestXPCFoo() : mFoo(NULL) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); } @@ -216,7 +216,7 @@ NS_IMPL_ISUPPORTS1(MySecMan, nsIXPCSecurityManager) MySecMan::MySecMan() : mMode(OK_ALL) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); } diff --git a/js/src/xpconnect/tests/components/xpctest_array.cpp b/js/src/xpconnect/tests/components/xpctest_array.cpp index d863cf5c6777..42cf547eebcf 100644 --- a/js/src/xpconnect/tests/components/xpctest_array.cpp +++ b/js/src/xpconnect/tests/components/xpctest_array.cpp @@ -52,7 +52,7 @@ private: xpcarraytest::xpcarraytest() : mReceiver(NULL) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); } diff --git a/js/src/xpconnect/tests/components/xpctest_attributes.cpp b/js/src/xpconnect/tests/components/xpctest_attributes.cpp index 284ff7da9802..65b4f33cbd1f 100644 --- a/js/src/xpconnect/tests/components/xpctest_attributes.cpp +++ b/js/src/xpconnect/tests/components/xpctest_attributes.cpp @@ -59,7 +59,7 @@ class xpcTestObjectReadOnly : public nsIXPCTestObjectReadOnly { NS_IMPL_ISUPPORTS1(xpcTestObjectReadOnly, nsIXPCTestObjectReadOnly); xpcTestObjectReadOnly :: xpcTestObjectReadOnly() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); boolProperty = PR_TRUE; @@ -158,7 +158,7 @@ class xpcTestObjectReadWrite : public nsIXPCTestObjectReadWrite { NS_IMPL_ISUPPORTS1(xpcTestObjectReadWrite, nsIXPCTestObjectReadWrite); xpcTestObjectReadWrite :: xpcTestObjectReadWrite() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); diff --git a/js/src/xpconnect/tests/components/xpctest_calljs.cpp b/js/src/xpconnect/tests/components/xpctest_calljs.cpp index 4f770c9ffbec..df73c5557593 100644 --- a/js/src/xpconnect/tests/components/xpctest_calljs.cpp +++ b/js/src/xpconnect/tests/components/xpctest_calljs.cpp @@ -60,7 +60,7 @@ NS_IMPL_ISUPPORTS2_CI(xpcTestCallJS, nsIXPCTestCallJS, nsIXPCScriptable); #include "xpc_map_end.h" /* This will #undef the above */ xpcTestCallJS :: xpcTestCallJS() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); }; diff --git a/js/src/xpconnect/tests/components/xpctest_child.cpp b/js/src/xpconnect/tests/components/xpctest_child.cpp index 704603621281..d8df4514b5fa 100644 --- a/js/src/xpconnect/tests/components/xpctest_child.cpp +++ b/js/src/xpconnect/tests/components/xpctest_child.cpp @@ -66,7 +66,7 @@ NS_IMPL_ISUPPORTS1(xpctestOther, nsIXPCTestOther); xpctestOther::xpctestOther() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); } @@ -171,7 +171,7 @@ xpctestChild::QueryInterface(REFNSIID iid, void** result) xpctestChild::xpctestChild() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); } diff --git a/js/src/xpconnect/tests/components/xpctest_const.cpp b/js/src/xpconnect/tests/components/xpctest_const.cpp index e8d0e9a8a47e..a0712850e342 100644 --- a/js/src/xpconnect/tests/components/xpctest_const.cpp +++ b/js/src/xpconnect/tests/components/xpctest_const.cpp @@ -47,7 +47,7 @@ public: NS_IMPL_ISUPPORTS1(xpcTestConst, nsIXPCTestConst); xpcTestConst :: xpcTestConst() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); }; diff --git a/js/src/xpconnect/tests/components/xpctest_domstring.cpp b/js/src/xpconnect/tests/components/xpctest_domstring.cpp index 62069c703ed8..f87aadd03449 100644 --- a/js/src/xpconnect/tests/components/xpctest_domstring.cpp +++ b/js/src/xpconnect/tests/components/xpctest_domstring.cpp @@ -53,7 +53,7 @@ NS_IMPL_ISUPPORTS1(xpcTestDOMString, nsIXPCTestDOMString); xpcTestDOMString::xpcTestDOMString() : mHandle(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); } diff --git a/js/src/xpconnect/tests/components/xpctest_echo.cpp b/js/src/xpconnect/tests/components/xpctest_echo.cpp index b2a9158585ab..8b9fbb6ad230 100644 --- a/js/src/xpconnect/tests/components/xpctest_echo.cpp +++ b/js/src/xpconnect/tests/components/xpctest_echo.cpp @@ -73,7 +73,7 @@ NS_IMPL_ISUPPORTS1(xpctestEcho, nsIEcho); xpctestEcho::xpctestEcho() : mReceiver(nsnull), mString(nsnull), mSomeValue(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); } diff --git a/js/src/xpconnect/tests/components/xpctest_in.cpp b/js/src/xpconnect/tests/components/xpctest_in.cpp index d849382f93e9..e88d5d43e13e 100644 --- a/js/src/xpconnect/tests/components/xpctest_in.cpp +++ b/js/src/xpconnect/tests/components/xpctest_in.cpp @@ -52,7 +52,7 @@ public: NS_IMPL_ISUPPORTS1(xpcTestIn, nsIXPCTestIn); xpcTestIn :: xpcTestIn() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); }; diff --git a/js/src/xpconnect/tests/components/xpctest_inout.cpp b/js/src/xpconnect/tests/components/xpctest_inout.cpp index 78dd481e9c82..46f844e6268c 100644 --- a/js/src/xpconnect/tests/components/xpctest_inout.cpp +++ b/js/src/xpconnect/tests/components/xpctest_inout.cpp @@ -48,7 +48,7 @@ public: NS_IMPL_ISUPPORTS1(xpcTestInOut, nsIXPCTestInOut); xpcTestInOut :: xpcTestInOut() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); }; diff --git a/js/src/xpconnect/tests/components/xpctest_multiple.cpp b/js/src/xpconnect/tests/components/xpctest_multiple.cpp index d7b1fc55daa0..3ee4396a3a23 100644 --- a/js/src/xpconnect/tests/components/xpctest_multiple.cpp +++ b/js/src/xpconnect/tests/components/xpctest_multiple.cpp @@ -50,7 +50,7 @@ NS_IMPL_ISUPPORTS1(xpcTestParentOne, nsIXPCTestParentOne); xpcTestParentOne :: xpcTestParentOne() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); }; @@ -114,7 +114,7 @@ NS_IMPL_ISUPPORTS1(xpcTestParentTwo, nsIXPCTestParentTwo); xpcTestParentTwo :: xpcTestParentTwo() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); }; @@ -185,7 +185,7 @@ NS_IMPL_ISUPPORTS3_CI(xpcTestChild2,nsIXPCTestChild2,nsIXPCTestParentOne,nsIXPCT xpcTestChild2 :: xpcTestChild2() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); }; @@ -307,7 +307,7 @@ NS_IMPL_ISUPPORTS2(xpcTestChild3,nsIXPCTestChild3,nsIXPCTestParentOne); xpcTestChild3 :: xpcTestChild3() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); }; @@ -405,7 +405,7 @@ NS_IMPL_ISUPPORTS3(xpcTestChild4,nsIXPCTestChild4,nsIXPCTestParentOne,nsIXPCTest xpcTestChild4 :: xpcTestChild4() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); }; @@ -476,7 +476,7 @@ NS_IMPL_ISUPPORTS3(xpcTestChild5,nsIXPCTestChild5,nsIXPCTestParentOne,nsIXPCTest xpcTestChild5 :: xpcTestChild5() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); }; diff --git a/js/src/xpconnect/tests/components/xpctest_noisy.cpp b/js/src/xpconnect/tests/components/xpctest_noisy.cpp index 7bedbe1065f8..de1286a5e223 100644 --- a/js/src/xpconnect/tests/components/xpctest_noisy.cpp +++ b/js/src/xpconnect/tests/components/xpctest_noisy.cpp @@ -102,7 +102,7 @@ xpctestNoisy::xpctestNoisy() : mID(++sID) { sCount++; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); printf("Noisy %d - Created, %d total\n", mID, sCount); NS_ADDREF_THIS(); } diff --git a/js/src/xpconnect/tests/components/xpctest_out.cpp b/js/src/xpconnect/tests/components/xpctest_out.cpp index 014e908cf4b3..ca779fda55a8 100644 --- a/js/src/xpconnect/tests/components/xpctest_out.cpp +++ b/js/src/xpconnect/tests/components/xpctest_out.cpp @@ -76,7 +76,7 @@ private: NS_IMPL_ISUPPORTS1(xpcTestOut, nsIXPCTestOut); xpcTestOut :: xpcTestOut() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); }; diff --git a/js/src/xpconnect/tests/components/xpctest_overloaded.cpp b/js/src/xpconnect/tests/components/xpctest_overloaded.cpp index a122a245e10e..4619ffacc079 100644 --- a/js/src/xpconnect/tests/components/xpctest_overloaded.cpp +++ b/js/src/xpconnect/tests/components/xpctest_overloaded.cpp @@ -102,7 +102,7 @@ public: xpcoverloaded::xpcoverloaded() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); } diff --git a/js/src/xpconnect/tests/components/xpctest_string.cpp b/js/src/xpconnect/tests/components/xpctest_string.cpp index 0af715fb16e4..8a2c9bc442a3 100644 --- a/js/src/xpconnect/tests/components/xpctest_string.cpp +++ b/js/src/xpconnect/tests/components/xpctest_string.cpp @@ -49,7 +49,7 @@ public: xpcstringtest::xpcstringtest() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); } diff --git a/js/src/xpconnect/tests/js/old/xpctest_enum_create.js b/js/src/xpconnect/tests/js/old/xpctest_enum_create.js index a81bf8c348b6..f2e4d4965c47 100644 --- a/js/src/xpconnect/tests/js/old/xpctest_enum_create.js +++ b/js/src/xpconnect/tests/js/old/xpctest_enum_create.js @@ -145,7 +145,7 @@ var contractIDsTo_NOT_Create = [ // fixed "@mozilla.org/rdf/xul-content-sink;1", // nsXULContentSink.cpp, XULContentSinkImpl::XULContentSinkImpl needs to init mNameSpaceManager -/* dp claims to have fixes coming */ "@mozilla.org/image/decoder;1?type=image/", // PNGDecoder::QueryInterface and JPGDecoder::QueryInterface, do NS_INIT_REFCNT() in QueryInterface! (npunn) +/* dp claims to have fixes coming */ "@mozilla.org/image/decoder;1?type=image/", // PNGDecoder::QueryInterface and JPGDecoder::QueryInterface, do NS_INIT_ISUPPORTS() in QueryInterface! (npunn) /* BUG 11507 */ "@mozilla.org/wallet;1", // WalletFactoryImpl::CreateInstance broken : calls "delete inst" then calls "NS_IF_RELEASE(inst)" diff --git a/layout/base/nsAutoCopy.cpp b/layout/base/nsAutoCopy.cpp index 30bbe6507a6c..6fda3cf1caa2 100644 --- a/layout/base/nsAutoCopy.cpp +++ b/layout/base/nsAutoCopy.cpp @@ -83,7 +83,7 @@ NS_NewAutoCopyService(nsIAutoCopyService** aResult) nsAutoCopyService::nsAutoCopyService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMETHODIMP diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index 925e7f1ba12e..348870396f05 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -1248,7 +1248,7 @@ nsCSSFrameConstructor::nsCSSFrameConstructor(void) mDocElementContainingBlock(nsnull), mGfxScrollFrame(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef DEBUG static PRBool gFirstTime = PR_TRUE; diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp index 835d69a45d7e..5e3638cc5b00 100644 --- a/layout/base/nsCaret.cpp +++ b/layout/base/nsCaret.cpp @@ -97,7 +97,7 @@ nsCaret::nsCaret() , mLastCaretView(nsnull) , mLastContentOffset(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp index a468d1cc23a7..07911c9f144c 100644 --- a/layout/base/nsDocumentViewer.cpp +++ b/layout/base/nsDocumentViewer.cpp @@ -269,7 +269,7 @@ public: , mGotSelectionState(PR_FALSE) , mSelectionWasCollapsed(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } virtual ~nsDocViewerSelectionListener() {} @@ -2979,7 +2979,7 @@ NS_IMPL_ISUPPORTS1(nsDocViewerFocusListener, nsIDOMFocusListener); nsDocViewerFocusListener::nsDocViewerFocusListener() :mDocViewer(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDocViewerFocusListener::~nsDocViewerFocusListener(){} diff --git a/layout/base/nsFrameContentIterator.cpp b/layout/base/nsFrameContentIterator.cpp index 1371176afbfa..3c27f9e4d38d 100644 --- a/layout/base/nsFrameContentIterator.cpp +++ b/layout/base/nsFrameContentIterator.cpp @@ -60,7 +60,7 @@ nsFrameContentIterator::nsFrameContentIterator(nsIPresContext* aPresContext, nsIFrame* aFrame) : mPresContext(aPresContext), mParentFrame(aFrame), mIsDone(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); First(); } diff --git a/layout/base/nsFrameManager.cpp b/layout/base/nsFrameManager.cpp index a3edff5af628..0e21d816271a 100644 --- a/layout/base/nsFrameManager.cpp +++ b/layout/base/nsFrameManager.cpp @@ -450,7 +450,7 @@ NS_NewFrameManager(nsIFrameManager** aInstancePtrResult) FrameManager::FrameManager() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } FrameManager::~FrameManager() diff --git a/layout/base/nsFrameTraversal.cpp b/layout/base/nsFrameTraversal.cpp index a1aae3ec4be3..1502ba2271dc 100644 --- a/layout/base/nsFrameTraversal.cpp +++ b/layout/base/nsFrameTraversal.cpp @@ -277,7 +277,7 @@ nsFrameIterator::nsFrameIterator() mLast = nsnull; mCurrent = nsnull; mStart = nsnull; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/layout/base/nsLayoutDebugger.cpp b/layout/base/nsLayoutDebugger.cpp index d2256847e1d8..8ef49928bf1d 100644 --- a/layout/base/nsLayoutDebugger.cpp +++ b/layout/base/nsLayoutDebugger.cpp @@ -82,7 +82,7 @@ NS_NewLayoutDebugger(nsILayoutDebugger** aResult) nsLayoutDebugger::nsLayoutDebugger() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsLayoutDebugger::~nsLayoutDebugger() diff --git a/layout/base/nsLayoutHistoryState.cpp b/layout/base/nsLayoutHistoryState.cpp index a0d7d9ff576f..ca39ac9b0e7a 100644 --- a/layout/base/nsLayoutHistoryState.cpp +++ b/layout/base/nsLayoutHistoryState.cpp @@ -79,7 +79,7 @@ NS_NewLayoutHistoryState(nsILayoutHistoryState** aState) nsLayoutHistoryState::nsLayoutHistoryState() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsLayoutHistoryState::~nsLayoutHistoryState() diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp index c2718f8568e7..bed41bb65c15 100644 --- a/layout/base/nsPresContext.cpp +++ b/layout/base/nsPresContext.cpp @@ -148,7 +148,7 @@ nsPresContext::nsPresContext() NS_FONT_WEIGHT_NORMAL, 0, NSIntPointsToTwips(12)), mNoTheme(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mCompatibilityMode = eCompatibility_FullStandards; mWidgetRenderingMode = eWidgetRendering_Gfx; mImageAnimationMode = imgIContainer::kNormalAnimMode; diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp index 25978112fd28..74792e4f96de 100644 --- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -768,7 +768,7 @@ nsDummyLayoutRequest::Create(nsIRequest** aResult, nsIPresShell* aPresShell) nsDummyLayoutRequest::nsDummyLayoutRequest(nsIPresShell* aPresShell) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (gRefCnt++ == 0) { nsresult rv; diff --git a/layout/base/src/nsAutoCopy.cpp b/layout/base/src/nsAutoCopy.cpp index 30bbe6507a6c..6fda3cf1caa2 100644 --- a/layout/base/src/nsAutoCopy.cpp +++ b/layout/base/src/nsAutoCopy.cpp @@ -83,7 +83,7 @@ NS_NewAutoCopyService(nsIAutoCopyService** aResult) nsAutoCopyService::nsAutoCopyService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMETHODIMP diff --git a/layout/base/src/nsCaret.cpp b/layout/base/src/nsCaret.cpp index 835d69a45d7e..5e3638cc5b00 100644 --- a/layout/base/src/nsCaret.cpp +++ b/layout/base/src/nsCaret.cpp @@ -97,7 +97,7 @@ nsCaret::nsCaret() , mLastCaretView(nsnull) , mLastContentOffset(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/layout/base/src/nsFrameTraversal.cpp b/layout/base/src/nsFrameTraversal.cpp index a1aae3ec4be3..1502ba2271dc 100644 --- a/layout/base/src/nsFrameTraversal.cpp +++ b/layout/base/src/nsFrameTraversal.cpp @@ -277,7 +277,7 @@ nsFrameIterator::nsFrameIterator() mLast = nsnull; mCurrent = nsnull; mStart = nsnull; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/layout/base/src/nsFrameUtil.cpp b/layout/base/src/nsFrameUtil.cpp index 61d072ff64be..35f76a0b43ca 100644 --- a/layout/base/src/nsFrameUtil.cpp +++ b/layout/base/src/nsFrameUtil.cpp @@ -510,7 +510,7 @@ NS_NewFrameUtil(nsIFrameUtil** aResult) nsFrameUtil::nsFrameUtil() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsFrameUtil::~nsFrameUtil() diff --git a/layout/base/src/nsIntervalSet.h b/layout/base/src/nsIntervalSet.h index e0f8a7bfbc0d..49f743ec0db7 100644 --- a/layout/base/src/nsIntervalSet.h +++ b/layout/base/src/nsIntervalSet.h @@ -41,6 +41,7 @@ #include "prtypes.h" #include "nsCoord.h" +#include "nsDebug.h" typedef void * (* PR_CALLBACK IntervalSetAlloc)(size_t aBytes, void *aClosure); diff --git a/layout/base/src/nsLayoutDebugger.cpp b/layout/base/src/nsLayoutDebugger.cpp index d2256847e1d8..8ef49928bf1d 100644 --- a/layout/base/src/nsLayoutDebugger.cpp +++ b/layout/base/src/nsLayoutDebugger.cpp @@ -82,7 +82,7 @@ NS_NewLayoutDebugger(nsILayoutDebugger** aResult) nsLayoutDebugger::nsLayoutDebugger() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsLayoutDebugger::~nsLayoutDebugger() diff --git a/layout/base/src/nsLayoutHistoryState.cpp b/layout/base/src/nsLayoutHistoryState.cpp index a0d7d9ff576f..ca39ac9b0e7a 100644 --- a/layout/base/src/nsLayoutHistoryState.cpp +++ b/layout/base/src/nsLayoutHistoryState.cpp @@ -79,7 +79,7 @@ NS_NewLayoutHistoryState(nsILayoutHistoryState** aState) nsLayoutHistoryState::nsLayoutHistoryState() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsLayoutHistoryState::~nsLayoutHistoryState() diff --git a/layout/base/src/nsPresContext.cpp b/layout/base/src/nsPresContext.cpp index c2718f8568e7..bed41bb65c15 100644 --- a/layout/base/src/nsPresContext.cpp +++ b/layout/base/src/nsPresContext.cpp @@ -148,7 +148,7 @@ nsPresContext::nsPresContext() NS_FONT_WEIGHT_NORMAL, 0, NSIntPointsToTwips(12)), mNoTheme(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mCompatibilityMode = eCompatibility_FullStandards; mWidgetRenderingMode = eWidgetRendering_Gfx; mImageAnimationMode = imgIContainer::kNormalAnimMode; diff --git a/layout/build/nsContentDLF.cpp b/layout/build/nsContentDLF.cpp index 4824758078c6..c52ff7628ddd 100644 --- a/layout/build/nsContentDLF.cpp +++ b/layout/build/nsContentDLF.cpp @@ -151,7 +151,7 @@ NS_NewContentDocumentLoaderFactory(nsIDocumentLoaderFactory** aResult) nsContentDLF::nsContentDLF() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsContentDLF::~nsContentDLF() diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp index 870a8d32de21..ca2914c8acac 100644 --- a/layout/forms/nsListControlFrame.cpp +++ b/layout/forms/nsListControlFrame.cpp @@ -3506,7 +3506,7 @@ NS_IMPL_RELEASE(nsListEventListener) nsListEventListener::nsListEventListener() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsListEventListener::~nsListEventListener() diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp index 5e3bac8b91b6..f8d7d9d40c2d 100644 --- a/layout/forms/nsTextControlFrame.cpp +++ b/layout/forms/nsTextControlFrame.cpp @@ -250,7 +250,7 @@ nsTextInputListener::nsTextInputListener() , mKnowSelectionCollapsed(PR_FALSE) , mFirstDoOfFirstUndo(PR_TRUE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } @@ -661,7 +661,7 @@ NS_IMPL_ISUPPORTS3(nsTextInputSelectionImpl, nsISelectionController, nsISupports nsTextInputSelectionImpl::nsTextInputSelectionImpl(nsIFrameSelection *aSel, nsIPresShell *aShell, nsIContent *aLimiter) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (aSel && aShell) { mFrameSelection = aSel;//we are the owner now! diff --git a/layout/generic/nsFrameFrame.cpp b/layout/generic/nsFrameFrame.cpp index d7f7cd65eebb..6b17bcdea499 100644 --- a/layout/generic/nsFrameFrame.cpp +++ b/layout/generic/nsFrameFrame.cpp @@ -1288,7 +1288,7 @@ nsHTMLFrameInnerFrame::GetDesiredSize(nsIPresContext* aPresContext, *****************************************************************************/ FrameLoadingInfo::FrameLoadingInfo(const nsSize& aSize) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mFrameSize = aSize; } diff --git a/layout/generic/nsFrameUtil.cpp b/layout/generic/nsFrameUtil.cpp index 61d072ff64be..35f76a0b43ca 100644 --- a/layout/generic/nsFrameUtil.cpp +++ b/layout/generic/nsFrameUtil.cpp @@ -510,7 +510,7 @@ NS_NewFrameUtil(nsIFrameUtil** aResult) nsFrameUtil::nsFrameUtil() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsFrameUtil::~nsFrameUtil() diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp index 65b18d17a1df..31bd5169118d 100644 --- a/layout/generic/nsGfxScrollFrame.cpp +++ b/layout/generic/nsGfxScrollFrame.cpp @@ -860,7 +860,7 @@ nsGfxScrollFrameInner::nsGfxScrollFrameInner(nsGfxScrollFrame* aOuter):mHScrollb mHasVerticalScrollbar(PR_FALSE), mHasHorizontalScrollbar(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mOuter = aOuter; mMaxElementSize.width = 0; mMaxElementSize.height = 0; diff --git a/layout/generic/nsImageMap.cpp b/layout/generic/nsImageMap.cpp index 455feb01b344..19794288b735 100644 --- a/layout/generic/nsImageMap.cpp +++ b/layout/generic/nsImageMap.cpp @@ -817,7 +817,7 @@ void CircleArea::GetShapeName(nsString& aResult) const nsImageMap::nsImageMap() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mMap = nsnull; mDomMap = nsnull; mDocument = nsnull; diff --git a/layout/generic/nsIntervalSet.h b/layout/generic/nsIntervalSet.h index e0f8a7bfbc0d..49f743ec0db7 100644 --- a/layout/generic/nsIntervalSet.h +++ b/layout/generic/nsIntervalSet.h @@ -41,6 +41,7 @@ #include "prtypes.h" #include "nsCoord.h" +#include "nsDebug.h" typedef void * (* PR_CALLBACK IntervalSetAlloc)(size_t aBytes, void *aClosure); diff --git a/layout/generic/nsLineBox.cpp b/layout/generic/nsLineBox.cpp index 8f861af8aa8e..ea29702825a1 100644 --- a/layout/generic/nsLineBox.cpp +++ b/layout/generic/nsLineBox.cpp @@ -572,7 +572,7 @@ static nsLineBox* gDummyLines[1]; nsLineIterator::nsLineIterator() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mLines = gDummyLines; mNumLines = 0; mIndex = 0; diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp index e5b6633b40c1..92045b179254 100644 --- a/layout/generic/nsObjectFrame.cpp +++ b/layout/generic/nsObjectFrame.cpp @@ -2039,7 +2039,7 @@ NS_NewObjectFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) nsPluginDOMContextMenuListener::nsPluginDOMContextMenuListener() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsPluginDOMContextMenuListener::~nsPluginDOMContextMenuListener() @@ -2096,7 +2096,7 @@ nsresult nsPluginDOMContextMenuListener::Destroy(nsObjectFrame *aFrame) nsPluginInstanceOwner::nsPluginInstanceOwner() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); memset(&mPluginWindow, 0, sizeof(mPluginWindow)); mInstance = nsnull; diff --git a/layout/generic/nsSelection.cpp b/layout/generic/nsSelection.cpp index 8e8560137fcb..227c7fe07943 100644 --- a/layout/generic/nsSelection.cpp +++ b/layout/generic/nsSelection.cpp @@ -810,7 +810,7 @@ IsValidSelectionPoint(nsSelection *aFrameSel, nsIContent *aContent) nsSelectionIterator::nsSelectionIterator(nsTypedSelection *aList) :mIndex(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (!aList) { NS_NOTREACHED("nsSelection"); @@ -967,7 +967,7 @@ nsSelectionIterator::QueryInterface(REFNSIID aIID, void** aInstancePtr) nsSelection::nsSelection() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); PRInt32 i; for (i = 0;iAddSheet(this); @@ -3288,7 +3288,7 @@ CSSRuleProcessor::CSSRuleProcessor(void) : mSheets(nsnull), mRuleCascades(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } static PRBool diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp index 807d10f2a05e..145b9c45c5a3 100644 --- a/layout/style/nsComputedDOMStyle.cpp +++ b/layout/style/nsComputedDOMStyle.cpp @@ -295,7 +295,7 @@ NS_NewComputedDOMStyle(nsIComputedDOMStyle** aComputedStyle) nsComputedDOMStyle::nsComputedDOMStyle() : mPresShellWeak(nsnull), mT2P(0.0f) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/layout/style/nsDOMCSSDeclaration.cpp b/layout/style/nsDOMCSSDeclaration.cpp index 3670837067bf..83d93ddccc9d 100644 --- a/layout/style/nsDOMCSSDeclaration.cpp +++ b/layout/style/nsDOMCSSDeclaration.cpp @@ -50,7 +50,7 @@ nsDOMCSSDeclaration::nsDOMCSSDeclaration() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDOMCSSDeclaration::~nsDOMCSSDeclaration() diff --git a/layout/style/nsDOMCSSRGBColor.cpp b/layout/style/nsDOMCSSRGBColor.cpp index cd049bf3892c..78fcd6e7daea 100644 --- a/layout/style/nsDOMCSSRGBColor.cpp +++ b/layout/style/nsDOMCSSRGBColor.cpp @@ -48,7 +48,7 @@ nsDOMCSSRGBColor::nsDOMCSSRGBColor(nsIDOMCSSPrimitiveValue* aRed, nsIDOMCSSPrimitiveValue* aBlue) : mRed(aRed), mGreen(aGreen), mBlue(aBlue) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDOMCSSRGBColor::~nsDOMCSSRGBColor(void) diff --git a/layout/style/nsDOMCSSRect.cpp b/layout/style/nsDOMCSSRect.cpp index 139077e18921..2dfc6197ec50 100644 --- a/layout/style/nsDOMCSSRect.cpp +++ b/layout/style/nsDOMCSSRect.cpp @@ -48,7 +48,7 @@ nsDOMCSSRect::nsDOMCSSRect(nsIDOMCSSPrimitiveValue* aTop, nsIDOMCSSPrimitiveValue* aLeft) : mTop(aTop), mRight(aRight), mBottom(aBottom), mLeft(aLeft) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDOMCSSRect::~nsDOMCSSRect(void) diff --git a/layout/style/nsDOMCSSValueList.cpp b/layout/style/nsDOMCSSValueList.cpp index 6cbf32e177f4..25699ec44e3f 100644 --- a/layout/style/nsDOMCSSValueList.cpp +++ b/layout/style/nsDOMCSSValueList.cpp @@ -44,7 +44,7 @@ nsDOMCSSValueList::nsDOMCSSValueList(PRBool aCommaDelimited, PRBool aReadonly) : mCommaDelimited(aCommaDelimited), mReadonly(aReadonly) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDOMCSSValueList::~nsDOMCSSValueList() diff --git a/layout/style/nsHTMLCSSStyleSheet.cpp b/layout/style/nsHTMLCSSStyleSheet.cpp index 0ef67b179e2f..fe941cb29ce3 100644 --- a/layout/style/nsHTMLCSSStyleSheet.cpp +++ b/layout/style/nsHTMLCSSStyleSheet.cpp @@ -84,7 +84,7 @@ public: CSSFirstLineRule::CSSFirstLineRule(nsIHTMLCSSStyleSheet* aSheet) : mSheet(aSheet) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } CSSFirstLineRule::~CSSFirstLineRule() diff --git a/layout/style/nsHTMLStyleSheet.cpp b/layout/style/nsHTMLStyleSheet.cpp index c4b6ed6fb7d1..4ca2a9ad92cf 100644 --- a/layout/style/nsHTMLStyleSheet.cpp +++ b/layout/style/nsHTMLStyleSheet.cpp @@ -110,7 +110,7 @@ protected: HTMLColorRule::HTMLColorRule(nsIHTMLStyleSheet* aSheet) : mSheet(aSheet) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } HTMLColorRule::~HTMLColorRule() @@ -298,7 +298,7 @@ public: GenericTableRule::GenericTableRule(nsIHTMLStyleSheet* aSheet) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mSheet = aSheet; } @@ -865,7 +865,7 @@ HTMLStyleSheetImpl::HTMLStyleSheetImpl(void) mActiveRule(nsnull), mDocumentColorRule(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mMappedAttrTable.ops = nsnull; } diff --git a/layout/style/nsROCSSPrimitiveValue.cpp b/layout/style/nsROCSSPrimitiveValue.cpp index a73c83e2caad..4d328f46b68f 100644 --- a/layout/style/nsROCSSPrimitiveValue.cpp +++ b/layout/style/nsROCSSPrimitiveValue.cpp @@ -49,7 +49,7 @@ nsROCSSPrimitiveValue::nsROCSSPrimitiveValue(float aT2P) : mType(CSS_PX), mT2P(aT2P) { mValue.mTwips = 0; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/layout/style/nsStyleSet.cpp b/layout/style/nsStyleSet.cpp index 98792c33c7d2..4e32006c51a9 100644 --- a/layout/style/nsStyleSet.cpp +++ b/layout/style/nsStyleSet.cpp @@ -393,7 +393,7 @@ StyleSetImpl::StyleSetImpl() ,mTimerEnabled(PR_FALSE) #endif { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (gInstances++ == 0) { static const char kQuirk_href[] = "resource:/res/quirk.css"; diff --git a/layout/xul/base/src/nsListBoxBodyFrame.cpp b/layout/xul/base/src/nsListBoxBodyFrame.cpp index 31d4fbfafe66..6c1cbb195972 100644 --- a/layout/xul/base/src/nsListBoxBodyFrame.cpp +++ b/layout/xul/base/src/nsListBoxBodyFrame.cpp @@ -115,7 +115,7 @@ public: nsListScrollSmoother::nsListScrollSmoother(nsListBoxBodyFrame* aOuter) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mDelta = 0; mOuter = aOuter; } diff --git a/layout/xul/base/src/nsMenuBarListener.cpp b/layout/xul/base/src/nsMenuBarListener.cpp index 42e25eda6695..40e40d4431a6 100644 --- a/layout/xul/base/src/nsMenuBarListener.cpp +++ b/layout/xul/base/src/nsMenuBarListener.cpp @@ -84,7 +84,7 @@ PRBool nsMenuBarListener::mAccessKeyFocuses = PR_FALSE; nsMenuBarListener::nsMenuBarListener(nsMenuBarFrame* aMenuBar) :mAccessKeyDown(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mMenuBarFrame = aMenuBar; } diff --git a/layout/xul/base/src/nsMenuDismissalListener.cpp b/layout/xul/base/src/nsMenuDismissalListener.cpp index 63d3e5faf490..04d8a6f11cfd 100644 --- a/layout/xul/base/src/nsMenuDismissalListener.cpp +++ b/layout/xul/base/src/nsMenuDismissalListener.cpp @@ -56,7 +56,7 @@ NS_IMPL_QUERY_INTERFACE3(nsMenuDismissalListener, nsIDOMMouseListener, nsIMenuRo nsMenuDismissalListener::nsMenuDismissalListener() : mEnabled(PR_TRUE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mMenuParent = nsnull; } diff --git a/layout/xul/base/src/nsMenuListener.cpp b/layout/xul/base/src/nsMenuListener.cpp index 48b7271f1b7b..13e07b403f66 100644 --- a/layout/xul/base/src/nsMenuListener.cpp +++ b/layout/xul/base/src/nsMenuListener.cpp @@ -78,7 +78,7 @@ NS_IMPL_QUERY_INTERFACE3(nsMenuListener, nsIDOMKeyListener, nsIDOMFocusListener, nsMenuListener::nsMenuListener(nsIMenuParent* aMenuParent) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mMenuParent = aMenuParent; } diff --git a/layout/xul/base/src/nsRepeatService.cpp b/layout/xul/base/src/nsRepeatService.cpp index 71730f7c32b3..71e254941bc4 100644 --- a/layout/xul/base/src/nsRepeatService.cpp +++ b/layout/xul/base/src/nsRepeatService.cpp @@ -58,7 +58,7 @@ nsRepeatService* nsRepeatService::gInstance = nsnull; nsRepeatService::nsRepeatService() : mFirstCall(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsRepeatService::~nsRepeatService() diff --git a/layout/xul/base/src/nsSplitterFrame.cpp b/layout/xul/base/src/nsSplitterFrame.cpp index b63fca39ae90..dd491e545523 100644 --- a/layout/xul/base/src/nsSplitterFrame.cpp +++ b/layout/xul/base/src/nsSplitterFrame.cpp @@ -101,7 +101,7 @@ public: nsSplitterFrameInner(nsSplitterFrame* aSplitter) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mOuter = aSplitter; mPressed = PR_FALSE; } diff --git a/layout/xul/base/src/nsXULTooltipListener.cpp b/layout/xul/base/src/nsXULTooltipListener.cpp index 2174edf42464..db6e90a7d59e 100644 --- a/layout/xul/base/src/nsXULTooltipListener.cpp +++ b/layout/xul/base/src/nsXULTooltipListener.cpp @@ -66,7 +66,7 @@ nsXULTooltipListener::nsXULTooltipListener() mIsSourceTree(PR_FALSE), mNeedTitletip(PR_FALSE), mLastTreeRow(-1) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsXULTooltipListener::~nsXULTooltipListener() diff --git a/mailnews/absync/src/nsAbSyncPostEngine.cpp b/mailnews/absync/src/nsAbSyncPostEngine.cpp index fe49d029e103..3b5eaa9f6929 100644 --- a/mailnews/absync/src/nsAbSyncPostEngine.cpp +++ b/mailnews/absync/src/nsAbSyncPostEngine.cpp @@ -104,7 +104,7 @@ NS_INTERFACE_MAP_END nsAbSyncPostEngine::nsAbSyncPostEngine() { /* the following macro is used to initialize the ref counting data */ - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // Init member variables... mTotalWritten = 0; diff --git a/mailnews/addrbook/src/nsAbAutoCompleteSession.h b/mailnews/addrbook/src/nsAbAutoCompleteSession.h index 0da77adb524c..af83f40edd41 100644 --- a/mailnews/addrbook/src/nsAbAutoCompleteSession.h +++ b/mailnews/addrbook/src/nsAbAutoCompleteSession.h @@ -154,7 +154,7 @@ public: PRBool isMailList, nsAbAutoCompleteSession::MatchType type) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mNickName = nsCRT::strdup(nickName ? nickName : NS_STATIC_CAST(const PRUnichar*, NS_LITERAL_STRING("").get())); mDisplayName = nsCRT::strdup(displayName ? displayName : NS_STATIC_CAST(const PRUnichar*, NS_LITERAL_STRING("").get())); mFirstName = nsCRT::strdup(firstName ? firstName : NS_STATIC_CAST(const PRUnichar*, NS_LITERAL_STRING("").get())); diff --git a/mailnews/base/search/src/nsMsgFilter.cpp b/mailnews/base/search/src/nsMsgFilter.cpp index 6c6ead4af9ce..2a2082656ba1 100644 --- a/mailnews/base/search/src/nsMsgFilter.cpp +++ b/mailnews/base/search/src/nsMsgFilter.cpp @@ -55,6 +55,7 @@ #include "nsEscape.h" #include "nsMsgUtf7Utils.h" #include "nsIImportService.h" +#include "nsISupportsObsolete.h" static const char *kImapPrefix = "//imap:"; @@ -71,7 +72,7 @@ nsMsgFilter::nsMsgFilter(): m_temporary(PR_FALSE), m_filterList(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_NewISupportsArray(getter_AddRefs(m_termList)); } diff --git a/mailnews/base/search/src/nsMsgFilterList.cpp b/mailnews/base/search/src/nsMsgFilterList.cpp index bf0f5d951c18..c87e42f24a9b 100644 --- a/mailnews/base/search/src/nsMsgFilterList.cpp +++ b/mailnews/base/search/src/nsMsgFilterList.cpp @@ -52,6 +52,7 @@ #include "nsIImportService.h" #include "nsMsgBaseCID.h" #include "nsIMsgFilterService.h" +#include "nsISupportsObsolete.h" static NS_DEFINE_CID(kMsgFilterServiceCID, NS_MSGFILTERSERVICE_CID); @@ -72,7 +73,7 @@ nsMsgFilterList::nsMsgFilterList() : m_loggingEnabled = PR_FALSE; m_curFilter = nsnull; m_arbitraryHeaders.SetLength(0); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMPL_ADDREF(nsMsgFilterList) diff --git a/mailnews/base/search/src/nsMsgFilterService.cpp b/mailnews/base/search/src/nsMsgFilterService.cpp index 4fccfd26ea08..eaaaf677a0a6 100644 --- a/mailnews/base/search/src/nsMsgFilterService.cpp +++ b/mailnews/base/search/src/nsMsgFilterService.cpp @@ -54,7 +54,7 @@ NS_IMPL_ISUPPORTS1(nsMsgFilterService, nsIMsgFilterService) nsMsgFilterService::nsMsgFilterService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMsgFilterService::~nsMsgFilterService() diff --git a/mailnews/base/search/src/nsMsgSearchTerm.cpp b/mailnews/base/search/src/nsMsgSearchTerm.cpp index c0a9ebbe7851..166afbba44b1 100644 --- a/mailnews/base/search/src/nsMsgSearchTerm.cpp +++ b/mailnews/base/search/src/nsMsgSearchTerm.cpp @@ -58,7 +58,7 @@ #include "nsTime.h" #include "nsIPrefBranch.h" #include "nsIPrefService.h" - +#include "nsISupportsObsolete.h" //--------------------------------------------------------------------------- // nsMsgSearchTerm specifies one criterion, e.g. name contains phil @@ -311,7 +311,7 @@ PRInt32 NS_MsgGetStatusValueFromName(char *name) // Needed for DeStream method. nsMsgSearchTerm::nsMsgSearchTerm() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // initialize this to zero m_value.string=nsnull; @@ -327,7 +327,7 @@ nsMsgSearchTerm::nsMsgSearchTerm ( nsMsgSearchBooleanOperator boolOp, const char * arbitraryHeader) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_operator = op; m_attribute = attrib; m_booleanOp = boolOp; @@ -1302,7 +1302,7 @@ nsMsgSearchScopeTerm::nsMsgSearchScopeTerm (nsIMsgSearchSession *session, nsMsgSearchScopeValue attribute, nsIMsgFolder *folder) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_attribute = attribute; m_folder = folder; m_searchServer = PR_TRUE; @@ -1311,7 +1311,7 @@ nsMsgSearchScopeTerm::nsMsgSearchScopeTerm (nsIMsgSearchSession *session, nsMsgSearchScopeTerm::nsMsgSearchScopeTerm () { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_searchServer = PR_TRUE; } diff --git a/mailnews/base/search/src/nsMsgSearchValue.cpp b/mailnews/base/search/src/nsMsgSearchValue.cpp index 59a4c82a3ae2..3a6ab5bd615c 100644 --- a/mailnews/base/search/src/nsMsgSearchValue.cpp +++ b/mailnews/base/search/src/nsMsgSearchValue.cpp @@ -39,6 +39,7 @@ #include "MailNewsTypes.h" #include "nsMsgSearchValue.h" #include "nsReadableUtils.h" +#include "nsISupportsObsolete.h" nsMsgSearchValueImpl::nsMsgSearchValueImpl(nsMsgSearchValue *aInitialValue) { diff --git a/mailnews/base/src/nsCopyMessageStreamListener.cpp b/mailnews/base/src/nsCopyMessageStreamListener.cpp index 5e9acae11092..83b38a2bcb60 100644 --- a/mailnews/base/src/nsCopyMessageStreamListener.cpp +++ b/mailnews/base/src/nsCopyMessageStreamListener.cpp @@ -96,7 +96,7 @@ static nsresult GetMessage(nsIURI *aURL, nsIMsgDBHdr **message) nsCopyMessageStreamListener::nsCopyMessageStreamListener() { /* the following macro is used to initialize the ref counting data */ - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsCopyMessageStreamListener::~nsCopyMessageStreamListener() diff --git a/mailnews/base/src/nsMessenger.cpp b/mailnews/base/src/nsMessenger.cpp index 00b729d1e108..565a5f000e1c 100644 --- a/mailnews/base/src/nsMessenger.cpp +++ b/mailnews/base/src/nsMessenger.cpp @@ -49,6 +49,7 @@ #include "nsReadableUtils.h" #include "nsIFileSpec.h" #include "nsILocalFile.h" +#include "nsISupportsObsolete.h" #ifdef XP_MAC #include "nsIAppleFileDecoder.h" #endif @@ -299,7 +300,7 @@ public: // nsMessenger::nsMessenger() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mScriptObject = nsnull; mWindow = nsnull; mMsgWindow = nsnull; @@ -1445,7 +1446,7 @@ NS_IMPL_ISUPPORTS1(SendLaterListener, nsIMsgSendLaterListener) SendLaterListener::SendLaterListener(nsIMessenger *aMessenger) { m_messenger = getter_AddRefs(NS_GetWeakReference(aMessenger)); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } SendLaterListener::~SendLaterListener() @@ -1570,7 +1571,7 @@ NS_IMETHODIMP nsMessenger::DoPrintPreview() nsSaveMsgListener::nsSaveMsgListener(nsIFileSpec* aSpec, nsMessenger *aMessenger) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (aSpec) m_fileSpec = do_QueryInterface(aSpec); m_messenger = aMessenger; diff --git a/mailnews/base/src/nsMessengerBootstrap.cpp b/mailnews/base/src/nsMessengerBootstrap.cpp index 700a4b82b0aa..daa94222dc3d 100644 --- a/mailnews/base/src/nsMessengerBootstrap.cpp +++ b/mailnews/base/src/nsMessengerBootstrap.cpp @@ -65,7 +65,7 @@ NS_IMPL_QUERY_INTERFACE2(nsMessengerBootstrap, nsICmdLineHandler, nsIMessengerWi nsMessengerBootstrap::nsMessengerBootstrap() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMessengerBootstrap::~nsMessengerBootstrap() diff --git a/mailnews/base/src/nsMessengerMigrator.cpp b/mailnews/base/src/nsMessengerMigrator.cpp index deedbb4d7ced..46ff3b8f0726 100644 --- a/mailnews/base/src/nsMessengerMigrator.cpp +++ b/mailnews/base/src/nsMessengerMigrator.cpp @@ -375,7 +375,7 @@ nsMessengerMigrator::nsMessengerMigrator() : m_haveShutdown(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMessengerMigrator::~nsMessengerMigrator() diff --git a/mailnews/base/src/nsMsgAccount.cpp b/mailnews/base/src/nsMsgAccount.cpp index b26f45d2dba5..8d6379b8b884 100644 --- a/mailnews/base/src/nsMsgAccount.cpp +++ b/mailnews/base/src/nsMsgAccount.cpp @@ -39,7 +39,7 @@ #include "prprf.h" #include "plstr.h" #include "prmem.h" - +#include "nsISupportsObsolete.h" #include "nsIComponentManager.h" #include "nsIServiceManager.h" @@ -66,7 +66,7 @@ nsMsgAccount::nsMsgAccount(): m_defaultIdentity(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMsgAccount::~nsMsgAccount() diff --git a/mailnews/base/src/nsMsgAccountManager.cpp b/mailnews/base/src/nsMsgAccountManager.cpp index 94eeef5b7979..1b67d3165abd 100644 --- a/mailnews/base/src/nsMsgAccountManager.cpp +++ b/mailnews/base/src/nsMsgAccountManager.cpp @@ -152,7 +152,7 @@ nsMsgAccountManager::nsMsgAccountManager() : m_shutdownInProgress(PR_FALSE), m_prefs(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMsgAccountManager::~nsMsgAccountManager() diff --git a/mailnews/base/src/nsMsgBiffManager.cpp b/mailnews/base/src/nsMsgBiffManager.cpp index 8ae3db7d5e4d..8e17cab56ed6 100644 --- a/mailnews/base/src/nsMsgBiffManager.cpp +++ b/mailnews/base/src/nsMsgBiffManager.cpp @@ -55,7 +55,7 @@ void OnBiffTimer(nsITimer *timer, void *aBiffManager) nsMsgBiffManager::nsMsgBiffManager() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mBiffArray = nsnull; mHaveShutdown = PR_FALSE; diff --git a/mailnews/base/src/nsMsgCopyService.cpp b/mailnews/base/src/nsMsgCopyService.cpp index 55c37c9c3c32..5fcc4cc78752 100644 --- a/mailnews/base/src/nsMsgCopyService.cpp +++ b/mailnews/base/src/nsMsgCopyService.cpp @@ -142,7 +142,7 @@ nsCopyRequest::AddNewCopySource(nsIMsgFolder* srcFolder) nsMsgCopyService::nsMsgCopyService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMsgCopyService::~nsMsgCopyService() diff --git a/mailnews/base/src/nsMsgCopyService.h b/mailnews/base/src/nsMsgCopyService.h index 7fb796b54cdd..362d465c287b 100644 --- a/mailnews/base/src/nsMsgCopyService.h +++ b/mailnews/base/src/nsMsgCopyService.h @@ -44,6 +44,7 @@ #include "nsIMsgFolder.h" #include "nsIMsgHdr.h" #include "nsIMsgWindow.h" +#include "nsComObsolete.h" typedef enum _nsCopyRequestType { diff --git a/mailnews/base/src/nsMsgFolderCache.cpp b/mailnews/base/src/nsMsgFolderCache.cpp index 4fe8217edb11..6e44758b06f1 100644 --- a/mailnews/base/src/nsMsgFolderCache.cpp +++ b/mailnews/base/src/nsMsgFolderCache.cpp @@ -59,7 +59,7 @@ nsMsgFolderCache::nsMsgFolderCache() { m_mdbEnv = nsnull; m_mdbStore = nsnull; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_mdbAllFoldersTable = nsnull; } diff --git a/mailnews/base/src/nsMsgFolderCacheElement.cpp b/mailnews/base/src/nsMsgFolderCacheElement.cpp index 0008da006420..08511fb1a051 100644 --- a/mailnews/base/src/nsMsgFolderCacheElement.cpp +++ b/mailnews/base/src/nsMsgFolderCacheElement.cpp @@ -38,13 +38,14 @@ #include "msgCore.h" #include "nsMsgFolderCacheElement.h" #include "prmem.h" +#include "nsISupportsObsolete.h" nsMsgFolderCacheElement::nsMsgFolderCacheElement() { m_mdbRow = nsnull; m_owningCache = nsnull; m_folderKey = nsnull; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMsgFolderCacheElement::~nsMsgFolderCacheElement() diff --git a/mailnews/base/src/nsMsgMailSession.cpp b/mailnews/base/src/nsMsgMailSession.cpp index bbb33a4753b8..0f131e64bbd5 100644 --- a/mailnews/base/src/nsMsgMailSession.cpp +++ b/mailnews/base/src/nsMsgMailSession.cpp @@ -70,7 +70,7 @@ static NS_DEFINE_CID(kMsgAccountManagerCID, NS_MSGACCOUNTMANAGER_CID); nsMsgMailSession::nsMsgMailSession() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/mailnews/base/src/nsMsgNotificationManager.cpp b/mailnews/base/src/nsMsgNotificationManager.cpp index 78761c042e71..dbaffa9a44ca 100644 --- a/mailnews/base/src/nsMsgNotificationManager.cpp +++ b/mailnews/base/src/nsMsgNotificationManager.cpp @@ -81,7 +81,7 @@ nsIAtom * nsMsgNotificationManager::kNumNewBiffMessagesAtom = nsnull; nsMsgNotificationManager::nsMsgNotificationManager() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/mailnews/base/src/nsMsgOfflineManager.cpp b/mailnews/base/src/nsMsgOfflineManager.cpp index 507a454b0262..56b97e3c4649 100644 --- a/mailnews/base/src/nsMsgOfflineManager.cpp +++ b/mailnews/base/src/nsMsgOfflineManager.cpp @@ -78,7 +78,7 @@ nsMsgOfflineManager::nsMsgOfflineManager() : m_curState(eNoState), m_curOperation(eNoOp) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMsgOfflineManager::~nsMsgOfflineManager() diff --git a/mailnews/base/src/nsMsgPrintEngine.cpp b/mailnews/base/src/nsMsgPrintEngine.cpp index 5b209b098657..46876f858460 100644 --- a/mailnews/base/src/nsMsgPrintEngine.cpp +++ b/mailnews/base/src/nsMsgPrintEngine.cpp @@ -64,7 +64,7 @@ static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); nsMsgPrintEngine::nsMsgPrintEngine() { mCurrentlyPrintingURI = -1; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/mailnews/base/src/nsMsgRDFDataSource.cpp b/mailnews/base/src/nsMsgRDFDataSource.cpp index 216cb9ed4735..46116b43fccc 100644 --- a/mailnews/base/src/nsMsgRDFDataSource.cpp +++ b/mailnews/base/src/nsMsgRDFDataSource.cpp @@ -51,7 +51,7 @@ nsMsgRDFDataSource::nsMsgRDFDataSource(): mInitialized(PR_FALSE), mRDFService(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // do one-time initialization here diff --git a/mailnews/base/src/nsMsgServiceProvider.cpp b/mailnews/base/src/nsMsgServiceProvider.cpp index fe0a9d439946..175036f7048b 100644 --- a/mailnews/base/src/nsMsgServiceProvider.cpp +++ b/mailnews/base/src/nsMsgServiceProvider.cpp @@ -57,7 +57,7 @@ static NS_DEFINE_CID(kRDFXMLDataSourceCID, NS_RDFXMLDATASOURCE_CID); nsMsgServiceProviderService::nsMsgServiceProviderService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMsgServiceProviderService::~nsMsgServiceProviderService() diff --git a/mailnews/base/src/nsMsgStatusFeedback.cpp b/mailnews/base/src/nsMsgStatusFeedback.cpp index dbccbbf29ffe..49958ac4cc24 100644 --- a/mailnews/base/src/nsMsgStatusFeedback.cpp +++ b/mailnews/base/src/nsMsgStatusFeedback.cpp @@ -60,7 +60,7 @@ nsMsgStatusFeedback::nsMsgStatusFeedback() : m_lastPercent(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); LL_I2L(m_lastProgressTime, 0); nsresult rv; diff --git a/mailnews/base/src/nsMsgWindow.cpp b/mailnews/base/src/nsMsgWindow.cpp index fd8c2cb4efc6..bf4648c45010 100644 --- a/mailnews/base/src/nsMsgWindow.cpp +++ b/mailnews/base/src/nsMsgWindow.cpp @@ -66,7 +66,7 @@ #include "plbase64.h" #include "nsMsgI18N.h" #include "nsIWebNavigation.h" - +#include "nsISupportsObsolete.h" // XXX Remove #include "nsIWebShell.h" diff --git a/mailnews/base/src/nsSubscribableServer.cpp b/mailnews/base/src/nsSubscribableServer.cpp index 817a5f1c4196..dd531560dafe 100644 --- a/mailnews/base/src/nsSubscribableServer.cpp +++ b/mailnews/base/src/nsSubscribableServer.cpp @@ -63,7 +63,7 @@ MOZ_DECL_CTOR_COUNTER(nsSubscribableServer) nsSubscribableServer::nsSubscribableServer(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mDelimiter = '.'; mShowFullName = PR_TRUE; mTreeRoot = nsnull; diff --git a/mailnews/base/src/nsSubscribeDataSource.cpp b/mailnews/base/src/nsSubscribeDataSource.cpp index 334eb305d0b5..69d5d1dcbd2c 100644 --- a/mailnews/base/src/nsSubscribeDataSource.cpp +++ b/mailnews/base/src/nsSubscribeDataSource.cpp @@ -62,7 +62,7 @@ typedef struct _nsSubscribeNotification { nsSubscribeDataSource::nsSubscribeDataSource() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsSubscribeDataSource::~nsSubscribeDataSource() diff --git a/mailnews/base/src/nsUrlListenerManager.cpp b/mailnews/base/src/nsUrlListenerManager.cpp index 1538bd849af9..8a232f8b0fd7 100644 --- a/mailnews/base/src/nsUrlListenerManager.cpp +++ b/mailnews/base/src/nsUrlListenerManager.cpp @@ -42,7 +42,7 @@ nsUrlListenerManager::nsUrlListenerManager() : m_listeners(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // create a new isupports array to store our listeners in... NS_NewISupportsArray(getter_AddRefs(m_listeners)); } diff --git a/mailnews/base/util/nsMsgFolder.cpp b/mailnews/base/util/nsMsgFolder.cpp index 5b57f02791b1..8743767c1a73 100644 --- a/mailnews/base/util/nsMsgFolder.cpp +++ b/mailnews/base/util/nsMsgFolder.cpp @@ -129,7 +129,7 @@ nsMsgFolder::nsMsgFolder(void) mDeleteIsMoveToTrash(PR_TRUE), mBaseMessageURI(nsnull) { -// NS_INIT_REFCNT(); done by superclass +// NS_INIT_ISUPPORTS(); done by superclass mSemaphoreHolder = NULL; diff --git a/mailnews/base/util/nsMsgIdentity.cpp b/mailnews/base/util/nsMsgIdentity.cpp index f2e287a67dcc..5cd04e05ace5 100644 --- a/mailnews/base/util/nsMsgIdentity.cpp +++ b/mailnews/base/util/nsMsgIdentity.cpp @@ -53,6 +53,7 @@ #include "nsMsgFolderFlags.h" #include "nsIMsgFolder.h" #include "prprf.h" +#include "nsISupportsObsolete.h" static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); @@ -66,7 +67,7 @@ nsMsgIdentity::nsMsgIdentity(): m_identityKey(0), m_prefs(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMsgIdentity::~nsMsgIdentity() diff --git a/mailnews/base/util/nsMsgIncomingServer.cpp b/mailnews/base/util/nsMsgIncomingServer.cpp index 0200a47dd6e5..4e6ccc185ca8 100644 --- a/mailnews/base/util/nsMsgIncomingServer.cpp +++ b/mailnews/base/util/nsMsgIncomingServer.cpp @@ -48,6 +48,7 @@ #include "nsXPIDLString.h" #include "nsReadableUtils.h" #include "nsEscape.h" +#include "nsISupportsObsolete.h" #include "nsMsgBaseCID.h" #include "nsMsgDBCID.h" @@ -96,7 +97,7 @@ nsMsgIncomingServer::nsMsgIncomingServer(): m_displayStartupPage(PR_TRUE), mPerformingBiff(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMsgIncomingServer::~nsMsgIncomingServer() diff --git a/mailnews/base/util/nsMsgMailNewsUrl.cpp b/mailnews/base/util/nsMsgMailNewsUrl.cpp index c15a266fcd59..018aa1299a7c 100644 --- a/mailnews/base/util/nsMsgMailNewsUrl.cpp +++ b/mailnews/base/util/nsMsgMailNewsUrl.cpp @@ -66,7 +66,7 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); nsMsgMailNewsUrl::nsMsgMailNewsUrl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // nsIURI specific state m_errorMessage = nsnull; @@ -837,7 +837,7 @@ nsMsgSaveAsListener::nsMsgSaveAsListener(nsIFileSpec *aFileSpec, PRBool addDummy m_writtenData = PR_FALSE; m_addDummyEnvelope = addDummyEnvelope; m_leftOver = 0; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMsgSaveAsListener::~nsMsgSaveAsListener() diff --git a/mailnews/base/util/nsMsgProtocol.cpp b/mailnews/base/util/nsMsgProtocol.cpp index a35b4f2bda02..0c3c05ea5d64 100644 --- a/mailnews/base/util/nsMsgProtocol.cpp +++ b/mailnews/base/util/nsMsgProtocol.cpp @@ -81,7 +81,7 @@ static PRUnichar *FormatStringWithHostNameByID(PRInt32 stringID, nsIMsgMailNewsU nsMsgProtocol::nsMsgProtocol(nsIURI * aURL) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_flags = 0; m_startPosition = 0; m_readCount = 0; @@ -785,7 +785,7 @@ class nsMsgProtocolStreamProvider : public nsIStreamProvider public: NS_DECL_ISUPPORTS - nsMsgProtocolStreamProvider() { NS_INIT_REFCNT(); } + nsMsgProtocolStreamProvider() { NS_INIT_ISUPPORTS(); } virtual ~nsMsgProtocolStreamProvider() {} void Init(nsMsgAsyncWriteProtocol *aProtInstance, nsIInputStream *aInputStream) { mMsgProtocol = aProtInstance; mInStream = aInputStream;} @@ -849,7 +849,7 @@ public: NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER - nsMsgFilePostHelper() { NS_INIT_REFCNT(); mSuspendedPostFileRead = PR_FALSE;} + nsMsgFilePostHelper() { NS_INIT_ISUPPORTS(); mSuspendedPostFileRead = PR_FALSE;} nsresult Init(nsIOutputStream * aOutStream, nsMsgAsyncWriteProtocol * aProtInstance, nsIFile *aFileToPost); virtual ~nsMsgFilePostHelper() {} nsCOMPtr mPostFileRequest; diff --git a/mailnews/base/util/nsMsgTxn.cpp b/mailnews/base/util/nsMsgTxn.cpp index 6ff91eb94f14..a31c1523bf23 100644 --- a/mailnews/base/util/nsMsgTxn.cpp +++ b/mailnews/base/util/nsMsgTxn.cpp @@ -46,7 +46,7 @@ NS_IMPL_THREADSAFE_QUERY_INTERFACE1(nsMsgTxn, nsITransaction) // note that aEditor is not refcounted nsMsgTxn::nsMsgTxn() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_txnType = 0; } diff --git a/mailnews/compose/src/nsMsgCompFields.cpp b/mailnews/compose/src/nsMsgCompFields.cpp index 402fca49aacd..81fdab2005f9 100644 --- a/mailnews/compose/src/nsMsgCompFields.cpp +++ b/mailnews/compose/src/nsMsgCompFields.cpp @@ -83,7 +83,7 @@ nsMsgCompFields::nsMsgCompFields() m_internalCharSet.Assign(msgCompHeaderInternalCharset()); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMsgCompFields::~nsMsgCompFields() diff --git a/mailnews/compose/src/nsMsgCompUtils.h b/mailnews/compose/src/nsMsgCompUtils.h index e04746d632e1..ae954845e0d9 100644 --- a/mailnews/compose/src/nsMsgCompUtils.h +++ b/mailnews/compose/src/nsMsgCompUtils.h @@ -44,6 +44,7 @@ #include "nsMsgCompFields.h" #include "nsIMsgSend.h" #include "nsIMsgCompUtils.h" +#include "nsComObsolete.h" class nsIPrompt; diff --git a/mailnews/compose/src/nsMsgCompose.cpp b/mailnews/compose/src/nsMsgCompose.cpp index 03ae17a99933..28925d0870a7 100644 --- a/mailnews/compose/src/nsMsgCompose.cpp +++ b/mailnews/compose/src/nsMsgCompose.cpp @@ -237,7 +237,7 @@ nsMsgCompose::nsMsgCompose() printf("CREATE nsMsgCompose: %x\n", this); #endif - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mQuotingToFollow = PR_FALSE; mWhatHolder = 1; @@ -1859,7 +1859,7 @@ QuotingOutputStreamListener::QuotingOutputStreamListener(const char * originalMs } } - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } /** @@ -2524,7 +2524,7 @@ nsMsgComposeSendListener::nsMsgComposeSendListener(void) #endif mDeliverMode = 0; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMsgComposeSendListener::~nsMsgComposeSendListener(void) @@ -3027,7 +3027,7 @@ NS_IMPL_ISUPPORTS1(nsMsgDocumentStateListener, nsIDocumentStateListener) nsMsgDocumentStateListener::nsMsgDocumentStateListener(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMsgDocumentStateListener::~nsMsgDocumentStateListener(void) diff --git a/mailnews/compose/src/nsMsgComposeContentHandler.cpp b/mailnews/compose/src/nsMsgComposeContentHandler.cpp index 08077f246973..4850c8129532 100644 --- a/mailnews/compose/src/nsMsgComposeContentHandler.cpp +++ b/mailnews/compose/src/nsMsgComposeContentHandler.cpp @@ -46,7 +46,7 @@ static NS_DEFINE_CID(kMsgComposeServiceCID, NS_MSGCOMPOSESERVICE_CID); nsMsgComposeContentHandler::nsMsgComposeContentHandler() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } /* the following macro actually implement addref, release and query interface for our component. */ diff --git a/mailnews/compose/src/nsMsgComposeParams.cpp b/mailnews/compose/src/nsMsgComposeParams.cpp index 34d8e53a69c3..b3aa3edc9b20 100644 --- a/mailnews/compose/src/nsMsgComposeParams.cpp +++ b/mailnews/compose/src/nsMsgComposeParams.cpp @@ -44,7 +44,7 @@ nsMsgComposeParams::nsMsgComposeParams() : mFormat(nsIMsgCompFormat::Default), mBodyIsLink(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } /* the following macro actually implement addref, release and query interface for our component. */ diff --git a/mailnews/compose/src/nsMsgComposeService.cpp b/mailnews/compose/src/nsMsgComposeService.cpp index 5859785801d8..86b86fa86584 100644 --- a/mailnews/compose/src/nsMsgComposeService.cpp +++ b/mailnews/compose/src/nsMsgComposeService.cpp @@ -137,7 +137,7 @@ nsMsgComposeService::nsMsgComposeService() _just_to_be_sure_we_create_only_one_compose_service_ = PR_TRUE; #endif - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // Defaulting the value of mLogComposePerformance to FALSE to prevent logging. mLogComposePerformance = PR_FALSE; diff --git a/mailnews/compose/src/nsMsgCopy.cpp b/mailnews/compose/src/nsMsgCopy.cpp index 060384182196..48e8c79744fe 100644 --- a/mailnews/compose/src/nsMsgCopy.cpp +++ b/mailnews/compose/src/nsMsgCopy.cpp @@ -82,7 +82,7 @@ CopyListener::CopyListener(void) { mCopyObject = nsnull; mCopyInProgress = PR_FALSE; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } CopyListener::~CopyListener(void) @@ -183,7 +183,7 @@ nsMsgCopy::nsMsgCopy() mMode = nsIMsgSend::nsMsgDeliverNow; mSavePref = nsnull; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMsgCopy::~nsMsgCopy() diff --git a/mailnews/compose/src/nsMsgCreate.cpp b/mailnews/compose/src/nsMsgCreate.cpp index d70d0ec828a7..168f3a3872ab 100644 --- a/mailnews/compose/src/nsMsgCreate.cpp +++ b/mailnews/compose/src/nsMsgCreate.cpp @@ -76,7 +76,7 @@ static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); // nsMsgDraft::nsMsgDraft() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mURI = nsnull; mMessageService = nsnull; diff --git a/mailnews/compose/src/nsMsgDeliveryListener.cpp b/mailnews/compose/src/nsMsgDeliveryListener.cpp index bd8cbaa23645..3e7ed3e9f936 100644 --- a/mailnews/compose/src/nsMsgDeliveryListener.cpp +++ b/mailnews/compose/src/nsMsgDeliveryListener.cpp @@ -114,7 +114,7 @@ nsMsgDeliveryListener::nsMsgDeliveryListener(nsMsgDeliveryCompletionCallback cal mMsgSendObj = nsnull; mMsgSendLaterObj = nsnull; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMsgDeliveryListener::~nsMsgDeliveryListener() diff --git a/mailnews/compose/src/nsMsgQuote.cpp b/mailnews/compose/src/nsMsgQuote.cpp index 8bba54fae6f0..c3b88a3a847f 100644 --- a/mailnews/compose/src/nsMsgQuote.cpp +++ b/mailnews/compose/src/nsMsgQuote.cpp @@ -80,7 +80,7 @@ NS_INTERFACE_MAP_END nsMsgQuoteListener::nsMsgQuoteListener() { /* the following macro is used to initialize the ref counting data */ - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMsgQuoteListener::~nsMsgQuoteListener() @@ -141,7 +141,7 @@ nsresult nsMsgQuoteListener::OnHeadersReady(nsIMimeHeaders * headers) // nsMsgQuote::nsMsgQuote() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mQuoteHeaders = PR_FALSE; mQuoteListener = nsnull; } diff --git a/mailnews/compose/src/nsMsgRecipientArray.cpp b/mailnews/compose/src/nsMsgRecipientArray.cpp index e9c5195ea448..e2a40ea9d7c4 100644 --- a/mailnews/compose/src/nsMsgRecipientArray.cpp +++ b/mailnews/compose/src/nsMsgRecipientArray.cpp @@ -41,7 +41,7 @@ nsMsgRecipientArray::nsMsgRecipientArray() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_array = new nsStringArray; } diff --git a/mailnews/compose/src/nsMsgSend.cpp b/mailnews/compose/src/nsMsgSend.cpp index 291c31a40096..fa998cf0acaa 100644 --- a/mailnews/compose/src/nsMsgSend.cpp +++ b/mailnews/compose/src/nsMsgSend.cpp @@ -221,7 +221,7 @@ nsMsgComposeAndSend::nsMsgComposeAndSend() : NS_NEWXPCOM(mSendReport, nsMsgSendReport); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMsgComposeAndSend::~nsMsgComposeAndSend() diff --git a/mailnews/compose/src/nsMsgSendLater.cpp b/mailnews/compose/src/nsMsgSendLater.cpp index 5b65f3bd1248..6305db520541 100644 --- a/mailnews/compose/src/nsMsgSendLater.cpp +++ b/mailnews/compose/src/nsMsgSendLater.cpp @@ -118,7 +118,7 @@ nsMsgSendLater::nsMsgSendLater() NS_NewISupportsArray(getter_AddRefs(mMessagesToSend)); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMsgSendLater::~nsMsgSendLater() @@ -332,7 +332,7 @@ NS_IMPL_ISUPPORTS2(SendOperationListener, nsIMsgSendListener, SendOperationListener::SendOperationListener(void) { mSendLater = nsnull; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } SendOperationListener::~SendOperationListener(void) diff --git a/mailnews/compose/src/nsSmtpDelegateFactory.cpp b/mailnews/compose/src/nsSmtpDelegateFactory.cpp index e5f69cb6e9c6..526aa462b4f1 100644 --- a/mailnews/compose/src/nsSmtpDelegateFactory.cpp +++ b/mailnews/compose/src/nsSmtpDelegateFactory.cpp @@ -59,7 +59,7 @@ NS_IMPL_ISUPPORTS1(nsSmtpDelegateFactory, nsIRDFDelegateFactory) nsSmtpDelegateFactory::nsSmtpDelegateFactory() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsSmtpDelegateFactory::~nsSmtpDelegateFactory() diff --git a/mailnews/compose/src/nsSmtpServer.cpp b/mailnews/compose/src/nsSmtpServer.cpp index d25d2dcdc731..88470e305534 100644 --- a/mailnews/compose/src/nsSmtpServer.cpp +++ b/mailnews/compose/src/nsSmtpServer.cpp @@ -58,7 +58,7 @@ NS_INTERFACE_MAP_END nsSmtpServer::nsSmtpServer() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsSmtpServer::~nsSmtpServer() diff --git a/mailnews/compose/src/nsSmtpService.cpp b/mailnews/compose/src/nsSmtpService.cpp index afef76069bc9..4eb787c83e63 100644 --- a/mailnews/compose/src/nsSmtpService.cpp +++ b/mailnews/compose/src/nsSmtpService.cpp @@ -159,7 +159,7 @@ nsresult NS_MsgLoadSmtpUrl(nsIURI * aUrl, nsISupports * aConsumer, nsIRequest ** nsSmtpService::nsSmtpService() : mSmtpServersLoaded(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_NewISupportsArray(getter_AddRefs(mSmtpServers)); } diff --git a/mailnews/compose/src/nsSmtpUrl.cpp b/mailnews/compose/src/nsSmtpUrl.cpp index 37abf500adac..bf3cf5ed63a7 100644 --- a/mailnews/compose/src/nsSmtpUrl.cpp +++ b/mailnews/compose/src/nsSmtpUrl.cpp @@ -46,6 +46,7 @@ #include "nsEscape.h" #include "nsIMimeConverter.h" #include "nsMsgMimeCID.h" +#include "nsISupportsObsolete.h" static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID); diff --git a/mailnews/compose/src/nsURLFetcher.cpp b/mailnews/compose/src/nsURLFetcher.cpp index ecf6c3f78e9a..f7f67900314d 100644 --- a/mailnews/compose/src/nsURLFetcher.cpp +++ b/mailnews/compose/src/nsURLFetcher.cpp @@ -73,7 +73,7 @@ nsURLFetcher::nsURLFetcher() printf("CREATE nsURLFetcher: %x\n", this); #endif /* the following macro is used to initialize the ref counting data */ - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // Init member variables... mTotalWritten = 0; diff --git a/mailnews/db/msgdb/src/nsDBFolderInfo.cpp b/mailnews/db/msgdb/src/nsDBFolderInfo.cpp index 0bb53bb2b9b1..a3d180c639a0 100644 --- a/mailnews/db/msgdb/src/nsDBFolderInfo.cpp +++ b/mailnews/db/msgdb/src/nsDBFolderInfo.cpp @@ -48,6 +48,7 @@ #include "nsIObserverService.h" #include "nsIMsgDBView.h" #include "nsReadableUtils.h" +#include "nsISupportsObsolete.h" static const char *kDBFolderInfoScope = "ns:msg:db:row:scope:dbfolderinfo:all"; static const char *kDBFolderInfoTableKind = "ns:msg:db:table:kind:dbfolderinfo"; @@ -170,7 +171,7 @@ nsDBFolderInfo::nsDBFolderInfo(nsMsgDatabase *mdb) m_numVisibleMessagesColumnToken(0), m_expiredMarkColumnToken(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_mdbTable = NULL; m_mdbRow = NULL; m_version = 1; // for upgrading... diff --git a/mailnews/db/msgdb/src/nsMailDatabase.cpp b/mailnews/db/msgdb/src/nsMailDatabase.cpp index 85901c51c333..2bd565ef7731 100644 --- a/mailnews/db/msgdb/src/nsMailDatabase.cpp +++ b/mailnews/db/msgdb/src/nsMailDatabase.cpp @@ -842,7 +842,7 @@ protected: nsMsgOfflineOpEnumerator::nsMsgOfflineOpEnumerator(nsMailDatabase* db) : mDB(db), mRowCursor(nsnull), mDone(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF(mDB); mNextPrefetched = PR_FALSE; } diff --git a/mailnews/db/msgdb/src/nsMsgDatabase.cpp b/mailnews/db/msgdb/src/nsMsgDatabase.cpp index 5e803571fec9..fb8233f7b970 100644 --- a/mailnews/db/msgdb/src/nsMsgDatabase.cpp +++ b/mailnews/db/msgdb/src/nsMsgDatabase.cpp @@ -743,7 +743,7 @@ nsMsgDatabase::nsMsgDatabase() m_cacheSize(kMaxHdrsInCache) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMsgDatabase::~nsMsgDatabase() @@ -2310,7 +2310,7 @@ nsMsgDBEnumerator::nsMsgDBEnumerator(nsMsgDatabase* db, : mDB(db), mRowCursor(nsnull), mResultHdr(nsnull), mDone(PR_FALSE), mFilter(filter), mClosure(closure) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF(mDB); mNextPrefetched = PR_FALSE; } @@ -2493,7 +2493,7 @@ nsMsgDBThreadEnumerator::nsMsgDBThreadEnumerator(nsMsgDatabase* db, : mDB(db), mTableCursor(nsnull), mResultThread(nsnull), mDone(PR_FALSE), mFilter(filter) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF(mDB); mNextPrefetched = PR_FALSE; } diff --git a/mailnews/db/msgdb/src/nsMsgHdr.cpp b/mailnews/db/msgdb/src/nsMsgHdr.cpp index b7935c3fc54f..0e06a3436acd 100644 --- a/mailnews/db/msgdb/src/nsMsgHdr.cpp +++ b/mailnews/db/msgdb/src/nsMsgHdr.cpp @@ -56,7 +56,7 @@ static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID); nsMsgHdr::nsMsgHdr(nsMsgDatabase *db, nsIMdbRow *dbRow) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_mdb = db; Init(); m_mdbRow = dbRow; diff --git a/mailnews/db/msgdb/src/nsMsgThread.cpp b/mailnews/db/msgdb/src/nsMsgThread.cpp index d2ccd73236f7..0d742b2bcd23 100644 --- a/mailnews/db/msgdb/src/nsMsgThread.cpp +++ b/mailnews/db/msgdb/src/nsMsgThread.cpp @@ -78,7 +78,7 @@ void nsMsgThread::Init() m_mdbDB = nsnull; m_metaRow = nsnull; m_cachedValuesInitialized = PR_FALSE; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } @@ -639,7 +639,7 @@ nsMsgThreadEnumerator::nsMsgThreadEnumerator(nsMsgThread *thread, nsMsgKey start : mRowCursor(nsnull), mDone(PR_FALSE), mFilter(filter), mClosure(closure), mFoundChildren(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mThreadParentKey = startKey; mChildIndex = 0; mThread = thread; diff --git a/mailnews/imap/src/nsIMAPHostSessionList.cpp b/mailnews/imap/src/nsIMAPHostSessionList.cpp index 56c714f50705..4fd838a99c3f 100644 --- a/mailnews/imap/src/nsIMAPHostSessionList.cpp +++ b/mailnews/imap/src/nsIMAPHostSessionList.cpp @@ -99,7 +99,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS3(nsIMAPHostSessionList, nsIMAPHostSessionList::nsIMAPHostSessionList() { - NS_INIT_REFCNT (); + NS_INIT_ISUPPORTS (); gCachedHostInfoMonitor = PR_NewMonitor(/* "accessing-hostlist-monitor"*/); fHostInfoList = nsnull; } diff --git a/mailnews/imap/src/nsImapFlagAndUidState.cpp b/mailnews/imap/src/nsImapFlagAndUidState.cpp index 5ba046e95365..46c235a0b733 100644 --- a/mailnews/imap/src/nsImapFlagAndUidState.cpp +++ b/mailnews/imap/src/nsImapFlagAndUidState.cpp @@ -118,7 +118,7 @@ nsImapFlagAndUidState::nsImapFlagAndUidState(PRInt32 numberOfMessages, PRUint16 fSupportedUserFlags = flags; fNumberDeleted = 0; m_customFlagsHash = nsnull; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsImapFlagAndUidState::nsImapFlagAndUidState(const nsImapFlagAndUidState& state, @@ -134,7 +134,7 @@ nsImapFlagAndUidState::nsImapFlagAndUidState(const nsImapFlagAndUidState& state, fSupportedUserFlags = flags; fNumberDeleted = 0; m_customFlagsHash = nsnull; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } /* static */PRBool PR_CALLBACK nsImapFlagAndUidState::FreeCustomFlags(nsHashKey *aKey, void *aData, diff --git a/mailnews/imap/src/nsImapIncomingServer.cpp b/mailnews/imap/src/nsImapIncomingServer.cpp index afa9b80d0db3..a93c4a1d43c7 100644 --- a/mailnews/imap/src/nsImapIncomingServer.cpp +++ b/mailnews/imap/src/nsImapIncomingServer.cpp @@ -48,6 +48,7 @@ #include "nsString.h" #include "nsReadableUtils.h" +#include "nsISupportsObsolete.h" #include "nsIMAPHostSessionList.h" #include "nsImapIncomingServer.h" @@ -116,7 +117,7 @@ NS_INTERFACE_MAP_END_INHERITING(nsMsgIncomingServer) nsImapIncomingServer::nsImapIncomingServer() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); nsresult rv; rv = NS_NewISupportsArray(getter_AddRefs(m_connectionCache)); rv = NS_NewISupportsArray(getter_AddRefs(m_urlQueue)); diff --git a/mailnews/imap/src/nsImapMailFolder.cpp b/mailnews/imap/src/nsImapMailFolder.cpp index a54538db98ab..959f012f3619 100644 --- a/mailnews/imap/src/nsImapMailFolder.cpp +++ b/mailnews/imap/src/nsImapMailFolder.cpp @@ -6408,7 +6408,7 @@ nsImapMailCopyState::nsImapMailCopyState() : m_totalCount(0), m_streamCopy(PR_FALSE), m_dataBuffer(nsnull), m_dataBufferSize(0), m_leftOver(0), m_allowUndo(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsImapMailCopyState::~nsImapMailCopyState() diff --git a/mailnews/imap/src/nsImapOfflineSync.cpp b/mailnews/imap/src/nsImapOfflineSync.cpp index b3c926aa7a51..414393e213c8 100644 --- a/mailnews/imap/src/nsImapOfflineSync.cpp +++ b/mailnews/imap/src/nsImapOfflineSync.cpp @@ -56,7 +56,7 @@ NS_IMPL_ISUPPORTS2(nsImapOfflineSync, nsIUrlListener, nsIMsgCopyServiceListener) nsImapOfflineSync::nsImapOfflineSync(nsIMsgWindow *window, nsIUrlListener *listener, nsIMsgFolder *singleFolderOnly) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_singleFolderToUpdate = singleFolderOnly; m_window = window; // not the perfect place for this, but I think it will work. diff --git a/mailnews/imap/src/nsImapProtocol.cpp b/mailnews/imap/src/nsImapProtocol.cpp index 7e4b35cbb6f9..015cb27bee78 100644 --- a/mailnews/imap/src/nsImapProtocol.cpp +++ b/mailnews/imap/src/nsImapProtocol.cpp @@ -52,6 +52,7 @@ #include "nsMsgImapCID.h" #include "nsIEventQueueService.h" +#include "nsISupportsObsolete.h" #include "nsImapCore.h" #include "nsImapProtocol.h" @@ -343,7 +344,7 @@ nsresult nsImapProtocol::GlobalInitialization() nsImapProtocol::nsImapProtocol() : m_parser(*this) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_flags = 0; m_urlInProgress = PR_FALSE; m_socketIsOpen = PR_FALSE; @@ -7351,7 +7352,7 @@ NS_INTERFACE_MAP_END_THREADSAFE nsImapMockChannel::nsImapMockChannel() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_channelContext = nsnull; m_cancelStatus = NS_OK; mLoadFlags = 0; diff --git a/mailnews/imap/src/nsImapProxyEvent.cpp b/mailnews/imap/src/nsImapProxyEvent.cpp index 11495c85544c..3b948f80bb14 100644 --- a/mailnews/imap/src/nsImapProxyEvent.cpp +++ b/mailnews/imap/src/nsImapProxyEvent.cpp @@ -127,7 +127,7 @@ nsImapExtensionSinkProxy::nsImapExtensionSinkProxy(nsIImapExtensionSink* aImapEx { NS_ASSERTION (aImapExtensionSink, "nsImapExtensionSinkProxy: invalid aImapExtensionSink"); - NS_INIT_REFCNT (); + NS_INIT_ISUPPORTS (); m_realImapExtensionSink = aImapExtensionSink; NS_IF_ADDREF (m_realImapExtensionSink); } @@ -271,7 +271,7 @@ nsImapMiscellaneousSinkProxy::nsImapMiscellaneousSinkProxy( { NS_ASSERTION (aImapMiscellaneousSink, "nsImapMiscellaneousSinkProxy: invalid aImapMiscellaneousSink"); - NS_INIT_REFCNT (); + NS_INIT_ISUPPORTS (); m_realImapMiscellaneousSink = aImapMiscellaneousSink; NS_IF_ADDREF (m_realImapMiscellaneousSink); } diff --git a/mailnews/imap/src/nsImapService.cpp b/mailnews/imap/src/nsImapService.cpp index 75c9f2337f7d..1ea8e3d1c308 100644 --- a/mailnews/imap/src/nsImapService.cpp +++ b/mailnews/imap/src/nsImapService.cpp @@ -126,7 +126,7 @@ NS_IMPL_QUERY_INTERFACE6(nsImapService, nsImapService::nsImapService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mPrintingOperation = PR_FALSE; if (!gInitialized) { diff --git a/mailnews/imap/src/nsImapStringBundle.h b/mailnews/imap/src/nsImapStringBundle.h index 171f219aafd1..ae74994aaea8 100644 --- a/mailnews/imap/src/nsImapStringBundle.h +++ b/mailnews/imap/src/nsImapStringBundle.h @@ -38,6 +38,7 @@ #define _nsImapStringBundle_H__ #include "nsIStringBundle.h" +#include "nsComObsolete.h" NS_BEGIN_EXTERN_C diff --git a/mailnews/imap/src/nsImapUrl.cpp b/mailnews/imap/src/nsImapUrl.cpp index 5b19550d3cc6..ad7b461c9e15 100644 --- a/mailnews/imap/src/nsImapUrl.cpp +++ b/mailnews/imap/src/nsImapUrl.cpp @@ -59,6 +59,7 @@ #include "nsAutoLock.h" #include "nsIMAPNamespace.h" #include "nsICacheEntryDescriptor.h" +#include "nsISupportsObsolete.h" // rdf stuff is needed to get the charset from the imap folder associated with the url. #include "nsIRDFService.h" #include "rdf.h" diff --git a/mailnews/imap/src/nsImapUtils.cpp b/mailnews/imap/src/nsImapUtils.cpp index 1c78013d7bd3..9a1bca7011c4 100644 --- a/mailnews/imap/src/nsImapUtils.cpp +++ b/mailnews/imap/src/nsImapUtils.cpp @@ -53,6 +53,7 @@ #include "nsImapCore.h" #include "nsMsgUtils.h" #include "nsIImapFlagAndUidState.h" +#include "nsISupportsObsolete.h" nsresult nsImapURI2Path(const char* rootURI, const char* uriStr, nsFileSpec& pathResult) @@ -287,7 +288,7 @@ nsImapMailboxSpec::nsImapMailboxSpec() onlineVerified = PR_FALSE; namespaceForFolder = nsnull; - NS_INIT_REFCNT (); + NS_INIT_ISUPPORTS (); } nsImapMailboxSpec::~nsImapMailboxSpec() diff --git a/mailnews/import/comm4x/src/nsComm4xMailImport.cpp b/mailnews/import/comm4x/src/nsComm4xMailImport.cpp index 6ed65ecc904f..a0b378e82719 100644 --- a/mailnews/import/comm4x/src/nsComm4xMailImport.cpp +++ b/mailnews/import/comm4x/src/nsComm4xMailImport.cpp @@ -81,7 +81,7 @@ static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); nsComm4xMailImport::nsComm4xMailImport() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); IMPORT_LOG0("nsComm4xMailImport Module Created\n"); @@ -179,7 +179,7 @@ NS_IMETHODIMP nsComm4xMailImport::GetImportInterface(const char *pImportType, ns ImportComm4xMailImpl::ImportComm4xMailImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_pBundleProxy = nsnull; } diff --git a/mailnews/import/eudora/src/nsEudoraCompose.cpp b/mailnews/import/eudora/src/nsEudoraCompose.cpp index 55a3dea5833d..9ef31c8d4c99 100644 --- a/mailnews/import/eudora/src/nsEudoraCompose.cpp +++ b/mailnews/import/eudora/src/nsEudoraCompose.cpp @@ -97,7 +97,7 @@ class EudoraSendListener : public nsIMsgSendListener { public: EudoraSendListener() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_done = PR_FALSE; m_location = nsnull; } diff --git a/mailnews/import/eudora/src/nsEudoraImport.cpp b/mailnews/import/eudora/src/nsEudoraImport.cpp index 9b55b17e68ad..622d285dbb04 100644 --- a/mailnews/import/eudora/src/nsEudoraImport.cpp +++ b/mailnews/import/eudora/src/nsEudoraImport.cpp @@ -197,7 +197,7 @@ void ConvertToUnicode(const char *pStr, nsString &dist) nsEudoraImport::nsEudoraImport() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); IMPORT_LOG0( "nsEudoraImport Module Created\n"); @@ -352,7 +352,7 @@ nsresult ImportEudoraMailImpl::Create(nsIImportMail** aImport) ImportEudoraMailImpl::ImportEudoraMailImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } @@ -570,7 +570,7 @@ nsresult ImportEudoraAddressImpl::Create(nsIImportAddressBooks** aImport) ImportEudoraAddressImpl::ImportEudoraAddressImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/mailnews/import/eudora/src/nsEudoraSettings.cpp b/mailnews/import/eudora/src/nsEudoraSettings.cpp index ebb3c18d11fd..7334152c0326 100644 --- a/mailnews/import/eudora/src/nsEudoraSettings.cpp +++ b/mailnews/import/eudora/src/nsEudoraSettings.cpp @@ -55,7 +55,7 @@ nsresult nsEudoraSettings::Create(nsIImportSettings** aImport) nsEudoraSettings::nsEudoraSettings() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_pLocation = nsnull; } diff --git a/mailnews/import/oexpress/nsOEImport.cpp b/mailnews/import/oexpress/nsOEImport.cpp index cfec7f654015..f426c873a842 100644 --- a/mailnews/import/oexpress/nsOEImport.cpp +++ b/mailnews/import/oexpress/nsOEImport.cpp @@ -177,7 +177,7 @@ private: nsOEImport::nsOEImport() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); IMPORT_LOG0( "nsOEImport Module Created\n"); @@ -332,7 +332,7 @@ nsresult ImportOEMailImpl::Create(nsIImportMail** aImport) ImportOEMailImpl::ImportOEMailImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } @@ -547,7 +547,7 @@ nsresult ImportOEAddressImpl::Create(nsIImportAddressBooks** aImport) ImportOEAddressImpl::ImportOEAddressImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_pWab = nsnull; } diff --git a/mailnews/import/oexpress/nsOESettings.cpp b/mailnews/import/oexpress/nsOESettings.cpp index ea7d0f2e2aa6..625ec5cf7627 100644 --- a/mailnews/import/oexpress/nsOESettings.cpp +++ b/mailnews/import/oexpress/nsOESettings.cpp @@ -104,7 +104,7 @@ nsresult nsOESettings::Create(nsIImportSettings** aImport) nsOESettings::nsOESettings() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsOESettings::~nsOESettings() diff --git a/mailnews/import/outlook/src/nsOutlookCompose.cpp b/mailnews/import/outlook/src/nsOutlookCompose.cpp index 62a025392fd6..e500fc277e8e 100644 --- a/mailnews/import/outlook/src/nsOutlookCompose.cpp +++ b/mailnews/import/outlook/src/nsOutlookCompose.cpp @@ -97,7 +97,7 @@ class OutlookSendListener : public nsIMsgSendListener { public: OutlookSendListener() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_done = PR_FALSE; m_location = nsnull; } diff --git a/mailnews/import/outlook/src/nsOutlookImport.cpp b/mailnews/import/outlook/src/nsOutlookImport.cpp index a82e0aad11f6..bdd8b8aebdf4 100644 --- a/mailnews/import/outlook/src/nsOutlookImport.cpp +++ b/mailnews/import/outlook/src/nsOutlookImport.cpp @@ -178,7 +178,7 @@ private: nsOutlookImport::nsOutlookImport() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); IMPORT_LOG0( "nsOutlookImport Module Created\n"); @@ -332,7 +332,7 @@ nsresult ImportOutlookMailImpl::Create(nsIImportMail** aImport) ImportOutlookMailImpl::ImportOutlookMailImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } @@ -528,7 +528,7 @@ nsresult ImportOutlookAddressImpl::Create(nsIImportAddressBooks** aImport) ImportOutlookAddressImpl::ImportOutlookAddressImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_msgCount = 0; m_msgTotal = 0; } diff --git a/mailnews/import/outlook/src/nsOutlookSettings.cpp b/mailnews/import/outlook/src/nsOutlookSettings.cpp index 987197e33f27..7d3327adfc4c 100644 --- a/mailnews/import/outlook/src/nsOutlookSettings.cpp +++ b/mailnews/import/outlook/src/nsOutlookSettings.cpp @@ -102,7 +102,7 @@ nsresult nsOutlookSettings::Create(nsIImportSettings** aImport) nsOutlookSettings::nsOutlookSettings() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsOutlookSettings::~nsOutlookSettings() diff --git a/mailnews/import/src/nsImportAddressBooks.cpp b/mailnews/import/src/nsImportAddressBooks.cpp index 7f4fe7920371..2a6f0a3430d0 100644 --- a/mailnews/import/src/nsImportAddressBooks.cpp +++ b/mailnews/import/src/nsImportAddressBooks.cpp @@ -186,7 +186,7 @@ nsresult NS_NewGenericAddressBooks(nsIImportGeneric** aImportGeneric) nsImportGenericAddressBooks::nsImportGenericAddressBooks() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_pInterface = nsnull; m_pBooks = nsnull; m_pSuccessLog = nsnull; diff --git a/mailnews/import/src/nsImportMail.cpp b/mailnews/import/src/nsImportMail.cpp index 3bc198774e82..2df07eab2a81 100644 --- a/mailnews/import/src/nsImportMail.cpp +++ b/mailnews/import/src/nsImportMail.cpp @@ -192,7 +192,7 @@ nsresult NS_NewGenericMail(nsIImportGeneric** aImportGeneric) nsImportGenericMail::nsImportGenericMail() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_pSrcLocation = nsnull; m_found = PR_FALSE; m_userVerify = PR_FALSE; diff --git a/mailnews/import/src/nsImportService.cpp b/mailnews/import/src/nsImportService.cpp index c4b00be44899..f49620750ee4 100644 --- a/mailnews/import/src/nsImportService.cpp +++ b/mailnews/import/src/nsImportService.cpp @@ -186,7 +186,7 @@ NS_IMETHODIMP NS_NewImportService( nsISupports* aOuter, REFNSIID aIID, void **aR nsImportService::nsImportService() : m_pModules( nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); IMPORT_LOG0( "* nsImport Service Created\n"); diff --git a/mailnews/import/text/src/nsTextImport.cpp b/mailnews/import/text/src/nsTextImport.cpp index b91efe25a2d7..3cbf49edd2bf 100644 --- a/mailnews/import/text/src/nsTextImport.cpp +++ b/mailnews/import/text/src/nsTextImport.cpp @@ -124,7 +124,7 @@ private: nsTextImport::nsTextImport() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); IMPORT_LOG0( "nsTextImport Module Created\n"); @@ -243,7 +243,7 @@ nsresult ImportAddressImpl::Create(nsIImportAddressBooks** aImport) ImportAddressImpl::ImportAddressImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_fileLoc = nsnull; m_haveDelim = PR_FALSE; diff --git a/mailnews/local/src/nsLocalMailFolder.cpp b/mailnews/local/src/nsLocalMailFolder.cpp index 76753411e5e0..b21c26948805 100644 --- a/mailnews/local/src/nsLocalMailFolder.cpp +++ b/mailnews/local/src/nsLocalMailFolder.cpp @@ -150,7 +150,7 @@ nsMsgLocalMailFolder::nsMsgLocalMailFolder(void) mInitialized(PR_FALSE), mCopyState(nsnull), mType(nsnull), mCheckForNewMessagesAfterParsing(PR_FALSE) { -// NS_INIT_REFCNT(); done by superclass +// NS_INIT_ISUPPORTS(); done by superclass } nsMsgLocalMailFolder::~nsMsgLocalMailFolder(void) diff --git a/mailnews/local/src/nsMailboxService.cpp b/mailnews/local/src/nsMailboxService.cpp index 2e8b254255b9..0222f45e432b 100644 --- a/mailnews/local/src/nsMailboxService.cpp +++ b/mailnews/local/src/nsMailboxService.cpp @@ -71,7 +71,7 @@ static NS_DEFINE_CID(kCPop3ServiceCID, NS_POP3SERVICE_CID); nsMailboxService::nsMailboxService() { mPrintingOperation = PR_FALSE; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMailboxService::~nsMailboxService() diff --git a/mailnews/local/src/nsMailboxUrl.cpp b/mailnews/local/src/nsMailboxUrl.cpp index 648c8a1c9dda..071df16ae601 100644 --- a/mailnews/local/src/nsMailboxUrl.cpp +++ b/mailnews/local/src/nsMailboxUrl.cpp @@ -57,6 +57,7 @@ #include "rdf.h" #include "nsIMsgFolder.h" #include "prprf.h" +#include "nsISupportsObsolete.h" // we need this because of an egcs 1.0 (and possibly gcc) compiler bug // that doesn't allow you to call ::nsISupports::GetIID() inside of a class diff --git a/mailnews/local/src/nsMailboxUrl.h b/mailnews/local/src/nsMailboxUrl.h index 0c4cb89e95b5..ac12a4bf5281 100644 --- a/mailnews/local/src/nsMailboxUrl.h +++ b/mailnews/local/src/nsMailboxUrl.h @@ -45,6 +45,7 @@ #include "nsCOMPtr.h" #include "nsXPIDLString.h" #include "nsMsgKeyArray.h" +#include "nsISupportsObsolete.h" class nsMailboxUrl : public nsIMailboxUrl, public nsMsgMailNewsUrl, public nsIMsgMessageUrl, public nsIMsgI18NUrl { diff --git a/mailnews/local/src/nsMovemailIncomingServer.cpp b/mailnews/local/src/nsMovemailIncomingServer.cpp index 8474557b5676..b1c2552719a0 100644 --- a/mailnews/local/src/nsMovemailIncomingServer.cpp +++ b/mailnews/local/src/nsMovemailIncomingServer.cpp @@ -70,7 +70,7 @@ NS_IMPL_ISUPPORTS_INHERITED2(nsMovemailIncomingServer, nsMovemailIncomingServer::nsMovemailIncomingServer() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMovemailIncomingServer::~nsMovemailIncomingServer() diff --git a/mailnews/local/src/nsMovemailService.cpp b/mailnews/local/src/nsMovemailService.cpp index d262f03eab81..4419f0224e22 100644 --- a/mailnews/local/src/nsMovemailService.cpp +++ b/mailnews/local/src/nsMovemailService.cpp @@ -77,7 +77,7 @@ static NS_DEFINE_CID(kMsgMailSessionCID, NS_MSGMAILSESSION_CID); nsMovemailService::nsMovemailService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef MOVEMAIL_DEBUG fprintf(stderr, "*** MURRR, new nsMovemailService\n"); #endif diff --git a/mailnews/local/src/nsNoIncomingServer.cpp b/mailnews/local/src/nsNoIncomingServer.cpp index 5ebff071a121..31b5f5434f54 100644 --- a/mailnews/local/src/nsNoIncomingServer.cpp +++ b/mailnews/local/src/nsNoIncomingServer.cpp @@ -62,7 +62,7 @@ NS_IMPL_ISUPPORTS_INHERITED2(nsNoIncomingServer, nsNoIncomingServer::nsNoIncomingServer() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsNoIncomingServer::~nsNoIncomingServer() diff --git a/mailnews/local/src/nsNoneService.cpp b/mailnews/local/src/nsNoneService.cpp index 26013b69b497..3c0b9a6c38fd 100644 --- a/mailnews/local/src/nsNoneService.cpp +++ b/mailnews/local/src/nsNoneService.cpp @@ -62,7 +62,7 @@ static NS_DEFINE_CID(kMsgMailSessionCID, NS_MSGMAILSESSION_CID); nsNoneService::nsNoneService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsNoneService::~nsNoneService() diff --git a/mailnews/local/src/nsParseMailbox.cpp b/mailnews/local/src/nsParseMailbox.cpp index 0f0040cb559f..083af4cb2bdf 100644 --- a/mailnews/local/src/nsParseMailbox.cpp +++ b/mailnews/local/src/nsParseMailbox.cpp @@ -252,7 +252,7 @@ NS_IMETHODIMP nsMsgMailboxParser::OnReadChanged(nsIDBChangeListener *instigator) nsMsgMailboxParser::nsMsgMailboxParser() : nsMsgLineBuffer(nsnull, PR_FALSE) { /* the following macro is used to initialize the ref counting data */ - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_obuffer = nsnull; m_obuffer_size = 0; @@ -490,7 +490,7 @@ NS_IMPL_ISUPPORTS1(nsParseMailMessageState, nsIMsgParseMailMsgState) nsParseMailMessageState::nsParseMailMessageState() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_position = 0; m_IgnoreXMozillaStatus = PR_FALSE; m_state = nsIMsgParseMailMsgState::ParseBodyState; diff --git a/mailnews/local/src/nsPop3IncomingServer.cpp b/mailnews/local/src/nsPop3IncomingServer.cpp index 4f232ae98aab..274813c38e06 100644 --- a/mailnews/local/src/nsPop3IncomingServer.cpp +++ b/mailnews/local/src/nsPop3IncomingServer.cpp @@ -67,7 +67,7 @@ NS_IMPL_ISUPPORTS_INHERITED2(nsPop3IncomingServer, nsPop3IncomingServer::nsPop3IncomingServer() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_capabilityFlags = POP3_AUTH_LOGIN_UNDEFINED | POP3_XSENDER_UNDEFINED | diff --git a/mailnews/local/src/nsPop3Service.cpp b/mailnews/local/src/nsPop3Service.cpp index 29f46becb983..5658601edcb5 100644 --- a/mailnews/local/src/nsPop3Service.cpp +++ b/mailnews/local/src/nsPop3Service.cpp @@ -74,7 +74,7 @@ static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); nsPop3Service::nsPop3Service() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsPop3Service::~nsPop3Service() diff --git a/mailnews/local/src/nsPop3Sink.cpp b/mailnews/local/src/nsPop3Sink.cpp index 3e2acabc0870..fe64e65a872d 100644 --- a/mailnews/local/src/nsPop3Sink.cpp +++ b/mailnews/local/src/nsPop3Sink.cpp @@ -56,7 +56,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsPop3Sink, nsIPop3Sink) nsPop3Sink::nsPop3Sink() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_authed = PR_FALSE; m_accountUrl = nsnull; m_biffState = 0; diff --git a/mailnews/mapi/mapihook/src/msgMapiHook.cpp b/mailnews/mapi/mapihook/src/msgMapiHook.cpp index 8b309c1bdf07..749c2670c477 100644 --- a/mailnews/mapi/mapihook/src/msgMapiHook.cpp +++ b/mailnews/mapi/mapihook/src/msgMapiHook.cpp @@ -126,7 +126,7 @@ public: protected : nsMAPISendListener() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_done = PR_FALSE; } diff --git a/mailnews/mime/cthandlers/glue/nsMimeContentTypeHandler.cpp b/mailnews/mime/cthandlers/glue/nsMimeContentTypeHandler.cpp index ac429fb75864..e273d298f41f 100644 --- a/mailnews/mime/cthandlers/glue/nsMimeContentTypeHandler.cpp +++ b/mailnews/mime/cthandlers/glue/nsMimeContentTypeHandler.cpp @@ -56,7 +56,7 @@ nsMimeContentTypeHandler::nsMimeContentTypeHandler(const char *aMimeType, MCTHCreateCTHClass callback) { /* the following macro is used to initialize the ref counting data */ - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ASSERTION(aMimeType, "nsMimeContentTypeHandler should be initialized with non-null mime type"); NS_ASSERTION(callback, "nsMimeContentTypeHandler should be initialized with non-null callback"); mimeType = PL_strdup(aMimeType); diff --git a/mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp b/mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp index 2a167330aab1..be6f2f49db5e 100644 --- a/mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp +++ b/mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp @@ -86,7 +86,7 @@ NS_INTERFACE_MAP_END nsMimeBaseEmitter::nsMimeBaseEmitter() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // Initialize data output vars... mFirstHeaders = PR_TRUE; diff --git a/mailnews/mime/src/nsMimeObjectClassAccess.cpp b/mailnews/mime/src/nsMimeObjectClassAccess.cpp index 20e2ef0c0dbe..085b58b3fe2b 100644 --- a/mailnews/mime/src/nsMimeObjectClassAccess.cpp +++ b/mailnews/mime/src/nsMimeObjectClassAccess.cpp @@ -55,7 +55,7 @@ NS_IMPL_ISUPPORTS1(nsMimeObjectClassAccess, nsIMimeObjectClassAccess) nsMimeObjectClassAccess::nsMimeObjectClassAccess() { /* the following macro is used to initialize the ref counting data */ - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMimeObjectClassAccess::~nsMimeObjectClassAccess() diff --git a/mailnews/mime/src/nsMsgHeaderParser.cpp b/mailnews/mime/src/nsMsgHeaderParser.cpp index 77f02ee0e433..16715743b626 100644 --- a/mailnews/mime/src/nsMsgHeaderParser.cpp +++ b/mailnews/mime/src/nsMsgHeaderParser.cpp @@ -91,7 +91,7 @@ static char *msg_make_full_address(const char* name, const char* addr); nsMsgHeaderParser::nsMsgHeaderParser() { /* the following macro is used to initialize the ref counting data */ - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMsgHeaderParser::~nsMsgHeaderParser() diff --git a/mailnews/mime/src/nsStreamConverter.cpp b/mailnews/mime/src/nsStreamConverter.cpp index 1b2aaa5e4b6a..297e9d4b9cc8 100644 --- a/mailnews/mime/src/nsStreamConverter.cpp +++ b/mailnews/mime/src/nsStreamConverter.cpp @@ -526,7 +526,7 @@ nsStreamConverter::InternalCleanup(void) nsStreamConverter::nsStreamConverter() { /* the following macro is used to initialize the ref counting data */ - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // Init member variables... mOverrideFormat = nsnull; diff --git a/mailnews/news/src/nsNNTPArticleList.cpp b/mailnews/news/src/nsNNTPArticleList.cpp index b20f63a95ea0..07456ae50a91 100644 --- a/mailnews/news/src/nsNNTPArticleList.cpp +++ b/mailnews/news/src/nsNNTPArticleList.cpp @@ -45,7 +45,7 @@ NS_IMPL_ISUPPORTS1(nsNNTPArticleList, nsINNTPArticleList) nsNNTPArticleList::nsNNTPArticleList() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsNNTPArticleList::~nsNNTPArticleList() diff --git a/mailnews/news/src/nsNNTPNewsgroupList.cpp b/mailnews/news/src/nsNNTPNewsgroupList.cpp index c7eb52b8a24b..b1986309060a 100644 --- a/mailnews/news/src/nsNNTPNewsgroupList.cpp +++ b/mailnews/news/src/nsNNTPNewsgroupList.cpp @@ -97,7 +97,7 @@ static NS_DEFINE_CID(kCNewsDB, NS_NEWSDB_CID); nsNNTPNewsgroupList::nsNNTPNewsgroupList() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/mailnews/news/src/nsNNTPNewsgroupPost.cpp b/mailnews/news/src/nsNNTPNewsgroupPost.cpp index a031d6f881cf..29ee3922087a 100644 --- a/mailnews/news/src/nsNNTPNewsgroupPost.cpp +++ b/mailnews/news/src/nsNNTPNewsgroupPost.cpp @@ -41,6 +41,8 @@ #include "nsINNTPNewsgroupPost.h" #include "nsNNTPNewsgroupPost.h" +#include "nsISupportsObsolete.h" + #include "plstr.h" #include "prmem.h" @@ -48,7 +50,7 @@ NS_IMPL_ISUPPORTS1(nsNNTPNewsgroupPost, nsINNTPNewsgroupPost) nsNNTPNewsgroupPost::nsNNTPNewsgroupPost() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); int i; for (i=0; i <= HEADER_LAST; i++) diff --git a/mailnews/news/src/nsNNTPNewsgroupPost.h b/mailnews/news/src/nsNNTPNewsgroupPost.h index 80f9bac67705..e2fa6bfff504 100644 --- a/mailnews/news/src/nsNNTPNewsgroupPost.h +++ b/mailnews/news/src/nsNNTPNewsgroupPost.h @@ -43,7 +43,7 @@ #include "nsCOMPtr.h" #include "nsIFileSpec.h" #include "prmem.h" - +#include "nsISupportsObsolete.h" #define HEADER_FROM 0 #define HEADER_NEWSGROUPS 1 diff --git a/mailnews/news/src/nsNNTPProtocol.cpp b/mailnews/news/src/nsNNTPProtocol.cpp index dc998c3aca12..6a2336796872 100644 --- a/mailnews/news/src/nsNNTPProtocol.cpp +++ b/mailnews/news/src/nsNNTPProtocol.cpp @@ -165,7 +165,7 @@ public: // nsDummyBufferStream methods: nsDummyBufferStream(const char* buffer, PRUint32 length) - : mBuffer(buffer), mLength(length) {NS_INIT_REFCNT();} + : mBuffer(buffer), mLength(length) {NS_INIT_ISUPPORTS();} virtual ~nsDummyBufferStream() {} protected: diff --git a/mailnews/news/src/nsNewsDownloadDialogArgs.cpp b/mailnews/news/src/nsNewsDownloadDialogArgs.cpp index ed7ac011707f..32913a1226ed 100644 --- a/mailnews/news/src/nsNewsDownloadDialogArgs.cpp +++ b/mailnews/news/src/nsNewsDownloadDialogArgs.cpp @@ -42,7 +42,7 @@ nsNewsDownloadDialogArgs::nsNewsDownloadDialogArgs() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mGroupName = ""; mArticleCount = 0; diff --git a/mailnews/news/src/nsNewsDownloader.cpp b/mailnews/news/src/nsNewsDownloader.cpp index c1d85acf7416..f69a7d9fa2eb 100644 --- a/mailnews/news/src/nsNewsDownloader.cpp +++ b/mailnews/news/src/nsNewsDownloader.cpp @@ -92,7 +92,7 @@ nsNewsDownloader::nsNewsDownloader(nsIMsgWindow *window, nsIMsgDatabase *msgDB, // not the perfect place for this, but I think it will work. if (m_window) m_window->SetStopped(PR_FALSE); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsNewsDownloader::~nsNewsDownloader() @@ -356,7 +356,7 @@ NS_IMPL_ISUPPORTS1(nsMsgDownloadAllNewsgroups, nsIUrlListener) nsMsgDownloadAllNewsgroups::nsMsgDownloadAllNewsgroups(nsIMsgWindow *window, nsIUrlListener *listener) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_window = window; m_listener = listener; m_downloaderForGroup = new DownloadMatchingNewsArticlesToNewsDB(window, nsnull, nsnull, this); diff --git a/mailnews/news/src/nsNewsFolder.cpp b/mailnews/news/src/nsNewsFolder.cpp index 035d54c78a87..6d716614c8c0 100644 --- a/mailnews/news/src/nsNewsFolder.cpp +++ b/mailnews/news/src/nsNewsFolder.cpp @@ -129,7 +129,7 @@ nsMsgNewsFolder::nsMsgNewsFolder(void) : nsMsgLineBuffer(nsnull, PR_FALSE), SetLookingForCRLF(PR_FALSE); } -// NS_INIT_REFCNT(); done by superclass +// NS_INIT_ISUPPORTS(); done by superclass } nsMsgNewsFolder::~nsMsgNewsFolder(void) diff --git a/mailnews/news/src/nsNntpIncomingServer.cpp b/mailnews/news/src/nsNntpIncomingServer.cpp index 8f3c30bf1a48..f11019c64ae0 100644 --- a/mailnews/news/src/nsNntpIncomingServer.cpp +++ b/mailnews/news/src/nsNntpIncomingServer.cpp @@ -97,7 +97,7 @@ NS_INTERFACE_MAP_END_INHERITING(nsMsgIncomingServer) nsNntpIncomingServer::nsNntpIncomingServer() : nsMsgLineBuffer(nsnull, PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mNewsrcHasChanged = PR_FALSE; mGroupsEnumerator = nsnull; diff --git a/mailnews/news/src/nsNntpService.cpp b/mailnews/news/src/nsNntpService.cpp index bbde0ab7f6fb..5252f43aca4d 100644 --- a/mailnews/news/src/nsNntpService.cpp +++ b/mailnews/news/src/nsNntpService.cpp @@ -41,6 +41,7 @@ #include "msgCore.h" // precompiled header... #include "nntpCore.h" +#include "nsISupportsObsolete.h" #include "nsMsgNewsCID.h" #include "nsINntpUrl.h" #include "nsNNTPProtocol.h" @@ -98,7 +99,7 @@ static NS_DEFINE_CID(kCacheServiceCID, NS_CACHESERVICE_CID); nsNntpService::nsNntpService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mPrintingOperation = PR_FALSE; mOpenAttachmentOperation = PR_FALSE; } diff --git a/mailnews/news/src/nsNntpUrl.cpp b/mailnews/news/src/nsNntpUrl.cpp index 85eaca5fc1df..e22026aed4ef 100644 --- a/mailnews/news/src/nsNntpUrl.cpp +++ b/mailnews/news/src/nsNntpUrl.cpp @@ -38,6 +38,7 @@ #include "msgCore.h" // precompiled header... #include "prlog.h" +#include "nsISupportsObsolete.h" #include "nsIURL.h" #include "nsNntpUrl.h" @@ -49,6 +50,7 @@ #include "prprf.h" #include "nsCRT.h" #include "nsNewsUtils.h" +#include "nsISupportsObsolete.h" #include "nntpCore.h" diff --git a/modules/libimg/gifcom/nsGIFDecoder.cpp b/modules/libimg/gifcom/nsGIFDecoder.cpp index df7530736d8b..9d0db7d9d1f5 100644 --- a/modules/libimg/gifcom/nsGIFDecoder.cpp +++ b/modules/libimg/gifcom/nsGIFDecoder.cpp @@ -49,7 +49,7 @@ NS_IMPL_ISUPPORTS1(GIFDecoder, nsIImgDecoder); GIFDecoder::GIFDecoder(il_container* aContainer) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); ilContainer = aContainer; } diff --git a/modules/libjar/nsJAR.cpp b/modules/libjar/nsJAR.cpp index 35c36894fbcb..729851b31b8d 100644 --- a/modules/libjar/nsJAR.cpp +++ b/modules/libjar/nsJAR.cpp @@ -153,7 +153,7 @@ nsJAR::nsJAR(): mManifestData(nsnull, nsnull, DeleteManifestEntry, nsnull, 10), mParsedManifest(PR_FALSE), mGlobalStatus(nsIJAR::NOT_SIGNED), mReleaseTime(PR_INTERVAL_NO_TIMEOUT), mCache(nsnull), mLock(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsJAR::~nsJAR() @@ -940,7 +940,7 @@ nsJAREnumerator::nsJAREnumerator(nsZipFind *aFind) mIsCurrStale(PR_TRUE) { mArchive = mFind->GetArchive(); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsJAREnumerator::~nsJAREnumerator() @@ -1132,7 +1132,7 @@ nsZipReaderCache::nsZipReaderCache() mZipSyncMisses(0) #endif { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMETHODIMP diff --git a/modules/libjar/nsJARChannel.cpp b/modules/libjar/nsJARChannel.cpp index f67601a2acf4..00333c1e0779 100644 --- a/modules/libjar/nsJARChannel.cpp +++ b/modules/libjar/nsJARChannel.cpp @@ -70,7 +70,7 @@ nsJARChannel::nsJARChannel() , mInitiator(nsnull) #endif { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #if defined(PR_LOGGING) // diff --git a/modules/libjar/nsJARInputStream.cpp b/modules/libjar/nsJARInputStream.cpp index 1ed4e38eb5dc..325dd4f4c5ec 100644 --- a/modules/libjar/nsJARInputStream.cpp +++ b/modules/libjar/nsJARInputStream.cpp @@ -129,7 +129,7 @@ nsJARInputStream::Create(nsISupports* ignored, const nsIID& aIID, void* *aResult nsJARInputStream::nsJARInputStream() : mJAR(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsJARInputStream::~nsJARInputStream() diff --git a/modules/libjar/nsJARProtocolHandler.cpp b/modules/libjar/nsJARProtocolHandler.cpp index 9daa44628c61..080c806af7e7 100644 --- a/modules/libjar/nsJARProtocolHandler.cpp +++ b/modules/libjar/nsJARProtocolHandler.cpp @@ -58,7 +58,7 @@ static NS_DEFINE_CID(kZipReaderCacheCID, NS_ZIPREADERCACHE_CID); nsJARProtocolHandler::nsJARProtocolHandler() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult diff --git a/modules/libjar/nsJARURI.cpp b/modules/libjar/nsJARURI.cpp index 9d57b3512ab7..6e0082c96208 100644 --- a/modules/libjar/nsJARURI.cpp +++ b/modules/libjar/nsJARURI.cpp @@ -32,7 +32,7 @@ nsJARURI::nsJARURI() : mJAREntry(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsJARURI::~nsJARURI() diff --git a/modules/libjar/test/TestJarCache.cpp b/modules/libjar/test/TestJarCache.cpp index e130195465df..e58d4ae798b4 100644 --- a/modules/libjar/test/TestJarCache.cpp +++ b/modules/libjar/test/TestJarCache.cpp @@ -107,7 +107,7 @@ PRUint32 TestThread::gCounter = 0; TestThread::TestThread() : mID(++gCounter) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } TestThread::~TestThread() diff --git a/modules/libpr0n/decoders/icon/mac/nsIconChannel.cpp b/modules/libpr0n/decoders/icon/mac/nsIconChannel.cpp index 409d4e63a6b7..b28479970b60 100644 --- a/modules/libpr0n/decoders/icon/mac/nsIconChannel.cpp +++ b/modules/libpr0n/decoders/icon/mac/nsIconChannel.cpp @@ -48,7 +48,7 @@ // nsIconChannel methods nsIconChannel::nsIconChannel() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mStatus = NS_OK; } diff --git a/modules/libpr0n/decoders/icon/nsIconProtocolHandler.cpp b/modules/libpr0n/decoders/icon/nsIconProtocolHandler.cpp index b17aee67bb23..3179b8b7e4a9 100644 --- a/modules/libpr0n/decoders/icon/nsIconProtocolHandler.cpp +++ b/modules/libpr0n/decoders/icon/nsIconProtocolHandler.cpp @@ -34,7 +34,7 @@ nsIconProtocolHandler::nsIconProtocolHandler() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsIconProtocolHandler::~nsIconProtocolHandler() diff --git a/modules/libpr0n/decoders/icon/nsIconURI.cpp b/modules/libpr0n/decoders/icon/nsIconURI.cpp index 632edf89e11f..07f893988a27 100644 --- a/modules/libpr0n/decoders/icon/nsIconURI.cpp +++ b/modules/libpr0n/decoders/icon/nsIconURI.cpp @@ -38,7 +38,7 @@ static void extractAttributeValue(const char * searchString, const char * attrib nsMozIconURI::nsMozIconURI() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mSize = DEFAULT_IMAGE_SIZE; } diff --git a/modules/libpr0n/decoders/icon/os2/nsIconChannel.cpp b/modules/libpr0n/decoders/icon/os2/nsIconChannel.cpp index c2962b11052a..184af8d9a98e 100644 --- a/modules/libpr0n/decoders/icon/os2/nsIconChannel.cpp +++ b/modules/libpr0n/decoders/icon/os2/nsIconChannel.cpp @@ -72,7 +72,7 @@ PRUint32 CalcWordAlignedRowSpan(PRUint32 aWidth, PRUint32 aBitCount); // nsIconChannel methods nsIconChannel::nsIconChannel() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mStatus = NS_OK; } diff --git a/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp b/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp index e3c909eccc6c..09083e7a3e7d 100644 --- a/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp +++ b/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp @@ -51,7 +51,7 @@ PRUint32 CalcWordAlignedRowSpan(PRUint32 aWidth, PRUint32 aBitCount); // nsIconChannel methods nsIconChannel::nsIconChannel() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mStatus = NS_OK; } diff --git a/modules/libpref/src/nsPref.cpp b/modules/libpref/src/nsPref.cpp index b5a4d1b459ea..90c381a2f191 100644 --- a/modules/libpref/src/nsPref.cpp +++ b/modules/libpref/src/nsPref.cpp @@ -134,7 +134,7 @@ nsPref::nsPref() //---------------------------------------------------------------------------------------- { PR_AtomicIncrement(&g_InstanceCount); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mPrefService = do_GetService(NS_PREFSERVICE_CONTRACTID); NS_ASSERTION(mPrefService, "Preference Service failed to start up!!"); diff --git a/modules/libpref/src/nsPrefBranch.cpp b/modules/libpref/src/nsPrefBranch.cpp index ed77bd643f23..c27b084acaf8 100644 --- a/modules/libpref/src/nsPrefBranch.cpp +++ b/modules/libpref/src/nsPrefBranch.cpp @@ -968,7 +968,7 @@ nsPrefLocalizedString::nsPrefLocalizedString() { nsresult rv; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mUnicodeString = do_CreateInstance(NS_SUPPORTS_STRING_CONTRACTID, &rv); } diff --git a/modules/libpref/src/nsPrefService.cpp b/modules/libpref/src/nsPrefService.cpp index 9889f3fecfa2..be8a511b57da 100644 --- a/modules/libpref/src/nsPrefService.cpp +++ b/modules/libpref/src/nsPrefService.cpp @@ -85,7 +85,7 @@ nsPrefService::nsPrefService() { nsPrefBranch *rootBranch; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); rootBranch = new nsPrefBranch("", PR_FALSE); mRootBranch = (nsIPrefBranch *)rootBranch; diff --git a/modules/libreg/xpcom/nsRegistry.cpp b/modules/libreg/xpcom/nsRegistry.cpp index 1e47bdda065b..e19de06b9f5a 100644 --- a/modules/libreg/xpcom/nsRegistry.cpp +++ b/modules/libreg/xpcom/nsRegistry.cpp @@ -368,7 +368,7 @@ NS_IMPL_ISUPPORTS1( nsRegistryValue, nsIRegistryValue ) ------------------------------------------------------------------------------*/ nsRegistry::nsRegistry() : mReg(0), mCurRegID(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef EXTRA_THREADSAFE mregLock = PR_NewLock(); #endif @@ -1574,7 +1574,7 @@ int nsRegistry::SetBufferSize( int bufsize ) nsRegSubtreeEnumerator::nsRegSubtreeEnumerator( HREG hReg, RKEY rKey, PRBool all ) : mReg( hReg ), mKey( rKey ), mEnum( 0 ), mNext( 0 ), mStyle( all ? REGENUM_DESCEND : REGENUM_CHILDREN ), mDone( PR_FALSE ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mName[0] = '\0'; @@ -1762,7 +1762,7 @@ NS_IMETHODIMP nsRegValueEnumerator::advance() { ------------------------------------------------------------------------------*/ nsRegistryNode::nsRegistryNode( HREG hReg, char *name, RKEY childKey ) : mReg( hReg ), mChildKey( childKey ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); PR_ASSERT(name != nsnull); strcpy(mName, name); @@ -1825,7 +1825,7 @@ NS_IMETHODIMP nsRegistryNode::GetKey( nsRegistryKey *r_key ) { ------------------------------------------------------------------------------*/ nsRegistryValue::nsRegistryValue( HREG hReg, RKEY key, REGENUM slot ) : mReg( hReg ), mKey( key ), mEnum( slot ), mErr( -1 ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef EXTRA_THREADSAFE mregLock = PR_NewLock(); #endif @@ -1953,7 +1953,7 @@ nsresult nsRegistryValue::getInfo() { nsRegistryFactory::nsRegistryFactory() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsRegistryFactory, nsIFactory) diff --git a/modules/mpfilelocprovider/src/nsMPFileLocProvider.cpp b/modules/mpfilelocprovider/src/nsMPFileLocProvider.cpp index b5610a81a385..594696c79fc3 100755 --- a/modules/mpfilelocprovider/src/nsMPFileLocProvider.cpp +++ b/modules/mpfilelocprovider/src/nsMPFileLocProvider.cpp @@ -71,7 +71,7 @@ nsIAtom* nsMPFileLocProvider::sApp_MessengerFolderCache50; nsMPFileLocProvider::nsMPFileLocProvider() : mInitialized(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/modules/oji/src/nsCNullSecurityContext.h b/modules/oji/src/nsCNullSecurityContext.h index 3e0315229796..4644c97b11ee 100644 --- a/modules/oji/src/nsCNullSecurityContext.h +++ b/modules/oji/src/nsCNullSecurityContext.h @@ -84,7 +84,7 @@ public: ////////////////////////////////////////////////////////////////////// // from nsISecureJNI: - nsCNullSecurityContext() { NS_INIT_REFCNT();}; + nsCNullSecurityContext() { NS_INIT_ISUPPORTS();}; }; #endif // CSecurityContext_h___ diff --git a/modules/oji/src/nsCSecurityContext.cpp b/modules/oji/src/nsCSecurityContext.cpp index d12d1bbe9376..3f52f67d1e41 100644 --- a/modules/oji/src/nsCSecurityContext.cpp +++ b/modules/oji/src/nsCSecurityContext.cpp @@ -238,7 +238,7 @@ nsCSecurityContext::nsCSecurityContext(JSContext* cx) m_HasUniversalBrowserReadCapability(PR_FALSE) { MOZ_COUNT_CTOR(nsCSecurityContext); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // Get the Script Security Manager. @@ -282,7 +282,7 @@ nsCSecurityContext::nsCSecurityContext(nsIPrincipal *principal) m_HasUniversalBrowserReadCapability(PR_FALSE) { MOZ_COUNT_CTOR(nsCSecurityContext); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // Get the Script Security Manager. diff --git a/modules/oji/tests/src/TestLoader/OJITestLoader.cpp b/modules/oji/tests/src/TestLoader/OJITestLoader.cpp index e641a96d97a7..a98adde44936 100755 --- a/modules/oji/tests/src/TestLoader/OJITestLoader.cpp +++ b/modules/oji/tests/src/TestLoader/OJITestLoader.cpp @@ -30,7 +30,7 @@ NS_IMPL_ISUPPORTS1(OJITestLoader, OJITestLoader) OJITestLoader::OJITestLoader(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); TestResult* res = NULL; char** testCase = loadTestList(); diff --git a/modules/oji/tests/src/TestLoader/OJITestLoaderFactory.cpp b/modules/oji/tests/src/TestLoader/OJITestLoaderFactory.cpp index a849c9c95354..9d674ec9a9d6 100755 --- a/modules/oji/tests/src/TestLoader/OJITestLoaderFactory.cpp +++ b/modules/oji/tests/src/TestLoader/OJITestLoaderFactory.cpp @@ -170,7 +170,7 @@ OJITestLoaderFactory::LockFactory(PRBool aLock) OJITestLoaderFactory::OJITestLoaderFactory(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } OJITestLoaderFactory::~OJITestLoaderFactory() diff --git a/modules/plugin/base/src/ns4xPlugin.cpp b/modules/plugin/base/src/ns4xPlugin.cpp index e0f8fed29b39..91c158d0e1c6 100644 --- a/modules/plugin/base/src/ns4xPlugin.cpp +++ b/modules/plugin/base/src/ns4xPlugin.cpp @@ -252,7 +252,7 @@ NS_IMPL_ISUPPORTS2(ns4xPlugin, nsIPlugin, nsIFactory); ns4xPlugin::ns4xPlugin(NPPluginFuncs* callbacks, PRLibrary* aLibrary, NP_PLUGINSHUTDOWN aShutdown, nsIServiceManagerObsolete* serviceMgr) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); memset((void*) &fCallbacks, 0, sizeof(fCallbacks)); gServiceMgr = serviceMgr; fLibrary = nsnull; diff --git a/modules/plugin/base/src/ns4xPluginInstance.cpp b/modules/plugin/base/src/ns4xPluginInstance.cpp index 160c559c861d..d34075d9b99f 100644 --- a/modules/plugin/base/src/ns4xPluginInstance.cpp +++ b/modules/plugin/base/src/ns4xPluginInstance.cpp @@ -94,7 +94,7 @@ ns4xPluginStreamListener::ns4xPluginStreamListener(nsIPluginInstance* inst, mCallNotify(PR_FALSE), mStreamInfo(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mInst = (ns4xPluginInstance*) inst; mPosition = 0; mStreamBufferSize = 0; @@ -570,7 +570,7 @@ NS_IMPL_ISUPPORTS2(ns4xPluginInstance, nsIPluginInstance, nsIScriptablePlugin) ns4xPluginInstance :: ns4xPluginInstance(NPPluginFuncs* callbacks, PRLibrary* aLibrary) : fCallbacks(callbacks) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ASSERTION(fCallbacks != NULL, "null callbacks"); diff --git a/modules/plugin/base/src/nsPluginHostImpl.cpp b/modules/plugin/base/src/nsPluginHostImpl.cpp index a1131b4fe6f9..8cbd0b5ce335 100644 --- a/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -1383,7 +1383,7 @@ private: //////////////////////////////////////////////////////////////////////// nsPluginStreamInfo::nsPluginStreamInfo() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mPluginInstance = nsnull; mPluginStreamListenerPeer = nsnull; @@ -1695,7 +1695,7 @@ private: //////////////////////////////////////////////////////////////////////// nsPluginCacheListener::nsPluginCacheListener(nsPluginStreamListenerPeer* aListener) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mListener = aListener; NS_ADDREF(mListener); @@ -1757,7 +1757,7 @@ nsPluginCacheListener::OnStopRequest(nsIRequest *request, nsPluginStreamListenerPeer::nsPluginStreamListenerPeer() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mURL = nsnull; mOwner = nsnull; @@ -2644,7 +2644,7 @@ nsPluginStreamListenerPeer::VisitHeader(const nsACString &header, const nsACStri nsPluginHostImpl::nsPluginHostImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mPluginsLoaded = PR_FALSE; mDontShowBadPluginMessage = PR_FALSE; mIsDestroyed = PR_FALSE; @@ -6524,7 +6524,7 @@ nsresult nsPluginStreamListenerPeer::ServeStreamAsFile(nsIRequest *request, NS_IMPL_ISUPPORTS1(nsPluginByteRangeStreamListener, nsIStreamListener) nsPluginByteRangeStreamListener::nsPluginByteRangeStreamListener(nsIWeakReference* aWeakPtr) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mWeakPtrPluginStreamListenerPeer = aWeakPtr; mRemoveMagicNumber = PR_FALSE; } diff --git a/modules/plugin/base/src/nsPluginInstancePeer.cpp b/modules/plugin/base/src/nsPluginInstancePeer.cpp index 018fd17e9723..a71418eb3873 100644 --- a/modules/plugin/base/src/nsPluginInstancePeer.cpp +++ b/modules/plugin/base/src/nsPluginInstancePeer.cpp @@ -65,7 +65,7 @@ nsPluginInstancePeerImpl::nsPluginInstancePeerImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mInstance = nsnull; mOwner = nsnull; @@ -155,7 +155,7 @@ nsPluginStreamToFile::nsPluginStreamToFile(const char* target, nsIPluginInstance mTarget(PL_strdup(target)), mOwner(owner) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); nsresult rv; nsCOMPtr pluginTmp; diff --git a/modules/plugin/base/src/nsPluginStreamPeer.cpp b/modules/plugin/base/src/nsPluginStreamPeer.cpp index 5bafcf13de06..b2b579a0d55f 100644 --- a/modules/plugin/base/src/nsPluginStreamPeer.cpp +++ b/modules/plugin/base/src/nsPluginStreamPeer.cpp @@ -42,7 +42,7 @@ nsPluginStreamPeer :: nsPluginStreamPeer() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mURL = nsnull; mLength = 0; diff --git a/modules/plugin/base/src/nsPluginViewer.cpp b/modules/plugin/base/src/nsPluginViewer.cpp index c04330183809..e6e839e1eb54 100644 --- a/modules/plugin/base/src/nsPluginViewer.cpp +++ b/modules/plugin/base/src/nsPluginViewer.cpp @@ -199,7 +199,7 @@ NS_NewPluginContentViewer(const char* aCommand, // Note: operator new zeros our memory PluginViewerImpl::PluginViewerImpl(const char* aCommand) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mEnableRendering = PR_TRUE; } @@ -964,7 +964,7 @@ PluginViewerImpl::CopyImageContents() PluginListener::PluginListener(PluginViewerImpl* aViewer) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mViewer = aViewer; NS_ADDREF(aViewer); } @@ -1016,7 +1016,7 @@ PluginListener::OnDataAvailable(nsIRequest *request, nsISupports *ctxt, pluginInstanceOwner :: pluginInstanceOwner() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); memset(&mPluginWindow, 0, sizeof(mPluginWindow)); mInstance = nsnull; diff --git a/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp b/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp index e425d59a21cc..2f352991b052 100644 --- a/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp +++ b/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp @@ -91,7 +91,7 @@ nsSanePluginInstance::nsSanePluginInstance( void ) printf("nsSanePluginInstance::nsSanePluginInstance()\n"); #endif - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); PR_AtomicIncrement(&gPluginObjectCount); // set default jpeg compression attributes @@ -1994,7 +1994,7 @@ nsSanePluginStreamListener::nsSanePluginStreamListener(nsSanePluginInstance* ins #endif PR_AtomicIncrement(&gPluginObjectCount); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mPlugInst = inst; } diff --git a/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp b/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp index 1e7d6c27498a..9270dfc4af06 100644 --- a/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp +++ b/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp @@ -48,7 +48,7 @@ nsSanePluginFactoryImpl::nsSanePluginFactoryImpl( const nsCID &aClass, printf("nsSanePluginFactoryImpl::nsSanePluginFactoryImpl()\n"); #endif - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/modules/plugin/samples/backward/badapter.cpp b/modules/plugin/samples/backward/badapter.cpp index 035d10b17009..d09a59b7fb67 100644 --- a/modules/plugin/samples/backward/badapter.cpp +++ b/modules/plugin/samples/backward/badapter.cpp @@ -1072,7 +1072,7 @@ NPP_HandleEvent(NPP instance, void* event) CPluginManager::CPluginManager(void) { // Set reference count to 0. - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mLiveconnect = NULL; } @@ -1375,7 +1375,7 @@ CPluginInstancePeer::CPluginInstancePeer(nsIPluginInstance* pluginInstance, attribute_list(NULL), values_list(NULL) { // Set the reference count to 0. - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_IF_ADDREF(mInstance); @@ -1621,7 +1621,7 @@ CPluginManagerStream::CPluginManagerStream(NPP npp, NPStream* pstr) : npp(npp), pstream(pstr) { // Set the reference count to 0. - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } CPluginManagerStream::~CPluginManagerStream(void) @@ -1726,7 +1726,7 @@ CPluginInputStream::CPluginInputStream(nsIPluginStreamListener* listener) mBuffer(NULL), mBufferLength(0), mAmountRead(0), mStreamInfo(NULL) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (mListener != NULL) { mListener->AddRef(); diff --git a/modules/plugin/samples/simple/npsimple.cpp b/modules/plugin/samples/simple/npsimple.cpp index d08cc6a3b6b6..d18c9ad2f4cd 100644 --- a/modules/plugin/samples/simple/npsimple.cpp +++ b/modules/plugin/samples/simple/npsimple.cpp @@ -496,7 +496,7 @@ SimplePluginInstance::UnregisterSelf(nsIComponentManager* aCompMgr, SimplePluginInstance::SimplePluginInstance(void) : fText(NULL), fPeer(NULL), fWindow(NULL), fMode(nsPluginMode_Embedded) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); static const char text[] = "Hello World!"; fText = (char*) nsMemory::Clone(text, sizeof(text)); @@ -811,7 +811,7 @@ SimplePluginStreamListener::SimplePluginStreamListener(SimplePluginInstance* ins const char* msgName) : fMessageName(msgName) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); char msg[256]; sprintf(msg, "### Creating SimplePluginStreamListener for %s\n", fMessageName); } diff --git a/modules/plugin/samples/testevents/npevents.cpp b/modules/plugin/samples/testevents/npevents.cpp index 5cd79c8c1666..d594a5892e89 100644 --- a/modules/plugin/samples/testevents/npevents.cpp +++ b/modules/plugin/samples/testevents/npevents.cpp @@ -337,7 +337,7 @@ NS_IMPL_ISUPPORTS2(EventsPluginInstance, nsIPluginInstance, nsIEventsSampleInsta EventsPluginInstance::EventsPluginInstance() : fPeer(NULL), fWindow(NULL), fMode(nsPluginMode_Embedded) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); wChild = 0; } @@ -560,7 +560,7 @@ NS_METHOD EventsPluginInstance::GetValue(nsPluginInstanceVariable /*variable*/, EventsPluginStreamListener::EventsPluginStreamListener(EventsPluginInstance* inst_, const char* msgName) : fMessageName(msgName), inst(inst_) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef EVENTSPLUGIN_DEBUG printf("EventsPluginStreamListener: EventsPluginStreamListener for %s\n", fMessageName); #endif diff --git a/modules/staticmod/macbuild/nsMetaModule_crypto.cpp b/modules/staticmod/macbuild/nsMetaModule_crypto.cpp index c879f11bacc8..cfa3b3f5abdb 100644 --- a/modules/staticmod/macbuild/nsMetaModule_crypto.cpp +++ b/modules/staticmod/macbuild/nsMetaModule_crypto.cpp @@ -90,7 +90,7 @@ public: nsMetaModuleImpl::nsMetaModuleImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMetaModuleImpl::~nsMetaModuleImpl() diff --git a/modules/staticmod/macbuild/nsMetaModule_mail.cpp b/modules/staticmod/macbuild/nsMetaModule_mail.cpp index 08d27c9abbda..e3e96100dcf1 100644 --- a/modules/staticmod/macbuild/nsMetaModule_mail.cpp +++ b/modules/staticmod/macbuild/nsMetaModule_mail.cpp @@ -122,7 +122,7 @@ public: nsMetaModuleImpl::nsMetaModuleImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMetaModuleImpl::~nsMetaModuleImpl() diff --git a/netwerk/base/src/nsAsyncStreamListener.h b/netwerk/base/src/nsAsyncStreamListener.h index eef759e3aab6..b3a417d25852 100644 --- a/netwerk/base/src/nsAsyncStreamListener.h +++ b/netwerk/base/src/nsAsyncStreamListener.h @@ -56,7 +56,7 @@ public: // nsAsyncStreamObserver methods: nsAsyncStreamObserver() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } virtual ~nsAsyncStreamObserver() {} diff --git a/netwerk/base/src/nsBufferedStreams.cpp b/netwerk/base/src/nsBufferedStreams.cpp index cfd47e45e45a..cf1af0d30c2b 100644 --- a/netwerk/base/src/nsBufferedStreams.cpp +++ b/netwerk/base/src/nsBufferedStreams.cpp @@ -74,7 +74,7 @@ nsBufferedStream::nsBufferedStream() mBufferDisabled(PR_FALSE), mGetBufferCount(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsBufferedStream::~nsBufferedStream() diff --git a/netwerk/base/src/nsDirectoryIndexStream.cpp b/netwerk/base/src/nsDirectoryIndexStream.cpp index 657100b9cbc4..d9ec2000a61d 100644 --- a/netwerk/base/src/nsDirectoryIndexStream.cpp +++ b/netwerk/base/src/nsDirectoryIndexStream.cpp @@ -81,7 +81,7 @@ static NS_DEFINE_CID(kCollationFactoryCID, NS_COLLATIONFACTORY_CID); nsDirectoryIndexStream::nsDirectoryIndexStream() : mOffset(0), mPos(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef PR_LOGGING if (! gLog) diff --git a/netwerk/base/src/nsDownloader.h b/netwerk/base/src/nsDownloader.h index 2a46d2a4c831..9e5b4db1459b 100644 --- a/netwerk/base/src/nsDownloader.h +++ b/netwerk/base/src/nsDownloader.h @@ -53,7 +53,7 @@ public: NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER - nsDownloader() { NS_INIT_REFCNT();} ; + nsDownloader() { NS_INIT_ISUPPORTS();} ; virtual ~nsDownloader() {}; static NS_METHOD diff --git a/netwerk/base/src/nsFileStreams.cpp b/netwerk/base/src/nsFileStreams.cpp index d7e42638195f..da6e963e001a 100644 --- a/netwerk/base/src/nsFileStreams.cpp +++ b/netwerk/base/src/nsFileStreams.cpp @@ -107,7 +107,7 @@ nsFileIO::nsFileIO() mPerm(0), mStatus(NS_OK) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #if defined(PR_LOGGING) // // Initialize the global PRLogModule for socket transport logging @@ -401,7 +401,7 @@ nsFileStream::nsFileStream() : mFD(nsnull) , mCloseFD(PR_TRUE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsFileStream::~nsFileStream() diff --git a/netwerk/base/src/nsFileTransportService.cpp b/netwerk/base/src/nsFileTransportService.cpp index 8177495085aa..991f5f12e65d 100644 --- a/netwerk/base/src/nsFileTransportService.cpp +++ b/netwerk/base/src/nsFileTransportService.cpp @@ -61,7 +61,7 @@ nsFileTransportService::nsFileTransportService() : mShuttingDown(PR_FALSE), mLock(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mInstance = this; } diff --git a/netwerk/base/src/nsIOService.cpp b/netwerk/base/src/nsIOService.cpp index 3267220e601d..b8053e31b867 100644 --- a/netwerk/base/src/nsIOService.cpp +++ b/netwerk/base/src/nsIOService.cpp @@ -155,7 +155,7 @@ nsIOService::nsIOService() : mOffline(PR_FALSE), mOfflineForProfileChange(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // Get the allocator ready if (!gBufferCache) diff --git a/netwerk/base/src/nsInputStreamChannel.cpp b/netwerk/base/src/nsInputStreamChannel.cpp index 668a06c30cc8..f868d7e10fc5 100644 --- a/netwerk/base/src/nsInputStreamChannel.cpp +++ b/netwerk/base/src/nsInputStreamChannel.cpp @@ -55,7 +55,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS2(nsInputStreamIO, nsInputStreamIO::nsInputStreamIO() : mContentLength(-1), mStatus(NS_OK) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsInputStreamIO::~nsInputStreamIO() @@ -160,7 +160,7 @@ nsStreamIOChannel::nsStreamIOChannel() mBufferSegmentSize(0), mBufferMaxSize(0), mLoadFlags(LOAD_NORMAL), mStatus(NS_OK) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsStreamIOChannel::~nsStreamIOChannel() diff --git a/netwerk/base/src/nsNetModRegEntry.cpp b/netwerk/base/src/nsNetModRegEntry.cpp index 31a1a290254d..7a2d61adb5b5 100644 --- a/netwerk/base/src/nsNetModRegEntry.cpp +++ b/netwerk/base/src/nsNetModRegEntry.cpp @@ -156,7 +156,7 @@ nsNetModRegEntry::nsNetModRegEntry(const char *aTopic, nsINetNotify *aNotify, nsresult *result) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mTopic = new char [PL_strlen(aTopic) + 1]; PL_strcpy(mTopic, aTopic); diff --git a/netwerk/base/src/nsNetModuleMgr.cpp b/netwerk/base/src/nsNetModuleMgr.cpp index 9f305f70e7cd..35e028f9284f 100644 --- a/netwerk/base/src/nsNetModuleMgr.cpp +++ b/netwerk/base/src/nsNetModuleMgr.cpp @@ -188,7 +188,7 @@ nsNetModuleMgr::EnumerateModules(const char *aTopic, nsISimpleEnumerator **aEnum /////////////////////////////////// nsNetModuleMgr::nsNetModuleMgr() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_NewISupportsArray(&mEntries); mMonitor = nsAutoMonitor::NewMonitor("nsNetModuleMgr"); } diff --git a/netwerk/base/src/nsProtocolProxyService.cpp b/netwerk/base/src/nsProtocolProxyService.cpp index 90f463b6ea8b..44663a999414 100644 --- a/netwerk/base/src/nsProtocolProxyService.cpp +++ b/netwerk/base/src/nsProtocolProxyService.cpp @@ -69,7 +69,7 @@ nsProtocolProxyService::nsProtocolProxyService(): mPAC(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsProtocolProxyService::~nsProtocolProxyService() diff --git a/netwerk/base/src/nsProtocolProxyService.h b/netwerk/base/src/nsProtocolProxyService.h index 93b18687db21..22e9990dd619 100644 --- a/netwerk/base/src/nsProtocolProxyService.h +++ b/netwerk/base/src/nsProtocolProxyService.h @@ -85,7 +85,7 @@ public: } nsProxyInfo() : mType(nsnull), mHost(nsnull), mPort(-1) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } char* mType; diff --git a/netwerk/base/src/nsSocketTransport.cpp b/netwerk/base/src/nsSocketTransport.cpp index 95fb5a6e141f..a78ae665ce99 100644 --- a/netwerk/base/src/nsSocketTransport.cpp +++ b/netwerk/base/src/nsSocketTransport.cpp @@ -193,7 +193,7 @@ nsSocketTransport::nsSocketTransport(): mReadRequest(nsnull), mWriteRequest(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #if defined(PR_LOGGING) if (!gSocketTransportLog) diff --git a/netwerk/base/src/nsSocketTransportService.cpp b/netwerk/base/src/nsSocketTransportService.cpp index 26b8ef039086..488b3fdb992e 100644 --- a/netwerk/base/src/nsSocketTransportService.cpp +++ b/netwerk/base/src/nsSocketTransportService.cpp @@ -78,7 +78,7 @@ nsSocketTransportService::nsSocketTransportService () : #endif LOG(("nsSocketTransportService::nsSocketTransportService")); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); PR_INIT_CLIST(&mWorkQ); diff --git a/netwerk/base/src/nsStreamLoader.h b/netwerk/base/src/nsStreamLoader.h index b91658fd6388..66cb38a4b4c6 100644 --- a/netwerk/base/src/nsStreamLoader.h +++ b/netwerk/base/src/nsStreamLoader.h @@ -52,7 +52,7 @@ public: NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER - nsStreamLoader() { NS_INIT_REFCNT(); }; + nsStreamLoader() { NS_INIT_ISUPPORTS(); }; virtual ~nsStreamLoader() {}; static NS_METHOD diff --git a/netwerk/base/src/nsSyncStreamListener.h b/netwerk/base/src/nsSyncStreamListener.h index fd11c1818110..51f0633ee3ae 100644 --- a/netwerk/base/src/nsSyncStreamListener.h +++ b/netwerk/base/src/nsSyncStreamListener.h @@ -35,7 +35,7 @@ public: // nsSyncStreamListener methods: nsSyncStreamListener() : mOutputStream(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } virtual ~nsSyncStreamListener(); diff --git a/netwerk/base/src/nsURIChecker.cpp b/netwerk/base/src/nsURIChecker.cpp index 2ddcc0253a40..12c826262ecd 100644 --- a/netwerk/base/src/nsURIChecker.cpp +++ b/netwerk/base/src/nsURIChecker.cpp @@ -53,7 +53,7 @@ NS_IMPL_ISUPPORTS5(nsURIChecker, nsIURIChecker, nsURIChecker::nsURIChecker() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mStatus = NS_OK; mIsPending = PR_FALSE; } diff --git a/netwerk/base/src/nsUnicharStreamLoader.h b/netwerk/base/src/nsUnicharStreamLoader.h index 528c937f8dda..3d0713742f45 100644 --- a/netwerk/base/src/nsUnicharStreamLoader.h +++ b/netwerk/base/src/nsUnicharStreamLoader.h @@ -56,7 +56,7 @@ public: NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSISTREAMLISTENER - nsUnicharStreamLoader() { NS_INIT_REFCNT(); } + nsUnicharStreamLoader() { NS_INIT_ISUPPORTS(); } virtual ~nsUnicharStreamLoader() {}; static NS_METHOD diff --git a/netwerk/base/tests/urltest.cpp b/netwerk/base/tests/urltest.cpp index bfc29e017a9f..816de77ac9e2 100644 --- a/netwerk/base/tests/urltest.cpp +++ b/netwerk/base/tests/urltest.cpp @@ -104,7 +104,7 @@ protected: TestConsumer::TestConsumer() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/netwerk/cache/src/nsCacheService.cpp b/netwerk/cache/src/nsCacheService.cpp index cb23bd097c00..19d82f9e8c93 100644 --- a/netwerk/cache/src/nsCacheService.cpp +++ b/netwerk/cache/src/nsCacheService.cpp @@ -373,7 +373,7 @@ nsCacheService::nsCacheService() mDeactivateFailures(0), mDeactivatedUnboundEntries(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ASSERTION(gService==nsnull, "multiple nsCacheService instances!"); gService = this; diff --git a/netwerk/dns/src/nsDnsService.cpp b/netwerk/dns/src/nsDnsService.cpp index 81ea2e850338..07e8c1c36757 100644 --- a/netwerk/dns/src/nsDnsService.cpp +++ b/netwerk/dns/src/nsDnsService.cpp @@ -138,7 +138,7 @@ public: , mStartTime(PR_IntervalNow()) #endif { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); PR_INIT_CLIST(this); } @@ -530,7 +530,7 @@ nsDNSLookup::nsDNSLookup() , mFlags(eCacheableMask) , mExpires(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); MOZ_COUNT_CTOR(nsDNSLookup); PR_INIT_CLIST(this); PR_INIT_CLIST(&mRequestQ); @@ -918,7 +918,7 @@ nsDNSService::nsDNSService() , mOut(nsnull) #endif { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ASSERTION(gService==nsnull,"multiple nsDNSServices allocated!"); gService = this; diff --git a/netwerk/mime/src/nsMIMEInfoImpl.cpp b/netwerk/mime/src/nsMIMEInfoImpl.cpp index f6545b52dc41..716e8829f66b 100644 --- a/netwerk/mime/src/nsMIMEInfoImpl.cpp +++ b/netwerk/mime/src/nsMIMEInfoImpl.cpp @@ -50,12 +50,12 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsMIMEInfoImpl, nsIMIMEInfo); // nsMIMEInfoImpl methods nsMIMEInfoImpl::nsMIMEInfoImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mPreferredAction = nsIMIMEInfo::saveToDisk; } nsMIMEInfoImpl::nsMIMEInfoImpl(const char *aMIMEType) :mMIMEType( aMIMEType ){ - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mPreferredAction = nsIMIMEInfo::saveToDisk; } diff --git a/netwerk/mime/src/nsMIMEService.cpp b/netwerk/mime/src/nsMIMEService.cpp index 68b88a66137c..07a0d8579ca1 100644 --- a/netwerk/mime/src/nsMIMEService.cpp +++ b/netwerk/mime/src/nsMIMEService.cpp @@ -69,7 +69,7 @@ nsMIMEService::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult) { // nsMIMEService methods nsMIMEService::nsMIMEService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMIMEService::~nsMIMEService() { diff --git a/netwerk/mime/src/nsXMLMIMEDataSource.cpp b/netwerk/mime/src/nsXMLMIMEDataSource.cpp index c1dab32e13f7..8560d37bb5ee 100644 --- a/netwerk/mime/src/nsXMLMIMEDataSource.cpp +++ b/netwerk/mime/src/nsXMLMIMEDataSource.cpp @@ -90,7 +90,7 @@ nsXMLMIMEDataSource::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResu // nsXMLMIMEDataSource methods nsXMLMIMEDataSource::nsXMLMIMEDataSource() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsXMLMIMEDataSource::~nsXMLMIMEDataSource() { diff --git a/netwerk/protocol/about/src/nsAboutBlank.h b/netwerk/protocol/about/src/nsAboutBlank.h index cc6ad16a0364..a884b7e6aef1 100644 --- a/netwerk/protocol/about/src/nsAboutBlank.h +++ b/netwerk/protocol/about/src/nsAboutBlank.h @@ -47,7 +47,7 @@ public: NS_DECL_NSIABOUTMODULE - nsAboutBlank() { NS_INIT_REFCNT(); } + nsAboutBlank() { NS_INIT_ISUPPORTS(); } virtual ~nsAboutBlank() {} static NS_METHOD diff --git a/netwerk/protocol/about/src/nsAboutBloat.h b/netwerk/protocol/about/src/nsAboutBloat.h index e015e2168a30..ede6a685290d 100644 --- a/netwerk/protocol/about/src/nsAboutBloat.h +++ b/netwerk/protocol/about/src/nsAboutBloat.h @@ -47,7 +47,7 @@ public: NS_DECL_NSIABOUTMODULE - nsAboutBloat() { NS_INIT_REFCNT(); } + nsAboutBloat() { NS_INIT_ISUPPORTS(); } virtual ~nsAboutBloat() {} static NS_METHOD diff --git a/netwerk/protocol/about/src/nsAboutCache.h b/netwerk/protocol/about/src/nsAboutCache.h index efeab7af5853..5d0585d828ae 100644 --- a/netwerk/protocol/about/src/nsAboutCache.h +++ b/netwerk/protocol/about/src/nsAboutCache.h @@ -54,7 +54,7 @@ public: NS_DECL_NSIABOUTMODULE NS_DECL_NSICACHEVISITOR - nsAboutCache() { NS_INIT_REFCNT(); } + nsAboutCache() { NS_INIT_ISUPPORTS(); } virtual ~nsAboutCache() {} static NS_METHOD diff --git a/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp b/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp index 7a02af9da870..cff2b976dda1 100644 --- a/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp +++ b/netwerk/protocol/about/src/nsAboutProtocolHandler.cpp @@ -53,7 +53,7 @@ static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); nsAboutProtocolHandler::nsAboutProtocolHandler() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult diff --git a/netwerk/protocol/about/src/nsAboutRedirector.h b/netwerk/protocol/about/src/nsAboutRedirector.h index 2d1f0cd7b3fd..74829a95f2fa 100644 --- a/netwerk/protocol/about/src/nsAboutRedirector.h +++ b/netwerk/protocol/about/src/nsAboutRedirector.h @@ -48,7 +48,7 @@ public: NS_DECL_NSIABOUTMODULE - nsAboutRedirector() { NS_INIT_REFCNT(); } + nsAboutRedirector() { NS_INIT_ISUPPORTS(); } virtual ~nsAboutRedirector() {} static NS_METHOD diff --git a/netwerk/protocol/data/src/nsDataChannel.cpp b/netwerk/protocol/data/src/nsDataChannel.cpp index 6d9ce59600af..86db852acf33 100644 --- a/netwerk/protocol/data/src/nsDataChannel.cpp +++ b/netwerk/protocol/data/src/nsDataChannel.cpp @@ -56,7 +56,7 @@ static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); // nsDataChannel methods nsDataChannel::nsDataChannel() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mStatus = NS_OK; mContentLength = -1; diff --git a/netwerk/protocol/data/src/nsDataHandler.cpp b/netwerk/protocol/data/src/nsDataHandler.cpp index 91729e4f6360..ba0c002e58a9 100644 --- a/netwerk/protocol/data/src/nsDataHandler.cpp +++ b/netwerk/protocol/data/src/nsDataHandler.cpp @@ -52,7 +52,7 @@ static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); //////////////////////////////////////////////////////////////////////////////// nsDataHandler::nsDataHandler() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDataHandler::~nsDataHandler() { diff --git a/netwerk/protocol/file/src/nsFileChannel.cpp b/netwerk/protocol/file/src/nsFileChannel.cpp index ba9f82dae93d..be1e3a46d83d 100644 --- a/netwerk/protocol/file/src/nsFileChannel.cpp +++ b/netwerk/protocol/file/src/nsFileChannel.cpp @@ -72,7 +72,7 @@ nsFileChannel::nsFileChannel() ,mInitiator(nsnull) #endif { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult diff --git a/netwerk/protocol/file/src/nsFileProtocolHandler.cpp b/netwerk/protocol/file/src/nsFileProtocolHandler.cpp index 543242249dd5..b37173aa9232 100644 --- a/netwerk/protocol/file/src/nsFileProtocolHandler.cpp +++ b/netwerk/protocol/file/src/nsFileProtocolHandler.cpp @@ -63,7 +63,7 @@ static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); nsFileProtocolHandler::nsFileProtocolHandler() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mGenerateHTMLContent = PR_FALSE; } diff --git a/netwerk/protocol/ftp/src/nsFTPChannel.cpp b/netwerk/protocol/ftp/src/nsFTPChannel.cpp index 49edf3a51ab4..4422411e3459 100644 --- a/netwerk/protocol/ftp/src/nsFTPChannel.cpp +++ b/netwerk/protocol/ftp/src/nsFTPChannel.cpp @@ -87,7 +87,7 @@ nsFTPChannel::nsFTPChannel() mStatus(NS_OK), mCanceled(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsFTPChannel::~nsFTPChannel() diff --git a/netwerk/protocol/ftp/src/nsFtpControlConnection.cpp b/netwerk/protocol/ftp/src/nsFtpControlConnection.cpp index 80a3e3758ae6..565155e45b19 100644 --- a/netwerk/protocol/ftp/src/nsFtpControlConnection.cpp +++ b/netwerk/protocol/ftp/src/nsFtpControlConnection.cpp @@ -112,7 +112,7 @@ nsFtpControlConnection::nsFtpControlConnection(const char* host, PRUint32 port) : mServerType(0), mSuspendedWrite(0), mPort(port) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); PR_LOG(gFTPLog, PR_LOG_ALWAYS, ("(%x) nsFtpControlConnection created", this)); mHost.Adopt(nsCRT::strdup(host)); diff --git a/netwerk/protocol/gopher/src/nsGopherChannel.cpp b/netwerk/protocol/gopher/src/nsGopherChannel.cpp index 937b0ccffe39..0e7a86fa831c 100644 --- a/netwerk/protocol/gopher/src/nsGopherChannel.cpp +++ b/netwerk/protocol/gopher/src/nsGopherChannel.cpp @@ -60,7 +60,7 @@ nsGopherChannel::nsGopherChannel() mType(-1), mStatus(NS_OK) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsGopherChannel::~nsGopherChannel() diff --git a/netwerk/protocol/gopher/src/nsGopherHandler.cpp b/netwerk/protocol/gopher/src/nsGopherHandler.cpp index 91e54ac8ed7f..42456bd15813 100644 --- a/netwerk/protocol/gopher/src/nsGopherHandler.cpp +++ b/netwerk/protocol/gopher/src/nsGopherHandler.cpp @@ -49,7 +49,7 @@ static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID); //////////////////////////////////////////////////////////////////////////////// nsGopherHandler::nsGopherHandler() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef PR_LOGGING if (!gGopherLog) gGopherLog = PR_NewLogModule("nsGopherProtocol"); diff --git a/netwerk/protocol/jar/src/nsJARChannel.cpp b/netwerk/protocol/jar/src/nsJARChannel.cpp index f67601a2acf4..00333c1e0779 100644 --- a/netwerk/protocol/jar/src/nsJARChannel.cpp +++ b/netwerk/protocol/jar/src/nsJARChannel.cpp @@ -70,7 +70,7 @@ nsJARChannel::nsJARChannel() , mInitiator(nsnull) #endif { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #if defined(PR_LOGGING) // diff --git a/netwerk/protocol/jar/src/nsJARProtocolHandler.cpp b/netwerk/protocol/jar/src/nsJARProtocolHandler.cpp index 9daa44628c61..080c806af7e7 100644 --- a/netwerk/protocol/jar/src/nsJARProtocolHandler.cpp +++ b/netwerk/protocol/jar/src/nsJARProtocolHandler.cpp @@ -58,7 +58,7 @@ static NS_DEFINE_CID(kZipReaderCacheCID, NS_ZIPREADERCACHE_CID); nsJARProtocolHandler::nsJARProtocolHandler() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult diff --git a/netwerk/protocol/jar/src/nsJARURI.cpp b/netwerk/protocol/jar/src/nsJARURI.cpp index 9d57b3512ab7..6e0082c96208 100644 --- a/netwerk/protocol/jar/src/nsJARURI.cpp +++ b/netwerk/protocol/jar/src/nsJARURI.cpp @@ -32,7 +32,7 @@ nsJARURI::nsJARURI() : mJAREntry(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsJARURI::~nsJARURI() diff --git a/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp b/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp index 140bb6a47ac1..4722a485bbec 100644 --- a/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp +++ b/netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp @@ -54,7 +54,7 @@ static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); //////////////////////////////////////////////////////////////////////////////// nsKeywordProtocolHandler::nsKeywordProtocolHandler() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult diff --git a/netwerk/protocol/res/src/nsResProtocolHandler.cpp b/netwerk/protocol/res/src/nsResProtocolHandler.cpp index 70ebb32935fb..e9213fa64d36 100644 --- a/netwerk/protocol/res/src/nsResProtocolHandler.cpp +++ b/netwerk/protocol/res/src/nsResProtocolHandler.cpp @@ -101,7 +101,7 @@ nsResURL::GetFile(nsIFile **result) nsResProtocolHandler::nsResProtocolHandler() : mSubstitutions(32) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #if defined(PR_LOGGING) gResLog = PR_NewLogModule("nsResProtocol"); diff --git a/netwerk/protocol/viewsource/src/nsViewSourceChannel.cpp b/netwerk/protocol/viewsource/src/nsViewSourceChannel.cpp index 190bbc4dcd33..9156cbec6597 100644 --- a/netwerk/protocol/viewsource/src/nsViewSourceChannel.cpp +++ b/netwerk/protocol/viewsource/src/nsViewSourceChannel.cpp @@ -34,7 +34,7 @@ // nsViewSourceChannel methods nsViewSourceChannel::nsViewSourceChannel() : mIsDocument(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsViewSourceChannel::~nsViewSourceChannel() diff --git a/netwerk/protocol/viewsource/src/nsViewSourceHandler.cpp b/netwerk/protocol/viewsource/src/nsViewSourceHandler.cpp index 1752f59632c7..68da8adfc247 100644 --- a/netwerk/protocol/viewsource/src/nsViewSourceHandler.cpp +++ b/netwerk/protocol/viewsource/src/nsViewSourceHandler.cpp @@ -48,7 +48,7 @@ static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); //////////////////////////////////////////////////////////////////////////////// nsViewSourceHandler::nsViewSourceHandler() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsViewSourceHandler::~nsViewSourceHandler() { diff --git a/netwerk/socket/base/nsSOCKS4SocketProvider.cpp b/netwerk/socket/base/nsSOCKS4SocketProvider.cpp index eccd91697ea1..6fc1de6dd84f 100644 --- a/netwerk/socket/base/nsSOCKS4SocketProvider.cpp +++ b/netwerk/socket/base/nsSOCKS4SocketProvider.cpp @@ -30,7 +30,7 @@ nsSOCKS4SocketProvider::nsSOCKS4SocketProvider() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult diff --git a/netwerk/socket/base/nsSOCKSIOLayer.cpp b/netwerk/socket/base/nsSOCKSIOLayer.cpp index 1e10f779d361..8e51293553a7 100644 --- a/netwerk/socket/base/nsSOCKSIOLayer.cpp +++ b/netwerk/socket/base/nsSOCKSIOLayer.cpp @@ -76,7 +76,7 @@ protected: nsSOCKSSocketInfo::nsSOCKSSocketInfo() : mSOCKSVersion(-1) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mProxyHost = nsnull; mProxyPort = -1; diff --git a/netwerk/socket/base/nsSOCKSSocketProvider.cpp b/netwerk/socket/base/nsSOCKSSocketProvider.cpp index e4957e3b2654..b350a2468c79 100644 --- a/netwerk/socket/base/nsSOCKSSocketProvider.cpp +++ b/netwerk/socket/base/nsSOCKSSocketProvider.cpp @@ -30,7 +30,7 @@ nsSOCKSSocketProvider::nsSOCKSSocketProvider() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult diff --git a/netwerk/socket/base/nsSocketProviderService.cpp b/netwerk/socket/base/nsSocketProviderService.cpp index d7d09d399003..1f8a3edd85bb 100644 --- a/netwerk/socket/base/nsSocketProviderService.cpp +++ b/netwerk/socket/base/nsSocketProviderService.cpp @@ -45,7 +45,7 @@ nsSocketProviderService::nsSocketProviderService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult diff --git a/netwerk/streamconv/converters/nsDirIndex.cpp b/netwerk/streamconv/converters/nsDirIndex.cpp index 5280e1ba635a..e05d58c41cef 100644 --- a/netwerk/streamconv/converters/nsDirIndex.cpp +++ b/netwerk/streamconv/converters/nsDirIndex.cpp @@ -38,6 +38,7 @@ #include "nsDirIndex.h" #include "nsReadableUtils.h" #include "nsCRT.h" +#include "nsISupportsObsolete.h" NS_IMPL_THREADSAFE_ISUPPORTS1(nsDirIndex, nsIDirIndex); @@ -45,7 +46,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsDirIndex, nsDirIndex::nsDirIndex() : mType(TYPE_UNKNOWN), mSize((PRUint32)(-1)), mLastModified(-1) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); }; nsDirIndex::~nsDirIndex() {}; diff --git a/netwerk/streamconv/converters/nsDirIndexParser.cpp b/netwerk/streamconv/converters/nsDirIndexParser.cpp index 299d2bc4946a..7964cb0884c5 100644 --- a/netwerk/streamconv/converters/nsDirIndexParser.cpp +++ b/netwerk/streamconv/converters/nsDirIndexParser.cpp @@ -59,7 +59,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS3(nsDirIndexParser, nsIDirIndexParser) nsDirIndexParser::nsDirIndexParser() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult diff --git a/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp b/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp index ff5c52507bd7..cdcc147a02e7 100644 --- a/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp +++ b/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp @@ -201,7 +201,7 @@ nsTXTToHTMLConv::OnDataAvailable(nsIRequest* request, nsISupports *aContext, } // nsTXTToHTMLConv methods nsTXTToHTMLConv::nsTXTToHTMLConv() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mToken = nsnull; mPreFormatHTML = PR_FALSE; } diff --git a/netwerk/test/TestCacheMgr.cpp b/netwerk/test/TestCacheMgr.cpp index dc5490144e88..7aa6745c499e 100644 --- a/netwerk/test/TestCacheMgr.cpp +++ b/netwerk/test/TestCacheMgr.cpp @@ -177,7 +177,7 @@ public: nsReader() : mStartTime(0), mBytesRead(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); gNumReaders++; } diff --git a/netwerk/test/TestCallbacks.cpp b/netwerk/test/TestCallbacks.cpp index 9693ffbea8f1..ac687cdc2142 100644 --- a/netwerk/test/TestCallbacks.cpp +++ b/netwerk/test/TestCallbacks.cpp @@ -79,7 +79,7 @@ class ConsumerContext : public nsIEquals { public: NS_DECL_ISUPPORTS - ConsumerContext() { NS_INIT_REFCNT();} + ConsumerContext() { NS_INIT_ISUPPORTS();} NS_IMETHOD Equals(void *aPtr, PRBool *_retval) { *_retval = PR_TRUE; @@ -180,7 +180,7 @@ Consumer::OnDataAvailable(nsIRequest *request, nsISupports *aContext, // Consumer implementation Consumer::Consumer() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mOnStart = mOnStop = PR_FALSE; mOnDataCount = 0; gKeepRunning++; diff --git a/netwerk/test/TestFileInput.cpp b/netwerk/test/TestFileInput.cpp index 25d31ae11f18..37d836192601 100644 --- a/netwerk/test/TestFileInput.cpp +++ b/netwerk/test/TestFileInput.cpp @@ -92,7 +92,7 @@ public: nsReader() : mEventQueue(nsnull), mStartTime(0), mThread(nsnull), mBytesRead(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mMonitor = PR_NewMonitor(); } diff --git a/netwerk/test/TestFileInput2.cpp b/netwerk/test/TestFileInput2.cpp index c4f65424f81e..ca0ee63ced37 100644 --- a/netwerk/test/TestFileInput2.cpp +++ b/netwerk/test/TestFileInput2.cpp @@ -206,7 +206,7 @@ public: : mInPath(nsnull), mOutPath(nsnull), mBuffer(nsnull), mBufferSize(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult Init(nsIFile* inPath, nsIFile* outPath, @@ -299,7 +299,7 @@ public: : mInPath(nsnull), mOutPath(nsnull), mBuffer(nsnull), mBufferSize(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult Init(nsIFile* inPath, nsIFile* outPath, diff --git a/netwerk/test/TestFileTransport.cpp b/netwerk/test/TestFileTransport.cpp index 5771f0e2c49a..90643fee2fce 100644 --- a/netwerk/test/TestFileTransport.cpp +++ b/netwerk/test/TestFileTransport.cpp @@ -152,7 +152,7 @@ public: } MyListener(PRUint32 stopCount = 1) : mTotal(0), mStopCount(stopCount) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult Init(const char* origFile) { @@ -330,7 +330,7 @@ public: return NS_OK; } - MyOpenObserver() { NS_INIT_REFCNT(); } + MyOpenObserver() { NS_INIT_ISUPPORTS(); } virtual ~MyOpenObserver() {} }; diff --git a/netwerk/test/TestProtocols.cpp b/netwerk/test/TestProtocols.cpp index 877eccc60ac8..514cfe91abe2 100644 --- a/netwerk/test/TestProtocols.cpp +++ b/netwerk/test/TestProtocols.cpp @@ -129,7 +129,7 @@ public: URLLoadInfo::URLLoadInfo(const char *aUrl) : mURLString(aUrl) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mBytesRead = 0; mConnectTime = mTotalTime = PR_Now(); @@ -158,7 +158,7 @@ public: TestHttpEventSink::TestHttpEventSink() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } TestHttpEventSink::~TestHttpEventSink() @@ -201,7 +201,7 @@ public: InputTestConsumer::InputTestConsumer() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } InputTestConsumer::~InputTestConsumer() @@ -402,7 +402,7 @@ public: NS_DECL_ISUPPORTS NotificationCallbacks() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMETHOD GetInterface(const nsIID& eventSinkIID, void* *result) { diff --git a/netwerk/test/TestRawCache.cpp b/netwerk/test/TestRawCache.cpp index 087f7885e797..6b17e2cbeaa5 100644 --- a/netwerk/test/TestRawCache.cpp +++ b/netwerk/test/TestRawCache.cpp @@ -187,7 +187,7 @@ public: nsReader() : mStartTime(0), mBytesRead(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); gNumReaders++; } diff --git a/netwerk/test/TestRes.cpp b/netwerk/test/TestRes.cpp index 646f54698e27..b7e1cc0b82d1 100644 --- a/netwerk/test/TestRes.cpp +++ b/netwerk/test/TestRes.cpp @@ -141,7 +141,7 @@ class Listener : public nsIStreamListener public: NS_DECL_ISUPPORTS - Listener() { NS_INIT_REFCNT(); } + Listener() { NS_INIT_ISUPPORTS(); } virtual ~Listener() {} NS_IMETHOD OnStartRequest(nsIRequest *request, nsISupports *ctxt) { diff --git a/netwerk/test/TestSocketInput.cpp b/netwerk/test/TestSocketInput.cpp index 1119125afbee..104b5cd5dddf 100644 --- a/netwerk/test/TestSocketInput.cpp +++ b/netwerk/test/TestSocketInput.cpp @@ -85,7 +85,7 @@ public: InputTestConsumer::InputTestConsumer() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } InputTestConsumer::~InputTestConsumer() diff --git a/netwerk/test/TestSocketTransport.cpp b/netwerk/test/TestSocketTransport.cpp index 61b0eb07c7b7..b94a7a62b1e3 100644 --- a/netwerk/test/TestSocketTransport.cpp +++ b/netwerk/test/TestSocketTransport.cpp @@ -207,7 +207,7 @@ public: TestConnectionOpenObserver(TestConnection* test) : mTestConnection(test) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } virtual ~TestConnectionOpenObserver() {} @@ -302,7 +302,7 @@ TestConnection::TestConnection(const char* aHostName, PRInt32 aPort, { nsresult rv; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mIsAsync = aAsyncFlag; diff --git a/netwerk/test/TestThreadedIO.cpp b/netwerk/test/TestThreadedIO.cpp index fdacb4b66b3c..435d46925d23 100644 --- a/netwerk/test/TestThreadedIO.cpp +++ b/netwerk/test/TestThreadedIO.cpp @@ -119,7 +119,7 @@ int TestListener::threadCount = 0; TestListener::TestListener() : mDone( PR_FALSE ), mThreadNo( ++threadCount ) { printf( "TestListener ctor called on thread %d\n", mThreadNo ); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } TestListener::~TestListener() { diff --git a/netwerk/test/TestUpload.cpp b/netwerk/test/TestUpload.cpp index eda1f25a7c87..c3abc90c4e08 100644 --- a/netwerk/test/TestUpload.cpp +++ b/netwerk/test/TestUpload.cpp @@ -72,7 +72,7 @@ public: InputTestConsumer::InputTestConsumer() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } InputTestConsumer::~InputTestConsumer() diff --git a/parser/htmlparser/robot/nsDebugRobot.cpp b/parser/htmlparser/robot/nsDebugRobot.cpp index 8fe8096b64dc..5023a01bd23b 100644 --- a/parser/htmlparser/robot/nsDebugRobot.cpp +++ b/parser/htmlparser/robot/nsDebugRobot.cpp @@ -62,7 +62,7 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); class RobotSinkObserver : public nsIRobotSinkObserver { public: RobotSinkObserver() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } virtual ~RobotSinkObserver() { @@ -148,7 +148,7 @@ class CStreamListener: public nsIWebProgressListener, { public: CStreamListener() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/parser/htmlparser/src/CNavDTD.cpp b/parser/htmlparser/src/CNavDTD.cpp index 62eabf762ad5..1370e89a4288 100644 --- a/parser/htmlparser/src/CNavDTD.cpp +++ b/parser/htmlparser/src/CNavDTD.cpp @@ -188,7 +188,7 @@ CNavDTD::CNavDTD() : nsIDTD(), mExpectedCRC32(0) #endif { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mBodyContext=new nsDTDContext(); diff --git a/parser/htmlparser/src/COtherDTD.cpp b/parser/htmlparser/src/COtherDTD.cpp index 068b4cc1579f..f32ec82deef7 100644 --- a/parser/htmlparser/src/COtherDTD.cpp +++ b/parser/htmlparser/src/COtherDTD.cpp @@ -146,7 +146,7 @@ NS_IMPL_RELEASE(COtherDTD) * @return */ COtherDTD::COtherDTD() : nsIDTD() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mSink = 0; mParser=0; mLineNumber=1; diff --git a/parser/htmlparser/src/nsExpatDriver.cpp b/parser/htmlparser/src/nsExpatDriver.cpp index e303b0e72f4d..a5e7d7f0018a 100644 --- a/parser/htmlparser/src/nsExpatDriver.cpp +++ b/parser/htmlparser/src/nsExpatDriver.cpp @@ -309,7 +309,7 @@ nsExpatDriver::nsExpatDriver() mSink(0), mCatalogData(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsExpatDriver::~nsExpatDriver() diff --git a/parser/htmlparser/src/nsHTMLNullSink.cpp b/parser/htmlparser/src/nsHTMLNullSink.cpp index b7227edda0bf..7ec1f204e018 100644 --- a/parser/htmlparser/src/nsHTMLNullSink.cpp +++ b/parser/htmlparser/src/nsHTMLNullSink.cpp @@ -134,7 +134,7 @@ NS_NewHTMLNullSink(nsIContentSink** aInstancePtrResult) * @return */ nsHTMLNullSink::nsHTMLNullSink() : nsIHTMLContentSink() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mNodeStackPos=0; memset(mNodeStack,0,sizeof(mNodeStack)); } diff --git a/parser/htmlparser/src/nsHTMLTokenizer.cpp b/parser/htmlparser/src/nsHTMLTokenizer.cpp index 0db173e323d0..cb033840a682 100644 --- a/parser/htmlparser/src/nsHTMLTokenizer.cpp +++ b/parser/htmlparser/src/nsHTMLTokenizer.cpp @@ -135,7 +135,7 @@ NS_IMPL_RELEASE(nsHTMLTokenizer) eParserCommands aCommand) : nsITokenizer(), mTokenDeque(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (aParseMode==eDTDMode_full_standards || aParseMode==eDTDMode_almost_standards) { diff --git a/parser/htmlparser/src/nsLoggingSink.cpp b/parser/htmlparser/src/nsLoggingSink.cpp index 463be53af525..bb34b7874f7d 100644 --- a/parser/htmlparser/src/nsLoggingSink.cpp +++ b/parser/htmlparser/src/nsLoggingSink.cpp @@ -74,7 +74,7 @@ NS_NewHTMLLoggingSink(nsIContentSink** aInstancePtrResult) } nsLoggingSink::nsLoggingSink() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mOutput = 0; mLevel=-1; mSink=0; diff --git a/parser/htmlparser/src/nsParser.cpp b/parser/htmlparser/src/nsParser.cpp index adacc5aa2945..eeabd2c8c508 100644 --- a/parser/htmlparser/src/nsParser.cpp +++ b/parser/htmlparser/src/nsParser.cpp @@ -294,7 +294,7 @@ static PRBool gDumpContent=PR_FALSE; * @return */ nsParser::nsParser(nsITokenObserver* anObserver) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef NS_DEBUG if(!gDumpContent) { diff --git a/parser/htmlparser/src/nsParserFactory.cpp b/parser/htmlparser/src/nsParserFactory.cpp index 5409231b7fd7..456d6af999fa 100644 --- a/parser/htmlparser/src/nsParserFactory.cpp +++ b/parser/htmlparser/src/nsParserFactory.cpp @@ -73,7 +73,7 @@ class nsParserFactory : public nsIFactory nsParserFactory::nsParserFactory(const nsCID &aClass) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mClassID = aClass; nsHTMLTags::AddRefTable(); nsHTMLEntities::AddRefTable(); diff --git a/parser/htmlparser/src/nsViewSourceHTML.cpp b/parser/htmlparser/src/nsViewSourceHTML.cpp index 7d6a0f20049e..7eb52ac410c4 100644 --- a/parser/htmlparser/src/nsViewSourceHTML.cpp +++ b/parser/htmlparser/src/nsViewSourceHTML.cpp @@ -329,7 +329,7 @@ static const char* const kDumpFileAfterText[] = { * @return */ CViewSourceHTML::CViewSourceHTML() : mFilename(), mTags(), mErrors() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mStartTag = VIEW_SOURCE_START_TAG; mEndTag = VIEW_SOURCE_END_TAG; diff --git a/parser/htmlparser/tests/grabpage/grabpage.cpp b/parser/htmlparser/tests/grabpage/grabpage.cpp index 37b6e65a0c1f..f72588c3ea9c 100644 --- a/parser/htmlparser/tests/grabpage/grabpage.cpp +++ b/parser/htmlparser/tests/grabpage/grabpage.cpp @@ -84,7 +84,7 @@ protected: StreamToFile::StreamToFile(FILE* fp) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mDone = PR_FALSE; mError = PR_FALSE; mFile = fp; diff --git a/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp b/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp index ec6cf9caac74..de44715dd77b 100644 --- a/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp +++ b/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp @@ -741,7 +741,7 @@ public: CPluginStreamInfo(const char* URL, nsIPluginInputStream* inStr, nsMIMEType type, PRBool seekable) : mURL(URL), mInputStream(inStr), mMimeType(type), mIsSeekable(seekable) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } virtual ~CPluginStreamInfo() {} @@ -1490,7 +1490,7 @@ NPP_HandleEvent(NPP instance, void* event) CPluginManager::CPluginManager(void) { // Set reference count to 0. - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mLiveconnect = NULL; @@ -2066,7 +2066,7 @@ CPluginInstancePeer::CPluginInstancePeer(nsIPluginInstance* pluginInstance, attribute_list(NULL), values_list(NULL) { // Set the reference count to 0. - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_IF_ADDREF(mInstance); @@ -2362,7 +2362,7 @@ CPluginManagerStream::CPluginManagerStream(NPP npp, NPStream* pstr) : npp(npp), pstream(pstr) { // Set the reference count to 0. - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } CPluginManagerStream::~CPluginManagerStream(void) @@ -2495,7 +2495,7 @@ CPluginInputStream::CPluginInputStream(nsIPluginStreamListener* listener) mBuffer(NULL), mBufferLength(0), mAmountRead(0), mStreamInfo(NULL) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (mListener != NULL) { mListener->AddRef(); diff --git a/plugin/oji/MRJ/plugin/Source/EmbeddedFramePluginInstance.cpp b/plugin/oji/MRJ/plugin/Source/EmbeddedFramePluginInstance.cpp index 8d014394bd2f..73bf89736613 100644 --- a/plugin/oji/MRJ/plugin/Source/EmbeddedFramePluginInstance.cpp +++ b/plugin/oji/MRJ/plugin/Source/EmbeddedFramePluginInstance.cpp @@ -50,7 +50,7 @@ EmbeddedFramePluginInstance::EmbeddedFramePluginInstance() : mPeer(NULL), mFrame(NULL) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } EmbeddedFramePluginInstance::~EmbeddedFramePluginInstance() diff --git a/plugin/oji/MRJ/plugin/Source/LiveConnectNativeMethods.cpp b/plugin/oji/MRJ/plugin/Source/LiveConnectNativeMethods.cpp index 80394653f34d..0fd33c634a6c 100644 --- a/plugin/oji/MRJ/plugin/Source/LiveConnectNativeMethods.cpp +++ b/plugin/oji/MRJ/plugin/Source/LiveConnectNativeMethods.cpp @@ -201,7 +201,7 @@ static jobject GetCurrentThread(JNIEnv* env) MRJSecurityContext::MRJSecurityContext(const char* location) : mLocation(nsnull), mConnection(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mLocation = ::strdup(location); if (mLocation) { diff --git a/plugin/oji/MRJCarbon/plugin/Source/EmbeddedFramePluginInstance.cpp b/plugin/oji/MRJCarbon/plugin/Source/EmbeddedFramePluginInstance.cpp index 3b814f558f39..606e201337f8 100644 --- a/plugin/oji/MRJCarbon/plugin/Source/EmbeddedFramePluginInstance.cpp +++ b/plugin/oji/MRJCarbon/plugin/Source/EmbeddedFramePluginInstance.cpp @@ -50,7 +50,7 @@ EmbeddedFramePluginInstance::EmbeddedFramePluginInstance() : mPeer(NULL), mFrame(NULL) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } EmbeddedFramePluginInstance::~EmbeddedFramePluginInstance() diff --git a/plugin/oji/MRJCarbon/plugin/Source/LiveConnectNativeMethods.cpp b/plugin/oji/MRJCarbon/plugin/Source/LiveConnectNativeMethods.cpp index 3fc967009f8d..ffcb9faaaaf8 100644 --- a/plugin/oji/MRJCarbon/plugin/Source/LiveConnectNativeMethods.cpp +++ b/plugin/oji/MRJCarbon/plugin/Source/LiveConnectNativeMethods.cpp @@ -207,7 +207,7 @@ static jobject GetCurrentThread(JNIEnv* env) MRJSecurityContext::MRJSecurityContext(const char* location) : mLocation(nsnull), mConnection(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mLocation = ::strdup(location); if (mLocation) { diff --git a/profile/pref-migrator/src/nsPrefMigration.cpp b/profile/pref-migrator/src/nsPrefMigration.cpp index f79fb7565963..bae8de1f54d8 100644 --- a/profile/pref-migrator/src/nsPrefMigration.cpp +++ b/profile/pref-migrator/src/nsPrefMigration.cpp @@ -270,7 +270,7 @@ nsPrefMigration::GetInstance() nsPrefMigration::nsPrefMigration() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mErrorCode = NS_OK; } @@ -2257,7 +2257,7 @@ nsPrefConverter::~nsPrefConverter() nsPrefConverter::nsPrefConverter() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsPrefConverter, nsIPrefConverter) diff --git a/profile/src/nsProfile.cpp b/profile/src/nsProfile.cpp index b6807559b86b..9b11f7178b2b 100644 --- a/profile/src/nsProfile.cpp +++ b/profile/src/nsProfile.cpp @@ -254,7 +254,7 @@ nsresult RecursiveCopy(nsIFile* srcDir, nsIFile* destDir) */ nsProfile::nsProfile() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mStartingUp = PR_FALSE; mAutomigrate = PR_FALSE; mOutofDiskSpace = PR_FALSE; diff --git a/rdf/base/src/nsCompositeDataSource.cpp b/rdf/base/src/nsCompositeDataSource.cpp index 2651d19929d8..bfced5a88d46 100644 --- a/rdf/base/src/nsCompositeDataSource.cpp +++ b/rdf/base/src/nsCompositeDataSource.cpp @@ -186,7 +186,7 @@ CompositeEnumeratorImpl::CompositeEnumeratorImpl(CompositeDataSourceImpl* aCompo mAllowNegativeAssertions(aAllowNegativeAssertions), mCoalesceDuplicateArcs(aCoalesceDuplicateArcs) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF(mCompositeDataSource); } @@ -625,7 +625,7 @@ CompositeDataSourceImpl::CompositeDataSourceImpl(void) mCoalesceDuplicateArcs(PR_TRUE), mUpdateBatchNest(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); static const size_t kBucketSizes[] = { sizeof(CompositeAssertionEnumeratorImpl), diff --git a/rdf/base/src/nsContainerEnumerator.cpp b/rdf/base/src/nsContainerEnumerator.cpp index 7b574a40fa8c..92f64d7c3cb9 100644 --- a/rdf/base/src/nsContainerEnumerator.cpp +++ b/rdf/base/src/nsContainerEnumerator.cpp @@ -109,7 +109,7 @@ ContainerEnumeratorImpl::ContainerEnumeratorImpl(nsIRDFDataSource* aDataSource, nsIRDFResource* aContainer) : mNextIndex(1) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mDataSource = dont_QueryInterface(aDataSource); mContainer = dont_QueryInterface(aContainer); } diff --git a/rdf/base/src/nsInMemoryDataSource.cpp b/rdf/base/src/nsInMemoryDataSource.cpp index 267b0d8a096a..f09aba1bde46 100644 --- a/rdf/base/src/nsInMemoryDataSource.cpp +++ b/rdf/base/src/nsInMemoryDataSource.cpp @@ -483,7 +483,7 @@ InMemoryAssertionEnumeratorImpl::InMemoryAssertionEnumeratorImpl( mTruthValue(aTruthValue), mNextAssertion(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF(mDataSource); NS_IF_ADDREF(mSource); @@ -689,7 +689,7 @@ InMemoryArcsEnumeratorImpl::InMemoryArcsEnumeratorImpl(InMemoryDataSource* aData mTarget(aTarget), mCurrent(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF(mDataSource); NS_IF_ADDREF(mSource); NS_IF_ADDREF(mTarget); diff --git a/rdf/base/src/nsRDFContainer.cpp b/rdf/base/src/nsRDFContainer.cpp index 862d72e422f3..952204a7cb80 100644 --- a/rdf/base/src/nsRDFContainer.cpp +++ b/rdf/base/src/nsRDFContainer.cpp @@ -405,7 +405,7 @@ RDFContainerImpl::IndexOf(nsIRDFNode *aElement, PRInt32 *aIndex) RDFContainerImpl::RDFContainerImpl() : mDataSource(nsnull), mContainer(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/rdf/base/src/nsRDFContainerUtils.cpp b/rdf/base/src/nsRDFContainerUtils.cpp index bf3e1929d3e5..d6b1a958e132 100644 --- a/rdf/base/src/nsRDFContainerUtils.cpp +++ b/rdf/base/src/nsRDFContainerUtils.cpp @@ -362,7 +362,7 @@ RDFContainerUtilsImpl::MakeAlt(nsIRDFDataSource *aDataSource, nsIRDFResource *aR RDFContainerUtilsImpl::RDFContainerUtilsImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (gRefCnt++ == 0) { nsresult rv; diff --git a/rdf/base/src/nsRDFContentSink.cpp b/rdf/base/src/nsRDFContentSink.cpp index 1974e648398e..33840d651630 100644 --- a/rdf/base/src/nsRDFContentSink.cpp +++ b/rdf/base/src/nsRDFContentSink.cpp @@ -326,7 +326,7 @@ RDFContentSinkImpl::RDFContentSinkImpl() mContextStack(nsnull), mDocumentURL(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (gRefCnt++ == 0) { nsresult rv; diff --git a/rdf/base/src/nsRDFService.cpp b/rdf/base/src/nsRDFService.cpp index 4b52f26ed4bf..5f75887fd0d6 100644 --- a/rdf/base/src/nsRDFService.cpp +++ b/rdf/base/src/nsRDFService.cpp @@ -393,7 +393,7 @@ public: BlobImpl(const PRUint8 *aBytes, PRInt32 aLength) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mData.mLength = aLength; mData.mBytes = new PRUint8[aLength]; memcpy(mData.mBytes, aBytes, aLength); @@ -569,7 +569,7 @@ LiteralImpl::Create(const PRUnichar* aValue, nsIRDFLiteral** aResult) LiteralImpl::LiteralImpl(const PRUnichar* s) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); gRDFService->RegisterLiteral(this); NS_ADDREF(gRDFService); } @@ -672,7 +672,7 @@ private: DateImpl::DateImpl(const PRTime s) : mValue(s) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); gRDFService->RegisterDate(this); NS_ADDREF(gRDFService); } @@ -779,7 +779,7 @@ private: IntImpl::IntImpl(PRInt32 s) : mValue(s) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); gRDFService->RegisterInt(this); NS_ADDREF(gRDFService); } @@ -866,7 +866,7 @@ RDFServiceImpl::RDFServiceImpl() : mNamedDataSources(nsnull), mLastPrefixlen(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult diff --git a/rdf/base/src/nsRDFXMLDataSource.cpp b/rdf/base/src/nsRDFXMLDataSource.cpp index cf3559986ec8..4bdeda8a257b 100644 --- a/rdf/base/src/nsRDFXMLDataSource.cpp +++ b/rdf/base/src/nsRDFXMLDataSource.cpp @@ -150,7 +150,7 @@ private: public: ProxyStream(void) : mBuffer(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } virtual ~ProxyStream(void) { @@ -467,7 +467,7 @@ RDFXMLDataSourceImpl::RDFXMLDataSourceImpl(void) mIsDirty(PR_FALSE), mLoadState(eLoadState_Unloaded) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef PR_LOGGING if (! gLog) diff --git a/rdf/base/src/nsRDFXMLParser.cpp b/rdf/base/src/nsRDFXMLParser.cpp index f03f4b66abeb..db6cf79b70f0 100644 --- a/rdf/base/src/nsRDFXMLParser.cpp +++ b/rdf/base/src/nsRDFXMLParser.cpp @@ -50,7 +50,7 @@ nsRDFXMLParser::Create(nsISupports* aOuter, REFNSIID aIID, void** aResult) nsRDFXMLParser::nsRDFXMLParser() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); MOZ_COUNT_CTOR(nsRDFXMLParser); } diff --git a/rdf/base/src/nsRDFXMLSerializer.cpp b/rdf/base/src/nsRDFXMLSerializer.cpp index 3d1789d69e9b..cf46ad0fdcb7 100644 --- a/rdf/base/src/nsRDFXMLSerializer.cpp +++ b/rdf/base/src/nsRDFXMLSerializer.cpp @@ -91,7 +91,7 @@ nsRDFXMLSerializer::Create(nsISupports* aOuter, REFNSIID aIID, void** aResult) nsRDFXMLSerializer::nsRDFXMLSerializer() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); MOZ_COUNT_CTOR(nsRDFXMLSerializer); } diff --git a/rdf/chrome/src/nsChromeProtocolHandler.cpp b/rdf/chrome/src/nsChromeProtocolHandler.cpp index f8f3e96f45f1..adcaa22f3add 100644 --- a/rdf/chrome/src/nsChromeProtocolHandler.cpp +++ b/rdf/chrome/src/nsChromeProtocolHandler.cpp @@ -180,7 +180,7 @@ nsCachedChromeChannel::Create(nsIURI* aURI, nsIChannel** aResult) nsCachedChromeChannel::nsCachedChromeChannel(nsIURI* aURI) : mURI(aURI), mLoadGroup(nsnull), mLoadFlags (nsIRequest::LOAD_NORMAL), mStatus(NS_OK) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef PR_LOGGING if (! gLog) @@ -495,7 +495,7 @@ nsCachedChromeChannel::DestroyLoadEvent(PLEvent* aEvent) nsChromeProtocolHandler::nsChromeProtocolHandler() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult diff --git a/rdf/chrome/src/nsChromeRegistry.cpp b/rdf/chrome/src/nsChromeRegistry.cpp index 5b2611e4dfd9..22d07cb92795 100644 --- a/rdf/chrome/src/nsChromeRegistry.cpp +++ b/rdf/chrome/src/nsChromeRegistry.cpp @@ -166,7 +166,7 @@ NS_IMPL_ISUPPORTS1(nsOverlayEnumerator, nsISimpleEnumerator) nsOverlayEnumerator::nsOverlayEnumerator(nsISimpleEnumerator *aInstallArcs, nsISimpleEnumerator *aProfileArcs) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mInstallArcs = aInstallArcs; mProfileArcs = aProfileArcs; mCurrentArcs = mInstallArcs; @@ -254,7 +254,7 @@ nsChromeRegistry::nsChromeRegistry() : mRDFService(nsnull), mBatchInstallFlushes(PR_FALSE), mSearchedForOverride(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); nsCOMPtr prefService(do_GetService(kPrefServiceCID)); if (prefService) diff --git a/rdf/chrome/src/nsChromeUIDataSource.cpp b/rdf/chrome/src/nsChromeUIDataSource.cpp index 295bcd4b0ece..03a42d03eeb5 100644 --- a/rdf/chrome/src/nsChromeUIDataSource.cpp +++ b/rdf/chrome/src/nsChromeUIDataSource.cpp @@ -64,7 +64,7 @@ static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); nsChromeUIDataSource::nsChromeUIDataSource(nsIRDFDataSource* aComposite) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mComposite = aComposite; mComposite->AddObserver(this); diff --git a/rdf/datasource/src/nsFileSystemDataSource.cpp b/rdf/datasource/src/nsFileSystemDataSource.cpp index 6e0f52d2d630..c5bedf28b677 100644 --- a/rdf/datasource/src/nsFileSystemDataSource.cpp +++ b/rdf/datasource/src/nsFileSystemDataSource.cpp @@ -277,7 +277,7 @@ FileSystemDataSource::isDirURI(nsIRDFResource* source) FileSystemDataSource::FileSystemDataSource(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (gRefCnt++ == 0) { diff --git a/rdf/tests/dsds/nsRDFDataSourceDS.cpp b/rdf/tests/dsds/nsRDFDataSourceDS.cpp index 0f27eeea908a..1ca9507dce3e 100644 --- a/rdf/tests/dsds/nsRDFDataSourceDS.cpp +++ b/rdf/tests/dsds/nsRDFDataSourceDS.cpp @@ -142,7 +142,7 @@ nsRDFDataSourceDataSource::nsRDFDataSourceDataSource(): mURI(nsnull), mDataSource(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/rdf/tests/rdfcat/rdfcat.cpp b/rdf/tests/rdfcat/rdfcat.cpp index 9c0b24e24503..4eb840592ef0 100644 --- a/rdf/tests/rdfcat/rdfcat.cpp +++ b/rdf/tests/rdfcat/rdfcat.cpp @@ -93,7 +93,7 @@ static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); class ConsoleOutputStreamImpl : public nsIOutputStream { public: - ConsoleOutputStreamImpl(void) { NS_INIT_REFCNT(); } + ConsoleOutputStreamImpl(void) { NS_INIT_ISUPPORTS(); } virtual ~ConsoleOutputStreamImpl(void) {} // nsISupports interface diff --git a/rdf/tests/rdfpoll/rdfpoll.cpp b/rdf/tests/rdfpoll/rdfpoll.cpp index cdf73a92f8ed..a41d0247b90e 100644 --- a/rdf/tests/rdfpoll/rdfpoll.cpp +++ b/rdf/tests/rdfpoll/rdfpoll.cpp @@ -106,7 +106,7 @@ public: Observer::Observer() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(Observer, nsIRDFObserver) diff --git a/rdf/tests/rdfsink/rdfsink.cpp b/rdf/tests/rdfsink/rdfsink.cpp index 2df353506d50..ca5053dad19e 100644 --- a/rdf/tests/rdfsink/rdfsink.cpp +++ b/rdf/tests/rdfsink/rdfsink.cpp @@ -78,7 +78,7 @@ NS_DEFINE_IID(kIRDFXMLSourceIID, NS_IRDFXMLSOURCE_IID); class ConsoleOutputStreamImpl : public nsIOutputStream { public: - ConsoleOutputStreamImpl(void) { NS_INIT_REFCNT(); } + ConsoleOutputStreamImpl(void) { NS_INIT_ISUPPORTS(); } virtual ~ConsoleOutputStreamImpl(void) {} // nsISupports interface diff --git a/rdf/util/src/nsRDFResource.cpp b/rdf/util/src/nsRDFResource.cpp index b22724d88043..359c34760a46 100644 --- a/rdf/util/src/nsRDFResource.cpp +++ b/rdf/util/src/nsRDFResource.cpp @@ -56,7 +56,7 @@ nsrefcnt nsRDFResource::gRDFServiceRefCnt = 0; nsRDFResource::nsRDFResource(void) : mURI(nsnull), mDelegates(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsRDFResource::~nsRDFResource(void) diff --git a/security/manager/pki/src/nsPKIParamBlock.cpp b/security/manager/pki/src/nsPKIParamBlock.cpp index 5d503027618d..ca569f8b0fb2 100644 --- a/security/manager/pki/src/nsPKIParamBlock.cpp +++ b/security/manager/pki/src/nsPKIParamBlock.cpp @@ -42,7 +42,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS2(nsPKIParamBlock, nsIPKIParamBlock, nsPKIParamBlock::nsPKIParamBlock() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult diff --git a/security/manager/ssl/src/nsCrypto.cpp b/security/manager/ssl/src/nsCrypto.cpp index 7ad99ceca20b..8208f7312fe0 100644 --- a/security/manager/ssl/src/nsCrypto.cpp +++ b/security/manager/ssl/src/nsCrypto.cpp @@ -239,7 +239,7 @@ static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID); nsCrypto::nsCrypto() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsCrypto::~nsCrypto() @@ -1607,7 +1607,7 @@ CryptoRunnableEvent::~CryptoRunnableEvent() nsP12Runnable::nsP12Runnable(nsIX509Cert **certArr, PRInt32 numCerts, nsIPK11Token *token) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mCertArr = certArr; mNumCerts = numCerts; mToken = token; @@ -1706,14 +1706,14 @@ nsP12Runnable::Run() nsCryptoRunArgs::nsCryptoRunArgs() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsCryptoRunArgs::~nsCryptoRunArgs() {} nsCryptoRunnable::nsCryptoRunnable(nsCryptoRunArgs *args) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ASSERTION(args,"Passed nsnull to nsCryptoRunnable constructor."); m_args = args; NS_IF_ADDREF(m_args); @@ -2078,7 +2078,7 @@ nsCRMFObject::SetCRMFRequest(char *inRequest) nsPkcs11::nsPkcs11() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsPkcs11::~nsPkcs11() diff --git a/security/manager/ssl/src/nsKeygenHandler.cpp b/security/manager/ssl/src/nsKeygenHandler.cpp index a9ebf3489aea..160350df4fe3 100644 --- a/security/manager/ssl/src/nsKeygenHandler.cpp +++ b/security/manager/ssl/src/nsKeygenHandler.cpp @@ -164,7 +164,7 @@ MOZ_DECL_CTOR_COUNTER(nsKeygenFormProcessor) nsKeygenFormProcessor::nsKeygenFormProcessor() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); MOZ_COUNT_CTOR(nsKeygenFormProcessor); m_ctx = new PipUIContext(); diff --git a/uriloader/base/nsDocLoader.cpp b/uriloader/base/nsDocLoader.cpp index 3eb2cef73879..9acac98d9067 100644 --- a/uriloader/base/nsDocLoader.cpp +++ b/uriloader/base/nsDocLoader.cpp @@ -134,7 +134,7 @@ struct nsListenerInfo { nsDocLoaderImpl::nsDocLoaderImpl() : mListenerInfoList(8) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #if defined(PR_LOGGING) if (nsnull == gDocLoaderLog) { diff --git a/uriloader/exthandler/mac/nsInternetConfigService.cpp b/uriloader/exthandler/mac/nsInternetConfigService.cpp index db39e6700ebc..9a95de5285ec 100644 --- a/uriloader/exthandler/mac/nsInternetConfigService.cpp +++ b/uriloader/exthandler/mac/nsInternetConfigService.cpp @@ -70,7 +70,7 @@ static NS_DEFINE_CID(kICServiceCID, NS_INTERNETCONFIGSERVICE_CID); nsInternetConfigService::nsInternetConfigService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsInternetConfigService::~nsInternetConfigService() diff --git a/uriloader/exthandler/mac/nsMacMIMEDataSource.cpp b/uriloader/exthandler/mac/nsMacMIMEDataSource.cpp index e6638da1ad81..74477e61107f 100644 --- a/uriloader/exthandler/mac/nsMacMIMEDataSource.cpp +++ b/uriloader/exthandler/mac/nsMacMIMEDataSource.cpp @@ -87,7 +87,7 @@ static nsresult MakeMIMEInfo( ICMapEntry &entry, nsIMIMEInfo*& info ) nsMacMIMEDataSource::nsMacMIMEDataSource() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMacMIMEDataSource::~nsMacMIMEDataSource() diff --git a/uriloader/exthandler/nsExternalProtocolHandler.cpp b/uriloader/exthandler/nsExternalProtocolHandler.cpp index 07ddcccf6115..4912fcf7904e 100644 --- a/uriloader/exthandler/nsExternalProtocolHandler.cpp +++ b/uriloader/exthandler/nsExternalProtocolHandler.cpp @@ -264,7 +264,7 @@ NS_IMETHODIMP nsExtProtocolChannel::Resume() nsExternalProtocolHandler::nsExternalProtocolHandler() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); m_schemeName = "default"; } diff --git a/uriloader/exthandler/nsMIMEInfoImpl.cpp b/uriloader/exthandler/nsMIMEInfoImpl.cpp index f6545b52dc41..716e8829f66b 100644 --- a/uriloader/exthandler/nsMIMEInfoImpl.cpp +++ b/uriloader/exthandler/nsMIMEInfoImpl.cpp @@ -50,12 +50,12 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsMIMEInfoImpl, nsIMIMEInfo); // nsMIMEInfoImpl methods nsMIMEInfoImpl::nsMIMEInfoImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mPreferredAction = nsIMIMEInfo::saveToDisk; } nsMIMEInfoImpl::nsMIMEInfoImpl(const char *aMIMEType) :mMIMEType( aMIMEType ){ - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mPreferredAction = nsIMIMEInfo::saveToDisk; } diff --git a/view/src/nsViewManager.cpp b/view/src/nsViewManager.cpp index ea994875da7d..5873f3027388 100644 --- a/view/src/nsViewManager.cpp +++ b/view/src/nsViewManager.cpp @@ -304,7 +304,7 @@ PRUint32 nsViewManager::gLastUserEventTime = 0; nsViewManager::nsViewManager() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (gViewManagers == nsnull) { NS_ASSERTION(mVMCount == 0, "View Manager count is incorrect"); diff --git a/webshell/tests/viewer/nsBrowserWindow.cpp b/webshell/tests/viewer/nsBrowserWindow.cpp index 8623d8f8a326..a757d78e94eb 100644 --- a/webshell/tests/viewer/nsBrowserWindow.cpp +++ b/webshell/tests/viewer/nsBrowserWindow.cpp @@ -1322,7 +1322,7 @@ GetTitleSuffix(void) // Note: operator new zeros our memory nsBrowserWindow::nsBrowserWindow() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (!gTitleSuffix) { #if XXX gTitleSuffix = GetTitleSuffix(); diff --git a/webshell/tests/viewer/nsThrobber.cpp b/webshell/tests/viewer/nsThrobber.cpp index a39d661901cf..0e3f4923352b 100644 --- a/webshell/tests/viewer/nsThrobber.cpp +++ b/webshell/tests/viewer/nsThrobber.cpp @@ -199,7 +199,7 @@ PRInt32 nsThrobber::gNumThrobbers; // Note: operator new zeros our memory nsThrobber::nsThrobber() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (0 == gNumThrobbers++) { gThrobbers = new nsVoidArray; } diff --git a/webshell/tests/viewer/nsViewerApp.cpp b/webshell/tests/viewer/nsViewerApp.cpp index e459a128114d..5286064c5e2b 100644 --- a/webshell/tests/viewer/nsViewerApp.cpp +++ b/webshell/tests/viewer/nsViewerApp.cpp @@ -88,6 +88,7 @@ #include "nsIDOMHTMLSelectElement.h" +#include "nsISupportsObsolete.h" // new widget stuff #ifdef USE_LOCAL_WIDGETS @@ -136,7 +137,7 @@ static NS_DEFINE_IID(kIDOMHTMLSelectElementIID, NS_IDOMHTMLSELECTELEMENT_IID); nsViewerApp::nsViewerApp() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); char * text = PR_GetEnv("NGLAYOUT_HOME"); mStartURL.AssignWithConversion(text ? text : "resource:/res/samples/test0.html"); @@ -225,7 +226,7 @@ NS_IMPL_ISUPPORTS1(nsTestFormProcessor, nsIFormProcessor); nsTestFormProcessor::nsTestFormProcessor() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_METHOD diff --git a/webshell/tests/viewer/nsWebBrowserChrome.cpp b/webshell/tests/viewer/nsWebBrowserChrome.cpp index b7d59cf06ed7..e7194342f5a7 100644 --- a/webshell/tests/viewer/nsWebBrowserChrome.cpp +++ b/webshell/tests/viewer/nsWebBrowserChrome.cpp @@ -52,7 +52,7 @@ static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); nsWebBrowserChrome::nsWebBrowserChrome() : mBrowserWindow(nsnull), mTimerSet(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mActiveDocuments = 0; mChromeFlags = 0; diff --git a/webshell/tests/viewer/nsWebCrawler.cpp b/webshell/tests/viewer/nsWebCrawler.cpp index 2afc9bf16d27..5bcbefd5aa2b 100644 --- a/webshell/tests/viewer/nsWebCrawler.cpp +++ b/webshell/tests/viewer/nsWebCrawler.cpp @@ -172,7 +172,7 @@ nsWebCrawler::nsWebCrawler(nsViewerApp* aViewer) : mHaveURLList(PR_FALSE), mQueuedLoadURLs(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mBrowser = nsnull; mViewer = aViewer; diff --git a/webshell/tests/viewer/nsWindowCreator.cpp b/webshell/tests/viewer/nsWindowCreator.cpp index 54b634cf0237..046223a78984 100644 --- a/webshell/tests/viewer/nsWindowCreator.cpp +++ b/webshell/tests/viewer/nsWindowCreator.cpp @@ -43,7 +43,7 @@ nsWindowCreator::nsWindowCreator(nsViewerApp *aApp) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mApp = aApp; } diff --git a/webshell/tests/viewer/nsXPBaseWindow.cpp b/webshell/tests/viewer/nsXPBaseWindow.cpp index 0e8c26cba9c1..33f58e442581 100644 --- a/webshell/tests/viewer/nsXPBaseWindow.cpp +++ b/webshell/tests/viewer/nsXPBaseWindow.cpp @@ -672,7 +672,7 @@ public: //---------------------------------------------------------------------- nsXPBaseWindowFactory::nsXPBaseWindowFactory() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } //---------------------------------------------------------------------- diff --git a/webshell/tests/viewer/os2/nsButton.cpp b/webshell/tests/viewer/os2/nsButton.cpp index 2d28d3d6068f..d51dcece9d79 100644 --- a/webshell/tests/viewer/os2/nsButton.cpp +++ b/webshell/tests/viewer/os2/nsButton.cpp @@ -82,7 +82,7 @@ NS_IMPL_RELEASE(nsButton) //------------------------------------------------------------------------- nsButton::nsButton() : nsWindow() , nsIButton() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } //------------------------------------------------------------------------- diff --git a/webshell/tests/viewer/os2/nsCheckButton.cpp b/webshell/tests/viewer/os2/nsCheckButton.cpp index 071610456fdd..070d05a29089 100644 --- a/webshell/tests/viewer/os2/nsCheckButton.cpp +++ b/webshell/tests/viewer/os2/nsCheckButton.cpp @@ -80,7 +80,7 @@ NS_IMPL_RELEASE(nsCheckButton) nsCheckButton::nsCheckButton() : nsWindow() , nsICheckButton(), mState(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/webshell/tests/viewer/os2/nsLabel.cpp b/webshell/tests/viewer/os2/nsLabel.cpp index 42c72a1fce62..cce079b9724a 100644 --- a/webshell/tests/viewer/os2/nsLabel.cpp +++ b/webshell/tests/viewer/os2/nsLabel.cpp @@ -73,7 +73,7 @@ NS_IMPL_RELEASE(nsLabel) //------------------------------------------------------------------------- nsLabel::nsLabel() : nsWindow(), nsILabel() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mAlignment = eAlign_Left; } diff --git a/webshell/tests/viewer/os2/nsTextWidget.cpp b/webshell/tests/viewer/os2/nsTextWidget.cpp index 29002124449d..701abc706d83 100644 --- a/webshell/tests/viewer/os2/nsTextWidget.cpp +++ b/webshell/tests/viewer/os2/nsTextWidget.cpp @@ -81,7 +81,7 @@ NS_IMPL_RELEASE(nsTextWidget) //------------------------------------------------------------------------- nsTextWidget::nsTextWidget() : nsTextHelper() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mBackground = NS_RGB(124, 124, 124); } diff --git a/webshell/tests/viewer/windows/nsButton.cpp b/webshell/tests/viewer/windows/nsButton.cpp index 84a46fbfbe02..1841e64d04a6 100644 --- a/webshell/tests/viewer/windows/nsButton.cpp +++ b/webshell/tests/viewer/windows/nsButton.cpp @@ -82,7 +82,7 @@ NS_IMPL_RELEASE(nsButton) //------------------------------------------------------------------------- nsButton::nsButton() : nsWindow() , nsIButton() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } //------------------------------------------------------------------------- diff --git a/webshell/tests/viewer/windows/nsCheckButton.cpp b/webshell/tests/viewer/windows/nsCheckButton.cpp index 07927e44d321..0ca2b1b476ee 100644 --- a/webshell/tests/viewer/windows/nsCheckButton.cpp +++ b/webshell/tests/viewer/windows/nsCheckButton.cpp @@ -78,7 +78,7 @@ NS_IMPL_RELEASE(nsCheckButton) nsCheckButton::nsCheckButton() : nsWindow() , nsICheckButton(), mState(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/webshell/tests/viewer/windows/nsLabel.cpp b/webshell/tests/viewer/windows/nsLabel.cpp index c9eed40697c0..1ebf94fdd1c4 100644 --- a/webshell/tests/viewer/windows/nsLabel.cpp +++ b/webshell/tests/viewer/windows/nsLabel.cpp @@ -73,7 +73,7 @@ NS_IMPL_RELEASE(nsLabel) //------------------------------------------------------------------------- nsLabel::nsLabel() : nsWindow(), nsILabel() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mAlignment = eAlign_Left; } diff --git a/webshell/tests/viewer/windows/nsTextWidget.cpp b/webshell/tests/viewer/windows/nsTextWidget.cpp index c8a61421513d..a70ba696a6a3 100644 --- a/webshell/tests/viewer/windows/nsTextWidget.cpp +++ b/webshell/tests/viewer/windows/nsTextWidget.cpp @@ -81,7 +81,7 @@ NS_IMPL_RELEASE(nsTextWidget) //------------------------------------------------------------------------- nsTextWidget::nsTextWidget() : nsTextHelper() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mBackground = NS_RGB(124, 124, 124); } diff --git a/widget/public/nsWidgetSupport.h b/widget/public/nsWidgetSupport.h index ca90ae95a99a..099bf3d392af 100644 --- a/widget/public/nsWidgetSupport.h +++ b/widget/public/nsWidgetSupport.h @@ -39,6 +39,7 @@ #define nsWidgetSupport_h__ #include "nscore.h" +#include "nsComObsolete.h" #include "nsISupports.h" #include "nsIWidget.h" diff --git a/widget/src/beos/nsAppShell.cpp b/widget/src/beos/nsAppShell.cpp index 1a18a12cbaf8..56fd7287b9a4 100644 --- a/widget/src/beos/nsAppShell.cpp +++ b/widget/src/beos/nsAppShell.cpp @@ -102,7 +102,7 @@ NS_IMPL_ISUPPORTS1(nsAppShell, nsIAppShell) nsAppShell::nsAppShell() : is_port_error(false) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mDispatchListener = 0; gBAppCount++; diff --git a/widget/src/beos/nsBidiKeyboard.cpp b/widget/src/beos/nsBidiKeyboard.cpp index 2eacce44b352..ac910adc52db 100644 --- a/widget/src/beos/nsBidiKeyboard.cpp +++ b/widget/src/beos/nsBidiKeyboard.cpp @@ -26,7 +26,7 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsBidiKeyboard::~nsBidiKeyboard() diff --git a/widget/src/beos/nsButton.cpp b/widget/src/beos/nsButton.cpp index bb3042a6bd2c..e6a7e84a16c2 100644 --- a/widget/src/beos/nsButton.cpp +++ b/widget/src/beos/nsButton.cpp @@ -62,7 +62,7 @@ NS_IMPL_RELEASE(nsButton) //------------------------------------------------------------------------- nsButton::nsButton() : nsWindow() , nsIButton() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } //------------------------------------------------------------------------- diff --git a/widget/src/beos/nsCheckButton.cpp b/widget/src/beos/nsCheckButton.cpp index f45c5ba98bb1..0a8d8a3c76ae 100644 --- a/widget/src/beos/nsCheckButton.cpp +++ b/widget/src/beos/nsCheckButton.cpp @@ -58,7 +58,7 @@ NS_IMPL_RELEASE(nsCheckButton) nsCheckButton::nsCheckButton() : nsWindow() , nsICheckButton(), mState(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/widget/src/beos/nsClipboard.cpp b/widget/src/beos/nsClipboard.cpp index 599e4b7e2744..fcad45e0bd72 100644 --- a/widget/src/beos/nsClipboard.cpp +++ b/widget/src/beos/nsClipboard.cpp @@ -70,7 +70,7 @@ nsClipboard::nsClipboard() : nsBaseClipboard() printf(" nsClipboard::nsClipboard()\n"); #endif /* DEBUG_CLIPBOARD */ - //NS_INIT_REFCNT(); + //NS_INIT_ISUPPORTS(); mIgnoreEmptyNotification = PR_FALSE; mClipboardOwner = nsnull; mTransferable = nsnull; diff --git a/widget/src/beos/nsDragService.cpp b/widget/src/beos/nsDragService.cpp index e6c8677a6751..61a282d4e405 100644 --- a/widget/src/beos/nsDragService.cpp +++ b/widget/src/beos/nsDragService.cpp @@ -63,7 +63,7 @@ NS_IMPL_RELEASE_INHERITED(nsDragService, nsBaseDragService) //------------------------------------------------------------------------- nsDragService::nsDragService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } //------------------------------------------------------------------------- diff --git a/widget/src/beos/nsFilePicker.cpp b/widget/src/beos/nsFilePicker.cpp index b63b5258f698..0040d7a3b801 100644 --- a/widget/src/beos/nsFilePicker.cpp +++ b/widget/src/beos/nsFilePicker.cpp @@ -49,7 +49,7 @@ nsFilePicker::nsFilePicker() , mUnicodeEncoder(nsnull) , mUnicodeDecoder(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mDisplayDirectory = do_CreateInstance("@mozilla.org/file/local;1"); } diff --git a/widget/src/beos/nsLabel.cpp b/widget/src/beos/nsLabel.cpp index f1fffaff4808..ae8d3b396aec 100644 --- a/widget/src/beos/nsLabel.cpp +++ b/widget/src/beos/nsLabel.cpp @@ -54,7 +54,7 @@ NS_IMPL_RELEASE(nsLabel) //------------------------------------------------------------------------- nsLabel::nsLabel() : nsWindow(), nsILabel() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mAlignment = eAlign_Left; } diff --git a/widget/src/beos/nsScrollbar.cpp b/widget/src/beos/nsScrollbar.cpp index 96396bae0a79..5955e7b2b80a 100644 --- a/widget/src/beos/nsScrollbar.cpp +++ b/widget/src/beos/nsScrollbar.cpp @@ -59,7 +59,7 @@ NS_IMPL_QUERY_INTERFACE2(nsScrollbar, nsIScrollbar, nsWindow) //------------------------------------------------------------------------- nsScrollbar::nsScrollbar(PRBool aIsVertical) : nsWindow(), nsIScrollbar() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mOrientation = (aIsVertical) ? B_VERTICAL : B_HORIZONTAL; mLineIncrement = 0; mScrollbar = 0; diff --git a/widget/src/beos/nsSound.cpp b/widget/src/beos/nsSound.cpp index e63fa4daff32..245d3a3f32b2 100644 --- a/widget/src/beos/nsSound.cpp +++ b/widget/src/beos/nsSound.cpp @@ -55,7 +55,7 @@ NS_IMPL_ISUPPORTS1(nsSound, nsISound) nsSound::nsSound() : mSound(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsSound::~nsSound() diff --git a/widget/src/beos/nsTextWidget.cpp b/widget/src/beos/nsTextWidget.cpp index ca5e69918aec..efec988483b8 100644 --- a/widget/src/beos/nsTextWidget.cpp +++ b/widget/src/beos/nsTextWidget.cpp @@ -65,7 +65,7 @@ NS_IMPL_RELEASE(nsTextWidget) //------------------------------------------------------------------------- nsTextWidget::nsTextWidget() : nsTextHelper() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mBackground = NS_RGB(124, 124, 124); } diff --git a/widget/src/beos/nsToolkit.cpp b/widget/src/beos/nsToolkit.cpp index 54758f484ef8..bc2747c36b4e 100644 --- a/widget/src/beos/nsToolkit.cpp +++ b/widget/src/beos/nsToolkit.cpp @@ -157,7 +157,7 @@ void nsToolkit::RunPump(void* arg) nsToolkit::nsToolkit() { localthread = false; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mGuiThread = NULL; } diff --git a/widget/src/beos/nsWindow.cpp b/widget/src/beos/nsWindow.cpp index 90d7979f9347..2dc0735260e7 100644 --- a/widget/src/beos/nsWindow.cpp +++ b/widget/src/beos/nsWindow.cpp @@ -102,7 +102,7 @@ nsWindow::nsWindow() : nsBaseWidget() { rgb_color back = ui_color(B_PANEL_BACKGROUND_COLOR); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mView = 0; mBackground = NS_RGB(back.red, back.green, back.blue); mForeground = NS_RGB(0x00,0x00,0x00); diff --git a/widget/src/cocoa/nsBidiKeyboard.cpp b/widget/src/cocoa/nsBidiKeyboard.cpp index 2eacce44b352..ac910adc52db 100644 --- a/widget/src/cocoa/nsBidiKeyboard.cpp +++ b/widget/src/cocoa/nsBidiKeyboard.cpp @@ -26,7 +26,7 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsBidiKeyboard::~nsBidiKeyboard() diff --git a/widget/src/cocoa/nsFilePicker.cpp b/widget/src/cocoa/nsFilePicker.cpp index 08061819aa46..87aea9e68990 100644 --- a/widget/src/cocoa/nsFilePicker.cpp +++ b/widget/src/cocoa/nsFilePicker.cpp @@ -124,7 +124,7 @@ NS_IMPL_ISUPPORTS1(nsFilePicker, nsIFilePicker) nsFilePicker::nsFilePicker() : mAllFilesDisplayed(PR_TRUE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // Zero out the type lists for (int i = 0; i < kMaxTypeListCount; i++) diff --git a/widget/src/cocoa/nsMenuBarX.cpp b/widget/src/cocoa/nsMenuBarX.cpp index 0c9b20263389..a89502ab63a3 100644 --- a/widget/src/cocoa/nsMenuBarX.cpp +++ b/widget/src/cocoa/nsMenuBarX.cpp @@ -88,7 +88,7 @@ EventHandlerUPP nsMenuBarX::sCommandEventHandler = nsnull; nsMenuBarX::nsMenuBarX() : mNumMenus(0), mParent(nsnull), mIsMenuBarAdded(PR_FALSE), mDocument(nsnull), mCurrentCommandID(1) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); OSStatus status = ::CreateNewMenu(0, 0, &mRootMenu); NS_ASSERTION(status == noErr, "nsMenuBarX::nsMenuBarX: creation of root menu failed."); diff --git a/widget/src/cocoa/nsMenuItemX.cpp b/widget/src/cocoa/nsMenuItemX.cpp index 10d52671ae9a..c0375506e8a4 100644 --- a/widget/src/cocoa/nsMenuItemX.cpp +++ b/widget/src/cocoa/nsMenuItemX.cpp @@ -67,7 +67,7 @@ NS_IMPL_ISUPPORTS4(nsMenuItemX, nsIMenuItem, nsIMenuListener, nsIChangeObserver, // nsMenuItemX::nsMenuItemX() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mMenuParent = nsnull; mIsSeparator = PR_FALSE; mKeyEquivalent.Assign(NS_LITERAL_STRING(" ")); diff --git a/widget/src/cocoa/nsMenuX.cpp b/widget/src/cocoa/nsMenuX.cpp index c2b7e5a9615d..b94bc63fc63f 100644 --- a/widget/src/cocoa/nsMenuX.cpp +++ b/widget/src/cocoa/nsMenuX.cpp @@ -99,7 +99,7 @@ public: nsDummyMenuItemX() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } }; @@ -120,7 +120,7 @@ nsMenuX::nsMenuX() mIsHelpMenu(PR_FALSE), mIsEnabled(PR_TRUE), mDestroyHandlerCalled(PR_FALSE), mNeedsRebuild(PR_TRUE), mConstructed(PR_FALSE), mVisible(PR_TRUE), mHandler(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #if DEBUG //++gMenuCounterX; diff --git a/widget/src/cocoa/nsRegionMac.cpp b/widget/src/cocoa/nsRegionMac.cpp index fc96c239a139..f5af86a36d02 100644 --- a/widget/src/cocoa/nsRegionMac.cpp +++ b/widget/src/cocoa/nsRegionMac.cpp @@ -46,7 +46,7 @@ nsRegionMac::nsRegionMac() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mRegion = nsnull; mRegionType = eRegionComplexity_empty; } diff --git a/widget/src/gtk/nsAppShell.cpp b/widget/src/gtk/nsAppShell.cpp index 46f33c3e2b2e..709ded50677a 100644 --- a/widget/src/gtk/nsAppShell.cpp +++ b/widget/src/gtk/nsAppShell.cpp @@ -139,7 +139,7 @@ static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); //------------------------------------------------------------------------- nsAppShell::nsAppShell() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef DEBUG_APPSHELL printf("nsAppShell::nsAppShell()\n"); #endif diff --git a/widget/src/gtk/nsBidiKeyboard.cpp b/widget/src/gtk/nsBidiKeyboard.cpp index 2eacce44b352..ac910adc52db 100644 --- a/widget/src/gtk/nsBidiKeyboard.cpp +++ b/widget/src/gtk/nsBidiKeyboard.cpp @@ -26,7 +26,7 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsBidiKeyboard::~nsBidiKeyboard() diff --git a/widget/src/gtk/nsCheckButton.cpp b/widget/src/gtk/nsCheckButton.cpp index 831211535ae7..f086d1c5aa86 100644 --- a/widget/src/gtk/nsCheckButton.cpp +++ b/widget/src/gtk/nsCheckButton.cpp @@ -49,7 +49,7 @@ NS_IMPL_QUERY_INTERFACE2(nsCheckButton, nsICheckButton, nsIWidget) //------------------------------------------------------------------------- nsCheckButton::nsCheckButton() : nsWidget() , nsICheckButton() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mLabel = nsnull; mCheckButton = nsnull; mState = PR_FALSE; diff --git a/widget/src/gtk/nsClipboard.cpp b/widget/src/gtk/nsClipboard.cpp index 42aec70e7494..e23db5e742fc 100644 --- a/widget/src/gtk/nsClipboard.cpp +++ b/widget/src/gtk/nsClipboard.cpp @@ -84,7 +84,7 @@ nsClipboard::nsClipboard() g_print("nsClipboard::nsClipboard()\n"); #endif /* DEBUG_CLIPBOARD */ - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mIgnoreEmptyNotification = PR_FALSE; mGlobalTransferable = nsnull; mSelectionTransferable = nsnull; diff --git a/widget/src/gtk/nsLabel.cpp b/widget/src/gtk/nsLabel.cpp index b868867acebd..68b03b4cd667 100644 --- a/widget/src/gtk/nsLabel.cpp +++ b/widget/src/gtk/nsLabel.cpp @@ -51,7 +51,7 @@ NS_IMPL_QUERY_INTERFACE2(nsLabel, nsILabel, nsIWidget) //------------------------------------------------------------------------- nsLabel::nsLabel() : nsWidget(), nsILabel() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mAlignment = eAlign_Left; } diff --git a/widget/src/gtk/nsScrollbar.cpp b/widget/src/gtk/nsScrollbar.cpp index 832509d74358..87cce0749163 100644 --- a/widget/src/gtk/nsScrollbar.cpp +++ b/widget/src/gtk/nsScrollbar.cpp @@ -53,7 +53,7 @@ NS_IMPL_QUERY_INTERFACE2(nsScrollbar, nsIScrollbar, nsIWidget) //------------------------------------------------------------------------- nsScrollbar::nsScrollbar (PRBool aIsVertical):nsWidget (), nsIScrollbar () { - NS_INIT_REFCNT (); + NS_INIT_ISUPPORTS (); mOrientation = (aIsVertical) ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL; diff --git a/widget/src/gtk/nsSound.cpp b/widget/src/gtk/nsSound.cpp index 596978f20d62..72a0baddb7d1 100644 --- a/widget/src/gtk/nsSound.cpp +++ b/widget/src/gtk/nsSound.cpp @@ -59,7 +59,7 @@ NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver); //////////////////////////////////////////////////////////////////////// nsSound::nsSound() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mInited = PR_FALSE; } diff --git a/widget/src/gtk/nsToolkit.cpp b/widget/src/gtk/nsToolkit.cpp index e95d2acdf797..8518c1ed7799 100644 --- a/widget/src/gtk/nsToolkit.cpp +++ b/widget/src/gtk/nsToolkit.cpp @@ -51,7 +51,7 @@ static PRUintn gToolkitTLSIndex = 0; //------------------------------------------------------------------------- nsToolkit::nsToolkit() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mSharedGC = nsnull; } diff --git a/widget/src/gtk2/nsAppShell.cpp b/widget/src/gtk2/nsAppShell.cpp index 396e374d893c..9a13631cf4d8 100644 --- a/widget/src/gtk2/nsAppShell.cpp +++ b/widget/src/gtk2/nsAppShell.cpp @@ -77,7 +77,7 @@ IntHashKey(PRInt32 key) nsAppShell::nsAppShell(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef PR_LOGGING if (!gWidgetLog) diff --git a/widget/src/gtk2/nsBidiKeyboard.cpp b/widget/src/gtk2/nsBidiKeyboard.cpp index b64a7c004b59..24c5747cd018 100644 --- a/widget/src/gtk2/nsBidiKeyboard.cpp +++ b/widget/src/gtk2/nsBidiKeyboard.cpp @@ -42,7 +42,7 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsBidiKeyboard::~nsBidiKeyboard() diff --git a/widget/src/gtk2/nsClipboard.cpp b/widget/src/gtk2/nsClipboard.cpp index 1094d610edf3..001c9174ea52 100644 --- a/widget/src/gtk2/nsClipboard.cpp +++ b/widget/src/gtk2/nsClipboard.cpp @@ -61,7 +61,7 @@ selection_clear_event_cb (GtkWidget *aWidget, nsClipboard::nsClipboard() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mWidget = nsnull; } diff --git a/widget/src/gtk2/nsToolkit.cpp b/widget/src/gtk2/nsToolkit.cpp index 6e8eb073349f..30ab1feaa1bc 100644 --- a/widget/src/gtk2/nsToolkit.cpp +++ b/widget/src/gtk2/nsToolkit.cpp @@ -53,7 +53,7 @@ static PRUintn gToolkitTLSIndex = 0; //------------------------------------------------------------------------- nsToolkit::nsToolkit() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mSharedGC = nsnull; } diff --git a/widget/src/mac/nsBidiKeyboard.cpp b/widget/src/mac/nsBidiKeyboard.cpp index 2eacce44b352..ac910adc52db 100644 --- a/widget/src/mac/nsBidiKeyboard.cpp +++ b/widget/src/mac/nsBidiKeyboard.cpp @@ -26,7 +26,7 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsBidiKeyboard::~nsBidiKeyboard() diff --git a/widget/src/mac/nsButton.cpp b/widget/src/mac/nsButton.cpp index d3b22f9eb111..7a9f35bf3f87 100644 --- a/widget/src/mac/nsButton.cpp +++ b/widget/src/mac/nsButton.cpp @@ -49,7 +49,7 @@ NS_IMPL_RELEASE(nsButton); //------------------------------------------------------------------------- nsButton::nsButton() : nsMacControl(), nsIButton() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); WIDGET_SET_CLASSNAME("nsButton"); SetControlType(pushButProc); } diff --git a/widget/src/mac/nsCheckButton.cpp b/widget/src/mac/nsCheckButton.cpp index f6383af9abcd..bbaa4a3d2884 100644 --- a/widget/src/mac/nsCheckButton.cpp +++ b/widget/src/mac/nsCheckButton.cpp @@ -49,7 +49,7 @@ NS_IMPL_RELEASE(nsCheckButton); //------------------------------------------------------------------------- nsCheckButton::nsCheckButton() : nsMacControl(), nsICheckButton() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); gInstanceClassName = "nsCheckButton"; SetControlType(checkBoxProc); } diff --git a/widget/src/mac/nsFilePicker.cpp b/widget/src/mac/nsFilePicker.cpp index e7ef2e399b31..0da7362609ae 100644 --- a/widget/src/mac/nsFilePicker.cpp +++ b/widget/src/mac/nsFilePicker.cpp @@ -60,7 +60,7 @@ OSType nsFilePicker::sCurrentProcessSignature = 0; nsFilePicker::nsFilePicker() : mAllFilesDisplayed(PR_TRUE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // Zero out the type lists for (int i = 0; i < kMaxTypeListCount; i++) diff --git a/widget/src/mac/nsLabel.cpp b/widget/src/mac/nsLabel.cpp index 802b91ca5e3f..270b08544c88 100644 --- a/widget/src/mac/nsLabel.cpp +++ b/widget/src/mac/nsLabel.cpp @@ -46,7 +46,7 @@ NS_IMPL_RELEASE(nsLabel); //------------------------------------------------------------------------- nsLabel::nsLabel() : nsTextWidget(), nsILabel() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); WIDGET_SET_CLASSNAME("nsLabel"); } diff --git a/widget/src/mac/nsMenu.cpp b/widget/src/mac/nsMenu.cpp index 22a626a6581c..1272c8e34ae0 100644 --- a/widget/src/mac/nsMenu.cpp +++ b/widget/src/mac/nsMenu.cpp @@ -115,7 +115,7 @@ public: nsDummyMenuItem() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } }; @@ -129,7 +129,7 @@ NS_IMPL_ISUPPORTS4(nsMenu, nsIMenu, nsIMenuListener, nsIChangeObserver, nsISuppo // nsMenu::nsMenu() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mNumMenuItems = 0; mParent = nsnull; mManager = nsnull; diff --git a/widget/src/mac/nsMenuBar.cpp b/widget/src/mac/nsMenuBar.cpp index 846ffb1c35e9..63bf42417205 100644 --- a/widget/src/mac/nsMenuBar.cpp +++ b/widget/src/mac/nsMenuBar.cpp @@ -113,7 +113,7 @@ nsMenuBar::nsMenuBar() nsPreviousMenuStackUnwind(nsnull, nsnull); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mNumMenus = 0; mParent = nsnull; mIsMenuBarAdded = PR_FALSE; diff --git a/widget/src/mac/nsMenuBarX.cpp b/widget/src/mac/nsMenuBarX.cpp index 9b474a3cbe47..063a480edcf1 100644 --- a/widget/src/mac/nsMenuBarX.cpp +++ b/widget/src/mac/nsMenuBarX.cpp @@ -89,7 +89,7 @@ EventHandlerUPP nsMenuBarX::sCommandEventHandler = nsnull; nsMenuBarX::nsMenuBarX() : mNumMenus(0), mParent(nsnull), mIsMenuBarAdded(PR_FALSE), mDocument(nsnull), mCurrentCommandID(1) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); OSStatus status = ::CreateNewMenu(0, 0, &mRootMenu); NS_ASSERTION(status == noErr, "nsMenuBarX::nsMenuBarX: creation of root menu failed."); diff --git a/widget/src/mac/nsMenuItem.cpp b/widget/src/mac/nsMenuItem.cpp index 29369c1b07a8..21b84c01ec6a 100644 --- a/widget/src/mac/nsMenuItem.cpp +++ b/widget/src/mac/nsMenuItem.cpp @@ -69,7 +69,7 @@ NS_IMPL_ISUPPORTS4(nsMenuItem, nsIMenuItem, nsIMenuListener, nsIChangeObserver, // nsMenuItem::nsMenuItem() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mMenuParent = nsnull; mIsSeparator = PR_FALSE; mKeyEquivalent.Assign(NS_LITERAL_STRING(" ")); diff --git a/widget/src/mac/nsMenuItemX.cpp b/widget/src/mac/nsMenuItemX.cpp index d63c115bce4e..f3317f3f0c97 100644 --- a/widget/src/mac/nsMenuItemX.cpp +++ b/widget/src/mac/nsMenuItemX.cpp @@ -68,7 +68,7 @@ NS_IMPL_ISUPPORTS4(nsMenuItemX, nsIMenuItem, nsIMenuListener, nsIChangeObserver, // nsMenuItemX::nsMenuItemX() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mMenuParent = nsnull; mIsSeparator = PR_FALSE; mKeyEquivalent.Assign(NS_LITERAL_STRING(" ")); diff --git a/widget/src/mac/nsMenuX.cpp b/widget/src/mac/nsMenuX.cpp index acb875139393..048dee64f7af 100644 --- a/widget/src/mac/nsMenuX.cpp +++ b/widget/src/mac/nsMenuX.cpp @@ -101,7 +101,7 @@ public: nsDummyMenuItemX() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } }; @@ -122,7 +122,7 @@ nsMenuX::nsMenuX() mIsHelpMenu(PR_FALSE), mIsEnabled(PR_TRUE), mDestroyHandlerCalled(PR_FALSE), mNeedsRebuild(PR_TRUE), mConstructed(PR_FALSE), mVisible(PR_TRUE), mHandler(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #if DEBUG ++gMenuCounterX; diff --git a/widget/src/mac/nsTextWidget.cpp b/widget/src/mac/nsTextWidget.cpp index f6ad08d4b3d7..ac7ff81949d0 100644 --- a/widget/src/mac/nsTextWidget.cpp +++ b/widget/src/mac/nsTextWidget.cpp @@ -88,7 +88,7 @@ enum //------------------------------------------------------------------------- nsTextWidget::nsTextWidget() : nsMacControl(), nsITextWidget(), Repeater() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); WIDGET_SET_CLASSNAME("nsTextWidget"); SetControlType(kControlEditTextProc); mIsPassword = PR_FALSE; diff --git a/widget/src/mac/nsToolkit.cpp b/widget/src/mac/nsToolkit.cpp index aa939488dc9c..09207ff57532 100644 --- a/widget/src/mac/nsToolkit.cpp +++ b/widget/src/mac/nsToolkit.cpp @@ -195,7 +195,7 @@ static const char* gQuartzRenderingPref = "browser.quartz.enable"; //------------------------------------------------------------------------- nsToolkit::nsToolkit() : mInited(false) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (gEventQueueHandler == nsnull) gEventQueueHandler = new nsMacNSPREventQueueHandler; } diff --git a/widget/src/os2/nsAppShell.cpp b/widget/src/os2/nsAppShell.cpp index 854942f144a8..91f8f56cc782 100644 --- a/widget/src/os2/nsAppShell.cpp +++ b/widget/src/os2/nsAppShell.cpp @@ -105,7 +105,7 @@ NS_IMPL_ISUPPORTS1(nsAppShell, nsIAppShell) // nsAppShell constructor nsAppShell::nsAppShell() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mDispatchListener = 0; mHab = 0; mHmq = 0; mQuitNow = FALSE; diff --git a/widget/src/os2/nsBidiKeyboard.cpp b/widget/src/os2/nsBidiKeyboard.cpp index 2eacce44b352..ac910adc52db 100644 --- a/widget/src/os2/nsBidiKeyboard.cpp +++ b/widget/src/os2/nsBidiKeyboard.cpp @@ -26,7 +26,7 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsBidiKeyboard::~nsBidiKeyboard() diff --git a/widget/src/os2/nsFilePicker.cpp b/widget/src/os2/nsFilePicker.cpp index 6643dbf5d7d4..7f7bfe9163f2 100644 --- a/widget/src/os2/nsFilePicker.cpp +++ b/widget/src/os2/nsFilePicker.cpp @@ -64,7 +64,7 @@ MRESULT EXPENTRY FileDialogProc( HWND hwndDlg, ULONG msg, MPARAM mp1, MPARAM mp2 //------------------------------------------------------------------------- nsFilePicker::nsFilePicker() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mWnd = NULL; mUnicodeEncoder = nsnull; mUnicodeDecoder = nsnull; diff --git a/widget/src/os2/nsScrollbar.cpp b/widget/src/os2/nsScrollbar.cpp index bbf98619da02..dbbd1a8a3b8d 100644 --- a/widget/src/os2/nsScrollbar.cpp +++ b/widget/src/os2/nsScrollbar.cpp @@ -37,7 +37,7 @@ NS_IMPL_RELEASE(nsScrollbar) //------------------------------------------------------------------------- nsScrollbar::nsScrollbar(PRBool aIsVertical) : nsWindow(), nsIScrollbar() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mPositionFlag = aIsVertical ? SBS_VERT : SBS_HORZ; mScaleFactor = 1.0f; mLineIncrement = 0; diff --git a/widget/src/os2/nsSound.cpp b/widget/src/os2/nsSound.cpp index f8208a3aff51..125c51508166 100644 --- a/widget/src/os2/nsSound.cpp +++ b/widget/src/os2/nsSound.cpp @@ -41,7 +41,7 @@ NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver) //////////////////////////////////////////////////////////////////////// nsSound::nsSound() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsSound::~nsSound() diff --git a/widget/src/os2/nsToolkit.cpp b/widget/src/os2/nsToolkit.cpp index a6ce0b41ff8b..3e54037b3914 100644 --- a/widget/src/os2/nsToolkit.cpp +++ b/widget/src/os2/nsToolkit.cpp @@ -87,7 +87,7 @@ void PR_CALLBACK RunPump(void* arg) //------------------------------------------------------------------------- nsToolkit::nsToolkit() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mGuiThread = NULL; mDispatchWnd = 0; mMonitor = PR_NewMonitor(); diff --git a/widget/src/os2/nsWindow.cpp b/widget/src/os2/nsWindow.cpp index 4e481d6cdca6..5e724f419a81 100644 --- a/widget/src/os2/nsWindow.cpp +++ b/widget/src/os2/nsWindow.cpp @@ -132,7 +132,7 @@ static int currentWindowIdentifier = 0; //------------------------------------------------------------------------- nsWindow::nsWindow() : nsBaseWidget() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mWnd = 0; mFrameWnd = 0; mPrevWndProc = NULL; diff --git a/widget/src/photon/nsAppShell.cpp b/widget/src/photon/nsAppShell.cpp index 852b044fbd87..b1b1b1f424f3 100644 --- a/widget/src/photon/nsAppShell.cpp +++ b/widget/src/photon/nsAppShell.cpp @@ -90,7 +90,7 @@ nsAppShell::nsAppShell() { mEventQueue = nsnull; mFD = -1; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } //------------------------------------------------------------------------- diff --git a/widget/src/photon/nsBidiKeyboard.cpp b/widget/src/photon/nsBidiKeyboard.cpp index b9544b930dd4..dbd51032d8c2 100644 --- a/widget/src/photon/nsBidiKeyboard.cpp +++ b/widget/src/photon/nsBidiKeyboard.cpp @@ -41,7 +41,7 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsBidiKeyboard::~nsBidiKeyboard() diff --git a/widget/src/photon/nsButton.cpp b/widget/src/photon/nsButton.cpp index 872d350a6014..d81a26aba666 100644 --- a/widget/src/photon/nsButton.cpp +++ b/widget/src/photon/nsButton.cpp @@ -63,7 +63,7 @@ NS_IMPL_ISUPPORTS_INHERITED1(nsButton, nsWidget, nsIButton) //------------------------------------------------------------------------- nsButton::nsButton() : nsWidget(), nsIButton() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } //------------------------------------------------------------------------- diff --git a/widget/src/photon/nsCheckButton.cpp b/widget/src/photon/nsCheckButton.cpp index 198f5badef1c..5d0e1db1e554 100644 --- a/widget/src/photon/nsCheckButton.cpp +++ b/widget/src/photon/nsCheckButton.cpp @@ -66,7 +66,7 @@ NS_IMPL_RELEASE(nsCheckButton) nsCheckButton::nsCheckButton() : nsWidget(), nsICheckButton(), mState(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } //------------------------------------------------------------------------- diff --git a/widget/src/photon/nsClipboard.cpp b/widget/src/photon/nsClipboard.cpp index 6760e898e983..80da1cb4d72d 100644 --- a/widget/src/photon/nsClipboard.cpp +++ b/widget/src/photon/nsClipboard.cpp @@ -76,7 +76,7 @@ nsClipboard::nsClipboard() printf("nsClipboard::nsClipboard()\n"); #endif /* DEBUG_CLIPBOARD */ - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mIgnoreEmptyNotification = PR_FALSE; mGlobalTransferable = nsnull; mSelectionTransferable = nsnull; diff --git a/widget/src/photon/nsDragService.cpp b/widget/src/photon/nsDragService.cpp index ff2d89af4b86..fccc3e1428de 100644 --- a/widget/src/photon/nsDragService.cpp +++ b/widget/src/photon/nsDragService.cpp @@ -61,7 +61,7 @@ NS_IMPL_QUERY_INTERFACE2(nsDragService, nsIDragService, nsIDragSession) //------------------------------------------------------------------------- nsDragService::nsDragService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mDndWidget = nsnull; mDndEvent = nsnull; mNativeCtrl = nsnull; diff --git a/widget/src/photon/nsLabel.cpp b/widget/src/photon/nsLabel.cpp index 9730fdf55493..e1ecce4da8e7 100644 --- a/widget/src/photon/nsLabel.cpp +++ b/widget/src/photon/nsLabel.cpp @@ -54,7 +54,7 @@ NS_IMPL_RELEASE_INHERITED(nsLabel, nsWidget) //------------------------------------------------------------------------- nsLabel::nsLabel() : nsWidget(), nsILabel() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mAlignment = eAlign_Left; } diff --git a/widget/src/photon/nsScrollbar.cpp b/widget/src/photon/nsScrollbar.cpp index 6c0cd079100f..a41c3b2ddfb9 100644 --- a/widget/src/photon/nsScrollbar.cpp +++ b/widget/src/photon/nsScrollbar.cpp @@ -55,7 +55,7 @@ NS_IMPL_QUERY_INTERFACE2(nsScrollbar, nsIScrollbar, nsIWidget) //------------------------------------------------------------------------- nsScrollbar::nsScrollbar (PRBool aIsVertical):nsWidget (), nsIScrollbar () { - NS_INIT_REFCNT (); + NS_INIT_ISUPPORTS (); mOrientation = (aIsVertical) ? Pt_VERTICAL : Pt_HORIZONTAL; } diff --git a/widget/src/photon/nsSound.cpp b/widget/src/photon/nsSound.cpp index c021ab56d107..d418b9d31658 100644 --- a/widget/src/photon/nsSound.cpp +++ b/widget/src/photon/nsSound.cpp @@ -55,7 +55,7 @@ NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver); //////////////////////////////////////////////////////////////////////// nsSound::nsSound() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mInited = PR_FALSE; } diff --git a/widget/src/photon/nsTextWidget.cpp b/widget/src/photon/nsTextWidget.cpp index a500ced87232..346465eb5db2 100644 --- a/widget/src/photon/nsTextWidget.cpp +++ b/widget/src/photon/nsTextWidget.cpp @@ -65,7 +65,7 @@ NS_IMPL_RELEASE(nsTextWidget) //------------------------------------------------------------------------- nsTextWidget::nsTextWidget() : nsTextHelper() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mBackground = NS_RGB(124, 124, 124); } diff --git a/widget/src/photon/nsToolkit.cpp b/widget/src/photon/nsToolkit.cpp index cabd6ddd47c1..acd8bd2dbf93 100644 --- a/widget/src/photon/nsToolkit.cpp +++ b/widget/src/photon/nsToolkit.cpp @@ -58,7 +58,7 @@ NS_IMPL_ISUPPORTS1(nsToolkit,nsIToolkit); //------------------------------------------------------------------------- nsToolkit::nsToolkit() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/widget/src/photon/nsWidget.cpp b/widget/src/photon/nsWidget.cpp index d402897f33d0..f5110969f7da 100644 --- a/widget/src/photon/nsWidget.cpp +++ b/widget/src/photon/nsWidget.cpp @@ -109,7 +109,7 @@ PRBool nsWidget::sJustGotDeactivated = PR_FALSE; nsWidget::nsWidget() { // XXX Shouldn't this be done in nsBaseWidget? - // NS_INIT_REFCNT(); + // NS_INIT_ISUPPORTS(); if (!sLookAndFeel) { if (NS_OK != nsComponentManager::CreateInstance(kLookAndFeelCID, diff --git a/widget/src/qt/nsAppShell.cpp b/widget/src/qt/nsAppShell.cpp index 650238d507e0..a066a9c589d2 100644 --- a/widget/src/qt/nsAppShell.cpp +++ b/widget/src/qt/nsAppShell.cpp @@ -66,7 +66,7 @@ PRBool nsAppShell::mRunning = PR_FALSE; //------------------------------------------------------------------------- nsAppShell::nsAppShell() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mDispatchListener = 0; mEventQueue = nsnull; mApplication = nsnull; diff --git a/widget/src/qt/nsBidiKeyboard.cpp b/widget/src/qt/nsBidiKeyboard.cpp index 2eacce44b352..ac910adc52db 100644 --- a/widget/src/qt/nsBidiKeyboard.cpp +++ b/widget/src/qt/nsBidiKeyboard.cpp @@ -26,7 +26,7 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsBidiKeyboard::~nsBidiKeyboard() diff --git a/widget/src/qt/nsCheckButton.cpp b/widget/src/qt/nsCheckButton.cpp index c7096b6b18d5..da8ab0a7e04e 100644 --- a/widget/src/qt/nsCheckButton.cpp +++ b/widget/src/qt/nsCheckButton.cpp @@ -68,7 +68,7 @@ NS_IMPL_QUERY_INTERFACE2(nsCheckButton, nsICheckButton, nsIWidget) nsCheckButton::nsCheckButton() : nsWidget() , nsICheckButton() { PR_LOG(QtWidgetsLM, PR_LOG_DEBUG, ("nsCheckButton::nsCheckButton()\n")); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mWidget = nsnull; } diff --git a/widget/src/qt/nsClipboard.cpp b/widget/src/qt/nsClipboard.cpp index e9c00bfe5a03..93dff922b40f 100644 --- a/widget/src/qt/nsClipboard.cpp +++ b/widget/src/qt/nsClipboard.cpp @@ -71,7 +71,7 @@ NS_IMPL_ISUPPORTS1(nsClipboard, nsIClipboard); //------------------------------------------------------------------------- nsClipboard::nsClipboard() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mIgnoreEmptyNotification = PR_FALSE; mGlobalTransferable = nsnull; mSelectionTransferable = nsnull; diff --git a/widget/src/qt/nsDragService.cpp b/widget/src/qt/nsDragService.cpp index e82c764b1b5c..96a0ab5cb88e 100644 --- a/widget/src/qt/nsDragService.cpp +++ b/widget/src/qt/nsDragService.cpp @@ -72,7 +72,7 @@ static PRBool gHaveDrag = PR_FALSE; //------------------------------------------------------------------------- nsDragService::nsDragService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // our hidden source widget mHiddenWidget = new QWidget(0,QWidget::tr("DragDrop"),0); diff --git a/widget/src/qt/nsLabel.cpp b/widget/src/qt/nsLabel.cpp index e45a422c5dcc..7d3abbddc244 100644 --- a/widget/src/qt/nsLabel.cpp +++ b/widget/src/qt/nsLabel.cpp @@ -72,7 +72,7 @@ nsLabel::nsLabel() : nsWidget(), nsILabel() PR_LOG(QtWidgetsLM, PR_LOG_DEBUG, ("nsLabel::nsLabel()\n")); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mAlignment = eAlign_Left; } diff --git a/widget/src/qt/nsToolkit.cpp b/widget/src/qt/nsToolkit.cpp index 9e315f349374..7db2d51fa4bf 100644 --- a/widget/src/qt/nsToolkit.cpp +++ b/widget/src/qt/nsToolkit.cpp @@ -50,7 +50,7 @@ static PRUintn gToolkitTLSIndex = 0; //------------------------------------------------------------------------- nsToolkit::nsToolkit() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } //------------------------------------------------------------------------- diff --git a/widget/src/windows/nsAppShell.cpp b/widget/src/windows/nsAppShell.cpp index 29767d8ebfa5..b8445e404187 100644 --- a/widget/src/windows/nsAppShell.cpp +++ b/widget/src/windows/nsAppShell.cpp @@ -59,7 +59,7 @@ static int gKeepGoing = 1; //------------------------------------------------------------------------- nsAppShell::nsAppShell() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mDispatchListener = 0; } diff --git a/widget/src/windows/nsBidiKeyboard.cpp b/widget/src/windows/nsBidiKeyboard.cpp index 79ba1b36da69..7298f7d299ec 100644 --- a/widget/src/windows/nsBidiKeyboard.cpp +++ b/widget/src/windows/nsBidiKeyboard.cpp @@ -27,7 +27,7 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef IBMBIDI mDefaultsSet = PR_FALSE; mLTRKeyboard[0] = '\0'; diff --git a/widget/src/windows/nsClipboard.cpp b/widget/src/windows/nsClipboard.cpp index c5ced677503f..df303b210a16 100644 --- a/widget/src/windows/nsClipboard.cpp +++ b/widget/src/windows/nsClipboard.cpp @@ -77,7 +77,7 @@ UINT nsClipboard::CF_HTML = ::RegisterClipboardFormat("HTML Format"); //------------------------------------------------------------------------- nsClipboard::nsClipboard() : nsBaseClipboard() { - //NS_INIT_REFCNT(); + //NS_INIT_ISUPPORTS(); mIgnoreEmptyNotification = PR_FALSE; mWindow = nsnull; diff --git a/widget/src/windows/nsDragService.cpp b/widget/src/windows/nsDragService.cpp index 429986ff86ae..9971e37b878f 100644 --- a/widget/src/windows/nsDragService.cpp +++ b/widget/src/windows/nsDragService.cpp @@ -59,7 +59,7 @@ //------------------------------------------------------------------------- nsDragService::nsDragService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mNativeDragTarget = nsnull; mNativeDragSrc = nsnull; mDataObject = nsnull; diff --git a/widget/src/windows/nsFilePicker.cpp b/widget/src/windows/nsFilePicker.cpp index 295ac9e21f8c..db0af92484d5 100644 --- a/widget/src/windows/nsFilePicker.cpp +++ b/widget/src/windows/nsFilePicker.cpp @@ -65,7 +65,7 @@ char nsFilePicker::mLastUsedDirectory[MAX_PATH+1] = { 0 }; //------------------------------------------------------------------------- nsFilePicker::nsFilePicker() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mWnd = NULL; mUnicodeEncoder = nsnull; mUnicodeDecoder = nsnull; diff --git a/widget/src/windows/nsScrollbar.cpp b/widget/src/windows/nsScrollbar.cpp index 8aed5d389c8c..948c32f7bc9f 100644 --- a/widget/src/windows/nsScrollbar.cpp +++ b/widget/src/windows/nsScrollbar.cpp @@ -52,7 +52,7 @@ NS_IMPL_RELEASE(nsScrollbar) //------------------------------------------------------------------------- nsScrollbar::nsScrollbar(PRBool aIsVertical) : nsWindow(), nsIScrollbar() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mPositionFlag = (aIsVertical) ? SBS_VERT : SBS_HORZ; mScaleFactor = 1.0f; mLineIncrement = 0; diff --git a/widget/src/windows/nsSound.cpp b/widget/src/windows/nsSound.cpp index 0aa9bd700592..75280b252220 100644 --- a/widget/src/windows/nsSound.cpp +++ b/widget/src/windows/nsSound.cpp @@ -73,7 +73,7 @@ private: nsSound::nsSound() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mLastSound = nsnull; } diff --git a/widget/src/windows/nsToolkit.cpp b/widget/src/windows/nsToolkit.cpp index e4f963da77eb..a9f62870cd4b 100644 --- a/widget/src/windows/nsToolkit.cpp +++ b/widget/src/windows/nsToolkit.cpp @@ -151,7 +151,7 @@ void RunPump(void* arg) //------------------------------------------------------------------------- nsToolkit::nsToolkit() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mGuiThread = NULL; mDispatchWnd = 0; diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp index fa9cb2ae6d71..da84e5e2ede7 100644 --- a/widget/src/windows/nsWindow.cpp +++ b/widget/src/windows/nsWindow.cpp @@ -743,7 +743,7 @@ nsWindow::nsWindow() : nsBaseWidget(), mRootAccessible(NULL) nsWindow::nsWindow() : nsBaseWidget() #endif { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mWnd = 0; mPrevWndProc = NULL; mBackground = ::GetSysColor(COLOR_BTNFACE); diff --git a/widget/src/xlib/nsBidiKeyboard.cpp b/widget/src/xlib/nsBidiKeyboard.cpp index 2eacce44b352..ac910adc52db 100644 --- a/widget/src/xlib/nsBidiKeyboard.cpp +++ b/widget/src/xlib/nsBidiKeyboard.cpp @@ -26,7 +26,7 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsBidiKeyboard::~nsBidiKeyboard() diff --git a/widget/src/xpwidgets/nsBaseClipboard.cpp b/widget/src/xpwidgets/nsBaseClipboard.cpp index 0d6df9481e5f..3d238e330597 100644 --- a/widget/src/xpwidgets/nsBaseClipboard.cpp +++ b/widget/src/xpwidgets/nsBaseClipboard.cpp @@ -59,7 +59,7 @@ NS_IMPL_QUERY_INTERFACE1(nsBaseClipboard, nsIClipboard); //------------------------------------------------------------------------- nsBaseClipboard::nsBaseClipboard() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mClipboardOwner = nsnull; mTransferable = nsnull; mIgnoreEmptyNotification = PR_FALSE; diff --git a/widget/src/xpwidgets/nsBaseDragService.cpp b/widget/src/xpwidgets/nsBaseDragService.cpp index 583223445bea..1941e379f383 100644 --- a/widget/src/xpwidgets/nsBaseDragService.cpp +++ b/widget/src/xpwidgets/nsBaseDragService.cpp @@ -67,7 +67,7 @@ NS_IMPL_QUERY_INTERFACE2(nsBaseDragService, nsIDragService, nsIDragSession) nsBaseDragService::nsBaseDragService() : mCanDrop(PR_FALSE), mDoingDrag(PR_FALSE), mTargetSize(0,0), mDragAction(DRAGDROP_ACTION_NONE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); nsresult result = NS_NewISupportsArray(getter_AddRefs(mTransArray)); if ( NS_FAILED(result) ) { //what do we do? we can't throw! diff --git a/widget/src/xpwidgets/nsBasePointerService.cpp b/widget/src/xpwidgets/nsBasePointerService.cpp index 534c622b6035..198c346d40fc 100644 --- a/widget/src/xpwidgets/nsBasePointerService.cpp +++ b/widget/src/xpwidgets/nsBasePointerService.cpp @@ -22,7 +22,7 @@ nsBasePointerService::nsBasePointerService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsBasePointerService::~nsBasePointerService() diff --git a/widget/src/xpwidgets/nsBaseWidget.cpp b/widget/src/xpwidgets/nsBaseWidget.cpp index 862dcbda2835..80ad8b0cd2c4 100644 --- a/widget/src/xpwidgets/nsBaseWidget.cpp +++ b/widget/src/xpwidgets/nsBaseWidget.cpp @@ -98,7 +98,7 @@ nsBaseWidget::nsBaseWidget() NS_NewISupportsArray(getter_AddRefs(mChildren)); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } @@ -1218,7 +1218,7 @@ nsBaseWidget::debug_DumpInvalidate(FILE * aFileOut, nsBaseWidget::Enumerator::Enumerator(nsBaseWidget & inParent) : mCurrentPosition(0), mParent(inParent) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/widget/src/xpwidgets/nsDataFlavor.cpp b/widget/src/xpwidgets/nsDataFlavor.cpp index 88925595ccb3..0cd44f52944d 100644 --- a/widget/src/xpwidgets/nsDataFlavor.cpp +++ b/widget/src/xpwidgets/nsDataFlavor.cpp @@ -50,7 +50,7 @@ NS_IMPL_RELEASE(nsDataFlavor) //------------------------------------------------------------------------- nsDataFlavor::nsDataFlavor() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } //------------------------------------------------------------------------- diff --git a/widget/src/xpwidgets/nsHTMLFormatConverter.cpp b/widget/src/xpwidgets/nsHTMLFormatConverter.cpp index eab978a22aff..8eb679effb22 100644 --- a/widget/src/xpwidgets/nsHTMLFormatConverter.cpp +++ b/widget/src/xpwidgets/nsHTMLFormatConverter.cpp @@ -74,7 +74,7 @@ NS_IMPL_QUERY_INTERFACE1(nsHTMLFormatConverter, nsIFormatConverter) //------------------------------------------------------------------------- nsHTMLFormatConverter::nsHTMLFormatConverter() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } //------------------------------------------------------------------------- diff --git a/widget/src/xpwidgets/nsTransferable.cpp b/widget/src/xpwidgets/nsTransferable.cpp index 08275b390e6c..537ac074e8d2 100644 --- a/widget/src/xpwidgets/nsTransferable.cpp +++ b/widget/src/xpwidgets/nsTransferable.cpp @@ -289,7 +289,7 @@ DataStruct::ReadCache(nsISupports** aData, PRUint32* aDataLen) //------------------------------------------------------------------------- nsTransferable::nsTransferable() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mDataArray = new nsVoidArray(); } diff --git a/widget/src/xpwidgets/nsXPLookAndFeel.cpp b/widget/src/xpwidgets/nsXPLookAndFeel.cpp index 0e3958add94e..498025e04755 100644 --- a/widget/src/xpwidgets/nsXPLookAndFeel.cpp +++ b/widget/src/xpwidgets/nsXPLookAndFeel.cpp @@ -183,7 +183,7 @@ PRBool nsXPLookAndFeel::sInitialized = PR_FALSE; nsXPLookAndFeel::nsXPLookAndFeel() : nsILookAndFeel() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } static int PR_CALLBACK intPrefChanged (const char *newpref, void *data) diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in index dde32810ac58..5834cfb1956a 100644 --- a/xpcom/base/Makefile.in +++ b/xpcom/base/Makefile.in @@ -57,7 +57,6 @@ EXPORTS = \ nsCom.h \ nsComObsolete.h \ nsCWeakReference.h \ - nsError.h \ nsIID.h \ nsISupportsObsolete.h \ nsTraceRefcnt.h \ @@ -91,6 +90,7 @@ SDK_XPIDLSRCS = \ nsrootidl.idl \ SDK_HEADERS = \ + nsError.h \ nsISupportsBase.h \ nscore.h \ nsID.h \ diff --git a/xpcom/base/nsAgg.h b/xpcom/base/nsAgg.h index 52eeba4c9b2d..5dd1a6eb74a9 100644 --- a/xpcom/base/nsAgg.h +++ b/xpcom/base/nsAgg.h @@ -81,7 +81,7 @@ public: \ // Put this in your class's constructor: #define NS_INIT_AGGREGATED(outer) \ PR_BEGIN_MACRO \ - NS_INIT_REFCNT(); \ + NS_INIT_ISUPPORTS(); \ fOuter = outer ? outer : &fAggregated; \ PR_END_MACRO diff --git a/xpcom/base/nsConsoleService.cpp b/xpcom/base/nsConsoleService.cpp index a86e5eeb9664..0295a19302bd 100644 --- a/xpcom/base/nsConsoleService.cpp +++ b/xpcom/base/nsConsoleService.cpp @@ -55,7 +55,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsConsoleService, nsIConsoleService); nsConsoleService::nsConsoleService() : mCurrent(0), mFull(PR_FALSE), mListening(PR_FALSE), mLock(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // XXX grab this from a pref! // hm, but worry about circularity, bc we want to be able to report diff --git a/xpcom/base/nsLeakDetector.cpp b/xpcom/base/nsLeakDetector.cpp index 59bc572b4fa6..8296adcd0bfd 100644 --- a/xpcom/base/nsLeakDetector.cpp +++ b/xpcom/base/nsLeakDetector.cpp @@ -84,7 +84,7 @@ public: NS_IMPL_ISUPPORTS1(nsLeakDetector, nsILeakDetector) nsLeakDetector::nsLeakDetector() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsLeakDetector::~nsLeakDetector() {} diff --git a/xpcom/base/nsMemoryImpl.cpp b/xpcom/base/nsMemoryImpl.cpp index 2ab6bb714280..1bd203f65e42 100644 --- a/xpcom/base/nsMemoryImpl.cpp +++ b/xpcom/base/nsMemoryImpl.cpp @@ -110,7 +110,7 @@ MemoryFlusher::MemoryFlusher(nsMemoryImpl* aMemoryImpl) mLock(nsnull), mCVar(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } MemoryFlusher::~MemoryFlusher() @@ -253,7 +253,7 @@ nsMemoryImpl::nsMemoryImpl() mFlushLock(nsnull), mIsFlushing(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMemoryImpl::~nsMemoryImpl() diff --git a/xpcom/base/nsSystemInfo.cpp b/xpcom/base/nsSystemInfo.cpp index 67a19d59c84e..dcb4b0cd9c9d 100644 --- a/xpcom/base/nsSystemInfo.cpp +++ b/xpcom/base/nsSystemInfo.cpp @@ -42,7 +42,7 @@ nsSystemInfo::nsSystemInfo() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsSystemInfo::~nsSystemInfo() diff --git a/xpcom/base/nscore.h b/xpcom/base/nscore.h index 4a309967bccc..600ce1cdb345 100644 --- a/xpcom/base/nscore.h +++ b/xpcom/base/nscore.h @@ -42,7 +42,6 @@ */ #include "prtypes.h" - /* Core XPCOM declarations. */ /** @@ -154,6 +153,7 @@ typedef PRUint32 nsresult; */ #define nsnull 0 +#include "nsError.h" /* ------------------------------------------------------------------------ */ /* Casting macros for hiding C++ features from older compilers */ @@ -301,11 +301,5 @@ typedef PRUint32 nsresult; #define NS_PTR_TO_INT32(x) ((char *)(x) - (char *)0) #define NS_INT32_TO_PTR(x) ((void *)((char *)0 + (x))) -/* Include deprecated APIs... */ - -#ifndef nsComObsolete_h__ -#include "nsComObsolete.h" -#endif - #endif /* nscore_h___ */ diff --git a/xpcom/components/nsCategoryManager.cpp b/xpcom/components/nsCategoryManager.cpp index 1d72151131e7..c62b5319c519 100644 --- a/xpcom/components/nsCategoryManager.cpp +++ b/xpcom/components/nsCategoryManager.cpp @@ -167,7 +167,7 @@ nsCategoryManager::nsCategoryManager() (nsHashtableEnumFunc) Destroy_CategoryNode, 0 ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsCategoryManager::~nsCategoryManager() @@ -387,7 +387,7 @@ NS_IMPL_ISUPPORTS1(nsCategoryManagerFactory, nsIFactory) nsCategoryManagerFactory::nsCategoryManagerFactory() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMETHODIMP diff --git a/xpcom/components/nsComponentManager.cpp b/xpcom/components/nsComponentManager.cpp index 3ecf84c4c87a..65c21f759d5d 100644 --- a/xpcom/components/nsComponentManager.cpp +++ b/xpcom/components/nsComponentManager.cpp @@ -479,7 +479,7 @@ PLDHashTableEnumeratorImpl::PLDHashTableEnumeratorImpl(PLDHashTable *table, nsAutoMonitor mon(mMonitor); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); Closure c = { PR_FALSE, converter, converterData, this }; mCount = PL_DHashTableEnumerate(table, Enumerator, &c); if (!c.succeeded) { @@ -689,7 +689,7 @@ nsComponentManagerImpl::nsComponentManagerImpl() mLoaderData(nsnull), mRegistryDirty(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mFactories.ops = nsnull; mContractIDs.ops = nsnull; } diff --git a/xpcom/components/nsNativeComponentLoader.cpp b/xpcom/components/nsNativeComponentLoader.cpp index 0b6aeb977be9..4d242c85cfd3 100644 --- a/xpcom/components/nsNativeComponentLoader.cpp +++ b/xpcom/components/nsNativeComponentLoader.cpp @@ -59,7 +59,7 @@ extern PRLogModuleInfo *nsComponentManagerLog; nsNativeComponentLoader::nsNativeComponentLoader() : mCompMgr(nsnull), mDllStore(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } static PRBool PR_CALLBACK diff --git a/xpcom/components/nsRegistry.cpp b/xpcom/components/nsRegistry.cpp index 1e47bdda065b..e19de06b9f5a 100644 --- a/xpcom/components/nsRegistry.cpp +++ b/xpcom/components/nsRegistry.cpp @@ -368,7 +368,7 @@ NS_IMPL_ISUPPORTS1( nsRegistryValue, nsIRegistryValue ) ------------------------------------------------------------------------------*/ nsRegistry::nsRegistry() : mReg(0), mCurRegID(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef EXTRA_THREADSAFE mregLock = PR_NewLock(); #endif @@ -1574,7 +1574,7 @@ int nsRegistry::SetBufferSize( int bufsize ) nsRegSubtreeEnumerator::nsRegSubtreeEnumerator( HREG hReg, RKEY rKey, PRBool all ) : mReg( hReg ), mKey( rKey ), mEnum( 0 ), mNext( 0 ), mStyle( all ? REGENUM_DESCEND : REGENUM_CHILDREN ), mDone( PR_FALSE ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mName[0] = '\0'; @@ -1762,7 +1762,7 @@ NS_IMETHODIMP nsRegValueEnumerator::advance() { ------------------------------------------------------------------------------*/ nsRegistryNode::nsRegistryNode( HREG hReg, char *name, RKEY childKey ) : mReg( hReg ), mChildKey( childKey ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); PR_ASSERT(name != nsnull); strcpy(mName, name); @@ -1825,7 +1825,7 @@ NS_IMETHODIMP nsRegistryNode::GetKey( nsRegistryKey *r_key ) { ------------------------------------------------------------------------------*/ nsRegistryValue::nsRegistryValue( HREG hReg, RKEY key, REGENUM slot ) : mReg( hReg ), mKey( key ), mEnum( slot ), mErr( -1 ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef EXTRA_THREADSAFE mregLock = PR_NewLock(); #endif @@ -1953,7 +1953,7 @@ nsresult nsRegistryValue::getInfo() { nsRegistryFactory::nsRegistryFactory() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsRegistryFactory, nsIFactory) diff --git a/xpcom/components/nsStaticComponentLoader.cpp b/xpcom/components/nsStaticComponentLoader.cpp index 48c97d2bfde4..93307ae09225 100644 --- a/xpcom/components/nsStaticComponentLoader.cpp +++ b/xpcom/components/nsStaticComponentLoader.cpp @@ -32,7 +32,7 @@ public: nsStaticComponentLoader() : mAutoRegistered(PR_FALSE), mLoadedInfo(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } virtual ~nsStaticComponentLoader() { diff --git a/xpcom/components/nsXPComFactory.h b/xpcom/components/nsXPComFactory.h index 99498b1534b5..35ebe5962fab 100644 --- a/xpcom/components/nsXPComFactory.h +++ b/xpcom/components/nsXPComFactory.h @@ -89,7 +89,7 @@ class ns##_name##Factory : public nsIFactory \ public: \ NS_DECL_ISUPPORTS \ \ - ns##_name##Factory() { NS_INIT_REFCNT(); } \ + ns##_name##Factory() { NS_INIT_ISUPPORTS(); } \ \ NS_IMETHOD CreateInstance(nsISupports *aOuter, \ const nsIID &aIID, \ diff --git a/xpcom/ds/nsArena.cpp b/xpcom/ds/nsArena.cpp index 64a2be24bec5..d9c02dba7758 100644 --- a/xpcom/ds/nsArena.cpp +++ b/xpcom/ds/nsArena.cpp @@ -42,7 +42,7 @@ ArenaImpl::ArenaImpl(void) : mInitialized(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); memset(&mPool, 0, sizeof(PLArenaPool)); } diff --git a/xpcom/ds/nsByteBuffer.cpp b/xpcom/ds/nsByteBuffer.cpp index 795353e7503f..d12d4fd8d1a7 100644 --- a/xpcom/ds/nsByteBuffer.cpp +++ b/xpcom/ds/nsByteBuffer.cpp @@ -45,7 +45,7 @@ ByteBufferImpl::ByteBufferImpl(void) : mBuffer(NULL), mSpace(0), mLength(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMETHODIMP diff --git a/xpcom/ds/nsEnumeratorUtils.cpp b/xpcom/ds/nsEnumeratorUtils.cpp index f03bf30dfc8e..ad8893b58557 100644 --- a/xpcom/ds/nsEnumeratorUtils.cpp +++ b/xpcom/ds/nsEnumeratorUtils.cpp @@ -42,7 +42,7 @@ nsArrayEnumerator::nsArrayEnumerator(nsISupportsArray* aValueArray) : mValueArray(aValueArray), mIndex(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_IF_ADDREF(mValueArray); } @@ -111,7 +111,7 @@ NS_NewArrayEnumerator(nsISimpleEnumerator* *result, nsSingletonEnumerator::nsSingletonEnumerator(nsISupports* aValue) : mValue(aValue) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_IF_ADDREF(mValue); mConsumed = (mValue ? PR_FALSE : PR_TRUE); } @@ -170,7 +170,7 @@ NS_NewSingletonEnumerator(nsISimpleEnumerator* *result, nsAdapterEnumerator::nsAdapterEnumerator(nsIEnumerator* aEnum) : mEnum(aEnum), mCurrent(0), mStarted(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF(mEnum); } diff --git a/xpcom/ds/nsHashtableEnumerator.cpp b/xpcom/ds/nsHashtableEnumerator.cpp index a67b6d676353..2105467d96a3 100644 --- a/xpcom/ds/nsHashtableEnumerator.cpp +++ b/xpcom/ds/nsHashtableEnumerator.cpp @@ -102,7 +102,7 @@ nsHashtableEnumerator::nsHashtableEnumerator (nsHashtable *aHash, void *aData) : mElements(nsnull), mCount(0), mDoneFlag(PR_TRUE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); Reset (aHash, aConverter, aData); } diff --git a/xpcom/ds/nsObserverList.cpp b/xpcom/ds/nsObserverList.cpp index a11311667d0b..ada9d755c55e 100644 --- a/xpcom/ds/nsObserverList.cpp +++ b/xpcom/ds/nsObserverList.cpp @@ -142,7 +142,7 @@ nsObserverList::GetObserverList(nsISimpleEnumerator** anEnumerator) ObserverListEnumerator::ObserverListEnumerator(nsISupportsArray* aValueArray) : mValueArray(aValueArray), mIndex(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_IF_ADDREF(mValueArray); if (mValueArray) { PRUint32 total; diff --git a/xpcom/ds/nsObserverService.cpp b/xpcom/ds/nsObserverService.cpp index 55c7aed8f1d1..7a21abf40810 100644 --- a/xpcom/ds/nsObserverService.cpp +++ b/xpcom/ds/nsObserverService.cpp @@ -74,7 +74,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsObserverService, nsIObserverService) nsObserverService::nsObserverService() : mObserverTopicTable(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mObserverTopicTable = nsnull; } diff --git a/xpcom/ds/nsPersistentProperties.cpp b/xpcom/ds/nsPersistentProperties.cpp index c3cb7ce80910..6e5c6a4a3fc5 100644 --- a/xpcom/ds/nsPersistentProperties.cpp +++ b/xpcom/ds/nsPersistentProperties.cpp @@ -119,7 +119,7 @@ struct PLDHashTableOps property_HashTableOps = { nsPersistentProperties::nsPersistentProperties() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mIn = nsnull; mSubclass = NS_STATIC_CAST(nsIPersistentProperties*, this); diff --git a/xpcom/ds/nsSizeOfHandler.cpp b/xpcom/ds/nsSizeOfHandler.cpp index 87b19e357b72..4ded07ffdeba 100644 --- a/xpcom/ds/nsSizeOfHandler.cpp +++ b/xpcom/ds/nsSizeOfHandler.cpp @@ -129,7 +129,7 @@ nsSizeOfHandler::nsSizeOfHandler() : mTotalSize(0), mTotalCount(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mTotalSize = 0; mSizeTable = PL_NewHashTable(32, (PLHashFunction) PointerHashKey, (PLHashComparator) PointerCompareKeys, diff --git a/xpcom/ds/nsSupportsArray.cpp b/xpcom/ds/nsSupportsArray.cpp index c3a81bea581f..a3f52fb52f03 100644 --- a/xpcom/ds/nsSupportsArray.cpp +++ b/xpcom/ds/nsSupportsArray.cpp @@ -129,7 +129,7 @@ static const PRInt32 kLinearThreshold = 16 * sizeof(nsISupports *); nsSupportsArray::nsSupportsArray() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mArray = mAutoArray; mArraySize = kAutoArraySize; mCount = 0; diff --git a/xpcom/ds/nsSupportsArrayEnumerator.cpp b/xpcom/ds/nsSupportsArrayEnumerator.cpp index aeaa3c1b5fd4..ccaac4f6f775 100644 --- a/xpcom/ds/nsSupportsArrayEnumerator.cpp +++ b/xpcom/ds/nsSupportsArrayEnumerator.cpp @@ -41,7 +41,7 @@ nsSupportsArrayEnumerator::nsSupportsArrayEnumerator(nsISupportsArray* array) : mArray(array), mCursor(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ASSERTION(array, "null array"); NS_ADDREF(mArray); } diff --git a/xpcom/ds/nsUnicharBuffer.cpp b/xpcom/ds/nsUnicharBuffer.cpp index d3094a28fe2b..72dd40faec07 100644 --- a/xpcom/ds/nsUnicharBuffer.cpp +++ b/xpcom/ds/nsUnicharBuffer.cpp @@ -45,7 +45,7 @@ UnicharBufferImpl::UnicharBufferImpl() : mBuffer(NULL), mSpace(0), mLength(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_METHOD diff --git a/xpcom/glue/Makefile.in b/xpcom/glue/Makefile.in index ac495999a4a4..252ec6a5abe4 100644 --- a/xpcom/glue/Makefile.in +++ b/xpcom/glue/Makefile.in @@ -42,15 +42,12 @@ CPPSRCS = \ $(XPCOM_GLUE_SRC_LCSRCS) \ $(NULL) -EXPORTS = \ +SDK_HEADERS = \ nsIGenericFactory.h \ nsIInterfaceRequestorUtils.h \ nsISupportsImpl.h \ nsISupportsUtils.h \ nsIWeakReferenceUtils.h \ - $(NULL) - -SDK_HEADERS = \ $(XPCOM_GLUE_SRC_LEXPORTS) \ $(NULL) diff --git a/xpcom/glue/nsISupportsUtils.h b/xpcom/glue/nsISupportsUtils.h index 720df82d7362..e909fd9757b9 100644 --- a/xpcom/glue/nsISupportsUtils.h +++ b/xpcom/glue/nsISupportsUtils.h @@ -61,10 +61,6 @@ #include "nsISupportsImpl.h" #endif -#ifndef nsISupportsObsolete_h__ -#include "nsISupportsObsolete.h" -#endif - /** * Macro for instantiating a new object that implements nsISupports. * Use this in your factory methods to allow for refcnt tracing. diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp index 663b2002425f..035f28c4d4b2 100755 --- a/xpcom/io/nsAppFileLocationProvider.cpp +++ b/xpcom/io/nsAppFileLocationProvider.cpp @@ -442,7 +442,7 @@ class nsAppDirectoryEnumerator : public nsISimpleEnumerator mProvider(aProvider), mCurrentKey(aKeyList) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMETHOD HasMoreElements(PRBool *result) diff --git a/xpcom/io/nsBinaryStream.cpp b/xpcom/io/nsBinaryStream.cpp index 1d482534ba2d..d463bd0cba1f 100644 --- a/xpcom/io/nsBinaryStream.cpp +++ b/xpcom/io/nsBinaryStream.cpp @@ -44,7 +44,7 @@ nsBinaryOutputStream::nsBinaryOutputStream(nsIOutputStream* aStream) : mOutputStream(aStream), mBufferAccess(do_QueryInterface(aStream)) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsBinaryOutputStream, nsIBinaryOutputStream) @@ -274,7 +274,7 @@ nsBinaryInputStream::nsBinaryInputStream(nsIInputStream* aStream) : mInputStream(aStream), mBufferAccess(do_QueryInterface(aStream)) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsBinaryInputStream, nsIBinaryInputStream) diff --git a/xpcom/io/nsByteArrayInputStream.cpp b/xpcom/io/nsByteArrayInputStream.cpp index c488f5bdb587..9bb8d16a548c 100644 --- a/xpcom/io/nsByteArrayInputStream.cpp +++ b/xpcom/io/nsByteArrayInputStream.cpp @@ -27,7 +27,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS2(nsByteArrayInputStream, nsIInputStream, nsIByteArr nsByteArrayInputStream::nsByteArrayInputStream (char *buffer, PRUint32 bytes) : _buffer (buffer), _nbytes (bytes), _pos (0) { - NS_INIT_REFCNT (); + NS_INIT_ISUPPORTS (); } nsByteArrayInputStream::~nsByteArrayInputStream () diff --git a/xpcom/io/nsDirectoryService.cpp b/xpcom/io/nsDirectoryService.cpp index 78509e1dbd6b..4e3755de8e66 100644 --- a/xpcom/io/nsDirectoryService.cpp +++ b/xpcom/io/nsDirectoryService.cpp @@ -408,7 +408,7 @@ nsDirectoryService* nsDirectoryService::mService = nsnull; nsDirectoryService::nsDirectoryService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_METHOD diff --git a/xpcom/io/nsFastLoadService.cpp b/xpcom/io/nsFastLoadService.cpp index b9a3fa1c0ed4..7631f5fc30fb 100644 --- a/xpcom/io/nsFastLoadService.cpp +++ b/xpcom/io/nsFastLoadService.cpp @@ -67,7 +67,7 @@ nsFastLoadService::nsFastLoadService() mFastLoadPtrMap(nsnull), mDirection(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ASSERTION(gFastLoadService_ == nsnull, "double FastLoadService init?"); gFastLoadService_ = this; diff --git a/xpcom/io/nsIFileStream.cpp b/xpcom/io/nsIFileStream.cpp index 80795ce352e4..2776fd758886 100644 --- a/xpcom/io/nsIFileStream.cpp +++ b/xpcom/io/nsIFileStream.cpp @@ -139,7 +139,7 @@ FileImpl::FileImpl(PRFileDesc* inDesc) , mLength(-1) , mGotBuffers(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mWriteCursor = nsnull; mWriteLimit = nsnull; @@ -155,7 +155,7 @@ FileImpl::FileImpl(const nsFileSpec& inFile, int nsprMode, PRIntn accessMode) , mLength(-1) , mGotBuffers(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mWriteCursor = nsnull; mWriteLimit = nsnull; diff --git a/xpcom/io/nsLocalFileMac.cpp b/xpcom/io/nsLocalFileMac.cpp index 865543ff76b5..1205b495da24 100644 --- a/xpcom/io/nsLocalFileMac.cpp +++ b/xpcom/io/nsLocalFileMac.cpp @@ -975,7 +975,7 @@ class nsDirEnumerator : public nsISimpleEnumerator nsDirEnumerator() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult Init(nsILocalFileMac* parent) @@ -1081,7 +1081,7 @@ nsLocalFile::nsLocalFile() : mType('TEXT'), mCreator(kDefaultCreator) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); ClearFSSpec(mSpec); ClearFSSpec(mTargetSpec); @@ -1093,7 +1093,7 @@ nsLocalFile::nsLocalFile() : nsLocalFile::nsLocalFile(const nsLocalFile& srcFile) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); *this = srcFile; } @@ -1107,7 +1107,7 @@ nsLocalFile::nsLocalFile(const FSSpec& aSpec, const nsACString& aAppendedPath) : mType('TEXT'), mCreator(kDefaultCreator) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); ClearFSSpec(mTargetSpec); diff --git a/xpcom/io/nsLocalFileOS2.cpp b/xpcom/io/nsLocalFileOS2.cpp index 3cc08d63e0db..613a8ffe2569 100644 --- a/xpcom/io/nsLocalFileOS2.cpp +++ b/xpcom/io/nsLocalFileOS2.cpp @@ -152,7 +152,7 @@ class nsDirEnumerator : public nsISimpleEnumerator nsDirEnumerator() : mDir(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult Init(nsILocalFile* parent) @@ -254,7 +254,7 @@ NS_IMPL_ISUPPORTS1(nsDirEnumerator, nsISimpleEnumerator) nsLocalFile::nsLocalFile() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifndef XP_OS2 mPersistFile = nsnull; diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp index dee8fa85d8bf..7606ae68945c 100644 --- a/xpcom/io/nsLocalFileUnix.cpp +++ b/xpcom/io/nsLocalFileUnix.cpp @@ -121,7 +121,7 @@ nsDirEnumeratorUnix::nsDirEnumeratorUnix() : mDir(nsnull), mEntry(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsDirEnumeratorUnix::~nsDirEnumeratorUnix() @@ -201,7 +201,7 @@ nsDirEnumeratorUnix::GetNextEntry() nsLocalFile::nsLocalFile() : mHaveCachedStat(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsLocalFile::~nsLocalFile() diff --git a/xpcom/io/nsLocalFileWin.cpp b/xpcom/io/nsLocalFileWin.cpp index 80b7bedd94df..1c461ba6ee2d 100644 --- a/xpcom/io/nsLocalFileWin.cpp +++ b/xpcom/io/nsLocalFileWin.cpp @@ -262,7 +262,7 @@ class nsDirEnumerator : public nsISimpleEnumerator nsDirEnumerator() : mDir(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsresult Init(nsILocalFile* parent) @@ -368,7 +368,7 @@ NS_IMPL_ISUPPORTS1(nsDirEnumerator, nsISimpleEnumerator); nsLocalFile::nsLocalFile() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mLastResolution = PR_FALSE; mFollowSymlinks = PR_FALSE; MakeDirty(); diff --git a/xpcom/io/nsPipe2.cpp b/xpcom/io/nsPipe2.cpp index 03c433c2d904..6d10410cf4c9 100644 --- a/xpcom/io/nsPipe2.cpp +++ b/xpcom/io/nsPipe2.cpp @@ -202,7 +202,7 @@ nsPipe::nsPipe() mWriteLimit(nsnull), mCondition(NS_OK) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsPipe::~nsPipe() diff --git a/xpcom/io/nsScriptableInputStream.h b/xpcom/io/nsScriptableInputStream.h index 47f6b9ed717e..a7479cc97dbe 100644 --- a/xpcom/io/nsScriptableInputStream.h +++ b/xpcom/io/nsScriptableInputStream.h @@ -57,7 +57,7 @@ public: NS_DECL_NSISCRIPTABLEINPUTSTREAM // nsScriptableInputStream methods - nsScriptableInputStream() { NS_INIT_REFCNT(); }; + nsScriptableInputStream() { NS_INIT_ISUPPORTS(); }; virtual ~nsScriptableInputStream() {}; static NS_METHOD diff --git a/xpcom/io/nsStorageStream.cpp b/xpcom/io/nsStorageStream.cpp index 02bc783a10ab..dcb1d1eb63c6 100644 --- a/xpcom/io/nsStorageStream.cpp +++ b/xpcom/io/nsStorageStream.cpp @@ -57,7 +57,7 @@ nsStorageStream::nsStorageStream() : mSegmentedBuffer(0), mSegmentSize(0), mWriteInProgress(PR_FALSE), mLastSegmentNum(-1), mWriteCursor(0), mSegmentEnd(0), mLogicalLength(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #if defined(PR_LOGGING) // @@ -321,7 +321,7 @@ public: mSegmentSize(aSegmentSize), mLogicalCursor(0) { NS_ADDREF(mStorageStream); - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } virtual ~nsStorageInputStream() diff --git a/xpcom/io/nsStringStream.cpp b/xpcom/io/nsStringStream.cpp index ec41d418021d..63882d111675 100644 --- a/xpcom/io/nsStringStream.cpp +++ b/xpcom/io/nsStringStream.cpp @@ -122,7 +122,7 @@ BasicStringImpl::BasicStringImpl() , mLastResult(NS_OK) , mEOF(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } //---------------------------------------------------------------------------------------- diff --git a/xpcom/io/nsUnicharInputStream.cpp b/xpcom/io/nsUnicharInputStream.cpp index 918fe1ec89de..21de7ca4e5cd 100644 --- a/xpcom/io/nsUnicharInputStream.cpp +++ b/xpcom/io/nsUnicharInputStream.cpp @@ -69,7 +69,7 @@ public: StringUnicharInputStream::StringUnicharInputStream(nsString* aString) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mString = aString; mPos = 0; mLen = aString->Length(); @@ -167,7 +167,7 @@ UTF8InputStream::UTF8InputStream(nsIInputStream* aStream, PRUint32 aBufferSize) : mInput(aStream) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (aBufferSize == 0) { aBufferSize = 8192; } diff --git a/xpcom/proxy/src/nsProxyEvent.cpp b/xpcom/proxy/src/nsProxyEvent.cpp index f3405d089865..e17e9fec1e4c 100644 --- a/xpcom/proxy/src/nsProxyEvent.cpp +++ b/xpcom/proxy/src/nsProxyEvent.cpp @@ -264,7 +264,7 @@ nsProxyObject::nsProxyObject() } nsProxyObject::nsProxyObject(nsIEventQueue *destQueue, PRInt32 proxyType, nsISupports *realObject) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mEventQService = do_GetService(kEventQueueServiceCID); @@ -276,7 +276,7 @@ nsProxyObject::nsProxyObject(nsIEventQueue *destQueue, PRInt32 proxyType, nsISup nsProxyObject::nsProxyObject(nsIEventQueue *destQueue, PRInt32 proxyType, const nsCID &aClass, nsISupports *aDelegate, const nsIID &aIID) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mEventQService = do_GetService(kEventQueueServiceCID); diff --git a/xpcom/proxy/src/nsProxyEventClass.cpp b/xpcom/proxy/src/nsProxyEventClass.cpp index 3d125b64d873..43a0d63a7d70 100644 --- a/xpcom/proxy/src/nsProxyEventClass.cpp +++ b/xpcom/proxy/src/nsProxyEventClass.cpp @@ -159,7 +159,7 @@ nsProxyEventClass::nsProxyEventClass(REFNSIID aIID, nsIInterfaceInfo* aInfo) : mIID(aIID), mDescriptors(NULL) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); mInfo = aInfo; diff --git a/xpcom/proxy/src/nsProxyEventObject.cpp b/xpcom/proxy/src/nsProxyEventObject.cpp index a1267893aaf0..d43664b41cfb 100644 --- a/xpcom/proxy/src/nsProxyEventObject.cpp +++ b/xpcom/proxy/src/nsProxyEventObject.cpp @@ -402,7 +402,7 @@ nsProxyEventObject::nsProxyEventObject(nsIEventQueue *destQueue, mRoot(root), mNext(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_IF_ADDREF(mRoot); mProxyObject = new nsProxyObject(destQueue, proxyType, aObj); diff --git a/xpcom/proxy/src/nsProxyObjectManager.cpp b/xpcom/proxy/src/nsProxyObjectManager.cpp index 635ce174495e..0aeb708e5aa2 100644 --- a/xpcom/proxy/src/nsProxyObjectManager.cpp +++ b/xpcom/proxy/src/nsProxyObjectManager.cpp @@ -80,7 +80,7 @@ class nsProxyCreateInstance : public nsIProxyCreateInstance nsProxyCreateInstance::nsProxyCreateInstance() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); } @@ -117,7 +117,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsProxyObjectManager, nsIProxyObjectManager) nsProxyObjectManager::nsProxyObjectManager() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mProxyClassMap = new nsHashtable(256, PR_TRUE); mProxyObjectMap = new nsHashtable(256, PR_TRUE); diff --git a/xpcom/proxy/tests/proxytests.cpp b/xpcom/proxy/tests/proxytests.cpp index d38f526cf665..20cc815e7cbb 100644 --- a/xpcom/proxy/tests/proxytests.cpp +++ b/xpcom/proxy/tests/proxytests.cpp @@ -73,7 +73,7 @@ class nsTestXPCFoo : public nsITestProxy nsTestXPCFoo::nsTestXPCFoo() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); } @@ -134,7 +134,7 @@ class nsTestXPCFoo2 : public nsITestProxy nsTestXPCFoo2::nsTestXPCFoo2() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); } diff --git a/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp b/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp index d57d4c0ab832..ea2a659766ac 100644 --- a/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp +++ b/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp @@ -130,7 +130,7 @@ NS_IMPL_ISUPPORTS1(InvokeTestTarget, InvokeTestTargetInterface) InvokeTestTarget::InvokeTestTarget() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); } @@ -800,7 +800,7 @@ public: FooBarImpl::FooBarImpl() : MyName("FooBarImpl") { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); } @@ -949,7 +949,7 @@ public: FooBarImpl2::FooBarImpl2() : value(0x12345678) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); } diff --git a/xpcom/reflect/xptinfo/src/xptiprivate.h b/xpcom/reflect/xptinfo/src/xptiprivate.h index 7fcb6b8e2b81..712797503669 100644 --- a/xpcom/reflect/xptinfo/src/xptiprivate.h +++ b/xpcom/reflect/xptinfo/src/xptiprivate.h @@ -787,7 +787,7 @@ public: xptiZipLoaderSink(xptiInterfaceInfoManager* aMgr, xptiWorkingSet* aWorkingSet) : mManager(aMgr), - mWorkingSet(aWorkingSet) { NS_INIT_REFCNT(); } + mWorkingSet(aWorkingSet) { NS_INIT_ISUPPORTS(); } virtual ~xptiZipLoaderSink() {}; NS_DECL_ISUPPORTS diff --git a/xpcom/tests/TestBuffers.cpp b/xpcom/tests/TestBuffers.cpp index fb3cdccdbc38..b87dfdbd0b94 100644 --- a/xpcom/tests/TestBuffers.cpp +++ b/xpcom/tests/TestBuffers.cpp @@ -92,7 +92,7 @@ public: Reader(nsIBuffer* readBuffer) : mReadBuffer(readBuffer), mBytesRead(0), mDone(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF(mReadBuffer); } diff --git a/xpcom/tests/TestFactory.cpp b/xpcom/tests/TestFactory.cpp index b64fa351c771..294a12e63d41 100644 --- a/xpcom/tests/TestFactory.cpp +++ b/xpcom/tests/TestFactory.cpp @@ -55,7 +55,7 @@ class TestClassImpl: public ITestClass { NS_DECL_ISUPPORTS public: TestClassImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } void Test(); @@ -76,7 +76,7 @@ class TestFactory: public nsIFactory { public: TestFactory() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMETHOD CreateInstance(nsISupports *aDelegate, diff --git a/xpcom/tests/TestObserverService.cpp b/xpcom/tests/TestObserverService.cpp index de485e9f1fd7..c38bf0bdcf51 100644 --- a/xpcom/tests/TestObserverService.cpp +++ b/xpcom/tests/TestObserverService.cpp @@ -70,7 +70,7 @@ class TestObserver : public nsIObserver, public nsSupportsWeakReference { public: TestObserver( const nsAString &name ) : mName( name ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } virtual ~TestObserver() {} NS_DECL_ISUPPORTS diff --git a/xpcom/tests/TestPipes.cpp b/xpcom/tests/TestPipes.cpp index 6834f48d9f27..7ef372ce257a 100644 --- a/xpcom/tests/TestPipes.cpp +++ b/xpcom/tests/TestPipes.cpp @@ -94,7 +94,7 @@ public: } nsReceiver(nsIInputStream* in) : mIn(in), mCount(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF(in); } @@ -190,7 +190,7 @@ public: } nsShortReader(nsIInputStream* in) : mIn(in), mReceived(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF(in); } @@ -296,7 +296,7 @@ public: return NS_OK; } - nsPipeObserver() { NS_INIT_REFCNT(); } + nsPipeObserver() { NS_INIT_ISUPPORTS(); } virtual ~nsPipeObserver() {} }; @@ -445,7 +445,7 @@ public: nsPump(nsIInputStream* in, nsIOutputStream* out) : mIn(in), mOut(out), mCount(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } virtual ~nsPump() { diff --git a/xpcom/tests/TestThreads.cpp b/xpcom/tests/TestThreads.cpp index 23ef342bb14e..9d6371edf889 100644 --- a/xpcom/tests/TestThreads.cpp +++ b/xpcom/tests/TestThreads.cpp @@ -77,7 +77,7 @@ public: } nsConcurrentRunner(){ - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mTestInt = 0; } @@ -110,7 +110,7 @@ public: } nsRunner(int num) : mNum(num) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } protected: @@ -234,7 +234,7 @@ public: } nsStressRunner(int num) : mNum(num), mWasRun(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); PR_AtomicIncrement(&gNum); } diff --git a/xpcom/tests/dynamic/TestDynamic.cpp b/xpcom/tests/dynamic/TestDynamic.cpp index d163fd1001a9..7e1e74335cbd 100644 --- a/xpcom/tests/dynamic/TestDynamic.cpp +++ b/xpcom/tests/dynamic/TestDynamic.cpp @@ -49,7 +49,7 @@ class TestDynamicClassImpl: public ITestClass { NS_DECL_ISUPPORTS TestDynamicClassImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } void Test(); }; diff --git a/xpcom/tests/services/MyService.cpp b/xpcom/tests/services/MyService.cpp index 527384d04796..aa24a3969c1e 100644 --- a/xpcom/tests/services/MyService.cpp +++ b/xpcom/tests/services/MyService.cpp @@ -63,7 +63,7 @@ NS_IMPL_ISUPPORTS1(MyService, IMyService); MyService::MyService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); printf(" creating my service\n"); } diff --git a/xpcom/tests/windows/TestCOM.cpp b/xpcom/tests/windows/TestCOM.cpp index 0656fd49a807..058fcab84584 100644 --- a/xpcom/tests/windows/TestCOM.cpp +++ b/xpcom/tests/windows/TestCOM.cpp @@ -62,7 +62,7 @@ class nsTestCom: public nsITestCom { public: nsTestCom() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } virtual ~nsTestCom() { cout << "nsTestCom instance successfully deleted\n"; @@ -99,7 +99,7 @@ class nsTestComFactory: public nsIFactory { NS_DECL_ISUPPORTS public: nsTestComFactory() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } NS_IMETHOD CreateInstance(nsISupports *aOuter, diff --git a/xpcom/threads/TimerThread.cpp b/xpcom/threads/TimerThread.cpp index 09583095da00..3f7095505415 100644 --- a/xpcom/threads/TimerThread.cpp +++ b/xpcom/threads/TimerThread.cpp @@ -52,7 +52,7 @@ TimerThread::TimerThread() : mMinTimerPeriod(0), mTimeoutAdjustment(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } TimerThread::~TimerThread() diff --git a/xpcom/threads/nsAutoLock.h b/xpcom/threads/nsAutoLock.h index 591bddc0bb2e..e3afa457d5ff 100644 --- a/xpcom/threads/nsAutoLock.h +++ b/xpcom/threads/nsAutoLock.h @@ -208,6 +208,7 @@ public: #include "prcmon.h" #include "nsError.h" +#include "nsDebug.h" class NS_COM nsAutoMonitor : public nsAutoLockBase { public: diff --git a/xpcom/threads/nsEventQueue.cpp b/xpcom/threads/nsEventQueue.cpp index eeaaf3469e2f..6638abc5e862 100644 --- a/xpcom/threads/nsEventQueue.cpp +++ b/xpcom/threads/nsEventQueue.cpp @@ -64,7 +64,7 @@ static const char gDestroyedNotification[] = "nsIEventQueueDestroyed"; nsEventQueueImpl::nsEventQueueImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); /* The slightly weird ownership model for eventqueues goes like this: diff --git a/xpcom/threads/nsEventQueueService.cpp b/xpcom/threads/nsEventQueueService.cpp index 948323cb2357..d56d54fd7048 100644 --- a/xpcom/threads/nsEventQueueService.cpp +++ b/xpcom/threads/nsEventQueueService.cpp @@ -68,7 +68,7 @@ static NS_DEFINE_CID(kEventQueueCID, NS_EVENTQUEUE_CID); nsEventQueueServiceImpl::nsEventQueueServiceImpl() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mEventQMonitor = PR_NewMonitor(); #if defined(PR_LOGGING) && defined(DEBUG_danm) diff --git a/xpcom/threads/nsThread.cpp b/xpcom/threads/nsThread.cpp index a4b3b2683891..c11704763c5f 100644 --- a/xpcom/threads/nsThread.cpp +++ b/xpcom/threads/nsThread.cpp @@ -66,7 +66,7 @@ PRLogModuleInfo* nsIThreadLog = nsnull; nsThread::nsThread() : mThread(nsnull), mDead(PR_FALSE), mStartLock(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #if defined(PR_LOGGING) // @@ -483,7 +483,7 @@ nsThreadPool::nsThreadPool() mPendingRequestsAtZero(nsnull), mMinThreads(0), mMaxThreads(0), mBusyThreads(0), mShuttingDown(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsThreadPool::~nsThreadPool() @@ -894,7 +894,7 @@ NS_NewThreadPool(nsIThreadPool* *result, nsThreadPoolRunnable::nsThreadPoolRunnable(nsThreadPool* pool) : mPool(pool) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsThreadPoolRunnable::~nsThreadPoolRunnable() diff --git a/xpcom/threads/nsTimerImpl.cpp b/xpcom/threads/nsTimerImpl.cpp index d739f98f752a..ecd7bbf2305c 100644 --- a/xpcom/threads/nsTimerImpl.cpp +++ b/xpcom/threads/nsTimerImpl.cpp @@ -160,7 +160,7 @@ nsTimerImpl::nsTimerImpl() : mTimeout(0), mIdle(PR_TRUE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); nsIThread::GetCurrent(getter_AddRefs(mCallingThread)); static PRCallOnceType once; @@ -514,7 +514,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsTimerManager, nsITimerManager) nsTimerManager::nsTimerManager() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mLock = PR_NewLock(); gManager = this; } diff --git a/xpfe/appshell/public/nsICmdLineService.idl b/xpfe/appshell/public/nsICmdLineService.idl index 871b96da0eb3..7d91739d0bbe 100644 --- a/xpfe/appshell/public/nsICmdLineService.idl +++ b/xpfe/appshell/public/nsICmdLineService.idl @@ -40,6 +40,8 @@ #include "nsICmdLineHandler.idl" %{C++ +#include "nsComObsolete.h" //for NS_APPSHELL + // e34783f5-ac08-11d2-8d19-00805fc2500c #define NS_COMMANDLINE_SERVICE_CID \ { 0xe34783f5, 0xac08, 0x11d2, \ diff --git a/xpfe/appshell/public/nsIDOMXPConnectFactory.h b/xpfe/appshell/public/nsIDOMXPConnectFactory.h index a6529603e862..a466438ad1b4 100644 --- a/xpfe/appshell/public/nsIDOMXPConnectFactory.h +++ b/xpfe/appshell/public/nsIDOMXPConnectFactory.h @@ -40,6 +40,7 @@ #define nsIDOMXPConnectFactory_h__ #include "nsISupports.h" +#include "nsComObsolete.h" #include "nsString.h" #include "nsIScriptContext.h" diff --git a/xpfe/appshell/src/nsAbout.h b/xpfe/appshell/src/nsAbout.h index 49d5c91e9f59..4dbf5d122049 100644 --- a/xpfe/appshell/src/nsAbout.h +++ b/xpfe/appshell/src/nsAbout.h @@ -48,7 +48,7 @@ public: NS_DECL_NSIABOUTMODULE - nsAbout() { NS_INIT_REFCNT(); } + nsAbout() { NS_INIT_ISUPPORTS(); } virtual ~nsAbout() {} static NS_METHOD diff --git a/xpfe/appshell/src/nsAppShellService.cpp b/xpfe/appshell/src/nsAppShellService.cpp index d685b925a494..81f1ab0d1be0 100644 --- a/xpfe/appshell/src/nsAppShellService.cpp +++ b/xpfe/appshell/src/nsAppShellService.cpp @@ -109,7 +109,7 @@ nsAppShellService::nsAppShellService() : mShuttingDown(PR_FALSE), mAttemptingQuit(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsAppShellService::~nsAppShellService() diff --git a/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp b/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp index 15a77ef8e7b6..6ed6b0ebf519 100644 --- a/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp +++ b/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp @@ -213,7 +213,7 @@ nsAppShellWindowEnumerator::nsAppShellWindowEnumerator ( mWindowMediator(&aMediator), mType(aTypeString), mCurrentPosition(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mWindowMediator->AddEnumerator(this); NS_ADDREF(mWindowMediator); diff --git a/xpfe/appshell/src/nsChromeTreeOwner.cpp b/xpfe/appshell/src/nsChromeTreeOwner.cpp index be0717f98ef7..1dd490d48eba 100644 --- a/xpfe/appshell/src/nsChromeTreeOwner.cpp +++ b/xpfe/appshell/src/nsChromeTreeOwner.cpp @@ -54,7 +54,7 @@ static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID); nsChromeTreeOwner::nsChromeTreeOwner() : mXULWindow(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsChromeTreeOwner::~nsChromeTreeOwner() diff --git a/xpfe/appshell/src/nsCommandLineService.cpp b/xpfe/appshell/src/nsCommandLineService.cpp index fd3fcedaf8f2..de10af070f0e 100644 --- a/xpfe/appshell/src/nsCommandLineService.cpp +++ b/xpfe/appshell/src/nsCommandLineService.cpp @@ -47,7 +47,7 @@ nsCmdLineService::nsCmdLineService() : mArgCount(0), mArgc(0), mArgv(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } /* diff --git a/xpfe/appshell/src/nsContentTreeOwner.cpp b/xpfe/appshell/src/nsContentTreeOwner.cpp index ead8381377d6..c8be88e16ae0 100644 --- a/xpfe/appshell/src/nsContentTreeOwner.cpp +++ b/xpfe/appshell/src/nsContentTreeOwner.cpp @@ -75,7 +75,7 @@ nsContentTreeOwner::nsContentTreeOwner(PRBool fPrimary) : mXULWindow(nsnull), mPrimary(fPrimary), mContentTitleSetting(PR_FALSE), mChromeFlags(nsIWebBrowserChrome::CHROME_ALL) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // note if this fails, QI on nsIEmbeddingSiteWindow(2) will simply fail mSiteWindow2 = new nsSiteWindow2(this); @@ -728,7 +728,7 @@ nsXULWindow* nsContentTreeOwner::XULWindow() nsSiteWindow2::nsSiteWindow2(nsContentTreeOwner *aAggregator) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mAggregator = aAggregator; } diff --git a/xpfe/appshell/src/nsInternetConfigService.cpp b/xpfe/appshell/src/nsInternetConfigService.cpp index db39e6700ebc..9a95de5285ec 100644 --- a/xpfe/appshell/src/nsInternetConfigService.cpp +++ b/xpfe/appshell/src/nsInternetConfigService.cpp @@ -70,7 +70,7 @@ static NS_DEFINE_CID(kICServiceCID, NS_INTERNETCONFIGSERVICE_CID); nsInternetConfigService::nsInternetConfigService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsInternetConfigService::~nsInternetConfigService() diff --git a/xpfe/appshell/src/nsMacMIMEDataSource.cpp b/xpfe/appshell/src/nsMacMIMEDataSource.cpp index e6638da1ad81..74477e61107f 100644 --- a/xpfe/appshell/src/nsMacMIMEDataSource.cpp +++ b/xpfe/appshell/src/nsMacMIMEDataSource.cpp @@ -87,7 +87,7 @@ static nsresult MakeMIMEInfo( ICMapEntry &entry, nsIMIMEInfo*& info ) nsMacMIMEDataSource::nsMacMIMEDataSource() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsMacMIMEDataSource::~nsMacMIMEDataSource() diff --git a/xpfe/appshell/src/nsUserInfoMac.cpp b/xpfe/appshell/src/nsUserInfoMac.cpp index c06d23c769f2..743b4340ade6 100644 --- a/xpfe/appshell/src/nsUserInfoMac.cpp +++ b/xpfe/appshell/src/nsUserInfoMac.cpp @@ -42,7 +42,7 @@ nsUserInfo::nsUserInfo() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsUserInfo::~nsUserInfo() diff --git a/xpfe/appshell/src/nsUserInfoOS2.cpp b/xpfe/appshell/src/nsUserInfoOS2.cpp index 547e284141e9..56b9963f77a8 100644 --- a/xpfe/appshell/src/nsUserInfoOS2.cpp +++ b/xpfe/appshell/src/nsUserInfoOS2.cpp @@ -33,7 +33,7 @@ nsUserInfo::nsUserInfo() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsUserInfo::~nsUserInfo() diff --git a/xpfe/appshell/src/nsUserInfoUnix.cpp b/xpfe/appshell/src/nsUserInfoUnix.cpp index 9c718e62154a..6c6a287575c0 100644 --- a/xpfe/appshell/src/nsUserInfoUnix.cpp +++ b/xpfe/appshell/src/nsUserInfoUnix.cpp @@ -57,7 +57,7 @@ nsUserInfo::nsUserInfo() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsUserInfo::~nsUserInfo() diff --git a/xpfe/appshell/src/nsUserInfoWin.cpp b/xpfe/appshell/src/nsUserInfoWin.cpp index 6bf1743e4dc3..e9c4b2c7e52e 100644 --- a/xpfe/appshell/src/nsUserInfoWin.cpp +++ b/xpfe/appshell/src/nsUserInfoWin.cpp @@ -45,7 +45,7 @@ nsUserInfo::nsUserInfo() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsUserInfo::~nsUserInfo() diff --git a/xpfe/appshell/src/nsWebShellWindow.cpp b/xpfe/appshell/src/nsWebShellWindow.cpp index 9af1842667f5..85881f6cf4c7 100644 --- a/xpfe/appshell/src/nsWebShellWindow.cpp +++ b/xpfe/appshell/src/nsWebShellWindow.cpp @@ -200,7 +200,7 @@ struct nsWebShellInfo { nsWebShellWindow::nsWebShellWindow() : nsXULWindow() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mWebShell = nsnull; mWindow = nsnull; diff --git a/xpfe/appshell/src/nsWindowMediator.cpp b/xpfe/appshell/src/nsWindowMediator.cpp index a0648f5afc94..a890fd5f8e1f 100644 --- a/xpfe/appshell/src/nsWindowMediator.cpp +++ b/xpfe/appshell/src/nsWindowMediator.cpp @@ -109,7 +109,7 @@ nsWindowMediator::nsWindowMediator() : mEnumeratorList(), mOldestWindow(0), mTopmostWindow(0), mTimeStamp(0), mUpdateBatchNest(0), mListLock(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); // This should really be done in the static constructor fn. nsresult rv; diff --git a/xpfe/appshell/src/nsXULWindow.cpp b/xpfe/appshell/src/nsXULWindow.cpp index 673b4381378b..2464c660f1d6 100644 --- a/xpfe/appshell/src/nsXULWindow.cpp +++ b/xpfe/appshell/src/nsXULWindow.cpp @@ -106,7 +106,7 @@ nsXULWindow::nsXULWindow() : mChromeTreeOwner(nsnull), mHadChildWindow(PR_FALSE), mZlevel(nsIXULWindow::normalZ) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsXULWindow::~nsXULWindow() diff --git a/xpfe/bootstrap/appleevents/nsAppleEventsService.cpp b/xpfe/bootstrap/appleevents/nsAppleEventsService.cpp index fd9da8348c8d..83ff10b760e8 100644 --- a/xpfe/bootstrap/appleevents/nsAppleEventsService.cpp +++ b/xpfe/bootstrap/appleevents/nsAppleEventsService.cpp @@ -42,7 +42,7 @@ nsAppleEventsService::nsAppleEventsService() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsAppleEventsService::~nsAppleEventsService() diff --git a/xpfe/bootstrap/nsNativeAppSupportBeOS.cpp b/xpfe/bootstrap/nsNativeAppSupportBeOS.cpp index 243b0336f76c..8803ac456a05 100644 --- a/xpfe/bootstrap/nsNativeAppSupportBeOS.cpp +++ b/xpfe/bootstrap/nsNativeAppSupportBeOS.cpp @@ -75,7 +75,7 @@ private: nsSplashScreenBeOS::nsSplashScreenBeOS() : window( NULL ) , bitmap( NULL ), textView(NULL) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); #ifdef DEBUG_SPLASH puts("nsSplashScreenBeOS::nsSlpashScreenBeOS()"); #endif diff --git a/xpfe/bootstrap/nsNativeAppSupportMac.cpp b/xpfe/bootstrap/nsNativeAppSupportMac.cpp index 4e26b310da1f..4c6aa4ec9228 100644 --- a/xpfe/bootstrap/nsNativeAppSupportMac.cpp +++ b/xpfe/bootstrap/nsNativeAppSupportMac.cpp @@ -93,7 +93,7 @@ protected: nsSplashScreenMac::nsSplashScreenMac() : mDialog(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/xpfe/bootstrap/nsWindowCreator.cpp b/xpfe/bootstrap/nsWindowCreator.cpp index 3cdc0c402116..7c0d9b725d4e 100644 --- a/xpfe/bootstrap/nsWindowCreator.cpp +++ b/xpfe/bootstrap/nsWindowCreator.cpp @@ -83,7 +83,7 @@ static NS_DEFINE_CID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID); static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); nsWindowCreator::nsWindowCreator() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsWindowCreator::~nsWindowCreator() { diff --git a/xpfe/browser/src/nsBrowserInstance.cpp b/xpfe/browser/src/nsBrowserInstance.cpp index ca114f0ebe36..07d6a0a8c22f 100644 --- a/xpfe/browser/src/nsBrowserInstance.cpp +++ b/xpfe/browser/src/nsBrowserInstance.cpp @@ -154,7 +154,7 @@ public: PageCycler(nsBrowserInstance* appCore, const char *aTimeoutValue = nsnull, const char *aWaitValue = nsnull) : mAppCore(appCore), mBuffer(nsnull), mCursor(nsnull), mTimeoutValue(0), mWaitValue(1 /*sec*/) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF(mAppCore); if (aTimeoutValue){ mTimeoutValue = atol(aTimeoutValue); @@ -406,7 +406,7 @@ nsBrowserInstance::nsBrowserInstance() : mIsClosed(PR_FALSE) { mDOMWindow = nsnull; mContentAreaDocShellWeak = nsnull; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsBrowserInstance::~nsBrowserInstance() diff --git a/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/xpfe/components/bookmarks/src/nsBookmarksService.cpp index 59ae7ab1563b..79f02e7a23e9 100644 --- a/xpfe/components/bookmarks/src/nsBookmarksService.cpp +++ b/xpfe/components/bookmarks/src/nsBookmarksService.cpp @@ -1699,7 +1699,7 @@ nsBookmarksService::nsBookmarksService() ,mIEFavoritesAvailable(PR_FALSE) #endif { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/xpfe/components/directory/nsDirectoryViewer.cpp b/xpfe/components/directory/nsDirectoryViewer.cpp index b625ece5f0d9..bdb7199f4c34 100644 --- a/xpfe/components/directory/nsDirectoryViewer.cpp +++ b/xpfe/components/directory/nsDirectoryViewer.cpp @@ -549,7 +549,7 @@ nsHTTPIndex::nsHTTPIndex() : mBindToGlobalObject(PR_TRUE), mRequestor(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } @@ -557,7 +557,7 @@ nsHTTPIndex::nsHTTPIndex(nsIInterfaceRequestor* aRequestor) : mBindToGlobalObject(PR_TRUE), mRequestor(aRequestor) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } @@ -1336,7 +1336,7 @@ nsHTTPIndex::GetAllCmds(nsIRDFResource *aSource, nsISimpleEnumerator **_retval) // nsDirectoryViewerFactory::nsDirectoryViewerFactory() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/xpfe/components/history/src/nsGlobalHistory.cpp b/xpfe/components/history/src/nsGlobalHistory.cpp index b3b358cb9f91..4eb10eda9d93 100644 --- a/xpfe/components/history/src/nsGlobalHistory.cpp +++ b/xpfe/components/history/src/nsGlobalHistory.cpp @@ -404,7 +404,7 @@ nsMdbTableEnumerator::nsMdbTableEnumerator() mCursor(nsnull), mCurrent(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } @@ -518,7 +518,7 @@ nsGlobalHistory::nsGlobalHistory() mStore(nsnull), mTable(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); LL_I2L(mFileSizeOnDisk, 0); // commonly used prefixes that should be chopped off all diff --git a/xpfe/components/intl/nsCharsetMenu.cpp b/xpfe/components/intl/nsCharsetMenu.cpp index 26d71de6b4f3..01311853d099 100644 --- a/xpfe/components/intl/nsCharsetMenu.cpp +++ b/xpfe/components/intl/nsCharsetMenu.cpp @@ -445,7 +445,7 @@ nsCharsetMenu::nsCharsetMenu() mAutoDetectInitialized(PR_FALSE), mOthersInitialized(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_TIMELINE_START_TIMER("nsCharsetMenu::nsCharsetMenu"); nsresult res = NS_OK; diff --git a/xpfe/components/regviewer/nsRegistryDataSource.cpp b/xpfe/components/regviewer/nsRegistryDataSource.cpp index e4c533a62571..9de855aa274c 100644 --- a/xpfe/components/regviewer/nsRegistryDataSource.cpp +++ b/xpfe/components/regviewer/nsRegistryDataSource.cpp @@ -78,7 +78,7 @@ nsIRDFLiteral* nsRegistryDataSource::kBinaryLiteral; nsRegistryDataSource::nsRegistryDataSource() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } @@ -700,7 +700,7 @@ nsRegistryDataSource::SubkeyEnumerator::SubkeyEnumerator(nsRegistryDataSource* a mRootKey(aRootKey), mStarted(PR_FALSE) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); NS_ADDREF(mViewer); } diff --git a/xpfe/components/related/src/nsRelatedLinksHandler.cpp b/xpfe/components/related/src/nsRelatedLinksHandler.cpp index e8ee4d147d77..9939a81eb514 100644 --- a/xpfe/components/related/src/nsRelatedLinksHandler.cpp +++ b/xpfe/components/related/src/nsRelatedLinksHandler.cpp @@ -178,7 +178,7 @@ NS_NewRelatedLinksStreamListener(nsIRDFDataSource* aDataSource, RelatedLinksStreamListener::RelatedLinksStreamListener(nsIRDFDataSource *aDataSource) : mDataSource(dont_QueryInterface(aDataSource)) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } @@ -584,7 +584,7 @@ RelatedLinksStreamListener::Unescape(nsString &text) RelatedLinksHandlerImpl::RelatedLinksHandlerImpl() : mRelatedLinksURL(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/xpfe/components/search/src/nsInternetSearchService.cpp b/xpfe/components/search/src/nsInternetSearchService.cpp index 645709735f9b..b5d82caf9714 100755 --- a/xpfe/components/search/src/nsInternetSearchService.cpp +++ b/xpfe/components/search/src/nsInternetSearchService.cpp @@ -422,7 +422,7 @@ nsIRDFResource *InternetSearchDataSource::kNC_SearchCommand_ClearFilters; nsIRDFLiteral *InternetSearchDataSource::kTrueLiteral; InternetSearchDataSource::InternetSearchDataSource(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (gRefCnt++ == 0) { diff --git a/xpfe/components/search/src/nsLocalSearchService.cpp b/xpfe/components/search/src/nsLocalSearchService.cpp index 5f84c24b4fdb..d0d5be8768ff 100755 --- a/xpfe/components/search/src/nsLocalSearchService.cpp +++ b/xpfe/components/search/src/nsLocalSearchService.cpp @@ -94,7 +94,7 @@ nsIRDFResource *LocalSearchDataSource::kRDF_type; LocalSearchDataSource::LocalSearchDataSource(void) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); if (gRefCnt++ == 0) { diff --git a/xpfe/components/shistory/src/nsSHEntry.cpp b/xpfe/components/shistory/src/nsSHEntry.cpp index 6652339a0629..d01dbecaf9a1 100644 --- a/xpfe/components/shistory/src/nsSHEntry.cpp +++ b/xpfe/components/shistory/src/nsSHEntry.cpp @@ -33,7 +33,7 @@ PRUint32 gEntryID=0; nsSHEntry::nsSHEntry() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mParent = nsnull; mID = gEntryID++; } diff --git a/xpfe/components/shistory/src/nsSHTransaction.cpp b/xpfe/components/shistory/src/nsSHTransaction.cpp index d92a33991457..92c230e4e714 100644 --- a/xpfe/components/shistory/src/nsSHTransaction.cpp +++ b/xpfe/components/shistory/src/nsSHTransaction.cpp @@ -29,7 +29,7 @@ nsSHTransaction::nsSHTransaction() : mPersist(PR_TRUE), mPrev(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } diff --git a/xpfe/components/shistory/src/nsSHistory.cpp b/xpfe/components/shistory/src/nsSHistory.cpp index f3ca25c092a1..0a99938435da 100644 --- a/xpfe/components/shistory/src/nsSHistory.cpp +++ b/xpfe/components/shistory/src/nsSHistory.cpp @@ -53,7 +53,7 @@ enum HistCmd{ nsSHistory::nsSHistory() : mListRoot(nsnull), mIndex(-1), mLength(0), mRequestedIndex(-1) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } @@ -858,7 +858,7 @@ nsSHistory::GetSHistoryEnumerator(nsISimpleEnumerator** aEnumerator) nsSHEnumerator::nsSHEnumerator(nsSHistory * aSHistory):mIndex(-1) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mSHistory = aSHistory; } diff --git a/xpfe/components/startup/public/nsICmdLineService.idl b/xpfe/components/startup/public/nsICmdLineService.idl index 871b96da0eb3..7d91739d0bbe 100644 --- a/xpfe/components/startup/public/nsICmdLineService.idl +++ b/xpfe/components/startup/public/nsICmdLineService.idl @@ -40,6 +40,8 @@ #include "nsICmdLineHandler.idl" %{C++ +#include "nsComObsolete.h" //for NS_APPSHELL + // e34783f5-ac08-11d2-8d19-00805fc2500c #define NS_COMMANDLINE_SERVICE_CID \ { 0xe34783f5, 0xac08, 0x11d2, \ diff --git a/xpfe/components/startup/src/nsCommandLineService.cpp b/xpfe/components/startup/src/nsCommandLineService.cpp index fd3fcedaf8f2..de10af070f0e 100644 --- a/xpfe/components/startup/src/nsCommandLineService.cpp +++ b/xpfe/components/startup/src/nsCommandLineService.cpp @@ -47,7 +47,7 @@ nsCmdLineService::nsCmdLineService() : mArgCount(0), mArgc(0), mArgv(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } /* diff --git a/xpfe/components/startup/src/nsUserInfoMac.cpp b/xpfe/components/startup/src/nsUserInfoMac.cpp index c06d23c769f2..743b4340ade6 100644 --- a/xpfe/components/startup/src/nsUserInfoMac.cpp +++ b/xpfe/components/startup/src/nsUserInfoMac.cpp @@ -42,7 +42,7 @@ nsUserInfo::nsUserInfo() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsUserInfo::~nsUserInfo() diff --git a/xpfe/components/startup/src/nsUserInfoOS2.cpp b/xpfe/components/startup/src/nsUserInfoOS2.cpp index 547e284141e9..56b9963f77a8 100644 --- a/xpfe/components/startup/src/nsUserInfoOS2.cpp +++ b/xpfe/components/startup/src/nsUserInfoOS2.cpp @@ -33,7 +33,7 @@ nsUserInfo::nsUserInfo() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsUserInfo::~nsUserInfo() diff --git a/xpfe/components/startup/src/nsUserInfoUnix.cpp b/xpfe/components/startup/src/nsUserInfoUnix.cpp index 9c718e62154a..6c6a287575c0 100644 --- a/xpfe/components/startup/src/nsUserInfoUnix.cpp +++ b/xpfe/components/startup/src/nsUserInfoUnix.cpp @@ -57,7 +57,7 @@ nsUserInfo::nsUserInfo() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsUserInfo::~nsUserInfo() diff --git a/xpfe/components/startup/src/nsUserInfoWin.cpp b/xpfe/components/startup/src/nsUserInfoWin.cpp index 6bf1743e4dc3..e9c4b2c7e52e 100644 --- a/xpfe/components/startup/src/nsUserInfoWin.cpp +++ b/xpfe/components/startup/src/nsUserInfoWin.cpp @@ -45,7 +45,7 @@ nsUserInfo::nsUserInfo() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsUserInfo::~nsUserInfo() diff --git a/xpfe/components/timebomb/nsTimeBomb.cpp b/xpfe/components/timebomb/nsTimeBomb.cpp index cb2d3827f715..327f0b3c9212 100644 --- a/xpfe/components/timebomb/nsTimeBomb.cpp +++ b/xpfe/components/timebomb/nsTimeBomb.cpp @@ -91,7 +91,7 @@ static nsresult DisplayURI(const char *urlStr, PRBool block) nsTimeBomb::nsTimeBomb() { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsTimeBomb::~nsTimeBomb() diff --git a/xpfe/components/urlbarhistory/src/nsUrlbarHistory.cpp b/xpfe/components/urlbarhistory/src/nsUrlbarHistory.cpp index f39d9cc14f29..aa651bb2bb22 100644 --- a/xpfe/components/urlbarhistory/src/nsUrlbarHistory.cpp +++ b/xpfe/components/urlbarhistory/src/nsUrlbarHistory.cpp @@ -85,7 +85,7 @@ static nsIPref * gPrefs; nsUrlbarHistory::nsUrlbarHistory():mLength(0) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); PRInt32 cnt = sizeof(ignoreArray)/sizeof(char *); for(PRInt32 i=0; i< cnt; i++) mIgnoreArray.AppendElement((void *) new nsString(NS_ConvertASCIItoUCS2(ignoreArray[i]))); diff --git a/xpinstall/src/nsInstallVersion.cpp b/xpinstall/src/nsInstallVersion.cpp index 85e87ad42f26..c7b9d076da02 100644 --- a/xpinstall/src/nsInstallVersion.cpp +++ b/xpinstall/src/nsInstallVersion.cpp @@ -58,7 +58,7 @@ static NS_DEFINE_IID(kIInstallVersion_IID, NS_IDOMINSTALLVERSION_IID); nsInstallVersion::nsInstallVersion() { mScriptObject = nsnull; - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); } nsInstallVersion::~nsInstallVersion() diff --git a/xpinstall/src/nsUpdateNotification.cpp b/xpinstall/src/nsUpdateNotification.cpp index 7b3cfaf69753..ca62be9cbbce 100644 --- a/xpinstall/src/nsUpdateNotification.cpp +++ b/xpinstall/src/nsUpdateNotification.cpp @@ -78,7 +78,7 @@ nsIRDFResource* nsXPINotifierImpl::kNC_Child = nsnull; nsXPINotifierImpl::nsXPINotifierImpl() : mRDF(nsnull) { - NS_INIT_REFCNT(); + NS_INIT_ISUPPORTS(); mPendingRefreshes = 0;