From 98de6346310fac6bee75ad684bfec6a1dc1a7ac0 Mon Sep 17 00:00:00 2001 From: Date: Sun, 8 Jul 2007 00:08:04 -0700 Subject: [PATCH] Bug 348748 - Replace all instances of NS_STATIC_CAST and friends with C++ casts (and simultaneously bitrot nearly every patch in existence). r=bsmedberg on the script that did this. Tune in next time for Macro Wars: Episode II: Attack on the LL_* Macros. --- accessible/src/atk/nsAccessibleWrap.cpp | 48 +++--- accessible/src/atk/nsAppRootAccessible.cpp | 4 +- accessible/src/atk/nsMaiHyperlink.cpp | 12 +- accessible/src/atk/nsMaiInterfaceAction.cpp | 2 +- accessible/src/atk/nsMaiInterfaceTable.cpp | 24 +-- accessible/src/atk/nsMaiInterfaceText.cpp | 12 +- accessible/src/base/nsAccessNode.cpp | 4 +- .../src/base/nsAccessibilityService.cpp | 14 +- accessible/src/base/nsAccessible.cpp | 14 +- accessible/src/base/nsAccessible.h | 2 +- .../src/base/nsApplicationAccessible.cpp | 4 +- accessible/src/base/nsDocAccessible.cpp | 12 +- accessible/src/base/nsRootAccessible.cpp | 4 +- .../src/html/nsHTMLSelectAccessible.cpp | 10 +- accessible/src/html/nsHTMLTextAccessible.cpp | 4 +- accessible/src/html/nsHyperTextAccessible.cpp | 6 +- accessible/src/mac/mozAccessible.mm | 4 +- accessible/src/mac/mozDocAccessible.mm | 2 +- accessible/src/mac/nsAccessibleWrap.h | 4 +- accessible/src/mac/nsAccessibleWrap.mm | 6 +- accessible/src/msaa/CAccessibleAction.cpp | 16 +- accessible/src/msaa/CAccessibleComponent.cpp | 4 +- .../src/msaa/CAccessibleEditableText.cpp | 4 +- accessible/src/msaa/CAccessibleHyperlink.cpp | 6 +- accessible/src/msaa/CAccessibleHypertext.cpp | 6 +- accessible/src/msaa/CAccessibleImage.cpp | 4 +- accessible/src/msaa/CAccessibleTable.cpp | 12 +- accessible/src/msaa/CAccessibleText.cpp | 10 +- accessible/src/msaa/CAccessibleValue.cpp | 4 +- accessible/src/msaa/nsAccessNodeWrap.cpp | 24 +-- .../src/msaa/nsAccessibleRelationWrap.cpp | 8 +- accessible/src/msaa/nsAccessibleWrap.cpp | 40 ++--- .../src/msaa/nsApplicationAccessibleWrap.cpp | 4 +- accessible/src/msaa/nsDocAccessibleWrap.cpp | 6 +- .../src/msaa/nsHyperTextAccessibleWrap.cpp | 2 +- accessible/src/msaa/nsTextAccessibleWrap.cpp | 4 +- accessible/src/xul/nsXULTreeAccessible.cpp | 2 +- .../bookmarks/src/nsBookmarksService.cpp | 6 +- .../components/feeds/src/nsFeedSniffer.cpp | 2 +- .../migration/src/nsIEProfileMigrator.cpp | 2 +- .../migration/src/nsOperaProfileMigrator.cpp | 4 +- .../src/nsPlacesImportExportService.cpp | 8 +- caps/include/nsScriptSecurityManager.h | 10 +- caps/src/nsJSPrincipals.cpp | 12 +- caps/src/nsPrincipal.cpp | 7 +- caps/src/nsScriptSecurityManager.cpp | 58 +++---- chrome/src/nsChromeRegistry.cpp | 30 ++-- content/base/public/nsContentUtils.h | 4 +- content/base/public/nsINode.h | 14 +- content/base/src/mozSanitizingSerializer.cpp | 4 +- content/base/src/nsAttrAndChildArray.cpp | 20 +-- content/base/src/nsAttrAndChildArray.h | 2 +- content/base/src/nsAttrName.h | 28 +-- content/base/src/nsAttrValue.cpp | 36 ++-- content/base/src/nsAttrValue.h | 18 +- content/base/src/nsContentAreaDragDrop.cpp | 8 +- content/base/src/nsContentIterator.cpp | 10 +- content/base/src/nsContentList.cpp | 14 +- content/base/src/nsContentList.h | 2 +- content/base/src/nsContentSink.cpp | 6 +- content/base/src/nsContentUtils.cpp | 42 ++--- content/base/src/nsDOMAttribute.cpp | 10 +- content/base/src/nsDOMAttributeMap.cpp | 4 +- content/base/src/nsDOMParser.cpp | 7 +- content/base/src/nsDocument.cpp | 105 ++++++------ content/base/src/nsDocument.h | 2 +- content/base/src/nsDocumentEncoder.cpp | 10 +- content/base/src/nsGenericDOMDataNode.cpp | 8 +- content/base/src/nsGenericDOMDataNode.h | 4 +- content/base/src/nsGenericElement.cpp | 44 ++--- content/base/src/nsGenericElement.h | 6 +- content/base/src/nsMappedAttributes.cpp | 2 +- content/base/src/nsMappedAttributes.h | 4 +- content/base/src/nsNodeInfoManager.cpp | 8 +- content/base/src/nsNodeUtils.cpp | 34 ++-- content/base/src/nsObjectLoadingContent.cpp | 24 +-- content/base/src/nsPlainTextSerializer.cpp | 8 +- content/base/src/nsPropertyTable.cpp | 34 ++-- content/base/src/nsRange.cpp | 8 +- content/base/src/nsScriptElement.cpp | 2 +- content/base/src/nsScriptLoader.cpp | 6 +- content/base/src/nsStyleLinkElement.cpp | 2 +- content/base/src/nsSyncLoadService.cpp | 8 +- content/base/src/nsTextFragment.cpp | 6 +- content/base/src/nsTextFragment.h | 2 +- content/base/src/nsTreeWalker.cpp | 2 +- content/base/src/nsXMLHttpRequest.cpp | 22 +-- content/base/src/nsXMLNameSpaceMap.cpp | 18 +- content/events/src/nsDOMCommandEvent.cpp | 4 +- content/events/src/nsDOMEvent.cpp | 70 ++++---- content/events/src/nsDOMKeyboardEvent.cpp | 2 +- content/events/src/nsDOMMouseEvent.cpp | 22 +-- content/events/src/nsDOMMutationEvent.cpp | 14 +- .../events/src/nsDOMPageTransitionEvent.cpp | 4 +- content/events/src/nsDOMPopupBlockedEvent.cpp | 12 +- content/events/src/nsDOMTextEvent.cpp | 4 +- content/events/src/nsDOMUIEvent.cpp | 14 +- content/events/src/nsDOMXULCommandEvent.cpp | 2 +- content/events/src/nsDOMXULCommandEvent.h | 2 +- content/events/src/nsEventDispatcher.cpp | 30 ++-- content/events/src/nsEventListenerManager.cpp | 36 ++-- content/events/src/nsEventStateManager.cpp | 40 ++--- content/events/src/nsPrivateTextRange.cpp | 2 +- content/events/src/nsXMLEventsManager.cpp | 2 +- content/html/content/src/nsFormSubmission.cpp | 2 +- .../html/content/src/nsGenericHTMLElement.cpp | 36 ++-- .../html/content/src/nsGenericHTMLElement.h | 6 +- .../html/content/src/nsHTMLButtonElement.cpp | 14 +- .../html/content/src/nsHTMLCanvasElement.cpp | 6 +- .../html/content/src/nsHTMLFormElement.cpp | 22 +-- .../html/content/src/nsHTMLImageElement.cpp | 6 +- .../html/content/src/nsHTMLInputElement.cpp | 35 ++-- .../html/content/src/nsHTMLLabelElement.cpp | 4 +- .../html/content/src/nsHTMLLegendElement.cpp | 2 +- .../html/content/src/nsHTMLLinkElement.cpp | 2 +- .../html/content/src/nsHTMLOptionElement.cpp | 14 +- .../html/content/src/nsHTMLScriptElement.cpp | 4 +- .../html/content/src/nsHTMLSelectElement.cpp | 6 +- .../content/src/nsHTMLTableCellElement.cpp | 2 +- .../content/src/nsHTMLTableRowElement.cpp | 4 +- .../content/src/nsHTMLTextAreaElement.cpp | 4 +- .../html/document/src/nsHTMLContentSink.cpp | 6 +- content/html/document/src/nsHTMLDocument.cpp | 72 ++++---- .../src/nsHTMLFragmentContentSink.cpp | 4 +- content/svg/content/src/nsDOMSVGZoomEvent.cpp | 2 +- content/svg/content/src/nsSVGElement.cpp | 2 +- content/svg/content/src/nsSVGFilters.cpp | 28 +-- content/svg/content/src/nsSVGLength.cpp | 6 +- content/svg/content/src/nsSVGLengthList.cpp | 6 +- content/svg/content/src/nsSVGNumber2.cpp | 2 +- content/svg/content/src/nsSVGNumberList.cpp | 4 +- .../svg/content/src/nsSVGPathDataParser.cpp | 2 +- content/svg/content/src/nsSVGPathElement.cpp | 4 +- content/svg/content/src/nsSVGPathSegList.cpp | 26 +-- content/svg/content/src/nsSVGPointList.cpp | 4 +- content/svg/content/src/nsSVGSVGElement.cpp | 30 ++-- content/svg/content/src/nsSVGSVGElement.h | 2 +- content/svg/content/src/nsSVGStopElement.cpp | 2 +- .../svg/content/src/nsSVGStylableElement.cpp | 2 +- .../svg/content/src/nsSVGTransformList.cpp | 4 +- content/svg/content/src/nsSVGUseElement.cpp | 4 +- content/svg/content/src/nsSVGValue.cpp | 8 +- content/xbl/src/nsBindingManager.cpp | 50 +++--- content/xbl/src/nsXBLBinding.cpp | 16 +- content/xbl/src/nsXBLDocumentInfo.cpp | 16 +- content/xbl/src/nsXBLEventHandler.cpp | 4 +- content/xbl/src/nsXBLProtoImplField.cpp | 4 +- content/xbl/src/nsXBLProtoImplMethod.cpp | 2 +- content/xbl/src/nsXBLProtoImplProperty.cpp | 2 +- content/xbl/src/nsXBLPrototypeBinding.cpp | 56 +++--- content/xbl/src/nsXBLService.cpp | 6 +- content/xbl/src/nsXBLWindowKeyHandler.cpp | 2 +- content/xml/content/src/nsXMLElement.cpp | 4 +- content/xml/document/src/nsXMLDocument.cpp | 2 +- content/xslt/src/base/txStringUtils.cpp | 2 +- content/xslt/src/xml/txXMLParser.cpp | 8 +- content/xslt/src/xml/txXMLUtils.h | 14 +- content/xslt/src/xpath/nsXPathResult.cpp | 18 +- content/xslt/src/xpath/txCoreFunctionCall.cpp | 8 +- content/xslt/src/xpath/txExprParser.cpp | 14 +- content/xslt/src/xpath/txFilterExpr.cpp | 2 +- content/xslt/src/xpath/txFunctionCall.cpp | 2 +- content/xslt/src/xpath/txLiteralExpr.cpp | 4 +- .../src/xpath/txMozillaXPathTreeWalker.cpp | 8 +- content/xslt/src/xpath/txNodeSet.cpp | 8 +- content/xslt/src/xpath/txPathExpr.cpp | 16 +- content/xslt/src/xpath/txRelationalExpr.cpp | 4 +- content/xslt/src/xpath/txResultRecycler.cpp | 26 +-- .../src/xpath/txStandaloneXPathTreeWalker.cpp | 26 +-- content/xslt/src/xpath/txUnionExpr.cpp | 4 +- .../src/xpath/txXPCOMExtensionFunction.cpp | 10 +- content/xslt/src/xpath/txXPathNode.h | 4 +- content/xslt/src/xpath/txXPathOptimizer.cpp | 20 +-- content/xslt/src/xslt/txBufferingHandler.cpp | 24 +-- .../xslt/src/xslt/txCurrentFunctionCall.cpp | 2 +- .../xslt/src/xslt/txDocumentFunctionCall.cpp | 8 +- content/xslt/src/xslt/txEXSLTFunctions.cpp | 12 +- content/xslt/src/xslt/txInstructions.cpp | 34 ++-- content/xslt/src/xslt/txKey.h | 4 +- content/xslt/src/xslt/txKeyFunctionCall.cpp | 22 +-- content/xslt/src/xslt/txMozillaXMLOutput.cpp | 12 +- .../xslt/src/xslt/txMozillaXSLTProcessor.cpp | 20 +-- content/xslt/src/xslt/txNodeSorter.cpp | 12 +- content/xslt/src/xslt/txPatternOptimizer.cpp | 2 +- .../xslt/txStandaloneStylesheetCompiler.cpp | 8 +- content/xslt/src/xslt/txStylesheet.cpp | 38 ++--- .../src/xslt/txStylesheetCompileHandlers.cpp | 44 +++-- .../xslt/src/xslt/txStylesheetCompiler.cpp | 28 +-- content/xtf/src/nsXTFElementWrapper.cpp | 28 +-- content/xul/content/src/nsXULElement.cpp | 56 +++--- content/xul/content/src/nsXULElement.h | 2 +- .../xul/content/src/nsXULPopupListener.cpp | 2 +- content/xul/document/src/nsElementMap.cpp | 40 ++--- content/xul/document/src/nsXULContentSink.cpp | 18 +- content/xul/document/src/nsXULControllers.cpp | 16 +- content/xul/document/src/nsXULDocument.cpp | 53 +++--- .../xul/document/src/nsXULPrototypeCache.cpp | 4 +- .../document/src/nsXULPrototypeDocument.cpp | 2 +- .../xul/templates/src/nsContentSupportMap.h | 4 +- .../templates/src/nsRDFConInstanceTestNode.h | 2 +- .../templates/src/nsRDFConMemberTestNode.h | 2 +- .../xul/templates/src/nsRDFPropertyTestNode.h | 2 +- content/xul/templates/src/nsRuleNetwork.cpp | 6 +- content/xul/templates/src/nsRuleNetwork.h | 2 +- content/xul/templates/src/nsTemplateMap.h | 4 +- content/xul/templates/src/nsTemplateRule.h | 4 +- .../xul/templates/src/nsXULContentBuilder.cpp | 4 +- .../templates/src/nsXULTemplateBuilder.cpp | 16 +- .../src/nsXULTemplateQueryProcessorRDF.cpp | 14 +- .../xul/templates/src/nsXULTreeBuilder.cpp | 10 +- db/mork/build/nsMorkFactory.cpp | 2 +- db/morkreader/nsMorkReader.cpp | 4 +- docshell/base/nsDSURIContentListener.cpp | 2 +- docshell/base/nsDocShell.cpp | 60 +++---- docshell/base/nsDocShellEnumerator.cpp | 2 +- docshell/base/nsWebShell.cpp | 8 +- docshell/shistory/src/nsSHistory.cpp | 6 +- dom/public/nsDOMJSUtils.h | 4 +- dom/src/base/nsBarProps.cpp | 2 +- dom/src/base/nsDOMClassInfo.cpp | 48 +++--- dom/src/base/nsFocusController.cpp | 8 +- dom/src/base/nsGlobalWindow.cpp | 133 ++++++++------- dom/src/base/nsGlobalWindow.h | 18 +- dom/src/base/nsGlobalWindowCommands.cpp | 8 +- dom/src/base/nsJSEnvironment.cpp | 54 +++--- dom/src/base/nsJSTimeoutHandler.cpp | 10 +- dom/src/base/nsJSUtils.cpp | 8 +- dom/src/base/nsScriptNameSpaceManager.cpp | 28 +-- dom/src/base/nsWindowRoot.cpp | 10 +- dom/src/events/nsJSEventListener.cpp | 4 +- dom/src/storage/nsDOMStorage.cpp | 2 +- .../src/nsComposerCommandsUpdater.cpp | 2 +- editor/composer/src/nsComposerController.cpp | 12 +- editor/composer/src/nsEditingSession.cpp | 12 +- editor/libeditor/base/EditAggregateTxn.cpp | 2 +- editor/libeditor/base/nsEditor.cpp | 2 +- editor/libeditor/base/nsEditorController.cpp | 8 +- editor/libeditor/html/nsHTMLCSSUtils.cpp | 2 +- editor/libeditor/html/nsHTMLEditRules.cpp | 6 +- editor/libeditor/html/nsHTMLEditor.cpp | 6 +- editor/libeditor/html/nsHTMLEditorStyle.cpp | 2 +- editor/libeditor/html/nsHTMLURIRefObject.cpp | 2 +- editor/libeditor/text/nsPlaintextEditor.cpp | 2 +- editor/libeditor/text/nsTextEditRules.cpp | 4 +- editor/txtsvc/src/nsTextServicesDocument.cpp | 6 +- .../activex/src/control/MozillaBrowser.cpp | 6 +- .../activex/src/control/WindowCreator.cpp | 2 +- .../activex/src/plugin/LegacyPlugin.cpp | 6 +- .../browser/activex/src/plugin/XPCBrowser.cpp | 2 +- .../activex/src/plugin/XPCDocument.cpp | 8 +- .../browser/activex/src/plugin/XPConnect.cpp | 10 +- embedding/browser/cocoa/src/CHBrowserView.mm | 7 +- embedding/browser/cocoa/src/NSBrowserView.mm | 8 +- .../browser/gtk/src/EmbedGlobalHistory.cpp | 12 +- .../browser/gtk/src/EmbedPasswordMgr.cpp | 20 +-- embedding/browser/gtk/src/EmbedPrivate.cpp | 36 ++-- embedding/browser/gtk/src/EmbedProgress.cpp | 8 +- embedding/browser/gtk/src/EmbedWindow.cpp | 8 +- .../browser/gtk/src/EmbedWindowCreator.cpp | 8 +- embedding/browser/gtk/src/gtkmozembed2.cpp | 4 +- embedding/browser/photon/src/EmbedPrivate.cpp | 30 ++-- embedding/browser/photon/src/EmbedStream.cpp | 4 +- embedding/browser/photon/src/EmbedWindow.cpp | 6 +- .../browser/photon/src/EmbedWindowCreator.cpp | 2 +- .../browser/webBrowser/nsCommandHandler.cpp | 2 +- .../webBrowser/nsDocShellTreeOwner.cpp | 24 +-- .../browser/webBrowser/nsEmbedStream.cpp | 6 +- embedding/browser/webBrowser/nsWebBrowser.cpp | 16 +- .../commandhandler/src/nsCommandGroup.cpp | 4 +- .../commandhandler/src/nsCommandManager.cpp | 2 +- .../commandhandler/src/nsCommandParams.cpp | 12 +- .../src/nsControllerCommandTable.cpp | 2 +- .../printingui/src/mac/nsPrintProgress.cpp | 2 +- .../src/mac/nsPrintingPromptService.cpp | 2 +- .../printingui/src/os2/nsPrintProgress.cpp | 2 +- .../src/os2/nsPrintingPromptService.cpp | 2 +- .../src/unixshared/nsPrintProgress.cpp | 2 +- .../unixshared/nsPrintingPromptService.cpp | 2 +- .../printingui/src/win/nsPrintDialogUtil.cpp | 4 +- .../printingui/src/win/nsPrintProgress.cpp | 2 +- .../src/win/nsPrintingPromptService.cpp | 2 +- .../src/nsWebBrowserPersist.cpp | 4 +- .../components/windowwatcher/src/nsPrompt.cpp | 2 +- .../windowwatcher/src/nsWindowWatcher.cpp | 12 +- embedding/lite/nsEmbedGlobalHistory.cpp | 20 +-- embedding/qa/mozembed/src/mozEmbed.cpp | 2 +- embedding/qa/testembed/BrowserImpl.cpp | 2 +- embedding/qa/testembed/BrowserView.cpp | 6 +- .../qa/testembed/PrintProgressDialog.cpp | 2 +- embedding/qa/testembed/TestEmbed.cpp | 4 +- embedding/qa/testembed/Tests.cpp | 14 +- embedding/qa/testembed/nsIObserServ.cpp | 2 +- embedding/qa/testembed/nsIWebBrow.cpp | 8 +- embedding/qa/testembed/nsIWebProg.cpp | 4 +- embedding/qa/testembed/nsichanneltests.cpp | 2 +- embedding/qa/testembed/nsirequest.cpp | 2 +- embedding/tests/os2Embed/WebBrowserChrome.cpp | 6 +- embedding/tests/os2Embed/os2Embed.cpp | 14 +- embedding/tests/winEmbed/WebBrowserChrome.cpp | 6 +- embedding/tests/winEmbed/winEmbed.cpp | 4 +- embedding/tests/wxEmbed/EmbedApp.cpp | 2 +- embedding/tests/wxEmbed/GeckoContainer.cpp | 6 +- .../tests/wxEmbed/GeckoProtocolHandler.cpp | 2 +- .../wrappers/DotNETEmbed/DotNETEmbed.cpp | 2 +- embedding/wrappers/DotNETEmbed/WebChrome.cpp | 2 +- .../accessproxy/nsAccessProxy.cpp | 2 +- extensions/auth/nsAuthSambaNTLM.cpp | 6 +- extensions/cookie/nsPermissionManager.cpp | 12 +- extensions/cookie/nsPermissionManager.h | 4 +- .../xpcom/src/nsAppFileLocProviderProxy.cpp | 8 +- .../java/xpcom/src/nsJavaInterfaces.cpp | 6 +- extensions/java/xpcom/src/nsJavaWrapper.cpp | 124 +++++++------- .../xpcom/src/nsJavaXPCOMBindingUtils.cpp | 24 +-- extensions/java/xpcom/src/nsJavaXPTCStub.cpp | 36 ++-- .../src/nsLayoutDebuggingTools.cpp | 10 +- extensions/metrics/src/nsLoadCollector.cpp | 6 +- extensions/metrics/src/nsMetricsConfig.cpp | 2 +- extensions/metrics/src/nsMetricsService.cpp | 14 +- .../metrics/src/nsUICommandCollector.cpp | 16 +- extensions/metrics/src/nsWindowCollector.cpp | 2 +- .../autoconfig/src/nsJSConfigTriggers.cpp | 2 +- .../pref/autoconfig/src/nsLDAPSyncQuery.cpp | 8 +- .../src/gconf/nsSystemPrefService.cpp | 8 +- extensions/python/dom/src/nsPyTimeout.cpp | 2 +- .../python/xpcom/src/PyIComponentManager.cpp | 2 +- .../spellcheck/src/mozInlineSpellChecker.cpp | 8 +- .../spellcheck/src/mozInlineSpellWordUtil.cpp | 2 +- .../spellcheck/src/mozPersonalDictionary.cpp | 2 +- gfx/src/beos/nsDeviceContextBeOS.cpp | 2 +- gfx/src/beos/nsImageBeOS.cpp | 2 +- gfx/src/mac/nsDeviceContextMac.cpp | 16 +- gfx/src/mac/nsDrawingSurfaceMac.cpp | 2 +- gfx/src/mac/nsImageMac.cpp | 6 +- gfx/src/mac/nsRegionMac.cpp | 4 +- gfx/src/mac/nsRenderingContextMac.cpp | 2 +- gfx/src/nsDeviceContext.cpp | 8 +- gfx/src/nsFontList.cpp | 4 +- gfx/src/nsRegion.cpp | 32 ++-- gfx/src/os2/nsFontMetricsOS2.cpp | 8 +- gfx/src/os2/nsImageOS2.cpp | 2 +- gfx/src/os2/nsRegionOS2.cpp | 18 +- gfx/src/photon/nsDeviceContextSpecPh.cpp | 2 +- gfx/src/photon/nsFontMetricsPh.cpp | 2 +- gfx/src/photon/nsImagePh.cpp | 2 +- gfx/src/photon/nsRenderingContextPh.h | 2 +- gfx/src/thebes/nsThebesFontEnumerator.cpp | 4 +- gfx/src/thebes/nsThebesFontMetrics.h | 6 +- gfx/src/thebes/nsThebesImage.cpp | 4 +- gfx/src/thebes/nsThebesRegion.cpp | 18 +- gfx/src/thebes/nsThebesRenderingContext.cpp | 14 +- gfx/src/windows/nsDeviceContextWin.cpp | 2 +- gfx/src/windows/nsFontMetricsWin.cpp | 12 +- gfx/src/windows/nsImageWin.cpp | 6 +- gfx/src/windows/nsRenderingContextWin.cpp | 2 +- gfx/thebes/public/gfxAtsuiFonts.h | 2 +- gfx/thebes/public/gfxFont.h | 6 +- gfx/thebes/public/gfxOS2Fonts.h | 2 +- gfx/thebes/public/gfxPangoFonts.h | 3 +- gfx/thebes/src/gfxAtsuiFonts.cpp | 8 +- gfx/thebes/src/gfxFont.cpp | 4 +- gfx/thebes/src/gfxOS2Fonts.cpp | 4 +- gfx/thebes/src/gfxPangoFonts.cpp | 8 +- gfx/thebes/src/gfxTextRunWordCache.cpp | 8 +- gfx/thebes/src/gfxWindowsFonts.cpp | 6 +- gfx/thebes/src/gfxWindowsNativeDrawing.cpp | 4 +- gfx/thebes/test/gfxFontSelectionTest.cpp | 2 +- gfx/thebes/test/gfxTextRunPerfTest.cpp | 2 +- intl/locale/src/os2/nsCollationOS2.cpp | 4 +- intl/locale/src/os2/nsDateTimeFormatOS2.cpp | 2 +- .../src/windows/nsDateTimeFormatWin.cpp | 8 +- intl/uconv/native/nsNativeUConvService.cpp | 2 +- intl/uconv/src/nsConverterInputStream.cpp | 3 +- intl/uconv/src/nsScriptableUConv.cpp | 12 +- intl/uconv/util/nsUnicodeDecodeHelper.cpp | 14 +- intl/uconv/util/nsUnicodeEncodeHelper.cpp | 4 +- intl/unicharutil/src/nsCaseConversionImp2.cpp | 4 +- ipc/ipcd/client/src/ipcdclient.cpp | 2 +- js/jsd/jsd_xpc.cpp | 92 +++++----- js/jsd/jsd_xpc.h | 8 +- .../xpconnect/loader/mozJSComponentLoader.cpp | 18 +- .../xpconnect/loader/mozJSSubScriptLoader.cpp | 4 +- js/src/xpconnect/src/XPCDispConvert.cpp | 18 +- js/src/xpconnect/src/XPCDispInlines.h | 21 ++- js/src/xpconnect/src/XPCDispInterface.cpp | 8 +- js/src/xpconnect/src/XPCDispObject.cpp | 12 +- .../xpconnect/src/XPCDispParamPropJSClass.cpp | 7 +- js/src/xpconnect/src/XPCDispPrivate.h | 4 +- js/src/xpconnect/src/XPCDispTearOff.cpp | 4 +- js/src/xpconnect/src/XPCDispTypeInfo.cpp | 16 +- .../xpconnect/src/XPCIDispatchClassInfo.cpp | 4 +- .../xpconnect/src/XPCIDispatchExtension.cpp | 6 +- js/src/xpconnect/src/XPCNativeWrapper.cpp | 12 +- js/src/xpconnect/src/nsXPConnect.cpp | 22 +-- js/src/xpconnect/src/xpccallcontext.cpp | 2 +- js/src/xpconnect/src/xpccomponents.cpp | 96 +++++------ js/src/xpconnect/src/xpcconvert.cpp | 10 +- js/src/xpconnect/src/xpcexception.cpp | 2 +- js/src/xpconnect/src/xpcinlines.h | 6 +- js/src/xpconnect/src/xpcjsid.cpp | 4 +- js/src/xpconnect/src/xpcjsruntime.cpp | 14 +- js/src/xpconnect/src/xpcruntimesvc.cpp | 4 +- js/src/xpconnect/src/xpcstring.cpp | 12 +- js/src/xpconnect/src/xpcthreadcontext.cpp | 6 +- js/src/xpconnect/src/xpcthrower.cpp | 21 ++- js/src/xpconnect/src/xpcvariant.cpp | 2 +- js/src/xpconnect/src/xpcwrappedjs.cpp | 14 +- js/src/xpconnect/src/xpcwrappedjsclass.cpp | 14 +- js/src/xpconnect/src/xpcwrappednative.cpp | 8 +- js/src/xpconnect/tests/TestXPC.cpp | 8 +- .../tests/components/xpctest_child.cpp | 2 +- .../tests/components/xpctest_echo.cpp | 6 +- .../tests/components/xpctest_noisy.cpp | 2 +- layout/base/nsCSSFrameConstructor.cpp | 62 +++---- layout/base/nsCaret.cpp | 2 +- layout/base/nsCounterManager.cpp | 6 +- layout/base/nsCounterManager.h | 10 +- layout/base/nsDisplayList.cpp | 16 +- layout/base/nsDisplayList.h | 2 +- layout/base/nsDocumentViewer.cpp | 14 +- layout/base/nsFrameManager.cpp | 47 +++-- layout/base/nsFrameTraversal.cpp | 4 +- layout/base/nsGenConList.h | 4 +- layout/base/nsIPresShell.h | 4 +- layout/base/nsLayoutDebugger.cpp | 2 +- layout/base/nsLayoutUtils.cpp | 42 ++--- layout/base/nsLayoutUtils.h | 2 +- layout/base/nsPresShell.cpp | 40 ++--- layout/base/nsQuoteList.cpp | 2 +- layout/base/nsQuoteList.h | 6 +- layout/build/nsContentDLF.cpp | 4 +- layout/forms/nsComboboxControlFrame.cpp | 22 +-- layout/forms/nsFieldSetFrame.cpp | 4 +- layout/forms/nsFileControlFrame.cpp | 4 +- layout/forms/nsFormControlFrame.cpp | 6 +- layout/forms/nsGfxButtonControlFrame.cpp | 6 +- layout/forms/nsGfxCheckboxControlFrame.cpp | 8 +- layout/forms/nsGfxRadioControlFrame.cpp | 6 +- layout/forms/nsHTMLButtonControlFrame.cpp | 10 +- layout/forms/nsImageControlFrame.cpp | 18 +- layout/forms/nsIsIndexFrame.cpp | 6 +- layout/forms/nsLegendFrame.cpp | 4 +- layout/forms/nsListControlFrame.cpp | 34 ++-- layout/forms/nsListControlFrame.h | 2 +- layout/forms/nsSelectsAreaFrame.cpp | 2 +- layout/forms/nsTextControlFrame.cpp | 36 ++-- layout/generic/nsBRFrame.cpp | 2 +- layout/generic/nsBlockFrame.cpp | 104 ++++++------ layout/generic/nsBlockReflowContext.cpp | 14 +- layout/generic/nsBlockReflowState.cpp | 12 +- layout/generic/nsBulletFrame.cpp | 4 +- layout/generic/nsColumnSetFrame.cpp | 2 +- layout/generic/nsContainerFrame.cpp | 30 ++-- layout/generic/nsFirstLetterFrame.cpp | 2 +- layout/generic/nsFrame.cpp | 64 +++---- layout/generic/nsFrame.h | 2 +- layout/generic/nsFrameFrame.cpp | 4 +- layout/generic/nsFrameList.cpp | 8 +- layout/generic/nsFrameSetFrame.cpp | 8 +- layout/generic/nsGfxScrollFrame.cpp | 5 +- layout/generic/nsHTMLCanvasFrame.cpp | 2 +- layout/generic/nsHTMLContainerFrame.cpp | 2 +- layout/generic/nsHTMLFrame.cpp | 12 +- layout/generic/nsHTMLReflowState.cpp | 10 +- layout/generic/nsIFrame.h | 10 +- layout/generic/nsImageFrame.cpp | 14 +- layout/generic/nsInlineFrame.cpp | 6 +- layout/generic/nsIntervalSet.cpp | 4 +- layout/generic/nsLineBox.cpp | 4 +- layout/generic/nsLineBox.h | 52 +++--- layout/generic/nsLineLayout.cpp | 12 +- layout/generic/nsObjectFrame.cpp | 42 ++--- layout/generic/nsPageFrame.cpp | 14 +- layout/generic/nsPlaceholderFrame.cpp | 6 +- layout/generic/nsPlaceholderFrame.h | 2 +- layout/generic/nsSelection.cpp | 14 +- layout/generic/nsSimplePageSequence.cpp | 10 +- layout/generic/nsSpaceManager.cpp | 6 +- layout/generic/nsSplittableFrame.cpp | 16 +- layout/generic/nsTextFrameThebes.cpp | 160 +++++++++--------- layout/generic/nsTextRunTransformations.cpp | 2 +- layout/inspector/src/inDeepTreeWalker.cpp | 2 +- layout/mathml/base/src/nsMathMLChar.cpp | 8 +- .../base/src/nsMathMLContainerFrame.cpp | 2 +- .../mathml/base/src/nsMathMLmfencedFrame.cpp | 2 +- layout/mathml/base/src/nsMathMLmsubFrame.cpp | 3 +- .../mathml/base/src/nsMathMLmsubsupFrame.cpp | 4 +- layout/mathml/base/src/nsMathMLmsupFrame.cpp | 3 +- .../mathml/base/src/nsMathMLmtableFrame.cpp | 6 +- layout/style/nsCSSDataBlock.cpp | 104 ++++++------ layout/style/nsCSSDataBlock.h | 10 +- layout/style/nsCSSDeclaration.cpp | 14 +- layout/style/nsCSSLoader.cpp | 14 +- layout/style/nsCSSLoader.h | 2 +- layout/style/nsCSSParser.cpp | 28 +-- layout/style/nsCSSRuleProcessor.cpp | 100 +++++------ layout/style/nsCSSRules.cpp | 10 +- layout/style/nsCSSStyleRule.cpp | 4 +- layout/style/nsCSSStyleSheet.cpp | 12 +- layout/style/nsCSSValue.cpp | 4 +- layout/style/nsCSSValue.h | 2 +- layout/style/nsComputedDOMStyle.cpp | 2 +- layout/style/nsHTMLStyleSheet.cpp | 12 +- layout/style/nsRuleNode.cpp | 68 ++++---- layout/style/nsRuleNode.h | 10 +- layout/style/nsStyleContext.cpp | 24 +-- layout/style/nsStyleSet.cpp | 10 +- layout/svg/base/src/nsSVGAFrame.cpp | 6 +- layout/svg/base/src/nsSVGClipPathFrame.cpp | 4 +- layout/svg/base/src/nsSVGFilterFrame.cpp | 10 +- .../svg/base/src/nsSVGForeignObjectFrame.cpp | 18 +- layout/svg/base/src/nsSVGGFrame.cpp | 6 +- .../base/src/nsSVGGenericContainerFrame.cpp | 4 +- layout/svg/base/src/nsSVGGeometryFrame.cpp | 26 +-- layout/svg/base/src/nsSVGGlyphFrame.cpp | 16 +- layout/svg/base/src/nsSVGGradientFrame.cpp | 28 +-- layout/svg/base/src/nsSVGImageFrame.cpp | 8 +- layout/svg/base/src/nsSVGInnerSVGFrame.cpp | 20 +-- layout/svg/base/src/nsSVGMarkerFrame.cpp | 8 +- layout/svg/base/src/nsSVGMaskFrame.cpp | 10 +- layout/svg/base/src/nsSVGOuterSVGFrame.cpp | 16 +- .../svg/base/src/nsSVGPathGeometryFrame.cpp | 32 ++-- layout/svg/base/src/nsSVGPatternFrame.cpp | 28 +-- layout/svg/base/src/nsSVGTSpanFrame.cpp | 4 +- .../svg/base/src/nsSVGTextContainerFrame.cpp | 2 +- layout/svg/base/src/nsSVGTextFrame.cpp | 6 +- layout/svg/base/src/nsSVGTextPathFrame.cpp | 6 +- layout/svg/base/src/nsSVGUseFrame.cpp | 6 +- layout/svg/base/src/nsSVGUtils.cpp | 60 +++---- layout/tables/SpanningCellSorter.cpp | 18 +- layout/tables/nsCellMap.cpp | 4 +- layout/tables/nsTableCellFrame.cpp | 16 +- layout/tables/nsTableColGroupFrame.cpp | 4 +- layout/tables/nsTableFrame.cpp | 38 ++--- layout/tables/nsTableFrame.h | 4 +- layout/tables/nsTableOuterFrame.cpp | 14 +- layout/tables/nsTablePainter.cpp | 10 +- layout/tables/nsTableRowFrame.cpp | 10 +- layout/tables/nsTableRowGroupFrame.cpp | 12 +- layout/xul/base/src/nsBox.cpp | 4 +- layout/xul/base/src/nsBoxFrame.cpp | 6 +- layout/xul/base/src/nsGroupBoxFrame.cpp | 2 +- layout/xul/base/src/nsImageBoxFrame.cpp | 4 +- layout/xul/base/src/nsListBoxBodyFrame.cpp | 6 +- layout/xul/base/src/nsListBoxLayout.cpp | 10 +- layout/xul/base/src/nsMenuBarFrame.cpp | 2 +- layout/xul/base/src/nsMenuBoxObject.cpp | 10 +- layout/xul/base/src/nsMenuFrame.cpp | 22 +-- layout/xul/base/src/nsMenuPopupFrame.cpp | 14 +- layout/xul/base/src/nsPopupBoxObject.cpp | 2 +- layout/xul/base/src/nsPopupSetFrame.cpp | 2 +- layout/xul/base/src/nsResizerFrame.cpp | 4 +- .../xul/base/src/nsScrollbarButtonFrame.cpp | 4 +- layout/xul/base/src/nsSliderFrame.cpp | 12 +- layout/xul/base/src/nsSplitterFrame.cpp | 10 +- layout/xul/base/src/nsTextBoxFrame.cpp | 2 +- layout/xul/base/src/nsTitleBarFrame.cpp | 6 +- layout/xul/base/src/nsXULPopupManager.cpp | 38 ++--- .../xul/base/src/tree/src/nsTreeBodyFrame.cpp | 14 +- .../xul/base/src/tree/src/nsTreeBoxObject.cpp | 4 +- .../xul/base/src/tree/src/nsTreeColumns.cpp | 2 +- .../xul/base/src/tree/src/nsTreeSelection.cpp | 2 +- .../base/src/tree/src/nsTreeStyleCache.cpp | 12 +- modules/libjar/nsJAR.cpp | 6 +- modules/libjar/nsJARURI.cpp | 2 +- modules/libjar/nsZipArchive.cpp | 14 +- modules/libjar/zipstub.h | 2 - modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp | 2 +- modules/libpr0n/decoders/bmp/nsICODecoder.cpp | 2 +- .../libpr0n/decoders/gif/imgContainerGIF.cpp | 2 +- .../libpr0n/decoders/gif/nsGIFDecoder2.cpp | 2 +- .../decoders/icon/os2/nsIconChannel.cpp | 2 +- modules/libpr0n/decoders/png/nsPNGDecoder.cpp | 18 +- modules/libpr0n/decoders/xbm/nsXBMDecoder.cpp | 2 +- .../libpr0n/encoders/jpeg/nsJPEGEncoder.cpp | 10 +- modules/libpr0n/encoders/png/nsPNGEncoder.cpp | 4 +- modules/libpr0n/public/ImageLogging.h | 10 +- modules/libpr0n/src/imgCache.cpp | 4 +- modules/libpr0n/src/imgContainer.cpp | 4 +- modules/libpr0n/src/imgLoader.cpp | 30 ++-- modules/libpr0n/src/imgRequest.cpp | 30 ++-- modules/libpref/src/nsPrefBranch.cpp | 8 +- modules/libpref/src/nsPrefService.cpp | 2 +- modules/libpref/src/nsSharedPrefHandler.cpp | 6 +- modules/libpref/src/prefapi.cpp | 20 +-- modules/oji/src/ProxyJNI.cpp | 12 +- modules/oji/src/lcglue.cpp | 10 +- modules/oji/src/nsJVMConfigManagerUnix.cpp | 22 +-- modules/oji/src/nsJVMManager.cpp | 6 +- .../plugin/base/src/ns4xPluginInstance.cpp | 2 +- modules/plugin/base/src/nsJSNPRuntime.cpp | 22 +-- .../base/src/nsPluginDirServiceProvider.cpp | 2 +- modules/plugin/base/src/nsPluginHostImpl.cpp | 22 +-- .../SanePlugin/nsSanePluginFactory.cpp | 12 +- modules/plugin/samples/simple/npsimple.cpp | 12 +- .../plugin/samples/testevents/npevents.cpp | 8 +- .../sdk/samples/simple/nsScriptablePeer.cpp | 6 +- netwerk/base/public/nsURIHashKey.h | 6 +- netwerk/base/src/nsBaseChannel.cpp | 10 +- netwerk/base/src/nsBaseChannel.h | 2 +- netwerk/base/src/nsIOService.cpp | 8 +- netwerk/base/src/nsIncrementalDownload.cpp | 2 +- netwerk/base/src/nsInputStreamPump.cpp | 4 +- netwerk/base/src/nsLoadGroup.cpp | 48 +++--- netwerk/base/src/nsPACMan.cpp | 4 +- netwerk/base/src/nsProtocolProxyService.cpp | 2 +- netwerk/base/src/nsSimpleURI.cpp | 8 +- netwerk/base/src/nsSocketTransport2.cpp | 2 +- netwerk/base/src/nsStandardURL.cpp | 2 +- netwerk/base/src/nsStreamLoader.cpp | 4 +- netwerk/cache/src/nsDeleteDir.cpp | 2 +- netwerk/cache/src/nsDiskCacheDeviceSQL.cpp | 2 +- netwerk/cache/src/nsDiskCacheEntry.h | 2 +- netwerk/cookie/src/nsCookie.cpp | 2 +- netwerk/cookie/src/nsCookieService.cpp | 16 +- netwerk/dns/src/nsEffectiveTLDService.cpp | 6 +- netwerk/dns/src/nsHostResolver.cpp | 36 ++-- .../ftp/src/nsFtpConnectionThread.cpp | 4 +- netwerk/protocol/http/src/nsHttp.cpp | 20 +-- netwerk/protocol/http/src/nsHttpChannel.cpp | 10 +- .../http/src/nsHttpChunkedDecoder.cpp | 2 +- .../protocol/http/src/nsHttpConnection.cpp | 4 +- netwerk/protocol/http/src/nsHttpHandler.cpp | 6 +- .../protocol/http/src/nsHttpTransaction.cpp | 8 +- .../viewsource/src/nsViewSourceChannel.cpp | 24 +-- .../viewsource/src/nsViewSourceHandler.cpp | 2 +- .../converters/nsUnknownDecoder.cpp | 2 +- .../src/nsStreamConverterService.cpp | 2 +- netwerk/test/TestCallbacks.cpp | 2 +- netwerk/test/TestThreadedIO.cpp | 2 +- parser/htmlparser/public/nsScannerString.h | 24 +-- parser/htmlparser/src/CNavDTD.cpp | 20 +-- parser/htmlparser/src/nsDTDUtils.cpp | 10 +- parser/htmlparser/src/nsDTDUtils.h | 2 +- parser/htmlparser/src/nsExpatDriver.cpp | 36 ++-- parser/htmlparser/src/nsHTMLEntities.cpp | 22 +-- parser/htmlparser/src/nsHTMLTokenizer.cpp | 12 +- parser/htmlparser/src/nsParser.cpp | 8 +- parser/htmlparser/src/nsParserNode.cpp | 10 +- parser/htmlparser/src/nsParserNode.h | 2 +- parser/htmlparser/src/nsParserService.cpp | 14 +- parser/htmlparser/src/nsParserService.h | 10 +- parser/htmlparser/src/nsScannerString.cpp | 12 +- parser/htmlparser/src/nsViewSourceHTML.cpp | 26 +-- parser/htmlparser/tests/outsinks/Convert.cpp | 2 +- .../dirserviceprovider/src/nsProfileLock.cpp | 2 +- profile/src/nsProfile.cpp | 2 +- profile/src/nsProfileAccess.cpp | 12 +- rdf/base/src/nsInMemoryDataSource.cpp | 70 ++++---- rdf/base/src/nsRDFContentSink.cpp | 10 +- rdf/base/src/nsRDFService.cpp | 68 ++++---- rdf/chrome/src/nsChromeRegistry.cpp | 2 +- rdf/datasource/src/nsLocalStore.cpp | 10 +- rdf/util/src/nsRDFResource.cpp | 8 +- .../boot/src/nsSecureBrowserUIImpl.cpp | 6 +- security/manager/ssl/src/nsCMS.cpp | 2 +- .../manager/ssl/src/nsCMSSecureMessage.cpp | 2 +- security/manager/ssl/src/nsCRLManager.cpp | 2 +- security/manager/ssl/src/nsCertTree.cpp | 14 +- .../ssl/src/nsCertVerificationThread.cpp | 4 +- security/manager/ssl/src/nsCrypto.cpp | 34 ++-- security/manager/ssl/src/nsKeyModule.cpp | 2 +- security/manager/ssl/src/nsKeygenHandler.cpp | 4 +- security/manager/ssl/src/nsKeygenThread.cpp | 4 +- security/manager/ssl/src/nsNSSCallbacks.cpp | 8 +- security/manager/ssl/src/nsNSSCallbacks.h | 12 +- security/manager/ssl/src/nsNSSCertHelper.cpp | 4 +- security/manager/ssl/src/nsNSSCertificate.cpp | 4 +- .../manager/ssl/src/nsNSSCertificateDB.cpp | 22 +-- security/manager/ssl/src/nsNSSComponent.cpp | 6 +- security/manager/ssl/src/nsNSSIOLayer.cpp | 10 +- security/manager/ssl/src/nsNSSShutDown.cpp | 14 +- security/manager/ssl/src/nsPK11TokenDB.cpp | 10 +- security/manager/ssl/src/nsPKCS11Slot.cpp | 4 +- security/manager/ssl/src/nsPKCS12Blob.cpp | 16 +- .../manager/ssl/src/nsPSMBackgroundThread.cpp | 4 +- security/manager/ssl/src/nsStreamCipher.cpp | 2 +- storage/src/mozStorageAsyncIO.cpp | 30 ++-- storage/src/mozStorageStatement.cpp | 6 +- storage/src/mozStorageStatementWrapper.cpp | 4 +- .../alerts/src/mac/mozGrowlDelegate.mm | 8 +- .../src/nsAutoCompleteController.cpp | 2 +- .../commandlines/src/nsCommandLine.cpp | 6 +- .../downloads/src/nsDownloadManager.cpp | 2 +- toolkit/components/downloads/src/old.cpp | 2 +- .../history/src/nsGlobalHistory.cpp | 10 +- toolkit/components/history/src/nsMdbPtr.h | 14 +- .../places/src/nsAnnotationService.cpp | 16 +- .../places/src/nsFaviconService.cpp | 6 +- .../components/places/src/nsMaybeWeakPtr.cpp | 6 +- .../components/places/src/nsMaybeWeakPtr.h | 4 +- .../places/src/nsMorkHistoryImporter.cpp | 10 +- .../components/places/src/nsNavBookmarks.cpp | 10 +- .../components/places/src/nsNavHistory.cpp | 12 +- .../places/src/nsNavHistoryAutoComplete.cpp | 4 +- .../places/src/nsNavHistoryExpire.cpp | 2 +- .../places/src/nsNavHistoryQuery.cpp | 20 +-- .../places/src/nsNavHistoryResult.cpp | 47 +++-- .../places/src/nsNavHistoryResult.h | 10 +- .../components/remote/nsGTKRemoteService.cpp | 10 +- .../satchel/src/nsFormFillController.cpp | 46 ++--- .../satchel/src/nsStorageFormHistory.cpp | 10 +- .../typeaheadfind/src/nsTypeAheadFind.cpp | 2 +- .../src/nsUrlClassifierDBService.cpp | 2 +- .../src/nsUrlClassifierUtils.cpp | 6 +- .../tests/TestUrlClassifierUtils.cpp | 8 +- .../profile/src/nsToolkitProfileService.cpp | 2 +- toolkit/system/dbus/nsDBusService.cpp | 4 +- .../system/dbus/nsNetworkManagerListener.cpp | 4 +- toolkit/xre/nsAppData.cpp | 6 +- toolkit/xre/nsAppRunner.cpp | 4 +- toolkit/xre/nsNativeAppSupportWin.cpp | 2 +- uriloader/base/nsDocLoader.cpp | 38 ++--- uriloader/base/nsDocLoader.h | 6 +- .../exthandler/mac/nsOSHelperAppService.cpp | 6 +- uriloader/prefetch/nsPrefetchService.cpp | 2 +- view/public/nsIView.h | 8 +- view/src/nsScrollPortView.cpp | 2 +- view/src/nsView.cpp | 10 +- view/src/nsView.h | 2 +- view/src/nsViewManager.cpp | 50 +++--- widget/public/nsGUIEvent.h | 4 +- widget/src/beos/nsWindow.cpp | 6 +- widget/src/cocoa/nsAppShell.mm | 8 +- widget/src/cocoa/nsChildView.mm | 28 +-- widget/src/cocoa/nsCocoaWindow.mm | 14 +- widget/src/cocoa/nsIdleServiceX.mm | 2 +- widget/src/cocoa/nsMenuBarX.mm | 18 +- widget/src/cocoa/nsMenuItemX.mm | 4 +- widget/src/cocoa/nsMenuX.mm | 10 +- widget/src/cocoa/nsPrintSettingsX.mm | 2 +- widget/src/cocoa/nsScreenManagerCocoa.mm | 2 +- widget/src/gtk2/nsAppShell.cpp | 2 +- widget/src/gtk2/nsClipboard.cpp | 16 +- widget/src/gtk2/nsDragService.cpp | 20 +-- widget/src/gtk2/nsFilePicker.cpp | 10 +- widget/src/gtk2/nsImageToPixbuf.cpp | 8 +- widget/src/gtk2/nsScreenGtk.cpp | 4 +- widget/src/gtk2/nsWindow.cpp | 30 ++-- widget/src/mac/nsAppShell.cpp | 4 +- widget/src/mac/nsChildWindow.cpp | 6 +- widget/src/mac/nsClipboard.cpp | 14 +- widget/src/mac/nsDeviceContextMac.cpp | 16 +- widget/src/mac/nsDragHelperService.cpp | 2 +- widget/src/mac/nsDragService.cpp | 20 +-- widget/src/mac/nsFilePicker.cpp | 10 +- widget/src/mac/nsMacControl.cpp | 4 +- widget/src/mac/nsMacEventHandler.cpp | 20 +-- widget/src/mac/nsMacMessagePump.cpp | 12 +- .../src/mac/nsMacNativeUnicodeConverter.cpp | 4 +- widget/src/mac/nsMacWindow.cpp | 20 +-- widget/src/mac/nsMenuBarX.cpp | 20 +-- widget/src/mac/nsMenuItemX.cpp | 4 +- widget/src/mac/nsMenuX.cpp | 6 +- widget/src/mac/nsMimeMapper.cpp | 2 +- widget/src/mac/nsPrintSettingsX.cpp | 2 +- widget/src/mac/nsScreenManagerMac.cpp | 4 +- widget/src/mac/nsSound.cpp | 26 +-- widget/src/mac/nsStylClipboardUtils.cpp | 5 +- widget/src/mac/nsWindow.cpp | 14 +- widget/src/os2/nsAppShell.cpp | 4 +- widget/src/os2/nsClipboard.cpp | 34 ++-- widget/src/os2/nsFilePicker.cpp | 4 +- widget/src/os2/nsWindow.cpp | 2 +- widget/src/photon/nsClipboard.cpp | 12 +- widget/src/photon/nsWidget.cpp | 2 +- widget/src/photon/nsWindow.cpp | 4 +- widget/src/windows/nsAppShell.cpp | 4 +- widget/src/windows/nsClipboard.cpp | 26 +-- widget/src/windows/nsDataObj.cpp | 30 ++-- widget/src/windows/nsDeviceContextSpecWin.cpp | 12 +- widget/src/windows/nsDragService.cpp | 2 +- widget/src/windows/nsFilePicker.cpp | 4 +- widget/src/windows/nsImageClipboard.cpp | 2 +- widget/src/windows/nsKeyboardLayout.cpp | 10 +- widget/src/windows/nsNativeDragTarget.cpp | 6 +- widget/src/windows/nsPrintSettingsWin.cpp | 2 +- widget/src/windows/nsScreenManagerWin.cpp | 6 +- widget/src/windows/nsSound.cpp | 2 +- widget/src/windows/nsWindow.cpp | 8 +- widget/src/xpwidgets/nsBaseWidget.cpp | 2 +- widget/src/xpwidgets/nsIdleService.cpp | 2 +- widget/src/xpwidgets/nsPrimitiveHelpers.cpp | 6 +- widget/src/xpwidgets/nsPrintSettingsImpl.cpp | 2 +- widget/src/xpwidgets/nsTransferable.cpp | 2 +- xpcom/base/nsAgg.h | 4 +- xpcom/base/nsAutoPtr.h | 132 +++++++-------- xpcom/base/nsCycleCollectionParticipant.cpp | 4 +- xpcom/base/nsCycleCollectionParticipant.h | 28 +-- xpcom/base/nsCycleCollector.cpp | 40 +++-- xpcom/base/nsDebugImpl.cpp | 2 +- xpcom/base/nsTraceRefcntImpl.cpp | 28 +-- xpcom/base/nsUUIDGenerator.cpp | 2 +- xpcom/base/nscore.h | 2 +- xpcom/build/nsOS2VACLegacy.cpp | 6 +- xpcom/build/nsXPCOMStrings.cpp | 8 +- xpcom/build/nsXPComInit.cpp | 6 +- xpcom/components/nsCategoryManager.cpp | 14 +- xpcom/components/nsComponentManager.cpp | 130 +++++++------- xpcom/components/nsServiceManagerObsolete.cpp | 3 +- xpcom/components/nsStaticComponentLoader.cpp | 12 +- xpcom/ds/nsArray.cpp | 18 +- xpcom/ds/nsAtomTable.cpp | 24 +-- xpcom/ds/nsCRT.cpp | 6 +- xpcom/ds/nsCppSharedAllocator.h | 2 +- xpcom/ds/nsDoubleHashtable.h | 26 +-- xpcom/ds/nsExpirationTracker.h | 2 +- xpcom/ds/nsFixedSizeAllocator.cpp | 4 +- xpcom/ds/nsHashPropertyBag.cpp | 2 +- xpcom/ds/nsHashtable.cpp | 50 +++--- xpcom/ds/nsINIParserImpl.cpp | 4 +- xpcom/ds/nsObserverList.cpp | 2 +- xpcom/ds/nsObserverList.h | 4 +- xpcom/ds/nsPersistentProperties.cpp | 16 +- xpcom/ds/nsStaticNameTable.cpp | 22 +-- xpcom/ds/nsStringEnumerator.cpp | 4 +- xpcom/ds/nsSupportsArray.cpp | 2 +- xpcom/ds/nsTextFormatter.cpp | 2 +- xpcom/glue/nsArrayEnumerator.cpp | 2 +- xpcom/glue/nsBaseHashtable.h | 6 +- xpcom/glue/nsCOMArray.cpp | 6 +- xpcom/glue/nsCOMArray.h | 22 +-- xpcom/glue/nsCOMPtr.cpp | 16 +- xpcom/glue/nsCOMPtr.h | 80 ++++----- xpcom/glue/nsComponentManagerUtils.h | 16 +- xpcom/glue/nsEnumeratorUtils.cpp | 2 +- xpcom/glue/nsGREGlue.cpp | 2 +- xpcom/glue/nsGenericFactory.cpp | 8 +- xpcom/glue/nsHashKeys.h | 12 +- xpcom/glue/nsIClassInfoImpl.h | 2 +- xpcom/glue/nsIInterfaceRequestorUtils.h | 2 +- xpcom/glue/nsINIParser.cpp | 2 +- xpcom/glue/nsISupportsImpl.cpp | 4 +- xpcom/glue/nsISupportsImpl.h | 32 ++-- xpcom/glue/nsISupportsUtils.h | 10 +- xpcom/glue/nsIWeakReferenceUtils.h | 2 +- xpcom/glue/nsServiceManagerUtils.h | 4 +- xpcom/glue/nsStringAPI.h | 10 +- xpcom/glue/nsTArray.cpp | 16 +- xpcom/glue/nsTArray.h | 22 +-- xpcom/glue/nsTHashtable.h | 26 +-- xpcom/glue/nsTObserverArray.h | 4 +- xpcom/glue/nsTPtrArray.h | 4 +- xpcom/glue/nsTraceRefcnt.h | 4 +- xpcom/glue/nsVersionComparator.cpp | 2 +- xpcom/glue/nsVoidArray.cpp | 60 +++---- xpcom/glue/nsVoidArray.h | 12 +- xpcom/io/nsBinaryStream.cpp | 38 ++--- xpcom/io/nsDirectoryService.cpp | 6 +- xpcom/io/nsDirectoryServiceUtils.h | 2 +- xpcom/io/nsFastLoadFile.cpp | 148 ++++++++-------- xpcom/io/nsFastLoadFile.h | 4 +- xpcom/io/nsFastLoadService.cpp | 8 +- xpcom/io/nsInputStreamTee.cpp | 2 +- xpcom/io/nsLocalFileOS2.cpp | 10 +- xpcom/io/nsLocalFileOSX.cpp | 2 +- xpcom/io/nsLocalFileWin.cpp | 4 +- xpcom/io/nsNativeCharsetUtils.cpp | 2 +- xpcom/io/nsStorageStream.cpp | 2 +- xpcom/io/nsStreamUtils.cpp | 10 +- xpcom/io/nsStringStream.cpp | 6 +- xpcom/io/nsUnicharInputStream.cpp | 5 +- xpcom/obsolete/component/nsRegistry.cpp | 14 +- xpcom/proxy/src/nsProxyEvent.cpp | 6 +- xpcom/proxy/src/nsProxyEventObject.cpp | 2 +- xpcom/reflect/xptcall/src/xptcall.cpp | 4 +- .../reflect/xptcall/tests/TestXPTCInvoke.cpp | 16 +- .../tests/eVC4/TestXPTCInvokeInIDE.cpp | 19 +-- .../reflect/xptinfo/src/xptiInterfaceInfo.cpp | 14 +- .../xptinfo/src/xptiInterfaceInfoManager.cpp | 14 +- xpcom/string/public/nsCharTraits.h | 20 +-- xpcom/string/public/nsLiteralString.h | 10 +- xpcom/string/public/nsTAString.h | 8 +- xpcom/string/public/nsTDependentString.h | 8 +- xpcom/string/public/nsTDependentSubstring.h | 4 +- xpcom/string/public/nsTString.h | 4 +- xpcom/string/public/nsTSubstring.h | 4 +- xpcom/string/src/nsReadableUtils.cpp | 14 +- xpcom/string/src/nsSubstring.cpp | 12 +- xpcom/string/src/nsSubstringTuple.cpp | 4 +- xpcom/string/src/nsTAString.cpp | 2 +- xpcom/string/src/nsTDependentString.cpp | 2 +- xpcom/string/src/nsTDependentSubstring.cpp | 4 +- xpcom/string/src/nsTObsoleteAStringThunk.cpp | 4 +- xpcom/string/src/nsTPromiseFlatString.cpp | 2 +- xpcom/string/src/nsTString.cpp | 2 +- xpcom/string/src/nsTSubstring.cpp | 4 +- xpcom/stub/nsOS2VACLegacy.cpp | 6 +- .../StringFactoringTests/nsStdStringWrapper.h | 4 +- .../StringFactoringTests/profile_main.cpp | 4 +- xpcom/tests/TestAutoPtr.cpp | 40 ++--- xpcom/tests/TestCallTemplates.cpp | 8 +- xpcom/tests/TestHashtables.cpp | 18 +- xpcom/tests/TestINIParser.cpp | 2 +- xpcom/tests/TestObserverService.cpp | 6 +- xpcom/tests/TestPermanentAtoms.cpp | 4 +- xpcom/tests/TestTArray.cpp | 2 +- xpcom/tests/TestVoidBTree.cpp | 4 +- xpcom/threads/TimerThread.cpp | 12 +- xpcom/threads/nsEventQueue.h | 2 +- xpcom/threads/nsProcessCommon.cpp | 4 +- xpcom/threads/nsThread.cpp | 4 +- xpcom/threads/nsThreadManager.cpp | 6 +- xpcom/threads/nsTimerImpl.cpp | 2 +- xpfe/appshell/src/nsAppShellService.cpp | 14 +- xpfe/appshell/src/nsContentTreeOwner.cpp | 4 +- xpfe/appshell/src/nsWebShellWindow.cpp | 4 +- xpfe/appshell/src/nsWindowMediator.cpp | 8 +- xpfe/appshell/src/nsXULWindow.cpp | 24 +-- xpfe/browser/src/nsBrowserStatusFilter.cpp | 2 +- .../bookmarks/src/nsBookmarksService.cpp | 8 +- .../directory/nsDirectoryViewer.cpp | 14 +- .../src/nsDownloadManager.cpp | 6 +- xpfe/components/filepicker/src/nsFileView.cpp | 12 +- .../history/src/nsGlobalHistory.cpp | 12 +- xpfe/components/history/src/nsMdbPtr.h | 14 +- .../search/src/nsInternetSearchService.cpp | 6 +- .../search/src/nsLocalSearchService.cpp | 2 +- .../startup/src/nsCommandLineService.cpp | 22 +-- .../windowds/nsWindowDataSource.cpp | 10 +- .../components/xremote/src/XRemoteService.cpp | 4 +- xpinstall/src/ScheduledTasks.cpp | 4 +- xpinstall/src/nsInstall.cpp | 18 +- xpinstall/src/nsInstallFile.cpp | 6 +- xpinstall/src/nsInstallPatch.cpp | 10 +- xpinstall/src/nsInstallTrigger.cpp | 6 +- xpinstall/src/nsInstallUninstall.cpp | 4 +- xpinstall/src/nsJSFile.cpp | 4 +- xpinstall/src/nsJSFileSpecObj.cpp | 4 +- xpinstall/src/nsJSInstall.cpp | 8 +- xpinstall/src/nsJSInstallTriggerGlobal.cpp | 12 +- xpinstall/src/nsJSInstallVersion.cpp | 8 +- xpinstall/src/nsSoftwareUpdateRun.cpp | 6 +- xpinstall/src/nsWinReg.cpp | 4 +- xpinstall/src/nsXPInstallManager.cpp | 2 +- 934 files changed, 5429 insertions(+), 5468 deletions(-) diff --git a/accessible/src/atk/nsAccessibleWrap.cpp b/accessible/src/atk/nsAccessibleWrap.cpp index b1f88a757b79..f64d40544edf 100644 --- a/accessible/src/atk/nsAccessibleWrap.cpp +++ b/accessible/src/atk/nsAccessibleWrap.cpp @@ -376,8 +376,8 @@ NS_IMETHODIMP nsAccessibleWrap::GetNativeInterface(void **aOutAccessible) GType type = GetMaiAtkType(CreateMaiInterfaces()); NS_ENSURE_TRUE(type, NS_ERROR_FAILURE); mAtkObject = - NS_REINTERPRET_CAST(AtkObject *, - g_object_new(type, NULL)); + reinterpret_cast + (g_object_new(type, NULL)); NS_ENSURE_TRUE(mAtkObject, NS_ERROR_OUT_OF_MEMORY); atk_object_initialize(mAtkObject, this); @@ -394,7 +394,7 @@ nsAccessibleWrap::GetAtkObject(void) { void *atkObj = nsnull; GetNativeInterface(&atkObj); - return NS_STATIC_CAST(AtkObject *, atkObj); + return static_cast(atkObj); } // Get AtkObject from nsIAccessible interface @@ -690,7 +690,7 @@ initializeCB(AtkObject *aAtkObj, gpointer aData) /* initialize object */ MAI_ATK_OBJECT(aAtkObj)->accWrap = - NS_STATIC_CAST(nsAccessibleWrap*, aData); + static_cast(aData); #ifdef MAI_LOGGING ++sMaiAtkObjCreated; @@ -782,7 +782,7 @@ getRoleCB(AtkObject *aAtkObj) atkRole = atkRoleMap[accRole]; // map to the actual value NS_ASSERTION(atkRoleMap[nsIAccessibleRole::ROLE_LAST_ENTRY] == kROLE_ATK_LAST_ENTRY, "ATK role map skewed"); - aAtkObj->role = NS_STATIC_CAST(AtkRole, atkRole); + aAtkObj->role = static_cast(atkRole); } return aAtkObj->role; } @@ -967,7 +967,7 @@ getIndexInParentCB(AtkObject *aAtkObj) PRInt32 currentIndex = 0; - while (sibling != NS_STATIC_CAST(nsIAccessible*, accWrap)) { + while (sibling != static_cast(accWrap)) { NS_ASSERTION(sibling, "Never ran into the same child that we started from"); if (!sibling) { @@ -1060,7 +1060,7 @@ refRelationSetCB(AtkObject *aAtkObj) }; for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(relationType); i++) { - relation = atk_relation_set_get_relation_by_type(relation_set, NS_STATIC_CAST(AtkRelationType, relationType[i])); + relation = atk_relation_set_get_relation_by_type(relation_set, static_cast(relationType[i])); if (relation) { atk_relation_set_remove(relation_set, relation); } @@ -1070,7 +1070,7 @@ refRelationSetCB(AtkObject *aAtkObj) if (NS_SUCCEEDED(rv) && accRelated) { accessible_array[0] = nsAccessibleWrap::GetAtkObject(accRelated); relation = atk_relation_new(accessible_array, 1, - NS_STATIC_CAST(AtkRelationType, relationType[i])); + static_cast(relationType[i])); atk_relation_set_add(relation_set, relation); g_object_unref(relation); } @@ -1096,7 +1096,7 @@ nsAccessibleWrap *GetAccessibleWrap(AtkObject *aAtkObj) nsRefPtr appAccWrap = nsAccessNode::GetApplicationAccessible(); nsAccessibleWrap* tmpAppAccWrap = - NS_STATIC_CAST(nsAccessibleWrap*, appAccWrap.get()); + static_cast(appAccWrap.get()); if (tmpAppAccWrap != tmpAccWrap && !tmpAccWrap->IsValidObject()) return nsnull; @@ -1118,7 +1118,7 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent) rv = aEvent->GetEventType(&type); NS_ENSURE_SUCCESS(rv, rv); - nsAccEvent *event = NS_REINTERPRET_CAST(nsAccEvent*, aEvent); + nsAccEvent *event = reinterpret_cast(aEvent); void *eventData = event->mEventData; AtkObject *atkObj = nsAccessibleWrap::GetAtkObject(accessible); @@ -1215,7 +1215,7 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent) if (!eventData) break; - pAtkTableChange = NS_REINTERPRET_CAST(AtkTableChange *, eventData); + pAtkTableChange = reinterpret_cast(eventData); g_signal_emit_by_name(atkObj, "row_inserted", @@ -1231,7 +1231,7 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent) if (!eventData) break; - pAtkTableChange = NS_REINTERPRET_CAST(AtkTableChange *, eventData); + pAtkTableChange = reinterpret_cast(eventData); g_signal_emit_by_name(atkObj, "row_deleted", @@ -1252,7 +1252,7 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent) if (!eventData) break; - pAtkTableChange = NS_REINTERPRET_CAST(AtkTableChange *, eventData); + pAtkTableChange = reinterpret_cast(eventData); g_signal_emit_by_name(atkObj, "column_inserted", @@ -1268,7 +1268,7 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent) if (!eventData) break; - pAtkTableChange = NS_REINTERPRET_CAST(AtkTableChange *, eventData); + pAtkTableChange = reinterpret_cast(eventData); g_signal_emit_by_name(atkObj, "column_deleted", @@ -1321,7 +1321,7 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent) { MAI_LOG_DEBUG(("\n\nReceived: EVENT_WINDOW_ACTIVATED\n")); nsDocAccessibleWrap *accDocWrap = - NS_STATIC_CAST(nsDocAccessibleWrap *, accessible.get()); + static_cast(accessible.get()); accDocWrap->mActivated = PR_TRUE; guint id = g_signal_lookup ("activate", MAI_TYPE_ATK_OBJECT); g_signal_emit(atkObj, id, 0); @@ -1331,7 +1331,7 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent) { MAI_LOG_DEBUG(("\n\nReceived: EVENT_WINDOW_DEACTIVATED\n")); nsDocAccessibleWrap *accDocWrap = - NS_STATIC_CAST(nsDocAccessibleWrap *, accessible.get()); + static_cast(accessible.get()); accDocWrap->mActivated = PR_FALSE; guint id = g_signal_lookup ("deactivate", MAI_TYPE_ATK_OBJECT); g_signal_emit(atkObj, id, 0); @@ -1457,9 +1457,9 @@ nsAccessibleWrap::FireAtkPropChangedEvent(nsIAccessibleEvent *aEvent, AtkPropertyValues values = { NULL }; nsAccessibleWrap *oldAccWrap = nsnull, *newAccWrap = nsnull; - nsAccEvent *event = NS_REINTERPRET_CAST(nsAccEvent*, aEvent); + nsAccEvent *event = reinterpret_cast(aEvent); - pAtkPropChange = NS_REINTERPRET_CAST(AtkPropertyChange *, event->mEventData); + pAtkPropChange = reinterpret_cast(event->mEventData); values.property_name = sAtkPropertyNameArray[pAtkPropChange->type]; NS_ASSERTION(pAtkPropChange, "Event needs event data"); @@ -1474,12 +1474,12 @@ nsAccessibleWrap::FireAtkPropChangedEvent(nsIAccessibleEvent *aEvent, case PROP_TABLE_SUMMARY: if (pAtkPropChange->oldvalue) - oldAccWrap = NS_REINTERPRET_CAST(nsAccessibleWrap *, - pAtkPropChange->oldvalue); + oldAccWrap = reinterpret_cast + (pAtkPropChange->oldvalue); if (pAtkPropChange->newvalue) - newAccWrap = NS_REINTERPRET_CAST(nsAccessibleWrap *, - pAtkPropChange->newvalue); + newAccWrap = reinterpret_cast + (pAtkPropChange->newvalue); if (oldAccWrap && newAccWrap) { g_value_init(&values.old_value, G_TYPE_POINTER); @@ -1497,8 +1497,8 @@ nsAccessibleWrap::FireAtkPropChangedEvent(nsIAccessibleEvent *aEvent, case PROP_TABLE_ROW_DESCRIPTION: g_value_init(&values.new_value, G_TYPE_INT); g_value_set_int(&values.new_value, - *NS_REINTERPRET_CAST(gint *, - pAtkPropChange->newvalue)); + *reinterpret_cast + (pAtkPropChange->newvalue)); break; //Perhaps need more cases in the future diff --git a/accessible/src/atk/nsAppRootAccessible.cpp b/accessible/src/atk/nsAppRootAccessible.cpp index ba232b54f40f..aa186647ad26 100644 --- a/accessible/src/atk/nsAppRootAccessible.cpp +++ b/accessible/src/atk/nsAppRootAccessible.cpp @@ -569,8 +569,8 @@ nsApplicationAccessibleWrap::GetNativeInterface(void **aOutAccessible) if (!mAtkObject) { mAtkObject = - NS_REINTERPRET_CAST(AtkObject *, - g_object_new(MAI_TYPE_ATK_OBJECT, NULL)); + reinterpret_cast + (g_object_new(MAI_TYPE_ATK_OBJECT, NULL)); NS_ENSURE_TRUE(mAtkObject, NS_ERROR_OUT_OF_MEMORY); atk_object_initialize(mAtkObject, this); diff --git a/accessible/src/atk/nsMaiHyperlink.cpp b/accessible/src/atk/nsMaiHyperlink.cpp index 459b9ae0f7ee..a45f339191d8 100644 --- a/accessible/src/atk/nsMaiHyperlink.cpp +++ b/accessible/src/atk/nsMaiHyperlink.cpp @@ -150,8 +150,8 @@ MaiHyperlink::GetAtkHyperlink(void) return nsnull; mMaiAtkHyperlink = - NS_REINTERPRET_CAST(AtkHyperlink *, - g_object_new(mai_atk_hyperlink_get_type(), NULL)); + reinterpret_cast + (g_object_new(mai_atk_hyperlink_get_type(), NULL)); NS_ASSERTION(mMaiAtkHyperlink, "OUT OF MEMORY"); NS_ENSURE_TRUE(mMaiAtkHyperlink, nsnull); @@ -260,7 +260,7 @@ getEndIndexCB(AtkHyperlink *aLink) PRInt32 endIndex = -1; nsresult rv = accHyperlink->GetEndIndex(&endIndex); - return (NS_FAILED(rv)) ? -1 : NS_STATIC_CAST(gint, endIndex); + return (NS_FAILED(rv)) ? -1 : static_cast(endIndex); } gint @@ -272,7 +272,7 @@ getStartIndexCB(AtkHyperlink *aLink) PRInt32 startIndex = -1; nsresult rv = accHyperlink->GetStartIndex(&startIndex); - return (NS_FAILED(rv)) ? -1 : NS_STATIC_CAST(gint, startIndex); + return (NS_FAILED(rv)) ? -1 : static_cast(startIndex); } gboolean @@ -283,7 +283,7 @@ isValidCB(AtkHyperlink *aLink) PRBool isValid = PR_FALSE; nsresult rv = accHyperlink->IsValid(&isValid); - return (NS_FAILED(rv)) ? FALSE : NS_STATIC_CAST(gboolean, isValid); + return (NS_FAILED(rv)) ? FALSE : static_cast(isValid); } gint @@ -294,7 +294,7 @@ getAnchorCountCB(AtkHyperlink *aLink) PRInt32 count = -1; nsresult rv = accHyperlink->GetAnchors(&count); - return (NS_FAILED(rv)) ? -1 : NS_STATIC_CAST(gint, count); + return (NS_FAILED(rv)) ? -1 : static_cast(count); } // Check if aHyperlink is a valid MaiHyperlink, and return the diff --git a/accessible/src/atk/nsMaiInterfaceAction.cpp b/accessible/src/atk/nsMaiInterfaceAction.cpp index 97e77ddd7dfd..219d6a8c30d2 100644 --- a/accessible/src/atk/nsMaiInterfaceAction.cpp +++ b/accessible/src/atk/nsMaiInterfaceAction.cpp @@ -75,7 +75,7 @@ getActionCountCB(AtkAction *aAction) PRUint8 num = 0; nsresult rv = accWrap->GetNumActions(&num); - return (NS_FAILED(rv)) ? 0 : NS_STATIC_CAST(gint, num); + return (NS_FAILED(rv)) ? 0 : static_cast(num); } const gchar * diff --git a/accessible/src/atk/nsMaiInterfaceTable.cpp b/accessible/src/atk/nsMaiInterfaceTable.cpp index f6bfb33cb36a..661eb7d9e2d7 100644 --- a/accessible/src/atk/nsMaiInterfaceTable.cpp +++ b/accessible/src/atk/nsMaiInterfaceTable.cpp @@ -108,7 +108,7 @@ getIndexAtCB(AtkTable *aTable, gint aRow, gint aColumn) nsresult rv = accTable->GetIndexAt(aRow, aColumn, &index); NS_ENSURE_SUCCESS(rv, -1); - return NS_STATIC_CAST(gint, index); + return static_cast(index); } gint @@ -127,7 +127,7 @@ getColumnAtIndexCB(AtkTable *aTable, gint aIndex) nsresult rv = accTable->GetColumnAtIndex(aIndex, &col); NS_ENSURE_SUCCESS(rv, -1); - return NS_STATIC_CAST(gint, col); + return static_cast(col); } gint @@ -146,7 +146,7 @@ getRowAtIndexCB(AtkTable *aTable, gint aIndex) nsresult rv = accTable->GetRowAtIndex(aIndex, &row); NS_ENSURE_SUCCESS(rv, -1); - return NS_STATIC_CAST(gint, row); + return static_cast(row); } gint @@ -165,7 +165,7 @@ getColumnCountCB(AtkTable *aTable) nsresult rv = accTable->GetColumns(&count); NS_ENSURE_SUCCESS(rv, -1); - return NS_STATIC_CAST(gint, count); + return static_cast(count); } gint @@ -184,7 +184,7 @@ getRowCountCB(AtkTable *aTable) nsresult rv = accTable->GetRows(&count); NS_ENSURE_SUCCESS(rv, -1); - return NS_STATIC_CAST(gint, count); + return static_cast(count); } gint @@ -204,7 +204,7 @@ getColumnExtentAtCB(AtkTable *aTable, nsresult rv = accTable->GetColumnExtentAt(aRow, aColumn, &extent); NS_ENSURE_SUCCESS(rv, -1); - return NS_STATIC_CAST(gint, extent); + return static_cast(extent); } gint @@ -224,7 +224,7 @@ getRowExtentAtCB(AtkTable *aTable, nsresult rv = accTable->GetRowExtentAt(aRow, aColumn, &extent); NS_ENSURE_SUCCESS(rv, -1); - return NS_STATIC_CAST(gint, extent); + return static_cast(extent); } AtkObject* @@ -375,7 +375,7 @@ getSelectedColumnsCB(AtkTable *aTable, gint **aSelected) //copy for (PRUint32 index = 0; index < size; ++index) - atkColumns[index] = NS_STATIC_CAST(gint, columns[index]); + atkColumns[index] = static_cast(columns[index]); nsMemory::Free(columns); *aSelected = atkColumns; @@ -410,7 +410,7 @@ getSelectedRowsCB(AtkTable *aTable, gint **aSelected) //copy for (PRUint32 index = 0; index < size; ++index) - atkRows[index] = NS_STATIC_CAST(gint, rows[index]); + atkRows[index] = static_cast(rows[index]); nsMemory::Free(rows); *aSelected = atkRows; @@ -431,7 +431,7 @@ isColumnSelectedCB(AtkTable *aTable, gint aColumn) PRBool outValue; nsresult rv = accTable->IsColumnSelected(aColumn, &outValue); - return NS_FAILED(rv) ? FALSE : NS_STATIC_CAST(gboolean, outValue); + return NS_FAILED(rv) ? FALSE : static_cast(outValue); } gboolean @@ -448,7 +448,7 @@ isRowSelectedCB(AtkTable *aTable, gint aRow) PRBool outValue; nsresult rv = accTable->IsRowSelected(aRow, &outValue); - return NS_FAILED(rv) ? FALSE : NS_STATIC_CAST(gboolean, outValue); + return NS_FAILED(rv) ? FALSE : static_cast(outValue); } gboolean @@ -465,5 +465,5 @@ isCellSelectedCB(AtkTable *aTable, gint aRow, gint aColumn) PRBool outValue; nsresult rv = accTable->IsCellSelected(aRow, aColumn, &outValue); - return NS_FAILED(rv) ? FALSE : NS_STATIC_CAST(gboolean, outValue); + return NS_FAILED(rv) ? FALSE : static_cast(outValue); } diff --git a/accessible/src/atk/nsMaiInterfaceText.cpp b/accessible/src/atk/nsMaiInterfaceText.cpp index a836163be1df..18b000965e8c 100644 --- a/accessible/src/atk/nsMaiInterfaceText.cpp +++ b/accessible/src/atk/nsMaiInterfaceText.cpp @@ -79,7 +79,7 @@ void ConvertTexttoAsterisks(nsAccessibleWrap* accWrap, nsAString& aString) // convert each char to "*" when it's "password text" PRUint32 accRole; accWrap->GetRole(&accRole); - if (NS_STATIC_CAST(AtkRole, accRole) == ATK_ROLE_PASSWORD_TEXT) { + if (static_cast(accRole) == ATK_ROLE_PASSWORD_TEXT) { for (PRUint32 i = 0; i < aString.Length(); i++) aString.Replace(i, 1, NS_LITERAL_STRING("*")); } @@ -187,11 +187,11 @@ getCharacterAtOffsetCB(AtkText *aText, gint aOffset) // convert char to "*" when it's "password text" PRUint32 accRole; accWrap->GetRole(&accRole); - if (NS_STATIC_CAST(AtkRole, accRole) == ATK_ROLE_PASSWORD_TEXT) { + if (static_cast(accRole) == ATK_ROLE_PASSWORD_TEXT) { uniChar = '*'; } - return (NS_FAILED(rv)) ? 0 : NS_STATIC_CAST(gunichar, uniChar); + return (NS_FAILED(rv)) ? 0 : static_cast(uniChar); } gchar * @@ -237,7 +237,7 @@ getCaretOffsetCB(AtkText *aText) PRInt32 offset; nsresult rv = accText->GetCaretOffset(&offset); - return (NS_FAILED(rv)) ? 0 : NS_STATIC_CAST(gint, offset); + return (NS_FAILED(rv)) ? 0 : static_cast(offset); } AtkAttributeSet * @@ -358,7 +358,7 @@ getCharacterCountCB(AtkText *aText) PRInt32 count = 0; nsresult rv = accText->GetCharacterCount(&count); - return (NS_FAILED(rv)) ? 0 : NS_STATIC_CAST(gint, count); + return (NS_FAILED(rv)) ? 0 : static_cast(count); } gint @@ -383,7 +383,7 @@ getOffsetAtPointCB(AtkText *aText, geckoCoordType = nsIAccessibleCoordinateType::COORDTYPE_WINDOW_RELATIVE; accText->GetOffsetAtPoint(aX, aY, geckoCoordType, &offset); - return NS_STATIC_CAST(gint, offset); + return static_cast(offset); } gint diff --git a/accessible/src/base/nsAccessNode.cpp b/accessible/src/base/nsAccessNode.cpp index b73c378d77e3..bd58451e32cb 100755 --- a/accessible/src/base/nsAccessNode.cpp +++ b/accessible/src/base/nsAccessNode.cpp @@ -198,7 +198,7 @@ NS_IMETHODIMP nsAccessNode::Shutdown() NS_IMETHODIMP nsAccessNode::GetUniqueID(void **aUniqueID) { - *aUniqueID = NS_STATIC_CAST(void*, mDOMNode); + *aUniqueID = static_cast(mDOMNode); return NS_OK; } @@ -659,7 +659,7 @@ nsAccessNode::GetDocAccessibleFor(nsIWeakReference *aPresShell) { nsIAccessibleDocument *docAccessible = nsnull; nsCOMPtr accessNode; - gGlobalDocAccessibleCache.Get(NS_STATIC_CAST(void*, aPresShell), getter_AddRefs(accessNode)); + gGlobalDocAccessibleCache.Get(static_cast(aPresShell), getter_AddRefs(accessNode)); if (accessNode) { CallQueryInterface(accessNode, &docAccessible); } diff --git a/accessible/src/base/nsAccessibilityService.cpp b/accessible/src/base/nsAccessibilityService.cpp index 7c40189cefb5..56c02b42e2ab 100644 --- a/accessible/src/base/nsAccessibilityService.cpp +++ b/accessible/src/base/nsAccessibilityService.cpp @@ -125,7 +125,7 @@ nsAccessibilityService::nsAccessibilityService() observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_FALSE); nsCOMPtr progress(do_GetService(NS_DOCUMENTLOADER_SERVICE_CONTRACTID)); if (progress) { - progress->AddProgressListener(NS_STATIC_CAST(nsIWebProgressListener*,this), + progress->AddProgressListener(static_cast(this), nsIWebProgress::NOTIFY_STATE_DOCUMENT | nsIWebProgress::NOTIFY_LOCATION); } @@ -155,7 +155,7 @@ nsAccessibilityService::Observe(nsISupports *aSubject, const char *aTopic, } nsCOMPtr progress(do_GetService(NS_DOCUMENTLOADER_SERVICE_CONTRACTID)); if (progress) { - progress->RemoveProgressListener(NS_STATIC_CAST(nsIWebProgressListener*,this)); + progress->RemoveProgressListener(static_cast(this)); } nsAccessNodeWrap::ShutdownAccessibility(); } @@ -279,7 +279,7 @@ nsresult nsAccessibilityService::GetInfo(nsISupports* aFrame, nsIFrame** aRealFrame, nsIWeakReference** aShell, nsIDOMNode** aNode) { NS_ASSERTION(aFrame,"Error -- 1st argument (aFrame) is null!!"); - *aRealFrame = NS_STATIC_CAST(nsIFrame*, aFrame); + *aRealFrame = static_cast(aFrame); nsCOMPtr content = (*aRealFrame)->GetContent(); nsCOMPtr node(do_QueryInterface(content)); if (!content || !node) @@ -651,7 +651,7 @@ nsAccessibilityService::CreateHTMLObjectFrameAccessible(nsObjectFrame *aFrame, nsCOMPtr node; nsCOMPtr weakShell; nsIFrame *frame; - GetInfo(NS_STATIC_CAST(nsIFrame*, aFrame), &frame, getter_AddRefs(weakShell), getter_AddRefs(node)); + GetInfo(static_cast(aFrame), &frame, getter_AddRefs(weakShell), getter_AddRefs(node)); *aAccessible = nsnull; if (!frame || frame->GetRect().IsEmpty()) { @@ -763,7 +763,7 @@ nsAccessibilityService::CreateHTMLTableHeadAccessible(nsIDOMNode *aDOMNode, nsIA NS_ENSURE_TRUE(accTableHead, NS_ERROR_OUT_OF_MEMORY); - *_retval = NS_STATIC_CAST(nsIAccessible *, accTableHead); + *_retval = static_cast(accTableHead); NS_IF_ADDREF(*_retval); return rv; @@ -922,7 +922,7 @@ NS_IMETHODIMP nsAccessibilityService::GetCachedAccessNode(nsIDOMNode *aNode, return NS_ERROR_FAILURE; } - return accessibleDoc->GetCachedAccessNode(NS_STATIC_CAST(void*, aNode), aAccessNode); + return accessibleDoc->GetCachedAccessNode(static_cast(aNode), aAccessNode); } NS_IMETHODIMP @@ -1724,7 +1724,7 @@ NS_IMETHODIMP nsAccessibilityService::AddNativeRootAccessible(void * aAtkAccessi nsNativeRootAccessibleWrap* rootAccWrap = new nsNativeRootAccessibleWrap((AtkObject*)aAtkAccessible); - *aRootAccessible = NS_STATIC_CAST(nsIAccessible*, rootAccWrap); + *aRootAccessible = static_cast(rootAccWrap); NS_ADDREF(*aRootAccessible); nsRefPtr appRoot = diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp index 906392b54967..033383570eeb 100644 --- a/accessible/src/base/nsAccessible.cpp +++ b/accessible/src/base/nsAccessible.cpp @@ -192,13 +192,13 @@ nsresult nsAccessible::QueryInterface(REFNSIID aIID, void** aInstancePtr) *aInstancePtr = nsnull; if (aIID.Equals(NS_GET_IID(nsIAccessible))) { - *aInstancePtr = NS_STATIC_CAST(nsIAccessible*, this); + *aInstancePtr = static_cast(this); NS_ADDREF_THIS(); return NS_OK; } if(aIID.Equals(NS_GET_IID(nsPIAccessible))) { - *aInstancePtr = NS_STATIC_CAST(nsPIAccessible*, this); + *aInstancePtr = static_cast(this); NS_ADDREF_THIS(); return NS_OK; } @@ -220,7 +220,7 @@ nsresult nsAccessible::QueryInterface(REFNSIID aIID, void** aInstancePtr) nsAccessibilityAtoms::multiselectable, strings, eCaseMatters) == nsIContent::ATTR_VALUE_NO_MATCH) { - *aInstancePtr = NS_STATIC_CAST(nsIAccessibleSelectable*, this); + *aInstancePtr = static_cast(this); NS_ADDREF_THIS(); } } @@ -228,7 +228,7 @@ nsresult nsAccessible::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (aIID.Equals(NS_GET_IID(nsIAccessibleValue))) { if (mRoleMapEntry && mRoleMapEntry->valueRule != eNoValue) { - *aInstancePtr = NS_STATIC_CAST(nsIAccessibleValue*, this); + *aInstancePtr = static_cast(this); NS_ADDREF_THIS(); } } @@ -237,7 +237,7 @@ nsresult nsAccessible::QueryInterface(REFNSIID aIID, void** aInstancePtr) nsCOMPtr parent(GetParent()); nsCOMPtr hyperTextParent(do_QueryInterface(parent)); if (hyperTextParent) { - *aInstancePtr = NS_STATIC_CAST(nsIAccessibleHyperLink*, this); + *aInstancePtr = static_cast(this); NS_ADDREF_THIS(); return NS_OK; } @@ -255,7 +255,7 @@ nsAccessible::nsAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell): nsAcces { nsCOMPtr shell(do_QueryReferent(aShell)); printf(">>> %p Created Acc - DOM: %p PS: %p", - (void*)NS_STATIC_CAST(nsIAccessible*, this), (void*)aNode, + (void*)static_cast(this), (void*)aNode, (void*)shell.get()); nsCOMPtr content = do_QueryInterface(aNode); if (content) { @@ -2810,7 +2810,7 @@ void nsAccessible::DoCommandCallback(nsITimer *aTimer, void *aClosure) NS_ASSERTION(gDoCommandTimer, "How did we get here if there was no gDoCommandTimer?"); NS_RELEASE(gDoCommandTimer); - nsIContent *content = NS_REINTERPRET_CAST(nsIContent*, aClosure); + nsIContent *content = reinterpret_cast(aClosure); nsCOMPtr xulElement(do_QueryInterface(content)); if (xulElement) { xulElement->Click(); diff --git a/accessible/src/base/nsAccessible.h b/accessible/src/base/nsAccessible.h index 28c85a65ecea..7a2aec7a618a 100644 --- a/accessible/src/base/nsAccessible.h +++ b/accessible/src/base/nsAccessible.h @@ -68,7 +68,7 @@ class nsIAtom; class nsIView; // When mNextSibling is set to this, it indicates there ar eno more siblings -#define DEAD_END_ACCESSIBLE NS_STATIC_CAST(nsIAccessible*, (void*)1) +#define DEAD_END_ACCESSIBLE static_cast((void*)1) // Saves a data member -- if child count equals this value we haven't // cached children or child count yet diff --git a/accessible/src/base/nsApplicationAccessible.cpp b/accessible/src/base/nsApplicationAccessible.cpp index b3338218b0d0..7c1a5d1f5822 100755 --- a/accessible/src/base/nsApplicationAccessible.cpp +++ b/accessible/src/base/nsApplicationAccessible.cpp @@ -143,7 +143,7 @@ nsApplicationAccessible::GetChildAt(PRInt32 aChildNum, nsIAccessible **aChild) NS_ENSURE_SUCCESS(rv, rv); } - if (aChildNum >= NS_STATIC_CAST(PRInt32, count) || count == 0) + if (aChildNum >= static_cast(count) || count == 0) return NS_ERROR_INVALID_ARG; if (aChildNum < 0) @@ -213,7 +213,7 @@ nsApplicationAccessible::CacheChildren() PRUint32 count = 0; mChildren->GetLength(&count); - mAccChildCount = NS_STATIC_CAST(PRInt32, count); + mAccChildCount = static_cast(count); } } diff --git a/accessible/src/base/nsDocAccessible.cpp b/accessible/src/base/nsDocAccessible.cpp index 16cb3767f0e5..fbb0893ac5d5 100644 --- a/accessible/src/base/nsDocAccessible.cpp +++ b/accessible/src/base/nsDocAccessible.cpp @@ -516,7 +516,7 @@ NS_IMETHODIMP nsDocAccessible::Init() NS_IMETHODIMP nsDocAccessible::Destroy() { if (mWeakShell) { - gGlobalDocAccessibleCache.Remove(NS_STATIC_CAST(void*, mWeakShell)); + gGlobalDocAccessibleCache.Remove(static_cast(mWeakShell)); } return Shutdown(); } @@ -822,7 +822,7 @@ NS_IMETHODIMP nsDocAccessible::FireDocLoadEvents(PRUint32 aEventType) void nsDocAccessible::ScrollTimerCallback(nsITimer *aTimer, void *aClosure) { - nsDocAccessible *docAcc = NS_REINTERPRET_CAST(nsDocAccessible*, aClosure); + nsDocAccessible *docAcc = reinterpret_cast(aClosure); if (docAcc && docAcc->mScrollPositionChangedTicks && ++docAcc->mScrollPositionChangedTicks > 2) { @@ -1235,7 +1235,7 @@ nsDocAccessible::FireDelayedAccessibleEvent(nsIAccessibleEvent *aEvent, // This is be the first delayed event in queue, start timer // so that event gets fired via FlushEventsCallback mFireEventTimer->InitWithFuncCallback(FlushEventsCallback, - NS_STATIC_CAST(nsPIAccessibleDocument*, this), + static_cast(this), 0, nsITimer::TYPE_ONE_SHOT); } @@ -1294,7 +1294,7 @@ NS_IMETHODIMP nsDocAccessible::FlushPendingEvents() void nsDocAccessible::FlushEventsCallback(nsITimer *aTimer, void *aClosure) { - nsPIAccessibleDocument *accessibleDoc = NS_STATIC_CAST(nsPIAccessibleDocument*, aClosure); + nsPIAccessibleDocument *accessibleDoc = static_cast(aClosure); NS_ASSERTION(accessibleDoc, "How did we get here without an accessible document?"); accessibleDoc->FlushPendingEvents(); } @@ -1315,7 +1315,7 @@ void nsDocAccessible::RefreshNodes(nsIDOMNode *aStartNode, PRUint32 aChangeEvent // children when they override Shutdown() // Don't shutdown our doc object! - if (accessNode != NS_STATIC_CAST(nsIAccessNode*, this)) { + if (accessNode != static_cast(this)) { nsCOMPtr accessible(do_QueryInterface(accessNode)); if (accessible) { @@ -1545,7 +1545,7 @@ void nsDocAccessible::DocLoadCallback(nsITimer *aTimer, void *aClosure) // which is important because we only fire doc loaded events for focused documents. nsDocAccessible *docAcc = - NS_REINTERPRET_CAST(nsDocAccessible*, aClosure); + reinterpret_cast(aClosure); if (!docAcc) { return; } diff --git a/accessible/src/base/nsRootAccessible.cpp b/accessible/src/base/nsRootAccessible.cpp index 75217c4837e5..0d145da988a3 100644 --- a/accessible/src/base/nsRootAccessible.cpp +++ b/accessible/src/base/nsRootAccessible.cpp @@ -94,7 +94,7 @@ NS_IMPL_QUERY_HEAD(nsRootAccessible) NS_IMPL_QUERY_BODY(nsIDOMEventListener) if (aIID.Equals(NS_GET_IID(nsRootAccessible))) - foundInterface = NS_REINTERPRET_CAST(nsISupports*, this); + foundInterface = reinterpret_cast(this); else NS_IMPL_QUERY_TAIL_INHERITING(nsDocAccessible) @@ -866,7 +866,7 @@ void nsRootAccessible::GetTargetNode(nsIDOMEvent *aEvent, nsIDOMNode **aTargetNo void nsRootAccessible::FireFocusCallback(nsITimer *aTimer, void *aClosure) { - nsRootAccessible *rootAccessible = NS_STATIC_CAST(nsRootAccessible*, aClosure); + nsRootAccessible *rootAccessible = static_cast(aClosure); NS_ASSERTION(rootAccessible, "How did we get here without a root accessible?"); rootAccessible->FireCurrentFocusEvent(); } diff --git a/accessible/src/html/nsHTMLSelectAccessible.cpp b/accessible/src/html/nsHTMLSelectAccessible.cpp index 2912687b579a..de8b0615ca47 100644 --- a/accessible/src/html/nsHTMLSelectAccessible.cpp +++ b/accessible/src/html/nsHTMLSelectAccessible.cpp @@ -132,7 +132,7 @@ void nsHTMLSelectableAccessible::iterator::AddAccessibleIfSelected(nsIAccessibil } if (tempAccess) - aSelectedAccessibles->AppendElement(NS_STATIC_CAST(nsISupports*, tempAccess), PR_FALSE); + aSelectedAccessibles->AppendElement(static_cast(tempAccess), PR_FALSE); } PRBool nsHTMLSelectableAccessible::iterator::GetAccessibleIfSelected(PRInt32 aIndex, @@ -565,7 +565,7 @@ nsHTMLSelectOptionAccessible::GetAttributesInternal(nsIPersistentProperties *aAt } nsAccUtils::SetAccGroupAttrs(aAttributes, level, posInSet, - NS_STATIC_CAST(PRInt32, setSize)); + static_cast(setSize)); return NS_OK; } @@ -1170,7 +1170,7 @@ nsHTMLTextFieldAccessible(aDOMNode, aShell) NS_IMETHODIMP nsHTMLComboboxTextFieldAccessible::GetUniqueID(void **aUniqueID) { // Since mDOMNode is same as for our parent, use |this| pointer as the unique Id - *aUniqueID = NS_STATIC_CAST(void*, this); + *aUniqueID = static_cast(this); return NS_OK; } @@ -1290,7 +1290,7 @@ NS_IMETHODIMP nsHTMLComboboxButtonAccessible::GetActionName(PRUint8 aIndex, nsAS NS_IMETHODIMP nsHTMLComboboxButtonAccessible::GetUniqueID(void **aUniqueID) { // Since mDOMNode is same for all tree item, use |this| pointer as the unique Id - *aUniqueID = NS_STATIC_CAST(void*, this); + *aUniqueID = static_cast(this); return NS_OK; } @@ -1422,7 +1422,7 @@ NS_IMETHODIMP nsHTMLComboboxListAccessible::GetParent(nsIAccessible **aParent) NS_IMETHODIMP nsHTMLComboboxListAccessible::GetUniqueID(void **aUniqueID) { // Since mDOMNode is same for all tree item, use |this| pointer as the unique Id - *aUniqueID = NS_STATIC_CAST(void*, this); + *aUniqueID = static_cast(this); return NS_OK; } diff --git a/accessible/src/html/nsHTMLTextAccessible.cpp b/accessible/src/html/nsHTMLTextAccessible.cpp index 0c84d07def54..d865c73fe76b 100644 --- a/accessible/src/html/nsHTMLTextAccessible.cpp +++ b/accessible/src/html/nsHTMLTextAccessible.cpp @@ -167,7 +167,7 @@ nsHTMLBRAccessible::GetState(PRUint32 *aState, PRUint32 *aExtraState) NS_IMETHODIMP nsHTMLBRAccessible::GetName(nsAString& aName) { - aName = NS_STATIC_CAST(PRUnichar, '\n'); // Newline char + aName = static_cast('\n'); // Newline char return NS_OK; } @@ -313,7 +313,7 @@ NS_IMETHODIMP nsHTMLListBulletAccessible::GetUniqueID(void **aUniqueID) { // Since mDOMNode is same as for list item, use |this| pointer as the unique Id - *aUniqueID = NS_STATIC_CAST(void*, this); + *aUniqueID = static_cast(this); return NS_OK; } diff --git a/accessible/src/html/nsHyperTextAccessible.cpp b/accessible/src/html/nsHyperTextAccessible.cpp index c9a8aed27cdb..11a826f3da19 100644 --- a/accessible/src/html/nsHyperTextAccessible.cpp +++ b/accessible/src/html/nsHyperTextAccessible.cpp @@ -81,7 +81,7 @@ nsresult nsHyperTextAccessible::QueryInterface(REFNSIID aIID, void** aInstancePt PRInt32 numChildren; GetChildCount(&numChildren); if (numChildren > 0) { - *aInstancePtr = NS_STATIC_CAST(nsIAccessibleText*, this); + *aInstancePtr = static_cast(this); NS_ADDREF_THIS(); return NS_OK; } @@ -91,7 +91,7 @@ nsresult nsHyperTextAccessible::QueryInterface(REFNSIID aIID, void** aInstancePt if (aIID.Equals(NS_GET_IID(nsIAccessibleHyperText))) { if (IsHyperText()) { // If |this| contains text and embedded objects - *aInstancePtr = NS_STATIC_CAST(nsIAccessibleHyperText*, this); + *aInstancePtr = static_cast(this); NS_ADDREF_THIS(); return NS_OK; } @@ -103,7 +103,7 @@ nsresult nsHyperTextAccessible::QueryInterface(REFNSIID aIID, void** aInstancePt PRUint32 state, extState; GetState(&state, &extState); if (extState & nsIAccessibleStates::EXT_STATE_EDITABLE) { - *aInstancePtr = NS_STATIC_CAST(nsIAccessibleEditableText*, this); + *aInstancePtr = static_cast(this); NS_ADDREF_THIS(); return NS_OK; } diff --git a/accessible/src/mac/mozAccessible.mm b/accessible/src/mac/mozAccessible.mm index 106c2b1e64e7..83bcf1600f10 100644 --- a/accessible/src/mac/mozAccessible.mm +++ b/accessible/src/mac/mozAccessible.mm @@ -328,7 +328,7 @@ GetNativeFromGeckoAccessible(nsIAccessible *anAccessible) // // get the native root accessible, and tell it to return its first parent unignored accessible. nsRefPtr root(mGeckoAccessible->GetRootAccessible()); - id nativeParent = GetNativeFromGeckoAccessible(NS_STATIC_CAST(nsIAccessible*, root)); + id nativeParent = GetNativeFromGeckoAccessible(static_cast(root)); NSAssert1 (nativeParent, @"!!! we can't find a parent for %@", self); return GetClosestInterestingAccessible(nativeParent); @@ -510,7 +510,7 @@ GetNativeFromGeckoAccessible(nsIAccessible *anAccessible) - (NSWindow*)window { - nsAccessibleWrap *accWrap = NS_STATIC_CAST (nsAccessibleWrap*, mGeckoAccessible); + nsAccessibleWrap *accWrap = static_cast(mGeckoAccessible); NSWindow *nativeWindow = nil; accWrap->GetNativeWindow ((void**)&nativeWindow); diff --git a/accessible/src/mac/mozDocAccessible.mm b/accessible/src/mac/mozDocAccessible.mm index fecebf56e420..bdd3b3da48a3 100644 --- a/accessible/src/mac/mozDocAccessible.mm +++ b/accessible/src/mac/mozDocAccessible.mm @@ -44,7 +44,7 @@ static id getNativeViewFromRootAccessible (nsAccessible *accessible) { - nsRootAccessibleWrap *root = NS_STATIC_CAST (nsRootAccessibleWrap*, accessible); + nsRootAccessibleWrap *root = static_cast(accessible); id nativeView = nil; root->GetNativeWidget ((void**)&nativeView); return nativeView; diff --git a/accessible/src/mac/nsAccessibleWrap.h b/accessible/src/mac/nsAccessibleWrap.h index f9eac9af8cd7..1f81f0b9f3eb 100644 --- a/accessible/src/mac/nsAccessibleWrap.h +++ b/accessible/src/mac/nsAccessibleWrap.h @@ -117,10 +117,10 @@ class nsAccessibleWrap : public nsAccessible nsCOMPtr curParent = GetParent(); while (curParent) { - nsAccessibleWrap *ancestorWrap = NS_STATIC_CAST(nsAccessibleWrap*, (nsIAccessible*)curParent.get()); + nsAccessibleWrap *ancestorWrap = static_cast((nsIAccessible*)curParent.get()); if (ancestorWrap->IsFlat()) return PR_TRUE; - curParent = NS_STATIC_CAST(nsAccessibleWrap*, (nsIAccessible*)curParent.get())->GetParent(); + curParent = static_cast((nsIAccessible*)curParent.get())->GetParent(); } // no parent was flat return PR_FALSE; diff --git a/accessible/src/mac/nsAccessibleWrap.mm b/accessible/src/mac/nsAccessibleWrap.mm index 855db24d1108..76ed4fb5b180 100644 --- a/accessible/src/mac/nsAccessibleWrap.mm +++ b/accessible/src/mac/nsAccessibleWrap.mm @@ -214,7 +214,7 @@ nsAccessibleWrap::GetUnignoredChildCount(PRBool aDeepCount) nsCOMPtr curAcc; while (NextChild(curAcc)) { - nsAccessibleWrap *childWrap = NS_STATIC_CAST(nsAccessibleWrap*, (nsIAccessible*)curAcc.get()); + nsAccessibleWrap *childWrap = static_cast((nsIAccessible*)curAcc.get()); // if the current child is not ignored, count it. if (!childWrap->IsIgnored()) @@ -256,7 +256,7 @@ nsAccessibleWrap::GetUnignoredChildren(nsTArray > &aC return; while (NextChild(curAcc)) { - nsAccessibleWrap *childWrap = NS_STATIC_CAST(nsAccessibleWrap*, (nsIAccessible*)curAcc.get()); + nsAccessibleWrap *childWrap = static_cast((nsIAccessible*)curAcc.get()); if (childWrap->IsIgnored()) { // element is ignored, so try adding its children as substitutes, if it has any. if (!childWrap->IsFlat()) { @@ -277,7 +277,7 @@ already_AddRefed nsAccessibleWrap::GetUnignoredParent() { nsCOMPtr parent(GetParent()); - nsAccessibleWrap *parentWrap = NS_STATIC_CAST(nsAccessibleWrap*, (nsIAccessible*)parent.get()); + nsAccessibleWrap *parentWrap = static_cast((nsIAccessible*)parent.get()); if (!parentWrap) return nsnull; diff --git a/accessible/src/msaa/CAccessibleAction.cpp b/accessible/src/msaa/CAccessibleAction.cpp index 20c296386f09..f3bc2da0c28a 100755 --- a/accessible/src/msaa/CAccessibleAction.cpp +++ b/accessible/src/msaa/CAccessibleAction.cpp @@ -56,8 +56,8 @@ CAccessibleAction::QueryInterface(REFIID iid, void** ppv) *ppv = NULL; if (IID_IAccessibleAction == iid) { - *ppv = NS_STATIC_CAST(IAccessibleAction*, this); - (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef(); + *ppv = static_cast(this); + (reinterpret_cast(*ppv))->AddRef(); return S_OK; } @@ -89,7 +89,7 @@ CAccessibleAction::doAction(long aActionIndex) if (!acc) return E_FAIL; - PRUint8 index = NS_STATIC_CAST(PRUint8, aActionIndex); + PRUint8 index = static_cast(aActionIndex); if (NS_SUCCEEDED(acc->DoAction(index))) return S_OK; return E_FAIL; @@ -105,7 +105,7 @@ CAccessibleAction::get_description(long aActionIndex, BSTR *aDescription) return E_FAIL; nsAutoString description; - PRUint8 index = NS_STATIC_CAST(PRUint8, aActionIndex); + PRUint8 index = static_cast(aActionIndex); if (NS_FAILED(acc->GetActionDescription(index, description))) return E_FAIL; @@ -130,7 +130,7 @@ CAccessibleAction::get_keyBinding(long aActionIndex, long aNumMaxBinding, return E_FAIL; nsCOMPtr keys; - PRUint8 index = NS_STATIC_CAST(PRUint8, aActionIndex); + PRUint8 index = static_cast(aActionIndex); nsresult rv = acc->GetKeyBindings(index, getter_AddRefs(keys)); if (NS_FAILED(rv)) return E_FAIL; @@ -138,9 +138,9 @@ CAccessibleAction::get_keyBinding(long aActionIndex, long aNumMaxBinding, PRUint32 length = 0; keys->GetLength(&length); - PRBool aUseNumMaxBinding = length > NS_STATIC_CAST(PRUint32, aNumMaxBinding); + PRBool aUseNumMaxBinding = length > static_cast(aNumMaxBinding); - PRUint32 maxBinding = NS_STATIC_CAST(PRUint32, aNumMaxBinding); + PRUint32 maxBinding = static_cast(aNumMaxBinding); PRUint32 numBinding = length > maxBinding ? maxBinding : length; *aNumBinding = numBinding; @@ -171,7 +171,7 @@ CAccessibleAction::get_name(long aActionIndex, BSTR *aName) return E_FAIL; nsAutoString name; - PRUint8 index = NS_STATIC_CAST(PRUint8, aActionIndex); + PRUint8 index = static_cast(aActionIndex); if (NS_FAILED(acc->GetActionName(index, name))) return E_FAIL; diff --git a/accessible/src/msaa/CAccessibleComponent.cpp b/accessible/src/msaa/CAccessibleComponent.cpp index a2943460c01d..3b7b9322a948 100755 --- a/accessible/src/msaa/CAccessibleComponent.cpp +++ b/accessible/src/msaa/CAccessibleComponent.cpp @@ -67,8 +67,8 @@ CAccessibleComponent::QueryInterface(REFIID iid, void** ppv) *ppv = NULL; if (IID_IAccessibleComponent == iid) { - *ppv = NS_STATIC_CAST(IAccessibleComponent*, this); - (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef(); + *ppv = static_cast(this); + (reinterpret_cast(*ppv))->AddRef(); return S_OK; } diff --git a/accessible/src/msaa/CAccessibleEditableText.cpp b/accessible/src/msaa/CAccessibleEditableText.cpp index b69873306a29..cb08b230ce68 100755 --- a/accessible/src/msaa/CAccessibleEditableText.cpp +++ b/accessible/src/msaa/CAccessibleEditableText.cpp @@ -64,8 +64,8 @@ CAccessibleEditableText::QueryInterface(REFIID iid, void** ppv) nsCOMPtr editTextAcc(do_QueryInterface(this)); if (!editTextAcc) return E_NOINTERFACE; - *ppv = NS_STATIC_CAST(IAccessibleEditableText*, this); - (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef(); + *ppv = static_cast(this); + (reinterpret_cast(*ppv))->AddRef(); return S_OK; } diff --git a/accessible/src/msaa/CAccessibleHyperlink.cpp b/accessible/src/msaa/CAccessibleHyperlink.cpp index 49971739b585..1cda3df1d815 100755 --- a/accessible/src/msaa/CAccessibleHyperlink.cpp +++ b/accessible/src/msaa/CAccessibleHyperlink.cpp @@ -65,8 +65,8 @@ CAccessibleHyperlink::QueryInterface(REFIID iid, void** ppv) if (!acc) return E_NOINTERFACE; - *ppv = NS_STATIC_CAST(IAccessibleHyperlink*, this); - (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef(); + *ppv = static_cast(this); + (reinterpret_cast(*ppv))->AddRef(); return S_OK; } @@ -99,7 +99,7 @@ CAccessibleHyperlink::get_anchor(long aIndex, VARIANT *aAnchor) if (NS_FAILED(rv)) return E_FAIL; - IUnknown *unknownPtr = NS_STATIC_CAST(IUnknown*, instancePtr); + IUnknown *unknownPtr = static_cast(instancePtr); aAnchor->ppunkVal = &unknownPtr; aAnchor->vt = VT_UNKNOWN; diff --git a/accessible/src/msaa/CAccessibleHypertext.cpp b/accessible/src/msaa/CAccessibleHypertext.cpp index 1870812d1907..1a3ed6a6a58f 100755 --- a/accessible/src/msaa/CAccessibleHypertext.cpp +++ b/accessible/src/msaa/CAccessibleHypertext.cpp @@ -59,8 +59,8 @@ CAccessibleHypertext::QueryInterface(REFIID iid, void** ppv) if (!hyperAcc) return E_NOINTERFACE; - *ppv = NS_STATIC_CAST(IAccessibleHypertext*, this); - (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef(); + *ppv = static_cast(this); + (reinterpret_cast(*ppv))->AddRef(); return S_OK; } @@ -107,7 +107,7 @@ CAccessibleHypertext::get_hyperlink(long aIndex, void *instancePtr = NULL; nsresult rv = winAccessNode->QueryNativeInterface(IID_IAccessibleHyperlink, &instancePtr); - *aHyperlink = NS_STATIC_CAST(IAccessibleHyperlink*, instancePtr); + *aHyperlink = static_cast(instancePtr); return NS_FAILED(rv) ? E_FAIL : S_OK; } diff --git a/accessible/src/msaa/CAccessibleImage.cpp b/accessible/src/msaa/CAccessibleImage.cpp index 9ad444837b01..70e241fc50d0 100755 --- a/accessible/src/msaa/CAccessibleImage.cpp +++ b/accessible/src/msaa/CAccessibleImage.cpp @@ -60,8 +60,8 @@ CAccessibleImage::QueryInterface(REFIID iid, void** ppv) if (!imageAcc) return E_FAIL; - *ppv = NS_STATIC_CAST(IAccessibleImage*, this); - (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef(); + *ppv = static_cast(this); + (reinterpret_cast(*ppv))->AddRef(); return S_OK; } diff --git a/accessible/src/msaa/CAccessibleTable.cpp b/accessible/src/msaa/CAccessibleTable.cpp index 842161cd8f93..a1889e339c15 100755 --- a/accessible/src/msaa/CAccessibleTable.cpp +++ b/accessible/src/msaa/CAccessibleTable.cpp @@ -61,8 +61,8 @@ CAccessibleTable::QueryInterface(REFIID iid, void** ppv) *ppv = NULL; if (IID_IAccessibleTable == iid) { - *ppv = NS_STATIC_CAST(IAccessibleTable*, this); - (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef(); + *ppv = static_cast(this); + (reinterpret_cast(*ppv))->AddRef(); return S_OK; } @@ -95,7 +95,7 @@ CAccessibleTable::get_accessibleAt(long aRow, long aColumn, if (NS_FAILED(rv)) return E_FAIL; - *aAccessible = NS_STATIC_CAST(IUnknown*, instancePtr); + *aAccessible = static_cast(instancePtr); return S_OK; } @@ -122,7 +122,7 @@ CAccessibleTable::get_caption(IUnknown **aAccessible) if (NS_FAILED(rv)) return E_FAIL; - *aAccessible = NS_STATIC_CAST(IUnknown*, instancePtr); + *aAccessible = static_cast(instancePtr); return S_OK; } @@ -208,7 +208,7 @@ CAccessibleTable::get_columnHeader(IAccessibleTable **aAccessibleTable, if (NS_FAILED(rv)) return E_FAIL; - *aAccessibleTable = NS_STATIC_CAST(IAccessibleTable*, instancePtr); + *aAccessibleTable = static_cast(instancePtr); return S_OK; } @@ -348,7 +348,7 @@ CAccessibleTable::get_rowHeader(IAccessibleTable **aAccessibleTable, if (NS_FAILED(rv)) return E_FAIL; - *aAccessibleTable = NS_STATIC_CAST(IAccessibleTable*, instancePtr); + *aAccessibleTable = static_cast(instancePtr); return S_OK; } diff --git a/accessible/src/msaa/CAccessibleText.cpp b/accessible/src/msaa/CAccessibleText.cpp index ece978cf965d..92acbc450e73 100755 --- a/accessible/src/msaa/CAccessibleText.cpp +++ b/accessible/src/msaa/CAccessibleText.cpp @@ -70,8 +70,8 @@ CAccessibleText::QueryInterface(REFIID iid, void** ppv) if (!textAcc) { return E_NOINTERFACE; } - *ppv = NS_STATIC_CAST(IAccessibleText*, this); - (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef(); + *ppv = static_cast(this); + (reinterpret_cast(*ppv))->AddRef(); return S_OK; } @@ -111,7 +111,7 @@ CAccessibleText::get_attributes(long aOffset, long *aStartOffset, if (!instancePtr) return E_FAIL; - IAccessible2 *pAccessible2 = NS_STATIC_CAST(IAccessible2*, *instancePtr); + IAccessible2 *pAccessible2 = static_cast(*instancePtr); HRESULT hr = pAccessible2->get_attributes(aTextAttributes); pAccessible2->Release(); @@ -378,7 +378,7 @@ CAccessibleText::scrollSubstringTo(long aStartIndex, long aEndIndex, if (!instancePtr) return E_FAIL; - IAccessible2 *pAccessible2 = NS_STATIC_CAST(IAccessible2*, *instancePtr); + IAccessible2 *pAccessible2 = static_cast(*instancePtr); HRESULT hr = pAccessible2->scrollTo(aScrollType); pAccessible2->Release(); @@ -410,7 +410,7 @@ CAccessibleText::scrollSubstringToPoint(long aStartIndex, long aEndIndex, if (!instancePtr) return E_FAIL; - IAccessible2 *pAccessible2 = NS_STATIC_CAST(IAccessible2*, *instancePtr); + IAccessible2 *pAccessible2 = static_cast(*instancePtr); HRESULT hr = pAccessible2->scrollToPoint(aCoordinateType, aX, aY); pAccessible2->Release(); diff --git a/accessible/src/msaa/CAccessibleValue.cpp b/accessible/src/msaa/CAccessibleValue.cpp index 883b5c0d526c..71691d1ee7e6 100755 --- a/accessible/src/msaa/CAccessibleValue.cpp +++ b/accessible/src/msaa/CAccessibleValue.cpp @@ -58,8 +58,8 @@ CAccessibleValue::QueryInterface(REFIID iid, void** ppv) if (!valueAcc) return E_NOINTERFACE; - *ppv = NS_STATIC_CAST(IAccessibleValue*, this); - (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef(); + *ppv = static_cast(this); + (reinterpret_cast(*ppv))->AddRef(); return S_OK; } diff --git a/accessible/src/msaa/nsAccessNodeWrap.cpp b/accessible/src/msaa/nsAccessNodeWrap.cpp index 02c6a1e015de..0e96cc2655a0 100644 --- a/accessible/src/msaa/nsAccessNodeWrap.cpp +++ b/accessible/src/msaa/nsAccessNodeWrap.cpp @@ -117,12 +117,12 @@ STDMETHODIMP nsAccessNodeWrap::QueryInterface(REFIID iid, void** ppv) *ppv = nsnull; if (IID_IUnknown == iid || IID_ISimpleDOMNode == iid) - *ppv = NS_STATIC_CAST(ISimpleDOMNode*, this); + *ppv = static_cast(this); if (nsnull == *ppv) return E_NOINTERFACE; //iid not supported. - (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef(); + (reinterpret_cast(*ppv))->AddRef(); return S_OK; } @@ -148,7 +148,7 @@ STDMETHODIMP nsAccessNodeWrap::get_nodeInfo( PRUint16 nodeType = 0; mDOMNode->GetNodeType(&nodeType); - *aNodeType=NS_STATIC_CAST(unsigned short, nodeType); + *aNodeType=static_cast(nodeType); if (*aNodeType != NODETYPE_TEXT) { nsAutoString nodeName; @@ -160,7 +160,7 @@ STDMETHODIMP nsAccessNodeWrap::get_nodeInfo( mDOMNode->GetNodeValue(nodeValue); *aNodeValue = ::SysAllocString(nodeValue.get()); - *aNameSpaceID = content ? NS_STATIC_CAST(short, content->GetNameSpaceID()) : 0; + *aNameSpaceID = content ? static_cast(content->GetNameSpaceID()) : 0; // This is a unique ID for every content node. The 3rd party // accessibility application can compare this to the childID we @@ -175,7 +175,7 @@ STDMETHODIMP nsAccessNodeWrap::get_nodeInfo( nsCOMPtr nodeList; mDOMNode->GetChildNodes(getter_AddRefs(nodeList)); if (nodeList && NS_OK == nodeList->GetLength(&numChildren)) - *aNumChildren = NS_STATIC_CAST(unsigned int, numChildren); + *aNumChildren = static_cast(numChildren); return S_OK; } @@ -199,7 +199,7 @@ STDMETHODIMP nsAccessNodeWrap::get_attributes( if (numAttribs > aMaxAttribs) numAttribs = aMaxAttribs; - *aNumAttribs = NS_STATIC_CAST(unsigned short, numAttribs); + *aNumAttribs = static_cast(numAttribs); for (PRUint32 index = 0; index < numAttribs; index++) { aNameSpaceIDs[index] = 0; aAttribValues[index] = aAttribNames[index] = nsnull; @@ -207,7 +207,7 @@ STDMETHODIMP nsAccessNodeWrap::get_attributes( const char *pszAttributeName; const nsAttrName* name = content->GetAttrNameAt(index); - aNameSpaceIDs[index] = NS_STATIC_CAST(short, name->NamespaceID()); + aNameSpaceIDs[index] = static_cast(name->NamespaceID()); name->LocalName()->GetUTF8String(&pszAttributeName); aAttribNames[index] = ::SysAllocString(NS_ConvertUTF8toUTF16(pszAttributeName).get()); content->GetAttr(name->NamespaceID(), name->LocalName(), attributeValue); @@ -242,7 +242,7 @@ STDMETHODIMP nsAccessNodeWrap::get_attributesForNames( aAttribValues[index] = nsnull; if (aAttribNames[index]) { nsAutoString attributeValue, nameSpaceURI; - nsAutoString attributeName(nsDependentString(NS_STATIC_CAST(PRUnichar*,aAttribNames[index]))); + nsAutoString attributeName(nsDependentString(static_cast(aAttribNames[index]))); nsresult rv; if (aNameSpaceID[index]>0 && @@ -290,7 +290,7 @@ STDMETHODIMP nsAccessNodeWrap::get_computedStyle( ++realIndex; } } - *aNumStyleProperties = NS_STATIC_CAST(unsigned short, realIndex); + *aNumStyleProperties = static_cast(realIndex); return S_OK; } @@ -314,7 +314,7 @@ STDMETHODIMP nsAccessNodeWrap::get_computedStyleForProperties( for (index = 0; index < aNumStyleProperties; index ++) { nsAutoString value; if (aStyleProperties[index]) - cssDecl->GetPropertyValue(nsDependentString(NS_STATIC_CAST(PRUnichar*,aStyleProperties[index])), value); // Get property value + cssDecl->GetPropertyValue(nsDependentString(static_cast(aStyleProperties[index])), value); // Get property value aStyleValues[index] = ::SysAllocString(value.get()); } @@ -376,7 +376,7 @@ ISimpleDOMNode* nsAccessNodeWrap::MakeAccessNode(nsIDOMNode *node) return NULL; newNode->Init(); - iNode = NS_STATIC_CAST(ISimpleDOMNode*, newNode); + iNode = static_cast(newNode); iNode->AddRef(); } @@ -498,7 +498,7 @@ STDMETHODIMP nsAccessNodeWrap::get_localInterface( /* [out] */ void __RPC_FAR *__RPC_FAR *localInterface) { - *localInterface = NS_STATIC_CAST(nsIAccessNode*, this); + *localInterface = static_cast(this); NS_ADDREF_THIS(); return S_OK; } diff --git a/accessible/src/msaa/nsAccessibleRelationWrap.cpp b/accessible/src/msaa/nsAccessibleRelationWrap.cpp index 8060ad764374..54b5587813c8 100755 --- a/accessible/src/msaa/nsAccessibleRelationWrap.cpp +++ b/accessible/src/msaa/nsAccessibleRelationWrap.cpp @@ -71,8 +71,8 @@ nsAccessibleRelationWrap::QueryInterface(REFIID iid, void** ppv) *ppv = NULL; if (IID_IAccessibleRelation == iid || IID_IUnknown == iid) { - *ppv = NS_STATIC_CAST(IAccessibleRelation*, this); - (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef(); + *ppv = static_cast(this); + (reinterpret_cast(*ppv))->AddRef(); return S_OK; } @@ -175,7 +175,7 @@ nsAccessibleRelationWrap::get_target(long aTargetIndex, IUnknown **aTarget) if (NS_FAILED(rv)) return E_FAIL; - *aTarget = NS_STATIC_CAST(IUnknown*, instancePtr); + *aTarget = static_cast(instancePtr); return S_OK; } @@ -209,7 +209,7 @@ nsAccessibleRelationWrap::get_targets(long aMaxTargets, IUnknown **aTarget, if (NS_FAILED(rv)) break; - aTarget[index] = NS_STATIC_CAST(IUnknown*, instancePtr); + aTarget[index] = static_cast(instancePtr); } if (NS_FAILED(rv)) { diff --git a/accessible/src/msaa/nsAccessibleWrap.cpp b/accessible/src/msaa/nsAccessibleWrap.cpp index 514252ecbd86..38b07212813f 100644 --- a/accessible/src/msaa/nsAccessibleWrap.cpp +++ b/accessible/src/msaa/nsAccessibleWrap.cpp @@ -106,16 +106,16 @@ STDMETHODIMP nsAccessibleWrap::QueryInterface(REFIID iid, void** ppv) *ppv = NULL; if (IID_IUnknown == iid || IID_IDispatch == iid || IID_IAccessible == iid) - *ppv = NS_STATIC_CAST(IAccessible*, this); + *ppv = static_cast(this); else if (IID_IEnumVARIANT == iid && !gIsEnumVariantSupportDisabled) { long numChildren; get_accChildCount(&numChildren); if (numChildren > 0) // Don't support this interface for leaf elements - *ppv = NS_STATIC_CAST(IEnumVARIANT*, this); + *ppv = static_cast(this); } else if (IID_IServiceProvider == iid) - *ppv = NS_STATIC_CAST(IServiceProvider*, this); + *ppv = static_cast(this); else if (IID_IAccessible2 == iid) - *ppv = NS_STATIC_CAST(IAccessible2*, this); + *ppv = static_cast(this); if (NULL == *ppv) { HRESULT hr = CAccessibleComponent::QueryInterface(iid, ppv); @@ -138,7 +138,7 @@ STDMETHODIMP nsAccessibleWrap::QueryInterface(REFIID iid, void** ppv) if (NULL == *ppv) return nsAccessNodeWrap::QueryInterface(iid, ppv); - (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef(); + (reinterpret_cast(*ppv))->AddRef(); return S_OK; } @@ -260,7 +260,7 @@ STDMETHODIMP nsAccessibleWrap::get_accChild( return E_FAIL; if (varChild.lVal == CHILDID_SELF) { - *ppdispChild = NS_STATIC_CAST(IDispatch*, this); + *ppdispChild = static_cast(this); AddRef(); return S_OK; } @@ -728,7 +728,7 @@ STDMETHODIMP nsAccessibleWrap::get_accSelection(VARIANT __RPC_FAR *pvarChildren) pvarChildren->vt = VT_EMPTY; nsCOMPtr - select(do_QueryInterface(NS_STATIC_CAST(nsIAccessible*, this))); + select(do_QueryInterface(static_cast(this))); if (select) { // do we have an nsIAccessibleSelectable? // we have an accessible that can have children selected @@ -959,7 +959,7 @@ STDMETHODIMP nsAccessibleWrap::accHitTest( // if we got a child if (xpAccessible) { // if the child is us - if (xpAccessible == NS_STATIC_CAST(nsIAccessible*, this)) { + if (xpAccessible == static_cast(this)) { pvarChild->vt = VT_I4; pvarChild->lVal = CHILDID_SELF; } else { // its not create an Accessible for it. @@ -1061,7 +1061,7 @@ nsAccessibleWrap::Next(ULONG aNumElementsRequested, VARIANT FAR* pvar, ULONG FAR for (long childIndex = 0; pvar[*aNumElementsFetched].vt == VT_DISPATCH; ++childIndex) { PRBool wasAccessibleFetched = PR_FALSE; nsAccessibleWrap *msaaAccessible = - NS_STATIC_CAST(nsAccessibleWrap*, pvar[*aNumElementsFetched].pdispVal); + static_cast(pvar[*aNumElementsFetched].pdispVal); if (!msaaAccessible) break; if (childIndex >= mEnumVARIANTPosition) { @@ -1074,14 +1074,14 @@ nsAccessibleWrap::Next(ULONG aNumElementsRequested, VARIANT FAR* pvar, ULONG FAR msaaAccessible->nsAccessNode::Release(); // this accessible will not be received by the caller } - mEnumVARIANTPosition += NS_STATIC_CAST(PRUint16, *aNumElementsFetched); + mEnumVARIANTPosition += static_cast(*aNumElementsFetched); return NOERROR; } STDMETHODIMP nsAccessibleWrap::Skip(ULONG aNumElements) { - mEnumVARIANTPosition += NS_STATIC_CAST(PRUint16, aNumElements); + mEnumVARIANTPosition += static_cast(aNumElements); PRInt32 numChildren; GetChildCount(&numChildren); @@ -1133,7 +1133,7 @@ nsAccessibleWrap::get_relation(long aRelationIndex, if (NS_FAILED(rv)) return E_FAIL; - *aRelation = NS_STATIC_CAST(IAccessibleRelation*, instancePtr); + *aRelation = static_cast(instancePtr); return S_OK; } @@ -1168,7 +1168,7 @@ nsAccessibleWrap::get_relations(long aMaxRelations, if (NS_FAILED(rv)) break; - aRelation[index] = NS_STATIC_CAST(IAccessibleRelation*, instancePtr); + aRelation[index] = static_cast(instancePtr); } if (NS_FAILED(rv)) { @@ -1326,7 +1326,7 @@ nsAccessibleWrap::get_uniqueID(long *uniqueID) { void *id; if (NS_SUCCEEDED(GetUniqueID(&id))) { - *uniqueID = NS_REINTERPRET_POINTER_CAST(long, id); + *uniqueID = reinterpret_cast(id); return S_OK; } return E_FAIL; @@ -1337,7 +1337,7 @@ nsAccessibleWrap::get_windowHandle(HWND *windowHandle) { void **handle = nsnull; if (NS_SUCCEEDED(GetOwnerWindow(handle))) { - *windowHandle = NS_REINTERPRET_POINTER_CAST(HWND, *handle); + *windowHandle = reinterpret_cast(*handle); return S_OK; } return E_FAIL; @@ -1434,7 +1434,7 @@ nsAccessibleWrap::Clone(IEnumVARIANT FAR* FAR* ppenum) if (!accessibleWrap) return E_FAIL; - IAccessible *msaaAccessible = NS_STATIC_CAST(IAccessible*, accessibleWrap); + IAccessible *msaaAccessible = static_cast(accessibleWrap); msaaAccessible->AddRef(); QueryInterface(IID_IEnumVARIANT, (void**)ppenum); if (*ppenum) @@ -1479,7 +1479,7 @@ STDMETHODIMP nsAccessibleWrap::Invoke(DISPID dispIdMember, REFIID riid, NS_IMETHODIMP nsAccessibleWrap::GetNativeInterface(void **aOutAccessible) { - *aOutAccessible = NS_STATIC_CAST(IAccessible*, this); + *aOutAccessible = static_cast(this); NS_ADDREF_THIS(); return NS_OK; } @@ -1637,7 +1637,7 @@ IDispatch *nsAccessibleWrap::NativeAccessible(nsIAccessible *aXPAccessible) accObject->GetHwnd(&hwnd); if (hwnd) { IDispatch *retval = nsnull; - AccessibleObjectFromWindow(NS_REINTERPRET_CAST(HWND, hwnd), + AccessibleObjectFromWindow(reinterpret_cast(hwnd), OBJID_WINDOW, IID_IAccessible, (void **) &retval); return retval; } @@ -1646,7 +1646,7 @@ IDispatch *nsAccessibleWrap::NativeAccessible(nsIAccessible *aXPAccessible) IAccessible *msaaAccessible; aXPAccessible->GetNativeInterface((void**)&msaaAccessible); - return NS_STATIC_CAST(IDispatch*, msaaAccessible); + return static_cast(msaaAccessible); } @@ -1658,7 +1658,7 @@ void nsAccessibleWrap::GetXPAccessibleFor(const VARIANT& aVarChild, nsIAccessibl // if its us real easy - this seems to always be the case if (aVarChild.lVal == CHILDID_SELF) { - *aXPAccessible = NS_STATIC_CAST(nsIAccessible*, this); + *aXPAccessible = static_cast(this); } else if (MustPrune(this)) { return; diff --git a/accessible/src/msaa/nsApplicationAccessibleWrap.cpp b/accessible/src/msaa/nsApplicationAccessibleWrap.cpp index 841ffa216cab..522945aadeac 100755 --- a/accessible/src/msaa/nsApplicationAccessibleWrap.cpp +++ b/accessible/src/msaa/nsApplicationAccessibleWrap.cpp @@ -58,8 +58,8 @@ nsApplicationAccessibleWrap::QueryInterface(REFIID iid, void** ppv) *ppv = NULL; if (IID_IAccessibleApplication == iid) { - *ppv = NS_STATIC_CAST(IAccessibleApplication*, this); - (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef(); + *ppv = static_cast(this); + (reinterpret_cast(*ppv))->AddRef(); return S_OK; } diff --git a/accessible/src/msaa/nsDocAccessibleWrap.cpp b/accessible/src/msaa/nsDocAccessibleWrap.cpp index dd4bb57df658..63e189b35a4f 100644 --- a/accessible/src/msaa/nsDocAccessibleWrap.cpp +++ b/accessible/src/msaa/nsDocAccessibleWrap.cpp @@ -85,12 +85,12 @@ STDMETHODIMP nsDocAccessibleWrap::QueryInterface(REFIID iid, void** ppv) *ppv = NULL; if (IID_ISimpleDOMDocument == iid) - *ppv = NS_STATIC_CAST(ISimpleDOMDocument*, this); + *ppv = static_cast(this); if (NULL == *ppv) return nsHyperTextAccessibleWrap::QueryInterface(iid, ppv); - (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef(); + (reinterpret_cast(*ppv))->AddRef(); return S_OK; } @@ -127,7 +127,7 @@ STDMETHODIMP nsDocAccessibleWrap::get_accChild( if (xpAccessible) { IAccessible *msaaAccessible; xpAccessible->GetNativeInterface((void**)&msaaAccessible); - *ppdispChild = NS_STATIC_CAST(IDispatch*, msaaAccessible); + *ppdispChild = static_cast(msaaAccessible); return S_OK; } else if (mDocument) { diff --git a/accessible/src/msaa/nsHyperTextAccessibleWrap.cpp b/accessible/src/msaa/nsHyperTextAccessibleWrap.cpp index b64ef2c1f2f0..b800cf549c6c 100755 --- a/accessible/src/msaa/nsHyperTextAccessibleWrap.cpp +++ b/accessible/src/msaa/nsHyperTextAccessibleWrap.cpp @@ -67,7 +67,7 @@ nsHyperTextAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent) NS_IF_RELEASE(gTextEvent); CallQueryInterface(aEvent, &gTextEvent); - (NS_STATIC_CAST(IUnknown*, instancePtr))->Release(); + (static_cast(instancePtr))->Release(); } } } diff --git a/accessible/src/msaa/nsTextAccessibleWrap.cpp b/accessible/src/msaa/nsTextAccessibleWrap.cpp index 36880ae4e7d9..a8e9047f5c20 100755 --- a/accessible/src/msaa/nsTextAccessibleWrap.cpp +++ b/accessible/src/msaa/nsTextAccessibleWrap.cpp @@ -78,12 +78,12 @@ STDMETHODIMP nsTextAccessibleWrap::QueryInterface(REFIID iid, void** ppv) *ppv = nsnull; if (IID_IUnknown == iid || IID_ISimpleDOMText == iid) - *ppv = NS_STATIC_CAST(ISimpleDOMText*, this); + *ppv = static_cast(this); if (nsnull == *ppv) return nsAccessibleWrap::QueryInterface(iid, ppv); - (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef(); + (reinterpret_cast(*ppv))->AddRef(); return S_OK; } diff --git a/accessible/src/xul/nsXULTreeAccessible.cpp b/accessible/src/xul/nsXULTreeAccessible.cpp index f20933a5f54f..a13a74d4417b 100644 --- a/accessible/src/xul/nsXULTreeAccessible.cpp +++ b/accessible/src/xul/nsXULTreeAccessible.cpp @@ -567,7 +567,7 @@ NS_IMETHODIMP nsXULTreeitemAccessible::GetName(nsAString& aName) NS_IMETHODIMP nsXULTreeitemAccessible::GetUniqueID(void **aUniqueID) { // Since mDOMNode is same for all tree item, use |this| pointer as the unique Id - *aUniqueID = NS_STATIC_CAST(void*, this); + *aUniqueID = static_cast(this); return NS_OK; } diff --git a/browser/components/bookmarks/src/nsBookmarksService.cpp b/browser/components/bookmarks/src/nsBookmarksService.cpp index 993fe2e64f19..7fffe72d6f6d 100644 --- a/browser/components/bookmarks/src/nsBookmarksService.cpp +++ b/browser/components/bookmarks/src/nsBookmarksService.cpp @@ -2009,7 +2009,7 @@ nsBookmarksService::GetBookmarkToPing(nsIRDFResource **theBookmark) void nsBookmarksService::FireTimer(nsITimer* aTimer, void* aClosure) { - nsBookmarksService *bmks = NS_STATIC_CAST(nsBookmarksService *, aClosure); + nsBookmarksService *bmks = static_cast(aClosure); if (!bmks) return; nsresult rv; @@ -3613,7 +3613,7 @@ CompareLastModifiedFolders(nsIRDFResource* aResource1, nsIRDFResource* aResource { nsCOMPtr node1, node2; - nsIRDFDataSource* outer = NS_STATIC_CAST(nsIRDFDataSource*, aOuter); + nsIRDFDataSource* outer = static_cast(aOuter); outer->GetTarget(aResource1, kWEB_LastModifiedDate, PR_TRUE, getter_AddRefs(node1)); outer->GetTarget(aResource2, kWEB_LastModifiedDate, PR_TRUE, getter_AddRefs(node2)); @@ -3666,7 +3666,7 @@ nsBookmarksService::GetLastModifiedFolders(nsISimpleEnumerator **aResult) } // sort the array containing all the folders - folderArray.Sort(CompareLastModifiedFolders, NS_STATIC_CAST(void*, mInner)); + folderArray.Sort(CompareLastModifiedFolders, static_cast(mInner)); // only keep the first elements PRInt32 index; diff --git a/browser/components/feeds/src/nsFeedSniffer.cpp b/browser/components/feeds/src/nsFeedSniffer.cpp index a176c41dd5b3..615fdb6c0172 100644 --- a/browser/components/feeds/src/nsFeedSniffer.cpp +++ b/browser/components/feeds/src/nsFeedSniffer.cpp @@ -388,7 +388,7 @@ nsFeedSniffer::AppendSegmentToString(nsIInputStream* inputStream, PRUint32 count, PRUint32* writeCount) { - nsCString* decodedData = NS_STATIC_CAST(nsCString*, closure); + nsCString* decodedData = static_cast(closure); decodedData->Append(rawSegment, count); *writeCount = count; return NS_OK; diff --git a/browser/components/migration/src/nsIEProfileMigrator.cpp b/browser/components/migration/src/nsIEProfileMigrator.cpp index ec17e3b09aa2..29a870254ad5 100644 --- a/browser/components/migration/src/nsIEProfileMigrator.cpp +++ b/browser/components/migration/src/nsIEProfileMigrator.cpp @@ -196,7 +196,7 @@ TranslateDWORDtoPRInt32(nsIWindowsRegKey *aRegKey, PRInt32 prefIntValue = 0; if (NS_SUCCEEDED(aRegKey->ReadIntValue(aRegValueName, - NS_REINTERPRET_CAST(PRUint32 *, &prefIntValue)))) + reinterpret_cast(&prefIntValue)))) aPrefs->SetIntPref(aPrefKeyName, prefIntValue); } diff --git a/browser/components/migration/src/nsOperaProfileMigrator.cpp b/browser/components/migration/src/nsOperaProfileMigrator.cpp index 4ca66f712734..7887d3a3c67a 100644 --- a/browser/components/migration/src/nsOperaProfileMigrator.cpp +++ b/browser/components/migration/src/nsOperaProfileMigrator.cpp @@ -796,7 +796,7 @@ nsOperaCookieMigrator::Migrate() break; case COOKIE_EXPIRY: mStream->Read16(&length); - mStream->Read32(NS_REINTERPRET_CAST(PRUint32*, &(mCurrCookie.expiryTime))); + mStream->Read32(reinterpret_cast(&(mCurrCookie.expiryTime))); break; case COOKIE_SECURE: mCurrCookie.isSecure = PR_TRUE; @@ -808,7 +808,7 @@ nsOperaCookieMigrator::Migrate() { mStream->Read16(&length); PRTime temp; - mStream->Read32(NS_REINTERPRET_CAST(PRUint32*, &temp)); + mStream->Read32(reinterpret_cast(&temp)); } break; case COOKIE_COMMENT: diff --git a/browser/components/places/src/nsPlacesImportExportService.cpp b/browser/components/places/src/nsPlacesImportExportService.cpp index 85124f270e39..480f9379a24f 100644 --- a/browser/components/places/src/nsPlacesImportExportService.cpp +++ b/browser/components/places/src/nsPlacesImportExportService.cpp @@ -1298,12 +1298,12 @@ BookmarkContentSink::SetFaviconForURI(nsIURI* aPageURI, nsIURI* aIconURI, return NS_ERROR_FAILURE; // read all the decoded data - PRUint8* buffer = NS_STATIC_CAST(PRUint8*, - nsMemory::Alloc(sizeof(PRUint8) * available)); + PRUint8* buffer = static_cast + (nsMemory::Alloc(sizeof(PRUint8) * available)); if (!buffer) return NS_ERROR_OUT_OF_MEMORY; PRUint32 numRead; - rv = stream->Read(NS_REINTERPRET_CAST(char*, buffer), available, &numRead); + rv = stream->Read(reinterpret_cast(buffer), available, &numRead); if (NS_FAILED(rv) || numRead != available) { nsMemory::Free(buffer); return rv; @@ -1484,7 +1484,7 @@ static nsresult DataToDataURI(PRUint8* aData, PRUint32 aDataLen, const nsACString& aMimeType, nsACString& aDataURI) { - char* encoded = PL_Base64Encode(NS_REINTERPRET_CAST(const char*, aData), + char* encoded = PL_Base64Encode(reinterpret_cast(aData), aDataLen, nsnull); if (!encoded) return NS_ERROR_OUT_OF_MEMORY; diff --git a/caps/include/nsScriptSecurityManager.h b/caps/include/nsScriptSecurityManager.h index c5400a9208cb..39cbd2990845 100644 --- a/caps/include/nsScriptSecurityManager.h +++ b/caps/include/nsScriptSecurityManager.h @@ -97,7 +97,7 @@ public: typedef const nsIPrincipal* KeyTypePointer; PrincipalKey(const nsIPrincipal* key) - : mKey(NS_CONST_CAST(nsIPrincipal*, key)) + : mKey(const_cast(key)) { } @@ -118,7 +118,7 @@ public: PRBool KeyEquals(KeyTypePointer aKey) const { PRBool eq; - mKey->Equals(NS_CONST_CAST(nsIPrincipal*, aKey), + mKey->Equals(const_cast(aKey), &eq); return eq; } @@ -131,7 +131,7 @@ public: static PLDHashNumber HashKey(KeyTypePointer aKey) { PRUint32 hash; - NS_CONST_CAST(nsIPrincipal*, aKey)->GetHashValue(&hash); + const_cast(aKey)->GetHashValue(&hash); return PLDHashNumber(hash); } @@ -352,10 +352,10 @@ MoveClassPolicyEntry(PLDHashTable *table, memcpy(to, from, table->entrySize); // Now update the mDefaultPolicy pointer that points to us, if any. - ClassPolicy* cp = NS_STATIC_CAST(ClassPolicy*, to); + ClassPolicy* cp = static_cast(to); if (cp->mDomainWeAreWildcardFor) { NS_ASSERTION(cp->mDomainWeAreWildcardFor->mWildcardPolicy == - NS_STATIC_CAST(const ClassPolicy*, from), + static_cast(from), "Unexpected wildcard policy on mDomainWeAreWildcardFor"); cp->mDomainWeAreWildcardFor->mWildcardPolicy = cp; } diff --git a/caps/src/nsJSPrincipals.cpp b/caps/src/nsJSPrincipals.cpp index 21da40b8615e..efd471ce277f 100644 --- a/caps/src/nsJSPrincipals.cpp +++ b/caps/src/nsJSPrincipals.cpp @@ -63,8 +63,8 @@ nsGlobalPrivilegesEnabled(JSContext *cx, JSPrincipals *jsprin) JS_STATIC_DLL_CALLBACK(JSBool) nsJSPrincipalsSubsume(JSPrincipals *jsprin, JSPrincipals *other) { - nsJSPrincipals *nsjsprin = NS_STATIC_CAST(nsJSPrincipals *, jsprin); - nsJSPrincipals *nsother = NS_STATIC_CAST(nsJSPrincipals *, other); + nsJSPrincipals *nsjsprin = static_cast(jsprin); + nsJSPrincipals *nsother = static_cast(other); JSBool result; nsresult rv = nsjsprin->nsIPrincipalPtr->Subsumes(nsother->nsIPrincipalPtr, @@ -75,7 +75,7 @@ nsJSPrincipalsSubsume(JSPrincipals *jsprin, JSPrincipals *other) JS_STATIC_DLL_CALLBACK(void) nsDestroyJSPrincipals(JSContext *cx, struct JSPrincipals *jsprin) { - nsJSPrincipals *nsjsprin = NS_STATIC_CAST(nsJSPrincipals *, jsprin); + nsJSPrincipals *nsjsprin = static_cast(jsprin); // We need to destroy the nsIPrincipal. We'll do this by adding // to the refcount and calling release @@ -106,7 +106,7 @@ nsTranscodeJSPrincipals(JSXDRState *xdr, JSPrincipals **jsprinp) if (xdr->mode == JSXDR_ENCODE) { nsIObjectOutputStream *stream = - NS_REINTERPRET_CAST(nsIObjectOutputStream*, xdr->userdata); + reinterpret_cast(xdr->userdata); // Flush xdr'ed data to the underlying object output stream. uint32 size; @@ -121,7 +121,7 @@ nsTranscodeJSPrincipals(JSXDRState *xdr, JSPrincipals **jsprinp) // Require that GetJSPrincipals has been called already by the // code that compiled the script that owns the principals. nsJSPrincipals *nsjsprin = - NS_STATIC_CAST(nsJSPrincipals*, *jsprinp); + static_cast(*jsprinp); rv = stream->WriteObject(nsjsprin->nsIPrincipalPtr, PR_TRUE); } @@ -129,7 +129,7 @@ nsTranscodeJSPrincipals(JSXDRState *xdr, JSPrincipals **jsprinp) } else { NS_ASSERTION(JS_XDRMemDataLeft(xdr) == 0, "XDR out of sync?!"); nsIObjectInputStream *stream = - NS_REINTERPRET_CAST(nsIObjectInputStream*, xdr->userdata); + reinterpret_cast(xdr->userdata); nsCOMPtr prin; rv = stream->ReadObject(PR_TRUE, getter_AddRefs(prin)); diff --git a/caps/src/nsPrincipal.cpp b/caps/src/nsPrincipal.cpp index 4a669cc2c948..78fe6258aa9d 100755 --- a/caps/src/nsPrincipal.cpp +++ b/caps/src/nsPrincipal.cpp @@ -235,8 +235,7 @@ nsPrincipal::GetSecurityPolicy(void** aSecurityPolicy) NS_IMETHODIMP nsPrincipal::SetSecurityPolicy(void* aSecurityPolicy) { - DomainPolicy *newPolicy = NS_REINTERPRET_CAST( - DomainPolicy *, aSecurityPolicy); + DomainPolicy *newPolicy = reinterpret_cast(aSecurityPolicy); if (newPolicy) newPolicy->Hold(); @@ -932,7 +931,7 @@ nsPrincipal::Read(nsIObjectInputStream* aStream) return rv; } - if (!mAnnotations.InsertElementAt(NS_REINTERPRET_CAST(void*, ht), i)) { + if (!mAnnotations.InsertElementAt(reinterpret_cast(ht), i)) { delete ht; return NS_ERROR_OUT_OF_MEMORY; } @@ -977,7 +976,7 @@ nsPrincipal::Write(nsIObjectOutputStream* aStream) } for (PRInt32 i = 0, n = PRInt32(annotationCount); i < n; i++) { - nsHashtable *ht = NS_REINTERPRET_CAST(nsHashtable *, mAnnotations[i]); + nsHashtable *ht = reinterpret_cast(mAnnotations[i]); rv = ht->Write(aStream, WriteScalarValue); if (NS_FAILED(rv)) { return rv; diff --git a/caps/src/nsScriptSecurityManager.cpp b/caps/src/nsScriptSecurityManager.cpp index 2d0c27ee5ada..172164fffc50 100644 --- a/caps/src/nsScriptSecurityManager.cpp +++ b/caps/src/nsScriptSecurityManager.cpp @@ -106,7 +106,7 @@ JSValIDToString(JSContext *cx, const jsval idval) JSString *str = JS_ValueToString(cx, idval); if(!str) return nsnull; - return NS_REINTERPRET_CAST(PRUnichar*, JS_GetStringChars(str)); + return reinterpret_cast(JS_GetStringChars(str)); } static nsIScriptContext * @@ -127,7 +127,7 @@ inline void SetPendingException(JSContext *cx, const PRUnichar *aMsg) { JSAutoRequest ar(cx); JSString *str = JS_NewUCStringCopyZ(cx, - NS_REINTERPRET_CAST(const jschar*, aMsg)); + reinterpret_cast(aMsg)); if (str) JS_SetPendingException(cx, STRING_TO_JSVAL(str)); } @@ -150,7 +150,7 @@ class ClassInfoData public: ClassInfoData(nsIClassInfo *aClassInfo, const char *aName) : mClassInfo(aClassInfo), - mName(NS_CONST_CAST(char *, aName)), + mName(const_cast(aName)), mDidGetFlags(PR_FALSE), mMustFreeName(PR_FALSE) { @@ -200,7 +200,7 @@ public: if (mName) { mMustFreeName = PR_TRUE; } else { - mName = NS_CONST_CAST(char *, "UnnamedClass"); + mName = const_cast("UnnamedClass"); } } @@ -1056,8 +1056,8 @@ nsScriptSecurityManager::LookupPolicy(nsIPrincipal* aPrincipal, printf("ClassLookup "); #endif - cpolicy = NS_STATIC_CAST(ClassPolicy*, - PL_DHashTableOperate(dpolicy, + cpolicy = static_cast + (PL_DHashTableOperate(dpolicy, aClassData.GetName(), PL_DHASH_LOOKUP)); @@ -1076,8 +1076,8 @@ nsScriptSecurityManager::LookupPolicy(nsIPrincipal* aPrincipal, PropertyPolicy* ppolicy = nsnull; if (cpolicy != NO_POLICY_FOR_CLASS) { - ppolicy = NS_STATIC_CAST(PropertyPolicy*, - PL_DHashTableOperate(cpolicy->mPolicy, + ppolicy = static_cast + (PL_DHashTableOperate(cpolicy->mPolicy, (void*)aProperty, PL_DHASH_LOOKUP)); } @@ -1088,8 +1088,8 @@ nsScriptSecurityManager::LookupPolicy(nsIPrincipal* aPrincipal, (!ppolicy || PL_DHASH_ENTRY_IS_FREE(ppolicy))) { ppolicy = - NS_STATIC_CAST(PropertyPolicy*, - PL_DHashTableOperate(dpolicy->mWildcardPolicy->mPolicy, + static_cast + (PL_DHashTableOperate(dpolicy->mWildcardPolicy->mPolicy, (void*)aProperty, PL_DHASH_LOOKUP)); } @@ -1100,16 +1100,16 @@ nsScriptSecurityManager::LookupPolicy(nsIPrincipal* aPrincipal, if (dpolicy != mDefaultPolicy && (!ppolicy || PL_DHASH_ENTRY_IS_FREE(ppolicy))) { - cpolicy = NS_STATIC_CAST(ClassPolicy*, - PL_DHashTableOperate(mDefaultPolicy, + cpolicy = static_cast + (PL_DHashTableOperate(mDefaultPolicy, aClassData.GetName(), PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_BUSY(cpolicy)) { ppolicy = - NS_STATIC_CAST(PropertyPolicy*, - PL_DHashTableOperate(cpolicy->mPolicy, + static_cast + (PL_DHashTableOperate(cpolicy->mPolicy, (void*)aProperty, PL_DHASH_LOOKUP)); } @@ -1118,8 +1118,8 @@ nsScriptSecurityManager::LookupPolicy(nsIPrincipal* aPrincipal, mDefaultPolicy->mWildcardPolicy) { ppolicy = - NS_STATIC_CAST(PropertyPolicy*, - PL_DHashTableOperate(mDefaultPolicy->mWildcardPolicy->mPolicy, + static_cast + (PL_DHashTableOperate(mDefaultPolicy->mWildcardPolicy->mPolicy, (void*)aProperty, PL_DHASH_LOOKUP)); } @@ -1833,8 +1833,8 @@ nsScriptSecurityManager::DoGetCertificatePrincipal(const nsACString& aCertFinger // Make sure this principal has names, so if we ever go to save it // we'll save them. If we get a name mismatch here we'll throw, // but that's desirable. - rv = NS_STATIC_CAST(nsPrincipal*, - NS_STATIC_CAST(nsIPrincipal*, fromTable)) + rv = static_cast + (static_cast(fromTable)) ->EnsureCertData(aSubjectName, aPrettyName, aCertificate); if (NS_FAILED(rv)) { // We have a subject name mismatch for the same cert id. @@ -1848,9 +1848,9 @@ nsScriptSecurityManager::DoGetCertificatePrincipal(const nsACString& aCertFinger if (!aURI) { // We were asked to just get the base certificate, so output // what we have in the table. - certificate = NS_STATIC_CAST(nsPrincipal*, - NS_STATIC_CAST(nsIPrincipal*, - fromTable)); + certificate = static_cast + (static_cast + (fromTable)); } else { // We found a certificate and now need to install a codebase // on it. We don't want to modify the principal in the hash @@ -2040,7 +2040,7 @@ nsScriptSecurityManager::GetScriptPrincipal(JSContext *cx, // Script didn't have principals -- shouldn't happen. return nsnull; } - nsJSPrincipals *nsJSPrin = NS_STATIC_CAST(nsJSPrincipals *, jsp); + nsJSPrincipals *nsJSPrin = static_cast(jsp); nsIPrincipal* result = nsJSPrin->nsIPrincipalPtr; if (!result) *rv = NS_ERROR_FAILURE; @@ -3236,7 +3236,7 @@ nsScriptSecurityManager::SystemPrincipalSingletonConstructor() nsIPrincipal *sysprin = nsnull; if (gScriptSecMan) NS_ADDREF(sysprin = gScriptSecMan->mSystemPrincipal); - return NS_STATIC_CAST(nsSystemPrincipal*, sysprin); + return static_cast(sysprin); } nsresult @@ -3468,7 +3468,7 @@ nsScriptSecurityManager::InitDomainPolicy(JSContext* cx, { //-- pref value is the name of a capability nsCStringKey secLevelKey(prefValue); secLevel.capability = - NS_REINTERPRET_CAST(char*, mCapabilities->Get(&secLevelKey)); + reinterpret_cast(mCapabilities->Get(&secLevelKey)); if (!secLevel.capability) { secLevel.capability = NS_strdup(prefValue); @@ -3482,8 +3482,8 @@ nsScriptSecurityManager::InitDomainPolicy(JSContext* cx, *end = '\0'; // Find or store this class in the classes table ClassPolicy* cpolicy = - NS_STATIC_CAST(ClassPolicy*, - PL_DHashTableOperate(aDomainPolicy, start, + static_cast + (PL_DHashTableOperate(aDomainPolicy, start, PL_DHASH_ADD)); if (!cpolicy) break; @@ -3513,10 +3513,10 @@ nsScriptSecurityManager::InitDomainPolicy(JSContext* cx, // Store this property in the class policy const void* ppkey = - NS_REINTERPRET_CAST(const void*, STRING_TO_JSVAL(propertyKey)); + reinterpret_cast(STRING_TO_JSVAL(propertyKey)); PropertyPolicy* ppolicy = - NS_STATIC_CAST(PropertyPolicy*, - PL_DHashTableOperate(cpolicy->mPolicy, ppkey, + static_cast + (PL_DHashTableOperate(cpolicy->mPolicy, ppkey, PL_DHASH_ADD)); if (!ppolicy) break; diff --git a/chrome/src/nsChromeRegistry.cpp b/chrome/src/nsChromeRegistry.cpp index b75d488d7c32..604892997da7 100644 --- a/chrome/src/nsChromeRegistry.cpp +++ b/chrome/src/nsChromeRegistry.cpp @@ -251,7 +251,7 @@ nsChromeRegistry::nsProviderArray::GetProvider(const nsACString& aPreferred, Mat ProviderEntry* entry; while (i--) { - entry = NS_REINTERPRET_CAST(ProviderEntry*, mArray[i]); + entry = reinterpret_cast(mArray[i]); if (aPreferred.Equals(entry->provider)) return entry; @@ -318,7 +318,7 @@ nsChromeRegistry::nsProviderArray::EnumerateToArray(nsCStringArray *a) { PRInt32 i = mArray.Count(); while (i--) { - ProviderEntry *entry = NS_REINTERPRET_CAST(ProviderEntry*, mArray[i]); + ProviderEntry *entry = reinterpret_cast(mArray[i]); a->AppendCString(entry->provider); } } @@ -328,7 +328,7 @@ nsChromeRegistry::nsProviderArray::Clear() { PRInt32 i = mArray.Count(); while (i--) { - ProviderEntry* entry = NS_REINTERPRET_CAST(ProviderEntry*, mArray[i]); + ProviderEntry* entry = reinterpret_cast(mArray[i]); delete entry; } @@ -343,7 +343,7 @@ nsChromeRegistry::PackageEntry::PackageEntry(const nsACString& aPackage) : PLHashNumber nsChromeRegistry::HashKey(PLDHashTable *table, const void *key) { - const nsACString& str = *NS_REINTERPRET_CAST(const nsACString*, key); + const nsACString& str = *reinterpret_cast(key); return HashString(str); } @@ -351,15 +351,15 @@ PRBool nsChromeRegistry::MatchKey(PLDHashTable *table, const PLDHashEntryHdr *entry, const void *key) { - const nsACString& str = *NS_REINTERPRET_CAST(const nsACString*, key); - const PackageEntry* pentry = NS_STATIC_CAST(const PackageEntry*, entry); + const nsACString& str = *reinterpret_cast(key); + const PackageEntry* pentry = static_cast(entry); return str.Equals(pentry->package); } void nsChromeRegistry::ClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) { - PackageEntry* pentry = NS_STATIC_CAST(PackageEntry*, entry); + PackageEntry* pentry = static_cast(entry); pentry->~PackageEntry(); } @@ -367,7 +367,7 @@ PRBool nsChromeRegistry::InitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, const void *key) { - const nsACString& str = *NS_REINTERPRET_CAST(const nsACString*, key); + const nsACString& str = *reinterpret_cast(key); new (entry) PackageEntry(str); return PR_TRUE; @@ -701,7 +701,7 @@ nsChromeRegistry::ConvertChromeURL(nsIURI* aChromeURI, nsIURI* *aResult) NS_ENSURE_SUCCESS(rv, rv); PackageEntry* entry = - NS_STATIC_CAST(PackageEntry*, PL_DHashTableOperate(&mPackagesHash, + static_cast(PL_DHashTableOperate(&mPackagesHash, & (nsACString&) package, PL_DHASH_LOOKUP)); @@ -749,7 +749,7 @@ nsresult nsChromeRegistry::GetSelectedLocale(const nsACString& aPackage, nsACString& aLocale) { PackageEntry* entry = - NS_STATIC_CAST(PackageEntry*, PL_DHashTableOperate(&mPackagesHash, + static_cast(PL_DHashTableOperate(&mPackagesHash, & aPackage, PL_DHASH_LOOKUP)); @@ -772,7 +772,7 @@ nsChromeRegistry::GetLocalesForPackage(const nsACString& aPackage, return NS_ERROR_OUT_OF_MEMORY; PackageEntry* entry = - NS_STATIC_CAST(PackageEntry*, PL_DHashTableOperate(&mPackagesHash, + static_cast(PL_DHashTableOperate(&mPackagesHash, & aPackage, PL_DHASH_LOOKUP)); @@ -883,7 +883,7 @@ nsChromeRegistry::FlushSkinCaches() do_GetService("@mozilla.org/observer-service;1"); NS_ASSERTION(obsSvc, "Couldn't get observer service."); - obsSvc->NotifyObservers(NS_STATIC_CAST(nsIChromeRegistry*, this), + obsSvc->NotifyObservers(static_cast(this), NS_CHROME_FLUSH_SKINS_TOPIC, nsnull); } @@ -2158,7 +2158,7 @@ nsChromeRegistry::ProcessManifestBuffer(char *buf, PRInt32 length, continue; PackageEntry* entry = - NS_STATIC_CAST(PackageEntry*, PL_DHashTableOperate(&mPackagesHash, + static_cast(PL_DHashTableOperate(&mPackagesHash, & (const nsACString&) nsDependentCString(package), PL_DHASH_ADD)); if (!entry) @@ -2227,7 +2227,7 @@ nsChromeRegistry::ProcessManifestBuffer(char *buf, PRInt32 length, continue; PackageEntry* entry = - NS_STATIC_CAST(PackageEntry*, PL_DHashTableOperate(&mPackagesHash, + static_cast(PL_DHashTableOperate(&mPackagesHash, & (const nsACString&) nsDependentCString(package), PL_DHASH_ADD)); if (!entry) @@ -2277,7 +2277,7 @@ nsChromeRegistry::ProcessManifestBuffer(char *buf, PRInt32 length, continue; PackageEntry* entry = - NS_STATIC_CAST(PackageEntry*, PL_DHashTableOperate(&mPackagesHash, + static_cast(PL_DHashTableOperate(&mPackagesHash, & (const nsACString&) nsDependentCString(package), PL_DHASH_ADD)); if (!entry) diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h index f0c2ca36d215..8587fd013ed5 100644 --- a/content/base/public/nsContentUtils.h +++ b/content/base/public/nsContentUtils.h @@ -979,7 +979,7 @@ public: static void DestroyMatchString(void* aData) { if (aData) { - nsString* matchString = NS_STATIC_CAST(nsString*, aData); + nsString* matchString = static_cast(aData); delete matchString; } } @@ -1205,7 +1205,7 @@ private: #define NS_INTERFACE_MAP_ENTRY_TEAROFF(_interface, _allocator) \ if (aIID.Equals(NS_GET_IID(_interface))) { \ - foundInterface = NS_STATIC_CAST(_interface *, _allocator); \ + foundInterface = static_cast<_interface *>(_allocator); \ if (!foundInterface) { \ *aInstancePtr = nsnull; \ return NS_ERROR_OUT_OF_MEMORY; \ diff --git a/content/base/public/nsINode.h b/content/base/public/nsINode.h index d06e9e259ea2..67dc1671c29d 100644 --- a/content/base/public/nsINode.h +++ b/content/base/public/nsINode.h @@ -101,8 +101,8 @@ class nsNodeSupportsWeakRefTearoff; // Returns the first argument cast to nsINode if it is non-null, otherwise // returns the second (which may be null) #define NODE_FROM(content_, document_) \ - ((content_) ? NS_STATIC_CAST(nsINode*, (content_)) : \ - NS_STATIC_CAST(nsINode*, (document_))) + ((content_) ? static_cast((content_)) : \ + static_cast((document_))) // IID for the nsINode interface @@ -460,8 +460,8 @@ public: nsIContent* GetParent() const { return NS_LIKELY(mParentPtrBits & PARENT_BIT_PARENT_IS_CONTENT) ? - NS_REINTERPRET_CAST(nsIContent*, - mParentPtrBits & ~kParentBitMask) : + reinterpret_cast + (mParentPtrBits & ~kParentBitMask) : nsnull; } @@ -472,7 +472,7 @@ public: */ nsINode* GetNodeParent() const { - return NS_REINTERPRET_CAST(nsINode*, mParentPtrBits & ~kParentBitMask); + return reinterpret_cast(mParentPtrBits & ~kParentBitMask); } /** @@ -621,7 +621,7 @@ protected: nsSlots* FlagsAsSlots() const { NS_ASSERTION(HasSlots(), "check HasSlots first"); - return NS_REINTERPRET_CAST(nsSlots*, mFlagsOrSlots); + return reinterpret_cast(mFlagsOrSlots); } nsSlots* GetExistingSlots() const @@ -637,7 +637,7 @@ protected: nsSlots* slots = CreateSlots(); if (slots) { - mFlagsOrSlots = NS_REINTERPRET_CAST(PtrBits, slots); + mFlagsOrSlots = reinterpret_cast(slots); } return slots; diff --git a/content/base/src/mozSanitizingSerializer.cpp b/content/base/src/mozSanitizingSerializer.cpp index 163d9a596570..533594785414 100644 --- a/content/base/src/mozSanitizingSerializer.cpp +++ b/content/base/src/mozSanitizingSerializer.cpp @@ -300,7 +300,7 @@ mozSanitizingHTMLSerializer::OpenContainer(const nsIParserNode& aNode) { PRInt32 type = aNode.GetNodeType(); - mParserNode = NS_CONST_CAST(nsIParserNode *, &aNode); + mParserNode = const_cast(&aNode); return DoOpenContainer(type); } @@ -316,7 +316,7 @@ mozSanitizingHTMLSerializer::AddLeaf(const nsIParserNode& aNode) eHTMLTags type = (eHTMLTags)aNode.GetNodeType(); const nsAString& text = aNode.GetText(); - mParserNode = NS_CONST_CAST(nsIParserNode*, &aNode); + mParserNode = const_cast(&aNode); return DoAddLeaf(type, text); } diff --git a/content/base/src/nsAttrAndChildArray.cpp b/content/base/src/nsAttrAndChildArray.cpp index c79518279af9..58e0c5211abe 100644 --- a/content/base/src/nsAttrAndChildArray.cpp +++ b/content/base/src/nsAttrAndChildArray.cpp @@ -113,7 +113,7 @@ GetIndexFromCache(const nsAttrAndChildArray* aArray) * See Bug 231104 for more information. */ #define ATTRS(_impl) \ - NS_REINTERPRET_CAST(InternalAttr*, &((_impl)->mBuffer[0])) + reinterpret_cast(&((_impl)->mBuffer[0])) #define NS_IMPL_EXTRA_SIZE \ @@ -213,7 +213,7 @@ nsAttrAndChildArray::RemoveChildAt(PRUint32 aPos) PRUint32 childCount = ChildCount(); void** pos = mImpl->mBuffer + AttrSlotsSize() + aPos; - nsIContent* child = NS_STATIC_CAST(nsIContent*, *pos); + nsIContent* child = static_cast(*pos); NS_RELEASE(child); memmove(pos, pos + 1, (childCount - aPos - 1) * sizeof(nsIContent*)); SetChildCount(childCount - 1); @@ -265,7 +265,7 @@ nsAttrAndChildArray::IndexOfChild(nsINode* aPossibleChild) const if (children[cursor] == aPossibleChild) { AddIndexToCache(this, cursor); - return NS_STATIC_CAST(PRInt32, cursor); + return static_cast(cursor); } } } @@ -274,7 +274,7 @@ nsAttrAndChildArray::IndexOfChild(nsINode* aPossibleChild) const if (children[cursor] == aPossibleChild) { AddIndexToCache(this, cursor); - return NS_STATIC_CAST(PRInt32, cursor); + return static_cast(cursor); } } } @@ -285,7 +285,7 @@ nsAttrAndChildArray::IndexOfChild(nsINode* aPossibleChild) const for (i = 0; i < count; ++i) { if (children[i] == aPossibleChild) { - return NS_STATIC_CAST(PRInt32, i); + return static_cast(i); } } @@ -497,7 +497,7 @@ nsAttrAndChildArray::GetSafeAttrNameAt(PRUint32 aPos) const return nsnull; } - return &NS_REINTERPRET_CAST(InternalAttr*, pos)->mName; + return &reinterpret_cast(pos)->mName; } const nsAttrName* @@ -619,7 +619,7 @@ nsAttrAndChildArray::Compact() mImpl = nsnull; } else if (newSize < mImpl->mBufferSize) { - mImpl = NS_STATIC_CAST(Impl*, PR_Realloc(mImpl, (newSize + NS_IMPL_EXTRA_SIZE) * sizeof(nsIContent*))); + mImpl = static_cast(PR_Realloc(mImpl, (newSize + NS_IMPL_EXTRA_SIZE) * sizeof(nsIContent*))); NS_ASSERTION(mImpl, "failed to reallocate to smaller buffer"); mImpl->mBufferSize = newSize; @@ -644,7 +644,7 @@ nsAttrAndChildArray::Clear() PRUint32 end = slotCount * ATTRSIZE + ChildCount(); for (i = slotCount * ATTRSIZE; i < end; ++i) { - nsIContent* child = NS_STATIC_CAST(nsIContent*, mImpl->mBuffer[i]); + nsIContent* child = static_cast(mImpl->mBuffer[i]); // making this PR_FALSE so tree teardown doesn't end up being // O(N*D) (number of nodes times average depth of tree). child->UnbindFromTree(PR_FALSE); // XXX is it better to let the owner do this? @@ -755,8 +755,8 @@ nsAttrAndChildArray::GrowBy(PRUint32 aGrowSize) size = PR_BIT(PR_CeilingLog2(minSize)); } - Impl* newImpl = NS_STATIC_CAST(Impl*, - mImpl ? PR_Realloc(mImpl, size * sizeof(void*)) : + Impl* newImpl = static_cast + (mImpl ? PR_Realloc(mImpl, size * sizeof(void*)) : PR_Malloc(size * sizeof(void*))); NS_ENSURE_TRUE(newImpl, PR_FALSE); diff --git a/content/base/src/nsAttrAndChildArray.h b/content/base/src/nsAttrAndChildArray.h index 07816861d472..5f475a8bad97 100644 --- a/content/base/src/nsAttrAndChildArray.h +++ b/content/base/src/nsAttrAndChildArray.h @@ -85,7 +85,7 @@ public: nsIContent* ChildAt(PRUint32 aPos) const { NS_ASSERTION(aPos < ChildCount(), "out-of-bounds access in nsAttrAndChildArray"); - return NS_REINTERPRET_CAST(nsIContent*, mImpl->mBuffer[AttrSlotsSize() + aPos]); + return reinterpret_cast(mImpl->mBuffer[AttrSlotsSize() + aPos]); } nsIContent* GetSafeChildAt(PRUint32 aPos) const; nsresult AppendChild(nsIContent* aChild) diff --git a/content/base/src/nsAttrName.h b/content/base/src/nsAttrName.h index 8a0714cc606f..652a6d72714a 100644 --- a/content/base/src/nsAttrName.h +++ b/content/base/src/nsAttrName.h @@ -62,7 +62,7 @@ public: } explicit nsAttrName(nsIAtom* aAtom) - : mBits(NS_REINTERPRET_CAST(PtrBits, aAtom)) + : mBits(reinterpret_cast(aAtom)) { NS_ASSERTION(aAtom, "null atom-name in nsAttrName"); NS_ADDREF(aAtom); @@ -72,11 +72,11 @@ public: { NS_ASSERTION(aNodeInfo, "null nodeinfo-name in nsAttrName"); if (aNodeInfo->NamespaceEquals(kNameSpaceID_None)) { - mBits = NS_REINTERPRET_CAST(PtrBits, aNodeInfo->NameAtom()); + mBits = reinterpret_cast(aNodeInfo->NameAtom()); NS_ADDREF(aNodeInfo->NameAtom()); } else { - mBits = NS_REINTERPRET_CAST(PtrBits, aNodeInfo) | + mBits = reinterpret_cast(aNodeInfo) | NS_ATTRNAME_NODEINFO_BIT; NS_ADDREF(aNodeInfo); } @@ -93,11 +93,11 @@ public: ReleaseInternalName(); if (aNodeInfo->NamespaceEquals(kNameSpaceID_None)) { - mBits = NS_REINTERPRET_CAST(PtrBits, aNodeInfo->NameAtom()); + mBits = reinterpret_cast(aNodeInfo->NameAtom()); NS_ADDREF(aNodeInfo->NameAtom()); } else { - mBits = NS_REINTERPRET_CAST(PtrBits, aNodeInfo) | + mBits = reinterpret_cast(aNodeInfo) | NS_ATTRNAME_NODEINFO_BIT; NS_ADDREF(aNodeInfo); } @@ -108,7 +108,7 @@ public: NS_ASSERTION(aAtom, "null atom-name in nsAttrName"); ReleaseInternalName(); - mBits = NS_REINTERPRET_CAST(PtrBits, aAtom); + mBits = reinterpret_cast(aAtom); NS_ADDREF(aAtom); } @@ -120,13 +120,13 @@ public: nsINodeInfo* NodeInfo() const { NS_ASSERTION(!IsAtom(), "getting nodeinfo-value of atom-name"); - return NS_REINTERPRET_CAST(nsINodeInfo*, mBits & ~NS_ATTRNAME_NODEINFO_BIT); + return reinterpret_cast(mBits & ~NS_ATTRNAME_NODEINFO_BIT); } nsIAtom* Atom() const { NS_ASSERTION(IsAtom(), "getting atom-value of nodeinfo-name"); - return NS_REINTERPRET_CAST(nsIAtom*, mBits); + return reinterpret_cast(mBits); } PRBool Equals(const nsAttrName& aOther) const @@ -137,7 +137,7 @@ public: // Faster comparison in the case we know the namespace is null PRBool Equals(nsIAtom* aAtom) const { - return NS_REINTERPRET_CAST(PtrBits, aAtom) == mBits; + return reinterpret_cast(aAtom) == mBits; } PRBool Equals(nsIAtom* aLocalName, PRInt32 aNamespaceID) const @@ -211,7 +211,7 @@ public: PRBool IsSmaller(nsIAtom* aOther) const { - return mBits < NS_REINTERPRET_CAST(PtrBits, aOther); + return mBits < reinterpret_cast(aOther); } private: @@ -220,8 +220,8 @@ private: { // Since both nsINodeInfo and nsIAtom inherit nsISupports as its first // interface we can safely assume that it's first in the vtable - nsISupports* name = NS_REINTERPRET_CAST(nsISupports *, - mBits & ~NS_ATTRNAME_NODEINFO_BIT); + nsISupports* name = reinterpret_cast + (mBits & ~NS_ATTRNAME_NODEINFO_BIT); NS_ADDREF(name); } @@ -230,8 +230,8 @@ private: { // Since both nsINodeInfo and nsIAtom inherit nsISupports as its first // interface we can safely assume that it's first in the vtable - nsISupports* name = NS_REINTERPRET_CAST(nsISupports *, - mBits & ~NS_ATTRNAME_NODEINFO_BIT); + nsISupports* name = reinterpret_cast + (mBits & ~NS_ATTRNAME_NODEINFO_BIT); NS_RELEASE(name); } diff --git a/content/base/src/nsAttrValue.cpp b/content/base/src/nsAttrValue.cpp index 9e8be91fd5fc..a03ab03b54f5 100644 --- a/content/base/src/nsAttrValue.cpp +++ b/content/base/src/nsAttrValue.cpp @@ -118,7 +118,7 @@ nsAttrValue::Type() const switch (BaseType()) { case eIntegerBase: { - return NS_STATIC_CAST(ValueType, mBits & NS_ATTRVALUE_INTEGERTYPE_MASK); + return static_cast(mBits & NS_ATTRVALUE_INTEGERTYPE_MASK); } case eOtherBase: { @@ -126,7 +126,7 @@ nsAttrValue::Type() const } default: { - return NS_STATIC_CAST(ValueType, NS_STATIC_CAST(PRUint16, BaseType())); + return static_cast(static_cast(BaseType())); } } } @@ -137,7 +137,7 @@ nsAttrValue::Reset() switch(BaseType()) { case eStringBase: { - nsStringBuffer* str = NS_STATIC_CAST(nsStringBuffer*, GetPtr()); + nsStringBuffer* str = static_cast(GetPtr()); if (str) { str->Release(); } @@ -174,7 +174,7 @@ nsAttrValue::SetTo(const nsAttrValue& aOther) case eStringBase: { ResetIfSet(); - nsStringBuffer* str = NS_STATIC_CAST(nsStringBuffer*, aOther.GetPtr()); + nsStringBuffer* str = static_cast(aOther.GetPtr()); if (str) { str->AddRef(); SetPtrValueAndType(str, eStringBase); @@ -257,7 +257,7 @@ nsAttrValue::SetTo(const nsAString& aValue) if (!buf) { return; } - PRUnichar *data = NS_STATIC_CAST(PRUnichar*, buf->Data()); + PRUnichar *data = static_cast(buf->Data()); CopyUnicodeTo(aValue, 0, data, len); data[len] = PRUnichar(0); @@ -308,7 +308,7 @@ nsAttrValue::ToString(nsAString& aResult) const switch(Type()) { case eString: { - nsStringBuffer* str = NS_STATIC_CAST(nsStringBuffer*, GetPtr()); + nsStringBuffer* str = static_cast(GetPtr()); if (str) { str->ToString(str->StorageSize()/sizeof(PRUnichar) - 1, aResult); } @@ -319,7 +319,7 @@ nsAttrValue::ToString(nsAString& aResult) const } case eAtom: { - nsIAtom *atom = NS_STATIC_CAST(nsIAtom*, GetPtr()); + nsIAtom *atom = static_cast(GetPtr()); atom->ToString(aResult); break; @@ -417,7 +417,7 @@ nsAttrValue::GetStringValue() const { NS_PRECONDITION(Type() == eString, "wrong type"); - return nsCheapString(NS_STATIC_CAST(nsStringBuffer*, GetPtr())); + return nsCheapString(static_cast(GetPtr())); } PRBool @@ -437,7 +437,7 @@ nsAttrValue::GetColorValue(nscolor& aColor) const } case eIntegerBase: { - aColor = NS_STATIC_CAST(nscolor, GetIntInternal()); + aColor = static_cast(GetIntInternal()); break; } @@ -489,10 +489,10 @@ nsAttrValue::HashValue() const switch(BaseType()) { case eStringBase: { - nsStringBuffer* str = NS_STATIC_CAST(nsStringBuffer*, GetPtr()); + nsStringBuffer* str = static_cast(GetPtr()); if (str) { PRUint32 len = str->StorageSize()/sizeof(PRUnichar) - 1; - return nsCRT::BufferHashCode(NS_STATIC_CAST(PRUnichar*, str->Data()), len); + return nsCRT::BufferHashCode(static_cast(str->Data()), len); } return 0; @@ -622,9 +622,9 @@ nsAttrValue::Equals(const nsAString& aValue, switch (BaseType()) { case eStringBase: { - nsStringBuffer* str = NS_STATIC_CAST(nsStringBuffer*, GetPtr()); + nsStringBuffer* str = static_cast(GetPtr()); if (str) { - nsDependentString dep(NS_STATIC_CAST(PRUnichar*, str->Data()), + nsDependentString dep(static_cast(str->Data()), str->StorageSize()/sizeof(PRUnichar) - 1); return aCaseSensitive == eCaseMatters ? aValue.Equals(dep) : aValue.Equals(dep, nsCaseInsensitiveStringComparator()); @@ -634,7 +634,7 @@ nsAttrValue::Equals(const nsAString& aValue, case eAtomBase: // Need a way to just do case-insensitive compares on atoms.. if (aCaseSensitive == eCaseMatters) { - return NS_STATIC_CAST(nsIAtom*, GetPtr())->Equals(aValue);; + return static_cast(GetPtr())->Equals(aValue);; } default: break; @@ -659,9 +659,9 @@ nsAttrValue::Equals(nsIAtom* aValue, nsCaseTreatment aCaseSensitive) const switch (BaseType()) { case eStringBase: { - nsStringBuffer* str = NS_STATIC_CAST(nsStringBuffer*, GetPtr()); + nsStringBuffer* str = static_cast(GetPtr()); if (str) { - nsDependentString dep(NS_STATIC_CAST(PRUnichar*, str->Data()), + nsDependentString dep(static_cast(str->Data()), str->StorageSize()/sizeof(PRUnichar) - 1); return aValue->Equals(dep); } @@ -669,7 +669,7 @@ nsAttrValue::Equals(nsIAtom* aValue, nsCaseTreatment aCaseSensitive) const } case eAtomBase: { - return NS_STATIC_CAST(nsIAtom*, GetPtr()) == aValue; + return static_cast(GetPtr()) == aValue; } default: break; @@ -971,7 +971,7 @@ nsAttrValue::ParseColor(const nsAString& aString, nsIDocument* aDocument) } } - PRInt32 colAsInt = NS_STATIC_CAST(PRInt32, color); + PRInt32 colAsInt = static_cast(color); PRInt32 tmp = colAsInt * NS_ATTRVALUE_INTEGERTYPE_MULTIPLIER; if (tmp / NS_ATTRVALUE_INTEGERTYPE_MULTIPLIER == colAsInt) { ResetIfSet(); diff --git a/content/base/src/nsAttrValue.h b/content/base/src/nsAttrValue.h index 15dbef316a6f..9672633249cb 100644 --- a/content/base/src/nsAttrValue.h +++ b/content/base/src/nsAttrValue.h @@ -298,7 +298,7 @@ inline nsIAtom* nsAttrValue::GetAtomValue() const { NS_PRECONDITION(Type() == eAtom, "wrong type"); - return NS_REINTERPRET_CAST(nsIAtom*, GetPtr()); + return reinterpret_cast(GetPtr()); } inline PRInt32 @@ -321,15 +321,15 @@ nsAttrValue::GetEnumValue() const NS_PRECONDITION(Type() == eEnum, "wrong type"); // We don't need to worry about sign extension here since we're // returning an PRInt16 which will cut away the top bits. - return NS_STATIC_CAST(PRInt16, - GetIntInternal() >> NS_ATTRVALUE_ENUMTABLEINDEX_BITS); + return static_cast + (GetIntInternal() >> NS_ATTRVALUE_ENUMTABLEINDEX_BITS); } inline float nsAttrValue::GetPercentValue() const { NS_PRECONDITION(Type() == ePercent, "wrong type"); - return NS_STATIC_CAST(float, GetIntInternal()) / + return static_cast(GetIntInternal()) / 100.0f; } @@ -359,7 +359,7 @@ nsAttrValue::GetSVGValue() const inline nsAttrValue::ValueBaseType nsAttrValue::BaseType() const { - return NS_STATIC_CAST(ValueBaseType, mBits & NS_ATTRVALUE_BASETYPE_MASK); + return static_cast(mBits & NS_ATTRVALUE_BASETYPE_MASK); } inline void @@ -367,7 +367,7 @@ nsAttrValue::SetPtrValueAndType(void* aValue, ValueBaseType aType) { NS_ASSERTION(!(NS_PTR_TO_INT32(aValue) & ~NS_ATTRVALUE_POINTERVALUE_MASK), "pointer not properly aligned, this will crash"); - mBits = NS_REINTERPRET_CAST(PtrBits, aValue) | aType; + mBits = reinterpret_cast(aValue) | aType; } inline void @@ -396,14 +396,14 @@ nsAttrValue::GetPtr() const { NS_ASSERTION(BaseType() != eIntegerBase, "getting pointer from non-pointer"); - return NS_REINTERPRET_CAST(void*, mBits & NS_ATTRVALUE_POINTERVALUE_MASK); + return reinterpret_cast(mBits & NS_ATTRVALUE_POINTERVALUE_MASK); } inline nsAttrValue::MiscContainer* nsAttrValue::GetMiscContainer() const { NS_ASSERTION(BaseType() == eOtherBase, "wrong type"); - return NS_STATIC_CAST(MiscContainer*, GetPtr()); + return static_cast(GetPtr()); } inline PRInt32 @@ -414,7 +414,7 @@ nsAttrValue::GetIntInternal() const // Make sure we get a signed value. // Lets hope the optimizer optimizes this into a shift. Unfortunatly signed // bitshift right is implementaion dependant. - return NS_STATIC_CAST(PRInt32, mBits & ~NS_ATTRVALUE_INTEGERTYPE_MASK) / + return static_cast(mBits & ~NS_ATTRVALUE_INTEGERTYPE_MASK) / NS_ATTRVALUE_INTEGERTYPE_MULTIPLIER; } diff --git a/content/base/src/nsContentAreaDragDrop.cpp b/content/base/src/nsContentAreaDragDrop.cpp index 467b95b7610e..3741ab1fb27d 100644 --- a/content/base/src/nsContentAreaDragDrop.cpp +++ b/content/base/src/nsContentAreaDragDrop.cpp @@ -217,7 +217,7 @@ nsContentAreaDragDrop::AddDragListener() nsresult rv = NS_ERROR_FAILURE; if (mEventTarget) { - nsIDOMDragListener *pListener = NS_STATIC_CAST(nsIDOMDragListener *, this); + nsIDOMDragListener *pListener = static_cast(this); rv = mEventTarget->AddEventListenerByIID(pListener, NS_GET_IID(nsIDOMDragListener)); if (NS_SUCCEEDED(rv)) @@ -239,7 +239,7 @@ nsContentAreaDragDrop::RemoveDragListener() nsresult rv = NS_ERROR_FAILURE; if (mEventTarget) { - nsIDOMDragListener *pListener = NS_STATIC_CAST(nsIDOMDragListener *, this); + nsIDOMDragListener *pListener = static_cast(this); rv = mEventTarget->RemoveEventListenerByIID(pListener, NS_GET_IID(nsIDOMDragListener)); @@ -743,7 +743,7 @@ nsContentAreaDragDrop::DragGesture(nsIDOMEvent* inMouseEvent) PRBool isSelection = PR_FALSE; nsCOMPtr trans; - nsTransferableFactory factory(inMouseEvent, NS_STATIC_CAST(nsIFlavorDataProvider*, this)); + nsTransferableFactory factory(inMouseEvent, static_cast(this)); factory.Produce(&isSelection, getter_AddRefs(trans)); if (trans) { @@ -1636,7 +1636,7 @@ void nsTransferableFactory::GetSelectedLink(nsISelection* inSelection, nsAutoString nodeStr; selectionStart->GetNodeValue(nodeStr); if (nodeStr.IsEmpty() || - startOffset+1 >= NS_STATIC_CAST(PRInt32, nodeStr.Length())) { + startOffset+1 >= static_cast(nodeStr.Length())) { nsCOMPtr curr = selectionStart; nsIDOMNode* next; diff --git a/content/base/src/nsContentIterator.cpp b/content/base/src/nsContentIterator.cpp index a2cdd464a6ab..fa95bb416384 100644 --- a/content/base/src/nsContentIterator.cpp +++ b/content/base/src/nsContentIterator.cpp @@ -415,7 +415,7 @@ nsContentIterator::Init(nsIDOMRange* aRange) NS_ASSERTION(startNode->IsNodeOfType(nsINode::eCONTENT), "Data node that's not content?"); - mFirst = NS_STATIC_CAST(nsIContent*, startNode); + mFirst = static_cast(startNode); mLast = mFirst; mCurNode = mFirst; @@ -459,13 +459,13 @@ nsContentIterator::Init(nsIDOMRange* aRange) NS_ASSERTION(startNode->IsNodeOfType(nsINode::eCONTENT), "Data node that's not content?"); - mFirst = NS_STATIC_CAST(nsIContent*, startNode); + mFirst = static_cast(startNode); } } else { // post-order if (startNode->IsNodeOfType(nsINode::eCONTENT)) { - mFirst = NS_STATIC_CAST(nsIContent*, startNode); + mFirst = static_cast(startNode); } else { // What else can we do? mFirst = nsnull; @@ -500,7 +500,7 @@ nsContentIterator::Init(nsIDOMRange* aRange) { if (mPre) { if (endNode->IsNodeOfType(nsINode::eCONTENT)) { - mLast = NS_STATIC_CAST(nsIContent*, endNode); + mLast = static_cast(endNode); } else { // Not much else to do here... mLast = nsnull; @@ -524,7 +524,7 @@ nsContentIterator::Init(nsIDOMRange* aRange) NS_ASSERTION(endNode->IsNodeOfType(nsINode::eCONTENT), "Data node that's not content?"); - mLast = NS_STATIC_CAST(nsIContent*, endNode); + mLast = static_cast(endNode); } } } diff --git a/content/base/src/nsContentList.cpp b/content/base/src/nsContentList.cpp index e96936e7d909..51481f4532c7 100644 --- a/content/base/src/nsContentList.cpp +++ b/content/base/src/nsContentList.cpp @@ -188,7 +188,7 @@ struct ContentListHashEntry : public PLDHashEntryHdr PR_STATIC_CALLBACK(PLDHashNumber) ContentListHashtableHashKey(PLDHashTable *table, const void *key) { - const nsContentListKey* list = NS_STATIC_CAST(const nsContentListKey *, key); + const nsContentListKey* list = static_cast(key); return list->GetHash(); } @@ -198,9 +198,9 @@ ContentListHashtableMatchEntry(PLDHashTable *table, const void *key) { const ContentListHashEntry *e = - NS_STATIC_CAST(const ContentListHashEntry *, entry); + static_cast(entry); const nsContentListKey* list1 = e->mContentList->GetKey(); - const nsContentListKey* list2 = NS_STATIC_CAST(const nsContentListKey *, key); + const nsContentListKey* list2 = static_cast(key); return list1->Equals(*list2); } @@ -244,8 +244,8 @@ NS_GetContentList(nsINode* aRootNode, nsIAtom* aMatchAtom, // A PL_DHASH_ADD is equivalent to a PL_DHASH_LOOKUP for cases // when the entry is already in the hashtable. - entry = NS_STATIC_CAST(ContentListHashEntry *, - PL_DHashTableOperate(&gContentListHashTable, + entry = static_cast + (PL_DHashTableOperate(&gContentListHashTable, &hashKey, PL_DHASH_ADD)); if (entry) @@ -873,10 +873,10 @@ nsContentList::AssertInSync() // elements that are outside of the document element. nsIContent *root; if (mRootNode->IsNodeOfType(nsINode::eDOCUMENT)) { - root = NS_STATIC_CAST(nsIDocument*, mRootNode)->GetRootContent(); + root = static_cast(mRootNode)->GetRootContent(); } else { - root = NS_STATIC_CAST(nsIContent*, mRootNode); + root = static_cast(mRootNode); } nsCOMPtr iter; diff --git a/content/base/src/nsContentList.h b/content/base/src/nsContentList.h index cf97823b29ff..031ea9811714 100644 --- a/content/base/src/nsContentList.h +++ b/content/base/src/nsContentList.h @@ -240,7 +240,7 @@ public: NS_HIDDEN_(nsIContent*) NamedItem(const nsAString& aName, PRBool aDoFlush); nsContentListKey* GetKey() { - return NS_STATIC_CAST(nsContentListKey*, this); + return static_cast(this); } diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp index 086e3ab29470..ec59ea71539e 100644 --- a/content/base/src/nsContentSink.cpp +++ b/content/base/src/nsContentSink.cpp @@ -1352,12 +1352,12 @@ nsContentSink::DidProcessATokenImpl() // to pressing the ENTER key in the URL bar... PRUint32 delayBeforeLoweringThreshold = - NS_STATIC_CAST(PRUint32, ((2 * mDynamicIntervalSwitchThreshold) + + static_cast(((2 * mDynamicIntervalSwitchThreshold) + NS_DELAY_FOR_WINDOW_CREATION)); if ((currentTime - mBeginLoadTime) > delayBeforeLoweringThreshold) { if ((currentTime - eventTime) < - NS_STATIC_CAST(PRUint32, mDynamicIntervalSwitchThreshold)) { + static_cast(mDynamicIntervalSwitchThreshold)) { if (!mDynamicLowerValue) { // lower the dynamic values to favor application @@ -1380,7 +1380,7 @@ nsContentSink::DidProcessATokenImpl() } if ((currentTime - mDelayTimerStart) > - NS_STATIC_CAST(PRUint32, GetMaxTokenProcessingTime())) { + static_cast(GetMaxTokenProcessingTime())) { return NS_ERROR_HTMLPARSER_INTERRUPTED; } diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp index 7cc43bae1a91..3424e3070daf 100644 --- a/content/base/src/nsContentUtils.cpp +++ b/content/base/src/nsContentUtils.cpp @@ -227,7 +227,7 @@ PR_STATIC_CALLBACK(void) EventListenerManagerHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) { EventListenerManagerMapEntry *lm = - NS_STATIC_CAST(EventListenerManagerMapEntry *, entry); + static_cast(entry); // Let the EventListenerManagerMapEntry clean itself up... lm->~EventListenerManagerMapEntry(); @@ -690,7 +690,7 @@ nsContentUtils::Shutdown() if (sPtrsToPtrsToRelease) { for (i = 0; i < sPtrsToPtrsToRelease->Count(); ++i) { nsISupports** ptrToPtr = - NS_STATIC_CAST(nsISupports**, sPtrsToPtrsToRelease->ElementAt(i)); + static_cast(sPtrsToPtrsToRelease->ElementAt(i)); NS_RELEASE(*ptrToPtr); } delete sPtrsToPtrsToRelease; @@ -823,7 +823,7 @@ nsContentUtils::InProlog(nsINode *aNode) return PR_FALSE; } - nsIDocument* doc = NS_STATIC_CAST(nsIDocument*, parent); + nsIDocument* doc = static_cast(parent); nsIContent* root = doc->GetRootContent(); return !root || doc->IndexOf(aNode) < doc->IndexOf(root); @@ -1000,13 +1000,13 @@ nsContentUtils::ReparentContentWrappersInScope(nsIScriptGlobalObject *aOldScope, // Try really hard to find a context to work on. nsIScriptContext *context = aOldScope->GetContext(); if (context) { - cx = NS_STATIC_CAST(JSContext *, context->GetNativeContext()); + cx = static_cast(context->GetNativeContext()); } if (!cx) { context = aNewScope->GetContext(); if (context) { - cx = NS_STATIC_CAST(JSContext *, context->GetNativeContext()); + cx = static_cast(context->GetNativeContext()); } if (!cx) { @@ -1293,17 +1293,17 @@ nsContentUtils::ComparePosition(nsINode* aNode1, // Check if either node is an attribute nsIAttribute* attr1 = nsnull; if (aNode1->IsNodeOfType(nsINode::eATTRIBUTE)) { - attr1 = NS_STATIC_CAST(nsIAttribute*, aNode1); + attr1 = static_cast(aNode1); nsIContent* elem = attr1->GetContent(); // If there is an owner element add the attribute // to the chain and walk up to the element if (elem) { aNode1 = elem; - parents1.AppendElement(NS_STATIC_CAST(nsINode*, attr1)); + parents1.AppendElement(static_cast(attr1)); } } if (aNode2->IsNodeOfType(nsINode::eATTRIBUTE)) { - nsIAttribute* attr2 = NS_STATIC_CAST(nsIAttribute*, aNode2); + nsIAttribute* attr2 = static_cast(aNode2); nsIContent* elem = attr2->GetContent(); if (elem == aNode1 && attr1) { // Both nodes are attributes on the same element. @@ -1329,7 +1329,7 @@ nsContentUtils::ComparePosition(nsINode* aNode1, if (elem) { aNode2 = elem; - parents2.AppendElement(NS_STATIC_CAST(nsINode*, attr2)); + parents2.AppendElement(static_cast(attr2)); } } @@ -1374,8 +1374,8 @@ nsContentUtils::ComparePosition(nsINode* aNode1, // IndexOf will return -1 for the attribute making the attribute be // considered before any child. return parent->IndexOf(child1) < parent->IndexOf(child2) ? - NS_STATIC_CAST(PRUint16, nsIDOM3Node::DOCUMENT_POSITION_PRECEDING) : - NS_STATIC_CAST(PRUint16, nsIDOM3Node::DOCUMENT_POSITION_FOLLOWING); + static_cast(nsIDOM3Node::DOCUMENT_POSITION_PRECEDING) : + static_cast(nsIDOM3Node::DOCUMENT_POSITION_FOLLOWING); } parent = child1; } @@ -3039,8 +3039,8 @@ nsContentUtils::TraverseListenerManager(nsINode *aNode, } EventListenerManagerMapEntry *entry = - NS_STATIC_CAST(EventListenerManagerMapEntry *, - PL_DHashTableOperate(&sEventListenerManagersHash, aNode, + static_cast + (PL_DHashTableOperate(&sEventListenerManagersHash, aNode, PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_BUSY(entry)) { cb.NoteXPCOMChild(entry->mListenerManager); @@ -3067,8 +3067,8 @@ nsContentUtils::GetListenerManager(nsINode *aNode, if (!aCreateIfNotFound) { EventListenerManagerMapEntry *entry = - NS_STATIC_CAST(EventListenerManagerMapEntry *, - PL_DHashTableOperate(&sEventListenerManagersHash, aNode, + static_cast + (PL_DHashTableOperate(&sEventListenerManagersHash, aNode, PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_BUSY(entry)) { *aResult = entry->mListenerManager; @@ -3078,8 +3078,8 @@ nsContentUtils::GetListenerManager(nsINode *aNode, } EventListenerManagerMapEntry *entry = - NS_STATIC_CAST(EventListenerManagerMapEntry *, - PL_DHashTableOperate(&sEventListenerManagersHash, aNode, + static_cast + (PL_DHashTableOperate(&sEventListenerManagersHash, aNode, PL_DHASH_ADD)); if (!entry) { @@ -3112,8 +3112,8 @@ nsContentUtils::RemoveListenerManager(nsINode *aNode) { if (sEventListenerManagersHash.ops) { EventListenerManagerMapEntry *entry = - NS_STATIC_CAST(EventListenerManagerMapEntry *, - PL_DHashTableOperate(&sEventListenerManagersHash, aNode, + static_cast + (PL_DHashTableOperate(&sEventListenerManagersHash, aNode, PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_BUSY(entry)) { nsCOMPtr listenerManager; @@ -3426,7 +3426,7 @@ nsContentUtils::AppendNodeTextContent(nsINode* aNode, PRBool aDeep, nsAString& aResult) { if (aNode->IsNodeOfType(nsINode::eTEXT)) { - NS_STATIC_CAST(nsIContent*, aNode)->AppendTextTo(aResult); + static_cast(aNode)->AppendTextTo(aResult); } else if (aDeep) { AppendNodeTextContentsRecurse(aNode, aResult); @@ -3478,7 +3478,7 @@ nsContentUtils::IsInSameAnonymousTree(nsINode* aNode, return aContent->GetBindingParent() == nsnull; } - return NS_STATIC_CAST(nsIContent*, aNode)->GetBindingParent() == + return static_cast(aNode)->GetBindingParent() == aContent->GetBindingParent(); } diff --git a/content/base/src/nsDOMAttribute.cpp b/content/base/src/nsDOMAttribute.cpp index 32d4da317d34..d01023df0353 100644 --- a/content/base/src/nsDOMAttribute.cpp +++ b/content/base/src/nsDOMAttribute.cpp @@ -366,7 +366,7 @@ nsresult nsDOMAttribute::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const { nsAutoString value; - NS_CONST_CAST(nsDOMAttribute*, this)->GetValue(value); + const_cast(this)->GetValue(value); *aResult = new nsDOMAttribute(nsnull, aNodeInfo, value); if (!*aResult) { @@ -469,7 +469,7 @@ nsDOMAttribute::IsSupported(const nsAString& aFeature, const nsAString& aVersion, PRBool* aReturn) { - return nsGenericElement::InternalIsSupported(NS_STATIC_CAST(nsIDOMAttr*, this), + return nsGenericElement::InternalIsSupported(static_cast(this), aFeature, aVersion, aReturn); } @@ -503,7 +503,7 @@ nsDOMAttribute::IsSameNode(nsIDOMNode* aOther, { NS_ASSERTION(aReturn, "IsSameNode() called with aReturn == nsnull!"); - *aReturn = SameCOMIdentity(NS_STATIC_CAST(nsIDOMNode*, this), aOther); + *aReturn = SameCOMIdentity(static_cast(this), aOther); return NS_OK; } @@ -572,7 +572,7 @@ nsDOMAttribute::GetFeature(const nsAString& aFeature, const nsAString& aVersion, nsISupports** aReturn) { - return nsGenericElement::InternalGetFeature(NS_STATIC_CAST(nsIDOMAttr*, this), + return nsGenericElement::InternalGetFeature(static_cast(this), aFeature, aVersion, aReturn); } @@ -768,7 +768,7 @@ nsDOMAttribute::EnsureChildState(PRBool aSetText, PRBool &aHasChild) const { aHasChild = PR_FALSE; - nsDOMAttribute* mutableThis = NS_CONST_CAST(nsDOMAttribute*, this); + nsDOMAttribute* mutableThis = const_cast(this); nsAutoString value; mutableThis->GetValue(value); diff --git a/content/base/src/nsDOMAttributeMap.cpp b/content/base/src/nsDOMAttributeMap.cpp index f995a4b46e19..53f6fdffa7d9 100644 --- a/content/base/src/nsDOMAttributeMap.cpp +++ b/content/base/src/nsDOMAttributeMap.cpp @@ -101,7 +101,7 @@ PLDHashOperator TraverseMapEntry(nsAttrHashKey::KeyType aKey, nsCOMPtr& aData, void* aUserArg) { nsCycleCollectionTraversalCallback *cb = - NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aUserArg); + static_cast(aUserArg); cb->NoteXPCOMChild(aData.get()); @@ -129,7 +129,7 @@ SetOwnerDocumentFunc(nsAttrHashKey::KeyType aKey, nsCOMPtr& aData, { nsCOMPtr attr(do_QueryInterface(aData)); NS_ASSERTION(attr, "non-nsIAttribute somehow made it into the hashmap?!"); - nsresult rv = attr->SetOwnerDocument(NS_STATIC_CAST(nsIDocument*, aUserArg)); + nsresult rv = attr->SetOwnerDocument(static_cast(aUserArg)); return NS_FAILED(rv) ? PL_DHASH_STOP : PL_DHASH_NEXT; } diff --git a/content/base/src/nsDOMParser.cpp b/content/base/src/nsDOMParser.cpp index e225dc15eda2..67306825241a 100644 --- a/content/base/src/nsDOMParser.cpp +++ b/content/base/src/nsDOMParser.cpp @@ -163,7 +163,7 @@ nsDOMParser::ParseFromBuffer(const PRUint8 *buf, // The new stream holds a reference to the buffer nsCOMPtr stream; nsresult rv = NS_NewByteInputStream(getter_AddRefs(stream), - NS_REINTERPRET_CAST(const char *, buf), + reinterpret_cast(buf), bufLen, NS_ASSIGNMENT_DEPEND); if (NS_FAILED(rv)) return rv; @@ -225,13 +225,12 @@ nsDOMParser::ParseFromStream(nsIInputStream *stream, // Register as a load listener on the document nsCOMPtr target(do_QueryInterface(domDocument)); if (target) { - nsWeakPtr requestWeak(do_GetWeakReference(NS_STATIC_CAST(nsIDOMParser*, this))); + nsWeakPtr requestWeak(do_GetWeakReference(static_cast(this))); nsLoadListenerProxy* proxy = new nsLoadListenerProxy(requestWeak); if (!proxy) return NS_ERROR_OUT_OF_MEMORY; // This will addref the proxy - rv = target->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMEventListener*, - proxy), + rv = target->AddEventListenerByIID(static_cast(proxy), NS_GET_IID(nsIDOMLoadListener)); NS_ENSURE_SUCCESS(rv, rv); } diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index b8fbd645a7b7..754244e9fc67 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -258,8 +258,8 @@ nsUint32ToContentHashEntryVisitorCallback(nsISupportsHashKey* aEntry, void* aClosure) { nsUint32ToContentHashEntry::Visitor* visitor = - NS_STATIC_CAST(nsUint32ToContentHashEntry::Visitor*, aClosure); - visitor->Visit(NS_STATIC_CAST(nsIContent*, aEntry->GetKey())); + static_cast(aClosure); + visitor->Visit(static_cast(aEntry->GetKey())); return PL_DHASH_NEXT; } @@ -673,7 +673,7 @@ nsDOMImplementation::HasFeature(const nsAString& aFeature, PRBool* aReturn) { return nsGenericElement::InternalIsSupported( - NS_STATIC_CAST(nsIDOMDOMImplementation*, this), + static_cast(this), aFeature, aVersion, aReturn); } @@ -786,7 +786,7 @@ nsDocument::~nsDocument() #endif #ifdef DEBUG - nsCycleCollector_DEBUG_wasFreed(NS_STATIC_CAST(nsIDocument*, this)); + nsCycleCollector_DEBUG_wasFreed(static_cast(this)); #endif mInDestructor = PR_TRUE; @@ -913,7 +913,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDocument) nsresult rv; mXPathEvaluatorTearoff = do_CreateInstance(NS_XPATH_EVALUATOR_CONTRACTID, - NS_STATIC_CAST(nsIDocument *, this), &rv); + static_cast(this), &rv); NS_ENSURE_SUCCESS(rv, rv); } @@ -933,9 +933,9 @@ PR_STATIC_CALLBACK(PLDHashOperator) SubDocTraverser(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { - SubDocMapEntry *entry = NS_STATIC_CAST(SubDocMapEntry*, hdr); + SubDocMapEntry *entry = static_cast(hdr); nsCycleCollectionTraversalCallback *cb = - NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, arg); + static_cast(arg); cb->NoteXPCOMChild(entry->mKey); cb->NoteXPCOMChild(entry->mSubDocument); @@ -946,16 +946,16 @@ SubDocTraverser(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, PR_STATIC_CALLBACK(PRIntn) RadioGroupsTraverser(nsHashKey *aKey, void *aData, void* aClosure) { - nsRadioGroupStruct *entry = NS_STATIC_CAST(nsRadioGroupStruct*, aData); + nsRadioGroupStruct *entry = static_cast(aData); nsCycleCollectionTraversalCallback *cb = - NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aClosure); + static_cast(aClosure); cb->NoteXPCOMChild(entry->mSelectedRadioButton); nsSmallVoidArray &radioButtons = entry->mRadioButtons; PRUint32 i, count = radioButtons.Count(); for (i = 0; i < count; ++i) { - cb->NoteXPCOMChild(NS_STATIC_CAST(nsIFormControl*, radioButtons[i])); + cb->NoteXPCOMChild(static_cast(radioButtons[i])); } @@ -966,7 +966,7 @@ PR_STATIC_CALLBACK(PLDHashOperator) BoxObjectTraverser(nsISupports* key, nsPIBoxObject* boxObject, void* userArg) { nsCycleCollectionTraversalCallback *cb = - NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, userArg); + static_cast(userArg); cb->NoteXPCOMChild(key); cb->NoteXPCOMChild(boxObject); @@ -988,7 +988,7 @@ PLDHashOperator PR_CALLBACK LinkMapTraverser(nsUint32ToContentHashEntry* aEntry, void* userArg) { LinkMapTraversalVisitor visitor; - visitor.mCb = NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, userArg); + visitor.mCb = static_cast(userArg); aEntry->VisitContent(&visitor); return PL_DHASH_NEXT; } @@ -1622,7 +1622,7 @@ nsDocument::GetActiveElement(nsIDOMElement **aElement) // No focused element anywhere in this document. Try to get the BODY. nsCOMPtr htmlDoc = - do_QueryInterface(NS_STATIC_CAST(nsIDocument*, this)); + do_QueryInterface(static_cast(this)); if (htmlDoc) { nsCOMPtr bodyElement; htmlDoc->GetBody(getter_AddRefs(bodyElement)); @@ -1694,7 +1694,7 @@ nsDocument::MatchClassNames(nsIContent* aContent, } // need to match *all* of the classes - nsCOMArray* classes = NS_STATIC_CAST(nsCOMArray*, aData); + nsCOMArray* classes = static_cast*>(aData); PRInt32 length = classes->Count(); PRInt32 i; for (i = 0; i < length; ++i) { @@ -1710,7 +1710,7 @@ nsDocument::MatchClassNames(nsIContent* aContent, void nsDocument::DestroyClassNameArray(void* aData) { - nsCOMArray* classes = NS_STATIC_CAST(nsCOMArray*, aData); + nsCOMArray* classes = static_cast*>(aData); delete classes; } @@ -1765,9 +1765,9 @@ nsDocument::SetDocumentCharacterSet(const nsACString& aCharSetID) for (PRInt32 i = 0; i < n; i++) { nsIObserver* observer = - NS_STATIC_CAST(nsIObserver *, mCharSetObservers.ElementAt(i)); + static_cast(mCharSetObservers.ElementAt(i)); - observer->Observe(NS_STATIC_CAST(nsIDocument *, this), "charset", + observer->Observe(static_cast(this), "charset", NS_ConvertASCIItoUTF16(aCharSetID).get()); } } @@ -1979,7 +1979,7 @@ nsDocument::GetPrimaryShell() const PR_STATIC_CALLBACK(void) SubDocClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) { - SubDocMapEntry *e = NS_STATIC_CAST(SubDocMapEntry *, entry); + SubDocMapEntry *e = static_cast(entry); NS_RELEASE(e->mKey); NS_IF_RELEASE(e->mSubDocument); @@ -1989,11 +1989,11 @@ PR_STATIC_CALLBACK(PRBool) SubDocInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, const void *key) { SubDocMapEntry *e = - NS_CONST_CAST(SubDocMapEntry *, - NS_STATIC_CAST(const SubDocMapEntry *, entry)); + const_cast + (static_cast(entry)); - e->mKey = NS_CONST_CAST(nsIContent *, - NS_STATIC_CAST(const nsIContent *, key)); + e->mKey = const_cast + (static_cast(key)); NS_ADDREF(e->mKey); e->mSubDocument = nsnull; @@ -2010,8 +2010,8 @@ nsDocument::SetSubDocumentFor(nsIContent *aContent, nsIDocument* aSubDoc) if (mSubDocuments) { SubDocMapEntry *entry = - NS_STATIC_CAST(SubDocMapEntry*, - PL_DHashTableOperate(mSubDocuments, aContent, + static_cast + (PL_DHashTableOperate(mSubDocuments, aContent, PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_BUSY(entry)) { @@ -2045,8 +2045,8 @@ nsDocument::SetSubDocumentFor(nsIContent *aContent, nsIDocument* aSubDoc) // Add a mapping to the hash table SubDocMapEntry *entry = - NS_STATIC_CAST(SubDocMapEntry*, - PL_DHashTableOperate(mSubDocuments, aContent, + static_cast + (PL_DHashTableOperate(mSubDocuments, aContent, PL_DHASH_ADD)); if (!entry) { @@ -2074,8 +2074,8 @@ nsDocument::GetSubDocumentFor(nsIContent *aContent) const { if (mSubDocuments) { SubDocMapEntry *entry = - NS_STATIC_CAST(SubDocMapEntry*, - PL_DHashTableOperate(mSubDocuments, aContent, + static_cast + (PL_DHashTableOperate(mSubDocuments, aContent, PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_BUSY(entry)) { @@ -2090,8 +2090,8 @@ PR_STATIC_CALLBACK(PLDHashOperator) FindContentEnumerator(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { - SubDocMapEntry *entry = NS_STATIC_CAST(SubDocMapEntry*, hdr); - FindContentData *data = NS_STATIC_CAST(FindContentData*, arg); + SubDocMapEntry *entry = static_cast(hdr); + FindContentData *data = static_cast(arg); if (entry->mSubDocument == data->mSubDocument) { data->mResult = entry->mKey; @@ -2683,7 +2683,7 @@ nsDocument::DispatchContentLoadedEvents() // Fire a DOM event notifying listeners that this document has been // loaded (excluding images and other loads initiated by this // document). - nsContentUtils::DispatchTrustedEvent(this, NS_STATIC_CAST(nsIDocument*, this), + nsContentUtils::DispatchTrustedEvent(this, static_cast(this), NS_LITERAL_STRING("DOMContentLoaded"), PR_TRUE, PR_TRUE); @@ -3436,7 +3436,7 @@ nsDocument::LoadBindingDocument(const nsAString& aURI) nsCOMPtr uri; nsresult rv = NS_NewURI(getter_AddRefs(uri), aURI, mCharacterSet.get(), - NS_STATIC_CAST(nsIDocument *, this)->GetBaseURI()); + static_cast(this)->GetBaseURI()); NS_ENSURE_SUCCESS(rv, rv); mBindingManager->LoadBindingDocument(this, uri); @@ -3636,7 +3636,7 @@ nsDocument::SetTitle(const nsAString& aTitle) mDocumentTitle.Assign(aTitle); // Fire a DOM event for the title change. - nsContentUtils::DispatchTrustedEvent(this, NS_STATIC_CAST(nsIDocument*, this), + nsContentUtils::DispatchTrustedEvent(this, static_cast(this), NS_LITERAL_STRING("DOMTitleChanged"), PR_TRUE, PR_TRUE); @@ -4018,7 +4018,7 @@ NS_IMETHODIMP nsDocument::IsSupported(const nsAString& aFeature, const nsAString& aVersion, PRBool* aReturn) { - return nsGenericElement::InternalIsSupported(NS_STATIC_CAST(nsIDOMDocument*, this), + return nsGenericElement::InternalIsSupported(static_cast(this), aFeature, aVersion, aReturn); } @@ -4131,7 +4131,7 @@ nsDocument::GetFeature(const nsAString& aFeature, const nsAString& aVersion, nsISupports** aReturn) { - return nsGenericElement::InternalGetFeature(NS_STATIC_CAST(nsIDOMDocument*, this), + return nsGenericElement::InternalGetFeature(static_cast(this), aFeature, aVersion, aReturn); } @@ -4274,7 +4274,7 @@ PLDHashOperator PR_CALLBACK BlastFunc(nsAttrHashKey::KeyType aKey, nsIDOMNode *aData, void* aUserArg) { nsCOMPtr *attr = - NS_STATIC_CAST(nsCOMPtr*, aUserArg); + static_cast*>(aUserArg); *attr = do_QueryInterface(aData); @@ -4289,7 +4289,7 @@ BlastSubtreeToPieces(nsINode *aNode) { PRUint32 i, count; if (aNode->IsNodeOfType(nsINode::eELEMENT)) { - nsGenericElement *element = NS_STATIC_CAST(nsGenericElement*, aNode); + nsGenericElement *element = static_cast(aNode); const nsDOMAttributeMap *map = element->GetAttributeMap(); if (map) { nsCOMPtr attr; @@ -4523,7 +4523,7 @@ nsDocument::GetListenerManager(PRBool aCreateIfNotFound, nsresult rv = NS_NewEventListenerManager(getter_AddRefs(mListenerManager)); NS_ENSURE_SUCCESS(rv, rv); - mListenerManager->SetListenerTarget(NS_STATIC_CAST(nsIDocument *,this)); + mListenerManager->SetListenerTarget(static_cast(this)); *aInstancePtrResult = mListenerManager; NS_ADDREF(*aInstancePtrResult); @@ -4570,7 +4570,7 @@ nsDocument::DispatchDOMEvent(nsEvent* aEvent, nsPresContext* aPresContext, nsEventStatus* aEventStatus) { - return nsEventDispatcher::DispatchDOMEvent(NS_STATIC_CAST(nsINode*, this), + return nsEventDispatcher::DispatchDOMEvent(static_cast(this), aEvent, aDOMEvent, aPresContext, aEventStatus); } @@ -4632,7 +4632,7 @@ nsDocument::DispatchEvent(nsIDOMEvent* aEvent, PRBool *_retval) nsEventStatus status = nsEventStatus_eIgnore; nsresult rv = - nsEventDispatcher::DispatchDOMEvent(NS_STATIC_CAST(nsINode*, this), + nsEventDispatcher::DispatchDOMEvent(static_cast(this), nsnull, aEvent, context, &status); *_retval = (status != nsEventStatus_eConsumeNoDefault); @@ -4931,7 +4931,7 @@ nsDocument::GetRadioGroup(const nsAString& aName, ToLowerCase(tmKey); //should case-insensitive. nsStringKey key(tmKey); nsRadioGroupStruct *radioGroup = - NS_STATIC_CAST(nsRadioGroupStruct *, mRadioGroups.Get(&key)); + static_cast(mRadioGroups.Get(&key)); if (!radioGroup) { radioGroup = new nsRadioGroupStruct(); @@ -5045,8 +5045,7 @@ nsDocument::GetNextRadioButton(const nsAString& aName, else if (++index >= numRadios) { index = 0; } - radio = do_QueryInterface(NS_STATIC_CAST(nsIFormControl*, - radioGroup->mRadioButtons.ElementAt(index))); + radio = do_QueryInterface(static_cast(radioGroup->mRadioButtons.ElementAt(index))); NS_ASSERTION(radio, "mRadioButtons holding a non-radio button"); radio->GetDisabled(&disabled); } while (disabled && radio != currentRadio); @@ -5097,8 +5096,8 @@ nsDocument::WalkRadioGroup(const nsAString& aName, PRBool stop = PR_FALSE; for (int i = 0; i < radioGroup->mRadioButtons.Count(); i++) { - aVisitor->Visit(NS_STATIC_CAST(nsIFormControl *, - radioGroup->mRadioButtons.ElementAt(i)), + aVisitor->Visit(static_cast + (radioGroup->mRadioButtons.ElementAt(i)), &stop); if (stop) { return NS_OK; @@ -5245,8 +5244,8 @@ PRBool nsDocument::IsSafeToFlush() const { PRBool isSafeToFlush = PR_TRUE; - nsPresShellIterator iter(NS_CONST_CAST(nsIDocument*, - NS_STATIC_CAST(const nsIDocument*, this))); + nsPresShellIterator iter(const_cast + (static_cast(this))); nsCOMPtr shell; while ((shell = iter.GetNextShell()) && isSafeToFlush) { shell->IsSafeToFlush(isSafeToFlush); @@ -5338,8 +5337,8 @@ PR_STATIC_CALLBACK(PLDHashOperator) SubDocHashEnum(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { - SubDocMapEntry *entry = NS_STATIC_CAST(SubDocMapEntry*, hdr); - SubDocEnumArgs *args = NS_STATIC_CAST(SubDocEnumArgs*, arg); + SubDocMapEntry *entry = static_cast(hdr); + SubDocEnumArgs *args = static_cast(arg); nsIDocument *subdoc = entry->mSubDocument; PRBool next = subdoc ? args->callback(subdoc, args->data) : PR_TRUE; @@ -5360,8 +5359,8 @@ PR_STATIC_CALLBACK(PLDHashOperator) CanCacheSubDocument(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { - SubDocMapEntry *entry = NS_STATIC_CAST(SubDocMapEntry*, hdr); - PRBool *canCacheArg = NS_STATIC_CAST(PRBool*, arg); + SubDocMapEntry *entry = static_cast(hdr); + PRBool *canCacheArg = static_cast(arg); nsIDocument *subdoc = entry->mSubDocument; @@ -5565,7 +5564,7 @@ nsDocument::CheckAncestryAndGetFrame(nsIDocument* aDocument) const { nsIDocument* parentDoc; for (parentDoc = aDocument->GetParentDocument(); - parentDoc != NS_STATIC_CAST(const nsIDocument* const, this); + parentDoc != static_cast(this); parentDoc = parentDoc->GetParentDocument()) { if (!parentDoc) { return nsnull; @@ -5603,7 +5602,7 @@ nsDocument::DispatchEventToWindow(nsEvent *aEvent) if (!window) return; - aEvent->target = NS_STATIC_CAST(nsIDocument*, this); + aEvent->target = static_cast(this); nsEventDispatcher::Dispatch(window, nsnull, aEvent); } diff --git a/content/base/src/nsDocument.h b/content/base/src/nsDocument.h index 3b0a77b9718d..fc7c35c5e4b3 100644 --- a/content/base/src/nsDocument.h +++ b/content/base/src/nsDocument.h @@ -153,7 +153,7 @@ class nsUint32ToContentHashEntry : public PLDHashEntryHdr // Pathetic attempt to not die: clear out the other mValOrHash so we're // effectively stealing it. If toCopy is destroyed right after this, // we'll be OK. - NS_CONST_CAST(nsUint32ToContentHashEntry&, toCopy).mValOrHash = nsnull; + const_cast(toCopy).mValOrHash = nsnull; NS_ERROR("Copying not supported. Fasten your seat belt."); } ~nsUint32ToContentHashEntry() { Destroy(); } diff --git a/content/base/src/nsDocumentEncoder.cpp b/content/base/src/nsDocumentEncoder.cpp index 1ad83cbf729f..120f7a1263b8 100644 --- a/content/base/src/nsDocumentEncoder.cpp +++ b/content/base/src/nsDocumentEncoder.cpp @@ -649,11 +649,11 @@ nsDocumentEncoder::SerializeRangeNodes(nsIDOMRange* aRange, nsCOMPtr startNode, endNode; PRInt32 start = mStartRootIndex - aDepth; if (start >= 0 && start <= mStartNodes.Count()) - startNode = NS_STATIC_CAST(nsIContent *, mStartNodes[start]); + startNode = static_cast(mStartNodes[start]); PRInt32 end = mEndRootIndex - aDepth; if (end >= 0 && end <= mEndNodes.Count()) - endNode = NS_STATIC_CAST(nsIContent *, mEndNodes[end]); + endNode = static_cast(mEndNodes[end]); if ((startNode != content) && (endNode != content)) { @@ -1236,7 +1236,7 @@ nsHTMLCopyEncoder::EncodeToStringWithContext(nsAString& aContextString, PRInt32 i; nsCOMPtr node; if (count > 0) - node = NS_STATIC_CAST(nsIDOMNode *, mCommonAncestors.ElementAt(0)); + node = static_cast(mCommonAncestors.ElementAt(0)); if (node && IsTextNode(node)) { @@ -1251,13 +1251,13 @@ nsHTMLCopyEncoder::EncodeToStringWithContext(nsAString& aContextString, i = count; while (i > 0) { - node = NS_STATIC_CAST(nsIDOMNode *, mCommonAncestors.ElementAt(--i)); + node = static_cast(mCommonAncestors.ElementAt(--i)); SerializeNodeStart(node, 0, -1, aContextString); } //i = 0; guaranteed by above while (i < count) { - node = NS_STATIC_CAST(nsIDOMNode *, mCommonAncestors.ElementAt(i++)); + node = static_cast(mCommonAncestors.ElementAt(i++)); SerializeNodeEnd(node, aContextString); } diff --git a/content/base/src/nsGenericDOMDataNode.cpp b/content/base/src/nsGenericDOMDataNode.cpp index 71dc85ef87d2..5f436eae71b4 100644 --- a/content/base/src/nsGenericDOMDataNode.cpp +++ b/content/base/src/nsGenericDOMDataNode.cpp @@ -236,7 +236,7 @@ nsGenericDOMDataNode::IsSupported(const nsAString& aFeature, const nsAString& aVersion, PRBool* aReturn) { - return nsGenericElement::InternalIsSupported(NS_STATIC_CAST(nsIContent*, this), + return nsGenericElement::InternalIsSupported(static_cast(this), aFeature, aVersion, aReturn); } @@ -580,10 +580,10 @@ nsGenericDOMDataNode::BindToTree(nsIDocument* aDocument, nsIContent* aParent, // Set parent if (aParent) { mParentPtrBits = - NS_REINTERPRET_CAST(PtrBits, aParent) | PARENT_BIT_PARENT_IS_CONTENT; + reinterpret_cast(aParent) | PARENT_BIT_PARENT_IS_CONTENT; } else { - mParentPtrBits = NS_REINTERPRET_CAST(PtrBits, aDocument); + mParentPtrBits = reinterpret_cast(aDocument); } // XXXbz sXBL/XBL2 issue! @@ -702,7 +702,7 @@ nsGenericDOMDataNode::DispatchDOMEvent(nsEvent* aEvent, nsPresContext* aPresContext, nsEventStatus* aEventStatus) { - return nsEventDispatcher::DispatchDOMEvent(NS_STATIC_CAST(nsINode*, this), + return nsEventDispatcher::DispatchDOMEvent(static_cast(this), aEvent, aDOMEvent, aPresContext, aEventStatus); } diff --git a/content/base/src/nsGenericDOMDataNode.h b/content/base/src/nsGenericDOMDataNode.h index 94209db51c23..dedcbcd51c95 100644 --- a/content/base/src/nsGenericDOMDataNode.h +++ b/content/base/src/nsGenericDOMDataNode.h @@ -298,12 +298,12 @@ protected: nsDataSlots *GetDataSlots() { - return NS_STATIC_CAST(nsDataSlots*, GetSlots()); + return static_cast(GetSlots()); } nsDataSlots *GetExistingDataSlots() const { - return NS_STATIC_CAST(nsDataSlots*, GetExistingSlots()); + return static_cast(GetExistingSlots()); } nsresult SplitText(PRUint32 aOffset, nsIDOMText** aReturn); diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp index 523b57383232..52cff1743053 100644 --- a/content/base/src/nsGenericElement.cpp +++ b/content/base/src/nsGenericElement.cpp @@ -1091,7 +1091,7 @@ nsGenericElement::~nsGenericElement() NS_PRECONDITION(!IsInDoc(), "Please remove this from the document properly"); #ifdef DEBUG - nsCycleCollector_DEBUG_wasFreed(NS_STATIC_CAST(nsINode*, this)); + nsCycleCollector_DEBUG_wasFreed(static_cast(this)); #endif } @@ -1959,14 +1959,14 @@ nsGenericElement::BindToTree(nsIDocument* aDocument, nsIContent* aParent, // Now set the parent and set the "Force attach xbl" flag if needed. if (aParent) { - mParentPtrBits = NS_REINTERPRET_CAST(PtrBits, aParent) | PARENT_BIT_PARENT_IS_CONTENT; + mParentPtrBits = reinterpret_cast(aParent) | PARENT_BIT_PARENT_IS_CONTENT; if (aParent->HasFlag(NODE_FORCE_XBL_BINDINGS)) { SetFlags(NODE_FORCE_XBL_BINDINGS); } } else { - mParentPtrBits = NS_REINTERPRET_CAST(PtrBits, aDocument); + mParentPtrBits = reinterpret_cast(aDocument); } // XXXbz sXBL/XBL2 issue! @@ -2109,7 +2109,7 @@ nsGenericElement::UnbindFromTree(PRBool aDeep, PRBool aNullParent) nsNodeUtils::ParentChainChanged(this); #ifdef DEBUG - nsCycleCollector_DEBUG_shouldBeFreed(NS_STATIC_CAST(nsINode*, this)); + nsCycleCollector_DEBUG_shouldBeFreed(static_cast(this)); #endif } @@ -2150,8 +2150,8 @@ nsGenericElement::doPreHandleEvent(nsIContent* aContent, if (aVisitor.mEvent->message == NS_MOUSE_ENTER_SYNTH || aVisitor.mEvent->message == NS_MOUSE_EXIT_SYNTH) { nsCOMPtr relatedTarget = - do_QueryInterface(NS_STATIC_CAST(nsMouseEvent*, - aVisitor.mEvent)->relatedTarget); + do_QueryInterface(static_cast + (aVisitor.mEvent)->relatedTarget); if (relatedTarget && relatedTarget->GetOwnerDoc() == aContent->GetOwnerDoc()) { @@ -2231,7 +2231,7 @@ nsGenericElement::DispatchDOMEvent(nsEvent* aEvent, nsPresContext* aPresContext, nsEventStatus* aEventStatus) { - return nsEventDispatcher::DispatchDOMEvent(NS_STATIC_CAST(nsIContent*, this), + return nsEventDispatcher::DispatchDOMEvent(static_cast(this), aEvent, aDOMEvent, aPresContext, aEventStatus); } @@ -2256,7 +2256,7 @@ nsGenericElement::GetID() const nsAutoString idVal(attrVal->GetStringValue()); // Create an atom from the value and set it into the attribute list. - NS_CONST_CAST(nsAttrValue*, attrVal)->ParseAtom(idVal); + const_cast(attrVal)->ParseAtom(idVal); return attrVal->GetAtomValue(); } } @@ -2699,7 +2699,7 @@ nsGenericElement::doRemoveChildAt(PRUint32 aIndex, PRBool aNotify, // was processing. if (guard.Mutated(0)) { aIndex = container->IndexOf(aKid); - if (NS_STATIC_CAST(PRInt32, aIndex) < 0) { + if (static_cast(aIndex) < 0) { return NS_OK; } } @@ -2760,7 +2760,7 @@ nsGenericElement::DispatchClickEvent(nsPresContext* aPresContext, event.refPoint = aSourceEvent->refPoint; PRUint32 clickCount = 1; if (aSourceEvent->eventStructType == NS_MOUSE_EVENT) { - clickCount = NS_STATIC_CAST(nsMouseEvent*, aSourceEvent)->clickCount; + clickCount = static_cast(aSourceEvent)->clickCount; } event.clickCount = clickCount; event.isShift = aSourceEvent->isShift; @@ -3325,11 +3325,11 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsGenericElement) if (tmp->HasProperties() && tmp->IsNodeOfType(nsINode::eXUL)) { nsISupports* property = - NS_STATIC_CAST(nsISupports*, - tmp->GetProperty(nsGkAtoms::contextmenulistener)); + static_cast + (tmp->GetProperty(nsGkAtoms::contextmenulistener)); cb.NoteXPCOMChild(property); - property = NS_STATIC_CAST(nsISupports*, - tmp->GetProperty(nsGkAtoms::popuplistener)); + property = static_cast + (tmp->GetProperty(nsGkAtoms::popuplistener)); cb.NoteXPCOMChild(property); } @@ -3576,8 +3576,8 @@ nsGenericElement::SetAttrAndNotify(PRInt32 aNamespaceID, { nsresult rv; PRUint8 modType = aModification ? - NS_STATIC_CAST(PRUint8, nsIDOMMutationEvent::MODIFICATION) : - NS_STATIC_CAST(PRUint8, nsIDOMMutationEvent::ADDITION); + static_cast(nsIDOMMutationEvent::MODIFICATION) : + static_cast(nsIDOMMutationEvent::ADDITION); nsIDocument* document = GetCurrentDoc(); mozAutoDocUpdate updateBatch(document, UPDATE_CONTENT_MODEL, aNotify); @@ -3683,7 +3683,7 @@ nsGenericElement::GetEventListenerManagerForAttr(nsIEventListenerManager** aMana { nsresult rv = GetListenerManager(PR_TRUE, aManager); if (NS_SUCCEEDED(rv)) { - NS_ADDREF(*aTarget = NS_STATIC_CAST(nsIContent*, this)); + NS_ADDREF(*aTarget = static_cast(this)); } *aDefer = PR_TRUE; return rv; @@ -3850,7 +3850,7 @@ nsGenericElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, if (hasMutationListeners) { nsCOMPtr node = - do_QueryInterface(NS_STATIC_CAST(nsIContent *, this)); + do_QueryInterface(static_cast(this)); nsMutationEvent mutation(PR_TRUE, NS_MUTATION_ATTRMODIFIED); mutation.mRelatedNode = attrNode; @@ -3990,7 +3990,7 @@ nsGenericElement::List(FILE* out, PRInt32 aIndent, fputs(">\n", out); - nsGenericElement* nonConstThis = NS_CONST_CAST(nsGenericElement*, this); + nsGenericElement* nonConstThis = const_cast(this); // XXX sXBL/XBL2 issue! Owner or current document? nsIDocument *document = GetOwnerDoc(); @@ -4198,7 +4198,7 @@ nsGenericElement::PostHandleEventForLinks(nsEventChainPostVisitor& aVisitor) case NS_MOUSE_BUTTON_DOWN: { if (aVisitor.mEvent->eventStructType == NS_MOUSE_EVENT && - NS_STATIC_CAST(nsMouseEvent*, aVisitor.mEvent)->button == + static_cast(aVisitor.mEvent)->button == nsMouseEvent::eLeftButton) { // don't make the link grab the focus if there is no link handler nsILinkHandler *handler = aVisitor.mPresContext->GetLinkHandler(); @@ -4232,7 +4232,7 @@ nsGenericElement::PostHandleEventForLinks(nsEventChainPostVisitor& aVisitor) case NS_MOUSE_CLICK: if (NS_IS_MOUSE_LEFT_CLICK(aVisitor.mEvent)) { - nsInputEvent* inputEvent = NS_STATIC_CAST(nsInputEvent*, aVisitor.mEvent); + nsInputEvent* inputEvent = static_cast(aVisitor.mEvent); if (inputEvent->isControl || inputEvent->isMeta || inputEvent->isAlt ||inputEvent->isShift) { break; @@ -4262,7 +4262,7 @@ nsGenericElement::PostHandleEventForLinks(nsEventChainPostVisitor& aVisitor) case NS_KEY_PRESS: { if (aVisitor.mEvent->eventStructType == NS_KEY_EVENT) { - nsKeyEvent* keyEvent = NS_STATIC_CAST(nsKeyEvent*, aVisitor.mEvent); + nsKeyEvent* keyEvent = static_cast(aVisitor.mEvent); if (keyEvent->keyCode == NS_VK_RETURN) { nsEventStatus status = nsEventStatus_eIgnore; rv = DispatchClickEvent(aVisitor.mPresContext, keyEvent, this, diff --git a/content/base/src/nsGenericElement.h b/content/base/src/nsGenericElement.h index bd7453480175..b6103e0e22f7 100644 --- a/content/base/src/nsGenericElement.h +++ b/content/base/src/nsGenericElement.h @@ -309,7 +309,7 @@ public: */ PRBool Mutated(PRUint8 aIgnoreCount) { - return sMutationCount < NS_STATIC_CAST(PRUint32, eMaxMutations - aIgnoreCount); + return sMutationCount < static_cast(eMaxMutations - aIgnoreCount); } // This function should be called whenever a mutation that we want to keep @@ -960,12 +960,12 @@ protected: nsDOMSlots *GetDOMSlots() { - return NS_STATIC_CAST(nsDOMSlots*, GetSlots()); + return static_cast(GetSlots()); } nsDOMSlots *GetExistingDOMSlots() const { - return NS_STATIC_CAST(nsDOMSlots*, GetExistingSlots()); + return static_cast(GetExistingSlots()); } /** diff --git a/content/base/src/nsMappedAttributes.cpp b/content/base/src/nsMappedAttributes.cpp index a90b74c7a78e..eb0f7634a780 100644 --- a/content/base/src/nsMappedAttributes.cpp +++ b/content/base/src/nsMappedAttributes.cpp @@ -99,7 +99,7 @@ void* nsMappedAttributes::operator new(size_t aSize, PRUint32 aAttrCount) CPP_TH #ifdef DEBUG if (newAttrs) { - NS_STATIC_CAST(nsMappedAttributes*, newAttrs)->mBufferSize = aAttrCount; + static_cast(newAttrs)->mBufferSize = aAttrCount; } #endif diff --git a/content/base/src/nsMappedAttributes.h b/content/base/src/nsMappedAttributes.h index cd826319a175..9f00c6853b05 100644 --- a/content/base/src/nsMappedAttributes.h +++ b/content/base/src/nsMappedAttributes.h @@ -127,11 +127,11 @@ private: */ const InternalAttr* Attrs() const { - return NS_REINTERPRET_CAST(const InternalAttr*, &(mAttrs[0])); + return reinterpret_cast(&(mAttrs[0])); } InternalAttr* Attrs() { - return NS_REINTERPRET_CAST(InternalAttr*, &(mAttrs[0])); + return reinterpret_cast(&(mAttrs[0])); } PRUint16 mAttrCount; diff --git a/content/base/src/nsNodeInfoManager.cpp b/content/base/src/nsNodeInfoManager.cpp index 65f629e878e0..83e956e8643d 100644 --- a/content/base/src/nsNodeInfoManager.cpp +++ b/content/base/src/nsNodeInfoManager.cpp @@ -60,7 +60,7 @@ nsNodeInfoManager::GetNodeInfoInnerHashValue(const void *key) NS_ASSERTION(key, "Null key passed to nsNodeInfo::GetHashValue!"); const nsINodeInfo::nsNodeInfoInner *node = - NS_REINTERPRET_CAST(const nsINodeInfo::nsNodeInfoInner *, key); + reinterpret_cast(key); // Is this an acceptable hash value? return (PLHashNumber(NS_PTR_TO_INT32(node->mName)) & 0xffff) >> 8; @@ -73,9 +73,9 @@ nsNodeInfoManager::NodeInfoInnerKeyCompare(const void *key1, const void *key2) NS_ASSERTION(key1 && key2, "Null key passed to NodeInfoInnerKeyCompare!"); const nsINodeInfo::nsNodeInfoInner *node1 = - NS_REINTERPRET_CAST(const nsINodeInfo::nsNodeInfoInner *, key1); + reinterpret_cast(key1); const nsINodeInfo::nsNodeInfoInner *node2 = - NS_REINTERPRET_CAST(const nsINodeInfo::nsNodeInfoInner *, key2); + reinterpret_cast(key2); return (node1->mName == node2->mName && node1->mPrefix == node2->mPrefix && @@ -187,7 +187,7 @@ nsNodeInfoManager::GetNodeInfo(nsIAtom *aName, nsIAtom *aPrefix, void *node = PL_HashTableLookup(mNodeInfoHash, &tmpKey); if (node) { - *aNodeInfo = NS_STATIC_CAST(nsINodeInfo *, node); + *aNodeInfo = static_cast(node); NS_ADDREF(*aNodeInfo); diff --git a/content/base/src/nsNodeUtils.cpp b/content/base/src/nsNodeUtils.cpp index 7d0a9cfe73f0..01abf066c453 100755 --- a/content/base/src/nsNodeUtils.cpp +++ b/content/base/src/nsNodeUtils.cpp @@ -121,12 +121,12 @@ nsNodeUtils::ContentInserted(nsINode* aContainer, nsIContent* container; nsIDocument* document; if (aContainer->IsNodeOfType(nsINode::eCONTENT)) { - container = NS_STATIC_CAST(nsIContent*, aContainer); + container = static_cast(aContainer); document = aContainer->GetOwnerDoc(); } else { container = nsnull; - document = NS_STATIC_CAST(nsIDocument*, aContainer); + document = static_cast(aContainer); } IMPL_MUTATION_NOTIFICATION(ContentInserted, aContainer, @@ -144,12 +144,12 @@ nsNodeUtils::ContentRemoved(nsINode* aContainer, nsIContent* container; nsIDocument* document; if (aContainer->IsNodeOfType(nsINode::eCONTENT)) { - container = NS_STATIC_CAST(nsIContent*, aContainer); + container = static_cast(aContainer); document = aContainer->GetOwnerDoc(); } else { container = nsnull; - document = NS_STATIC_CAST(nsIDocument*, aContainer); + document = static_cast(aContainer); } IMPL_MUTATION_NOTIFICATION(ContentRemoved, aContainer, @@ -195,7 +195,7 @@ nsNodeUtils::LastRelease(nsINode* aNode) // Delete all properties before tearing down the document. Some of the // properties are bound to nsINode objects and the destructor functions of // the properties may want to use the owner document of the nsINode. - NS_STATIC_CAST(nsIDocument*, aNode)->PropertyTable()->DeleteAllProperties(); + static_cast(aNode)->PropertyTable()->DeleteAllProperties(); } else if (aNode->HasProperties()) { // Strong reference to the document so that deleting properties can't @@ -266,7 +266,7 @@ nsNodeUtils::SetUserData(nsINode *aNode, const nsAString &aKey, } // Take over ownership of the old data from the property table. - nsCOMPtr oldData = dont_AddRef(NS_STATIC_CAST(nsIVariant*, data)); + nsCOMPtr oldData = dont_AddRef(static_cast(data)); if (aData && aHandler) { nsCOMPtr oldHandler; @@ -298,8 +298,8 @@ nsNodeUtils::GetUserData(nsINode *aNode, const nsAString &aKey, return NS_ERROR_OUT_OF_MEMORY; } - *aResult = NS_STATIC_CAST(nsIVariant*, - aNode->GetProperty(DOM_USER_DATA, key)); + *aResult = static_cast + (aNode->GetProperty(DOM_USER_DATA, key)); NS_IF_ADDREF(*aResult); return NS_OK; @@ -314,12 +314,12 @@ struct nsHandlerData static void CallHandler(void *aObject, nsIAtom *aKey, void *aHandler, void *aData) { - nsHandlerData *handlerData = NS_STATIC_CAST(nsHandlerData*, aData); + nsHandlerData *handlerData = static_cast(aData); nsCOMPtr handler = - NS_STATIC_CAST(nsIDOMUserDataHandler*, aHandler); - nsINode *node = NS_STATIC_CAST(nsINode*, aObject); + static_cast(aHandler); + nsINode *node = static_cast(aObject); nsCOMPtr data = - NS_STATIC_CAST(nsIVariant*, node->GetProperty(DOM_USER_DATA, aKey)); + static_cast(node->GetProperty(DOM_USER_DATA, aKey)); NS_ASSERTION(data, "Handler without data?"); nsAutoString key; @@ -371,8 +371,8 @@ static void NoteUserData(void *aObject, nsIAtom *aKey, void *aXPCOMChild, void *aData) { nsCycleCollectionTraversalCallback* cb = - NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aData); - cb->NoteXPCOMChild(NS_STATIC_CAST(nsISupports*, aXPCOMChild)); + static_cast(aData); + cb->NoteXPCOMChild(static_cast(aXPCOMChild)); } /* static */ @@ -443,7 +443,7 @@ AdoptFunc(nsAttrHashKey::KeyType aKey, nsIDOMNode *aData, void* aUserArg) nsCOMPtr attr = do_QueryInterface(aData); NS_ASSERTION(attr, "non-nsIAttribute somehow made it into the hashmap?!"); - AdoptFuncData *data = NS_STATIC_CAST(AdoptFuncData*, aUserArg); + AdoptFuncData *data = static_cast(aUserArg); // If we were passed an element we need to clone the attribute nodes and // insert them into the element. @@ -505,7 +505,7 @@ nsNodeUtils::CloneAndAdopt(nsINode *aNode, PRBool aClone, PRBool aDeep, } nsGenericElement *elem = aNode->IsNodeOfType(nsINode::eELEMENT) ? - NS_STATIC_CAST(nsGenericElement*, aNode) : + static_cast(aNode) : nsnull; nsCOMPtr clone; @@ -642,7 +642,7 @@ nsNodeUtils::CloneAndAdopt(nsINode *aNode, PRBool aClone, PRBool aDeep, // in a document. #ifdef MOZ_XUL if (aClone && !aParent && aNode->IsNodeOfType(nsINode::eXUL)) { - nsXULElement *xulElem = NS_STATIC_CAST(nsXULElement*, elem); + nsXULElement *xulElem = static_cast(elem); if (!xulElem->mPrototype || xulElem->IsInDoc()) { clone->SetFlags(NODE_FORCE_XBL_BINDINGS); } diff --git a/content/base/src/nsObjectLoadingContent.cpp b/content/base/src/nsObjectLoadingContent.cpp index f26eaee1b1c3..9d3661e6a374 100644 --- a/content/base/src/nsObjectLoadingContent.cpp +++ b/content/base/src/nsObjectLoadingContent.cpp @@ -105,12 +105,12 @@ public: nsIURI* aURI) : mContent(aContent), mFrame(aFrame), mContentType(aType), mURI(aURI) { - NS_STATIC_CAST(nsIObjectLoadingContent *, mContent)->AddRef(); + static_cast(mContent)->AddRef(); } ~nsAsyncInstantiateEvent() { - NS_STATIC_CAST(nsIObjectLoadingContent *, mContent)->Release(); + static_cast(mContent)->Release(); } NS_IMETHOD Run(); @@ -339,7 +339,7 @@ nsObjectLoadingContent::OnStartRequest(nsIRequest *aRequest, nsISupports *aConte } nsCOMPtr thisContent = - do_QueryInterface(NS_STATIC_CAST(nsIImageLoadingContent*, this)); + do_QueryInterface(static_cast(this)); NS_ASSERTION(thisContent, "must be a content"); switch (newType) { case eType_Image: @@ -543,7 +543,7 @@ nsObjectLoadingContent::EnsureInstantiation(nsIPluginInstance** aInstance) mInstantiating = PR_TRUE; nsCOMPtr thisContent = - do_QueryInterface(NS_STATIC_CAST(nsIImageLoadingContent*, this)); + do_QueryInterface(static_cast(this)); NS_ASSERTION(thisContent, "must be a content"); nsIDocument* doc = thisContent->GetCurrentDoc(); @@ -703,7 +703,7 @@ nsObjectLoadingContent::LoadObject(const nsAString& aURI, // Avoid StringToURI in order to use the codebase attribute as base URI nsCOMPtr thisContent = - do_QueryInterface(NS_STATIC_CAST(nsIImageLoadingContent*, this)); + do_QueryInterface(static_cast(this)); NS_ASSERTION(thisContent, "must be a content"); nsIDocument* doc = thisContent->GetOwnerDoc(); @@ -765,7 +765,7 @@ nsObjectLoadingContent::LoadObject(nsIURI* aURI, mContentType = aTypeHint; nsCOMPtr thisContent = - do_QueryInterface(NS_STATIC_CAST(nsIImageLoadingContent*, this)); + do_QueryInterface(static_cast(this)); NS_ASSERTION(thisContent, "must be a content"); nsIDocument* doc = thisContent->GetOwnerDoc(); @@ -812,7 +812,7 @@ nsObjectLoadingContent::LoadObject(nsIURI* aURI, NS_CheckContentLoadPolicy(nsIContentPolicy::TYPE_OBJECT, aURI, doc->GetDocumentURI(), - NS_STATIC_CAST(nsIImageLoadingContent*, this), + static_cast(this), aTypeHint, nsnull, //extra &shouldLoad, @@ -1095,7 +1095,7 @@ PRBool nsObjectLoadingContent::IsSupportedDocument(const nsCString& aMimeType) { nsCOMPtr thisContent = - do_QueryInterface(NS_STATIC_CAST(nsIImageLoadingContent*, this)); + do_QueryInterface(static_cast(this)); NS_ASSERTION(thisContent, "must be a content"); nsresult rv; @@ -1156,7 +1156,7 @@ nsObjectLoadingContent::NotifyStateChanged(ObjectType aOldType, this, aOldType, aOldState, mType, ObjectState(), aSync)); nsCOMPtr thisContent = - do_QueryInterface(NS_STATIC_CAST(nsIImageLoadingContent*, this)); + do_QueryInterface(static_cast(this)); NS_ASSERTION(thisContent, "must be a content"); nsIDocument* doc = thisContent->GetCurrentDoc(); @@ -1230,7 +1230,7 @@ nsObjectLoadingContent::GetTypeOfContent(const nsCString& aMIMEType) } nsCOMPtr thisContent = - do_QueryInterface(NS_STATIC_CAST(nsIImageLoadingContent*, this)); + do_QueryInterface(static_cast(this)); NS_ASSERTION(thisContent, "must be a content"); if (ShouldShowDefaultPlugin(thisContent, aMIMEType)) { @@ -1299,7 +1299,7 @@ nsIObjectFrame* nsObjectLoadingContent::GetFrame() { nsCOMPtr thisContent = - do_QueryInterface(NS_STATIC_CAST(nsIImageLoadingContent*, this)); + do_QueryInterface(static_cast(this)); NS_ASSERTION(thisContent, "must be a content"); PRBool flushed = PR_FALSE; @@ -1375,7 +1375,7 @@ nsObjectLoadingContent::Instantiate(const nsACString& aMIMEType, nsIURI* aURI) // We need some URI. If we have nothing else, use the base URI. // XXX(biesi): The code used to do this. Not sure why this is correct... nsCOMPtr thisContent = - do_QueryInterface(NS_STATIC_CAST(nsIImageLoadingContent*, this)); + do_QueryInterface(static_cast(this)); NS_ASSERTION(thisContent, "must be a content"); GetObjectBaseURI(thisContent, getter_AddRefs(baseURI)); diff --git a/content/base/src/nsPlainTextSerializer.cpp b/content/base/src/nsPlainTextSerializer.cpp index 8e58b64688f2..ff512b5e27e5 100644 --- a/content/base/src/nsPlainTextSerializer.cpp +++ b/content/base/src/nsPlainTextSerializer.cpp @@ -237,7 +237,7 @@ nsPlainTextSerializer::GetLastBool(const nsVoidArray& aStack) if (size == 0) { return PR_FALSE; } - return (aStack.ElementAt(size-1) != NS_REINTERPRET_CAST(void*, PR_FALSE)); + return (aStack.ElementAt(size-1) != reinterpret_cast(PR_FALSE)); } void @@ -245,7 +245,7 @@ nsPlainTextSerializer::SetLastBool(nsVoidArray& aStack, PRBool aValue) { PRUint32 size = aStack.Count(); if (size > 0) { - aStack.ReplaceElementAt(NS_REINTERPRET_CAST(void*, aValue), size-1); + aStack.ReplaceElementAt(reinterpret_cast(aValue), size-1); } else { NS_ERROR("There is no \"Last\" value"); @@ -255,7 +255,7 @@ nsPlainTextSerializer::SetLastBool(nsVoidArray& aStack, PRBool aValue) void nsPlainTextSerializer::PushBool(nsVoidArray& aStack, PRBool aValue) { - aStack.AppendElement(NS_REINTERPRET_CAST(void*, aValue)); + aStack.AppendElement(reinterpret_cast(aValue)); } PRBool @@ -264,7 +264,7 @@ nsPlainTextSerializer::PopBool(nsVoidArray& aStack) PRBool returnValue = PR_FALSE; PRUint32 size = aStack.Count(); if (size > 0) { - returnValue = (aStack.ElementAt(size-1) != NS_REINTERPRET_CAST(void*, PR_FALSE)); + returnValue = (aStack.ElementAt(size-1) != reinterpret_cast(PR_FALSE)); aStack.RemoveElementAt(size-1); } return returnValue; diff --git a/content/base/src/nsPropertyTable.cpp b/content/base/src/nsPropertyTable.cpp index 8f0f0ca33b1a..2fc62d6c0aa1 100644 --- a/content/base/src/nsPropertyTable.cpp +++ b/content/base/src/nsPropertyTable.cpp @@ -133,8 +133,8 @@ nsPropertyTable::TransferOrDeleteAllPropertiesFor(nsPropertyOwner aObject, nsresult rv = NS_OK; for (PropertyList* prop = mPropertyList; prop; prop = prop->mNext) { if (prop->mTransfer) { - PropertyListMapEntry *entry = NS_STATIC_CAST(PropertyListMapEntry*, - PL_DHashTableOperate(&prop->mObjectValueMap, aObject, + PropertyListMapEntry *entry = static_cast + (PL_DHashTableOperate(&prop->mObjectValueMap, aObject, PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_BUSY(entry)) { rv = aOtherTable->SetProperty(aObject, prop->mCategory, prop->mName, @@ -165,11 +165,11 @@ nsPropertyTable::Enumerate(nsPropertyOwner aObject, PRUint16 aCategory, PropertyList* prop; for (prop = mPropertyList; prop; prop = prop->mNext) { if (prop->mCategory == aCategory) { - PropertyListMapEntry *entry = NS_STATIC_CAST(PropertyListMapEntry*, - PL_DHashTableOperate(&prop->mObjectValueMap, aObject, + PropertyListMapEntry *entry = static_cast + (PL_DHashTableOperate(&prop->mObjectValueMap, aObject, PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_BUSY(entry)) { - aCallback(NS_CONST_CAST(void*, aObject.get()), prop->mName, entry->value, + aCallback(const_cast(aObject.get()), prop->mName, entry->value, aData); } } @@ -189,8 +189,8 @@ nsPropertyTable::GetPropertyInternal(nsPropertyOwner aObject, PropertyList* propertyList = GetPropertyListFor(aCategory, aPropertyName); if (propertyList) { - PropertyListMapEntry *entry = NS_STATIC_CAST(PropertyListMapEntry*, - PL_DHashTableOperate(&propertyList->mObjectValueMap, aObject, + PropertyListMapEntry *entry = static_cast + (PL_DHashTableOperate(&propertyList->mObjectValueMap, aObject, PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_BUSY(entry)) { propValue = entry->value; @@ -246,8 +246,8 @@ nsPropertyTable::SetPropertyInternal(nsPropertyOwner aObject, // The current property value (if there is one) is replaced and the current // value is destroyed nsresult result = NS_OK; - PropertyListMapEntry *entry = NS_STATIC_CAST(PropertyListMapEntry*, - PL_DHashTableOperate(&propertyList->mObjectValueMap, aObject, PL_DHASH_ADD)); + PropertyListMapEntry *entry = static_cast + (PL_DHashTableOperate(&propertyList->mObjectValueMap, aObject, PL_DHASH_ADD)); if (!entry) return NS_ERROR_OUT_OF_MEMORY; // A NULL entry->key is the sign that the entry has just been allocated @@ -256,7 +256,7 @@ nsPropertyTable::SetPropertyInternal(nsPropertyOwner aObject, if (aOldValue) *aOldValue = entry->value; else if (propertyList->mDtorFunc) - propertyList->mDtorFunc(NS_CONST_CAST(void*, entry->key), aPropertyName, + propertyList->mDtorFunc(const_cast(entry->key), aPropertyName, entry->value, propertyList->mDtorData); result = NS_PROPTABLE_PROP_OVERWRITTEN; } @@ -329,10 +329,10 @@ DestroyPropertyEnumerator(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { nsPropertyTable::PropertyList *propList = - NS_STATIC_CAST(nsPropertyTable::PropertyList*, table->data); - PropertyListMapEntry* entry = NS_STATIC_CAST(PropertyListMapEntry*, hdr); + static_cast(table->data); + PropertyListMapEntry* entry = static_cast(hdr); - propList->mDtorFunc(NS_CONST_CAST(void*, entry->key), propList->mName, + propList->mDtorFunc(const_cast(entry->key), propList->mName, entry->value, propList->mDtorData); return PL_DHASH_NEXT; } @@ -349,8 +349,8 @@ nsPropertyTable::PropertyList::Destroy() PRBool nsPropertyTable::PropertyList::DeletePropertyFor(nsPropertyOwner aObject) { - PropertyListMapEntry *entry = NS_STATIC_CAST(PropertyListMapEntry*, - PL_DHashTableOperate(&mObjectValueMap, aObject, PL_DHASH_LOOKUP)); + PropertyListMapEntry *entry = static_cast + (PL_DHashTableOperate(&mObjectValueMap, aObject, PL_DHASH_LOOKUP)); if (!PL_DHASH_ENTRY_IS_BUSY(entry)) return PR_FALSE; @@ -358,7 +358,7 @@ nsPropertyTable::PropertyList::DeletePropertyFor(nsPropertyOwner aObject) PL_DHashTableRawRemove(&mObjectValueMap, entry); if (mDtorFunc) - mDtorFunc(NS_CONST_CAST(void*, aObject.get()), mName, value, mDtorData); + mDtorFunc(const_cast(aObject.get()), mName, value, mDtorData); return PR_TRUE; } @@ -368,6 +368,6 @@ void nsPropertyTable::SupportsDtorFunc(void *aObject, nsIAtom *aPropertyName, void *aPropertyValue, void *aData) { - nsISupports *propertyValue = NS_STATIC_CAST(nsISupports*, aPropertyValue); + nsISupports *propertyValue = static_cast(aPropertyValue); NS_IF_RELEASE(propertyValue); } diff --git a/content/base/src/nsRange.cpp b/content/base/src/nsRange.cpp index 8ba148d92114..c174349cf1d4 100644 --- a/content/base/src/nsRange.cpp +++ b/content/base/src/nsRange.cpp @@ -392,7 +392,7 @@ nsRange::ComparePoint(nsIDOMNode* aParent, PRInt32 aOffset, PRInt16* aResult) static PRInt32 GetNodeLength(nsINode *aNode) { if(aNode->IsNodeOfType(nsINode::eDATA_NODE)) { - return NS_STATIC_CAST(nsIContent*, aNode)->TextLength(); + return static_cast(aNode)->TextLength(); } return aNode->GetChildCount(); @@ -421,9 +421,9 @@ nsRange::DoSetRange(nsINode* aStartN, PRInt32 aStartOffset, (aStartN->IsNodeOfType(nsINode::eCONTENT) && aEndN->IsNodeOfType(nsINode::eCONTENT) && aRoot == - NS_STATIC_CAST(nsIContent*, aStartN)->GetBindingParent() && + static_cast(aStartN)->GetBindingParent() && aRoot == - NS_STATIC_CAST(nsIContent*, aEndN)->GetBindingParent()) || + static_cast(aEndN)->GetBindingParent()) || (!aRoot->GetNodeParent() && (aRoot->IsNodeOfType(nsINode::eDOCUMENT) || aRoot->IsNodeOfType(nsINode::eATTRIBUTE) || @@ -556,7 +556,7 @@ nsINode* nsRange::IsValidBoundary(nsINode* aNode) } if (aNode->IsNodeOfType(nsINode::eCONTENT)) { - nsIContent* content = NS_STATIC_CAST(nsIContent*, aNode); + nsIContent* content = static_cast(aNode); if (content->Tag() == nsGkAtoms::documentTypeNodeName) { return nsnull; } diff --git a/content/base/src/nsScriptElement.cpp b/content/base/src/nsScriptElement.cpp index b4636d1d9ee1..20e0999e0884 100755 --- a/content/base/src/nsScriptElement.cpp +++ b/content/base/src/nsScriptElement.cpp @@ -166,7 +166,7 @@ InNonScriptingContainer(nsINode* aNode) // prefs or per-document container settings for not allowing // frames or plugins. if (aNode->IsNodeOfType(nsINode::eHTML)) { - nsIAtom *localName = NS_STATIC_CAST(nsIContent*, aNode)->Tag(); + nsIAtom *localName = static_cast(aNode)->Tag(); if (localName == nsGkAtoms::iframe || localName == nsGkAtoms::noframes || localName == nsGkAtoms::noembed) { diff --git a/content/base/src/nsScriptLoader.cpp b/content/base/src/nsScriptLoader.cpp index 64060586d110..ee11a91e0012 100644 --- a/content/base/src/nsScriptLoader.cpp +++ b/content/base/src/nsScriptLoader.cpp @@ -744,7 +744,7 @@ nsScriptLoader::ConvertToUTF16(nsIChannel* aChannel, const PRUint8* aData, if (NS_SUCCEEDED(rv)) { PRInt32 unicodeLength = 0; - rv = unicodeDecoder->GetMaxLength(NS_REINTERPRET_CAST(const char*, aData), + rv = unicodeDecoder->GetMaxLength(reinterpret_cast(aData), aLength, &unicodeLength); if (NS_SUCCEEDED(rv)) { if (!EnsureStringLength(aString, unicodeLength)) @@ -757,7 +757,7 @@ nsScriptLoader::ConvertToUTF16(nsIChannel* aChannel, const PRUint8* aData, PRInt32 convertedLength = 0; PRInt32 bufferLength = unicodeLength; do { - rv = unicodeDecoder->Convert(NS_REINTERPRET_CAST(const char*, aData), + rv = unicodeDecoder->Convert(reinterpret_cast(aData), (PRInt32 *) &aLength, ustr, &unicodeLength); if (NS_FAILED(rv)) { @@ -787,7 +787,7 @@ nsScriptLoader::OnStreamComplete(nsIStreamLoader* aLoader, PRUint32 aStringLen, const PRUint8* aString) { - nsScriptLoadRequest* request = NS_STATIC_CAST(nsScriptLoadRequest*, aContext); + nsScriptLoadRequest* request = static_cast(aContext); NS_ASSERTION(request, "null request in stream complete handler"); NS_ENSURE_TRUE(request, NS_ERROR_FAILURE); diff --git a/content/base/src/nsStyleLinkElement.cpp b/content/base/src/nsStyleLinkElement.cpp index 81de24ea769f..a18f4e31f764 100644 --- a/content/base/src/nsStyleLinkElement.cpp +++ b/content/base/src/nsStyleLinkElement.cpp @@ -91,7 +91,7 @@ nsStyleLinkElement::SetStyleSheet(nsIStyleSheet* aStyleSheet) if (cssSheet) { nsCOMPtr node; CallQueryInterface(this, - NS_STATIC_CAST(nsIDOMNode**, getter_AddRefs(node))); + static_cast(getter_AddRefs(node))); if (node) { cssSheet->SetOwningNode(node); } diff --git a/content/base/src/nsSyncLoadService.cpp b/content/base/src/nsSyncLoadService.cpp index 353851aa9b41..6b1b4a5e3fc5 100644 --- a/content/base/src/nsSyncLoadService.cpp +++ b/content/base/src/nsSyncLoadService.cpp @@ -227,13 +227,12 @@ nsSyncLoader::LoadDocument(nsIChannel* aChannel, nsCOMPtr target = do_QueryInterface(document); NS_ENSURE_TRUE(target, NS_ERROR_FAILURE); - nsWeakPtr requestWeak = do_GetWeakReference(NS_STATIC_CAST(nsIDOMLoadListener*, this)); + nsWeakPtr requestWeak = do_GetWeakReference(static_cast(this)); nsLoadListenerProxy* proxy = new nsLoadListenerProxy(requestWeak); NS_ENSURE_TRUE(proxy, NS_ERROR_OUT_OF_MEMORY); // This will addref the proxy - rv = target->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMEventListener*, - proxy), + rv = target->AddEventListenerByIID(static_cast(proxy), NS_GET_IID(nsIDOMLoadListener)); NS_ENSURE_SUCCESS(rv, rv); @@ -255,8 +254,7 @@ nsSyncLoader::LoadDocument(nsIChannel* aChannel, // This will release the proxy. Don't use the errorvalue from this since // we're more interested in the errorvalue from the loading - target->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMEventListener*, - proxy), + target->RemoveEventListenerByIID(static_cast(proxy), NS_GET_IID(nsIDOMLoadListener)); // check that the load succeeded diff --git a/content/base/src/nsTextFragment.cpp b/content/base/src/nsTextFragment.cpp index 5d27b747bd6d..a09f40d121fd 100644 --- a/content/base/src/nsTextFragment.cpp +++ b/content/base/src/nsTextFragment.cpp @@ -130,8 +130,8 @@ nsTextFragment::operator=(const nsTextFragment& aOther) m1b = aOther.m1b; // This will work even if aOther is using m2b } else { - m2b = NS_STATIC_CAST(PRUnichar*, - nsMemory::Clone(aOther.m2b, aOther.mState.mLength * + m2b = static_cast + (nsMemory::Clone(aOther.m2b, aOther.mState.mLength * (aOther.mState.mIs2b ? sizeof(PRUnichar) : sizeof(char)))); } @@ -358,7 +358,7 @@ nsTextFragment::Append(const PRUnichar* aBuffer, PRUint32 aLength) // The new and the old data is all 1-byte char* buff; if (mState.mInHeap) { - buff = (char*)nsMemory::Realloc(NS_CONST_CAST(char*, m1b), + buff = (char*)nsMemory::Realloc(const_cast(m1b), (mState.mLength + aLength) * sizeof(char)); if (!buff) { return; diff --git a/content/base/src/nsTextFragment.h b/content/base/src/nsTextFragment.h index 896b17f68aad..6c65e147f9f9 100644 --- a/content/base/src/nsTextFragment.h +++ b/content/base/src/nsTextFragment.h @@ -182,7 +182,7 @@ public: PRUnichar CharAt(PRInt32 aIndex) const { NS_ASSERTION(PRUint32(aIndex) < mState.mLength, "bad index"); - return mState.mIs2b ? m2b[aIndex] : NS_STATIC_CAST(unsigned char, m1b[aIndex]); + return mState.mIs2b ? m2b[aIndex] : static_cast(m1b[aIndex]); } /** diff --git a/content/base/src/nsTreeWalker.cpp b/content/base/src/nsTreeWalker.cpp index 111835e282fd..c5d61c6919b9 100644 --- a/content/base/src/nsTreeWalker.cpp +++ b/content/base/src/nsTreeWalker.cpp @@ -585,7 +585,7 @@ nsresult nsTreeWalker::TestNode(nsINode* aNode, PRInt16* _filtered) nodeType = nsIDOMNode::ELEMENT_NODE; } else if (aNode->IsNodeOfType(nsINode::eCONTENT)) { - nsIAtom* tag = NS_STATIC_CAST(nsIContent*, aNode)->Tag(); + nsIAtom* tag = static_cast(aNode)->Tag(); if (tag == nsGkAtoms::textTagName) { nodeType = nsIDOMNode::TEXT_NODE; } diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp index 302a574ae53c..73b6b4365e60 100644 --- a/content/base/src/nsXMLHttpRequest.cpp +++ b/content/base/src/nsXMLHttpRequest.cpp @@ -652,7 +652,7 @@ nsXMLHttpRequest::ConvertBodyToText(nsAString& aOutBuffer) return rv; PRUnichar * outBuffer = - NS_STATIC_CAST(PRUnichar*, nsMemory::Alloc((outBufferLength + 1) * + static_cast(nsMemory::Alloc((outBufferLength + 1) * sizeof(PRUnichar))); if (!outBuffer) { return NS_ERROR_OUT_OF_MEMORY; @@ -1170,8 +1170,8 @@ nsXMLHttpRequest::Open(const nsACString& method, const nsACString& url) JSString* userStr = ::JS_ValueToString(cx, argv[3]); if (userStr) { - user.Assign(NS_REINTERPRET_CAST(PRUnichar *, - ::JS_GetStringChars(userStr)), + user.Assign(reinterpret_cast + (::JS_GetStringChars(userStr)), ::JS_GetStringLength(userStr)); } @@ -1179,8 +1179,8 @@ nsXMLHttpRequest::Open(const nsACString& method, const nsACString& url) JSString* passwdStr = JS_ValueToString(cx, argv[4]); if (passwdStr) { - password.Assign(NS_REINTERPRET_CAST(PRUnichar *, - ::JS_GetStringChars(passwdStr)), + password.Assign(reinterpret_cast + (::JS_GetStringChars(passwdStr)), ::JS_GetStringLength(passwdStr)); } } @@ -1202,7 +1202,7 @@ nsXMLHttpRequest::StreamReaderFunc(nsIInputStream* in, PRUint32 count, PRUint32 *writeCount) { - nsXMLHttpRequest* xmlHttpRequest = NS_STATIC_CAST(nsXMLHttpRequest*, closure); + nsXMLHttpRequest* xmlHttpRequest = static_cast(closure); if (!xmlHttpRequest || !writeCount) { NS_WARNING("XMLHttpRequest cannot read from stream: no closure or writeCount"); return NS_ERROR_FAILURE; @@ -1300,13 +1300,13 @@ nsXMLHttpRequest::OnStartRequest(nsIRequest *request, nsISupports *ctxt) nsCOMPtr target(do_QueryInterface(mDocument)); if (target) { nsWeakPtr requestWeak = - do_GetWeakReference(NS_STATIC_CAST(nsIXMLHttpRequest*, this)); + do_GetWeakReference(static_cast(this)); nsCOMPtr proxy = new nsLoadListenerProxy(requestWeak); if (!proxy) return NS_ERROR_OUT_OF_MEMORY; // This will addref the proxy - rv = target->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMEventListener*, - proxy), + rv = target->AddEventListenerByIID(static_cast + (proxy), NS_GET_IID(nsIDOMLoadListener)); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; } @@ -2089,12 +2089,12 @@ nsXMLHttpRequest::GetInterface(const nsIID & aIID, void **aResult) // need to see these notifications for proper functioning. if (aIID.Equals(NS_GET_IID(nsIChannelEventSink))) { mChannelEventSink = do_GetInterface(mNotificationCallbacks); - *aResult = NS_STATIC_CAST(nsIChannelEventSink*, this); + *aResult = static_cast(this); NS_ADDREF_THIS(); return NS_OK; } else if (aIID.Equals(NS_GET_IID(nsIProgressEventSink))) { mProgressEventSink = do_GetInterface(mNotificationCallbacks); - *aResult = NS_STATIC_CAST(nsIProgressEventSink*, this); + *aResult = static_cast(this); NS_ADDREF_THIS(); return NS_OK; } diff --git a/content/base/src/nsXMLNameSpaceMap.cpp b/content/base/src/nsXMLNameSpaceMap.cpp index 10328caed1cb..5e62e2e6dfb2 100755 --- a/content/base/src/nsXMLNameSpaceMap.cpp +++ b/content/base/src/nsXMLNameSpaceMap.cpp @@ -86,8 +86,8 @@ nsXMLNameSpaceMap::AddPrefix(nsIAtom *aPrefix, PRInt32 aNameSpaceID) nsNameSpaceEntry *foundEntry = nsnull; for (PRInt32 i = 0; i < count; ++i) { - nsNameSpaceEntry *entry = NS_STATIC_CAST(nsNameSpaceEntry*, - mNameSpaces.FastElementAt(i)); + nsNameSpaceEntry *entry = static_cast + (mNameSpaces.FastElementAt(i)); NS_ASSERTION(entry, "null entry in namespace map!"); @@ -129,8 +129,8 @@ nsXMLNameSpaceMap::RemovePrefix(nsIAtom *aPrefix) PRInt32 count = mNameSpaces.Count(); for (PRInt32 i = 0; i < count; ++i) { - nsNameSpaceEntry *entry = NS_STATIC_CAST(nsNameSpaceEntry*, - mNameSpaces.FastElementAt(i)); + nsNameSpaceEntry *entry = static_cast + (mNameSpaces.FastElementAt(i)); NS_ASSERTION(entry, "null entry in namespace map!"); @@ -147,8 +147,8 @@ nsXMLNameSpaceMap::FindNameSpaceID(nsIAtom *aPrefix) const PRInt32 count = mNameSpaces.Count(); for (PRInt32 i = 0; i < count; ++i) { - nsNameSpaceEntry *entry = NS_STATIC_CAST(nsNameSpaceEntry*, - mNameSpaces.FastElementAt(i)); + nsNameSpaceEntry *entry = static_cast + (mNameSpaces.FastElementAt(i)); NS_ASSERTION(entry, "null entry in namespace map!"); @@ -169,8 +169,8 @@ nsXMLNameSpaceMap::FindPrefix(PRInt32 aNameSpaceID) const PRInt32 count = mNameSpaces.Count(); for (PRInt32 i = 0; i < count; ++i) { - nsNameSpaceEntry *entry = NS_STATIC_CAST(nsNameSpaceEntry*, - mNameSpaces.FastElementAt(i)); + nsNameSpaceEntry *entry = static_cast + (mNameSpaces.FastElementAt(i)); NS_ASSERTION(entry, "null entry in namespace map!"); @@ -184,7 +184,7 @@ nsXMLNameSpaceMap::FindPrefix(PRInt32 aNameSpaceID) const PR_STATIC_CALLBACK(PRBool) DeleteEntry(void *aElement, void *aData) { - delete NS_STATIC_CAST(nsNameSpaceEntry*, aElement); + delete static_cast(aElement); return PR_TRUE; } diff --git a/content/events/src/nsDOMCommandEvent.cpp b/content/events/src/nsDOMCommandEvent.cpp index f27b1dab417d..b7c3ca4c3c46 100644 --- a/content/events/src/nsDOMCommandEvent.cpp +++ b/content/events/src/nsDOMCommandEvent.cpp @@ -62,7 +62,7 @@ NS_IMPL_RELEASE_INHERITED(nsDOMCommandEvent, nsDOMEvent) NS_IMETHODIMP nsDOMCommandEvent::GetCommand(nsAString& aCommand) { - nsIAtom* command = NS_STATIC_CAST(nsCommandEvent*, mEvent)->command; + nsIAtom* command = static_cast(mEvent)->command; if (command) { command->ToString(aCommand); } else { @@ -80,7 +80,7 @@ nsDOMCommandEvent::InitCommandEvent(const nsAString& aTypeArg, nsresult rv = nsDOMEvent::InitEvent(aTypeArg, aCanBubbleArg, aCancelableArg); NS_ENSURE_SUCCESS(rv, rv); - NS_STATIC_CAST(nsCommandEvent*, mEvent)->command = do_GetAtom(aCommand); + static_cast(mEvent)->command = do_GetAtom(aCommand); return NS_OK; } diff --git a/content/events/src/nsDOMEvent.cpp b/content/events/src/nsDOMEvent.cpp index 9c171f14efda..6788a3914202 100644 --- a/content/events/src/nsDOMEvent.cpp +++ b/content/events/src/nsDOMEvent.cpp @@ -162,13 +162,13 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDOMEvent) switch (tmp->mEvent->eventStructType) { case NS_MOUSE_EVENT: case NS_MOUSE_SCROLL_EVENT: - NS_STATIC_CAST(nsMouseEvent_base*, tmp->mEvent)->relatedTarget = nsnull; + static_cast(tmp->mEvent)->relatedTarget = nsnull; break; case NS_XUL_COMMAND_EVENT: - NS_STATIC_CAST(nsXULCommandEvent*, tmp->mEvent)->sourceEvent = nsnull; + static_cast(tmp->mEvent)->sourceEvent = nsnull; break; case NS_MUTATION_EVENT: - NS_STATIC_CAST(nsMutationEvent*, tmp->mEvent)->mRelatedNode = nsnull; + static_cast(tmp->mEvent)->mRelatedNode = nsnull; break; default: break; @@ -188,15 +188,15 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsDOMEvent) case NS_MOUSE_EVENT: case NS_MOUSE_SCROLL_EVENT: cb.NoteXPCOMChild( - NS_STATIC_CAST(nsMouseEvent_base*, tmp->mEvent)->relatedTarget); + static_cast(tmp->mEvent)->relatedTarget); break; case NS_XUL_COMMAND_EVENT: cb.NoteXPCOMChild( - NS_STATIC_CAST(nsXULCommandEvent*, tmp->mEvent)->sourceEvent); + static_cast(tmp->mEvent)->sourceEvent); break; case NS_MUTATION_EVENT: cb.NoteXPCOMChild( - NS_STATIC_CAST(nsMutationEvent*, tmp->mEvent)->mRelatedNode); + static_cast(tmp->mEvent)->mRelatedNode); break; default: break; @@ -631,8 +631,8 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData() { nsSizeEvent* sizeEvent = new nsSizeEvent(PR_FALSE, msg, nsnull); NS_ENSURE_TRUE(sizeEvent, NS_ERROR_OUT_OF_MEMORY); - sizeEvent->mWinWidth = NS_STATIC_CAST(nsSizeEvent*, mEvent)->mWinWidth; - sizeEvent->mWinHeight = NS_STATIC_CAST(nsSizeEvent*, mEvent)->mWinHeight; + sizeEvent->mWinWidth = static_cast(mEvent)->mWinWidth; + sizeEvent->mWinHeight = static_cast(mEvent)->mWinHeight; newEvent = sizeEvent; break; } @@ -640,15 +640,15 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData() { newEvent = new nsSizeModeEvent(PR_FALSE, msg, nsnull); NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY); - NS_STATIC_CAST(nsSizeModeEvent*, newEvent)->mSizeMode = - NS_STATIC_CAST(nsSizeModeEvent*, mEvent)->mSizeMode; + static_cast(newEvent)->mSizeMode = + static_cast(mEvent)->mSizeMode; break; } case NS_ZLEVEL_EVENT: { nsZLevelEvent* zLevelEvent = new nsZLevelEvent(PR_FALSE, msg, nsnull); NS_ENSURE_TRUE(zLevelEvent, NS_ERROR_OUT_OF_MEMORY); - nsZLevelEvent* oldZLevelEvent = NS_STATIC_CAST(nsZLevelEvent*, mEvent); + nsZLevelEvent* oldZLevelEvent = static_cast(mEvent); zLevelEvent->mPlacement = oldZLevelEvent->mPlacement; zLevelEvent->mImmediate = oldZLevelEvent->mImmediate; zLevelEvent->mAdjusted = oldZLevelEvent->mAdjusted; @@ -664,8 +664,8 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData() { newEvent = new nsScrollbarEvent(PR_FALSE, msg, nsnull); NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY); - NS_STATIC_CAST(nsScrollbarEvent*, newEvent)->position = - NS_STATIC_CAST(nsScrollbarEvent*, mEvent)->position; + static_cast(newEvent)->position = + static_cast(mEvent)->position; break; } case NS_INPUT_EVENT: @@ -678,7 +678,7 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData() { nsKeyEvent* keyEvent = new nsKeyEvent(PR_FALSE, msg, nsnull); NS_ENSURE_TRUE(keyEvent, NS_ERROR_OUT_OF_MEMORY); - nsKeyEvent* oldKeyEvent = NS_STATIC_CAST(nsKeyEvent*, mEvent); + nsKeyEvent* oldKeyEvent = static_cast(mEvent); isInputEvent = PR_TRUE; keyEvent->keyCode = oldKeyEvent->keyCode; keyEvent->charCode = oldKeyEvent->charCode; @@ -688,7 +688,7 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData() } case NS_MOUSE_EVENT: { - nsMouseEvent* oldMouseEvent = NS_STATIC_CAST(nsMouseEvent*, mEvent); + nsMouseEvent* oldMouseEvent = static_cast(mEvent); nsMouseEvent* mouseEvent = new nsMouseEvent(PR_FALSE, msg, nsnull, oldMouseEvent->reason); NS_ENSURE_TRUE(mouseEvent, NS_ERROR_OUT_OF_MEMORY); @@ -704,16 +704,16 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData() { newEvent = new nsMenuEvent(PR_FALSE, msg, nsnull); NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY); - NS_STATIC_CAST(nsMenuEvent*, newEvent)->mCommand = - NS_STATIC_CAST(nsMenuEvent*, mEvent)->mCommand; + static_cast(newEvent)->mCommand = + static_cast(mEvent)->mCommand; break; } case NS_SCRIPT_ERROR_EVENT: { newEvent = new nsScriptErrorEvent(PR_FALSE, msg); NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY); - NS_STATIC_CAST(nsScriptErrorEvent*, newEvent)->lineNr = - NS_STATIC_CAST(nsScriptErrorEvent*, mEvent)->lineNr; + static_cast(newEvent)->lineNr = + static_cast(mEvent)->lineNr; break; } case NS_TEXT_EVENT: @@ -741,7 +741,7 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData() NS_ENSURE_TRUE(mouseScrollEvent, NS_ERROR_OUT_OF_MEMORY); isInputEvent = PR_TRUE; nsMouseScrollEvent* oldMouseScrollEvent = - NS_STATIC_CAST(nsMouseScrollEvent*, mEvent); + static_cast(mEvent); mouseScrollEvent->scrollFlags = oldMouseScrollEvent->scrollFlags; mouseScrollEvent->delta = oldMouseScrollEvent->delta; mouseScrollEvent->relatedTarget = oldMouseScrollEvent->relatedTarget; @@ -753,8 +753,8 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData() { newEvent = new nsScrollPortEvent(PR_FALSE, msg, nsnull); NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY); - NS_STATIC_CAST(nsScrollPortEvent*, newEvent)->orient = - NS_STATIC_CAST(nsScrollPortEvent*, mEvent)->orient; + static_cast(newEvent)->orient = + static_cast(mEvent)->orient; break; } case NS_MUTATION_EVENT: @@ -762,7 +762,7 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData() nsMutationEvent* mutationEvent = new nsMutationEvent(PR_FALSE, msg); NS_ENSURE_TRUE(mutationEvent, NS_ERROR_OUT_OF_MEMORY); nsMutationEvent* oldMutationEvent = - NS_STATIC_CAST(nsMutationEvent*, mEvent); + static_cast(mEvent); mutationEvent->mRelatedNode = oldMutationEvent->mRelatedNode; mutationEvent->mAttrName = oldMutationEvent->mAttrName; mutationEvent->mPrevAttrValue = oldMutationEvent->mPrevAttrValue; @@ -786,8 +786,8 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData() { newEvent = new nsFocusEvent(PR_FALSE, msg, nsnull); NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY); - NS_STATIC_CAST(nsFocusEvent*, newEvent)->isMozWindowTakingFocus = - NS_STATIC_CAST(nsFocusEvent*, mEvent)->isMozWindowTakingFocus; + static_cast(newEvent)->isMozWindowTakingFocus = + static_cast(mEvent)->isMozWindowTakingFocus; break; } case NS_POPUP_EVENT: @@ -801,7 +801,7 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData() case NS_COMMAND_EVENT: { newEvent = new nsCommandEvent(PR_FALSE, mEvent->userType, - NS_STATIC_CAST(nsCommandEvent*, mEvent)->command, nsnull); + static_cast(mEvent)->command, nsnull); NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY); break; } @@ -815,14 +815,14 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData() { newEvent = new nsBeforePageUnloadEvent(PR_FALSE, msg); NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY); - NS_STATIC_CAST(nsBeforePageUnloadEvent*, newEvent)->text = - NS_STATIC_CAST(nsBeforePageUnloadEvent*, mEvent)->text; + static_cast(newEvent)->text = + static_cast(mEvent)->text; break; } case NS_UI_EVENT: { newEvent = new nsUIEvent(PR_FALSE, msg, - NS_STATIC_CAST(nsUIEvent*, mEvent)->detail); + static_cast(mEvent)->detail); break; } case NS_QUERYCARETRECT_EVENT: @@ -860,8 +860,8 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData() NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY); isInputEvent = PR_TRUE; newEvent->eventStructType = NS_XUL_COMMAND_EVENT; - NS_STATIC_CAST(nsXULCommandEvent*, newEvent)->sourceEvent = - NS_STATIC_CAST(nsXULCommandEvent*, mEvent)->sourceEvent; + static_cast(newEvent)->sourceEvent = + static_cast(mEvent)->sourceEvent; break; } default: @@ -874,8 +874,8 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData() NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY); if (isInputEvent) { - nsInputEvent* oldInputEvent = NS_STATIC_CAST(nsInputEvent*, mEvent); - nsInputEvent* newInputEvent = NS_STATIC_CAST(nsInputEvent*, newEvent); + nsInputEvent* oldInputEvent = static_cast(mEvent); + nsInputEvent* newInputEvent = static_cast(newEvent); newInputEvent->isShift = oldInputEvent->isShift; newInputEvent->isControl = oldInputEvent->isControl; newInputEvent->isAlt = oldInputEvent->isAlt; @@ -1055,7 +1055,7 @@ nsDOMEvent::GetEventPopupControlState(nsEvent *aEvent) break; case NS_KEY_EVENT : if (NS_IS_TRUSTED_EVENT(aEvent)) { - PRUint32 key = NS_STATIC_CAST(nsKeyEvent *, aEvent)->keyCode; + PRUint32 key = static_cast(aEvent)->keyCode; switch(aEvent->message) { case NS_KEY_PRESS : // return key on focused button. see note at NS_MOUSE_CLICK. @@ -1080,7 +1080,7 @@ nsDOMEvent::GetEventPopupControlState(nsEvent *aEvent) break; case NS_MOUSE_EVENT : if (NS_IS_TRUSTED_EVENT(aEvent) && - NS_STATIC_CAST(nsMouseEvent*, aEvent)->button == nsMouseEvent::eLeftButton) { + static_cast(aEvent)->button == nsMouseEvent::eLeftButton) { switch(aEvent->message) { case NS_MOUSE_BUTTON_UP : if (::PopupAllowedForEvent("mouseup")) diff --git a/content/events/src/nsDOMKeyboardEvent.cpp b/content/events/src/nsDOMKeyboardEvent.cpp index f1a38754d061..4a0206bac9f5 100644 --- a/content/events/src/nsDOMKeyboardEvent.cpp +++ b/content/events/src/nsDOMKeyboardEvent.cpp @@ -174,7 +174,7 @@ nsDOMKeyboardEvent::InitKeyEvent(const nsAString& aType, PRBool aCanBubble, PRBo nsresult rv = nsDOMUIEvent::InitUIEvent(aType, aCanBubble, aCancelable, aView, 0); NS_ENSURE_SUCCESS(rv, rv); - nsKeyEvent* keyEvent = NS_STATIC_CAST(nsKeyEvent*, mEvent); + nsKeyEvent* keyEvent = static_cast(mEvent); keyEvent->isControl = aCtrlKey; keyEvent->isAlt = aAltKey; keyEvent->isShift = aShiftKey; diff --git a/content/events/src/nsDOMMouseEvent.cpp b/content/events/src/nsDOMMouseEvent.cpp index 272fac3b840a..a9b04e00506d 100644 --- a/content/events/src/nsDOMMouseEvent.cpp +++ b/content/events/src/nsDOMMouseEvent.cpp @@ -65,10 +65,10 @@ nsDOMMouseEvent::nsDOMMouseEvent(nsPresContext* aPresContext, switch (mEvent->eventStructType) { case NS_MOUSE_EVENT: - mDetail = NS_STATIC_CAST(nsMouseEvent*, mEvent)->clickCount; + mDetail = static_cast(mEvent)->clickCount; break; case NS_MOUSE_SCROLL_EVENT: - mDetail = NS_STATIC_CAST(nsMouseScrollEvent*, mEvent)->delta; + mDetail = static_cast(mEvent)->delta; break; default: break; @@ -81,10 +81,10 @@ nsDOMMouseEvent::~nsDOMMouseEvent() switch (mEvent->eventStructType) { case NS_MOUSE_EVENT: - delete NS_STATIC_CAST(nsMouseEvent*, mEvent); + delete static_cast(mEvent); break; case NS_MOUSE_SCROLL_EVENT: - delete NS_STATIC_CAST(nsMouseScrollEvent*, mEvent); + delete static_cast(mEvent); break; default: delete mEvent; @@ -117,9 +117,9 @@ nsDOMMouseEvent::InitMouseEvent(const nsAString & aType, PRBool aCanBubble, PRBo case NS_MOUSE_EVENT: case NS_MOUSE_SCROLL_EVENT: { - NS_STATIC_CAST(nsMouseEvent_base*, mEvent)->relatedTarget = aRelatedTarget; - NS_STATIC_CAST(nsMouseEvent_base*, mEvent)->button = aButton; - nsInputEvent* inputEvent = NS_STATIC_CAST(nsInputEvent*, mEvent); + static_cast(mEvent)->relatedTarget = aRelatedTarget; + static_cast(mEvent)->button = aButton; + nsInputEvent* inputEvent = static_cast(mEvent); inputEvent->isControl = aCtrlKey; inputEvent->isAlt = aAltKey; inputEvent->isShift = aShiftKey; @@ -130,10 +130,10 @@ nsDOMMouseEvent::InitMouseEvent(const nsAString & aType, PRBool aCanBubble, PRBo inputEvent->refPoint.y = aScreenY; if (mEvent->eventStructType == NS_MOUSE_SCROLL_EVENT) { - nsMouseScrollEvent* scrollEvent = NS_STATIC_CAST(nsMouseScrollEvent*, mEvent); + nsMouseScrollEvent* scrollEvent = static_cast(mEvent); scrollEvent->delta = aDetail; } else { - nsMouseEvent* mouseEvent = NS_STATIC_CAST(nsMouseEvent*, mEvent); + nsMouseEvent* mouseEvent = static_cast(mEvent); mouseEvent->clickCount = aDetail; } break; @@ -153,7 +153,7 @@ nsDOMMouseEvent::GetButton(PRUint16* aButton) { case NS_MOUSE_EVENT: case NS_MOUSE_SCROLL_EVENT: - *aButton = NS_STATIC_CAST(nsMouseEvent_base*, mEvent)->button; + *aButton = static_cast(mEvent)->button; break; default: NS_WARNING("Tried to get mouse button for non-mouse event!"); @@ -173,7 +173,7 @@ nsDOMMouseEvent::GetRelatedTarget(nsIDOMEventTarget** aRelatedTarget) { case NS_MOUSE_EVENT: case NS_MOUSE_SCROLL_EVENT: - relatedTarget = NS_STATIC_CAST(nsMouseEvent_base*, mEvent)->relatedTarget; + relatedTarget = static_cast(mEvent)->relatedTarget; break; default: break; diff --git a/content/events/src/nsDOMMutationEvent.cpp b/content/events/src/nsDOMMutationEvent.cpp index 89fccb6f26cc..179795925b6f 100644 --- a/content/events/src/nsDOMMutationEvent.cpp +++ b/content/events/src/nsDOMMutationEvent.cpp @@ -53,7 +53,7 @@ nsDOMMutationEvent::nsDOMMutationEvent(nsPresContext* aPresContext, nsDOMMutationEvent::~nsDOMMutationEvent() { if (mEventIsInternal) { - nsMutationEvent* mutation = NS_STATIC_CAST(nsMutationEvent*, mEvent); + nsMutationEvent* mutation = static_cast(mEvent); delete mutation; mEvent = nsnull; } @@ -71,7 +71,7 @@ NS_IMETHODIMP nsDOMMutationEvent::GetRelatedNode(nsIDOMNode** aRelatedNode) { *aRelatedNode = nsnull; - nsMutationEvent* mutation = NS_STATIC_CAST(nsMutationEvent*, mEvent); + nsMutationEvent* mutation = static_cast(mEvent); *aRelatedNode = mutation->mRelatedNode; NS_IF_ADDREF(*aRelatedNode); return NS_OK; @@ -80,7 +80,7 @@ nsDOMMutationEvent::GetRelatedNode(nsIDOMNode** aRelatedNode) NS_IMETHODIMP nsDOMMutationEvent::GetPrevValue(nsAString& aPrevValue) { - nsMutationEvent* mutation = NS_STATIC_CAST(nsMutationEvent*, mEvent); + nsMutationEvent* mutation = static_cast(mEvent); if (mutation->mPrevAttrValue) mutation->mPrevAttrValue->ToString(aPrevValue); return NS_OK; @@ -89,7 +89,7 @@ nsDOMMutationEvent::GetPrevValue(nsAString& aPrevValue) NS_IMETHODIMP nsDOMMutationEvent::GetNewValue(nsAString& aNewValue) { - nsMutationEvent* mutation = NS_STATIC_CAST(nsMutationEvent*, mEvent); + nsMutationEvent* mutation = static_cast(mEvent); if (mutation->mNewAttrValue) mutation->mNewAttrValue->ToString(aNewValue); return NS_OK; @@ -98,7 +98,7 @@ nsDOMMutationEvent::GetNewValue(nsAString& aNewValue) NS_IMETHODIMP nsDOMMutationEvent::GetAttrName(nsAString& aAttrName) { - nsMutationEvent* mutation = NS_STATIC_CAST(nsMutationEvent*, mEvent); + nsMutationEvent* mutation = static_cast(mEvent); if (mutation->mAttrName) mutation->mAttrName->ToString(aAttrName); return NS_OK; @@ -108,7 +108,7 @@ NS_IMETHODIMP nsDOMMutationEvent::GetAttrChange(PRUint16* aAttrChange) { *aAttrChange = 0; - nsMutationEvent* mutation = NS_STATIC_CAST(nsMutationEvent*, mEvent); + nsMutationEvent* mutation = static_cast(mEvent); if (mutation->mAttrChange) *aAttrChange = mutation->mAttrChange; return NS_OK; @@ -120,7 +120,7 @@ nsDOMMutationEvent::InitMutationEvent(const nsAString& aTypeArg, PRBool aCanBubb nsresult rv = nsDOMEvent::InitEvent(aTypeArg, aCanBubbleArg, aCancelableArg); NS_ENSURE_SUCCESS(rv, rv); - nsMutationEvent* mutation = NS_STATIC_CAST(nsMutationEvent*, mEvent); + nsMutationEvent* mutation = static_cast(mEvent); mutation->mRelatedNode = aRelatedNodeArg; if (!aPrevValueArg.IsEmpty()) mutation->mPrevAttrValue = do_GetAtom(aPrevValueArg); diff --git a/content/events/src/nsDOMPageTransitionEvent.cpp b/content/events/src/nsDOMPageTransitionEvent.cpp index a432cb842a2d..4c7f6fddf784 100755 --- a/content/events/src/nsDOMPageTransitionEvent.cpp +++ b/content/events/src/nsDOMPageTransitionEvent.cpp @@ -65,7 +65,7 @@ NS_IMPL_RELEASE_INHERITED(nsDOMPageTransitionEvent, nsDOMEvent) NS_IMETHODIMP nsDOMPageTransitionEvent::GetPersisted(PRBool* aPersisted) { - *aPersisted = NS_STATIC_CAST(nsPageTransitionEvent*, mEvent)->persisted; + *aPersisted = static_cast(mEvent)->persisted; return NS_OK; } @@ -78,7 +78,7 @@ nsDOMPageTransitionEvent::InitPageTransitionEvent(const nsAString &aTypeArg, nsresult rv = nsDOMEvent::InitEvent(aTypeArg, aCanBubbleArg, aCancelableArg); NS_ENSURE_SUCCESS(rv, rv); - NS_STATIC_CAST(nsPageTransitionEvent*, mEvent)->persisted = aPersisted; + static_cast(mEvent)->persisted = aPersisted; return NS_OK; } diff --git a/content/events/src/nsDOMPopupBlockedEvent.cpp b/content/events/src/nsDOMPopupBlockedEvent.cpp index 1a986cad26e5..0b5eff05f3c2 100644 --- a/content/events/src/nsDOMPopupBlockedEvent.cpp +++ b/content/events/src/nsDOMPopupBlockedEvent.cpp @@ -61,7 +61,7 @@ nsDOMPopupBlockedEvent::~nsDOMPopupBlockedEvent() { if (mEventIsInternal) { if (mEvent->eventStructType == NS_POPUPBLOCKED_EVENT) { - nsPopupBlockedEvent* event = NS_STATIC_CAST(nsPopupBlockedEvent*, mEvent); + nsPopupBlockedEvent* event = static_cast(mEvent); NS_IF_RELEASE(event->mPopupWindowURI); } } @@ -90,7 +90,7 @@ nsDOMPopupBlockedEvent::InitPopupBlockedEvent(const nsAString & aTypeArg, { case NS_POPUPBLOCKED_EVENT: { - nsPopupBlockedEvent* event = NS_STATIC_CAST(nsPopupBlockedEvent*, mEvent); + nsPopupBlockedEvent* event = static_cast(mEvent); event->mRequestingWindow = do_GetWeakReference(aRequestingWindow); event->mPopupWindowURI = aPopupWindowURI; NS_IF_ADDREF(event->mPopupWindowURI); @@ -109,7 +109,7 @@ NS_IMETHODIMP nsDOMPopupBlockedEvent::GetRequestingWindow(nsIDOMWindow **aRequestingWindow) { if (mEvent->eventStructType == NS_POPUPBLOCKED_EVENT) { - nsPopupBlockedEvent* event = NS_STATIC_CAST(nsPopupBlockedEvent*, mEvent); + nsPopupBlockedEvent* event = static_cast(mEvent); CallQueryReferent(event->mRequestingWindow.get(), aRequestingWindow); } else { *aRequestingWindow = 0; @@ -123,7 +123,7 @@ nsDOMPopupBlockedEvent::GetPopupWindowURI(nsIURI **aPopupWindowURI) { NS_ENSURE_ARG_POINTER(aPopupWindowURI); if (mEvent->eventStructType == NS_POPUPBLOCKED_EVENT) { - nsPopupBlockedEvent* event = NS_STATIC_CAST(nsPopupBlockedEvent*, mEvent); + nsPopupBlockedEvent* event = static_cast(mEvent); *aPopupWindowURI = event->mPopupWindowURI; NS_IF_ADDREF(*aPopupWindowURI); return NS_OK; @@ -136,7 +136,7 @@ NS_IMETHODIMP nsDOMPopupBlockedEvent::GetPopupWindowFeatures(nsAString &aPopupWindowFeatures) { if (mEvent->eventStructType == NS_POPUPBLOCKED_EVENT) { - nsPopupBlockedEvent* event = NS_STATIC_CAST(nsPopupBlockedEvent*, mEvent); + nsPopupBlockedEvent* event = static_cast(mEvent); aPopupWindowFeatures = event->mPopupWindowFeatures; return NS_OK; } @@ -148,7 +148,7 @@ NS_IMETHODIMP nsDOMPopupBlockedEvent::GetPopupWindowName(nsAString &aPopupWindowName) { if (mEvent->eventStructType == NS_POPUPBLOCKED_EVENT) { - nsPopupBlockedEvent* event = NS_STATIC_CAST(nsPopupBlockedEvent*, mEvent); + nsPopupBlockedEvent* event = static_cast(mEvent); aPopupWindowName = event->mPopupWindowName; return NS_OK; } diff --git a/content/events/src/nsDOMTextEvent.cpp b/content/events/src/nsDOMTextEvent.cpp index 1b0720c0de90..2f7cedd928a2 100644 --- a/content/events/src/nsDOMTextEvent.cpp +++ b/content/events/src/nsDOMTextEvent.cpp @@ -59,7 +59,7 @@ nsDOMTextEvent::nsDOMTextEvent(nsPresContext* aPresContext, // // extract the IME composition string // - nsTextEvent *te = NS_STATIC_CAST(nsTextEvent*, mEvent); + nsTextEvent *te = static_cast(mEvent); mText = te->theText; // @@ -113,7 +113,7 @@ NS_METHOD nsDOMTextEvent::GetEventReply(nsTextEventReply** aReply) { if (mEvent->message == NS_TEXT_TEXT) { - *aReply = &(NS_STATIC_CAST(nsTextEvent*, mEvent)->theReply); + *aReply = &(static_cast(mEvent)->theReply); return NS_OK; } aReply = 0; diff --git a/content/events/src/nsDOMUIEvent.cpp b/content/events/src/nsDOMUIEvent.cpp index 6086aafd8c44..5b7c6695f047 100644 --- a/content/events/src/nsDOMUIEvent.cpp +++ b/content/events/src/nsDOMUIEvent.cpp @@ -55,8 +55,8 @@ nsDOMUIEvent::nsDOMUIEvent(nsPresContext* aPresContext, nsGUIEvent* aEvent) : nsDOMEvent(aPresContext, aEvent ? - NS_STATIC_CAST(nsEvent *, aEvent) : - NS_STATIC_CAST(nsEvent *, new nsUIEvent(PR_FALSE, 0, 0))) + static_cast(aEvent) : + static_cast(new nsUIEvent(PR_FALSE, 0, 0))) , mClientPoint(0,0) { if (aEvent) { @@ -73,14 +73,14 @@ nsDOMUIEvent::nsDOMUIEvent(nsPresContext* aPresContext, nsGUIEvent* aEvent) { case NS_UI_EVENT: { - nsUIEvent *event = NS_STATIC_CAST(nsUIEvent*, mEvent); + nsUIEvent *event = static_cast(mEvent); mDetail = event->detail; break; } case NS_SCROLLPORT_EVENT: { - nsScrollPortEvent* scrollEvent = NS_STATIC_CAST(nsScrollPortEvent*, mEvent); + nsScrollPortEvent* scrollEvent = static_cast(mEvent); mDetail = (PRInt32)scrollEvent->orient; break; } @@ -444,7 +444,7 @@ NS_METHOD nsDOMUIEvent::GetCompositionReply(nsTextEventReply** aReply) (mEvent->message == NS_COMPOSITION_START) || (mEvent->message == NS_COMPOSITION_QUERY)) { - *aReply = &(NS_STATIC_CAST(nsCompositionEvent*, mEvent)->theReply); + *aReply = &(static_cast(mEvent)->theReply); return NS_OK; } *aReply = nsnull; @@ -456,7 +456,7 @@ nsDOMUIEvent::GetReconversionReply(nsReconversionEventReply** aReply) { if (mEvent->eventStructType == NS_RECONVERSION_EVENT) { - *aReply = &(NS_STATIC_CAST(nsReconversionEvent*, mEvent)->theReply); + *aReply = &(static_cast(mEvent)->theReply); return NS_OK; } *aReply = nsnull; @@ -468,7 +468,7 @@ nsDOMUIEvent::GetQueryCaretRectReply(nsQueryCaretRectEventReply** aReply) { if (mEvent->eventStructType == NS_QUERYCARETRECT_EVENT) { - *aReply = &(NS_STATIC_CAST(nsQueryCaretRectEvent*, mEvent)->theReply); + *aReply = &(static_cast(mEvent)->theReply); return NS_OK; } *aReply = nsnull; diff --git a/content/events/src/nsDOMXULCommandEvent.cpp b/content/events/src/nsDOMXULCommandEvent.cpp index 4211091986c8..d5415a8d41a9 100644 --- a/content/events/src/nsDOMXULCommandEvent.cpp +++ b/content/events/src/nsDOMXULCommandEvent.cpp @@ -56,7 +56,7 @@ nsDOMXULCommandEvent::nsDOMXULCommandEvent(nsPresContext* aPresContext, nsDOMXULCommandEvent::~nsDOMXULCommandEvent() { if (mEventIsInternal) { - nsXULCommandEvent* command = NS_STATIC_CAST(nsXULCommandEvent*, mEvent); + nsXULCommandEvent* command = static_cast(mEvent); delete command; mEvent = nsnull; } diff --git a/content/events/src/nsDOMXULCommandEvent.h b/content/events/src/nsDOMXULCommandEvent.h index 2eff7f5ce374..1401c542ef88 100644 --- a/content/events/src/nsDOMXULCommandEvent.h +++ b/content/events/src/nsDOMXULCommandEvent.h @@ -60,7 +60,7 @@ public: private: // Convenience accessor for the event nsXULCommandEvent* Event() { - return NS_STATIC_CAST(nsXULCommandEvent*, mEvent); + return static_cast(mEvent); } }; diff --git a/content/events/src/nsEventDispatcher.cpp b/content/events/src/nsEventDispatcher.cpp index b9e35ae7eb7d..dcbc4d24ec0a 100644 --- a/content/events/src/nsEventDispatcher.cpp +++ b/content/events/src/nsEventDispatcher.cpp @@ -549,54 +549,54 @@ nsEventDispatcher::CreateEvent(nsPresContext* aPresContext, switch(aEvent->eventStructType) { case NS_MUTATION_EVENT: return NS_NewDOMMutationEvent(aDOMEvent, aPresContext, - NS_STATIC_CAST(nsMutationEvent*,aEvent)); + static_cast(aEvent)); case NS_GUI_EVENT: case NS_COMPOSITION_EVENT: case NS_RECONVERSION_EVENT: case NS_QUERYCARETRECT_EVENT: case NS_SCROLLPORT_EVENT: return NS_NewDOMUIEvent(aDOMEvent, aPresContext, - NS_STATIC_CAST(nsGUIEvent*,aEvent)); + static_cast(aEvent)); case NS_KEY_EVENT: return NS_NewDOMKeyboardEvent(aDOMEvent, aPresContext, - NS_STATIC_CAST(nsKeyEvent*,aEvent)); + static_cast(aEvent)); case NS_MOUSE_EVENT: case NS_MOUSE_SCROLL_EVENT: case NS_POPUP_EVENT: return NS_NewDOMMouseEvent(aDOMEvent, aPresContext, - NS_STATIC_CAST(nsInputEvent*,aEvent)); + static_cast(aEvent)); case NS_POPUPBLOCKED_EVENT: return NS_NewDOMPopupBlockedEvent(aDOMEvent, aPresContext, - NS_STATIC_CAST(nsPopupBlockedEvent*, - aEvent)); + static_cast + (aEvent)); case NS_TEXT_EVENT: return NS_NewDOMTextEvent(aDOMEvent, aPresContext, - NS_STATIC_CAST(nsTextEvent*,aEvent)); + static_cast(aEvent)); case NS_BEFORE_PAGE_UNLOAD_EVENT: return NS_NewDOMBeforeUnloadEvent(aDOMEvent, aPresContext, - NS_STATIC_CAST(nsBeforePageUnloadEvent*, - aEvent)); + static_cast + (aEvent)); case NS_PAGETRANSITION_EVENT: return NS_NewDOMPageTransitionEvent(aDOMEvent, aPresContext, - NS_STATIC_CAST(nsPageTransitionEvent*, - aEvent)); + static_cast + (aEvent)); #ifdef MOZ_SVG case NS_SVG_EVENT: return NS_NewDOMSVGEvent(aDOMEvent, aPresContext, aEvent); case NS_SVGZOOM_EVENT: return NS_NewDOMSVGZoomEvent(aDOMEvent, aPresContext, - NS_STATIC_CAST(nsGUIEvent*,aEvent)); + static_cast(aEvent)); #endif // MOZ_SVG case NS_XUL_COMMAND_EVENT: return NS_NewDOMXULCommandEvent(aDOMEvent, aPresContext, - NS_STATIC_CAST(nsXULCommandEvent*, - aEvent)); + static_cast + (aEvent)); case NS_COMMAND_EVENT: return NS_NewDOMCommandEvent(aDOMEvent, aPresContext, - NS_STATIC_CAST(nsCommandEvent*, aEvent)); + static_cast(aEvent)); } // For all other types of events, create a vanilla event object. diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp index 6597d3a14faf..bbe98c8b8c06 100644 --- a/content/events/src/nsEventListenerManager.cpp +++ b/content/events/src/nsEventListenerManager.cpp @@ -198,7 +198,7 @@ struct EventTypeData const nsIID* iid; }; -#define HANDLER(x) NS_REINTERPRET_CAST(GenericHandler, x) +#define HANDLER(x) reinterpret_cast(x) static const EventDispatchData sMouseEvents[] = { { NS_MOUSE_BUTTON_DOWN, HANDLER(&nsIDOMMouseListener::MouseDown) }, @@ -373,7 +373,7 @@ nsEventListenerManager::RemoveAllListeners() mListenersRemoved = PR_TRUE; PRInt32 count = mListeners.Count(); for (PRInt32 i = 0; i < count; i++) { - delete NS_STATIC_CAST(nsListenerStruct*, mListeners.ElementAt(i)); + delete static_cast(mListeners.ElementAt(i)); } mListeners.Clear(); return NS_OK; @@ -402,7 +402,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsEventListenerManager) PRInt32 i, count = tmp->mListeners.Count(); nsListenerStruct *ls; for (i = 0; i < count; i++) { - ls = NS_STATIC_CAST(nsListenerStruct*, tmp->mListeners.ElementAt(i)); + ls = static_cast(tmp->mListeners.ElementAt(i)); if (ls) { cb.NoteXPCOMChild(ls->mListener.get()); } @@ -485,7 +485,7 @@ nsEventListenerManager::AddEventListener(nsIDOMEventListener *aListener, nsListenerStruct* ls = nsnull; PRInt32 count = mListeners.Count(); for (PRInt32 i = 0; i < count; i++) { - ls = NS_STATIC_CAST(nsListenerStruct*, mListeners.ElementAt(i)); + ls = static_cast(mListeners.ElementAt(i)); if (ls->mListener == aListener && ls->mFlags == aFlags && ls->mGroupFlags == group && (EVENT_TYPE_EQUALS(ls, aType, aTypeAtom) || @@ -571,7 +571,7 @@ nsEventListenerManager::RemoveEventListener(nsIDOMEventListener *aListener, PRInt32 count = mListeners.Count(); for (PRInt32 i = 0; i < count; ++i) { - ls = NS_STATIC_CAST(nsListenerStruct*, mListeners.ElementAt(i)); + ls = static_cast(mListeners.ElementAt(i)); if (ls->mListener == aListener && ls->mGroupFlags == group && ((ls->mFlags & ~NS_PRIV_EVENT_UNTRUSTED_PERMITTED) == aFlags) && @@ -654,7 +654,7 @@ nsEventListenerManager::FindJSEventListener(PRUint32 aEventType, nsListenerStruct *ls; PRInt32 count = mListeners.Count(); for (PRInt32 i = 0; i < count; ++i) { - ls = NS_STATIC_CAST(nsListenerStruct*, mListeners.ElementAt(i)); + ls = static_cast(mListeners.ElementAt(i)); if (EVENT_TYPE_EQUALS(ls, aEventType, aTypeAtom) && ls->mFlags & NS_PRIV_EVENT_FLAG_SCRIPT) { return ls; @@ -809,7 +809,7 @@ nsEventListenerManager::AddScriptEventListener(nsISupports *aObject, else { PRInt32 nameSpace = kNameSpaceID_Unknown; if (node && node->IsNodeOfType(nsINode::eCONTENT)) { - nsIContent* content = NS_STATIC_CAST(nsIContent*, node.get()); + nsIContent* content = static_cast(node.get()); nameSpace = content->GetNameSpaceID(); } else if (doc) { @@ -1179,7 +1179,7 @@ found: PRBool hasListener = PR_FALSE; for (PRInt32 k = 0; !mListenersRemoved && k < count; ++k) { nsListenerStruct* ls = - NS_STATIC_CAST(nsListenerStruct*, originalListeners.FastElementAt(k)); + static_cast(originalListeners.FastElementAt(k)); if (!ls || (mListenerRemoved && mListeners.IndexOf(ls) == -1)) { continue; } @@ -1391,7 +1391,7 @@ nsEventListenerManager::FixContextMenuEvent(nsPresContext* aPresContext, nsresult ret = NS_OK; PRBool contextMenuKey = - NS_STATIC_CAST(nsMouseEvent*, aEvent)->context == nsMouseEvent::eContextMenuKey; + static_cast(aEvent)->context == nsMouseEvent::eContextMenuKey; if (nsnull == *aDOMEvent) { // If we're here because of the key-equiv for showing context menus, we // have to twiddle with the NS event to make sure the context menu comes @@ -1404,7 +1404,7 @@ nsEventListenerManager::FixContextMenuEvent(nsPresContext* aPresContext, aEvent->refPoint.x = 0; aEvent->refPoint.y = 0; } - ret = NS_NewDOMMouseEvent(aDOMEvent, aPresContext, NS_STATIC_CAST(nsInputEvent*, aEvent)); + ret = NS_NewDOMMouseEvent(aDOMEvent, aPresContext, static_cast(aEvent)); NS_ENSURE_SUCCESS(ret, ret); } @@ -1676,8 +1676,8 @@ nsEventListenerManager::HasMutationListeners(PRBool* aListener) if (mMayHaveMutationListeners) { PRInt32 count = mListeners.Count(); for (PRInt32 i = 0; i < count; ++i) { - nsListenerStruct* ls = NS_STATIC_CAST(nsListenerStruct*, - mListeners.FastElementAt(i)); + nsListenerStruct* ls = static_cast + (mListeners.FastElementAt(i)); if (ls && ls->mEventType >= NS_MUTATION_START && ls->mEventType <= NS_MUTATION_END) { @@ -1697,8 +1697,8 @@ nsEventListenerManager::MutationListenerBits() if (mMayHaveMutationListeners) { PRInt32 i, count = mListeners.Count(); for (i = 0; i < count; ++i) { - nsListenerStruct* ls = NS_STATIC_CAST(nsListenerStruct*, - mListeners.FastElementAt(i)); + nsListenerStruct* ls = static_cast + (mListeners.FastElementAt(i)); if (ls && (ls->mEventType >= NS_MUTATION_START && ls->mEventType <= NS_MUTATION_END)) { @@ -1737,8 +1737,8 @@ found: PRInt32 i, count = mListeners.Count(); for (i = 0; i < count; ++i) { - nsListenerStruct* ls = NS_STATIC_CAST(nsListenerStruct*, - mListeners.FastElementAt(i)); + nsListenerStruct* ls = static_cast + (mListeners.FastElementAt(i)); if (ls && (ls->mTypeAtom == atom || EVENT_TYPE_DATA_EQUALS(ls->mTypeData, typeData))) { @@ -1753,8 +1753,8 @@ nsEventListenerManager::HasUnloadListeners() { PRInt32 count = mListeners.Count(); for (PRInt32 i = 0; i < count; ++i) { - nsListenerStruct* ls = NS_STATIC_CAST(nsListenerStruct*, - mListeners.FastElementAt(i)); + nsListenerStruct* ls = static_cast + (mListeners.FastElementAt(i)); if (ls && (ls->mEventType == NS_PAGE_UNLOAD || ls->mEventType == NS_BEFORE_PAGE_UNLOAD) || diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp index b837932de173..97ecd971d4af 100644 --- a/content/events/src/nsEventStateManager.cpp +++ b/content/events/src/nsEventStateManager.cpp @@ -634,7 +634,7 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext, switch (aEvent->message) { case NS_MOUSE_BUTTON_DOWN: - switch (NS_STATIC_CAST(nsMouseEvent*, aEvent)->button) { + switch (static_cast(aEvent)->button) { case nsMouseEvent::eLeftButton: #ifndef XP_OS2 BeginTrackingDragGesture ( aPresContext, (nsMouseEvent*)aEvent, aTargetFrame ); @@ -657,7 +657,7 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext, } break; case NS_MOUSE_BUTTON_UP: - switch (NS_STATIC_CAST(nsMouseEvent*, aEvent)->button) { + switch (static_cast(aEvent)->button) { case nsMouseEvent::eLeftButton: #ifdef CLICK_HOLD_CONTEXT_MENUS KillClickHoldTimer(); @@ -685,7 +685,7 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext, // window bounds --- the mouse probably moved into some // "on top" window. { - nsMouseEvent* mouseEvent = NS_STATIC_CAST(nsMouseEvent*, aEvent); + nsMouseEvent* mouseEvent = static_cast(aEvent); nsIWidget* parentWidget = mouseEvent->widget->GetParent(); nsPoint eventPoint; eventPoint = nsLayoutUtils::TranslateWidgetToView(aPresContext, @@ -904,7 +904,7 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext, // This allows "-moz-user-focus: ignore" to work. #if defined(XP_WIN) || defined(XP_OS2) - if (!NS_STATIC_CAST(nsFocusEvent*, aEvent)->isMozWindowTakingFocus) { + if (!static_cast(aEvent)->isMozWindowTakingFocus) { // This situation occurs when focus goes to a non-gecko child window // in an embedding application. In this case we do fire a blur @@ -1172,7 +1172,7 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext, mCurrentTargetContent = mCurrentFocus; } - nsMouseScrollEvent* msEvent = NS_STATIC_CAST(nsMouseScrollEvent*, aEvent); + nsMouseScrollEvent* msEvent = static_cast(aEvent); NS_NAMED_LITERAL_CSTRING(actionslot, ".action"); NS_NAMED_LITERAL_CSTRING(numlinesslot, ".numlines"); @@ -1271,7 +1271,7 @@ nsEventStateManager::HandleAccessKey(nsPresContext* aPresContext, nsVoidKey key(NS_INT32_TO_PTR(accKey)); if (mAccessKeys->Exists(&key)) { nsCOMPtr content = - dont_AddRef(NS_STATIC_CAST(nsIContent*, mAccessKeys->Get(&key))); + dont_AddRef(static_cast(mAccessKeys->Get(&key))); content->PerformAccesskey(sKeyCausesActivation, NS_IS_TRUSTED_EVENT(aEvent)); *aStatus = nsEventStatus_eConsumeNoDefault; @@ -1313,7 +1313,7 @@ nsEventStateManager::HandleAccessKey(nsPresContext* aPresContext, nsPresContext *subPC = subPS->GetPresContext(); nsEventStateManager* esm = - NS_STATIC_CAST(nsEventStateManager *, subPC->EventStateManager()); + static_cast(subPC->EventStateManager()); if (esm) esm->HandleAccessKey(subPC, aEvent, aStatus, nsnull, @@ -1346,7 +1346,7 @@ nsEventStateManager::HandleAccessKey(nsPresContext* aPresContext, NS_ASSERTION(parentPC, "PresShell without PresContext"); nsEventStateManager* esm = - NS_STATIC_CAST(nsEventStateManager *, parentPC->EventStateManager()); + static_cast(parentPC->EventStateManager()); if (esm) esm->HandleAccessKey(parentPC, aEvent, aStatus, docShell, @@ -1424,7 +1424,7 @@ nsEventStateManager::KillClickHoldTimer() void nsEventStateManager::sClickHoldCallback(nsITimer *aTimer, void* aESM) { - nsEventStateManager* self = NS_STATIC_CAST(nsEventStateManager*, aESM); + nsEventStateManager* self = static_cast(aESM); if ( self ) self->FireContextClick(); @@ -2054,7 +2054,7 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext, switch (aEvent->message) { case NS_MOUSE_BUTTON_DOWN: { - if (NS_STATIC_CAST(nsMouseEvent*, aEvent)->button == nsMouseEvent::eLeftButton && + if (static_cast(aEvent)->button == nsMouseEvent::eLeftButton && !mNormalLMouseEventInProcess) { //Our state is out of whack. We got a mouseup while still processing //the mousedown. Kill View-level mouse capture or it'll stay stuck @@ -2113,7 +2113,7 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext, } // The rest is left button-specific. - if (NS_STATIC_CAST(nsMouseEvent*, aEvent)->button != + if (static_cast(aEvent)->button != nsMouseEvent::eLeftButton) break; @@ -2242,7 +2242,7 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext, nsMouseEvent event(NS_IS_TRUSTED_EVENT(aEvent), NS_DRAGDROP_DRAGDROP, widget, nsMouseEvent::eReal); - nsMouseEvent* mouseEvent = NS_STATIC_CAST(nsMouseEvent*, aEvent); + nsMouseEvent* mouseEvent = static_cast(aEvent); event.refPoint = mouseEvent->refPoint; event.isShift = mouseEvent->isShift; event.isControl = mouseEvent->isControl; @@ -2731,7 +2731,7 @@ nsEventStateManager::NotifyMouseOut(nsGUIEvent* aEvent, nsIContent* aMovingInto) if (presContext) { nsEventStateManager* kidESM = - NS_STATIC_CAST(nsEventStateManager*, presContext->EventStateManager()); + static_cast(presContext->EventStateManager()); // Not moving into any element in this subdocument kidESM->NotifyMouseOut(aEvent, nsnull); } @@ -2790,8 +2790,8 @@ nsEventStateManager::NotifyMouseOver(nsGUIEvent* aEvent, nsIContent* aContent) nsIPresShell *parentShell = parentDoc->GetPrimaryShell(); if (parentShell) { nsEventStateManager* parentESM = - NS_STATIC_CAST(nsEventStateManager*, - parentShell->GetPresContext()->EventStateManager()); + static_cast + (parentShell->GetPresContext()->EventStateManager()); parentESM->NotifyMouseOver(aEvent, docContent); } } @@ -4516,7 +4516,7 @@ nsEventStateManager::EventStatusOK(nsGUIEvent* aEvent, PRBool *aOK) { *aOK = PR_TRUE; if (aEvent->message == NS_MOUSE_BUTTON_DOWN && - NS_STATIC_CAST(nsMouseEvent*, aEvent)->button == nsMouseEvent::eLeftButton) { + static_cast(aEvent)->button == nsMouseEvent::eLeftButton) { if (!mNormalLMouseEventInProcess) { *aOK = PR_FALSE; } @@ -4543,7 +4543,7 @@ nsEventStateManager::RegisterAccessKey(nsIContent* aContent, PRUint32 aKey) nsVoidKey key(NS_INT32_TO_PTR(accKey)); #ifdef DEBUG_jag - nsCOMPtr oldContent = dont_AddRef(NS_STATIC_CAST(nsIContent*, mAccessKeys->Get(&key))); + nsCOMPtr oldContent = dont_AddRef(static_cast(mAccessKeys->Get(&key))); NS_ASSERTION(!oldContent, "Overwriting accesskey registration"); #endif mAccessKeys->Put(&key, aContent); @@ -4564,7 +4564,7 @@ nsEventStateManager::UnregisterAccessKey(nsIContent* aContent, PRUint32 aKey) nsVoidKey key(NS_INT32_TO_PTR(accKey)); - nsCOMPtr oldContent = dont_AddRef(NS_STATIC_CAST(nsIContent*, mAccessKeys->Get(&key))); + nsCOMPtr oldContent = dont_AddRef(static_cast(mAccessKeys->Get(&key))); #ifdef DEBUG_jag NS_ASSERTION(oldContent == aContent, "Trying to unregister wrong content"); #endif @@ -4655,7 +4655,7 @@ nsEventStateManager::GetDocSelectionLocation(nsIContent **aStartContent, if (domRange) { domRange->GetStartContainer(getter_AddRefs(startNode)); domRange->GetEndContainer(getter_AddRefs(endNode)); - domRange->GetStartOffset(NS_REINTERPRET_CAST(PRInt32 *, aStartOffset)); + domRange->GetStartOffset(reinterpret_cast(aStartOffset)); nsIContent *childContent = nsnull; @@ -4741,7 +4741,7 @@ nsEventStateManager::GetDocSelectionLocation(nsIContent **aStartContent, frameTraversal->Next(); nsISupports* currentItem; frameTraversal->CurrentItem(¤tItem); - if (nsnull == (newCaretFrame = NS_STATIC_CAST(nsIFrame*, currentItem))) { + if (nsnull == (newCaretFrame = static_cast(currentItem))) { break; } newCaretContent = newCaretFrame->GetContent(); diff --git a/content/events/src/nsPrivateTextRange.cpp b/content/events/src/nsPrivateTextRange.cpp index 6c7e25c2498b..f1ff0995f119 100644 --- a/content/events/src/nsPrivateTextRange.cpp +++ b/content/events/src/nsPrivateTextRange.cpp @@ -96,7 +96,7 @@ void nsPrivateTextRangeList::AppendTextRange(nsRefPtr& aRang NS_METHOD nsPrivateTextRangeList::GetLength(PRUint16* aLength) { - *aLength = NS_STATIC_CAST(PRUint16, mList.Length()); + *aLength = static_cast(mList.Length()); return NS_OK; } diff --git a/content/events/src/nsXMLEventsManager.cpp b/content/events/src/nsXMLEventsManager.cpp index 9be1dd59bf5b..542893320231 100644 --- a/content/events/src/nsXMLEventsManager.cpp +++ b/content/events/src/nsXMLEventsManager.cpp @@ -265,7 +265,7 @@ PR_STATIC_CALLBACK(PLDHashOperator) EnumAndSetIncomplete(nsISupports * aContent, void * aData) { if (aListener && aData) { - nsCOMPtr content = NS_STATIC_CAST(nsIContent *, aData); + nsCOMPtr content = static_cast(aData); if (content) { if (aListener->ObserverEquals(content) || aListener->HandlerEquals(content)) { aListener->SetIncomplete(); diff --git a/content/html/content/src/nsFormSubmission.cpp b/content/html/content/src/nsFormSubmission.cpp index 8cacb30db793..06e07f05cd5f 100644 --- a/content/html/content/src/nsFormSubmission.cpp +++ b/content/html/content/src/nsFormSubmission.cpp @@ -1203,7 +1203,7 @@ GetSubmissionFromForm(nsGenericHTMLElement* aForm, // This ASSUMES that all encodings above inherit from nsFormSubmission, which // they currently do. If that changes, change this too. - NS_STATIC_CAST(nsFormSubmission*, *aFormSubmission)->Init(); + static_cast(*aFormSubmission)->Init(); return NS_OK; } diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp index 7e788631c660..993edd6c60dd 100644 --- a/content/html/content/src/nsGenericHTMLElement.cpp +++ b/content/html/content/src/nsGenericHTMLElement.cpp @@ -230,21 +230,21 @@ nsGenericHTMLElement::DOMQueryInterface(nsIDOMHTMLElement *aElement, nsISupports *inst = nsnull; if (aIID.Equals(NS_GET_IID(nsIDOMNode))) { - inst = NS_STATIC_CAST(nsIDOMNode *, aElement); + inst = static_cast(aElement); } else if (aIID.Equals(NS_GET_IID(nsIDOMElement))) { - inst = NS_STATIC_CAST(nsIDOMElement *, aElement); + inst = static_cast(aElement); } else if (aIID.Equals(NS_GET_IID(nsIDOMHTMLElement))) { - inst = NS_STATIC_CAST(nsIDOMHTMLElement *, aElement); + inst = static_cast(aElement); } else if (aIID.Equals(NS_GET_IID(nsIDOMNSHTMLElement))) { - inst = NS_STATIC_CAST(nsIDOMNSHTMLElement *, - new nsGenericHTMLElementTearoff(this)); + inst = static_cast + (new nsGenericHTMLElementTearoff(this)); if (NS_UNLIKELY(!inst)) { *aInstancePtr = nsnull; return NS_ERROR_OUT_OF_MEMORY; } } else if (aIID.Equals(NS_GET_IID(nsIDOMElementCSSInlineStyle))) { - inst = NS_STATIC_CAST(nsIDOMElementCSSInlineStyle *, - new nsGenericHTMLElementTearoff(this)); + inst = static_cast + (new nsGenericHTMLElementTearoff(this)); if (NS_UNLIKELY(!inst)) { *aInstancePtr = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -306,14 +306,14 @@ nsGenericHTMLElement::CopyInnerTo(nsGenericElement* aDst) const rv = aDst->SetProperty(nsGkAtoms::htmlBaseHref, prop, nsPropertyTable::SupportsDtorFunc, PR_TRUE); if (NS_SUCCEEDED(rv)) { - NS_ADDREF(NS_STATIC_CAST(nsIURI*, prop)); + NS_ADDREF(static_cast(prop)); } } if ((prop = GetProperty(nsGkAtoms::htmlBaseTarget))) { rv = aDst->SetProperty(nsGkAtoms::htmlBaseTarget, prop, nsPropertyTable::SupportsDtorFunc, PR_TRUE); if (NS_SUCCEEDED(rv)) { - NS_ADDREF(NS_STATIC_CAST(nsIAtom*, prop)); + NS_ADDREF(static_cast(prop)); } } @@ -724,8 +724,8 @@ nsGenericHTMLElement::GetInnerHTML(nsAString& aInnerHTML) return NS_OK; // We rely on the document for doing HTML conversion } - nsCOMPtr thisNode(do_QueryInterface(NS_STATIC_CAST(nsIContent *, - this))); + nsCOMPtr thisNode(do_QueryInterface(static_cast + (this))); nsresult rv = NS_OK; nsAutoString contentType; @@ -791,8 +791,8 @@ nsGenericHTMLElement::SetInnerHTML(const nsAString& aInnerHTML) loader->SetEnabled(PR_FALSE); } - nsCOMPtr thisNode(do_QueryInterface(NS_STATIC_CAST(nsIContent *, - this))); + nsCOMPtr thisNode(do_QueryInterface(static_cast + (this))); nsresult rv = nsContentUtils::CreateContextualFragment(thisNode, aInnerHTML, getter_AddRefs(df)); if (NS_SUCCEEDED(rv)) { @@ -1094,7 +1094,7 @@ nsGenericHTMLElement::GetSpellcheck(PRBool* aSpellcheck) if (node->IsNodeOfType(nsINode::eHTML)) { static nsIContent::AttrValuesArray strings[] = {&nsGkAtoms::_true, &nsGkAtoms::_false, nsnull}; - switch (NS_STATIC_CAST(nsIContent*, node)-> + switch (static_cast(node)-> FindAttrValueIn(kNameSpaceID_None, nsGkAtoms::spellcheck, strings, eCaseMatters)) { case 0: // spellcheck = "true" @@ -1571,7 +1571,7 @@ nsGenericHTMLElement::GetBaseURI() const void* prop; if (HasFlag(NODE_HAS_PROPERTIES) && (prop = GetProperty(nsGkAtoms::htmlBaseHref))) { - nsIURI* uri = NS_STATIC_CAST(nsIURI*, prop); + nsIURI* uri = static_cast(prop); NS_ADDREF(uri); return uri; @@ -1598,7 +1598,7 @@ nsGenericHTMLElement::GetBaseTarget(nsAString& aBaseTarget) const { void* prop; if (HasFlag(NODE_HAS_PROPERTIES) && (prop = GetProperty(nsGkAtoms::htmlBaseTarget))) { - NS_STATIC_CAST(nsIAtom*, prop)->ToString(aBaseTarget); + static_cast(prop)->ToString(aBaseTarget); return; } @@ -3047,8 +3047,8 @@ nsGenericHTMLFormElement::IntrinsicState() const if (mForm && // XXXbz Need the cast to make VC++6 happy. - NS_STATIC_CAST(const nsIFormControl*, - mForm->GetDefaultSubmitElement()) == this) { + static_cast + (mForm->GetDefaultSubmitElement()) == this) { NS_ASSERTION(IsSubmitControl(), "Default submit element that isn't a submit control."); // We are the default submit element (:default) diff --git a/content/html/content/src/nsGenericHTMLElement.h b/content/html/content/src/nsGenericHTMLElement.h index c0e7c3d69c74..5656d1013441 100644 --- a/content/html/content/src/nsGenericHTMLElement.h +++ b/content/html/content/src/nsGenericHTMLElement.h @@ -86,7 +86,7 @@ public: static nsGenericHTMLElement* FromContent(nsIContent *aContent) { if (aContent->IsNodeOfType(eHTML)) - return NS_STATIC_CAST(nsGenericHTMLElement*, aContent); + return static_cast(aContent); return nsnull; } @@ -1103,7 +1103,7 @@ NS_NewHTML##_elementName##Element(nsINodeInfo *aNodeInfo, PRBool aFromParser)\ if (NS_SUCCEEDED(rv)) \ return rv; \ \ - rv = DOMQueryInterface(NS_STATIC_CAST(_base_if *, this), aIID, \ + rv = DOMQueryInterface(static_cast<_base_if *>(this), aIID, \ aInstancePtr); \ \ if (NS_SUCCEEDED(rv)) \ @@ -1134,7 +1134,7 @@ NS_NewHTML##_elementName##Element(nsINodeInfo *aNodeInfo, PRBool aFromParser)\ if (NS_SUCCEEDED(rv)) \ return rv; \ \ - rv = DOMQueryInterface(NS_STATIC_CAST(_base_if *, this), aIID, \ + rv = DOMQueryInterface(static_cast<_base_if *>(this), aIID, \ aInstancePtr); \ \ if (NS_SUCCEEDED(rv)) \ diff --git a/content/html/content/src/nsHTMLButtonElement.cpp b/content/html/content/src/nsHTMLButtonElement.cpp index e928a1311ce0..5e826438b00b 100644 --- a/content/html/content/src/nsHTMLButtonElement.cpp +++ b/content/html/content/src/nsHTMLButtonElement.cpp @@ -229,7 +229,7 @@ nsHTMLButtonElement::Click() NS_MOUSE_CLICK, nsnull, nsMouseEvent::eReal); nsEventStatus status = nsEventStatus_eIgnore; - nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this), context, + nsEventDispatcher::Dispatch(static_cast(this), context, &event, nsnull, &status); } } @@ -369,7 +369,7 @@ nsHTMLButtonElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor) nsMouseEvent event(NS_IS_TRUSTED_EVENT(aVisitor.mEvent), NS_MOUSE_CLICK, nsnull, nsMouseEvent::eReal); - nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this), + nsEventDispatcher::Dispatch(static_cast(this), aVisitor.mPresContext, &event, nsnull, &status); } @@ -423,14 +423,14 @@ nsHTMLButtonElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor) case NS_MOUSE_BUTTON_DOWN: { if (aVisitor.mEvent->eventStructType == NS_MOUSE_EVENT) { - if (NS_STATIC_CAST(nsMouseEvent*, aVisitor.mEvent)->button == + if (static_cast(aVisitor.mEvent)->button == nsMouseEvent::eLeftButton) { aVisitor.mPresContext->EventStateManager()-> SetContentState(this, NS_EVENT_STATE_ACTIVE | NS_EVENT_STATE_FOCUS); aVisitor.mEventStatus = nsEventStatus_eConsumeNoDefault; - } else if (NS_STATIC_CAST(nsMouseEvent*, aVisitor.mEvent)->button == + } else if (static_cast(aVisitor.mEvent)->button == nsMouseEvent::eMiddleButton || - NS_STATIC_CAST(nsMouseEvent*, aVisitor.mEvent)->button == + static_cast(aVisitor.mEvent)->button == nsMouseEvent::eRightButton) { // cancel all of these events for buttons //XXXsmaug What to do with these events? Why these should be cancelled? @@ -449,9 +449,9 @@ nsHTMLButtonElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor) { if (aVisitor.mEvent->eventStructType == NS_MOUSE_EVENT && aVisitor.mDOMEvent && - (NS_STATIC_CAST(nsMouseEvent*, aVisitor.mEvent)->button == + (static_cast(aVisitor.mEvent)->button == nsMouseEvent::eMiddleButton || - NS_STATIC_CAST(nsMouseEvent*, aVisitor.mEvent)->button == + static_cast(aVisitor.mEvent)->button == nsMouseEvent::eRightButton)) { aVisitor.mDOMEvent->StopPropagation(); } diff --git a/content/html/content/src/nsHTMLCanvasElement.cpp b/content/html/content/src/nsHTMLCanvasElement.cpp index e1e870d7223a..1cc32fa664fc 100644 --- a/content/html/content/src/nsHTMLCanvasElement.cpp +++ b/content/html/content/src/nsHTMLCanvasElement.cpp @@ -321,7 +321,7 @@ nsHTMLCanvasElement::ToDataURL(nsAString& aDataURL) if (!JSVAL_IS_STRING(argv[0])) return NS_ERROR_DOM_SYNTAX_ERR; JSString *type = JS_ValueToString(ctx, argv[0]); - return ToDataURLImpl (nsDependentString(NS_REINTERPRET_CAST(PRUnichar*,(JS_GetStringChars(type)))), + return ToDataURLImpl (nsDependentString(reinterpret_cast((JS_GetStringChars(type)))), EmptyString(), aDataURL); } @@ -334,8 +334,8 @@ nsHTMLCanvasElement::ToDataURL(nsAString& aDataURL) type = JS_ValueToString(ctx, argv[0]); params = JS_ValueToString(ctx, argv[1]); - return ToDataURLImpl (nsDependentString(NS_REINTERPRET_CAST(PRUnichar*,JS_GetStringChars(type))), - nsDependentString(NS_REINTERPRET_CAST(PRUnichar*,JS_GetStringChars(params))), + return ToDataURLImpl (nsDependentString(reinterpret_cast(JS_GetStringChars(type))), + nsDependentString(reinterpret_cast(JS_GetStringChars(params))), aDataURL); } diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp index 84230618c703..68fd85bddf33 100644 --- a/content/html/content/src/nsHTMLFormElement.cpp +++ b/content/html/content/src/nsHTMLFormElement.cpp @@ -563,7 +563,7 @@ ElementTraverser(const nsAString& key, nsIDOMHTMLInputElement* element, void* userArg) { nsCycleCollectionTraversalCallback *cb = - NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, userArg); + static_cast(userArg); cb->NoteXPCOMChild(element); return PL_DHASH_NEXT; @@ -688,7 +688,7 @@ NS_IMETHODIMP nsHTMLFormElement::Reset() { nsFormEvent event(PR_TRUE, NS_FORM_RESET); - nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this), nsnull, + nsEventDispatcher::Dispatch(static_cast(this), nsnull, &event); return NS_OK; } @@ -759,7 +759,7 @@ nsHTMLFormElement::UnbindFromTree(PRBool aDeep, PRBool aNullParent) nsresult nsHTMLFormElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor) { - if (aVisitor.mEvent->originalTarget == NS_STATIC_CAST(nsIContent*, this)) { + if (aVisitor.mEvent->originalTarget == static_cast(this)) { PRUint32 msg = aVisitor.mEvent->message; if (msg == NS_FORM_SUBMIT) { if (mGeneratingSubmit) { @@ -787,7 +787,7 @@ nsHTMLFormElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor) nsresult nsHTMLFormElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor) { - if (aVisitor.mEvent->originalTarget == NS_STATIC_CAST(nsIContent*, this)) { + if (aVisitor.mEvent->originalTarget == static_cast(this)) { PRUint32 msg = aVisitor.mEvent->message; if (msg == NS_FORM_SUBMIT) { // let the form know not to defer subsequent submissions @@ -1744,7 +1744,7 @@ nsHTMLFormElement::GetPositionInGroup(nsIDOMHTMLInputElement *aRadio, // XXX If ResolveName could return an nsContentList instead then we // could get an nsContentList instead of using this hacky upcast nsBaseContentList *radioGroup = - NS_STATIC_CAST(nsBaseContentList *, (nsIDOMNodeList *)radioNodeList); + static_cast((nsIDOMNodeList *)radioNodeList); NS_ASSERTION(radioGroup, "No such radio group in this container"); if (!radioGroup) { return NS_OK; @@ -1787,7 +1787,7 @@ nsHTMLFormElement::GetNextRadioButton(const nsAString& aName, // could get an nsContentList instead of using this hacky upcast nsBaseContentList *radioGroup = - NS_STATIC_CAST(nsBaseContentList *, (nsIDOMNodeList *)radioNodeList); + static_cast((nsIDOMNodeList *)radioNodeList); if (!radioGroup) { return NS_ERROR_FAILURE; } @@ -1986,7 +1986,7 @@ PR_STATIC_CALLBACK(PLDHashOperator) ControlTraverser(const nsAString& key, nsISupports* control, void* userArg) { nsCycleCollectionTraversalCallback *cb = - NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, userArg); + static_cast(userArg); cb->NoteXPCOMChild(control); return PL_DHASH_NEXT; @@ -2144,8 +2144,8 @@ nsFormControlList::AddElementToTable(nsIFormControl* aChild, NS_ENSURE_TRUE(nodeList, NS_ERROR_FAILURE); // Upcast, uggly, but it works! - nsBaseContentList *list = NS_STATIC_CAST(nsBaseContentList *, - (nsIDOMNodeList *)nodeList.get()); + nsBaseContentList *list = static_cast + ((nsIDOMNodeList *)nodeList.get()); PRInt32 oldIndex = list->IndexOf(newChild, PR_FALSE); @@ -2206,8 +2206,8 @@ nsFormControlList::RemoveElementFromTable(nsIFormControl* aChild, NS_ENSURE_TRUE(nodeList, NS_ERROR_FAILURE); // Upcast, uggly, but it works! - nsBaseContentList *list = NS_STATIC_CAST(nsBaseContentList *, - (nsIDOMNodeList *)nodeList.get()); + nsBaseContentList *list = static_cast + ((nsIDOMNodeList *)nodeList.get()); list->RemoveElement(content); diff --git a/content/html/content/src/nsHTMLImageElement.cpp b/content/html/content/src/nsHTMLImageElement.cpp index b6d75ba9151d..821205e95543 100644 --- a/content/html/content/src/nsHTMLImageElement.cpp +++ b/content/html/content/src/nsHTMLImageElement.cpp @@ -422,7 +422,7 @@ nsHTMLImageElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor) // element. (bug 39723) if (aVisitor.mEvent->eventStructType == NS_MOUSE_EVENT && aVisitor.mEvent->message == NS_MOUSE_CLICK && - NS_STATIC_CAST(nsMouseEvent*, aVisitor.mEvent)->button == + static_cast(aVisitor.mEvent)->button == nsMouseEvent::eLeftButton) { PRBool isMap = PR_FALSE; GetIsMap(&isMap); @@ -553,7 +553,7 @@ nsHTMLImageElement::Initialize(JSContext* aContext, JSObject *aObj, JSBool ret = JS_ValueToInt32(aContext, argv[0], &width); NS_ENSURE_TRUE(ret, NS_ERROR_INVALID_ARG); - nsresult rv = SetIntAttr(nsGkAtoms::width, NS_STATIC_CAST(PRInt32, width)); + nsresult rv = SetIntAttr(nsGkAtoms::width, static_cast(width)); if (NS_SUCCEEDED(rv) && (argc > 1)) { // The second (optional) argument is the height of the image @@ -561,7 +561,7 @@ nsHTMLImageElement::Initialize(JSContext* aContext, JSObject *aObj, ret = JS_ValueToInt32(aContext, argv[1], &height); NS_ENSURE_TRUE(ret, NS_ERROR_INVALID_ARG); - rv = SetIntAttr(nsGkAtoms::height, NS_STATIC_CAST(PRInt32, height)); + rv = SetIntAttr(nsGkAtoms::height, static_cast(height)); } return rv; diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp index b839bcfa9bde..974f518e918b 100644 --- a/content/html/content/src/nsHTMLInputElement.cpp +++ b/content/html/content/src/nsHTMLInputElement.cpp @@ -429,7 +429,7 @@ nsHTMLInputElement::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const // the clone. // XXX GetValue should be const nsAutoString value; - NS_CONST_CAST(nsHTMLInputElement*, this)->GetValue(value); + const_cast(this)->GetValue(value); // SetValueInternal handles setting the VALUE_CHANGED bit for us it->SetValueInternal(value, nsnull); } @@ -446,7 +446,7 @@ nsHTMLInputElement::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const // checked state on the clone. // XXX GetChecked should be const PRBool checked; - NS_CONST_CAST(nsHTMLInputElement*, this)->GetChecked(&checked); + const_cast(this)->GetChecked(&checked); it->DoSetChecked(checked, PR_FALSE); } break; @@ -1019,9 +1019,8 @@ nsHTMLInputElement::RadioSetChecked(PRBool aNotify) if (currentlySelected) { // Pass PR_TRUE for the aNotify parameter since the currently selected // button is already in the document. - rv = NS_STATIC_CAST(nsHTMLInputElement*, - NS_STATIC_CAST(nsIDOMHTMLInputElement*, currentlySelected) - )->SetCheckedInternal(PR_FALSE, PR_TRUE); + rv = static_cast + (static_cast(currentlySelected))->SetCheckedInternal(PR_FALSE, PR_TRUE); } // @@ -1144,7 +1143,7 @@ nsHTMLInputElement::FireOnChange() nsEventStatus status = nsEventStatus_eIgnore; nsEvent event(PR_TRUE, NS_FORM_CHANGE); nsCOMPtr presContext = GetPresContext(); - nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this), presContext, + nsEventDispatcher::Dispatch(static_cast(this), presContext, &event, nsnull, &status); } @@ -1251,7 +1250,7 @@ nsHTMLInputElement::Select() nsEvent event(nsContentUtils::IsCallerChrome(), NS_FORM_SELECTED); SET_BOOLBIT(mBitField, BF_HANDLING_SELECT_EVENT, PR_TRUE); - nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this), + nsEventDispatcher::Dispatch(static_cast(this), presContext, &event, nsnull, &status); SET_BOOLBIT(mBitField, BF_HANDLING_SELECT_EVENT, PR_FALSE); } @@ -1345,7 +1344,7 @@ nsHTMLInputElement::Click() SET_BOOLBIT(mBitField, BF_HANDLING_CLICK, PR_TRUE); - nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this), context, + nsEventDispatcher::Dispatch(static_cast(this), context, &event, nsnull, &status); SET_BOOLBIT(mBitField, BF_HANDLING_CLICK, PR_FALSE); @@ -1475,13 +1474,13 @@ nsHTMLInputElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor) if ((mType == NS_FORM_INPUT_TEXT || mType == NS_FORM_INPUT_PASSWORD) && aVisitor.mEvent->message == NS_MOUSE_CLICK && aVisitor.mEvent->eventStructType == NS_MOUSE_EVENT && - NS_STATIC_CAST(nsMouseEvent*, aVisitor.mEvent)->button == + static_cast(aVisitor.mEvent)->button == nsMouseEvent::eMiddleButton) { aVisitor.mEvent->flags &= ~NS_EVENT_FLAG_NO_CONTENT_DISPATCH; } // We must cache type because mType may change during JS event (bug 2369) - aVisitor.mItemFlags |= NS_STATIC_CAST(PRUint8, mType); + aVisitor.mItemFlags |= static_cast(mType); // Fire onchange (if necessary), before we do the blur, bug 357684. if (aVisitor.mEvent->message == NS_BLUR_CONTENT) { @@ -1606,7 +1605,7 @@ nsHTMLInputElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor) // this parent file control -- leave focus on the child. nsIFormControlFrame* formControlFrame = GetFormControlFrame(PR_FALSE); if (formControlFrame && ShouldFocus(this) && - aVisitor.mEvent->originalTarget == NS_STATIC_CAST(nsINode*, this)) + aVisitor.mEvent->originalTarget == static_cast(this)) formControlFrame->SetFocus(PR_TRUE, PR_TRUE); } break; // NS_FOCUS_CONTENT @@ -1643,7 +1642,7 @@ nsHTMLInputElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor) NS_MOUSE_CLICK, nsnull, nsMouseEvent::eReal); nsEventStatus status = nsEventStatus_eIgnore; - nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this), + nsEventDispatcher::Dispatch(static_cast(this), aVisitor.mPresContext, &event, nsnull, &status); } // case @@ -1749,9 +1748,9 @@ nsHTMLInputElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor) // cancel all of these events for buttons //XXXsmaug Why? if (aVisitor.mEvent->eventStructType == NS_MOUSE_EVENT && - (NS_STATIC_CAST(nsMouseEvent*, aVisitor.mEvent)->button == + (static_cast(aVisitor.mEvent)->button == nsMouseEvent::eMiddleButton || - NS_STATIC_CAST(nsMouseEvent*, aVisitor.mEvent)->button == + static_cast(aVisitor.mEvent)->button == nsMouseEvent::eRightButton)) { if (mType == NS_FORM_INPUT_BUTTON || mType == NS_FORM_INPUT_RESET || @@ -2311,7 +2310,7 @@ nsHTMLInputElement::SubmitNamesValues(nsIFormSubmission* aFormSubmission, nsAutoString yVal; nsIntPoint* lastClickedPoint = - NS_STATIC_CAST(nsIntPoint*, GetProperty(nsGkAtoms::imageClickedPoint)); + static_cast(GetProperty(nsGkAtoms::imageClickedPoint)); if (lastClickedPoint) { // Convert the values to strings for submission xVal.AppendInt(lastClickedPoint->x); @@ -2597,7 +2596,7 @@ nsHTMLInputElement::IntrinsicState() const // The call is to an interface function, which makes it non-const, so we // use a nasty hack :( PRBool defaultState = PR_FALSE; - NS_CONST_CAST(nsHTMLInputElement*, this)->GetDefaultChecked(&defaultState); + const_cast(this)->GetDefaultChecked(&defaultState); if (defaultState) { state |= NS_EVENT_STATE_DEFAULT; } @@ -2725,7 +2724,7 @@ nsHTMLInputElement::AddedToRadioGroup(PRBool aNotify) if (container) { nsAutoString name; if (GetNameIfExists(name)) { - container->AddToRadioGroup(name, NS_STATIC_CAST(nsIFormControl*, this)); + container->AddToRadioGroup(name, static_cast(this)); } } @@ -2780,7 +2779,7 @@ nsHTMLInputElement::WillRemoveFromRadioGroup() gotName = PR_TRUE; } container->RemoveFromRadioGroup(name, - NS_STATIC_CAST(nsIFormControl*, this)); + static_cast(this)); } return NS_OK; diff --git a/content/html/content/src/nsHTMLLabelElement.cpp b/content/html/content/src/nsHTMLLabelElement.cpp index a673d0a41421..a0bb837ab246 100644 --- a/content/html/content/src/nsHTMLLabelElement.cpp +++ b/content/html/content/src/nsHTMLLabelElement.cpp @@ -240,7 +240,7 @@ nsHTMLLabelElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor) // Ok to use aVisitor.mEvent as parameter because DispatchClickEvent // will actually create a new event. DispatchClickEvent(aVisitor.mPresContext, - NS_STATIC_CAST(nsInputEvent*, aVisitor.mEvent), + static_cast(aVisitor.mEvent), content, PR_FALSE, &status); // Do we care about the status this returned? I don't think we do... } @@ -342,7 +342,7 @@ nsHTMLLabelElement::PerformAccesskey(PRBool aKeyCausesActivation, nsAutoPopupStatePusher popupStatePusher(aIsTrustedEvent ? openAllowed : openAbused); - nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this), presContext, + nsEventDispatcher::Dispatch(static_cast(this), presContext, &event); } } diff --git a/content/html/content/src/nsHTMLLegendElement.cpp b/content/html/content/src/nsHTMLLegendElement.cpp index 1d84337b91e3..c074d8493545 100644 --- a/content/html/content/src/nsHTMLLegendElement.cpp +++ b/content/html/content/src/nsHTMLLegendElement.cpp @@ -267,7 +267,7 @@ nsHTMLLegendElement::SetFocus(nsPresContext* aPresContext) nsIFocusController* focusController = ourWindow->GetRootFocusController(); nsCOMPtr domElement = - do_QueryInterface(NS_STATIC_CAST(nsIContent *, this)); + do_QueryInterface(static_cast(this)); if (focusController && domElement) { focusController->MoveFocus(PR_TRUE, domElement); } diff --git a/content/html/content/src/nsHTMLLinkElement.cpp b/content/html/content/src/nsHTMLLinkElement.cpp index 045f8b772505..260b1e433db0 100644 --- a/content/html/content/src/nsHTMLLinkElement.cpp +++ b/content/html/content/src/nsHTMLLinkElement.cpp @@ -274,7 +274,7 @@ nsHTMLLinkElement::CreateAndDispatchEvent(nsIDocument* aDoc, return; nsContentUtils::DispatchTrustedEvent(aDoc, - NS_STATIC_CAST(nsIContent*, this), + static_cast(this), aEventName, PR_TRUE, PR_TRUE); } diff --git a/content/html/content/src/nsHTMLOptionElement.cpp b/content/html/content/src/nsHTMLOptionElement.cpp index c623dc3db091..2e05efb33668 100644 --- a/content/html/content/src/nsHTMLOptionElement.cpp +++ b/content/html/content/src/nsHTMLOptionElement.cpp @@ -324,7 +324,7 @@ nsHTMLOptionElement::GetIndex(PRInt32* aIndex) for (PRUint32 i = 0; i < length; i++) { options->Item(i, getter_AddRefs(thisOption)); - if (thisOption.get() == NS_STATIC_CAST(nsIDOMNode *, this)) { + if (thisOption.get() == static_cast(this)) { *aIndex = i; break; @@ -377,13 +377,13 @@ nsHTMLOptionElement::IntrinsicState() const // toggles some of our hidden internal state at that! Would that we could // use |mutable|. PRBool selected; - NS_CONST_CAST(nsHTMLOptionElement*, this)->GetSelected(&selected); + const_cast(this)->GetSelected(&selected); if (selected) { state |= NS_EVENT_STATE_CHECKED; } // Also calling a non-const interface method (for :default) - NS_CONST_CAST(nsHTMLOptionElement*, this)->GetDefaultSelected(&selected); + const_cast(this)->GetDefaultSelected(&selected); if (selected) { state |= NS_EVENT_STATE_DEFAULT; } @@ -463,8 +463,8 @@ nsHTMLOptionElement::Initialize(JSContext* aContext, return result; } - textContent->SetText(NS_REINTERPRET_CAST(const PRUnichar*, - JS_GetStringChars(jsstr)), + textContent->SetText(reinterpret_cast + (JS_GetStringChars(jsstr)), JS_GetStringLength(jsstr), PR_FALSE); @@ -479,8 +479,8 @@ nsHTMLOptionElement::Initialize(JSContext* aContext, jsstr = JS_ValueToString(aContext, argv[1]); if (nsnull != jsstr) { // Set the value attribute for this element - nsAutoString value(NS_REINTERPRET_CAST(const PRUnichar*, - JS_GetStringChars(jsstr))); + nsAutoString value(reinterpret_cast + (JS_GetStringChars(jsstr))); result = SetAttr(kNameSpaceID_None, nsGkAtoms::value, value, PR_FALSE); diff --git a/content/html/content/src/nsHTMLScriptElement.cpp b/content/html/content/src/nsHTMLScriptElement.cpp index 6d461fe1f32e..259670094918 100644 --- a/content/html/content/src/nsHTMLScriptElement.cpp +++ b/content/html/content/src/nsHTMLScriptElement.cpp @@ -389,8 +389,8 @@ NS_HTML_CONTENT_INTERFACE_MAP_BEGIN(nsHTMLScriptElement, nsGenericHTMLElement) NS_INTERFACE_MAP_ENTRY(nsIScriptElement) NS_INTERFACE_MAP_ENTRY(nsIMutationObserver) if (mScriptEventHandler && aIID.Equals(NS_GET_IID(nsIScriptEventHandler))) - foundInterface = NS_STATIC_CAST(nsIScriptEventHandler*, - mScriptEventHandler); + foundInterface = static_cast + (mScriptEventHandler); else NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(HTMLScriptElement) NS_HTML_CONTENT_INTERFACE_MAP_END diff --git a/content/html/content/src/nsHTMLSelectElement.cpp b/content/html/content/src/nsHTMLSelectElement.cpp index a131dee6c996..1edb7876919e 100644 --- a/content/html/content/src/nsHTMLSelectElement.cpp +++ b/content/html/content/src/nsHTMLSelectElement.cpp @@ -1034,7 +1034,7 @@ nsHTMLSelectElement::Add(nsIDOMHTMLElement* aElement, nsCOMPtr ancestor(parent); nsCOMPtr temp; - while (ancestor != NS_STATIC_CAST(nsIDOMNode*, this)) { + while (ancestor != static_cast(this)) { ancestor->GetParentNode(getter_AddRefs(temp)); if (!temp) { // NOT_FOUND_ERR: Raised if before is not a descendant of the SELECT @@ -1947,7 +1947,7 @@ nsHTMLSelectElement::GetBoxObject(nsIBoxObject** aResult) return NS_ERROR_FAILURE; } - return nsDoc->GetBoxObjectFor(NS_STATIC_CAST(nsIDOMElement*, this), aResult); + return nsDoc->GetBoxObjectFor(static_cast(this), aResult); } void @@ -2102,7 +2102,7 @@ void nsHTMLSelectElement::DispatchDOMEvent(const nsAString& aName) { nsContentUtils::DispatchTrustedEvent(GetOwnerDoc(), - NS_STATIC_CAST(nsIContent*, this), + static_cast(this), aName, PR_TRUE, PR_TRUE); } diff --git a/content/html/content/src/nsHTMLTableCellElement.cpp b/content/html/content/src/nsHTMLTableCellElement.cpp index 8212e0c32cc0..f9235c480b9e 100644 --- a/content/html/content/src/nsHTMLTableCellElement.cpp +++ b/content/html/content/src/nsHTMLTableCellElement.cpp @@ -181,7 +181,7 @@ nsHTMLTableCellElement::GetCellIndex(PRInt32* aCellIndex) nsCOMPtr node; cells->Item(i, getter_AddRefs(node)); - if (node.get() == NS_STATIC_CAST(nsIDOMNode *, this)) { + if (node.get() == static_cast(this)) { *aCellIndex = i; found = PR_TRUE; } diff --git a/content/html/content/src/nsHTMLTableRowElement.cpp b/content/html/content/src/nsHTMLTableRowElement.cpp index 2ff0deec60ba..5380430bc96a 100644 --- a/content/html/content/src/nsHTMLTableRowElement.cpp +++ b/content/html/content/src/nsHTMLTableRowElement.cpp @@ -186,7 +186,7 @@ nsHTMLTableRowElement::GetRowIndex(PRInt32* aValue) rows->Item(i, getter_AddRefs(node)); - if (node.get() == NS_STATIC_CAST(nsIDOMNode *, this)) { + if (node.get() == static_cast(this)) { *aValue = i; found = PR_TRUE; } @@ -219,7 +219,7 @@ nsHTMLTableRowElement::GetSectionRowIndex(PRInt32* aValue) nsCOMPtr node; rows->Item(i, getter_AddRefs(node)); - if (node.get() == NS_STATIC_CAST(nsIDOMNode *, this)) { + if (node.get() == static_cast(this)) { *aValue = i; found = PR_TRUE; } diff --git a/content/html/content/src/nsHTMLTextAreaElement.cpp b/content/html/content/src/nsHTMLTextAreaElement.cpp index 8cb6e900a12f..c24004ee2b66 100644 --- a/content/html/content/src/nsHTMLTextAreaElement.cpp +++ b/content/html/content/src/nsHTMLTextAreaElement.cpp @@ -371,7 +371,7 @@ nsHTMLTextAreaElement::Select() nsEventStatus status = nsEventStatus_eIgnore; nsGUIEvent event(PR_TRUE, NS_FORM_SELECTED, nsnull); - nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this), presContext, + nsEventDispatcher::Dispatch(static_cast(this), presContext, &event, nsnull, &status); // If the DOM event was not canceled (e.g. by a JS event handler @@ -645,7 +645,7 @@ nsHTMLTextAreaElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor) aVisitor.mItemFlags |= NS_NO_CONTENT_DISPATCH; if (aVisitor.mEvent->message == NS_MOUSE_CLICK && aVisitor.mEvent->eventStructType == NS_MOUSE_EVENT && - NS_STATIC_CAST(nsMouseEvent*, aVisitor.mEvent)->button == + static_cast(aVisitor.mEvent)->button == nsMouseEvent::eMiddleButton) { aVisitor.mEvent->flags &= ~NS_EVENT_FLAG_NO_CONTENT_DISPATCH; } diff --git a/content/html/document/src/nsHTMLContentSink.cpp b/content/html/document/src/nsHTMLContentSink.cpp index 83ad7d0258ec..2de042b0c21c 100644 --- a/content/html/document/src/nsHTMLContentSink.cpp +++ b/content/html/document/src/nsHTMLContentSink.cpp @@ -1726,7 +1726,7 @@ HTMLContentSink::Init(nsIDocument* aDoc, // If the document already has a root we'll use it. This will // happen when we do document.open()/.write()/.close()... - NS_ADDREF(mRoot = NS_STATIC_CAST(nsGenericHTMLElement*, doc_root)); + NS_ADDREF(mRoot = static_cast(doc_root)); } else { mRoot = NS_NewHTMLHtmlElement(nodeInfo); if (!mRoot) { @@ -2829,7 +2829,7 @@ HTMLContentSink::AddBaseTagInfo(nsIContent* aContent) nsPropertyTable::SupportsDtorFunc, PR_TRUE); if (NS_SUCCEEDED(rv)) { // circumvent nsDerivedSafe - NS_ADDREF(NS_STATIC_CAST(nsIURI*, mBaseHref)); + NS_ADDREF(static_cast(mBaseHref)); } } if (mBaseTarget) { @@ -2837,7 +2837,7 @@ HTMLContentSink::AddBaseTagInfo(nsIContent* aContent) nsPropertyTable::SupportsDtorFunc, PR_TRUE); if (NS_SUCCEEDED(rv)) { // circumvent nsDerivedSafe - NS_ADDREF(NS_STATIC_CAST(nsIAtom*, mBaseTarget)); + NS_ADDREF(static_cast(mBaseTarget)); } } } diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp index 25c233fdd491..7a482101fa3a 100644 --- a/content/html/document/src/nsHTMLDocument.cpp +++ b/content/html/document/src/nsHTMLDocument.cpp @@ -229,7 +229,7 @@ public: } nsIContent* GetIdContent() { - return NS_STATIC_CAST(nsIContent*, mIdContentList.SafeElementAt(0)); + return static_cast(mIdContentList.SafeElementAt(0)); } PRBool AddIdContent(nsIContent* aContent); @@ -292,8 +292,8 @@ IdAndNameHashMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry, const void *key) { const IdAndNameMapEntry *e = - NS_STATIC_CAST(const IdAndNameMapEntry *, entry); - const nsIAtom *atom = NS_STATIC_CAST(const nsIAtom *, key); + static_cast(entry); + const nsIAtom *atom = static_cast(key); return atom == e->mKey; } @@ -301,7 +301,7 @@ IdAndNameHashMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry, PR_STATIC_CALLBACK(void) IdAndNameHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) { - IdAndNameMapEntry *e = NS_STATIC_CAST(IdAndNameMapEntry *, entry); + IdAndNameMapEntry *e = static_cast(entry); // An entry is being cleared, let the entry do its own cleanup. e->~IdAndNameMapEntry(); @@ -311,8 +311,8 @@ PR_STATIC_CALLBACK(PRBool) IdAndNameHashInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, const void *key) { - nsIAtom *atom = NS_CONST_CAST(nsIAtom *, - NS_STATIC_CAST(const nsIAtom*, key)); + nsIAtom *atom = const_cast + (static_cast(key)); // Inititlize the entry with placement new new (entry) IdAndNameMapEntry(atom); @@ -348,8 +348,8 @@ IdAndNameMapEntryTraverse(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { nsCycleCollectionTraversalCallback *cb = - NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, arg); - IdAndNameMapEntry *entry = NS_STATIC_CAST(IdAndNameMapEntry*, hdr); + static_cast(arg); + IdAndNameMapEntry *entry = static_cast(hdr); if (entry->mNameContentList != NAME_NOT_VALID) cb->NoteXPCOMChild(entry->mNameContentList); @@ -1121,7 +1121,7 @@ nsHTMLDocument::DocumentWriteTerminationFunc(nsISupports *aRef) nsCOMPtr parser = do_QueryElementAt(arr, 1); NS_ASSERTION(parser, "Must have parser!"); - nsHTMLDocument *htmldoc = NS_STATIC_CAST(nsHTMLDocument*, doc.get()); + nsHTMLDocument *htmldoc = static_cast(doc.get()); // Check whether htmldoc still has the same parser. If not, it's // not for us to mess with it. @@ -1184,7 +1184,7 @@ nsHTMLDocument::EndLoad() nsCOMPtr arr = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { - rv = arr->AppendElement(NS_STATIC_CAST(nsIDocument*, this), + rv = arr->AppendElement(static_cast(this), PR_FALSE); if (NS_SUCCEEDED(rv)) { rv = arr->AppendElement(mParser, PR_FALSE); @@ -2033,7 +2033,7 @@ nsHTMLDocument::OpenCommon(const nsACString& aContentType, PRBool aReplace) return NS_OK; } - if (!nsContentUtils::CanCallerAccess(NS_STATIC_CAST(nsIDOMHTMLDocument*, this))) { + if (!nsContentUtils::CanCallerAccess(static_cast(this))) { nsPIDOMWindow *win = GetWindow(); if (win) { nsCOMPtr frameElement; @@ -2272,7 +2272,7 @@ nsHTMLDocument::OpenCommon(const nsACString& aContentType, PRBool aReplace) docshell->GetContentViewer(getter_AddRefs(cv)); nsCOMPtr docViewer = do_QueryInterface(cv); if (docViewer) { - docViewer->LoadStart(NS_STATIC_CAST(nsIHTMLDocument *, this)); + docViewer->LoadStart(static_cast(this)); } } @@ -2493,8 +2493,8 @@ nsHTMLDocument::ScriptWriteCommon(PRBool aNewlineTerminate) JSString *jsstr = JS_ValueToString(cx, argv[0]); NS_ENSURE_TRUE(jsstr, NS_ERROR_OUT_OF_MEMORY); - nsDependentString str(NS_REINTERPRET_CAST(const PRUnichar *, - ::JS_GetStringChars(jsstr)), + nsDependentString str(reinterpret_cast + (::JS_GetStringChars(jsstr)), ::JS_GetStringLength(jsstr)); return WriteCommon(str, aNewlineTerminate); @@ -2509,8 +2509,8 @@ nsHTMLDocument::ScriptWriteCommon(PRBool aNewlineTerminate) JSString *str = JS_ValueToString(cx, argv[i]); NS_ENSURE_TRUE(str, NS_ERROR_OUT_OF_MEMORY); - string_buffer.Append(NS_REINTERPRET_CAST(const PRUnichar *, - ::JS_GetStringChars(str)), + string_buffer.Append(reinterpret_cast + (::JS_GetStringChars(str)), ::JS_GetStringLength(str)); } @@ -2549,8 +2549,8 @@ nsHTMLDocument::GetElementById(const nsAString& aElementId, // us being notified (all removals notify immediately, as far as I can tell). // So do the lookup first. IdAndNameMapEntry *entry = - NS_STATIC_CAST(IdAndNameMapEntry *, - PL_DHashTableOperate(&mIdAndNameHashTable, idAtom, + static_cast + (PL_DHashTableOperate(&mIdAndNameHashTable, idAtom, PL_DHASH_ADD)); NS_ENSURE_TRUE(entry, NS_ERROR_OUT_OF_MEMORY); @@ -2573,8 +2573,8 @@ nsHTMLDocument::GetElementById(const nsAString& aElementId, // entry again, adding if necessary (the adding may be necessary in case // the flush actually deleted entries). entry = - NS_STATIC_CAST(IdAndNameMapEntry *, - PL_DHashTableOperate(&mIdAndNameHashTable, idAtom, + static_cast + (PL_DHashTableOperate(&mIdAndNameHashTable, idAtom, PL_DHASH_ADD)); NS_ENSURE_TRUE(entry, NS_ERROR_OUT_OF_MEMORY); } @@ -2673,7 +2673,7 @@ nsHTMLDocument::MatchNameAttribute(nsIContent* aContent, PRInt32 aNamespaceID, nsIAtom* aAtom, void* aData) { NS_PRECONDITION(aContent, "Must have content node to work with!"); - nsString* elementName = NS_STATIC_CAST(nsString*, aData); + nsString* elementName = static_cast(aData); return aContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::name, *elementName, eCaseMatters); } @@ -3023,7 +3023,7 @@ ReportUseOfDeprecatedMethod(nsHTMLDocument* aDoc, const char* aWarning) nsContentUtils::ReportToConsole(nsContentUtils::eDOM_PROPERTIES, aWarning, nsnull, 0, - NS_STATIC_CAST(nsIDocument*, aDoc)-> + static_cast(aDoc)-> GetDocumentURI(), EmptyString(), 0, 0, nsIScriptError::warningFlag, @@ -3103,8 +3103,8 @@ ReserveNameInHash(const char* aName, PLDHashTable *aHash) NS_ENSURE_TRUE(atom, NS_ERROR_OUT_OF_MEMORY); IdAndNameMapEntry *entry = - NS_STATIC_CAST(IdAndNameMapEntry *, - PL_DHashTableOperate(aHash, atom, PL_DHASH_ADD)); + static_cast + (PL_DHashTableOperate(aHash, atom, PL_DHASH_ADD)); NS_ENSURE_TRUE(entry, NS_ERROR_OUT_OF_MEMORY); @@ -3192,8 +3192,8 @@ nsHTMLDocument::UpdateNameTableEntry(nsIAtom* aName, "nsHTMLDocument::UpdateNameTableEntry Don't call me on an XHTML document!!!"); IdAndNameMapEntry *entry = - NS_STATIC_CAST(IdAndNameMapEntry *, - PL_DHashTableOperate(&mIdAndNameHashTable, aName, + static_cast + (PL_DHashTableOperate(&mIdAndNameHashTable, aName, PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_FREE(entry)) { @@ -3223,8 +3223,8 @@ nsHTMLDocument::UpdateIdTableEntry(nsIAtom* aId, nsIContent *aContent) PRBool liveTable = IdTableIsLive(); PLDHashOperator op = liveTable ? PL_DHASH_ADD : PL_DHASH_LOOKUP; IdAndNameMapEntry *entry = - NS_STATIC_CAST(IdAndNameMapEntry *, - PL_DHashTableOperate(&mIdAndNameHashTable, aId, + static_cast + (PL_DHashTableOperate(&mIdAndNameHashTable, aId, op)); NS_ENSURE_TRUE(entry, NS_ERROR_OUT_OF_MEMORY); @@ -3245,8 +3245,8 @@ nsHTMLDocument::RemoveFromNameTable(nsIAtom* aName, nsIContent *aContent) "nsHTMLDocument::RemoveFromNameTable Don't call me on an XHTML document!!!"); IdAndNameMapEntry *entry = - NS_STATIC_CAST(IdAndNameMapEntry *, - PL_DHashTableOperate(&mIdAndNameHashTable, aName, + static_cast + (PL_DHashTableOperate(&mIdAndNameHashTable, aName, PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_BUSY(entry) && entry->mNameContentList && @@ -3267,8 +3267,8 @@ nsHTMLDocument::RemoveFromIdTable(nsIContent *aContent) } IdAndNameMapEntry *entry = - NS_STATIC_CAST(IdAndNameMapEntry *, - PL_DHashTableOperate(&mIdAndNameHashTable, id, + static_cast + (PL_DHashTableOperate(&mIdAndNameHashTable, id, PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_FREE(entry)) { @@ -3403,8 +3403,8 @@ nsHTMLDocument::ResolveName(const nsAString& aName, // be updated as content is added and removed. IdAndNameMapEntry *entry = - NS_STATIC_CAST(IdAndNameMapEntry *, - PL_DHashTableOperate(&mIdAndNameHashTable, name, + static_cast + (PL_DHashTableOperate(&mIdAndNameHashTable, name, PL_DHASH_ADD)); NS_ENSURE_TRUE(entry, NS_ERROR_OUT_OF_MEMORY); @@ -3432,8 +3432,8 @@ nsHTMLDocument::ResolveName(const nsAString& aName, // entry again, adding if necessary (the adding may be necessary in case // the flush actually deleted entries). entry = - NS_STATIC_CAST(IdAndNameMapEntry *, - PL_DHashTableOperate(&mIdAndNameHashTable, name, + static_cast + (PL_DHashTableOperate(&mIdAndNameHashTable, name, PL_DHASH_ADD)); NS_ENSURE_TRUE(entry, NS_ERROR_OUT_OF_MEMORY); } diff --git a/content/html/document/src/nsHTMLFragmentContentSink.cpp b/content/html/document/src/nsHTMLFragmentContentSink.cpp index b5bbb6b60191..ee61da91eb70 100644 --- a/content/html/document/src/nsHTMLFragmentContentSink.cpp +++ b/content/html/document/src/nsHTMLFragmentContentSink.cpp @@ -347,7 +347,7 @@ nsHTMLFragmentContentSink::AddBaseTagInfo(nsIContent* aContent) nsPropertyTable::SupportsDtorFunc, PR_TRUE); if (NS_SUCCEEDED(rv)) { // circumvent nsDerivedSafe - NS_ADDREF(NS_STATIC_CAST(nsIURI*, mBaseHref)); + NS_ADDREF(static_cast(mBaseHref)); } } if (mBaseTarget) { @@ -355,7 +355,7 @@ nsHTMLFragmentContentSink::AddBaseTagInfo(nsIContent* aContent) nsPropertyTable::SupportsDtorFunc, PR_TRUE); if (NS_SUCCEEDED(rv)) { // circumvent nsDerivedSafe - NS_ADDREF(NS_STATIC_CAST(nsIAtom*, mBaseTarget)); + NS_ADDREF(static_cast(mBaseTarget)); } } } diff --git a/content/svg/content/src/nsDOMSVGZoomEvent.cpp b/content/svg/content/src/nsDOMSVGZoomEvent.cpp index b9c0946d61dd..0dcea674b5ca 100755 --- a/content/svg/content/src/nsDOMSVGZoomEvent.cpp +++ b/content/svg/content/src/nsDOMSVGZoomEvent.cpp @@ -89,7 +89,7 @@ nsDOMSVGZoomEvent::nsDOMSVGZoomEvent(nsPresContext* aPresContext, NS_NewSVGReadonlyPoint(getter_AddRefs(mNewTranslate), x, y); nsSVGSVGElement *SVGSVGElement = - NS_STATIC_CAST(nsSVGSVGElement*, rootContent); + static_cast(rootContent); mPreviousScale = SVGSVGElement->GetPreviousScale(); NS_NewSVGReadonlyPoint(getter_AddRefs(mPreviousTranslate), SVGSVGElement->GetPreviousTranslate_x(), diff --git a/content/svg/content/src/nsSVGElement.cpp b/content/svg/content/src/nsSVGElement.cpp index ddb77406fefa..8b4b03cc9087 100644 --- a/content/svg/content/src/nsSVGElement.cpp +++ b/content/svg/content/src/nsSVGElement.cpp @@ -810,7 +810,7 @@ nsSVGElement::GetCtx() { nsCOMPtr svg; GetOwnerSVGElement(getter_AddRefs(svg)); - return NS_STATIC_CAST(nsSVGSVGElement*, svg.get()); + return static_cast(svg.get()); } nsSVGElement::LengthAttributesInfo diff --git a/content/svg/content/src/nsSVGFilters.cpp b/content/svg/content/src/nsSVGFilters.cpp index c6eb7ffa599a..c322967f6897 100644 --- a/content/svg/content/src/nsSVGFilters.cpp +++ b/content/svg/content/src/nsSVGFilters.cpp @@ -117,7 +117,7 @@ nsSVGFE::ScanDualValueAttribute(const nsAString& aValue, nsIAtom* aAttribute, NS_ConvertUTF16toUTF8 value(aValue); value.CompressWhitespace(PR_FALSE, PR_TRUE); const char *str = value.get(); - x = NS_STATIC_CAST(float, PR_strtod(str, &rest)); + x = static_cast(PR_strtod(str, &rest)); if (str == rest) { //first value was illformed parseError = PR_TRUE; @@ -126,7 +126,7 @@ nsSVGFE::ScanDualValueAttribute(const nsAString& aValue, nsIAtom* aAttribute, //second value was not supplied y = x; } else { - y = NS_STATIC_CAST(float, PR_strtod(rest, &rest)); + y = static_cast(PR_strtod(rest, &rest)); if (*rest != '\0') { //second value was illformed or there was trailing content parseError = PR_TRUE; @@ -659,8 +659,8 @@ nsSVGFEGaussianBlurElement::GaussianBlur(PRUint8 *aInput, PRUint8 *aOutput, dX = (PRUint32) floor(aStdX * 3*sqrt(2*M_PI)/4 + 0.5); dY = (PRUint32) floor(aStdY * 3*sqrt(2*M_PI)/4 + 0.5); - PRUint8 *tmp = NS_STATIC_CAST(PRUint8*, - calloc(aFilterResource->GetDataLength(), 1)); + PRUint8 *tmp = static_cast + (calloc(aFilterResource->GetDataLength(), 1)); nsRect rect = aFilterResource->GetRect(); PRUint32 stride = aFilterResource->GetDataStride(); @@ -981,7 +981,7 @@ nsSVGFEBlendElement::Filter(nsSVGFilterInstance *instance) break; } val = PR_MIN(val / 255, 255); - targetData[targIndex + i] = NS_STATIC_CAST(PRUint8, val); + targetData[targIndex + i] = static_cast(val); } PRUint32 alpha = 255 * 255 - (255 - qa) * (255 - qb); FAST_DIVIDE_BY_255(targetData[targIndex + GFX_ARGB32_OFFSET_A], alpha); @@ -1265,8 +1265,8 @@ nsSVGFEColorMatrixElement::Filter(nsSVGFilterInstance *instance) list->GetItem(0, getter_AddRefs(number)); number->GetValue(&hueRotateValue); - c = NS_STATIC_CAST(float, cos(hueRotateValue * M_PI / 180)); - s = NS_STATIC_CAST(float, sin(hueRotateValue * M_PI / 180)); + c = static_cast(cos(hueRotateValue * M_PI / 180)); + s = static_cast(sin(hueRotateValue * M_PI / 180)); memcpy(colorMatrix, identityMatrix, sizeof(colorMatrix)); @@ -1308,13 +1308,13 @@ nsSVGFEColorMatrixElement::Filter(nsSVGFilterInstance *instance) col[i] = PR_MIN(PR_MAX(0, col[i]), 255); } targetData[targIndex + GFX_ARGB32_OFFSET_R] = - NS_STATIC_CAST(PRUint8, col[0]); + static_cast(col[0]); targetData[targIndex + GFX_ARGB32_OFFSET_G] = - NS_STATIC_CAST(PRUint8, col[1]); + static_cast(col[1]); targetData[targIndex + GFX_ARGB32_OFFSET_B] = - NS_STATIC_CAST(PRUint8, col[2]); + static_cast(col[2]); targetData[targIndex + GFX_ARGB32_OFFSET_A] = - NS_STATIC_CAST(PRUint8, col[3]); + static_cast(col[3]); } } return NS_OK; @@ -1574,7 +1574,7 @@ nsSVGFECompositeElement::Filter(nsSVGFilterInstance *instance) PRUint8 i1 = sourceData[targIndex + i]; float result = k1Scaled*i1*i2 + k2*i1 + k3*i2 + k4Scaled; targetData[targIndex + i] = - NS_STATIC_CAST(PRUint8, PR_MIN(PR_MAX(0, result), 255)); + static_cast(PR_MIN(PR_MAX(0, result), 255)); } } } @@ -3988,7 +3988,7 @@ ConvolvePixel(const PRUint8 *aSourceData, } for (PRInt32 i = 0; i < channels; i++) { aTargetData[aY * aStride + 4 * aX + offsets[i]] = - BOUND(NS_STATIC_CAST(PRInt32, sum[i] / aDivisor + aBias * 255), 0, 255); + BOUND(static_cast(sum[i] / aDivisor + aBias * 255), 0, 255); } if (aPreserveAlpha) { aTargetData[aY * aStride + 4 * aX + GFX_ARGB32_OFFSET_A] = @@ -4013,7 +4013,7 @@ nsSVGFEConvolveMatrixElement::Filter(nsSVGFilterInstance *instance) mOrderX->GetAnimVal(&orderX); mOrderY->GetAnimVal(&orderY); if (orderX <= 0 || orderY <= 0 || - NS_STATIC_CAST(PRUint32, orderX * orderY) != num) { + static_cast(orderX * orderY) != num) { return NS_ERROR_FAILURE; } diff --git a/content/svg/content/src/nsSVGLength.cpp b/content/svg/content/src/nsSVGLength.cpp index e8b97b2ddc79..e99c194df932 100644 --- a/content/svg/content/src/nsSVGLength.cpp +++ b/content/svg/content/src/nsSVGLength.cpp @@ -531,7 +531,7 @@ float nsSVGLength::mmPerPixel() } nsSVGSVGElement *ctx = - NS_STATIC_CAST(nsSVGElement*, element.get())->GetCtx(); + static_cast(element.get())->GetCtx(); float mmPerPx = ctx->GetMMPerPx(mCtxType); if (mmPerPx == 0.0f) { @@ -551,7 +551,7 @@ float nsSVGLength::AxisLength() } nsSVGSVGElement *ctx = - NS_STATIC_CAST(nsSVGElement*, element.get())->GetCtx(); + static_cast(element.get())->GetCtx(); float d = ctx->GetLength(mCtxType); if (d == 0.0f) { @@ -588,7 +588,7 @@ already_AddRefed nsSVGLength::MaybeGetCtxRect() nsCOMPtr element = do_QueryReferent(mElement); if (element) { nsSVGSVGElement *ctx = - NS_STATIC_CAST(nsSVGElement*, element.get())->GetCtx(); + static_cast(element.get())->GetCtx(); if (ctx) return ctx->GetCtxRect(); } diff --git a/content/svg/content/src/nsSVGLengthList.cpp b/content/svg/content/src/nsSVGLengthList.cpp index 5f06cc4b3f05..d94bfd94bb4c 100644 --- a/content/svg/content/src/nsSVGLengthList.cpp +++ b/content/svg/content/src/nsSVGLengthList.cpp @@ -105,7 +105,7 @@ protected: nsSVGLengthList::nsSVGLengthList(nsSVGElement *aContext, PRUint8 aCtxType) : mCtxType(aCtxType) { - mContext = do_GetWeakReference(NS_STATIC_CAST(nsGenericElement*, aContext)); + mContext = do_GetWeakReference(static_cast(aContext)); } nsSVGLengthList::~nsSVGLengthList() @@ -225,7 +225,7 @@ NS_IMETHODIMP nsSVGLengthList::Initialize(nsIDOMSVGLength *newItem, /* nsIDOMSVGLength getItem (in unsigned long index); */ NS_IMETHODIMP nsSVGLengthList::GetItem(PRUint32 index, nsIDOMSVGLength **_retval) { - if (index >= NS_STATIC_CAST(PRUint32, mLengths.Count())) { + if (index >= static_cast(mLengths.Count())) { *_retval = nsnull; return NS_ERROR_DOM_INDEX_SIZE_ERR; } @@ -266,7 +266,7 @@ nsSVGLengthList::ReplaceItem(nsIDOMSVGLength *newItem, /* nsIDOMSVGLengthList removeItem (in unsigned long index); */ NS_IMETHODIMP nsSVGLengthList::RemoveItem(PRUint32 index, nsIDOMSVGLength **_retval) { - if (index >= NS_STATIC_CAST(PRUint32, mLengths.Count())) { + if (index >= static_cast(mLengths.Count())) { *_retval = nsnull; return NS_ERROR_DOM_INDEX_SIZE_ERR; } diff --git a/content/svg/content/src/nsSVGNumber2.cpp b/content/svg/content/src/nsSVGNumber2.cpp index 4930b034b1fa..d7f0ff810d97 100644 --- a/content/svg/content/src/nsSVGNumber2.cpp +++ b/content/svg/content/src/nsSVGNumber2.cpp @@ -58,7 +58,7 @@ nsSVGNumber2::SetBaseValueString(const nsAString &aValueAsString, s.Assign(aValueAsString); PRInt32 err; float val = s.ToFloat(&err); - nsresult rv = NS_STATIC_CAST(nsresult, err); + nsresult rv = static_cast(err); NS_ENSURE_SUCCESS(rv, rv); mBaseVal = mAnimVal = val; return NS_OK; diff --git a/content/svg/content/src/nsSVGNumberList.cpp b/content/svg/content/src/nsSVGNumberList.cpp index 5cdfd6e02481..af9494a705f2 100644 --- a/content/svg/content/src/nsSVGNumberList.cpp +++ b/content/svg/content/src/nsSVGNumberList.cpp @@ -222,7 +222,7 @@ NS_IMETHODIMP nsSVGNumberList::Initialize(nsIDOMSVGNumber *newItem, /* nsIDOMSVGNumber getItem (in unsigned long index); */ NS_IMETHODIMP nsSVGNumberList::GetItem(PRUint32 index, nsIDOMSVGNumber **_retval) { - if (index >= NS_STATIC_CAST(PRUint32, mNumbers.Count())) { + if (index >= static_cast(mNumbers.Count())) { *_retval = nsnull; return NS_ERROR_DOM_INDEX_SIZE_ERR; } @@ -277,7 +277,7 @@ nsSVGNumberList::ReplaceItem(nsIDOMSVGNumber *newItem, /* nsIDOMSVGNumberList removeItem (in unsigned long index); */ NS_IMETHODIMP nsSVGNumberList::RemoveItem(PRUint32 index, nsIDOMSVGNumber **_retval) { - if (index >= NS_STATIC_CAST(PRUint32, mNumbers.Count())) { + if (index >= static_cast(mNumbers.Count())) { *_retval = nsnull; return NS_ERROR_DOM_INDEX_SIZE_ERR; } diff --git a/content/svg/content/src/nsSVGPathDataParser.cpp b/content/svg/content/src/nsSVGPathDataParser.cpp index 421c59de93cc..d2d6bfe0362c 100644 --- a/content/svg/content/src/nsSVGPathDataParser.cpp +++ b/content/svg/content/src/nsSVGPathDataParser.cpp @@ -1403,7 +1403,7 @@ nsSVGArcConverter::nsSVGArcConverter(float x1, float y1, dtheta += 2.0*M_PI; // Convert into cubic bezier segments <= 90deg - mNumSegs = NS_STATIC_CAST(int, ceil(fabs(dtheta/(M_PI/2.0)))); + mNumSegs = static_cast(ceil(fabs(dtheta/(M_PI/2.0)))); mDelta = dtheta/mNumSegs; mT = 8.0/3.0 * sin(mDelta/4.0) * sin(mDelta/4.0) / sin(mDelta/2.0); diff --git a/content/svg/content/src/nsSVGPathElement.cpp b/content/svg/content/src/nsSVGPathElement.cpp index e97fe89744fe..648ad6b16eb9 100644 --- a/content/svg/content/src/nsSVGPathElement.cpp +++ b/content/svg/content/src/nsSVGPathElement.cpp @@ -153,7 +153,7 @@ nsSVGPathElement::GetPathSegAtLength(float distance, PRUint32 *_retval) while (distCovered < distance && i < numSegments - 1) { nsIDOMSVGPathSeg *iSeg; mSegments->GetItem(i, &iSeg); - nsSVGPathSeg* curSeg = NS_STATIC_CAST(nsSVGPathSeg*, iSeg); + nsSVGPathSeg* curSeg = static_cast(iSeg); if (i == 0) { curSeg->GetLength(&ts); } else { @@ -975,7 +975,7 @@ nsSVGPathList::Playback(gfxContext *aCtx) float *args = mArguments; for (PRUint32 i = 0; i < mNumCommands; i++) { PRUint8 command = - NS_REINTERPRET_CAST(PRUint8*, mArguments + mNumArguments)[i / 4]; + reinterpret_cast(mArguments + mNumArguments)[i / 4]; command = (command >> (2 * (i % 4))) & 0x3; switch (command) { case MOVETO: diff --git a/content/svg/content/src/nsSVGPathSegList.cpp b/content/svg/content/src/nsSVGPathSegList.cpp index 592dc9944d3e..ef8bba3b2468 100644 --- a/content/svg/content/src/nsSVGPathSegList.cpp +++ b/content/svg/content/src/nsSVGPathSegList.cpp @@ -105,7 +105,7 @@ nsSVGPathSegList::~nsSVGPathSegList() { PRInt32 count = mSegments.Count(); for (PRInt32 i = 0; i < count; ++i) { - nsSVGPathSeg* seg = NS_STATIC_CAST(nsSVGPathSeg*, mSegments.ObjectAt(i)); + nsSVGPathSeg* seg = static_cast(mSegments.ObjectAt(i)); seg->SetCurrentList(nsnull); } } @@ -140,7 +140,7 @@ nsSVGPathSegList::SetValueString(const nsAString& aValue) PRInt32 count = mSegments.Count(); for (PRInt32 i=0; i(mSegments.ObjectAt(i)); seg->SetCurrentList(this); } @@ -164,7 +164,7 @@ nsSVGPathSegList::GetValueString(nsAString& aValue) PRInt32 i = 0; while (1) { - nsSVGPathSeg* seg = NS_STATIC_CAST(nsSVGPathSeg*, mSegments.ObjectAt(i)); + nsSVGPathSeg* seg = static_cast(mSegments.ObjectAt(i)); nsAutoString str; seg->GetValueString(str); @@ -209,7 +209,7 @@ NS_IMETHODIMP nsSVGPathSegList::Initialize(nsIDOMSVGPathSeg *newItem, /* nsIDOMSVGPathSeg getItem (in unsigned long index); */ NS_IMETHODIMP nsSVGPathSegList::GetItem(PRUint32 index, nsIDOMSVGPathSeg **_retval) { - if (index >= NS_STATIC_CAST(PRUint32, mSegments.Count())) { + if (index >= static_cast(mSegments.Count())) { *_retval = nsnull; return NS_ERROR_DOM_INDEX_SIZE_ERR; } @@ -226,11 +226,11 @@ NS_IMETHODIMP nsSVGPathSegList::InsertItemBefore(nsIDOMSVGPathSeg *newItem, { NS_ENSURE_NATIVE_PATH_SEG(newItem, _retval); - if (index >= NS_STATIC_CAST(PRUint32, mSegments.Count())) { + if (index >= static_cast(mSegments.Count())) { return NS_ERROR_DOM_INDEX_SIZE_ERR; } - InsertElementAt(NS_STATIC_CAST(nsSVGPathSeg*, newItem), index); + InsertElementAt(static_cast(newItem), index); NS_ADDREF(*_retval = newItem); return NS_OK; @@ -243,11 +243,11 @@ NS_IMETHODIMP nsSVGPathSegList::ReplaceItem(nsIDOMSVGPathSeg *newItem, { NS_ENSURE_NATIVE_PATH_SEG(newItem, _retval); - if (index >= NS_STATIC_CAST(PRUint32, mSegments.Count())) { + if (index >= static_cast(mSegments.Count())) { return NS_ERROR_DOM_INDEX_SIZE_ERR; } - InsertElementAt(NS_STATIC_CAST(nsSVGPathSeg*, newItem), index); + InsertElementAt(static_cast(newItem), index); RemoveElementAt(index+1); NS_ADDREF(*_retval = newItem); @@ -257,7 +257,7 @@ NS_IMETHODIMP nsSVGPathSegList::ReplaceItem(nsIDOMSVGPathSeg *newItem, /* nsIDOMSVGPathSeg removeItem (in unsigned long index); */ NS_IMETHODIMP nsSVGPathSegList::RemoveItem(PRUint32 index, nsIDOMSVGPathSeg **_retval) { - if (index >= NS_STATIC_CAST(PRUint32, mSegments.Count())) { + if (index >= static_cast(mSegments.Count())) { *_retval = nsnull; return NS_ERROR_DOM_INDEX_SIZE_ERR; } @@ -276,7 +276,7 @@ NS_IMETHODIMP nsSVGPathSegList::AppendItem(nsIDOMSVGPathSeg *newItem, { NS_ENSURE_NATIVE_PATH_SEG(newItem, _retval); NS_ADDREF(*_retval = newItem); - AppendElement(NS_STATIC_CAST(nsSVGPathSeg*, newItem)); + AppendElement(static_cast(newItem)); return NS_OK; } @@ -315,7 +315,7 @@ nsSVGPathSegList::ReleaseSegments(PRBool aModify) } PRInt32 count = mSegments.Count(); for (PRInt32 i = 0; i < count; ++i) { - nsSVGPathSeg* seg = NS_STATIC_CAST(nsSVGPathSeg*, mSegments.ObjectAt(i)); + nsSVGPathSeg* seg = static_cast(mSegments.ObjectAt(i)); seg->SetCurrentList(nsnull); } mSegments.Clear(); @@ -340,7 +340,7 @@ void nsSVGPathSegList::RemoveElementAt(PRInt32 index) { WillModify(); - nsSVGPathSeg* seg = NS_STATIC_CAST(nsSVGPathSeg*, mSegments.ObjectAt(index)); + nsSVGPathSeg* seg = static_cast(mSegments.ObjectAt(index)); seg->SetCurrentList(nsnull); mSegments.RemoveObjectAt(index); DidModify(); @@ -367,7 +367,7 @@ nsSVGPathSegList::RemoveFromCurrentList(nsSVGPathSeg* aSeg) nsCOMPtr currentList = aSeg->GetCurrentList(); if (currentList) { // aSeg's current list must be cast back to a nsSVGPathSegList* - nsSVGPathSegList* otherSegList = NS_STATIC_CAST(nsSVGPathSegList*, currentList.get()); + nsSVGPathSegList* otherSegList = static_cast(currentList.get()); PRInt32 ix = otherSegList->mSegments.IndexOfObject(aSeg); if (ix != -1) { otherSegList->RemoveElementAt(ix); diff --git a/content/svg/content/src/nsSVGPointList.cpp b/content/svg/content/src/nsSVGPointList.cpp index 9cea54b6c1e2..5be972f95a09 100644 --- a/content/svg/content/src/nsSVGPointList.cpp +++ b/content/svg/content/src/nsSVGPointList.cpp @@ -277,7 +277,7 @@ NS_IMETHODIMP nsSVGPointList::Initialize(nsIDOMSVGPoint *newItem, /* nsIDOMSVGPoint getItem (in unsigned long index); */ NS_IMETHODIMP nsSVGPointList::GetItem(PRUint32 index, nsIDOMSVGPoint **_retval) { - if (index >= NS_STATIC_CAST(PRUint32, mPoints.Count())) { + if (index >= static_cast(mPoints.Count())) { *_retval = nsnull; return NS_ERROR_DOM_INDEX_SIZE_ERR; } @@ -316,7 +316,7 @@ NS_IMETHODIMP nsSVGPointList::ReplaceItem(nsIDOMSVGPoint *newItem, /* nsIDOMSVGPoint removeItem (in unsigned long index); */ NS_IMETHODIMP nsSVGPointList::RemoveItem(PRUint32 index, nsIDOMSVGPoint **_retval) { - if (index >= NS_STATIC_CAST(PRUint32, mPoints.Count())) { + if (index >= static_cast(mPoints.Count())) { *_retval = nsnull; return NS_ERROR_DOM_INDEX_SIZE_ERR; } diff --git a/content/svg/content/src/nsSVGSVGElement.cpp b/content/svg/content/src/nsSVGSVGElement.cpp index 4424eec4b406..36359bf0abcd 100644 --- a/content/svg/content/src/nsSVGSVGElement.cpp +++ b/content/svg/content/src/nsSVGSVGElement.cpp @@ -571,7 +571,7 @@ nsSVGSVGElement::CreateSVGNumber(nsIDOMSVGNumber **_retval) NS_IMETHODIMP nsSVGSVGElement::CreateSVGLength(nsIDOMSVGLength **_retval) { - return NS_NewSVGLength(NS_REINTERPRET_CAST(nsISVGLength**, _retval)); + return NS_NewSVGLength(reinterpret_cast(_retval)); } /* nsIDOMSVGAngle createSVGAngle (); */ @@ -769,7 +769,7 @@ nsSVGSVGElement::GetCTM(nsIDOMSVGMatrix **_retval) // we didn't find an SVG ancestor float s=1, x=0, y=0; if (ownerDoc && - ownerDoc->GetRootContent() == NS_STATIC_CAST(nsIContent*, this)) { + ownerDoc->GetRootContent() == static_cast(this)) { // we're the root element. get our currentScale and currentTranslate vals mCurrentScale->GetValue(&s); mCurrentTranslate->GetX(&x); @@ -789,10 +789,10 @@ nsSVGSVGElement::GetCTM(nsIDOMSVGMatrix **_retval) if (ancestorCount == 0) { // our immediate parent is an SVG element. get our 'x' and 'y' attribs. // cast to nsSVGElement so we get our ancestor coord context. - x = mLengthAttributes[X].GetAnimValue(NS_STATIC_CAST(nsSVGElement*, - this)); - y = mLengthAttributes[Y].GetAnimValue(NS_STATIC_CAST(nsSVGElement*, - this)); + x = mLengthAttributes[X].GetAnimValue(static_cast + (this)); + y = mLengthAttributes[Y].GetAnimValue(static_cast + (this)); } else { // We have an SVG ancestor, but with non-SVG content between us @@ -879,7 +879,7 @@ nsSVGSVGElement::GetScreenCTM(nsIDOMSVGMatrix **_retval) // we didn't find an SVG ancestor float s=1, x=0, y=0; if (ownerDoc && - ownerDoc->GetRootContent() == NS_STATIC_CAST(nsIContent*, this)) { + ownerDoc->GetRootContent() == static_cast(this)) { // we're the root element. get our currentScale and currentTranslate vals mCurrentScale->GetValue(&s); mCurrentTranslate->GetX(&x); @@ -899,10 +899,10 @@ nsSVGSVGElement::GetScreenCTM(nsIDOMSVGMatrix **_retval) if (ancestorCount == 0) { // our immediate parent is an SVG element. get our 'x' and 'y' attribs // cast to nsSVGElement so we get our ancestor coord context. - x = mLengthAttributes[X].GetAnimValue(NS_STATIC_CAST(nsSVGElement*, - this)); - y = mLengthAttributes[Y].GetAnimValue(NS_STATIC_CAST(nsSVGElement*, - this)); + x = mLengthAttributes[X].GetAnimValue(static_cast + (this)); + y = mLengthAttributes[Y].GetAnimValue(static_cast + (this)); } else { // We have an SVG ancestor, but with non-SVG content between us @@ -1013,7 +1013,7 @@ nsSVGSVGElement::SetCurrentScaleTranslate(float s, float x, float y) nsCOMPtr presShell = doc->GetPrimaryShell(); NS_ASSERTION(presShell, "no presShell"); if (presShell && - doc->GetRootContent() == NS_STATIC_CAST(nsIContent*, this)) { + doc->GetRootContent() == static_cast(this)) { nsEventStatus status = nsEventStatus_eIgnore; nsGUIEvent event(PR_TRUE, NS_SVG_ZOOM, 0); event.eventStructType = NS_SVGZOOM_EVENT; @@ -1038,7 +1038,7 @@ nsSVGSVGElement::SetCurrentTranslate(float x, float y) nsCOMPtr presShell = doc->GetPrimaryShell(); NS_ASSERTION(presShell, "no presShell"); if (presShell && - doc->GetRootContent() == NS_STATIC_CAST(nsIContent*, this)) { + doc->GetRootContent() == static_cast(this)) { nsEventStatus status = nsEventStatus_eIgnore; nsEvent event(PR_TRUE, NS_SVG_SCROLL); event.eventStructType = NS_SVG_EVENT; @@ -1176,7 +1176,7 @@ nsSVGSVGElement::DidModifySVGObservable (nsISVGValue* observable, nsCOMPtr n = do_QueryInterface(observable); if (n && n==mCurrentScale) { if (mDispatchEvent && - doc->GetRootContent() == NS_STATIC_CAST(nsIContent*, this)) { + doc->GetRootContent() == static_cast(this)) { nsEventStatus status = nsEventStatus_eIgnore; nsGUIEvent event(PR_TRUE, NS_SVG_ZOOM, 0); event.eventStructType = NS_SVGZOOM_EVENT; @@ -1190,7 +1190,7 @@ nsSVGSVGElement::DidModifySVGObservable (nsISVGValue* observable, nsCOMPtr p = do_QueryInterface(observable); if (p && p==mCurrentTranslate) { if (mDispatchEvent && - doc->GetRootContent() == NS_STATIC_CAST(nsIContent*, this)) { + doc->GetRootContent() == static_cast(this)) { nsEventStatus status = nsEventStatus_eIgnore; nsEvent event(PR_TRUE, NS_SVG_SCROLL); event.eventStructType = NS_SVG_EVENT; diff --git a/content/svg/content/src/nsSVGSVGElement.h b/content/svg/content/src/nsSVGSVGElement.h index 734644f8b13f..0024960e4b28 100644 --- a/content/svg/content/src/nsSVGSVGElement.h +++ b/content/svg/content/src/nsSVGSVGElement.h @@ -52,7 +52,7 @@ class nsISVGEnum; #define QI_AND_CAST_TO_NSSVGSVGELEMENT(base) \ (nsCOMPtr(do_QueryInterface(base)) ? \ - NS_STATIC_CAST(nsSVGSVGElement*, base.get()) : nsnull) + static_cast(base.get()) : nsnull) typedef nsSVGStylableElement nsSVGSVGElementBase; diff --git a/content/svg/content/src/nsSVGStopElement.cpp b/content/svg/content/src/nsSVGStopElement.cpp index d776aeaa593a..71c934db4e43 100644 --- a/content/svg/content/src/nsSVGStopElement.cpp +++ b/content/svg/content/src/nsSVGStopElement.cpp @@ -142,7 +142,7 @@ nsSVGStopElement::ParseAttribute(PRInt32 aNamespaceID, const char *str = value.get(); char *rest; - float offset = NS_STATIC_CAST(float, PR_strtod(str, &rest)); + float offset = static_cast(PR_strtod(str, &rest)); if (str != rest) { if (*rest == '%') { offset /= 100; diff --git a/content/svg/content/src/nsSVGStylableElement.cpp b/content/svg/content/src/nsSVGStylableElement.cpp index 24793401f02f..6e8d19d834eb 100644 --- a/content/svg/content/src/nsSVGStylableElement.cpp +++ b/content/svg/content/src/nsSVGStylableElement.cpp @@ -77,7 +77,7 @@ nsSVGStylableElement::Init() mClassName = new nsSVGClassValue; NS_ENSURE_TRUE(mClassName, NS_ERROR_OUT_OF_MEMORY); rv = AddMappedSVGValue(nsGkAtoms::_class, - NS_STATIC_CAST(nsIDOMSVGAnimatedString*, mClassName), + static_cast(mClassName), kNameSpaceID_None); NS_ENSURE_SUCCESS(rv, rv); } diff --git a/content/svg/content/src/nsSVGTransformList.cpp b/content/svg/content/src/nsSVGTransformList.cpp index b459fc4e684c..378cd57b8606 100644 --- a/content/svg/content/src/nsSVGTransformList.cpp +++ b/content/svg/content/src/nsSVGTransformList.cpp @@ -263,7 +263,7 @@ NS_IMETHODIMP nsSVGTransformList::Initialize(nsIDOMSVGTransform *newItem, /* nsIDOMSVGTransform getItem (in unsigned long index); */ NS_IMETHODIMP nsSVGTransformList::GetItem(PRUint32 index, nsIDOMSVGTransform **_retval) { - if (index >= NS_STATIC_CAST(PRUint32, mTransforms.Count())) { + if (index >= static_cast(mTransforms.Count())) { *_retval = nsnull; return NS_ERROR_DOM_INDEX_SIZE_ERR; } @@ -341,7 +341,7 @@ NS_IMETHODIMP nsSVGTransformList::RemoveItem(PRUint32 index, nsIDOMSVGTransform { nsSVGValueAutoNotifier autonotifier(this); - if (index >= NS_STATIC_CAST(PRUint32, mTransforms.Count())) { + if (index >= static_cast(mTransforms.Count())) { *_retval = nsnull; return NS_ERROR_DOM_INDEX_SIZE_ERR; } diff --git a/content/svg/content/src/nsSVGUseElement.cpp b/content/svg/content/src/nsSVGUseElement.cpp index bdc14f8f14e7..d28d2134cf02 100644 --- a/content/svg/content/src/nsSVGUseElement.cpp +++ b/content/svg/content/src/nsSVGUseElement.cpp @@ -74,7 +74,7 @@ NS_INTERFACE_MAP_BEGIN(nsSVGUseElement) NS_INTERFACE_MAP_ENTRY(nsIMutationObserver) NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGUseElement) if (aIID.Equals(NS_GET_IID(nsSVGUseElement))) - foundInterface = NS_REINTERPRET_CAST(nsISupports*, this); + foundInterface = reinterpret_cast(this); else NS_INTERFACE_MAP_END_INHERITING(nsSVGUseElementBase) @@ -129,7 +129,7 @@ nsSVGUseElement::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const rv |= CopyInnerTo(it); // nsSVGUseElement specific portion - record who we cloned from - it->mOriginal = NS_CONST_CAST(nsSVGUseElement*, this); + it->mOriginal = const_cast(this); if (NS_SUCCEEDED(rv)) { kungFuDeathGrip.swap(*aResult); diff --git a/content/svg/content/src/nsSVGValue.cpp b/content/svg/content/src/nsSVGValue.cpp index f478cbfb4848..2b5097a73c10 100644 --- a/content/svg/content/src/nsSVGValue.cpp +++ b/content/svg/content/src/nsSVGValue.cpp @@ -55,7 +55,7 @@ nsSVGValue::ReleaseObservers() PRInt32 count = mObservers.Count(); PRInt32 i; for (i = 0; i < count; ++i) { - nsIWeakReference* wr = NS_STATIC_CAST(nsIWeakReference*,mObservers.ElementAt(i)); + nsIWeakReference* wr = static_cast(mObservers.ElementAt(i)); NS_RELEASE(wr); } while (i) @@ -72,10 +72,10 @@ nsSVGValue::NotifyObservers(SVGObserverNotifyFunction f, // from the observer list (mod_die), walk backwards through the list // to catch everyone. for (PRInt32 i = count - 1; i >= 0; i--) { - nsIWeakReference* wr = NS_STATIC_CAST(nsIWeakReference*,mObservers.ElementAt(i)); + nsIWeakReference* wr = static_cast(mObservers.ElementAt(i)); nsCOMPtr observer = do_QueryReferent(wr); if (observer) - (NS_STATIC_CAST(nsISVGValueObserver*,observer)->*f)(this, aModType); + (static_cast(observer)->*f)(this, aModType); } } @@ -122,7 +122,7 @@ nsSVGValue::RemoveObserver(nsISVGValueObserver* observer) if (!wr) return NS_ERROR_FAILURE; PRInt32 i = mObservers.IndexOf((void*)wr); if (i<0) return NS_ERROR_FAILURE; - nsIWeakReference* wr2 = NS_STATIC_CAST(nsIWeakReference*,mObservers.ElementAt(i)); + nsIWeakReference* wr2 = static_cast(mObservers.ElementAt(i)); NS_RELEASE(wr2); mObservers.RemoveElementAt(i); return NS_OK; diff --git a/content/xbl/src/nsBindingManager.cpp b/content/xbl/src/nsBindingManager.cpp index 2950dd40c68e..db4a48f8b77e 100644 --- a/content/xbl/src/nsBindingManager.cpp +++ b/content/xbl/src/nsBindingManager.cpp @@ -100,7 +100,7 @@ public: PRInt32 GetInsertionPointCount() { return mElements->Length(); } - nsXBLInsertionPoint* GetInsertionPointAt(PRInt32 i) { return NS_STATIC_CAST(nsXBLInsertionPoint*, mElements->ElementAt(i)); } + nsXBLInsertionPoint* GetInsertionPointAt(PRInt32 i) { return static_cast(mElements->ElementAt(i)); } void RemoveInsertionPointAt(PRInt32 i) { mElements->RemoveElementAt(i); } private: @@ -156,7 +156,7 @@ nsAnonymousContentList::GetLength(PRUint32* aLength) *aLength = 0; for (PRInt32 i = 0; i < cnt; i++) - *aLength += NS_STATIC_CAST(nsXBLInsertionPoint*, mElements->ElementAt(i))->ChildCount(); + *aLength += static_cast(mElements->ElementAt(i))->ChildCount(); return NS_OK; } @@ -170,7 +170,7 @@ nsAnonymousContentList::Item(PRUint32 aIndex, nsIDOMNode** aReturn) for (PRInt32 i = 0; i < cnt; i++) { aIndex -= pointCount; - nsXBLInsertionPoint* point = NS_STATIC_CAST(nsXBLInsertionPoint*, mElements->ElementAt(i)); + nsXBLInsertionPoint* point = static_cast(mElements->ElementAt(i)); pointCount = point->ChildCount(); if (aIndex < pointCount) { @@ -211,7 +211,7 @@ private: PR_STATIC_CALLBACK(void) ClearObjectEntry(PLDHashTable* table, PLDHashEntryHdr *entry) { - ObjectEntry* objEntry = NS_STATIC_CAST(ObjectEntry*, entry); + ObjectEntry* objEntry = static_cast(entry); objEntry->~ObjectEntry(); } @@ -243,8 +243,8 @@ AddObjectEntry(PLDHashTable& table, nsISupports* aKey, nsISupports* aValue) if (!aKey) return NS_ERROR_INVALID_ARG; ObjectEntry *entry = - NS_STATIC_CAST(ObjectEntry*, - PL_DHashTableOperate(&table, aKey, PL_DHASH_ADD)); + static_cast + (PL_DHashTableOperate(&table, aKey, PL_DHASH_ADD)); if (!entry) return NS_ERROR_OUT_OF_MEMORY; @@ -266,8 +266,8 @@ static nsISupports* LookupObject(PLDHashTable& table, nsISupports* aKey) { ObjectEntry *entry = - NS_STATIC_CAST(ObjectEntry*, - PL_DHashTableOperate(&table, aKey, PL_DHASH_LOOKUP)); + static_cast + (PL_DHashTableOperate(&table, aKey, PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_BUSY(entry)) return entry->GetValue(); @@ -344,7 +344,7 @@ DocumentInfoHashtableTraverser(nsIURI* key, void* userArg) { nsCycleCollectionTraversalCallback *cb = - NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, userArg); + static_cast(userArg); cb->NoteXPCOMChild(di); return PL_DHASH_NEXT; } @@ -355,7 +355,7 @@ LoadingDocHashtableTraverser(nsIURI* key, void* userArg) { nsCycleCollectionTraversalCallback *cb = - NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, userArg); + static_cast(userArg); cb->NoteXPCOMChild(sl); return PL_DHASH_NEXT; } @@ -458,8 +458,8 @@ nsIContent* nsBindingManager::GetInsertionParent(nsIContent* aContent) { if (mInsertionParentTable.ops) { - return NS_STATIC_CAST(nsIContent*, - LookupObject(mInsertionParentTable, aContent)); + return static_cast + (LookupObject(mInsertionParentTable, aContent)); } return nsnull; @@ -475,7 +475,7 @@ nsIXPConnectWrappedJS* nsBindingManager::GetWrappedJS(nsIContent* aContent) { if (mWrapperTable.ops) { - return NS_STATIC_CAST(nsIXPConnectWrappedJS*, LookupObject(mWrapperTable, aContent)); + return static_cast(LookupObject(mWrapperTable, aContent)); } return nsnull; @@ -541,8 +541,8 @@ nsBindingManager::GetContentListFor(nsIContent* aContent, nsIDOMNodeList** aResu *aResult = nsnull; if (mContentListTable.ops) { - *aResult = NS_STATIC_CAST(nsIDOMNodeList*, - LookupObject(mContentListTable, aContent)); + *aResult = static_cast + (LookupObject(mContentListTable, aContent)); NS_IF_ADDREF(*aResult); } @@ -584,8 +584,8 @@ nsBindingManager::GetAnonymousNodesInternal(nsIContent* aContent, // Locate the primary binding and get its node list of anonymous children. *aResult = nsnull; if (mAnonymousNodesTable.ops) { - *aResult = NS_STATIC_CAST(nsIDOMNodeList*, - LookupObject(mAnonymousNodesTable, aContent)); + *aResult = static_cast + (LookupObject(mAnonymousNodesTable, aContent)); NS_IF_ADDREF(*aResult); } @@ -650,8 +650,8 @@ nsBindingManager::GetXBLChildNodesInternal(nsIContent* aContent, // insertion points. if (!result) { if (mContentListTable.ops) { - result = NS_STATIC_CAST(nsIDOMNodeList*, - LookupObject(mContentListTable, aContent)); + result = static_cast + (LookupObject(mContentListTable, aContent)); *aIsAnonymousContentList = PR_TRUE; } } @@ -844,7 +844,7 @@ PR_STATIC_CALLBACK(PLDHashOperator) AccumulateBindingsToDetach(nsISupports *aKey, nsXBLBinding *aBinding, void* aVoidArray) { - nsVoidArray* arr = NS_STATIC_CAST(nsVoidArray*, aVoidArray); + nsVoidArray* arr = static_cast(aVoidArray); // Hold an owning reference to this binding, just in case if (arr->AppendElement(aBinding)) NS_ADDREF(aBinding); @@ -855,7 +855,7 @@ PR_STATIC_CALLBACK(PRBool) ExecuteDetachedHandler(void* aBinding, void* aClosure) { NS_PRECONDITION(aBinding, "Null binding in list?"); - nsXBLBinding* binding = NS_STATIC_CAST(nsXBLBinding*, aBinding); + nsXBLBinding* binding = static_cast(aBinding); binding->ExecuteDetachedHandler(); // Drop our ref to the binding now NS_RELEASE(binding); @@ -1066,7 +1066,7 @@ nsBindingManager::GetBindingImplementation(nsIContent* aContent, REFNSIID aIID, // We successfully created a wrapper. We will own this wrapper for as long as the binding remains // alive. At the time the binding is cleared out of the bindingManager, we will remove the wrapper // from the bindingManager as well. - nsISupports* supp = NS_STATIC_CAST(nsISupports*, *aResult); + nsISupports* supp = static_cast(*aResult); wrappedJS = do_QueryInterface(supp); SetWrappedJS(aContent, wrappedJS); @@ -1220,7 +1220,7 @@ nsBindingManager::ContentAppended(nsIDocument* aDocument, // Find a non-pseudo-insertion point and just jam ourselves in. // This is not 100% correct. Hack city, baby. nsAnonymousContentList* contentList = - NS_STATIC_CAST(nsAnonymousContentList*, nodeList.get()); + static_cast(nodeList.get()); PRInt32 count = contentList->GetInsertionPointCount(); for (PRInt32 i = 0; i < count; i++) { @@ -1268,7 +1268,7 @@ nsBindingManager::ContentInserted(nsIDocument* aDocument, // Find a non-pseudo-insertion point and just jam ourselves in. // This is not 100% correct. Hack city, baby. nsAnonymousContentList* contentList = - NS_STATIC_CAST(nsAnonymousContentList*, nodeList.get()); + static_cast(nodeList.get()); PRInt32 count = contentList->GetInsertionPointCount(); for (PRInt32 i = 0; i < count; i++) { @@ -1337,7 +1337,7 @@ nsBindingManager::ContentRemoved(nsIDocument* aDocument, if (nodeList && isAnonymousContentList) { // Find a non-pseudo-insertion point and remove ourselves. - nsAnonymousContentList* contentList = NS_STATIC_CAST(nsAnonymousContentList*, NS_STATIC_CAST(nsIDOMNodeList*, nodeList)); + nsAnonymousContentList* contentList = static_cast(static_cast(nodeList)); PRInt32 count = contentList->GetInsertionPointCount(); for (PRInt32 i =0; i < count; i++) { nsXBLInsertionPoint* point = contentList->GetInsertionPointAt(i); diff --git a/content/xbl/src/nsXBLBinding.cpp b/content/xbl/src/nsXBLBinding.cpp index 1377a8143cbb..08b226bc6803 100644 --- a/content/xbl/src/nsXBLBinding.cpp +++ b/content/xbl/src/nsXBLBinding.cpp @@ -111,14 +111,14 @@ PR_STATIC_CALLBACK(void) XBLFinalize(JSContext *cx, JSObject *obj) { - nsXBLJSClass* c = NS_STATIC_CAST(nsXBLJSClass*, ::JS_GetClass(cx, obj)); + nsXBLJSClass* c = static_cast(::JS_GetClass(cx, obj)); c->Drop(); } nsXBLJSClass::nsXBLJSClass(const nsAFlatCString& aClassName) { memset(this, 0, sizeof(nsXBLJSClass)); - next = prev = NS_STATIC_CAST(JSCList*, this); + next = prev = static_cast(this); name = ToNewCString(aClassName); addProperty = delProperty = setProperty = getProperty = ::JS_PropertyStub; enumerate = ::JS_EnumerateStub; @@ -130,7 +130,7 @@ nsXBLJSClass::nsXBLJSClass(const nsAFlatCString& aClassName) nsrefcnt nsXBLJSClass::Destroy() { - NS_ASSERTION(next == prev && prev == NS_STATIC_CAST(JSCList*, this), + NS_ASSERTION(next == prev && prev == static_cast(this), "referenced nsXBLJSClass is on LRU list already!?"); if (nsXBLService::gClassTable) { @@ -143,7 +143,7 @@ nsXBLJSClass::Destroy() delete this; } else { // Put this most-recently-used class on end of the LRU-sorted freelist. - JSCList* mru = NS_STATIC_CAST(JSCList*, this); + JSCList* mru = static_cast(this); JS_APPEND_LINK(mru, &nsXBLService::gClassLRUList); nsXBLService::gClassLRUListLength++; } @@ -177,7 +177,7 @@ PR_STATIC_CALLBACK(PLDHashOperator) TraverseKey(nsISupports* aKey, nsInsertionPointList* aData, void* aClosure) { nsCycleCollectionTraversalCallback &cb = - *NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aClosure); + *static_cast(aClosure); cb.NoteXPCOMChild(aKey); if (aData) { @@ -1079,10 +1079,10 @@ nsXBLBinding::DoInitJSClass(JSContext *cx, JSObject *global, JSObject *obj, classObject = (nsXBLService::gClassTable)->Get(&key); if (classObject) { - c = NS_STATIC_CAST(nsXBLJSClass*, classObject); + c = static_cast(classObject); // If c is on the LRU list (i.e., not linked to itself), remove it now! - JSCList* link = NS_STATIC_CAST(JSCList*, c); + JSCList* link = static_cast(c); if (c->next != link) { JS_REMOVE_AND_INIT_LINK(link); nsXBLService::gClassLRUListLength--; @@ -1101,7 +1101,7 @@ nsXBLBinding::DoInitJSClass(JSContext *cx, JSObject *global, JSObject *obj, nsXBLService::gClassLRUListLength--; // Remove any mapping from the old name to the class struct. - c = NS_STATIC_CAST(nsXBLJSClass*, lru); + c = static_cast(lru); nsCStringKey oldKey(c->name); (nsXBLService::gClassTable)->Remove(&oldKey); diff --git a/content/xbl/src/nsXBLDocumentInfo.cpp b/content/xbl/src/nsXBLDocumentInfo.cpp index 0ad22c29841b..f3bbe1ee0f4a 100644 --- a/content/xbl/src/nsXBLDocumentInfo.cpp +++ b/content/xbl/src/nsXBLDocumentInfo.cpp @@ -233,9 +233,9 @@ XBL_ProtoErrorReporter(JSContext *cx, PRUint32 column = report->uctokenptr - report->uclinebuf; errorObject->Init - (NS_REINTERPRET_CAST(const PRUnichar*, report->ucmessage), + (reinterpret_cast(report->ucmessage), NS_ConvertUTF8toUTF16(report->filename).get(), - NS_REINTERPRET_CAST(const PRUnichar*, report->uclinebuf), + reinterpret_cast(report->uclinebuf), report->lineno, column, report->flags, "xbl javascript" ); @@ -372,8 +372,8 @@ nsXBLDocGlobalObject::GetGlobalJSObject() if (!mScriptContext) return nsnull; - JSContext* cx = NS_STATIC_CAST(JSContext*, - mScriptContext->GetNativeContext()); + JSContext* cx = static_cast + (mScriptContext->GetNativeContext()); if (!cx) return nsnull; @@ -442,8 +442,8 @@ static PRIntn PR_CALLBACK TraverseProtos(nsHashKey *aKey, void *aData, void* aClosure) { nsCycleCollectionTraversalCallback *cb = - NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aClosure); - nsXBLPrototypeBinding *proto = NS_STATIC_CAST(nsXBLPrototypeBinding*, aData); + static_cast(aClosure); + nsXBLPrototypeBinding *proto = static_cast(aData); proto->Traverse(*cb); return kHashEnumerateNext; } @@ -518,7 +518,7 @@ nsXBLDocumentInfo::GetPrototypeBinding(const nsACString& aRef, nsXBLPrototypeBin const nsPromiseFlatCString& flat = PromiseFlatCString(aRef); nsCStringKey key(flat.get()); - *aResult = NS_STATIC_CAST(nsXBLPrototypeBinding*, mBindingTable->Get(&key)); + *aResult = static_cast(mBindingTable->Get(&key)); return NS_OK; } @@ -526,7 +526,7 @@ nsXBLDocumentInfo::GetPrototypeBinding(const nsACString& aRef, nsXBLPrototypeBin static PRBool PR_CALLBACK DeletePrototypeBinding(nsHashKey* aKey, void* aData, void* aClosure) { - nsXBLPrototypeBinding* binding = NS_STATIC_CAST(nsXBLPrototypeBinding*, aData); + nsXBLPrototypeBinding* binding = static_cast(aData); delete binding; return PR_TRUE; } diff --git a/content/xbl/src/nsXBLEventHandler.cpp b/content/xbl/src/nsXBLEventHandler.cpp index a01f88eb5ef9..e2ebed8c82ef 100644 --- a/content/xbl/src/nsXBLEventHandler.cpp +++ b/content/xbl/src/nsXBLEventHandler.cpp @@ -147,8 +147,8 @@ nsXBLKeyEventHandler::HandleEvent(nsIDOMEvent* aEvent) PRUint32 i; for (i = 0; i < count; ++i) { - nsXBLPrototypeHandler* handler = NS_STATIC_CAST(nsXBLPrototypeHandler*, - mProtoHandlers[i]); + nsXBLPrototypeHandler* handler = static_cast + (mProtoHandlers[i]); PRBool hasAllowUntrustedAttr = handler->HasAllowUntrustedAttr(); if ((trustedEvent || (hasAllowUntrustedAttr && handler->AllowUntrustedEvents()) || diff --git a/content/xbl/src/nsXBLProtoImplField.cpp b/content/xbl/src/nsXBLProtoImplField.cpp index 1d3c552c0c92..4c7480ad6088 100644 --- a/content/xbl/src/nsXBLProtoImplField.cpp +++ b/content/xbl/src/nsXBLProtoImplField.cpp @@ -136,8 +136,8 @@ nsXBLProtoImplField::InstallMember(nsIScriptContext* aContext, // Define the evaluated result as a JS property nsDependentString name(mName); JSAutoRequest ar(cx); - if (!::JS_DefineUCProperty(cx, NS_STATIC_CAST(JSObject *, aScriptObject), - NS_REINTERPRET_CAST(const jschar*, mName), + if (!::JS_DefineUCProperty(cx, static_cast(aScriptObject), + reinterpret_cast(mName), name.Length(), result, nsnull, nsnull, mJSAttributes)) return NS_ERROR_OUT_OF_MEMORY; } diff --git a/content/xbl/src/nsXBLProtoImplMethod.cpp b/content/xbl/src/nsXBLProtoImplMethod.cpp index dc2fbb98f346..b4dc110df611 100644 --- a/content/xbl/src/nsXBLProtoImplMethod.cpp +++ b/content/xbl/src/nsXBLProtoImplMethod.cpp @@ -166,7 +166,7 @@ nsXBLProtoImplMethod::InstallMember(nsIScriptContext* aContext, NS_ENSURE_SUCCESS(rv, rv); if (!::JS_DefineUCProperty(cx, targetClassObject, - NS_REINTERPRET_CAST(const jschar*, mName), + reinterpret_cast(mName), name.Length(), OBJECT_TO_JSVAL(method), NULL, NULL, JSPROP_ENUMERATE)) { return NS_ERROR_OUT_OF_MEMORY; diff --git a/content/xbl/src/nsXBLProtoImplProperty.cpp b/content/xbl/src/nsXBLProtoImplProperty.cpp index 1942311cf3d9..76a5b44bec06 100644 --- a/content/xbl/src/nsXBLProtoImplProperty.cpp +++ b/content/xbl/src/nsXBLProtoImplProperty.cpp @@ -211,7 +211,7 @@ nsXBLProtoImplProperty::InstallMember(nsIScriptContext* aContext, nsDependentString name(mName); if (!::JS_DefineUCProperty(cx, targetClassObject, - NS_REINTERPRET_CAST(const jschar*, mName), + reinterpret_cast(mName), name.Length(), JSVAL_VOID, (JSPropertyOp) getter, (JSPropertyOp) setter, mJSAttributes)) return NS_ERROR_OUT_OF_MEMORY; diff --git a/content/xbl/src/nsXBLPrototypeBinding.cpp b/content/xbl/src/nsXBLPrototypeBinding.cpp index 705e400d42ee..24f620512a85 100644 --- a/content/xbl/src/nsXBLPrototypeBinding.cpp +++ b/content/xbl/src/nsXBLPrototypeBinding.cpp @@ -334,9 +334,9 @@ PR_STATIC_CALLBACK(PRIntn) TraverseInsertionPoint(nsHashKey* aKey, void* aData, void* aClosure) { nsCycleCollectionTraversalCallback &cb = - *NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aClosure); + *static_cast(aClosure); nsXBLInsertionPointEntry* entry = - NS_STATIC_CAST(nsXBLInsertionPointEntry*, aData); + static_cast(aData); NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NATIVE_PTR(entry, nsXBLInsertionPointEntry) return kHashEnumerateNext; @@ -346,8 +346,8 @@ PR_STATIC_CALLBACK(PRBool) TraverseBinding(nsHashKey *aKey, void *aData, void* aClosure) { nsCycleCollectionTraversalCallback *cb = - NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aClosure); - cb->NoteXPCOMChild(NS_STATIC_CAST(nsISupports*, aData)); + static_cast(aClosure); + cb->NoteXPCOMChild(static_cast(aData)); return kHashEnumerateNext; } @@ -535,14 +535,13 @@ nsXBLPrototypeBinding::AttributeChanged(nsIAtom* aAttribute, if (!mAttributeTable) return; nsPRUint32Key nskey(aNameSpaceID); - nsObjectHashtable *attributesNS = NS_STATIC_CAST(nsObjectHashtable*, - mAttributeTable->Get(&nskey)); + nsObjectHashtable *attributesNS = static_cast(mAttributeTable->Get(&nskey)); if (!attributesNS) return; nsISupportsKey key(aAttribute); - nsXBLAttributeEntry* xblAttr = NS_STATIC_CAST(nsXBLAttributeEntry*, - attributesNS->Get(&key)); + nsXBLAttributeEntry* xblAttr = static_cast + (attributesNS->Get(&key)); if (!xblAttr) return; @@ -630,8 +629,8 @@ struct InsertionData { PRBool PR_CALLBACK InstantiateInsertionPoint(nsHashKey* aKey, void* aData, void* aClosure) { - nsXBLInsertionPointEntry* entry = NS_STATIC_CAST(nsXBLInsertionPointEntry*, aData); - InsertionData* data = NS_STATIC_CAST(InsertionData*, aClosure); + nsXBLInsertionPointEntry* entry = static_cast(aData); + InsertionData* data = static_cast(aClosure); nsXBLBinding* binding = data->mBinding; nsXBLPrototypeBinding* proto = data->mPrototype; @@ -699,10 +698,10 @@ nsXBLPrototypeBinding::GetInsertionPoint(nsIContent* aBoundElement, return nsnull; nsISupportsKey key(aChild->Tag()); - nsXBLInsertionPointEntry* entry = NS_STATIC_CAST(nsXBLInsertionPointEntry*, mInsertionPointTable->Get(&key)); + nsXBLInsertionPointEntry* entry = static_cast(mInsertionPointTable->Get(&key)); if (!entry) { nsISupportsKey key2(nsGkAtoms::children); - entry = NS_STATIC_CAST(nsXBLInsertionPointEntry*, mInsertionPointTable->Get(&key2)); + entry = static_cast(mInsertionPointTable->Get(&key2)); } nsIContent *realContent = nsnull; @@ -739,7 +738,7 @@ nsXBLPrototypeBinding::GetSingleInsertionPoint(nsIContent* aBoundElement, nsISupportsKey key(nsGkAtoms::children); nsXBLInsertionPointEntry* entry = - NS_STATIC_CAST(nsXBLInsertionPointEntry*, mInsertionPointTable->Get(&key)); + static_cast(mInsertionPointTable->Get(&key)); if (!entry) { // The only insertion point specified was actually a filtered insertion @@ -788,8 +787,7 @@ nsXBLPrototypeBinding::ImplementsInterface(REFNSIID aIID) const // Check our IID table. if (mInterfaceTable) { nsIIDKey key(aIID); - nsCOMPtr supports = getter_AddRefs(NS_STATIC_CAST(nsISupports*, - mInterfaceTable->Get(&key))); + nsCOMPtr supports = getter_AddRefs(static_cast(mInterfaceTable->Get(&key))); return supports != nsnull; } @@ -889,7 +887,7 @@ nsXBLPrototypeBinding::LocateInstance(nsIContent* aBoundElement, // Next we have to find the real insertion point for this proto insertion // point. If it does not contain any default content, then we should // return null, since the content is not in the clone. - nsXBLInsertionPoint* currPoint = NS_STATIC_CAST(nsXBLInsertionPoint*, points->ElementAt(i)); + nsXBLInsertionPoint* currPoint = static_cast(points->ElementAt(i)); nsCOMPtr defContent = currPoint->GetDefaultContentTemplate(); if (defContent == childPoint) { // Now check to see if we even built default content at this @@ -931,8 +929,8 @@ struct nsXBLAttrChangeData // XXXbz this duplicates lots of AttributeChanged PRBool PR_CALLBACK SetAttrs(nsHashKey* aKey, void* aData, void* aClosure) { - nsXBLAttributeEntry* entry = NS_STATIC_CAST(nsXBLAttributeEntry*, aData); - nsXBLAttrChangeData* changeData = NS_STATIC_CAST(nsXBLAttrChangeData*, aClosure); + nsXBLAttributeEntry* entry = static_cast(aData); + nsXBLAttrChangeData* changeData = static_cast(aClosure); nsIAtom* src = entry->GetSrcAttribute(); PRInt32 srcNs = changeData->mSrcNamespace; @@ -998,11 +996,11 @@ PRBool PR_CALLBACK SetAttrs(nsHashKey* aKey, void* aData, void* aClosure) PRBool PR_CALLBACK SetAttrsNS(nsHashKey* aKey, void* aData, void* aClosure) { if (aData && aClosure) { - nsPRUint32Key * key = NS_STATIC_CAST(nsPRUint32Key*, aKey); + nsPRUint32Key * key = static_cast(aKey); nsObjectHashtable* xblAttributes = - NS_STATIC_CAST(nsObjectHashtable*, aData); - nsXBLAttrChangeData * changeData = NS_STATIC_CAST(nsXBLAttrChangeData *, - aClosure); + static_cast(aData); + nsXBLAttrChangeData * changeData = static_cast + (aClosure); changeData->mSrcNamespace = key->GetValue(); xblAttributes->Enumerate(SetAttrs, (void*)changeData); } @@ -1045,7 +1043,7 @@ nsXBLPrototypeBinding::ShouldBuildChildFrames() const return PR_TRUE; nsPRUint32Key nskey(kNameSpaceID_XBL); nsObjectHashtable* xblAttributes = - NS_STATIC_CAST(nsObjectHashtable*, mAttributeTable->Get(&nskey)); + static_cast(mAttributeTable->Get(&nskey)); if (xblAttributes) { nsISupportsKey key(nsGkAtoms::text); void* entry = xblAttributes->Get(&key); @@ -1058,14 +1056,14 @@ nsXBLPrototypeBinding::ShouldBuildChildFrames() const static PRBool PR_CALLBACK DeleteAttributeEntry(nsHashKey* aKey, void* aData, void* aClosure) { - nsXBLAttributeEntry::Destroy(NS_STATIC_CAST(nsXBLAttributeEntry*, aData)); + nsXBLAttributeEntry::Destroy(static_cast(aData)); return PR_TRUE; } static PRBool PR_CALLBACK DeleteAttributeTable(nsHashKey* aKey, void* aData, void* aClosure) { - delete NS_STATIC_CAST(nsObjectHashtable*, aData); + delete static_cast(aData); return PR_TRUE; } @@ -1134,7 +1132,7 @@ nsXBLPrototypeBinding::ConstructAttributeTable(nsIContent* aElement) nsPRUint32Key nskey(atomNsID); nsObjectHashtable* attributesNS = - NS_STATIC_CAST(nsObjectHashtable*, mAttributeTable->Get(&nskey)); + static_cast(mAttributeTable->Get(&nskey)); if (!attributesNS) { attributesNS = new nsObjectHashtable(nsnull, nsnull, DeleteAttributeEntry, @@ -1152,8 +1150,8 @@ nsXBLPrototypeBinding::ConstructAttributeTable(nsIContent* aElement) // Now we should see if some element within our anonymous // content is already observing this attribute. nsISupportsKey key(atom); - nsXBLAttributeEntry* entry = NS_STATIC_CAST(nsXBLAttributeEntry*, - attributesNS->Get(&key)); + nsXBLAttributeEntry* entry = static_cast + (attributesNS->Get(&key)); if (!entry) { // Put it in the table. @@ -1189,7 +1187,7 @@ nsXBLPrototypeBinding::ConstructAttributeTable(nsIContent* aElement) static PRBool PR_CALLBACK DeleteInsertionPointEntry(nsHashKey* aKey, void* aData, void* aClosure) { - NS_STATIC_CAST(nsXBLInsertionPointEntry*, aData)->Release(); + static_cast(aData)->Release(); return PR_TRUE; } diff --git a/content/xbl/src/nsXBLService.cpp b/content/xbl/src/nsXBLService.cpp index 11616fed3b92..ea782d316a6e 100644 --- a/content/xbl/src/nsXBLService.cpp +++ b/content/xbl/src/nsXBLService.cpp @@ -742,7 +742,7 @@ nsXBLService::FlushMemory() { while (!JS_CLIST_IS_EMPTY(&gClassLRUList)) { JSCList* lru = gClassLRUList.next; - nsXBLJSClass* c = NS_STATIC_CAST(nsXBLJSClass*, lru); + nsXBLJSClass* c = static_cast(lru); JS_REMOVE_AND_INIT_LINK(lru); delete c; @@ -1029,7 +1029,7 @@ nsXBLService::LoadBindingDocumentInfo(nsIContent* aBoundElement, listener = bindingManager->GetLoadingDocListener(documentURI); if (listener) { nsXBLStreamListener* xblListener = - NS_STATIC_CAST(nsXBLStreamListener*, listener.get()); + static_cast(listener.get()); // Create a new load observer. if (!xblListener->HasRequest(aBindingURI, aBoundElement)) { nsXBLBindingRequest* req = nsXBLBindingRequest::Create(mPool, aBindingURI, aBoundElement); @@ -1178,7 +1178,7 @@ nsXBLService::FetchBindingDocument(nsIContent* aBoundElement, nsIDocument* aBoun nsCOMPtr target(do_QueryInterface(doc)); target->AddEventListener(NS_LITERAL_STRING("load"), - NS_STATIC_CAST(nsIDOMLoadListener*, xblListener), + static_cast(xblListener), PR_FALSE); // Add ourselves to the list of loading docs. diff --git a/content/xbl/src/nsXBLWindowKeyHandler.cpp b/content/xbl/src/nsXBLWindowKeyHandler.cpp index fe75a1731d0e..80c653a88ccf 100644 --- a/content/xbl/src/nsXBLWindowKeyHandler.cpp +++ b/content/xbl/src/nsXBLWindowKeyHandler.cpp @@ -292,7 +292,7 @@ GetEditorKeyBindings() static void DoCommandCallback(const char *aCommand, void *aData) { - nsIControllers *controllers = NS_STATIC_CAST(nsIControllers*, aData); + nsIControllers *controllers = static_cast(aData); if (controllers) { nsCOMPtr controller; controllers->GetControllerForCommand(aCommand, getter_AddRefs(controller)); diff --git a/content/xml/content/src/nsXMLElement.cpp b/content/xml/content/src/nsXMLElement.cpp index ef699fc66e57..803926d0439e 100644 --- a/content/xml/content/src/nsXMLElement.cpp +++ b/content/xml/content/src/nsXMLElement.cpp @@ -77,9 +77,9 @@ nsXMLElement::QueryInterface(REFNSIID aIID, void** aInstancePtr) nsISupports *inst = nsnull; if (aIID.Equals(NS_GET_IID(nsIDOMNode))) { - inst = NS_STATIC_CAST(nsIDOMNode *, this); + inst = static_cast(this); } else if (aIID.Equals(NS_GET_IID(nsIDOMElement))) { - inst = NS_STATIC_CAST(nsIDOMElement *, this); + inst = static_cast(this); } else if (aIID.Equals(NS_GET_IID(nsIClassInfo))) { inst = NS_GetDOMClassInfoInstance(eDOMClassInfo_Element_id); NS_ENSURE_TRUE(inst, NS_ERROR_OUT_OF_MEMORY); diff --git a/content/xml/document/src/nsXMLDocument.cpp b/content/xml/document/src/nsXMLDocument.cpp index 22b88f9e1698..84231037dd28 100644 --- a/content/xml/document/src/nsXMLDocument.cpp +++ b/content/xml/document/src/nsXMLDocument.cpp @@ -650,7 +650,7 @@ nsXMLDocument::EndLoad() nsCxPusher pusher(sgo); - nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIDocument*, this), nsnull, + nsEventDispatcher::Dispatch(static_cast(this), nsnull, &event, nsnull, &status); } nsDocument::EndLoad(); diff --git a/content/xslt/src/base/txStringUtils.cpp b/content/xslt/src/base/txStringUtils.cpp index f2aa8f9887df..df9f4c934f92 100644 --- a/content/xslt/src/base/txStringUtils.cpp +++ b/content/xslt/src/base/txStringUtils.cpp @@ -88,7 +88,7 @@ public: PRUint32 write( const PRUnichar* aSource, PRUint32 aSourceLength) { - PRUnichar* cp = NS_CONST_CAST(PRUnichar*, aSource); + PRUnichar* cp = const_cast(aSource); const PRUnichar* end = aSource + aSourceLength; while (cp != end) { PRUnichar ch = *cp; diff --git a/content/xslt/src/xml/txXMLParser.cpp b/content/xslt/src/xml/txXMLParser.cpp index d5bfa77348dd..4e39fa91f57d 100644 --- a/content/xslt/src/xml/txXMLParser.cpp +++ b/content/xslt/src/xml/txXMLParser.cpp @@ -146,7 +146,7 @@ txParseFromStream(istream& aInputStream, const nsAString& aUri, */ // shortcut macro for redirection into txXMLParser method calls -#define TX_XMLPARSER(_userData) NS_STATIC_CAST(txXMLParser*, _userData) +#define TX_XMLPARSER(_userData) static_cast(_userData) #define TX_ENSURE_DATA(_userData) \ PR_BEGIN_MACRO \ if (!aUserData) { \ @@ -335,9 +335,9 @@ void txXMLParser::CharacterData(const XML_Char* aChars, int aLength) { Node* prevSib = mCurrentNode->getLastChild(); - const PRUnichar* pChars = NS_STATIC_CAST(const PRUnichar*, aChars); + const PRUnichar* pChars = static_cast(aChars); if (prevSib && prevSib->getNodeType() == Node::TEXT_NODE) { - NS_STATIC_CAST(NodeDefinition*, prevSib)->appendData(pChars, aLength); + static_cast(prevSib)->appendData(pChars, aLength); } else { // aChars is not null-terminated so we use Substring here. @@ -351,7 +351,7 @@ void txXMLParser::Comment(const XML_Char* aChars) { Node* node = mDocument->createComment( - nsDependentString(NS_STATIC_CAST(const PRUnichar*, aChars))); + nsDependentString(static_cast(aChars))); mCurrentNode->appendChild(node); } diff --git a/content/xslt/src/xml/txXMLUtils.h b/content/xslt/src/xml/txXMLUtils.h index 097f8c8df9c2..bb10bb1d0eda 100644 --- a/content/xslt/src/xml/txXMLUtils.h +++ b/content/xslt/src/xml/txXMLUtils.h @@ -166,12 +166,12 @@ public: aQName.EndReading(end); const char *colonPtr; - int result = MOZ_XMLCheckQName(NS_REINTERPRET_CAST(const char*, - aQName.get()), - NS_REINTERPRET_CAST(const char*, - end), + int result = MOZ_XMLCheckQName(reinterpret_cast + (aQName.get()), + reinterpret_cast + (end), PR_TRUE, &colonPtr); - *aColon = NS_REINTERPRET_CAST(const PRUnichar*, colonPtr); + *aColon = reinterpret_cast(colonPtr); return result == 0; #else nsIParserService* ps = nsContentUtils::GetParserService(); @@ -185,7 +185,7 @@ public: static PRBool isLetter(PRUnichar aChar) { #ifdef TX_EXE - return MOZ_XMLIsLetter(NS_REINTERPRET_CAST(const char*, &aChar)); + return MOZ_XMLIsLetter(reinterpret_cast(&aChar)); #else nsIParserService* ps = nsContentUtils::GetParserService(); return ps && ps->IsXMLLetter(aChar); @@ -198,7 +198,7 @@ public: static PRBool isNCNameChar(PRUnichar aChar) { #ifdef TX_EXE - return MOZ_XMLIsNCNameChar(NS_REINTERPRET_CAST(const char*, &aChar)); + return MOZ_XMLIsNCNameChar(reinterpret_cast(&aChar)); #else nsIParserService* ps = nsContentUtils::GetParserService(); return ps && ps->IsXMLNCNameChar(aChar); diff --git a/content/xslt/src/xpath/nsXPathResult.cpp b/content/xslt/src/xpath/nsXPathResult.cpp index b70dae3317ff..5444db5a0c92 100644 --- a/content/xslt/src/xpath/nsXPathResult.cpp +++ b/content/xslt/src/xpath/nsXPathResult.cpp @@ -125,7 +125,7 @@ nsXPathResult::GetSingleNodeValue(nsIDOMNode **aSingleNodeValue) return NS_ERROR_DOM_TYPE_ERR; } - txNodeSet *nodeSet = NS_STATIC_CAST(txNodeSet*, mResult.get()); + txNodeSet *nodeSet = static_cast(mResult.get()); if (nodeSet->size() > 0) { return txXPathNativeNode::getNode(nodeSet->get(0), aSingleNodeValue); } @@ -150,7 +150,7 @@ nsXPathResult::GetSnapshotLength(PRUint32 *aSnapshotLength) return NS_ERROR_DOM_TYPE_ERR; } - txNodeSet *nodeSet = NS_STATIC_CAST(txNodeSet*, mResult.get()); + txNodeSet *nodeSet = static_cast(mResult.get()); *aSnapshotLength = (PRUint32)nodeSet->size(); return NS_OK; @@ -171,7 +171,7 @@ nsXPathResult::IterateNext(nsIDOMNode **aResult) return NS_ERROR_DOM_INVALID_STATE_ERR; } - txNodeSet *nodeSet = NS_STATIC_CAST(txNodeSet*, mResult.get()); + txNodeSet *nodeSet = static_cast(mResult.get()); if (mCurrentPos < (PRUint32)nodeSet->size()) { return txXPathNativeNode::getNode(nodeSet->get(mCurrentPos++), aResult); @@ -189,7 +189,7 @@ nsXPathResult::SnapshotItem(PRUint32 aIndex, nsIDOMNode **aResult) return NS_ERROR_DOM_TYPE_ERR; } - txNodeSet *nodeSet = NS_STATIC_CAST(txNodeSet*, mResult.get()); + txNodeSet *nodeSet = static_cast(mResult.get()); if (aIndex < (PRUint32)nodeSet->size()) { return txXPathNativeNode::getNode(nodeSet->get(aIndex), aResult); } @@ -274,7 +274,7 @@ nsXPathResult::SetExprResult(txAExprResult* aExprResult, PRUint16 aResultType) mInvalidIteratorState = PR_FALSE; - txNodeSet* nodeSet = NS_STATIC_CAST(txNodeSet*, aExprResult); + txNodeSet* nodeSet = static_cast(aExprResult); nsCOMPtr node; if (nodeSet->size() > 0) { nsresult rv = txXPathNativeNode::getNode(nodeSet->get(0), @@ -360,8 +360,8 @@ txResultHolder::set(txAExprResult *aResult) if (mResult && mResult->getResultType() == txAExprResult::NODESET) { txNodeSet *nodeSet = - NS_STATIC_CAST(txNodeSet*, - NS_STATIC_CAST(txAExprResult*, mResult)); + static_cast + (static_cast(mResult)); PRInt32 i, count = nodeSet->size(); for (i = 0; i < count; ++i) { txXPathNativeNode::addRef(nodeSet->get(i)); @@ -374,8 +374,8 @@ txResultHolder::releaseNodeSet() { if (mResult && mResult->getResultType() == txAExprResult::NODESET) { txNodeSet *nodeSet = - NS_STATIC_CAST(txNodeSet*, - NS_STATIC_CAST(txAExprResult*, mResult)); + static_cast + (static_cast(mResult)); PRInt32 i, count = nodeSet->size(); for (i = 0; i < count; ++i) { txXPathNativeNode::release(nodeSet->get(i)); diff --git a/content/xslt/src/xpath/txCoreFunctionCall.cpp b/content/xslt/src/xpath/txCoreFunctionCall.cpp index e040a5aab2b5..f4d92bddf72d 100755 --- a/content/xslt/src/xpath/txCoreFunctionCall.cpp +++ b/content/xslt/src/xpath/txCoreFunctionCall.cpp @@ -134,9 +134,9 @@ txCoreFunctionCall::evaluate(txIEvalContext* aContext, txAExprResult** aResult) txXPathTreeWalker walker(aContext->getContextNode()); if (exprResult->getResultType() == txAExprResult::NODESET) { - txNodeSet* nodes = NS_STATIC_CAST(txNodeSet*, - NS_STATIC_CAST(txAExprResult*, - exprResult)); + txNodeSet* nodes = static_cast + (static_cast + (exprResult)); PRInt32 i; for (i = 0; i < nodes->size(); ++i) { nsAutoString idList; @@ -741,7 +741,7 @@ txCoreFunctionCall::getTypeFromAtom(nsIAtom* aName, eType& aType) PRUint32 i; for (i = 0; i < NS_ARRAY_LENGTH(descriptTable); ++i) { if (aName == *descriptTable[i].mName) { - aType = NS_STATIC_CAST(eType, i); + aType = static_cast(i); return PR_TRUE; } diff --git a/content/xslt/src/xpath/txExprParser.cpp b/content/xslt/src/xpath/txExprParser.cpp index 64de62311e10..36d91927f061 100644 --- a/content/xslt/src/xpath/txExprParser.cpp +++ b/content/xslt/src/xpath/txExprParser.cpp @@ -339,12 +339,12 @@ txExprParser::createExpr(txExprLexer& lexer, txIParseContext* aContext, short tokPrecedence = precedence(tok); if (tokPrecedence != 0) { while (!exprs.isEmpty() && tokPrecedence - <= precedence(NS_STATIC_CAST(Token*, ops.peek()))) { + <= precedence(static_cast(ops.peek()))) { // can't use expr as argument due to order of evaluation - nsAutoPtr left(NS_STATIC_CAST(Expr*, exprs.pop())); + nsAutoPtr left(static_cast(exprs.pop())); nsAutoPtr right(expr); rv = createBinaryExpr(left, right, - NS_STATIC_CAST(Token*, ops.pop()), + static_cast(ops.pop()), getter_Transfers(expr)); if (NS_FAILED(rv)) { done = PR_TRUE; @@ -361,14 +361,14 @@ txExprParser::createExpr(txExprLexer& lexer, txIParseContext* aContext, } while (NS_SUCCEEDED(rv) && !exprs.isEmpty()) { - nsAutoPtr left(NS_STATIC_CAST(Expr*, exprs.pop())); + nsAutoPtr left(static_cast(exprs.pop())); nsAutoPtr right(expr); - rv = createBinaryExpr(left, right, NS_STATIC_CAST(Token*, ops.pop()), + rv = createBinaryExpr(left, right, static_cast(ops.pop()), getter_Transfers(expr)); } // clean up on error while (!exprs.isEmpty()) { - delete NS_STATIC_CAST(Expr*, exprs.pop()); + delete static_cast(exprs.pop()); } NS_ENSURE_SUCCESS(rv, rv); @@ -716,7 +716,7 @@ txExprParser::createPathExpr(txExprLexer& lexer, txIParseContext* aContext, NS_ENSURE_TRUE(expr, NS_ERROR_OUT_OF_MEMORY); #ifdef TX_TO_STRING - NS_STATIC_CAST(RootExpr*, expr.get())->setSerialize(PR_FALSE); + static_cast(expr.get())->setSerialize(PR_FALSE); #endif } diff --git a/content/xslt/src/xpath/txFilterExpr.cpp b/content/xslt/src/xpath/txFilterExpr.cpp index 65d2fe2d9df3..0429997876c3 100644 --- a/content/xslt/src/xpath/txFilterExpr.cpp +++ b/content/xslt/src/xpath/txFilterExpr.cpp @@ -68,7 +68,7 @@ FilterExpr::evaluate(txIEvalContext* aContext, txAExprResult** aResult) NS_ERROR_XSLT_NODESET_EXPECTED); nsRefPtr nodes = - NS_STATIC_CAST(txNodeSet*, NS_STATIC_CAST(txAExprResult*, exprRes)); + static_cast(static_cast(exprRes)); // null out exprRes so that we can test for shared-ness exprRes = nsnull; diff --git a/content/xslt/src/xpath/txFunctionCall.cpp b/content/xslt/src/xpath/txFunctionCall.cpp index 4f2dec3c415f..f118a85cadd7 100644 --- a/content/xslt/src/xpath/txFunctionCall.cpp +++ b/content/xslt/src/xpath/txFunctionCall.cpp @@ -84,7 +84,7 @@ FunctionCall::evaluateToNodeSet(Expr* aExpr, txIEvalContext* aContext, } *aResult = - NS_STATIC_CAST(txNodeSet*, NS_STATIC_CAST(txAExprResult*, exprRes)); + static_cast(static_cast(exprRes)); NS_ADDREF(*aResult); return NS_OK; diff --git a/content/xslt/src/xpath/txLiteralExpr.cpp b/content/xslt/src/xpath/txLiteralExpr.cpp index d281d8a247ba..daf67f4002f3 100644 --- a/content/xslt/src/xpath/txLiteralExpr.cpp +++ b/content/xslt/src/xpath/txLiteralExpr.cpp @@ -109,8 +109,8 @@ txLiteralExpr::toString(nsAString& aStr) case txAExprResult::STRING: { StringResult* strRes = - NS_STATIC_CAST(StringResult*, NS_STATIC_CAST(txAExprResult*, - mValue)); + static_cast(static_cast + (mValue)); PRUnichar ch = '\''; if (strRes->mValue.FindChar(ch) != kNotFound) { ch = '\"'; diff --git a/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp b/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp index 17b58140521b..f953e8e9f834 100644 --- a/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp +++ b/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp @@ -126,7 +126,7 @@ txXPathTreeWalker::moveToElementById(const nsAString& aID) "root of subtree wasn't an nsIContent"); content = nsContentUtils::MatchElementId( - NS_STATIC_CAST(nsIContent*, rootNode), aID); + static_cast(rootNode), aID); } if (!content) { @@ -738,9 +738,9 @@ txXPathNodeUtils::comparePosition(const txXPathNode& aNode, PRInt32 i; parent = nsnull; for (i = 0; i <= lastIndex; ++i) { - node = NS_STATIC_CAST(nsINode*, parents.ElementAt(total - i)); - otherNode = NS_STATIC_CAST(nsINode*, - otherParents.ElementAt(otherTotal - i)); + node = static_cast(parents.ElementAt(total - i)); + otherNode = static_cast + (otherParents.ElementAt(otherTotal - i)); if (node != otherNode) { if (!parent) { // The two nodes are in different orphan subtrees. diff --git a/content/xslt/src/xpath/txNodeSet.cpp b/content/xslt/src/xpath/txNodeSet.cpp index 45cd1d1f47b9..382d5848899c 100644 --- a/content/xslt/src/xpath/txNodeSet.cpp +++ b/content/xslt/src/xpath/txNodeSet.cpp @@ -48,12 +48,12 @@ #ifdef NS_BUILD_REFCNT_LOGGING #define LOG_CHUNK_MOVE(_start, _new_start, _count) \ { \ - txXPathNode *start = NS_CONST_CAST(txXPathNode*, _start); \ + txXPathNode *start = const_cast(_start); \ while (start < _start + _count) { \ NS_LogDtor(start, "txXPathNode", sizeof(*start)); \ ++start; \ } \ - start = NS_CONST_CAST(txXPathNode*, _new_start); \ + start = const_cast(_new_start); \ while (start < _new_start + _count) { \ NS_LogCtor(start, "txXPathNode", sizeof(*start)); \ ++start; \ @@ -558,8 +558,8 @@ PRBool txNodeSet::ensureGrowSize(PRInt32 aSize) newLength *= kTxNodeSetGrowFactor; } - txXPathNode* newArr = NS_STATIC_CAST(txXPathNode*, - nsMemory::Alloc(newLength * + txXPathNode* newArr = static_cast + (nsMemory::Alloc(newLength * sizeof(txXPathNode))); if (!newArr) { return PR_FALSE; diff --git a/content/xslt/src/xpath/txPathExpr.cpp b/content/xslt/src/xpath/txPathExpr.cpp index 904363eed02b..ef7e13f45279 100644 --- a/content/xslt/src/xpath/txPathExpr.cpp +++ b/content/xslt/src/xpath/txPathExpr.cpp @@ -92,9 +92,9 @@ PathExpr::evaluate(txIEvalContext* aContext, txAExprResult** aResult) NS_ENSURE_TRUE(res->getResultType() == txAExprResult::NODESET, NS_ERROR_XSLT_NODESET_EXPECTED); - nsRefPtr nodes = NS_STATIC_CAST(txNodeSet*, - NS_STATIC_CAST(txAExprResult*, - res)); + nsRefPtr nodes = static_cast + (static_cast + (res)); if (nodes->isEmpty()) { res.swap(*aResult); @@ -129,9 +129,9 @@ PathExpr::evaluate(txIEvalContext* aContext, txAExprResult** aResult) //XXX ErrorReport: report nonnodeset error return NS_ERROR_XSLT_NODESET_EXPECTED; } - resNodes = NS_STATIC_CAST(txNodeSet*, - NS_STATIC_CAST(txAExprResult*, - res)); + resNodes = static_cast + (static_cast + (res)); } if (tmpNodes) { @@ -184,8 +184,8 @@ PathExpr::evalDescendants(Expr* aStep, const txXPathNode& aNode, return NS_ERROR_XSLT_NODESET_EXPECTED; } - txNodeSet* oldSet = NS_STATIC_CAST(txNodeSet*, - NS_STATIC_CAST(txAExprResult*, res)); + txNodeSet* oldSet = static_cast + (static_cast(res)); nsRefPtr newSet; rv = aContext->recycler()->getNonSharedNodeSet(oldSet, getter_AddRefs(newSet)); diff --git a/content/xslt/src/xpath/txRelationalExpr.cpp b/content/xslt/src/xpath/txRelationalExpr.cpp index a2a26dbcc269..8d5ba79d4674 100644 --- a/content/xslt/src/xpath/txRelationalExpr.cpp +++ b/content/xslt/src/xpath/txRelationalExpr.cpp @@ -60,7 +60,7 @@ RelationalExpr::compareResults(txIEvalContext* aContext, txAExprResult* aLeft, return compareResults(aContext, &leftBool, aRight); } - txNodeSet* nodeSet = NS_STATIC_CAST(txNodeSet*, aLeft); + txNodeSet* nodeSet = static_cast(aLeft); nsRefPtr strResult; rv = aContext->recycler()->getStringResult(getter_AddRefs(strResult)); NS_ENSURE_SUCCESS(rv, rv); @@ -85,7 +85,7 @@ RelationalExpr::compareResults(txIEvalContext* aContext, txAExprResult* aLeft, return compareResults(aContext, aLeft, &rightBool); } - txNodeSet* nodeSet = NS_STATIC_CAST(txNodeSet*, aRight); + txNodeSet* nodeSet = static_cast(aRight); nsRefPtr strResult; rv = aContext->recycler()->getStringResult(getter_AddRefs(strResult)); NS_ENSURE_SUCCESS(rv, rv); diff --git a/content/xslt/src/xpath/txResultRecycler.cpp b/content/xslt/src/xpath/txResultRecycler.cpp index dd88a650ebdf..f97d28a9f13f 100644 --- a/content/xslt/src/xpath/txResultRecycler.cpp +++ b/content/xslt/src/xpath/txResultRecycler.cpp @@ -51,15 +51,15 @@ txResultRecycler::~txResultRecycler() { txStackIterator stringIter(&mStringResults); while (stringIter.hasNext()) { - delete NS_STATIC_CAST(StringResult*, stringIter.next()); + delete static_cast(stringIter.next()); } txStackIterator nodesetIter(&mNodeSetResults); while (nodesetIter.hasNext()) { - delete NS_STATIC_CAST(txNodeSet*, nodesetIter.next()); + delete static_cast(nodesetIter.next()); } txStackIterator numberIter(&mNumberResults); while (numberIter.hasNext()) { - delete NS_STATIC_CAST(NumberResult*, numberIter.next()); + delete static_cast(numberIter.next()); } NS_IF_RELEASE(mEmptyStringResult); @@ -103,7 +103,7 @@ txResultRecycler::recycle(txAExprResult* aResult) switch (aResult->getResultType()) { case txAExprResult::STRING: { - rv = mStringResults.push(NS_STATIC_CAST(StringResult*, aResult)); + rv = mStringResults.push(static_cast(aResult)); if (NS_FAILED(rv)) { delete aResult; } @@ -111,7 +111,7 @@ txResultRecycler::recycle(txAExprResult* aResult) } case txAExprResult::NODESET: { - rv = mNodeSetResults.push(NS_STATIC_CAST(txNodeSet*, aResult)); + rv = mNodeSetResults.push(static_cast(aResult)); if (NS_FAILED(rv)) { delete aResult; } @@ -119,7 +119,7 @@ txResultRecycler::recycle(txAExprResult* aResult) } case txAExprResult::NUMBER: { - rv = mNumberResults.push(NS_STATIC_CAST(NumberResult*, aResult)); + rv = mNumberResults.push(static_cast(aResult)); if (NS_FAILED(rv)) { delete aResult; } @@ -140,7 +140,7 @@ txResultRecycler::getStringResult(StringResult** aResult) NS_ENSURE_TRUE(*aResult, NS_ERROR_OUT_OF_MEMORY); } else { - *aResult = NS_STATIC_CAST(StringResult*, mStringResults.pop()); + *aResult = static_cast(mStringResults.pop()); (*aResult)->mValue.Truncate(); (*aResult)->mRecycler = this; } @@ -159,7 +159,7 @@ txResultRecycler::getStringResult(const nsAString& aValue, } else { StringResult* strRes = - NS_STATIC_CAST(StringResult*, mStringResults.pop()); + static_cast(mStringResults.pop()); strRes->mValue = aValue; strRes->mRecycler = this; *aResult = strRes; @@ -184,7 +184,7 @@ txResultRecycler::getNodeSet(txNodeSet** aResult) NS_ENSURE_TRUE(*aResult, NS_ERROR_OUT_OF_MEMORY); } else { - *aResult = NS_STATIC_CAST(txNodeSet*, mNodeSetResults.pop()); + *aResult = static_cast(mNodeSetResults.pop()); (*aResult)->clear(); (*aResult)->mRecycler = this; } @@ -201,7 +201,7 @@ txResultRecycler::getNodeSet(txNodeSet* aNodeSet, txNodeSet** aResult) NS_ENSURE_TRUE(*aResult, NS_ERROR_OUT_OF_MEMORY); } else { - *aResult = NS_STATIC_CAST(txNodeSet*, mNodeSetResults.pop()); + *aResult = static_cast(mNodeSetResults.pop()); (*aResult)->clear(); (*aResult)->append(*aNodeSet); (*aResult)->mRecycler = this; @@ -219,7 +219,7 @@ txResultRecycler::getNodeSet(const txXPathNode& aNode, txAExprResult** aResult) NS_ENSURE_TRUE(*aResult, NS_ERROR_OUT_OF_MEMORY); } else { - txNodeSet* nodes = NS_STATIC_CAST(txNodeSet*, mNodeSetResults.pop()); + txNodeSet* nodes = static_cast(mNodeSetResults.pop()); nodes->clear(); nodes->append(aNode); nodes->mRecycler = this; @@ -238,7 +238,7 @@ txResultRecycler::getNodeSet(const txXPathNode& aNode, txNodeSet** aResult) NS_ENSURE_TRUE(*aResult, NS_ERROR_OUT_OF_MEMORY); } else { - *aResult = NS_STATIC_CAST(txNodeSet*, mNodeSetResults.pop()); + *aResult = static_cast(mNodeSetResults.pop()); (*aResult)->clear(); (*aResult)->append(aNode); (*aResult)->mRecycler = this; @@ -257,7 +257,7 @@ txResultRecycler::getNumberResult(double aValue, txAExprResult** aResult) } else { NumberResult* numRes = - NS_STATIC_CAST(NumberResult*, mNumberResults.pop()); + static_cast(mNumberResults.pop()); numRes->value = aValue; numRes->mRecycler = this; *aResult = numRes; diff --git a/content/xslt/src/xpath/txStandaloneXPathTreeWalker.cpp b/content/xslt/src/xpath/txStandaloneXPathTreeWalker.cpp index 449b9e649e3f..1b6e036e37cf 100644 --- a/content/xslt/src/xpath/txStandaloneXPathTreeWalker.cpp +++ b/content/xslt/src/xpath/txStandaloneXPathTreeWalker.cpp @@ -72,7 +72,7 @@ txXPathTreeWalker::moveToElementById(const nsAString& aID) { Document* document; if (INNER->nodeType == Node::DOCUMENT_NODE) { - document = NS_STATIC_CAST(Document*, INNER); + document = static_cast(INNER); } else { document = INNER->ownerDocument; @@ -96,7 +96,7 @@ txXPathTreeWalker::moveToFirstAttribute() return PR_FALSE; } - Element* element = NS_STATIC_CAST(Element*, INNER); + Element* element = static_cast(INNER); Attr *attribute = element->getFirstAttribute(); while (attribute) { if (attribute->getNamespaceID() != kNameSpaceID_XMLNS) { @@ -119,7 +119,7 @@ txXPathTreeWalker::moveToNextAttribute() return PR_FALSE; } - Element* element = NS_STATIC_CAST(Element*, INNER->getXPathParent()); + Element* element = static_cast(INNER->getXPathParent()); Attr *attribute = element->getFirstAttribute(); while (attribute != INNER) { attribute = attribute->getNextAttribute(); @@ -148,7 +148,7 @@ txXPathTreeWalker::moveToNamedAttribute(nsIAtom* aLocalName, PRInt32 aNSID) return PR_FALSE; } - Element* element = NS_STATIC_CAST(Element*, INNER); + Element* element = static_cast(INNER); NamedNodeMap* attrs = element->getAttributes(); NodeListDefinition::ListItem* item = attrs->firstItem; // find requested attribute @@ -162,7 +162,7 @@ txXPathTreeWalker::moveToNamedAttribute(nsIAtom* aLocalName, PRInt32 aNSID) return PR_FALSE; } - INNER = NS_STATIC_CAST(NodeDefinition*, item->node); + INNER = static_cast(item->node); return PR_TRUE; } @@ -218,7 +218,7 @@ PRBool txXPathTreeWalker::moveToParent() { if (INNER->nodeType == Node::ATTRIBUTE_NODE) { - INNER = NS_STATIC_CAST(NodeDefinition*, INNER->getXPathParent()); + INNER = static_cast(INNER->getXPathParent()); return PR_TRUE; } @@ -253,7 +253,7 @@ txXPathNodeUtils::getAttr(const txXPathNode& aNode, nsIAtom* aLocalName, return PR_FALSE; } - Element* elem = NS_STATIC_CAST(Element*, aNode.mInner); + Element* elem = static_cast(aNode.mInner); return elem->getAttr(aLocalName, aNSID, aValue); } @@ -310,8 +310,8 @@ txXPathNodeUtils::appendNodeValueHelper(NodeDefinition* aNode, nsAString& aResult) { - NodeDefinition* child = NS_STATIC_CAST(NodeDefinition*, - aNode->getFirstChild()); + NodeDefinition* child = static_cast + (aNode->getFirstChild()); while (child) { switch (child->getNodeType()) { case Node::TEXT_NODE: @@ -323,7 +323,7 @@ txXPathNodeUtils::appendNodeValueHelper(NodeDefinition* aNode, appendNodeValueHelper(child, aResult); } } - child = NS_STATIC_CAST(NodeDefinition*, child->getNextSibling()); + child = static_cast(child->getNextSibling()); } } @@ -417,7 +417,7 @@ txXPathNode* txXPathNativeNode::createXPathNode(Node* aNode) { if (aNode != nsnull) { - return new txXPathNode(NS_STATIC_CAST(NodeDefinition*, aNode)); + return new txXPathNode(static_cast(aNode)); } return nsnull; } @@ -430,7 +430,7 @@ txXPathNativeNode::getElement(const txXPathNode& aNode, Element** aResult) return NS_ERROR_FAILURE; } - *aResult = NS_STATIC_CAST(Element*, aNode.mInner); + *aResult = static_cast(aNode.mInner); return NS_OK; @@ -444,7 +444,7 @@ txXPathNativeNode::getDocument(const txXPathNode& aNode, Document** aResult) return NS_ERROR_FAILURE; } - *aResult = NS_STATIC_CAST(Document*, aNode.mInner); + *aResult = static_cast(aNode.mInner); return NS_OK; } diff --git a/content/xslt/src/xpath/txUnionExpr.cpp b/content/xslt/src/xpath/txUnionExpr.cpp index 93be071a4aaa..8a48c656d60b 100644 --- a/content/xslt/src/xpath/txUnionExpr.cpp +++ b/content/xslt/src/xpath/txUnionExpr.cpp @@ -75,8 +75,8 @@ UnionExpr::evaluate(txIEvalContext* aContext, txAExprResult** aResult) } nsRefPtr resultSet, ownedSet; - resultSet = NS_STATIC_CAST(txNodeSet*, - NS_STATIC_CAST(txAExprResult*, exprResult)); + resultSet = static_cast + (static_cast(exprResult)); exprResult = nsnull; rv = aContext->recycler()-> getNonSharedNodeSet(resultSet, getter_AddRefs(ownedSet)); diff --git a/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp b/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp index f2eb82b2dd33..3b24dddb3c68 100644 --- a/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp +++ b/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp @@ -342,7 +342,7 @@ txParamArrayHolder::~txParamArrayHolder() for (i = 0; i < mCount; ++i) { nsXPTCVariant &variant = mArray[i]; if (variant.IsValInterface()) { - NS_STATIC_CAST(nsISupports*, variant.val.p)->Release(); + static_cast(variant.val.p)->Release(); } else if (variant.IsValDOMString()) { delete (nsAString*)variant.val.p; @@ -532,8 +532,8 @@ txXPCOMExtensionFunctionCall::evaluate(txIEvalContext* aContext, switch (returnType) { case NODESET: { - txINodeSet *nodeSet = NS_STATIC_CAST(txINodeSet*, - returnParam.val.p); + txINodeSet *nodeSet = static_cast + (returnParam.val.p); NS_ADDREF(*aResult = nodeSet->GetTxNodeSet()); @@ -552,8 +552,8 @@ txXPCOMExtensionFunctionCall::evaluate(txIEvalContext* aContext, } case STRING: { - nsString *returned = NS_STATIC_CAST(nsString*, - returnParam.val.p); + nsString *returned = static_cast + (returnParam.val.p); return aContext->recycler()->getStringResult(*returned, aResult); } default: diff --git a/content/xslt/src/xpath/txXPathNode.h b/content/xslt/src/xpath/txXPathNode.h index 3c38de84c6f4..f6755b062d0c 100644 --- a/content/xslt/src/xpath/txXPathNode.h +++ b/content/xslt/src/xpath/txXPathNode.h @@ -131,12 +131,12 @@ private: nsIContent* Content() const { NS_ASSERTION(isContent() || isAttribute(), "wrong type"); - return NS_STATIC_CAST(nsIContent*, mNode); + return static_cast(mNode); } nsIDocument* Document() const { NS_ASSERTION(isDocument(), "wrong type"); - return NS_STATIC_CAST(nsIDocument*, mNode); + return static_cast(mNode); } enum PositionType diff --git a/content/xslt/src/xpath/txXPathOptimizer.cpp b/content/xslt/src/xpath/txXPathOptimizer.cpp index 707111285d07..9251fb7e85f0 100755 --- a/content/xslt/src/xpath/txXPathOptimizer.cpp +++ b/content/xslt/src/xpath/txXPathOptimizer.cpp @@ -83,7 +83,7 @@ public: // This will return an invalid node, but we should never // get here so that's fine. - return *NS_STATIC_CAST(txXPathNode*, nsnull); + return *static_cast(nsnull); } PRUint32 size() { @@ -167,14 +167,14 @@ txXPathOptimizer::optimize(Expr* aInExpr, Expr** aOutExpr) nsresult txXPathOptimizer::optimizeStep(Expr* aInExpr, Expr** aOutExpr) { - LocationStep* step = NS_STATIC_CAST(LocationStep*, aInExpr); + LocationStep* step = static_cast(aInExpr); if (step->getAxisIdentifier() == LocationStep::ATTRIBUTE_AXIS) { // Test for @foo type steps. txNameTest* nameTest = nsnull; if (!step->getSubExprAt(0) && step->getNodeTest()->getType() == txNameTest::NAME_TEST && - (nameTest = NS_STATIC_CAST(txNameTest*, step->getNodeTest()))-> + (nameTest = static_cast(step->getNodeTest()))-> mLocalName != txXPathAtoms::_asterix) { *aOutExpr = new txNamedAttributeStep(nameTest->mNamespace, @@ -204,7 +204,7 @@ txXPathOptimizer::optimizeStep(Expr* aInExpr, Expr** aOutExpr) nsresult txXPathOptimizer::optimizePath(Expr* aInExpr, Expr** aOutExpr) { - PathExpr* path = NS_STATIC_CAST(PathExpr*, aInExpr); + PathExpr* path = static_cast(aInExpr); PRUint32 i; Expr* subExpr; @@ -214,7 +214,7 @@ txXPathOptimizer::optimizePath(Expr* aInExpr, Expr** aOutExpr) if (path->getPathOpAt(i) == PathExpr::DESCENDANT_OP && subExpr->getType() == Expr::LOCATIONSTEP_EXPR && !subExpr->getSubExprAt(0)) { - LocationStep* step = NS_STATIC_CAST(LocationStep*, subExpr); + LocationStep* step = static_cast(subExpr); if (step->getAxisIdentifier() == LocationStep::CHILD_AXIS) { step->setAxisIdentifier(LocationStep::DESCENDANT_AXIS); path->setPathOpAt(i, PathExpr::RELATIVE_OP); @@ -232,13 +232,13 @@ txXPathOptimizer::optimizePath(Expr* aInExpr, Expr** aOutExpr) if (subExpr->getType() == Expr::LOCATIONSTEP_EXPR && path->getSubExprAt(1) && path->getPathOpAt(1) != PathExpr::DESCENDANT_OP) { - step = NS_STATIC_CAST(LocationStep*, subExpr); + step = static_cast(subExpr); if (step->getAxisIdentifier() == LocationStep::SELF_AXIS && !step->getSubExprAt(0)) { txNodeTest* test = step->getNodeTest(); txNodeTypeTest* typeTest; if (test->getType() == txNodeTest::NODETYPE_TEST && - (typeTest = NS_STATIC_CAST(txNodeTypeTest*, test))-> + (typeTest = static_cast(test))-> getNodeTestType() == txNodeTypeTest::NODE_TYPE) { // We have a '.' as first step followed by a single '/'. @@ -263,7 +263,7 @@ txXPathOptimizer::optimizePath(Expr* aInExpr, Expr** aOutExpr) nsresult txXPathOptimizer::optimizeUnion(Expr* aInExpr, Expr** aOutExpr) { - UnionExpr* uni = NS_STATIC_CAST(UnionExpr*, aInExpr); + UnionExpr* uni = static_cast(aInExpr); // Check for expressions like "foo | bar" and // "descendant::foo | descendant::bar" @@ -277,7 +277,7 @@ txXPathOptimizer::optimizeUnion(Expr* aInExpr, Expr** aOutExpr) continue; } - LocationStep* currentStep = NS_STATIC_CAST(LocationStep*, subExpr); + LocationStep* currentStep = static_cast(subExpr); LocationStep::LocationStepType axis = currentStep->getAxisIdentifier(); txUnionNodeTest* unionTest = nsnull; @@ -291,7 +291,7 @@ txXPathOptimizer::optimizeUnion(Expr* aInExpr, Expr** aOutExpr) continue; } - LocationStep* step = NS_STATIC_CAST(LocationStep*, subExpr); + LocationStep* step = static_cast(subExpr); if (step->getAxisIdentifier() != axis) { continue; } diff --git a/content/xslt/src/xslt/txBufferingHandler.cpp b/content/xslt/src/xslt/txBufferingHandler.cpp index 3627e6f53553..6ea2178eea2d 100644 --- a/content/xslt/src/xslt/txBufferingHandler.cpp +++ b/content/xslt/src/xslt/txBufferingHandler.cpp @@ -236,7 +236,7 @@ txBufferingHandler::characters(const nsSubstring& aData, PRBool aDOE) txOutputTransaction* transaction = mBuffer->getLastTransaction(); if (transaction && transaction->mType == type) { mBuffer->mStringValue.Append(aData); - NS_STATIC_CAST(txCharacterTransaction*, transaction)->mLength += + static_cast(transaction)->mLength += aData.Length(); return NS_OK; } @@ -350,7 +350,7 @@ txBufferingHandler::startElement(nsIAtom* aPrefix, PR_STATIC_CALLBACK(PRBool) deleteTransaction(void* aElement, void *aData) { - delete NS_STATIC_CAST(txOutputTransaction*, aElement); + delete static_cast(aElement); return PR_TRUE; } @@ -378,17 +378,17 @@ struct Holder PR_STATIC_CALLBACK(PRBool) flushTransaction(void* aElement, void *aData) { - Holder* holder = NS_STATIC_CAST(Holder*, aData); + Holder* holder = static_cast(aData); txAXMLEventHandler* handler = *holder->mHandler; txOutputTransaction* transaction = - NS_STATIC_CAST(txOutputTransaction*, aElement); + static_cast(aElement); nsresult rv; switch (transaction->mType) { case txOutputTransaction::eAttributeAtomTransaction: { txAttributeAtomTransaction* transaction = - NS_STATIC_CAST(txAttributeAtomTransaction*, aElement); + static_cast(aElement); rv = handler->attribute(transaction->mPrefix, transaction->mLocalName, transaction->mLowercaseLocalName, @@ -399,7 +399,7 @@ flushTransaction(void* aElement, void *aData) case txOutputTransaction::eAttributeTransaction: { txAttributeTransaction* attrTransaction = - NS_STATIC_CAST(txAttributeTransaction*, aElement); + static_cast(aElement); rv = handler->attribute(attrTransaction->mPrefix, attrTransaction->mLocalName, attrTransaction->mNsID, @@ -410,7 +410,7 @@ flushTransaction(void* aElement, void *aData) case txOutputTransaction::eCharacterNoOETransaction: { txCharacterTransaction* charTransaction = - NS_STATIC_CAST(txCharacterTransaction*, aElement); + static_cast(aElement); nsAFlatString::const_char_iterator& start = holder->mIter; nsAFlatString::const_char_iterator end = @@ -424,7 +424,7 @@ flushTransaction(void* aElement, void *aData) case txOutputTransaction::eCommentTransaction: { txCommentTransaction* commentTransaction = - NS_STATIC_CAST(txCommentTransaction*, aElement); + static_cast(aElement); rv = handler->comment(commentTransaction->mValue); break; } @@ -436,7 +436,7 @@ flushTransaction(void* aElement, void *aData) case txOutputTransaction::ePITransaction: { txPITransaction* piTransaction = - NS_STATIC_CAST(txPITransaction*, aElement); + static_cast(aElement); rv = handler->processingInstruction(piTransaction->mTarget, piTransaction->mData); break; @@ -449,7 +449,7 @@ flushTransaction(void* aElement, void *aData) case txOutputTransaction::eStartElementAtomTransaction: { txStartElementAtomTransaction* transaction = - NS_STATIC_CAST(txStartElementAtomTransaction*, aElement); + static_cast(aElement); rv = handler->startElement(transaction->mPrefix, transaction->mLocalName, transaction->mLowercaseLocalName, @@ -459,7 +459,7 @@ flushTransaction(void* aElement, void *aData) case txOutputTransaction::eStartElementTransaction: { txStartElementTransaction* transaction = - NS_STATIC_CAST(txStartElementTransaction*, aElement); + static_cast(aElement); rv = handler->startElement(transaction->mPrefix, transaction->mLocalName, transaction->mNsID); @@ -490,5 +490,5 @@ txResultBuffer::getLastTransaction() if (last < 0) { return nsnull; } - return NS_STATIC_CAST(txOutputTransaction*, mTransactions[last]); + return static_cast(mTransactions[last]); } diff --git a/content/xslt/src/xslt/txCurrentFunctionCall.cpp b/content/xslt/src/xslt/txCurrentFunctionCall.cpp index 7aa74ca7e840..f03af5b63f83 100644 --- a/content/xslt/src/xslt/txCurrentFunctionCall.cpp +++ b/content/xslt/src/xslt/txCurrentFunctionCall.cpp @@ -28,7 +28,7 @@ CurrentFunctionCall::evaluate(txIEvalContext* aContext, txAExprResult** aResult) return NS_ERROR_XPATH_BAD_ARGUMENT_COUNT; txExecutionState* es = - NS_STATIC_CAST(txExecutionState*, aContext->getPrivateContext()); + static_cast(aContext->getPrivateContext()); if (!es) { NS_ASSERTION(0, "called xslt extension function \"current\" with wrong context"); diff --git a/content/xslt/src/xslt/txDocumentFunctionCall.cpp b/content/xslt/src/xslt/txDocumentFunctionCall.cpp index 900499798b60..4d2fc05bc237 100644 --- a/content/xslt/src/xslt/txDocumentFunctionCall.cpp +++ b/content/xslt/src/xslt/txDocumentFunctionCall.cpp @@ -105,7 +105,7 @@ DocumentFunctionCall::evaluate(txIEvalContext* aContext, { *aResult = nsnull; txExecutionState* es = - NS_STATIC_CAST(txExecutionState*, aContext->getPrivateContext()); + static_cast(aContext->getPrivateContext()); nsRefPtr nodeSet; nsresult rv = aContext->recycler()->getNodeSet(getter_AddRefs(nodeSet)); @@ -143,9 +143,9 @@ DocumentFunctionCall::evaluate(txIEvalContext* aContext, if (exprResult1->getResultType() == txAExprResult::NODESET) { // The first argument is a NodeSet, iterate on its nodes - txNodeSet* nodeSet1 = NS_STATIC_CAST(txNodeSet*, - NS_STATIC_CAST(txAExprResult*, - exprResult1)); + txNodeSet* nodeSet1 = static_cast + (static_cast + (exprResult1)); PRInt32 i; for (i = 0; i < nodeSet1->size(); ++i) { const txXPathNode& node = nodeSet1->get(i); diff --git a/content/xslt/src/xslt/txEXSLTFunctions.cpp b/content/xslt/src/xslt/txEXSLTFunctions.cpp index 6623dfc55364..6cacbf47a507 100644 --- a/content/xslt/src/xslt/txEXSLTFunctions.cpp +++ b/content/xslt/src/xslt/txEXSLTFunctions.cpp @@ -67,7 +67,7 @@ static nsresult convertRtfToNode(txIEvalContext *aContext, txResultTreeFragment *aRtf) { txExecutionState* es = - NS_STATIC_CAST(txExecutionState*, aContext->getPrivateContext()); + static_cast(aContext->getPrivateContext()); if (!es) { NS_ERROR("Need txExecutionState!"); @@ -110,7 +110,7 @@ createTextNode(txIEvalContext *aContext, nsString& aValue, txXPathNode* *aResult) { txExecutionState* es = - NS_STATIC_CAST(txExecutionState*, aContext->getPrivateContext()); + static_cast(aContext->getPrivateContext()); if (!es) { NS_ERROR("Need txExecutionState!"); @@ -139,7 +139,7 @@ static nsresult createDocFragment(txIEvalContext *aContext, nsIContent** aResult) { txExecutionState* es = - NS_STATIC_CAST(txExecutionState*, aContext->getPrivateContext()); + static_cast(aContext->getPrivateContext()); if (!es) { NS_ERROR("Need txExecutionState!"); @@ -310,8 +310,8 @@ txEXSLTFunctionCall::evaluate(txIEvalContext *aContext, if (exprResult->getResultType() == txAExprResult::RESULT_TREE_FRAGMENT) { txResultTreeFragment *rtf = - NS_STATIC_CAST(txResultTreeFragment*, - exprResult.get()); + static_cast + (exprResult.get()); const txXPathNode *node = rtf->getNode(); if (!node) { @@ -725,7 +725,7 @@ TX_ConstructEXSLTFunction(nsIAtom *aName, txEXSLTFunctionDescriptor& desc = descriptTable[i]; if (aName == *desc.mName && aNamespaceID == desc.mNamespaceID) { *aResult = new txEXSLTFunctionCall( - NS_STATIC_CAST(txEXSLTFunctionCall::eType, i)); + static_cast(i)); return *aResult ? NS_OK : NS_ERROR_OUT_OF_MEMORY; } diff --git a/content/xslt/src/xslt/txInstructions.cpp b/content/xslt/src/xslt/txInstructions.cpp index 6aaa73c1b337..2bfe93cdf0a6 100644 --- a/content/xslt/src/xslt/txInstructions.cpp +++ b/content/xslt/src/xslt/txInstructions.cpp @@ -166,7 +166,7 @@ txAttribute::execute(txExecutionState& aEs) } nsAutoPtr handler( - NS_STATIC_CAST(txTextHandler*, aEs.popResultHandler())); + static_cast(aEs.popResultHandler())); // add attribute if everything was ok return nsId != kNameSpaceID_Unknown ? @@ -240,7 +240,7 @@ nsresult txComment::execute(txExecutionState& aEs) { nsAutoPtr handler( - NS_STATIC_CAST(txTextHandler*, aEs.popResultHandler())); + static_cast(aEs.popResultHandler())); PRUint32 length = handler->mValue.Length(); PRInt32 pos = 0; while ((pos = handler->mValue.FindChar('-', (PRUint32)pos)) != kNotFound) { @@ -417,9 +417,9 @@ txCopyOf::execute(txExecutionState& aEs) switch (exprRes->getResultType()) { case txAExprResult::NODESET: { - txNodeSet* nodes = NS_STATIC_CAST(txNodeSet*, - NS_STATIC_CAST(txAExprResult*, - exprRes)); + txNodeSet* nodes = static_cast + (static_cast + (exprRes)); PRInt32 i; for (i = 0; i < nodes->size(); ++i) { rv = copyNode(nodes->get(i), aEs); @@ -430,8 +430,8 @@ txCopyOf::execute(txExecutionState& aEs) case txAExprResult::RESULT_TREE_FRAGMENT: { txResultTreeFragment* rtf = - NS_STATIC_CAST(txResultTreeFragment*, - NS_STATIC_CAST(txAExprResult*, exprRes)); + static_cast + (static_cast(exprRes)); return rtf->flushToHandler(&aEs.mResultHandler); } default: @@ -508,7 +508,7 @@ txLoopNodeSet::execute(txExecutionState& aEs) { aEs.popTemplateRule(); txNodeSetContext* context = - NS_STATIC_CAST(txNodeSetContext*, aEs.getEvalContext()); + static_cast(aEs.getEvalContext()); if (!context->hasNext()) { delete aEs.popEvalContext(); @@ -564,7 +564,7 @@ nsresult txMessage::execute(txExecutionState& aEs) { nsAutoPtr handler( - NS_STATIC_CAST(txTextHandler*, aEs.popResultHandler())); + static_cast(aEs.popResultHandler())); nsCOMPtr consoleSvc = do_GetService("@mozilla.org/consoleservice;1"); @@ -617,7 +617,7 @@ nsresult txProcessingInstruction::execute(txExecutionState& aEs) { nsAutoPtr handler( - NS_STATIC_CAST(txTextHandler*, aEs.popResultHandler())); + static_cast(aEs.popResultHandler())); XMLUtils::normalizePIValue(handler->mValue); nsAutoString name; @@ -645,7 +645,7 @@ txPushNewContext::~txPushNewContext() PRInt32 i; for (i = 0; i < mSortKeys.Count(); ++i) { - delete NS_STATIC_CAST(SortKey*, mSortKeys[i]); + delete static_cast(mSortKeys[i]); } } @@ -662,9 +662,9 @@ txPushNewContext::execute(txExecutionState& aEs) return NS_ERROR_XSLT_NODESET_EXPECTED; } - txNodeSet* nodes = NS_STATIC_CAST(txNodeSet*, - NS_STATIC_CAST(txAExprResult*, - exprRes)); + txNodeSet* nodes = static_cast + (static_cast + (exprRes)); if (nodes->isEmpty()) { aEs.gotoInstruction(mBailTarget); @@ -675,7 +675,7 @@ txPushNewContext::execute(txExecutionState& aEs) txNodeSorter sorter; PRInt32 i, count = mSortKeys.Count(); for (i = 0; i < count; ++i) { - SortKey* sort = NS_STATIC_CAST(SortKey*, mSortKeys[i]); + SortKey* sort = static_cast(mSortKeys[i]); rv = sorter.addSortElement(sort->mSelectExpr, sort->mLangExpr, sort->mDataTypeExpr, sort->mOrderExpr, sort->mCaseOrderExpr, @@ -821,7 +821,7 @@ txSetParam::execute(txExecutionState& aEs) } else { nsAutoPtr rtfHandler( - NS_STATIC_CAST(txRtfHandler*, aEs.popResultHandler())); + static_cast(aEs.popResultHandler())); rv = rtfHandler->getAsRTF(getter_AddRefs(exprRes)); NS_ENSURE_SUCCESS(rv, rv); } @@ -849,7 +849,7 @@ txSetVariable::execute(txExecutionState& aEs) } else { nsAutoPtr rtfHandler( - NS_STATIC_CAST(txRtfHandler*, aEs.popResultHandler())); + static_cast(aEs.popResultHandler())); rv = rtfHandler->getAsRTF(getter_AddRefs(exprRes)); NS_ENSURE_SUCCESS(rv, rv); } diff --git a/content/xslt/src/xslt/txKey.h b/content/xslt/src/xslt/txKey.h index 51869d3011a1..9efbbdb80f52 100644 --- a/content/xslt/src/xslt/txKey.h +++ b/content/xslt/src/xslt/txKey.h @@ -69,7 +69,7 @@ public: struct txKeyValueHashEntry : public PLDHashEntryHdr { txKeyValueHashEntry(const void* aKey) - : mKey(*NS_STATIC_CAST(const txKeyValueHashKey*, aKey)), + : mKey(*static_cast(aKey)), mNodeSet(new txNodeSet(nsnull)) { } @@ -101,7 +101,7 @@ public: struct txIndexedKeyHashEntry : public PLDHashEntryHdr { txIndexedKeyHashEntry(const void* aKey) - : mKey(*NS_STATIC_CAST(const txIndexedKeyHashKey*, aKey)), + : mKey(*static_cast(aKey)), mIndexed(PR_FALSE) { } diff --git a/content/xslt/src/xslt/txKeyFunctionCall.cpp b/content/xslt/src/xslt/txKeyFunctionCall.cpp index 2116a2ceb8c9..e1531a7ee3c7 100644 --- a/content/xslt/src/xslt/txKeyFunctionCall.cpp +++ b/content/xslt/src/xslt/txKeyFunctionCall.cpp @@ -73,7 +73,7 @@ txKeyFunctionCall::evaluate(txIEvalContext* aContext, txAExprResult** aResult) return NS_ERROR_XPATH_BAD_ARGUMENT_COUNT; txExecutionState* es = - NS_STATIC_CAST(txExecutionState*, aContext->getPrivateContext()); + static_cast(aContext->getPrivateContext()); nsAutoString keyQName; nsresult rv = mParams[0]->evaluateToString(aContext, keyQName); @@ -93,9 +93,9 @@ txKeyFunctionCall::evaluate(txIEvalContext* aContext, txAExprResult** aResult) nsRefPtr res; txNodeSet* nodeSet; if (exprResult->getResultType() == txAExprResult::NODESET && - (nodeSet = NS_STATIC_CAST(txNodeSet*, - NS_STATIC_CAST(txAExprResult*, - exprResult)))->size() > 1) { + (nodeSet = static_cast + (static_cast + (exprResult)))->size() > 1) { rv = aContext->recycler()->getNodeSet(getter_AddRefs(res)); NS_ENSURE_SUCCESS(rv, rv); @@ -159,7 +159,7 @@ PRBool txKeyValueHashEntry::MatchEntry(const void* aKey) const { const txKeyValueHashKey* key = - NS_STATIC_CAST(const txKeyValueHashKey*, aKey); + static_cast(aKey); return mKey.mKeyName == key->mKeyName && mKey.mRootIdentifier == key->mRootIdentifier && @@ -170,7 +170,7 @@ PLDHashNumber txKeyValueHashEntry::HashKey(const void* aKey) { const txKeyValueHashKey* key = - NS_STATIC_CAST(const txKeyValueHashKey*, aKey); + static_cast(aKey); return key->mKeyName.mNamespaceID ^ NS_PTR_TO_INT32(key->mKeyName.mLocalName.get()) ^ @@ -182,7 +182,7 @@ PRBool txIndexedKeyHashEntry::MatchEntry(const void* aKey) const { const txIndexedKeyHashKey* key = - NS_STATIC_CAST(const txIndexedKeyHashKey*, aKey); + static_cast(aKey); return mKey.mKeyName == key->mKeyName && mKey.mRootIdentifier == key->mRootIdentifier; @@ -192,7 +192,7 @@ PLDHashNumber txIndexedKeyHashEntry::HashKey(const void* aKey) { const txIndexedKeyHashKey* key = - NS_STATIC_CAST(const txIndexedKeyHashKey*, aKey); + static_cast(aKey); return key->mKeyName.mNamespaceID ^ NS_PTR_TO_INT32(key->mKeyName.mLocalName.get()) ^ @@ -400,9 +400,9 @@ nsresult txXSLKey::testNode(const txXPathNode& aNode, aEs.popEvalContext(); if (exprResult->getResultType() == txAExprResult::NODESET) { - txNodeSet* res = NS_STATIC_CAST(txNodeSet*, - NS_STATIC_CAST(txAExprResult*, - exprResult)); + txNodeSet* res = static_cast + (static_cast + (exprResult)); PRInt32 i; for (i = 0; i < res->size(); ++i) { val.Truncate(); diff --git a/content/xslt/src/xslt/txMozillaXMLOutput.cpp b/content/xslt/src/xslt/txMozillaXMLOutput.cpp index 488d968834ed..44fedd15e128 100644 --- a/content/xslt/src/xslt/txMozillaXMLOutput.cpp +++ b/content/xslt/src/xslt/txMozillaXMLOutput.cpp @@ -315,9 +315,9 @@ txMozillaXMLOutput::endElement() NS_ENSURE_TRUE(mCurrentNode->IsNodeOfType(nsINode::eELEMENT), NS_ERROR_UNEXPECTED); - nsIContent* element = NS_STATIC_CAST(nsIContent*, - NS_STATIC_CAST(nsINode*, - mCurrentNode)); + nsIContent* element = static_cast + (static_cast + (mCurrentNode)); // Handle html-elements if (!mNoFixup) { @@ -386,7 +386,7 @@ txMozillaXMLOutput::endElement() mCurrentNode = parent; mTableState = - NS_STATIC_CAST(TableState, NS_PTR_TO_INT32(mTableStateStack.pop())); + static_cast(NS_PTR_TO_INT32(mTableStateStack.pop())); return NS_OK; } @@ -779,8 +779,8 @@ txMozillaXMLOutput::endHTMLElement(nsIContent* aElement) mCurrentNode = mCurrentNodeStack.SafeObjectAt(last); mCurrentNodeStack.RemoveObjectAt(last); - mTableState = NS_STATIC_CAST(TableState, - NS_PTR_TO_INT32(mTableStateStack.pop())); + mTableState = static_cast + (NS_PTR_TO_INT32(mTableStateStack.pop())); return NS_OK; } diff --git a/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp b/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp index 905ae477d488..9bdd49f638dc 100644 --- a/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp +++ b/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp @@ -515,7 +515,7 @@ txMozillaXSLTProcessor::AddXSLTParam(const nsString& aName, NS_ENSURE_SUCCESS(rv, rv); txExpandedName varName(nsId, name); - txVariable* var = NS_STATIC_CAST(txVariable*, mVariables.get(varName)); + txVariable* var = static_cast(mVariables.get(varName)); if (var) { var->setValue(value); @@ -678,7 +678,7 @@ txMozillaXSLTProcessor::TransformToDoc(nsIDOMDocument *aOutputDoc, if (NS_SUCCEEDED(rv)) { if (aResult) { txAOutputXMLEventHandler* handler = - NS_STATIC_CAST(txAOutputXMLEventHandler*, es.mOutputHandler); + static_cast(es.mOutputHandler); handler->getOutputDocument(aResult); } } @@ -802,8 +802,8 @@ txMozillaXSLTProcessor::SetParameter(const nsAString & aNamespaceURI, if (result->getResultType() == txAExprResult::NODESET) { txNodeSet *nodeSet = - NS_STATIC_CAST(txNodeSet*, - NS_STATIC_CAST(txAExprResult*, result)); + static_cast + (static_cast(result)); nsCOMPtr node; PRInt32 i, count = nodeSet->size(); @@ -882,7 +882,7 @@ txMozillaXSLTProcessor::SetParameter(const nsAString & aNamespaceURI, return NS_ERROR_ILLEGAL_VALUE; } - nsISupports** values = NS_STATIC_CAST(nsISupports**, array); + nsISupports** values = static_cast(array); PRUint32 i; for (i = 0; i < count; ++i) { @@ -929,7 +929,7 @@ txMozillaXSLTProcessor::SetParameter(const nsAString & aNamespaceURI, nsCOMPtr localName = do_GetAtom(aLocalName); txExpandedName varName(nsId, localName); - txVariable* var = NS_STATIC_CAST(txVariable*, mVariables.get(varName)); + txVariable* var = static_cast(mVariables.get(varName)); if (var) { var->setValue(value); return NS_OK; @@ -953,7 +953,7 @@ txMozillaXSLTProcessor::GetParameter(const nsAString& aNamespaceURI, nsCOMPtr localName = do_GetAtom(aLocalName); txExpandedName varName(nsId, localName); - txVariable* var = NS_STATIC_CAST(txVariable*, mVariables.get(varName)); + txVariable* var = static_cast(mVariables.get(varName)); if (var) { return var->getValue(aResult); } @@ -1429,8 +1429,8 @@ txVariable::Convert(nsIVariant *aValue, txAExprResult** aResult) NS_ENSURE_TRUE(str, NS_ERROR_FAILURE); const PRUnichar *strChars = - NS_REINTERPRET_CAST(const PRUnichar*, - ::JS_GetStringChars(str)); + reinterpret_cast + (::JS_GetStringChars(str)); nsDependentString value(strChars, ::JS_GetStringLength(str)); *aResult = new StringResult(value, nsnull); @@ -1459,7 +1459,7 @@ txVariable::Convert(nsIVariant *aValue, txAExprResult** aResult) type == nsIDataType::VTYPE_INTERFACE_IS, "Huh, we checked this in SetParameter?"); - nsISupports** values = NS_STATIC_CAST(nsISupports**, array); + nsISupports** values = static_cast(array); nsRefPtr nodeSet = new txNodeSet(nsnull); if (!nodeSet) { diff --git a/content/xslt/src/xslt/txNodeSorter.cpp b/content/xslt/src/xslt/txNodeSorter.cpp index 2ea5cf457519..8f52a2d8a020 100644 --- a/content/xslt/src/xslt/txNodeSorter.cpp +++ b/content/xslt/src/xslt/txNodeSorter.cpp @@ -177,12 +177,12 @@ txNodeSorter::sortNodeSet(txNodeSet* aNodes, txExecutionState* aEs, NS_ENSURE_SUCCESS(rv, rv); // Create and set up memoryblock for sort-values and indexarray - PRUint32 len = NS_STATIC_CAST(PRUint32, aNodes->size()); + PRUint32 len = static_cast(aNodes->size()); void* mem = PR_Malloc(len * (sizeof(PRUint32) + mNKeys * sizeof(TxObject*))); NS_ENSURE_TRUE(mem, NS_ERROR_OUT_OF_MEMORY); - PRUint32* indexes = NS_STATIC_CAST(PRUint32*, mem); - TxObject** sortValues = NS_REINTERPRET_CAST(TxObject**, indexes + len); + PRUint32* indexes = static_cast(mem); + TxObject** sortValues = reinterpret_cast(indexes + len); PRUint32 i; for (i = 0; i < len; ++i) { @@ -234,12 +234,12 @@ int txNodeSorter::compareNodes(const void* aIndexA, const void* aIndexB, void* aSortData) { - SortData* sortData = NS_STATIC_CAST(SortData*, aSortData); + SortData* sortData = static_cast(aSortData); NS_ENSURE_SUCCESS(sortData->mRv, -1); txListIterator iter(&sortData->mNodeSorter->mSortKeys); - PRUint32 indexA = *NS_STATIC_CAST(const PRUint32*, aIndexA); - PRUint32 indexB = *NS_STATIC_CAST(const PRUint32*, aIndexB); + PRUint32 indexA = *static_cast(aIndexA); + PRUint32 indexB = *static_cast(aIndexB); TxObject** sortValuesA = sortData->mSortValues + indexA * sortData->mNodeSorter->mNKeys; TxObject** sortValuesB = sortData->mSortValues + diff --git a/content/xslt/src/xslt/txPatternOptimizer.cpp b/content/xslt/src/xslt/txPatternOptimizer.cpp index 6cbc496b6d15..584880f7dfac 100755 --- a/content/xslt/src/xslt/txPatternOptimizer.cpp +++ b/content/xslt/src/xslt/txPatternOptimizer.cpp @@ -92,7 +92,7 @@ nsresult txPatternOptimizer::optimizeStep(txPattern* aInPattern, txPattern** aOutPattern) { - txStepPattern* step = NS_STATIC_CAST(txStepPattern*, aInPattern); + txStepPattern* step = static_cast(aInPattern); // Test for predicates that can be combined into the nodetest Expr* pred; diff --git a/content/xslt/src/xslt/txStandaloneStylesheetCompiler.cpp b/content/xslt/src/xslt/txStandaloneStylesheetCompiler.cpp index 5b75f3df8558..f5b90e8a10ea 100644 --- a/content/xslt/src/xslt/txStandaloneStylesheetCompiler.cpp +++ b/content/xslt/src/xslt/txStandaloneStylesheetCompiler.cpp @@ -117,7 +117,7 @@ TX_CompileStylesheetPath(const txParsedURL& aURL, txStylesheet** aResult) */ // shortcut macro for redirection into txDriver method calls -#define TX_DRIVER(_userData) NS_STATIC_CAST(txDriver*, _userData) +#define TX_DRIVER(_userData) static_cast(_userData) PR_STATIC_CALLBACK(void) startElement(void *aUserData, const XML_Char *aName, const XML_Char **aAtts) @@ -243,8 +243,8 @@ txDriver::StartElement(const XML_Char *aName, const XML_Char **aAtts) } PRInt32 idOffset = XML_GetIdAttributeIndex(mExpatParser); nsresult rv = - mCompiler->startElement(NS_STATIC_CAST(const PRUnichar*, aName), - NS_STATIC_CAST(const PRUnichar**, aAtts), + mCompiler->startElement(static_cast(aName), + static_cast(aAtts), attcount/2, idOffset); if (NS_FAILED(rv)) { PR_LOG(txLog::xslt, PR_LOG_ALWAYS, @@ -266,7 +266,7 @@ txDriver::EndElement(const XML_Char* aName) void txDriver::CharacterData(const XML_Char* aChars, int aLength) { - const PRUnichar* pChars = NS_STATIC_CAST(const PRUnichar*, aChars); + const PRUnichar* pChars = static_cast(aChars); // ignore rv, as this expat handler returns void nsresult rv = mCompiler->characters(Substring(pChars, pChars + aLength)); if (NS_FAILED(rv)) { diff --git a/content/xslt/src/xslt/txStylesheet.cpp b/content/xslt/src/xslt/txStylesheet.cpp index c4ff582ea832..a5809670c260 100644 --- a/content/xslt/src/xslt/txStylesheet.cpp +++ b/content/xslt/src/xslt/txStylesheet.cpp @@ -118,12 +118,12 @@ txStylesheet::~txStylesheet() delete mRootFrame; txListIterator frameIter(&mImportFrames); while (frameIter.hasNext()) { - delete NS_STATIC_CAST(ImportFrame*, frameIter.next()); + delete static_cast(frameIter.next()); } txListIterator instrIter(&mTemplateInstructions); while (instrIter.hasNext()) { - delete NS_STATIC_CAST(txInstruction*, instrIter.next()); + delete static_cast(instrIter.next()); } // We can't make the map own its values because then we wouldn't be able @@ -149,9 +149,9 @@ txStylesheet::findTemplate(const txXPathNode& aNode, txListIterator frameIter(&mImportFrames); if (aImportedBy) { - ImportFrame* curr = NS_STATIC_CAST(ImportFrame*, frameIter.next()); + ImportFrame* curr = static_cast(frameIter.next()); while (curr != aImportedBy) { - curr = NS_STATIC_CAST(ImportFrame*, frameIter.next()); + curr = static_cast(frameIter.next()); } endFrame = aImportedBy->mFirstNotImported; } @@ -162,7 +162,7 @@ txStylesheet::findTemplate(const txXPathNode& aNode, ImportFrame* frame; while (!matchTemplate && - (frame = NS_STATIC_CAST(ImportFrame*, frameIter.next())) && + (frame = static_cast(frameIter.next())) && frame != endFrame) { // get templatelist for this mode @@ -316,18 +316,18 @@ txStylesheet::doneCompiling() // all items frameIter.reset(); ImportFrame* frame; - while ((frame = NS_STATIC_CAST(ImportFrame*, frameIter.next()))) { + while ((frame = static_cast(frameIter.next()))) { nsTPtrArray frameStripSpaceTests; txListIterator itemIter(&frame->mToplevelItems); itemIter.resetToEnd(); txToplevelItem* item; - while ((item = NS_STATIC_CAST(txToplevelItem*, itemIter.previous()))) { + while ((item = static_cast(itemIter.previous()))) { switch (item->getType()) { case txToplevelItem::attributeSet: { - rv = addAttributeSet(NS_STATIC_CAST(txAttributeSetItem*, - item)); + rv = addAttributeSet(static_cast + (item)); NS_ENSURE_SUCCESS(rv, rv); break; } @@ -338,19 +338,19 @@ txStylesheet::doneCompiling() } case txToplevelItem::output: { - mOutputFormat.merge(NS_STATIC_CAST(txOutputItem*, item)->mFormat); + mOutputFormat.merge(static_cast(item)->mFormat); break; } case txToplevelItem::stripSpace: { - rv = addStripSpace(NS_STATIC_CAST(txStripSpaceItem*, item), + rv = addStripSpace(static_cast(item), frameStripSpaceTests); NS_ENSURE_SUCCESS(rv, rv); break; } case txToplevelItem::templ: { - rv = addTemplate(NS_STATIC_CAST(txTemplateItem*, item), + rv = addTemplate(static_cast(item), frame); NS_ENSURE_SUCCESS(rv, rv); @@ -358,8 +358,8 @@ txStylesheet::doneCompiling() } case txToplevelItem::variable: { - rv = addGlobalVariable(NS_STATIC_CAST(txVariableItem*, - item)); + rv = addGlobalVariable(static_cast + (item)); NS_ENSURE_SUCCESS(rv, rv); break; @@ -477,15 +477,15 @@ txStylesheet::addTemplate(txTemplateItem* aTemplate, nsresult txStylesheet::addFrames(txListIterator& aInsertIter) { - ImportFrame* frame = NS_STATIC_CAST(ImportFrame*, aInsertIter.current()); + ImportFrame* frame = static_cast(aInsertIter.current()); nsresult rv = NS_OK; txListIterator iter(&frame->mToplevelItems); txToplevelItem* item; - while ((item = NS_STATIC_CAST(txToplevelItem*, iter.next()))) { + while ((item = static_cast(iter.next()))) { if (item->getType() == txToplevelItem::import) { - txImportItem* import = NS_STATIC_CAST(txImportItem*, item); + txImportItem* import = static_cast(item); import->mFrame->mFirstNotImported = - NS_STATIC_CAST(ImportFrame*, aInsertIter.next()); + static_cast(aInsertIter.next()); rv = aInsertIter.addBefore(import->mFrame); NS_ENSURE_SUCCESS(rv, rv); @@ -631,7 +631,7 @@ txStylesheet::ImportFrame::~ImportFrame() { txListIterator tlIter(&mToplevelItems); while (tlIter.hasNext()) { - delete NS_STATIC_CAST(txToplevelItem*, tlIter.next()); + delete static_cast(tlIter.next()); } } diff --git a/content/xslt/src/xslt/txStylesheetCompileHandlers.cpp b/content/xslt/src/xslt/txStylesheetCompileHandlers.cpp index 012ab12f8d6f..36e8f0634aba 100644 --- a/content/xslt/src/xslt/txStylesheetCompileHandlers.cpp +++ b/content/xslt/src/xslt/txStylesheetCompileHandlers.cpp @@ -1229,7 +1229,7 @@ txFnEndTopVariable(txStylesheetCompilerState& aState) { txHandlerTable* prev = aState.mHandlerTable; aState.popHandlerTable(); - txVariableItem* var = NS_STATIC_CAST(txVariableItem*, aState.popPtr()); + txVariableItem* var = static_cast(aState.popPtr()); if (prev == gTxTopVariableHandler) { // No children were found. @@ -1481,14 +1481,14 @@ txFnEndApplyTemplates(txStylesheetCompilerState& aState) aState.popHandlerTable(); txPushNewContext* pushcontext = - NS_STATIC_CAST(txPushNewContext*, aState.popObject()); + static_cast(aState.popObject()); nsAutoPtr instr(pushcontext); // txPushNewContext nsresult rv = aState.addInstruction(instr); NS_ENSURE_SUCCESS(rv, rv); aState.popSorter(); - instr = NS_STATIC_CAST(txInstruction*, aState.popObject()); // txApplyTemplates + instr = static_cast(aState.popObject()); // txApplyTemplates nsAutoPtr loop(new txLoopNodeSet(instr)); NS_ENSURE_TRUE(loop, NS_ERROR_OUT_OF_MEMORY); @@ -1559,8 +1559,8 @@ nsresult txFnEndAttribute(txStylesheetCompilerState& aState) { aState.popHandlerTable(); - nsAutoPtr instr(NS_STATIC_CAST(txInstruction*, - aState.popObject())); + nsAutoPtr instr(static_cast + (aState.popObject())); nsresult rv = aState.addInstruction(instr); NS_ENSURE_SUCCESS(rv, rv); @@ -1613,8 +1613,7 @@ txFnEndCallTemplate(txStylesheetCompilerState& aState) aState.popHandlerTable(); // txCallTemplate - nsAutoPtr instr(NS_STATIC_CAST(txInstruction*, - aState.popObject())); + nsAutoPtr instr(static_cast(aState.popObject())); nsresult rv = aState.addInstruction(instr); NS_ENSURE_SUCCESS(rv, rv); @@ -1662,7 +1661,7 @@ txFnEndChoose(txStylesheetCompilerState& aState) aState.popHandlerTable(); txListIterator iter(aState.mChooseGotoList); txGoTo* gotoinstr; - while ((gotoinstr = NS_STATIC_CAST(txGoTo*, iter.next()))) { + while ((gotoinstr = static_cast(iter.next()))) { rv = aState.addGotoTarget(&gotoinstr->mTarget); NS_ENSURE_SUCCESS(rv, rv); } @@ -1750,7 +1749,7 @@ txFnEndCopy(txStylesheetCompilerState& aState) nsresult rv = aState.addInstruction(instr); NS_ENSURE_SUCCESS(rv, rv); - txCopy* copy = NS_STATIC_CAST(txCopy*, aState.popPtr()); + txCopy* copy = static_cast(aState.popPtr()); rv = aState.addGotoTarget(©->mBailTarget); NS_ENSURE_SUCCESS(rv, rv); @@ -1930,7 +1929,7 @@ txFnEndForEach(txStylesheetCompilerState& aState) // This is a txPushNullTemplateRule txInstruction* pnullrule = - NS_STATIC_CAST(txInstruction*, aState.popPtr()); + static_cast(aState.popPtr()); nsAutoPtr instr(new txLoopNodeSet(pnullrule)); nsresult rv = aState.addInstruction(instr); @@ -1938,7 +1937,7 @@ txFnEndForEach(txStylesheetCompilerState& aState) aState.popSorter(); txPushNewContext* pushcontext = - NS_STATIC_CAST(txPushNewContext*, aState.popPtr()); + static_cast(aState.popPtr()); aState.addGotoTarget(&pushcontext->mBailTarget); return NS_OK; @@ -2007,7 +2006,7 @@ nsresult txFnEndIf(txStylesheetCompilerState& aState) { txConditionalGoto* condGoto = - NS_STATIC_CAST(txConditionalGoto*, aState.popPtr()); + static_cast(aState.popPtr()); return aState.addGotoTarget(&condGoto->mTarget); } @@ -2051,8 +2050,7 @@ txFnStartMessage(PRInt32 aNamespaceID, nsresult txFnEndMessage(txStylesheetCompilerState& aState) { - nsAutoPtr instr(NS_STATIC_CAST(txInstruction*, - aState.popObject())); + nsAutoPtr instr(static_cast(aState.popObject())); nsresult rv = aState.addInstruction(instr); NS_ENSURE_SUCCESS(rv, rv); @@ -2237,8 +2235,8 @@ txFnStartParam(PRInt32 aNamespaceID, nsresult txFnEndParam(txStylesheetCompilerState& aState) { - nsAutoPtr var(NS_STATIC_CAST(txSetVariable*, - aState.popObject())); + nsAutoPtr var(static_cast + (aState.popObject())); txHandlerTable* prev = aState.mHandlerTable; aState.popHandlerTable(); @@ -2257,7 +2255,7 @@ txFnEndParam(txStylesheetCompilerState& aState) rv = aState.addInstruction(instr); NS_ENSURE_SUCCESS(rv, rv); - txCheckParam* checkParam = NS_STATIC_CAST(txCheckParam*, aState.popPtr()); + txCheckParam* checkParam = static_cast(aState.popPtr()); aState.addGotoTarget(&checkParam->mBailTarget); return NS_OK; @@ -2303,8 +2301,8 @@ txFnStartPI(PRInt32 aNamespaceID, nsresult txFnEndPI(txStylesheetCompilerState& aState) { - nsAutoPtr instr(NS_STATIC_CAST(txInstruction*, - aState.popObject())); + nsAutoPtr instr(static_cast + (aState.popObject())); nsresult rv = aState.addInstruction(instr); NS_ENSURE_SUCCESS(rv, rv); @@ -2516,8 +2514,8 @@ txFnStartVariable(PRInt32 aNamespaceID, nsresult txFnEndVariable(txStylesheetCompilerState& aState) { - nsAutoPtr var(NS_STATIC_CAST(txSetVariable*, - aState.popObject())); + nsAutoPtr var(static_cast + (aState.popObject())); txHandlerTable* prev = aState.mHandlerTable; aState.popHandlerTable(); @@ -2623,7 +2621,7 @@ txFnEndWhen(txStylesheetCompilerState& aState) NS_ENSURE_SUCCESS(rv, rv); txConditionalGoto* condGoto = - NS_STATIC_CAST(txConditionalGoto*, aState.popPtr()); + static_cast(aState.popPtr()); rv = aState.addGotoTarget(&condGoto->mTarget); NS_ENSURE_SUCCESS(rv, rv); @@ -2681,7 +2679,7 @@ txFnStartWithParam(PRInt32 aNamespaceID, nsresult txFnEndWithParam(txStylesheetCompilerState& aState) { - nsAutoPtr var(NS_STATIC_CAST(txSetParam*, aState.popObject())); + nsAutoPtr var(static_cast(aState.popObject())); txHandlerTable* prev = aState.mHandlerTable; aState.popHandlerTable(); diff --git a/content/xslt/src/xslt/txStylesheetCompiler.cpp b/content/xslt/src/xslt/txStylesheetCompiler.cpp index c74ff861f056..4556bff080e3 100644 --- a/content/xslt/src/xslt/txStylesheetCompiler.cpp +++ b/content/xslt/src/xslt/txStylesheetCompiler.cpp @@ -226,7 +226,7 @@ txStylesheetCompiler::startElementInternal(PRInt32 aNamespaceID, nsresult rv = NS_OK; PRInt32 i; for (i = mInScopeVariables.Count() - 1; i >= 0; --i) { - ++(NS_STATIC_CAST(txInScopeVariable*, mInScopeVariables[i]))->mLevel; + ++(static_cast(mInScopeVariables[i]))->mLevel; } // Update the elementcontext if we have special attributes @@ -356,7 +356,7 @@ txStylesheetCompiler::startElementInternal(PRInt32 aNamespaceID, } } - rv = pushPtr(NS_CONST_CAST(txElementHandler*, handler)); + rv = pushPtr(const_cast(handler)); NS_ENSURE_SUCCESS(rv, rv); mElementContext->mDepth++; @@ -379,7 +379,7 @@ txStylesheetCompiler::endElement() PRInt32 i; for (i = mInScopeVariables.Count() - 1; i >= 0; --i) { txInScopeVariable* var = - NS_STATIC_CAST(txInScopeVariable*, mInScopeVariables[i]); + static_cast(mInScopeVariables[i]); if (!--(var->mLevel)) { nsAutoPtr instr(new txRemoveVariable(var->mName)); NS_ENSURE_TRUE(instr, NS_ERROR_OUT_OF_MEMORY); @@ -393,14 +393,14 @@ txStylesheetCompiler::endElement() } const txElementHandler* handler = - NS_CONST_CAST(const txElementHandler*, - NS_STATIC_CAST(txElementHandler*, popPtr())); + const_cast + (static_cast(popPtr())); rv = (handler->mEndFunction)(*this); NS_ENSURE_SUCCESS(rv, rv); if (!--mElementContext->mDepth) { // this will delete the old object - mElementContext = NS_STATIC_CAST(txElementContext*, popObject()); + mElementContext = static_cast(popObject()); } return NS_OK; @@ -644,7 +644,7 @@ txStylesheetCompilerState::~txStylesheetCompilerState() PRInt32 i; for (i = mInScopeVariables.Count() - 1; i >= 0; --i) { - delete NS_STATIC_CAST(txInScopeVariable*, mInScopeVariables[i]); + delete static_cast(mInScopeVariables[i]); } } @@ -662,7 +662,7 @@ txStylesheetCompilerState::pushHandlerTable(txHandlerTable* aTable) void txStylesheetCompilerState::popHandlerTable() { - mHandlerTable = NS_STATIC_CAST(txHandlerTable*, popPtr()); + mHandlerTable = static_cast(popPtr()); } nsresult @@ -679,7 +679,7 @@ txStylesheetCompilerState::pushSorter(txPushNewContext* aSorter) void txStylesheetCompilerState::popSorter() { - mSorter = NS_STATIC_CAST(txPushNewContext*, popPtr()); + mSorter = static_cast(popPtr()); } nsresult @@ -699,7 +699,7 @@ void txStylesheetCompilerState::popChooseGotoList() { // this will delete the old value - mChooseGotoList = NS_STATIC_CAST(txList*, popObject()); + mChooseGotoList = static_cast(popObject()); } nsresult @@ -711,7 +711,7 @@ txStylesheetCompilerState::pushObject(TxObject* aObject) TxObject* txStylesheetCompilerState::popObject() { - return NS_STATIC_CAST(TxObject*, mObjectStack.pop()); + return static_cast(mObjectStack.pop()); } nsresult @@ -768,7 +768,7 @@ txStylesheetCompilerState::addInstruction(nsAutoPtr aInstruction) PRInt32 i, count = mGotoTargetPointers.Count(); for (i = 0; i < count; ++i) { - *NS_STATIC_CAST(txInstruction**, mGotoTargetPointers[i]) = newInstr; + *static_cast(mGotoTargetPointers[i]) = newInstr; } mGotoTargetPointers.Clear(); @@ -797,7 +797,7 @@ txStylesheetCompilerState::loadIncludedStylesheet(const nsAString& aURI) // step back to the dummy-item mToplevelIterator.previous(); - txACompileObserver* observer = NS_STATIC_CAST(txStylesheetCompiler*, this); + txACompileObserver* observer = static_cast(this); nsRefPtr compiler = new txStylesheetCompiler(aURI, mStylesheet, &mToplevelIterator, @@ -834,7 +834,7 @@ txStylesheetCompilerState::loadImportedStylesheet(const nsAString& aURI, txListIterator iter(&aFrame->mToplevelItems); iter.next(); // go to the end of the list - txACompileObserver* observer = NS_STATIC_CAST(txStylesheetCompiler*, this); + txACompileObserver* observer = static_cast(this); nsRefPtr compiler = new txStylesheetCompiler(aURI, mStylesheet, &iter, observer); diff --git a/content/xtf/src/nsXTFElementWrapper.cpp b/content/xtf/src/nsXTFElementWrapper.cpp index 855c66d4460d..9fdeb9517137 100644 --- a/content/xtf/src/nsXTFElementWrapper.cpp +++ b/content/xtf/src/nsXTFElementWrapper.cpp @@ -91,7 +91,7 @@ nsXTFElementWrapper::Init() &weakWrapper); NS_ENSURE_SUCCESS(rv, rv); - mXTFElement->OnCreated(NS_STATIC_CAST(nsIXTFElementWrapper*, weakWrapper)); + mXTFElement->OnCreated(static_cast(weakWrapper)); weakWrapper->Release(); PRBool innerHandlesAttribs = PR_FALSE; @@ -113,12 +113,12 @@ nsXTFElementWrapper::QueryInterface(REFNSIID aIID, void** aInstancePtr) NS_PRECONDITION(aInstancePtr, "null out param"); if (aIID.Equals(NS_GET_IID(nsIClassInfo))) { - *aInstancePtr = NS_STATIC_CAST(nsIClassInfo*, this); + *aInstancePtr = static_cast(this); NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(NS_GET_IID(nsIXTFElementWrapper))) { - *aInstancePtr = NS_STATIC_CAST(nsIXTFElementWrapper*, this); + *aInstancePtr = static_cast(this); NS_ADDREF_THIS(); return NS_OK; } @@ -134,7 +134,7 @@ nsXTFElementWrapper::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (inner) { rv = NS_NewXTFInterfaceAggregator(aIID, inner, - NS_STATIC_CAST(nsIContent*, this), + static_cast(this), aInstancePtr); return rv; @@ -474,7 +474,7 @@ nsXTFElementWrapper::GetAttrNameAt(PRUint32 aIndex) const nsresult rv = mAttributeHandler->GetAttributeNameAt(aIndex, getter_AddRefs(localName)); NS_ENSURE_SUCCESS(rv, nsnull); - NS_CONST_CAST(nsXTFElementWrapper*, this)->mTmpAttrName.SetTo(localName); + const_cast(this)->mTmpAttrName.SetTo(localName); return &mTmpAttrName; } else { // wrapper handles attrib @@ -549,7 +549,7 @@ nsXTFElementWrapper::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const return NS_ERROR_OUT_OF_MEMORY; nsXTFElementWrapper* wrapper = - NS_STATIC_CAST(nsXTFElementWrapper*, it.get()); + static_cast(it.get()); nsresult rv = CopyInnerTo(wrapper); if (NS_SUCCEEDED(rv)) { @@ -570,7 +570,7 @@ nsXTFElementWrapper::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const } // XXX CloneState should take |const nIDOMElement*| - wrapper->CloneState(NS_CONST_CAST(nsXTFElementWrapper*, this)); + wrapper->CloneState(const_cast(this)); return rv; } @@ -673,14 +673,14 @@ nsXTFElementWrapper::GetInterfaces(PRUint32* aCount, nsIID*** aArray) } PRUint32 count = baseCount + xtfCount; - nsIID** iids = NS_STATIC_CAST(nsIID**, - nsMemory::Alloc(count * sizeof(nsIID*))); + nsIID** iids = static_cast + (nsMemory::Alloc(count * sizeof(nsIID*))); NS_ENSURE_TRUE(iids, NS_ERROR_OUT_OF_MEMORY); PRUint32 i = 0; for (; i < baseCount; ++i) { - iids[i] = NS_STATIC_CAST(nsIID*, - nsMemory::Clone(baseArray[i], sizeof(nsIID))); + iids[i] = static_cast + (nsMemory::Clone(baseArray[i], sizeof(nsIID))); if (!iids[i]) { NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(baseCount, baseArray); NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(xtfCount, xtfArray); @@ -690,8 +690,8 @@ nsXTFElementWrapper::GetInterfaces(PRUint32* aCount, nsIID*** aArray) } for (; i < count; ++i) { - iids[i] = NS_STATIC_CAST(nsIID*, - nsMemory::Clone(xtfArray[i - baseCount], sizeof(nsIID))); + iids[i] = static_cast + (nsMemory::Clone(xtfArray[i - baseCount], sizeof(nsIID))); if (!iids[i]) { NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(baseCount, baseArray); NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(xtfCount, xtfArray); @@ -905,7 +905,7 @@ nsXTFElementWrapper::GetClasses() const val->ToString(value); nsAttrValue newValue; newValue.ParseAtomArray(value); - NS_CONST_CAST(nsAttrAndChildArray*, &mAttrsAndChildren)-> + const_cast(&mAttrsAndChildren)-> SetAndTakeAttr(clazzAttr, newValue); } } diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp index 708032d138f6..4d12f3946c9f 100644 --- a/content/xul/content/src/nsXULElement.cpp +++ b/content/xul/content/src/nsXULElement.cpp @@ -380,18 +380,18 @@ nsXULElement::QueryInterface(REFNSIID aIID, void** aInstancePtr) nsISupports *inst = nsnull; if (aIID.Equals(NS_GET_IID(nsIDOMNode))) { - inst = NS_STATIC_CAST(nsIDOMNode *, this); + inst = static_cast(this); } else if (aIID.Equals(NS_GET_IID(nsIDOMElement))) { - inst = NS_STATIC_CAST(nsIDOMElement *, this); + inst = static_cast(this); } else if (aIID.Equals(NS_GET_IID(nsIDOMXULElement))) { - inst = NS_STATIC_CAST(nsIDOMXULElement *, this); + inst = static_cast(this); } else if (aIID.Equals(NS_GET_IID(nsIScriptEventHandlerOwner))) { - inst = NS_STATIC_CAST(nsIScriptEventHandlerOwner*, - new nsScriptEventHandlerOwnerTearoff(this)); + inst = static_cast + (new nsScriptEventHandlerOwnerTearoff(this)); NS_ENSURE_TRUE(inst, NS_ERROR_OUT_OF_MEMORY); } else if (aIID.Equals(NS_GET_IID(nsIDOMElementCSSInlineStyle))) { - inst = NS_STATIC_CAST(nsIDOMElementCSSInlineStyle *, - new nsXULElementTearoff(this)); + inst = static_cast + (new nsXULElementTearoff(this)); NS_ENSURE_TRUE(inst, NS_ERROR_OUT_OF_MEMORY); } else if (aIID.Equals(NS_GET_IID(nsIClassInfo))) { inst = NS_GetDOMClassInfoInstance(eDOMClassInfo_XULElement_id); @@ -548,7 +548,7 @@ nsXULElement::IsFocusable(PRInt32 *aTabIndex) PRInt32 tabIndex = aTabIndex? *aTabIndex : -1; PRBool disabled = tabIndex < 0; nsCOMPtr xulControl = - do_QueryInterface(NS_STATIC_CAST(nsIContent*, this)); + do_QueryInterface(static_cast(this)); if (xulControl) { xulControl->GetDisabled(&disabled); if (disabled) { @@ -647,7 +647,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsScriptEventHandlerOwnerTearoff) tmp->mElement = nsnull; NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsScriptEventHandlerOwnerTearoff) - cb.NoteXPCOMChild(NS_STATIC_CAST(nsIContent*, tmp->mElement)); + cb.NoteXPCOMChild(static_cast(tmp->mElement)); NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsScriptEventHandlerOwnerTearoff) @@ -891,7 +891,7 @@ nsXULElement::RemoveChildAt(PRUint32 aIndex, PRBool aNotify) // and cells going away. // First, retrieve the tree. // Check first whether this element IS the tree - controlElement = do_QueryInterface(NS_STATIC_CAST(nsIContent*, this)); + controlElement = do_QueryInterface(static_cast(this)); // If it's not, look at our parent if (!controlElement) @@ -958,7 +958,7 @@ nsXULElement::RemoveChildAt(PRUint32 aIndex, PRBool aNotify) nsIDocument* doc; if (fireSelectionHandler && (doc = GetCurrentDoc())) { nsContentUtils::DispatchTrustedEvent(doc, - NS_STATIC_CAST(nsIContent*, this), + static_cast(this), NS_LITERAL_STRING("select"), PR_FALSE, PR_TRUE); @@ -1308,7 +1308,7 @@ nsXULElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, PRBool aNotify) mutation.mAttrChange = nsIDOMMutationEvent::REMOVAL; mozAutoSubtreeModified subtree(GetOwnerDoc(), this); - nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this), + nsEventDispatcher::Dispatch(static_cast(this), nsnull, &mutation); } @@ -1444,7 +1444,7 @@ nsXULElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor) aVisitor.mForceContentDispatch = PR_TRUE; //FIXME! Bug 329119 nsIAtom* tag = Tag(); if (aVisitor.mEvent->message == NS_XUL_COMMAND && - aVisitor.mEvent->originalTarget == NS_STATIC_CAST(nsIContent*, this) && + aVisitor.mEvent->originalTarget == static_cast(this) && tag != nsGkAtoms::command) { // See if we have a command elt. If so, we execute on the command // instead of on our content element. @@ -1471,7 +1471,7 @@ nsXULElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor) NS_XUL_COMMAND, nsnull); if (aVisitor.mEvent->eventStructType == NS_XUL_COMMAND_EVENT) { nsXULCommandEvent *orig = - NS_STATIC_CAST(nsXULCommandEvent*, aVisitor.mEvent); + static_cast(aVisitor.mEvent); event.isShift = orig->isShift; event.isControl = orig->isControl; @@ -1568,7 +1568,7 @@ nsXULElement::EnsureContentsGenerated(void) const return NS_ERROR_NOT_INITIALIZED; // XXX hack because we can't use "mutable" - nsXULElement* unconstThis = NS_CONST_CAST(nsXULElement*, this); + nsXULElement* unconstThis = const_cast(this); // Clear this value *first*, so we can re-enter the nsIContent // getters if needed. @@ -1747,7 +1747,7 @@ nsXULElement::GetControllers(nsIControllers** aResult) nsresult rv; rv = NS_NewXULControllers(nsnull, NS_GET_IID(nsIControllers), - NS_REINTERPRET_CAST(void**, &slots->mControllers)); + reinterpret_cast(&slots->mControllers)); NS_ASSERTION(NS_SUCCEEDED(rv), "unable to create a controllers"); if (NS_FAILED(rv)) return rv; @@ -1970,17 +1970,17 @@ nsXULElement::Click() // send mouse down nsEventStatus status = nsEventStatus_eIgnore; - nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this), + nsEventDispatcher::Dispatch(static_cast(this), context, &eventDown, nsnull, &status); // send mouse up status = nsEventStatus_eIgnore; // reset status - nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this), + nsEventDispatcher::Dispatch(static_cast(this), context, &eventUp, nsnull, &status); // send mouse click status = nsEventStatus_eIgnore; // reset status - nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this), + nsEventDispatcher::Dispatch(static_cast(this), context, &eventClick, nsnull, &status); } } @@ -2000,7 +2000,7 @@ nsXULElement::DoCommand() nsCOMPtr context = shell->GetPresContext(); nsEventStatus status = nsEventStatus_eIgnore; nsXULCommandEvent event(PR_TRUE, NS_XUL_COMMAND, nsnull); - nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this), + nsEventDispatcher::Dispatch(static_cast(this), context, &event, nsnull, &status); } } @@ -2048,12 +2048,12 @@ PopupListenerPropertyDtor(void* aObject, nsIAtom* aPropertyName, void* aPropertyValue, void* aData) { nsIDOMEventListener* listener = - NS_STATIC_CAST(nsIDOMEventListener*, aPropertyValue); + static_cast(aPropertyValue); if (!listener) { return; } nsCOMPtr target = - do_QueryInterface(NS_STATIC_CAST(nsINode*, aObject)); + do_QueryInterface(static_cast(aObject)); if (target) { target->RemoveEventListener(NS_LITERAL_STRING("mousedown"), listener, PR_FALSE); @@ -2074,7 +2074,7 @@ nsXULElement::AddPopupListener(nsIAtom* aName) nsGkAtoms::popuplistener; nsCOMPtr popupListener = - NS_STATIC_CAST(nsIDOMEventListener*, GetProperty(listenerAtom)); + static_cast(GetProperty(listenerAtom)); if (popupListener) { // Popup listener is already installed. return NS_OK; @@ -2086,7 +2086,7 @@ nsXULElement::AddPopupListener(nsIAtom* aName) return rv; // Add the popup as a listener on this element. - nsCOMPtr target(do_QueryInterface(NS_STATIC_CAST(nsIContent *, this))); + nsCOMPtr target(do_QueryInterface(static_cast(this))); NS_ENSURE_TRUE(target, NS_ERROR_FAILURE); rv = SetProperty(listenerAtom, popupListener, PopupListenerPropertyDtor, PR_TRUE); @@ -2224,7 +2224,7 @@ nsXULElement::HideWindowChrome(PRBool aShouldHide) nsIPresShell *shell = doc->GetPrimaryShell(); if (shell) { - nsIContent* content = NS_STATIC_CAST(nsIContent*, this); + nsIContent* content = static_cast(this); nsIFrame* frame = shell->GetPrimaryFrameFor(content); nsPresContext *presContext = shell->GetPresContext(); @@ -2315,7 +2315,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_NATIVE_0(nsXULPrototypeNode) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NATIVE_BEGIN(nsXULPrototypeNode) if (tmp->mType == nsXULPrototypeNode::eType_Element) { nsXULPrototypeElement *elem = - NS_STATIC_CAST(nsXULPrototypeElement*, tmp); + static_cast(tmp); PRUint32 i; for (i = 0; i < elem->mNumAttributes; ++i) { cb.NoteScriptChild(elem->mScriptTypeID, @@ -2327,7 +2327,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NATIVE_BEGIN(nsXULPrototypeNode) } } else if (tmp->mType == nsXULPrototypeNode::eType_Script) { - NS_STATIC_CAST(nsXULPrototypeScript*, tmp)->mScriptObject.traverse(cb); + static_cast(tmp)->mScriptObject.traverse(cb); } NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(nsXULPrototypeNode, AddRef) @@ -2415,7 +2415,7 @@ nsXULPrototypeElement::Serialize(nsIObjectOutputStream* aStream, break; case eType_Script: rv |= aStream->Write32(child->mType); - nsXULPrototypeScript* script = NS_STATIC_CAST(nsXULPrototypeScript*, child); + nsXULPrototypeScript* script = static_cast(child); rv |= aStream->Write32(script->mScriptObject.mLangID); diff --git a/content/xul/content/src/nsXULElement.h b/content/xul/content/src/nsXULElement.h index f50c690fcb65..3da3a6dea12f 100644 --- a/content/xul/content/src/nsXULElement.h +++ b/content/xul/content/src/nsXULElement.h @@ -463,7 +463,7 @@ public: static nsXULElement* FromContent(nsIContent *aContent) { if (aContent->IsNodeOfType(eXUL)) - return NS_STATIC_CAST(nsXULElement*, aContent); + return static_cast(aContent); return nsnull; } diff --git a/content/xul/content/src/nsXULPopupListener.cpp b/content/xul/content/src/nsXULPopupListener.cpp index 1d5b7d5672a8..74f7035567fd 100644 --- a/content/xul/content/src/nsXULPopupListener.cpp +++ b/content/xul/content/src/nsXULPopupListener.cpp @@ -502,7 +502,7 @@ NS_NewXULPopupListener(nsIDOMElement* aElement, PRBool aIsContext, if (!pl) return NS_ERROR_OUT_OF_MEMORY; - *aListener = NS_STATIC_CAST(nsIDOMMouseListener *, pl); + *aListener = static_cast(pl); NS_ADDREF(*aListener); return NS_OK; } diff --git a/content/xul/document/src/nsElementMap.cpp b/content/xul/document/src/nsElementMap.cpp index 1cc34d3cdb9a..fcc5d140b9fa 100644 --- a/content/xul/document/src/nsElementMap.cpp +++ b/content/xul/document/src/nsElementMap.cpp @@ -67,19 +67,19 @@ static void* PR_CALLBACK AllocTable(void* aPool, PRSize aSize) static void PR_CALLBACK FreeTable(void* aPool, void* aItem) { - delete[] NS_STATIC_CAST(char*, aItem); + delete[] static_cast(aItem); } static PLHashEntry* PR_CALLBACK AllocEntry(void* aPool, const void* aKey) { - nsFixedSizeAllocator* pool = NS_STATIC_CAST(nsFixedSizeAllocator*, aPool); - PLHashEntry* entry = NS_STATIC_CAST(PLHashEntry*, pool->Alloc(sizeof(PLHashEntry))); + nsFixedSizeAllocator* pool = static_cast(aPool); + PLHashEntry* entry = static_cast(pool->Alloc(sizeof(PLHashEntry))); return entry; } static void PR_CALLBACK FreeEntry(void* aPool, PLHashEntry* aEntry, PRUintn aFlag) { - nsFixedSizeAllocator* pool = NS_STATIC_CAST(nsFixedSizeAllocator*, aPool); + nsFixedSizeAllocator* pool = static_cast(aPool); if (aFlag == HT_FREE_ENTRY) pool->Free(aEntry, sizeof(PLHashEntry)); } @@ -142,15 +142,15 @@ nsElementMap::~nsElementMap() PRIntn nsElementMap::ReleaseContentList(PLHashEntry* aHashEntry, PRIntn aIndex, void* aClosure) { - nsElementMap* self = NS_STATIC_CAST(nsElementMap*, aClosure); + nsElementMap* self = static_cast(aClosure); PRUnichar* id = - NS_REINTERPRET_CAST(PRUnichar*, NS_CONST_CAST(void*, aHashEntry->key)); + reinterpret_cast(const_cast(aHashEntry->key)); nsMemory::Free(id); ContentListItem* head = - NS_REINTERPRET_CAST(ContentListItem*, aHashEntry->value); + reinterpret_cast(aHashEntry->value); while (head) { ContentListItem* doomed = head; @@ -173,7 +173,7 @@ nsElementMap::Add(const nsAString& aID, nsIContent* aContent) const PRUnichar *id = flatID.get(); ContentListItem* head = - NS_STATIC_CAST(ContentListItem*, PL_HashTableLookup(mMap, id)); + static_cast(PL_HashTableLookup(mMap, id)); if (! head) { head = ContentListItem::Create(mPool, aContent); @@ -282,7 +282,7 @@ nsElementMap::Remove(const nsAString& aID, nsIContent* aContent) if (!hep || !*hep) return NS_OK; - ContentListItem* head = NS_REINTERPRET_CAST(ContentListItem*, (*hep)->value); + ContentListItem* head = reinterpret_cast((*hep)->value); if (head->mContent.get() == aContent) { ContentListItem* next = head->mNext; @@ -291,7 +291,7 @@ nsElementMap::Remove(const nsAString& aID, nsIContent* aContent) } else { // It was the last reference in the table - PRUnichar* key = NS_REINTERPRET_CAST(PRUnichar*, NS_CONST_CAST(void*, (*hep)->key)); + PRUnichar* key = reinterpret_cast(const_cast((*hep)->key)); PL_HashTableRawRemove(mMap, hep, *hep); nsMemory::Free(key); } @@ -324,7 +324,7 @@ nsElementMap::Find(const nsAString& aID, nsCOMArray& aResults) aResults.Clear(); ContentListItem* item = - NS_REINTERPRET_CAST(ContentListItem*, PL_HashTableLookup(mMap, (const PRUnichar *)PromiseFlatString(aID).get())); + reinterpret_cast(PL_HashTableLookup(mMap, (const PRUnichar *)PromiseFlatString(aID).get())); while (item) { aResults.AppendObject(item->mContent); @@ -342,7 +342,7 @@ nsElementMap::FindFirst(const nsAString& aID, nsIContent** aResult) return NS_ERROR_NOT_INITIALIZED; ContentListItem* item = - NS_REINTERPRET_CAST(ContentListItem*, PL_HashTableLookup(mMap, (const PRUnichar *)PromiseFlatString(aID).get())); + reinterpret_cast(PL_HashTableLookup(mMap, (const PRUnichar *)PromiseFlatString(aID).get())); if (item) { *aResult = item->mContent; @@ -371,14 +371,14 @@ nsElementMap::EnumerateImpl(PLHashEntry* aHashEntry, PRIntn aIndex, void* aClosu // hashtable. It will in turn call the enumerator that the user // has passed in via Enumerate() once for each element that's been // mapped to this ID. - EnumerateClosure* closure = NS_REINTERPRET_CAST(EnumerateClosure*, aClosure); + EnumerateClosure* closure = reinterpret_cast(aClosure); const PRUnichar* id = - NS_REINTERPRET_CAST(const PRUnichar*, aHashEntry->key); + reinterpret_cast(aHashEntry->key); // 'link' holds a pointer to the previous element's link field. ContentListItem** link = - NS_REINTERPRET_CAST(ContentListItem**, &aHashEntry->value); + reinterpret_cast(&aHashEntry->value); ContentListItem* item = *link; @@ -393,10 +393,10 @@ nsElementMap::EnumerateImpl(PLHashEntry* aHashEntry, PRIntn aIndex, void* aClosu *link = item; ContentListItem::Destroy(closure->mSelf->mPool, current); - if ((! *link) && (link == NS_REINTERPRET_CAST(ContentListItem**, &aHashEntry->value))) { + if ((! *link) && (link == reinterpret_cast(&aHashEntry->value))) { // It's the last content node that was mapped to this // ID. Unhash it. - PRUnichar* key = NS_CONST_CAST(PRUnichar*, id); + PRUnichar* key = const_cast(id); nsMemory::Free(key); return HT_ENUMERATE_REMOVE; } @@ -414,7 +414,7 @@ PLHashNumber nsElementMap::Hash(const void* aKey) { PLHashNumber result = 0; - const PRUnichar* s = NS_REINTERPRET_CAST(const PRUnichar*, aKey); + const PRUnichar* s = reinterpret_cast(aKey); while (*s != nsnull) { result = (result >> 28) ^ (result << 4) ^ *s; ++s; @@ -426,6 +426,6 @@ nsElementMap::Hash(const void* aKey) PRIntn nsElementMap::Compare(const void* aLeft, const void* aRight) { - return 0 == nsCRT::strcmp(NS_REINTERPRET_CAST(const PRUnichar*, aLeft), - NS_REINTERPRET_CAST(const PRUnichar*, aRight)); + return 0 == nsCRT::strcmp(reinterpret_cast(aLeft), + reinterpret_cast(aRight)); } diff --git a/content/xul/document/src/nsXULContentSink.cpp b/content/xul/document/src/nsXULContentSink.cpp index 1d758e47b7e7..507e71603f7d 100644 --- a/content/xul/document/src/nsXULContentSink.cpp +++ b/content/xul/document/src/nsXULContentSink.cpp @@ -186,13 +186,13 @@ XULContentSinkImpl::ContextStack::GetTopNodeScriptType(PRUint32 *aScriptType) switch (node->mType) { case nsXULPrototypeNode::eType_Element: { nsXULPrototypeElement *parent = \ - NS_REINTERPRET_CAST(nsXULPrototypeElement*, node); + reinterpret_cast(node); *aScriptType = parent->mScriptTypeID; break; } case nsXULPrototypeNode::eType_Script: { nsXULPrototypeScript *parent = \ - NS_REINTERPRET_CAST(nsXULPrototypeScript*, node); + reinterpret_cast(node); *aScriptType = parent->mScriptObject.mLangID; break; } @@ -238,7 +238,7 @@ XULContentSinkImpl::~XULContentSinkImpl() if (NS_SUCCEEDED(rv)) { for (PRInt32 i = children->Count() - 1; i >= 0; --i) { nsXULPrototypeNode* child = - NS_REINTERPRET_CAST(nsXULPrototypeNode*, children->ElementAt(i)); + reinterpret_cast(children->ElementAt(i)); child->Release(); } @@ -421,7 +421,7 @@ XULContentSinkImpl::FlushText(PRBool aCreateTextNode) PRBool stripWhitespace = PR_FALSE; if (node->mType == nsXULPrototypeNode::eType_Element) { nsINodeInfo *nodeInfo = - NS_STATIC_CAST(nsXULPrototypeElement*, node)->mNodeInfo; + static_cast(node)->mNodeInfo; if (nodeInfo->NamespaceEquals(kNameSpaceID_XUL)) stripWhitespace = !nodeInfo->Equals(nsGkAtoms::label) && @@ -593,7 +593,7 @@ XULContentSinkImpl::HandleEndElement(const PRUnichar *aName) if (NS_FAILED(rv)) return rv; nsXULPrototypeElement* element = - NS_REINTERPRET_CAST(nsXULPrototypeElement*, node); + reinterpret_cast(node); PRInt32 count = children->Count(); if (count) { @@ -603,7 +603,7 @@ XULContentSinkImpl::HandleEndElement(const PRUnichar *aName) for (PRInt32 i = count - 1; i >= 0; --i) element->mChildren[i] = - NS_REINTERPRET_CAST(nsXULPrototypeNode*, children->ElementAt(i)); + reinterpret_cast(children->ElementAt(i)); element->mNumChildren = count; } @@ -612,7 +612,7 @@ XULContentSinkImpl::HandleEndElement(const PRUnichar *aName) case nsXULPrototypeNode::eType_Script: { nsXULPrototypeScript* script = - NS_STATIC_CAST(nsXULPrototypeScript*, node); + static_cast(node); // If given a src= attribute, we must ignore script tag content. if (! script->mSrcURI && ! script->mScriptObject.mObject) { @@ -648,7 +648,7 @@ XULContentSinkImpl::HandleEndElement(const PRUnichar *aName) // root element. This transfers ownership of the prototype // element tree to the prototype document. nsXULPrototypeElement* element = - NS_STATIC_CAST(nsXULPrototypeElement*, node); + static_cast(node); mPrototype->SetRootElement(element); mState = eInEpilog; @@ -760,7 +760,7 @@ XULContentSinkImpl::ReportError(const PRUnichar* aErrorText, if (NS_SUCCEEDED(rv)) { for (PRInt32 i = children->Count() - 1; i >= 0; --i) { nsXULPrototypeNode* child = - NS_REINTERPRET_CAST(nsXULPrototypeNode*, children->ElementAt(i)); + reinterpret_cast(children->ElementAt(i)); child->Release(); } diff --git a/content/xul/document/src/nsXULControllers.cpp b/content/xul/document/src/nsXULControllers.cpp index 26029da249c8..3af8d9cc2af5 100644 --- a/content/xul/document/src/nsXULControllers.cpp +++ b/content/xul/document/src/nsXULControllers.cpp @@ -70,7 +70,7 @@ nsXULControllers::DeleteControllers() PRUint32 count = mControllers.Count(); for (PRUint32 i = 0; i < count; i++) { - nsXULControllerData* controllerData = NS_STATIC_CAST(nsXULControllerData*, mControllers.ElementAt(i)); + nsXULControllerData* controllerData = static_cast(mControllers.ElementAt(i)); if (controllerData) delete controllerData; // releases the nsIController } @@ -106,7 +106,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsXULControllers) PRUint32 i, count = tmp->mControllers.Count(); for (i = 0; i < count; ++i) { nsXULControllerData* controllerData = - NS_STATIC_CAST(nsXULControllerData*, tmp->mControllers[i]); + static_cast(tmp->mControllers[i]); if (controllerData) { cb.NoteXPCOMChild(controllerData->mController); } @@ -133,7 +133,7 @@ nsXULControllers::GetControllerForCommand(const char *aCommand, nsIController** PRUint32 count = mControllers.Count(); for (PRUint32 i=0; i < count; i++) { - nsXULControllerData* controllerData = NS_STATIC_CAST(nsXULControllerData*, mControllers.ElementAt(i)); + nsXULControllerData* controllerData = static_cast(mControllers.ElementAt(i)); if (controllerData) { nsCOMPtr controller; @@ -173,7 +173,7 @@ nsXULControllers::RemoveControllerAt(PRUint32 aIndex, nsIController **_retval) NS_ENSURE_ARG_POINTER(_retval); *_retval = nsnull; - nsXULControllerData* controllerData = NS_STATIC_CAST(nsXULControllerData*, mControllers.SafeElementAt(aIndex)); + nsXULControllerData* controllerData = static_cast(mControllers.SafeElementAt(aIndex)); if (!controllerData) return NS_ERROR_FAILURE; #ifdef DEBUG @@ -195,7 +195,7 @@ nsXULControllers::GetControllerAt(PRUint32 aIndex, nsIController **_retval) NS_ENSURE_ARG_POINTER(_retval); *_retval = nsnull; - nsXULControllerData* controllerData = NS_STATIC_CAST(nsXULControllerData*, mControllers.SafeElementAt(aIndex)); + nsXULControllerData* controllerData = static_cast(mControllers.SafeElementAt(aIndex)); if (!controllerData) return NS_ERROR_FAILURE; return controllerData->GetController(_retval); // does the addref @@ -225,7 +225,7 @@ nsXULControllers::RemoveController(nsIController *controller) PRUint32 count = mControllers.Count(); for (PRUint32 i = 0; i < count; i++) { - nsXULControllerData* controllerData = NS_STATIC_CAST(nsXULControllerData*, mControllers.ElementAt(i)); + nsXULControllerData* controllerData = static_cast(mControllers.ElementAt(i)); if (controllerData) { nsCOMPtr thisController; @@ -251,7 +251,7 @@ nsXULControllers::GetControllerId(nsIController *controller, PRUint32 *_retval) PRUint32 count = mControllers.Count(); for (PRUint32 i = 0; i < count; i++) { - nsXULControllerData* controllerData = NS_STATIC_CAST(nsXULControllerData*, mControllers.ElementAt(i)); + nsXULControllerData* controllerData = static_cast(mControllers.ElementAt(i)); if (controllerData) { nsCOMPtr thisController; @@ -275,7 +275,7 @@ nsXULControllers::GetControllerById(PRUint32 controllerID, nsIController **_retv PRUint32 count = mControllers.Count(); for (PRUint32 i = 0; i < count; i++) { - nsXULControllerData* controllerData = NS_STATIC_CAST(nsXULControllerData*, mControllers.ElementAt(i)); + nsXULControllerData* controllerData = static_cast(mControllers.ElementAt(i)); if (controllerData && controllerData->GetControllerID() == controllerID) { return controllerData->GetController(_retval); diff --git a/content/xul/document/src/nsXULDocument.cpp b/content/xul/document/src/nsXULDocument.cpp index 10719eabaa6c..fc4aeec4b058 100644 --- a/content/xul/document/src/nsXULDocument.cpp +++ b/content/xul/document/src/nsXULDocument.cpp @@ -296,7 +296,7 @@ static PRIntn TraverseElement(const PRUnichar* aID, nsIContent* aElement, void* aContext) { nsCycleCollectionTraversalCallback *cb = - NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aContext); + static_cast(aContext); cb->NoteXPCOMChild(aElement); @@ -308,7 +308,7 @@ TraverseTemplateBuilders(nsISupports* aKey, nsIXULTemplateBuilder* aData, void* aContext) { nsCycleCollectionTraversalCallback *cb = - NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aContext); + static_cast(aContext); cb->NoteXPCOMChild(aKey); cb->NoteXPCOMChild(aData); @@ -320,7 +320,7 @@ static PLDHashOperator PR_CALLBACK TraverseObservers(nsIURI* aKey, nsIObserver* aData, void* aContext) { nsCycleCollectionTraversalCallback *cb = - NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aContext); + static_cast(aContext); cb->NoteXPCOMChild(aData); @@ -347,8 +347,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsXULDocument, nsXMLDocument) PRUint32 i, count = tmp->mPrototypes.Length(); for (i = 0; i < count; ++i) { - cb.NoteXPCOMChild(NS_STATIC_CAST(nsIScriptGlobalObjectOwner*, - tmp->mPrototypes[i])); + cb.NoteXPCOMChild(static_cast(tmp->mPrototypes[i])); } NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mTooltipNode) @@ -646,7 +645,7 @@ PR_STATIC_CALLBACK(void) ClearBroadcasterMapEntry(PLDHashTable* aTable, PLDHashEntryHdr* aEntry) { BroadcasterMapEntry* entry = - NS_STATIC_CAST(BroadcasterMapEntry*, aEntry); + static_cast(aEntry); for (PRInt32 i = entry->mListeners.Count() - 1; i >= 0; --i) { delete (BroadcastListener*)entry->mListeners[i]; } @@ -738,14 +737,14 @@ nsXULDocument::AddBroadcastListenerFor(nsIDOMElement* aBroadcaster, NS_ENSURE_ARG(aBroadcaster && aListener); nsresult rv = - nsContentUtils::CheckSameOrigin(NS_STATIC_CAST(nsDocument *, this), + nsContentUtils::CheckSameOrigin(static_cast(this), aBroadcaster); if (NS_FAILED(rv)) { return rv; } - rv = nsContentUtils::CheckSameOrigin(NS_STATIC_CAST(nsDocument *, this), + rv = nsContentUtils::CheckSameOrigin(static_cast(this), aListener); if (NS_FAILED(rv)) { @@ -773,14 +772,14 @@ nsXULDocument::AddBroadcastListenerFor(nsIDOMElement* aBroadcaster, } BroadcasterMapEntry* entry = - NS_STATIC_CAST(BroadcasterMapEntry*, - PL_DHashTableOperate(mBroadcasterMap, aBroadcaster, + static_cast + (PL_DHashTableOperate(mBroadcasterMap, aBroadcaster, PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_FREE(entry)) { entry = - NS_STATIC_CAST(BroadcasterMapEntry*, - PL_DHashTableOperate(mBroadcasterMap, aBroadcaster, + static_cast + (PL_DHashTableOperate(mBroadcasterMap, aBroadcaster, PL_DHASH_ADD)); if (! entry) @@ -798,7 +797,7 @@ nsXULDocument::AddBroadcastListenerFor(nsIDOMElement* aBroadcaster, BroadcastListener* bl; for (PRInt32 i = entry->mListeners.Count() - 1; i >= 0; --i) { - bl = NS_STATIC_CAST(BroadcastListener*, entry->mListeners[i]); + bl = static_cast(entry->mListeners[i]); if ((bl->mListener == aListener) && (bl->mAttribute == attr)) return NS_OK; @@ -828,15 +827,15 @@ nsXULDocument::RemoveBroadcastListenerFor(nsIDOMElement* aBroadcaster, return NS_OK; BroadcasterMapEntry* entry = - NS_STATIC_CAST(BroadcasterMapEntry*, - PL_DHashTableOperate(mBroadcasterMap, aBroadcaster, + static_cast + (PL_DHashTableOperate(mBroadcasterMap, aBroadcaster, PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_BUSY(entry)) { nsCOMPtr attr = do_GetAtom(aAttr); for (PRInt32 i = entry->mListeners.Count() - 1; i >= 0; --i) { BroadcastListener* bl = - NS_STATIC_CAST(BroadcastListener*, entry->mListeners[i]); + static_cast(entry->mListeners[i]); if ((bl->mListener == aListener) && (bl->mAttribute == attr)) { entry->mListeners.RemoveElementAt(i); @@ -944,8 +943,8 @@ nsXULDocument::AttributeChanged(nsIDocument* aDocument, if (mBroadcasterMap && CanBroadcast(aNameSpaceID, aAttribute)) { nsCOMPtr domele = do_QueryInterface(aElement); BroadcasterMapEntry* entry = - NS_STATIC_CAST(BroadcasterMapEntry*, - PL_DHashTableOperate(mBroadcasterMap, domele.get(), + static_cast + (PL_DHashTableOperate(mBroadcasterMap, domele.get(), PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_BUSY(entry)) { @@ -957,7 +956,7 @@ nsXULDocument::AttributeChanged(nsIDocument* aDocument, PRInt32 i; for (i = entry->mListeners.Count() - 1; i >= 0; --i) { BroadcastListener* bl = - NS_STATIC_CAST(BroadcastListener*, entry->mListeners[i]); + static_cast(entry->mListeners[i]); if ((bl->mAttribute == aAttribute) || (bl->mAttribute == nsGkAtoms::_asterix)) { @@ -1810,7 +1809,7 @@ nsXULDocument::RemoveElementsFromMapByContent(const PRUnichar* aID, nsIContent* aElement, void* aClosure) { - nsIContent* content = NS_REINTERPRET_CAST(nsIContent*, aClosure); + nsIContent* content = reinterpret_cast(aClosure); return (aElement == content) ? HT_ENUMERATE_REMOVE : HT_ENUMERATE_NEXT; } @@ -1967,7 +1966,7 @@ nsXULDocument::MatchAttribute(nsIContent* aContent, void* aData) { NS_PRECONDITION(aContent, "Must have content node to work with!"); - nsString* attrValue = NS_STATIC_CAST(nsString*, aData); + nsString* attrValue = static_cast(aData); if (aNamespaceID != kNameSpaceID_Unknown && aNamespaceID != kNameSpaceID_Wildcard) { return attrValue->EqualsLiteral("*") ? @@ -2749,7 +2748,7 @@ FirePendingMergeNotification(nsIURI* aKey, nsCOMPtr& aObserver, voi aObserver->Observe(aKey, "xul-overlay-merged", EmptyString().get()); typedef nsInterfaceHashtable table; - table* observers = NS_STATIC_CAST(table*, aClosure); + table* observers = static_cast(aClosure); observers->Remove(aKey); return PL_DHASH_REMOVE; @@ -2843,7 +2842,7 @@ nsXULDocument::ResumeWalk() case nsXULPrototypeNode::eType_Element: { // An 'element', which may contain more content. nsXULPrototypeElement* protoele = - NS_STATIC_CAST(nsXULPrototypeElement*, childproto); + static_cast(childproto); nsCOMPtr child; @@ -2900,7 +2899,7 @@ nsXULDocument::ResumeWalk() // A script reference. Execute the script immediately; // this may have side effects in the content model. nsXULPrototypeScript* scriptproto = - NS_STATIC_CAST(nsXULPrototypeScript*, childproto); + static_cast(childproto); if (scriptproto->mSrcURI) { // A transcluded script reference; this may @@ -2935,7 +2934,7 @@ nsXULDocument::ResumeWalk() NS_ENSURE_SUCCESS(rv, rv); nsXULPrototypeText* textproto = - NS_STATIC_CAST(nsXULPrototypeText*, childproto); + static_cast(childproto); text->SetText(textproto->mValue, PR_FALSE); rv = element->AppendChildTo(text, PR_FALSE); @@ -2946,7 +2945,7 @@ nsXULDocument::ResumeWalk() case nsXULPrototypeNode::eType_PI: { nsXULPrototypePI* piProto = - NS_STATIC_CAST(nsXULPrototypePI*, childproto); + static_cast(childproto); // and don't have effect // outside the prolog, like they used to. Issue a warning. @@ -4242,7 +4241,7 @@ nsXULDocument::InsertElement(nsIContent* aParent, nsIContent* aChild, PRBool aNo aChild->GetAttr(kNameSpaceID_None, nsGkAtoms::position, posStr); if (!posStr.IsEmpty()) { // Positions are one-indexed. - PRInt32 pos = posStr.ToInteger(NS_REINTERPRET_CAST(PRInt32*, &rv)); + PRInt32 pos = posStr.ToInteger(reinterpret_cast(&rv)); // Note: if the insertion index (which is |pos - 1|) would be less // than 0 or greater than the number of children aParent has, then // don't insert, since the position is bogus. Just skip on to diff --git a/content/xul/document/src/nsXULPrototypeCache.cpp b/content/xul/document/src/nsXULPrototypeCache.cpp index ed5a391c274a..accfb324bb9a 100644 --- a/content/xul/document/src/nsXULPrototypeCache.cpp +++ b/content/xul/document/src/nsXULPrototypeCache.cpp @@ -159,7 +159,7 @@ nsXULPrototypeCache::GetInstance() CallGetService(kXULPrototypeCacheCID, &cache); - sInstance = NS_STATIC_CAST(nsXULPrototypeCache*, cache); + sInstance = static_cast(cache); } return sInstance; } @@ -734,7 +734,7 @@ nsXULPrototypeCache::StartFastLoad(nsIURI* aURI) // Give the FastLoad service an object by which it can get or create a // file output stream given an input stream on the same file. nsXULFastLoadFileIO* xio = new nsXULFastLoadFileIO(file); - nsCOMPtr io = NS_STATIC_CAST(nsIFastLoadFileIO*, xio); + nsCOMPtr io = static_cast(xio); if (! io) return NS_ERROR_OUT_OF_MEMORY; fastLoadService->SetFileIO(io); diff --git a/content/xul/document/src/nsXULPrototypeDocument.cpp b/content/xul/document/src/nsXULPrototypeDocument.cpp index 0a0b0135db1a..240dd63f63e3 100644 --- a/content/xul/document/src/nsXULPrototypeDocument.cpp +++ b/content/xul/document/src/nsXULPrototypeDocument.cpp @@ -381,7 +381,7 @@ GetNodeInfos(nsXULPrototypeElement* aPrototype, for (i = 0; i < aPrototype->mNumChildren; ++i) { nsXULPrototypeNode* child = aPrototype->mChildren[i]; if (child->mType == nsXULPrototypeNode::eType_Element) { - rv = GetNodeInfos(NS_STATIC_CAST(nsXULPrototypeElement*, child), + rv = GetNodeInfos(static_cast(child), aArray); NS_ENSURE_SUCCESS(rv, rv); } diff --git a/content/xul/templates/src/nsContentSupportMap.h b/content/xul/templates/src/nsContentSupportMap.h index 8b8b566c6443..c88c58d96ce8 100644 --- a/content/xul/templates/src/nsContentSupportMap.h +++ b/content/xul/templates/src/nsContentSupportMap.h @@ -66,7 +66,7 @@ public: if (!hdr) return NS_ERROR_OUT_OF_MEMORY; - Entry* entry = NS_REINTERPRET_CAST(Entry*, hdr); + Entry* entry = reinterpret_cast(hdr); NS_ASSERTION(entry->mMatch == nsnull, "over-writing entry"); entry->mContent = aElement; entry->mMatch = aMatch; @@ -80,7 +80,7 @@ public: if (PL_DHASH_ENTRY_IS_FREE(hdr)) return PR_FALSE; - Entry* entry = NS_REINTERPRET_CAST(Entry*, hdr); + Entry* entry = reinterpret_cast(hdr); *aMatch = entry->mMatch; return PR_TRUE; } diff --git a/content/xul/templates/src/nsRDFConInstanceTestNode.h b/content/xul/templates/src/nsRDFConInstanceTestNode.h index ea273acb7706..5b45849e1ea8 100644 --- a/content/xul/templates/src/nsRDFConInstanceTestNode.h +++ b/content/xul/templates/src/nsRDFConInstanceTestNode.h @@ -115,7 +115,7 @@ public: virtual PRBool Equals(const MemoryElement& aElement) const { if (aElement.Type() == Type()) { - const Element& element = NS_STATIC_CAST(const Element&, aElement); + const Element& element = static_cast(aElement); return mContainer == element.mContainer && mContainerTest == element.mContainerTest && mEmptyTest == element.mEmptyTest; diff --git a/content/xul/templates/src/nsRDFConMemberTestNode.h b/content/xul/templates/src/nsRDFConMemberTestNode.h index e902299a57f4..9cd591f46a18 100644 --- a/content/xul/templates/src/nsRDFConMemberTestNode.h +++ b/content/xul/templates/src/nsRDFConMemberTestNode.h @@ -106,7 +106,7 @@ public: virtual PRBool Equals(const MemoryElement& aElement) const { if (aElement.Type() == Type()) { - const Element& element = NS_STATIC_CAST(const Element&, aElement); + const Element& element = static_cast(aElement); return mContainer == element.mContainer && mMember == element.mMember; } return PR_FALSE; } diff --git a/content/xul/templates/src/nsRDFPropertyTestNode.h b/content/xul/templates/src/nsRDFPropertyTestNode.h index 7d726fbc99f1..0da978c5082b 100644 --- a/content/xul/templates/src/nsRDFPropertyTestNode.h +++ b/content/xul/templates/src/nsRDFPropertyTestNode.h @@ -130,7 +130,7 @@ public: virtual PRBool Equals(const MemoryElement& aElement) const { if (aElement.Type() == Type()) { - const Element& element = NS_STATIC_CAST(const Element&, aElement); + const Element& element = static_cast(aElement); return mSource == element.mSource && mProperty == element.mProperty && mTarget == element.mTarget; diff --git a/content/xul/templates/src/nsRuleNetwork.cpp b/content/xul/templates/src/nsRuleNetwork.cpp index 7f8a33a73baa..dc1ab12d74a5 100644 --- a/content/xul/templates/src/nsRuleNetwork.cpp +++ b/content/xul/templates/src/nsRuleNetwork.cpp @@ -227,7 +227,7 @@ nsAssignmentSet::Equals(const nsAssignmentSet& aSet) const PLHashNumber Instantiation::Hash(const void* aKey) { - const Instantiation* inst = NS_STATIC_CAST(const Instantiation*, aKey); + const Instantiation* inst = static_cast(aKey); PLHashNumber result = 0; @@ -243,8 +243,8 @@ Instantiation::Hash(const void* aKey) PRIntn Instantiation::Compare(const void* aLeft, const void* aRight) { - const Instantiation* left = NS_STATIC_CAST(const Instantiation*, aLeft); - const Instantiation* right = NS_STATIC_CAST(const Instantiation*, aRight); + const Instantiation* left = static_cast(aLeft); + const Instantiation* right = static_cast(aRight); return *left == *right; } diff --git a/content/xul/templates/src/nsRuleNetwork.h b/content/xul/templates/src/nsRuleNetwork.h index f5bdd2dfc6e4..b25929dd0190 100644 --- a/content/xul/templates/src/nsRuleNetwork.h +++ b/content/xul/templates/src/nsRuleNetwork.h @@ -598,7 +598,7 @@ public: }; ConstIterator First() const { return ConstIterator(mHead.mNext); } - ConstIterator Last() const { return ConstIterator(NS_CONST_CAST(List*, &mHead)); } + ConstIterator Last() const { return ConstIterator(const_cast(&mHead)); } class Iterator : public ConstIterator { public: diff --git a/content/xul/templates/src/nsTemplateMap.h b/content/xul/templates/src/nsTemplateMap.h index 4c092e83e515..373961b2b5c9 100644 --- a/content/xul/templates/src/nsTemplateMap.h +++ b/content/xul/templates/src/nsTemplateMap.h @@ -69,7 +69,7 @@ public: "aContent already in map"); Entry* entry = - NS_REINTERPRET_CAST(Entry*, PL_DHashTableOperate(&mTable, aContent, PL_DHASH_ADD)); + reinterpret_cast(PL_DHashTableOperate(&mTable, aContent, PL_DHASH_ADD)); if (entry) { entry->mContent = aContent; @@ -107,7 +107,7 @@ public: void GetTemplateFor(nsIContent* aContent, nsIContent** aResult) { Entry* entry = - NS_REINTERPRET_CAST(Entry*, PL_DHashTableOperate(&mTable, aContent, PL_DHASH_LOOKUP)); + reinterpret_cast(PL_DHashTableOperate(&mTable, aContent, PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_BUSY(&entry->mHdr)) NS_IF_ADDREF(*aResult = entry->mTemplate); diff --git a/content/xul/templates/src/nsTemplateRule.h b/content/xul/templates/src/nsTemplateRule.h index 5b023644123b..7e42df1b22f5 100644 --- a/content/xul/templates/src/nsTemplateRule.h +++ b/content/xul/templates/src/nsTemplateRule.h @@ -338,13 +338,13 @@ public: nsTemplateRule* GetRuleAt(PRInt16 aIndex) { - return NS_STATIC_CAST(nsTemplateRule*, mRules[aIndex]); + return static_cast(mRules[aIndex]); } void Clear() { for (PRInt32 r = mRules.Count() - 1; r >= 0; r--) { - nsTemplateRule* rule = NS_STATIC_CAST(nsTemplateRule* , mRules[r]); + nsTemplateRule* rule = static_cast(mRules[r]); delete rule; } mRules.Clear(); diff --git a/content/xul/templates/src/nsXULContentBuilder.cpp b/content/xul/templates/src/nsXULContentBuilder.cpp index 3bbc3ad97e5f..e9c69e603606 100644 --- a/content/xul/templates/src/nsXULContentBuilder.cpp +++ b/content/xul/templates/src/nsXULContentBuilder.cpp @@ -1521,7 +1521,7 @@ nsXULContentBuilder::RemoveGeneratedContent(nsIContent* aElement) while (0 != (count = ungenerated.Count())) { // Pull the next "ungenerated" element off the queue. PRInt32 last = count - 1; - nsIContent* element = NS_STATIC_CAST(nsIContent*, ungenerated[last]); + nsIContent* element = static_cast(ungenerated[last]); ungenerated.RemoveElementAt(last); PRUint32 i = element->GetChildCount(); @@ -1871,7 +1871,7 @@ nsXULContentBuilder::ReplaceMatch(nsIXULTemplateResult* aOldResult, { nsresult rv; - nsIContent* content = NS_STATIC_CAST(nsIContent*, aContext); + nsIContent* content = static_cast(aContext); // update the container attributes for the match if (content) { diff --git a/content/xul/templates/src/nsXULTemplateBuilder.cpp b/content/xul/templates/src/nsXULTemplateBuilder.cpp index 314f57bf2d0a..4109bdb93144 100644 --- a/content/xul/templates/src/nsXULTemplateBuilder.cpp +++ b/content/xul/templates/src/nsXULTemplateBuilder.cpp @@ -140,7 +140,7 @@ nsXULTemplateBuilder::nsXULTemplateBuilder(void) static PLDHashOperator DestroyMatchList(nsISupports* aKey, nsTemplateMatch* aMatch, void* aContext) { - nsFixedSizeAllocator* pool = NS_STATIC_CAST(nsFixedSizeAllocator *, aContext); + nsFixedSizeAllocator* pool = static_cast(aContext); // delete all the matches in the list while (aMatch) { @@ -231,7 +231,7 @@ static PLDHashOperator TraverseMatchList(nsISupports* aKey, nsTemplateMatch* aMatch, void* aContext) { nsCycleCollectionTraversalCallback *cb = - NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aContext); + static_cast(aContext); cb->NoteXPCOMChild(aKey); nsTemplateMatch* match = aMatch; @@ -1425,7 +1425,7 @@ nsXULTemplateBuilder::InitHTMLTemplateRoot() if (! context) return NS_ERROR_UNEXPECTED; - JSContext* jscontext = NS_REINTERPRET_CAST(JSContext*, context->GetNativeContext()); + JSContext* jscontext = reinterpret_cast(context->GetNativeContext()); NS_ASSERTION(context != nsnull, "no jscontext"); if (! jscontext) return NS_ERROR_UNEXPECTED; @@ -1466,7 +1466,7 @@ nsXULTemplateBuilder::InitHTMLTemplateRoot() // builder nsCOMPtr wrapper; rv = xpc->WrapNative(jscontext, jselement, - NS_STATIC_CAST(nsIXULTemplateBuilder*, this), + static_cast(this), NS_GET_IID(nsIXULTemplateBuilder), getter_AddRefs(wrapper)); NS_ENSURE_SUCCESS(rv, rv); @@ -1641,7 +1641,7 @@ nsXULTemplateBuilder::SubstituteTextAppendText(nsXULTemplateBuilder* aThis, void* aClosure) { // Append aString to the closure's result - SubstituteTextClosure* c = NS_STATIC_CAST(SubstituteTextClosure*, aClosure); + SubstituteTextClosure* c = static_cast(aClosure); c->str.Append(aText); } @@ -1652,7 +1652,7 @@ nsXULTemplateBuilder::SubstituteTextReplaceVariable(nsXULTemplateBuilder* aThis, { // Substitute the value for the variable and append to the // closure's result. - SubstituteTextClosure* c = NS_STATIC_CAST(SubstituteTextClosure*, aClosure); + SubstituteTextClosure* c = static_cast(aClosure); nsAutoString replacementText; @@ -2511,7 +2511,7 @@ nsXULTemplateBuilder::AddSimpleRuleBindings(nsTemplateRule* aRule, while (elements.Count()) { // Pop the next element off the stack PRUint32 i = (PRUint32)(elements.Count() - 1); - nsIContent* element = NS_STATIC_CAST(nsIContent*, elements[i]); + nsIContent* element = static_cast(elements[i]); elements.RemoveElementAt(i); // Iterate through its attributes, looking for substitutions @@ -2556,7 +2556,7 @@ nsXULTemplateBuilder::AddBindingsFor(nsXULTemplateBuilder* aThis, if (!StringBeginsWith(aVariable, NS_LITERAL_STRING("rdf:"))) return; - nsTemplateRule* rule = NS_STATIC_CAST(nsTemplateRule*, aClosure); + nsTemplateRule* rule = static_cast(aClosure); nsCOMPtr var = do_GetAtom(aVariable); diff --git a/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp b/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp index 69abe1aea3b0..d012e98266b9 100755 --- a/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp +++ b/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp @@ -91,7 +91,7 @@ BindingDependenciesTraverser(nsISupports* key, void* userArg) { nsCycleCollectionTraversalCallback *cb = - NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, userArg); + static_cast(userArg); PRInt32 i, count = array->Count(); for (i = 0; i < count; ++i) { @@ -107,7 +107,7 @@ MemoryElementTraverser(const PRUint32& key, void* userArg) { nsCycleCollectionTraversalCallback *cb = - NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, userArg); + static_cast(userArg); PRInt32 i, count = array->Count(); for (i = 0; i < count; ++i) { @@ -121,7 +121,7 @@ PR_STATIC_CALLBACK(PLDHashOperator) RuleToBindingTraverser(nsISupports* key, RDFBindingSet* binding, void* userArg) { nsCycleCollectionTraversalCallback *cb = - NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, userArg); + static_cast(userArg); cb->NoteXPCOMChild(key); @@ -384,7 +384,7 @@ nsXULTemplateQueryProcessorRDF::GenerateResults(nsISupports* aDatasource, // should be safe to cast here since the query is a // non-scriptable nsITemplateRDFQuery - nsRDFQuery* query = NS_STATIC_CAST(nsRDFQuery *, aQuery); + nsRDFQuery* query = static_cast(aQuery); *aResults = nsnull; @@ -829,7 +829,7 @@ nsXULTemplateQueryProcessorRDF::Propagate(nsIRDFResource* aSource, { ReteNodeSet::Iterator last = mRDFTests.Last(); for (ReteNodeSet::Iterator i = mRDFTests.First(); i != last; ++i) { - nsRDFTestNode* rdftestnode = NS_STATIC_CAST(nsRDFTestNode*, *i); + nsRDFTestNode* rdftestnode = static_cast(*i); Instantiation seed; if (rdftestnode->CanPropagate(aSource, aProperty, aTarget, seed)) { @@ -846,7 +846,7 @@ nsXULTemplateQueryProcessorRDF::Propagate(nsIRDFResource* aSource, { ReteNodeSet::Iterator last = livenodes.Last(); for (ReteNodeSet::Iterator i = livenodes.First(); i != last; ++i) { - nsRDFTestNode* rdftestnode = NS_STATIC_CAST(nsRDFTestNode*, *i); + nsRDFTestNode* rdftestnode = static_cast(*i); // What happens here is we create an instantiation as if we were // at the found test in the rule network. For example, if the @@ -918,7 +918,7 @@ nsXULTemplateQueryProcessorRDF::Retract(nsIRDFResource* aSource, // Retract any currently active rules that will no longer be matched. ReteNodeSet::ConstIterator lastnode = mRDFTests.Last(); for (ReteNodeSet::ConstIterator node = mRDFTests.First(); node != lastnode; ++node) { - const nsRDFTestNode* rdftestnode = NS_STATIC_CAST(const nsRDFTestNode*, *node); + const nsRDFTestNode* rdftestnode = static_cast(*node); rdftestnode->Retract(aSource, aProperty, aTarget); diff --git a/content/xul/templates/src/nsXULTreeBuilder.cpp b/content/xul/templates/src/nsXULTreeBuilder.cpp index f84f8964d78c..109678034bfc 100644 --- a/content/xul/templates/src/nsXULTreeBuilder.cpp +++ b/content/xul/templates/src/nsXULTreeBuilder.cpp @@ -1799,13 +1799,13 @@ nsXULTreeBuilder::IsContainerOpen(nsIRDFResource* aResource, PRBool* aOpen) int nsXULTreeBuilder::Compare(const void* aLeft, const void* aRight, void* aClosure) { - nsXULTreeBuilder* self = NS_STATIC_CAST(nsXULTreeBuilder*, aClosure); + nsXULTreeBuilder* self = static_cast(aClosure); - nsTreeRows::Row* left = NS_STATIC_CAST(nsTreeRows::Row*, - NS_CONST_CAST(void*, aLeft)); + nsTreeRows::Row* left = static_cast + (const_cast(aLeft)); - nsTreeRows::Row* right = NS_STATIC_CAST(nsTreeRows::Row*, - NS_CONST_CAST(void*, aRight)); + nsTreeRows::Row* right = static_cast + (const_cast(aRight)); return self->CompareResults(left->mMatch->mResult, right->mMatch->mResult); } diff --git a/db/mork/build/nsMorkFactory.cpp b/db/mork/build/nsMorkFactory.cpp index 95ef68ccbd4b..71fa7b2efd2e 100644 --- a/db/mork/build/nsMorkFactory.cpp +++ b/db/mork/build/nsMorkFactory.cpp @@ -85,7 +85,7 @@ nsMorkFactoryFactory::QueryInterface(REFNSIID iid, void** result) *result = nsnull; if(iid.Equals(NS_GET_IID(nsIMdbFactoryFactory)) || iid.Equals(NS_GET_IID(nsISupports))) { - *result = NS_STATIC_CAST(nsIMdbFactoryFactory*, this); + *result = static_cast(this); AddRef(); return NS_OK; } diff --git a/db/morkreader/nsMorkReader.cpp b/db/morkreader/nsMorkReader.cpp index f3663764854f..10d3bb9ed866 100644 --- a/db/morkreader/nsMorkReader.cpp +++ b/db/morkreader/nsMorkReader.cpp @@ -173,7 +173,7 @@ struct AddColumnClosure PR_STATIC_CALLBACK(PLDHashOperator) AddColumn(const nsCSubstring &id, nsCString name, void *userData) { - AddColumnClosure *closure = NS_STATIC_CAST(AddColumnClosure*, userData); + AddColumnClosure *closure = static_cast(userData); nsTArray *array = closure->array; if (!array->AppendElement(nsMorkReader::MorkColumn(id, name)) || @@ -261,7 +261,7 @@ nsMorkReader::EnumerateRows(RowEnumerator aCallback, void *aUserData) const { // Constify the table values typedef const nsDataHashtable* > ConstTable; - NS_REINTERPRET_CAST(ConstTable*, &mTable)->EnumerateRead(aCallback, + reinterpret_cast(&mTable)->EnumerateRead(aCallback, aUserData); } diff --git a/docshell/base/nsDSURIContentListener.cpp b/docshell/base/nsDSURIContentListener.cpp index 9e1e51146a59..4057ecc73e3c 100644 --- a/docshell/base/nsDSURIContentListener.cpp +++ b/docshell/base/nsDSURIContentListener.cpp @@ -142,7 +142,7 @@ nsDSURIContentListener::DoContent(const char* aContentType, } if (loadFlags & nsIChannel::LOAD_RETARGETED_DOCUMENT_URI) { - nsCOMPtr domWindow = do_GetInterface(NS_STATIC_CAST(nsIDocShell*, mDocShell)); + nsCOMPtr domWindow = do_GetInterface(static_cast(mDocShell)); NS_ENSURE_TRUE(domWindow, NS_ERROR_FAILURE); domWindow->Focus(); } diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 90e5b0593fe5..aed29cf57457 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -360,8 +360,8 @@ nsDocShell::Init() // We want to hold a strong ref to the loadgroup, so it better hold a weak // ref to us... use an InterfaceRequestorProxy to do this. nsCOMPtr proxy = - new InterfaceRequestorProxy(NS_STATIC_CAST(nsIInterfaceRequestor*, - this)); + new InterfaceRequestorProxy(static_cast + (this)); NS_ENSURE_TRUE(proxy, NS_ERROR_OUT_OF_MEMORY); mLoadGroup->SetNotificationCallbacks(proxy); @@ -723,7 +723,7 @@ nsDocShell::LoadURI(nsIURI * aURI, nsCOMPtr parentDS(do_QueryInterface(parentAsItem)); PRUint32 parentLoadType; - if (parentDS && parentDS != NS_STATIC_CAST(nsIDocShell *, this)) { + if (parentDS && parentDS != static_cast(this)) { /* OK. It is a subframe. Checkout the * parent's loadtype. If the parent was loaded thro' a history * mechanism, then get the SH entry for the child from the parent. @@ -1179,7 +1179,7 @@ nsDocShell::SetCurrentURI(nsIURI *aURI, nsIRequest *aRequest, nsCOMPtr root; GetSameTypeRootTreeItem(getter_AddRefs(root)); - if (root.get() == NS_STATIC_CAST(nsIDocShellTreeItem *, this)) + if (root.get() == static_cast(this)) { // This is the root docshell isRoot = PR_TRUE; @@ -1784,7 +1784,7 @@ NS_IMETHODIMP nsDocShell::GetRootTreeItem(nsIDocShellTreeItem ** aRootTreeItem) { NS_ENSURE_ARG_POINTER(aRootTreeItem); - *aRootTreeItem = NS_STATIC_CAST(nsIDocShellTreeItem *, this); + *aRootTreeItem = static_cast(this); nsCOMPtr parent; NS_ENSURE_SUCCESS(GetParent(getter_AddRefs(parent)), NS_ERROR_FAILURE); @@ -1801,7 +1801,7 @@ NS_IMETHODIMP nsDocShell::GetSameTypeRootTreeItem(nsIDocShellTreeItem ** aRootTreeItem) { NS_ENSURE_ARG_POINTER(aRootTreeItem); - *aRootTreeItem = NS_STATIC_CAST(nsIDocShellTreeItem *, this); + *aRootTreeItem = static_cast(this); nsCOMPtr parent; NS_ENSURE_SUCCESS(GetSameTypeParent(getter_AddRefs(parent)), @@ -2051,8 +2051,8 @@ nsDocShell::FindItemWithName(const PRUnichar * aName, if (parentType == mItemType) { return parentAsTreeItem-> FindItemWithName(aName, - NS_STATIC_CAST(nsIDocShellTreeItem*, - this), + static_cast + (this), aOriginalRequestor, _retval); } @@ -2429,8 +2429,8 @@ nsDocShell::FindChildWithName(const PRUnichar * aName, #endif child->FindChildWithName(aName, PR_TRUE, aSameType, - NS_STATIC_CAST(nsIDocShellTreeItem*, - this), + static_cast + (this), aOriginalRequestor, _retval); NS_ASSERTION(NS_SUCCEEDED(rv), @@ -3282,7 +3282,7 @@ nsDocShell::SetSessionHistory(nsISHistory * aSessionHistory) */ GetSameTypeRootTreeItem(getter_AddRefs(root)); NS_ENSURE_TRUE(root, NS_ERROR_FAILURE); - if (root.get() == NS_STATIC_CAST(nsIDocShellTreeItem *, this)) { + if (root.get() == static_cast(this)) { mSessionHistory = aSessionHistory; nsCOMPtr shPrivate(do_QueryInterface(mSessionHistory)); @@ -4083,7 +4083,7 @@ nsDocShell::GetScrollbarVisibility(PRBool * verticalVisible, // We should now call nsLayoutUtils::GetScrollableFrameFor, // but we can't because of stupid linkage! nsIFrame* scrollFrame = - NS_STATIC_CAST(nsIFrame*, scrollView->View()->GetParent()->GetClientData()); + static_cast(scrollView->View()->GetParent()->GetClientData()); if (!scrollFrame) return NS_ERROR_FAILURE; nsIScrollableFrame* scrollable = nsnull; @@ -4634,7 +4634,7 @@ nsDocShell::RefreshURIFromQueue() // This is the nsRefreshTimer object, waiting to be // setup in a timer object and fired. // Create the timer and trigger it. - PRUint32 delay = NS_STATIC_CAST(nsRefreshTimer*, NS_STATIC_CAST(nsITimerCallback*, refreshInfo))->GetDelay(); + PRUint32 delay = static_cast(static_cast(refreshInfo))->GetDelay(); nsCOMPtr timer = do_CreateInstance("@mozilla.org/timer;1"); if (timer) { // Replace the nsRefreshTimer element in the queue with @@ -5039,7 +5039,7 @@ nsDocShell::CreateAboutBlankContentViewer(nsIPrincipal* aPrincipal) docFactory->CreateBlankDocument(mLoadGroup, aPrincipal, getter_AddRefs(blankDoc)); if (blankDoc) { - blankDoc->SetContainer(NS_STATIC_CAST(nsIDocShell *, this)); + blankDoc->SetContainer(static_cast(this)); // create a content viewer for us and the new document docFactory->CreateInstanceForDocument(NS_ISUPPORTS_CAST(nsIDocShell *, this), @@ -5047,7 +5047,7 @@ nsDocShell::CreateAboutBlankContentViewer(nsIPrincipal* aPrincipal) // hook 'em up if (viewer) { - viewer->SetContainer(NS_STATIC_CAST(nsIContentViewerContainer *,this)); + viewer->SetContainer(static_cast(this)); nsCOMPtr domdoc(do_QueryInterface(blankDoc)); Embed(viewer, "", 0); viewer->SetDOMDocument(domdoc); @@ -5607,7 +5607,7 @@ nsDocShell::RestoreFromHistory() // Now we simulate a load. First, we restore the state of the javascript // window object. nsCOMPtr privWin = - do_GetInterface(NS_STATIC_CAST(nsIInterfaceRequestor*, this)); + do_GetInterface(static_cast(this)); NS_ASSERTION(privWin, "could not get nsPIDOMWindow interface"); rv = privWin->RestoreWindowState(windowState); @@ -5880,7 +5880,7 @@ nsDocShell::NewContentViewerObj(const char *aContentType, aViewer), NS_ERROR_FAILURE); - (*aViewer)->SetContainer(NS_STATIC_CAST(nsIContentViewerContainer *, this)); + (*aViewer)->SetContainer(static_cast(this)); return NS_OK; } @@ -6871,7 +6871,7 @@ nsDocShell::DoURILoad(nsIURI * aURI, aURI, nsnull, nsnull, - NS_STATIC_CAST(nsIInterfaceRequestor *, this), + static_cast(this), loadFlags); if (NS_FAILED(rv)) { if (rv == NS_ERROR_UNKNOWN_PROTOCOL) { @@ -7059,7 +7059,7 @@ AppendSegmentToString(nsIInputStream *in, { // aFromSegment now contains aCount bytes of data. - nsCAutoString *buf = NS_STATIC_CAST(nsCAutoString *, closure); + nsCAutoString *buf = static_cast(closure); buf->Append(fromRawSegment, count); // Indicate that we have consumed all of aFromSegment @@ -7664,7 +7664,7 @@ nsDocShell::AddToSessionHistory(nsIURI * aURI, * other vitalities. */ if (LOAD_TYPE_HAS_FLAGS(mLoadType, LOAD_FLAGS_REPLACE_HISTORY) && - root != NS_STATIC_CAST(nsIDocShellTreeItem *, this)) { + root != static_cast(this)) { // This is a subframe entry = mOSHE; nsCOMPtr shContainer(do_QueryInterface(entry)); @@ -7757,7 +7757,7 @@ nsDocShell::AddToSessionHistory(nsIURI * aURI, entry->SetExpirationStatus(PR_TRUE); - if (root == NS_STATIC_CAST(nsIDocShellTreeItem *, this) && mSessionHistory) { + if (root == static_cast(this) && mSessionHistory) { // This is the root docshell if (LOAD_TYPE_HAS_FLAGS(mLoadType, LOAD_FLAGS_REPLACE_HISTORY)) { // Replace current entry in session history. @@ -7947,7 +7947,7 @@ nsDocShell::WalkHistoryEntries(nsISHEntry *aRootEntry, PRInt32 childCount = aRootShell->mChildList.Count(); for (PRInt32 j = 0; j < childCount; ++j) { nsDocShell *child = - NS_STATIC_CAST(nsDocShell*, aRootShell->ChildAt(j)); + static_cast(aRootShell->ChildAt(j)); if (child->HasHistoryEntry(childEntry)) { childShell = child; @@ -7984,7 +7984,7 @@ nsDocShell::CloneAndReplaceChild(nsISHEntry *aEntry, nsDocShell *aShell, nsresult result = NS_OK; nsCOMPtr dest; - CloneAndReplaceData *data = NS_STATIC_CAST(CloneAndReplaceData*, aData); + CloneAndReplaceData *data = static_cast(aData); PRUint32 cloneID = data->cloneID; nsISHEntry *replaceEntry = data->replaceEntry; @@ -8066,7 +8066,7 @@ nsresult nsDocShell::SetChildHistoryEntry(nsISHEntry *aEntry, nsDocShell *aShell, PRInt32 aEntryIndex, void *aData) { - SwapEntriesData *data = NS_STATIC_CAST(SwapEntriesData*, aData); + SwapEntriesData *data = static_cast(aData); nsDocShell *ignoreShell = data->ignoreShell; if (!aShell || aShell == ignoreShell) @@ -8159,9 +8159,9 @@ nsDocShell::SetHistoryEntry(nsCOMPtr *aPtr, nsISHEntry *aEntry) if (rootShell) { // if we're the root just set it, nothing to swap SwapEntriesData data = { this, newRootEntry }; nsIDocShell *rootIDocShell = - NS_STATIC_CAST(nsIDocShell*, rootShell); - nsDocShell *rootDocShell = NS_STATIC_CAST(nsDocShell*, - rootIDocShell); + static_cast(rootShell); + nsDocShell *rootDocShell = static_cast + (rootIDocShell); #ifdef NS_DEBUG nsresult rv = @@ -8346,7 +8346,7 @@ nsDocShell::ConfirmRepost(PRBool * aRepost) { nsresult rv; nsCOMPtr prompter; - CallGetInterface(this, NS_STATIC_CAST(nsIPrompt**, getter_AddRefs(prompter))); + CallGetInterface(this, static_cast(getter_AddRefs(prompter))); nsCOMPtr stringBundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv)); @@ -8476,7 +8476,7 @@ nsDocShell::EnsureScriptEnvironment() NS_ENSURE_TRUE(mScriptGlobal, NS_ERROR_FAILURE); nsCOMPtr win(do_QueryInterface(mScriptGlobal)); - win->SetDocShell(NS_STATIC_CAST(nsIDocShell *, this)); + win->SetDocShell(static_cast(this)); mScriptGlobal-> SetGlobalObjectOwner(static_cast(this)); @@ -8866,7 +8866,7 @@ nsDocShell::GetAuthPrompt(PRUint32 aPromptReason, const nsIID& iid, // of the dialogs works as it should when using tabs. return wwatch->GetPrompt(window, iid, - NS_REINTERPRET_CAST(void**, aResult)); + reinterpret_cast(aResult)); } //***************************************************************************** diff --git a/docshell/base/nsDocShellEnumerator.cpp b/docshell/base/nsDocShellEnumerator.cpp index d7e9c9687ebb..ad1074b23a9d 100644 --- a/docshell/base/nsDocShellEnumerator.cpp +++ b/docshell/base/nsDocShellEnumerator.cpp @@ -70,7 +70,7 @@ NS_IMETHODIMP nsDocShellEnumerator::GetNext(nsISupports **outCurItem) if (mCurIndex >= 0 && mCurIndex < mItemArray->Count()) { - nsIDocShellTreeItem* thisItem = NS_REINTERPRET_CAST(nsIDocShellTreeItem*, mItemArray->ElementAt(mCurIndex)); + nsIDocShellTreeItem* thisItem = reinterpret_cast(mItemArray->ElementAt(mCurIndex)); rv = thisItem->QueryInterface(NS_GET_IID(nsISupports), (void **)outCurItem); if (NS_FAILED(rv)) return rv; } diff --git a/docshell/base/nsWebShell.cpp b/docshell/base/nsWebShell.cpp index 3000869df18d..f7a94932fdae 100644 --- a/docshell/base/nsWebShell.cpp +++ b/docshell/base/nsWebShell.cpp @@ -306,7 +306,7 @@ ForEachPing(nsIContent *content, ForEachPingCallback callback, void *closure) static void OnPingTimeout(nsITimer *timer, void *closure) { - nsILoadGroup *loadGroup = NS_STATIC_CAST(nsILoadGroup *, closure); + nsILoadGroup *loadGroup = static_cast(closure); loadGroup->Cancel(NS_ERROR_ABORT); loadGroup->Release(); } @@ -412,7 +412,7 @@ struct SendPingInfo { static void SendPing(void *closure, nsIContent *content, nsIURI *uri, nsIIOService *ios) { - SendPingInfo *info = NS_STATIC_CAST(SendPingInfo *, closure); + SendPingInfo *info = static_cast(closure); if (info->numPings >= info->maxPings) return; @@ -513,7 +513,7 @@ SendPing(void *closure, nsIContent *content, nsIURI *uri, nsIIOService *ios) if (NS_SUCCEEDED(rv)) { // When the timer expires, the callback function will release this // reference to the loadgroup. - NS_STATIC_CAST(nsILoadGroup *, loadGroup.get())->AddRef(); + static_cast(loadGroup.get())->AddRef(); loadGroup = 0; } } @@ -597,7 +597,7 @@ nsWebShell::EnsureCommandHandler() nsCOMPtr commandUpdater = do_QueryInterface(mCommandManager); if (!commandUpdater) return NS_ERROR_FAILURE; - nsCOMPtr domWindow = do_GetInterface(NS_STATIC_CAST(nsIInterfaceRequestor *, this)); + nsCOMPtr domWindow = do_GetInterface(static_cast(this)); #ifdef DEBUG nsresult rv = #endif diff --git a/docshell/shistory/src/nsSHistory.cpp b/docshell/shistory/src/nsSHistory.cpp index 0adfc3f39ce0..b3443fff4ad5 100644 --- a/docshell/shistory/src/nsSHistory.cpp +++ b/docshell/shistory/src/nsSHistory.cpp @@ -844,8 +844,8 @@ nsSHistory::EvictGlobalContentViewer() nsCOMPtr evictFromSHE; nsCOMPtr evictViewer; PRInt32 totalContentViewers = 0; - nsSHistory* shist = NS_STATIC_CAST(nsSHistory*, - PR_LIST_HEAD(&gSHistoryList)); + nsSHistory* shist = static_cast + (PR_LIST_HEAD(&gSHistoryList)); while (shist != &gSHistoryList) { // Calculate the window of SHEntries that could possibly have a content // viewer. There could be up to gHistoryMaxViewers content viewers, @@ -903,7 +903,7 @@ nsSHistory::EvictGlobalContentViewer() nsISHTransaction* temp = trans; temp->GetNext(getter_AddRefs(trans)); } - shist = NS_STATIC_CAST(nsSHistory*, PR_NEXT_LINK(shist)); + shist = static_cast(PR_NEXT_LINK(shist)); } #ifdef DEBUG_PAGE_CACHE diff --git a/dom/public/nsDOMJSUtils.h b/dom/public/nsDOMJSUtils.h index edff24462d9a..5ff7cc68d807 100644 --- a/dom/public/nsDOMJSUtils.h +++ b/dom/public/nsDOMJSUtils.h @@ -15,8 +15,8 @@ GetScriptContextFromJSContext(JSContext *cx) } nsCOMPtr scx = - do_QueryInterface(NS_STATIC_CAST(nsISupports *, - ::JS_GetContextPrivate(cx))); + do_QueryInterface(static_cast + (::JS_GetContextPrivate(cx))); // This will return a pointer to something that's about to be // released, but that's ok here. diff --git a/dom/src/base/nsBarProps.cpp b/dom/src/base/nsBarProps.cpp index 157b657ad811..c794e25c54d5 100644 --- a/dom/src/base/nsBarProps.cpp +++ b/dom/src/base/nsBarProps.cpp @@ -264,7 +264,7 @@ nsStatusbarProp::SetVisible(PRBool aVisible) nsScrollbarsProp::nsScrollbarsProp(nsGlobalWindow *aWindow) { mDOMWindow = aWindow; - nsISupports *supwin = NS_STATIC_CAST(nsIScriptGlobalObject *, aWindow); + nsISupports *supwin = static_cast(aWindow); mDOMWindowWeakref = do_GetWeakReference(supwin); } diff --git a/dom/src/base/nsDOMClassInfo.cpp b/dom/src/base/nsDOMClassInfo.cpp index edbc24896298..5610f3618224 100644 --- a/dom/src/base/nsDOMClassInfo.cpp +++ b/dom/src/base/nsDOMClassInfo.cpp @@ -1563,8 +1563,8 @@ nsDOMClassInfo::~nsDOMClassInfo() { if (IS_EXTERNAL(mData->mCachedClassInfo)) { // Some compilers don't like delete'ing a const nsDOMClassInfo* - nsDOMClassInfoData* data = NS_CONST_CAST(nsDOMClassInfoData*, mData); - delete NS_STATIC_CAST(nsExternalDOMClassInfoData*, data); + nsDOMClassInfoData* data = const_cast(mData); + delete static_cast(data); } } @@ -3312,12 +3312,12 @@ nsDOMClassInfo::GetInterfaces(PRUint32 *aCount, nsIID ***aArray) return NS_OK; } - *aArray = NS_STATIC_CAST(nsIID **, nsMemory::Alloc(count * sizeof(nsIID *))); + *aArray = static_cast(nsMemory::Alloc(count * sizeof(nsIID *))); NS_ENSURE_TRUE(*aArray, NS_ERROR_OUT_OF_MEMORY); PRUint32 i; for (i = 0; i < count; i++) { - nsIID *iid = NS_STATIC_CAST(nsIID *, nsMemory::Clone(mData->mInterfaces[i], + nsIID *iid = static_cast(nsMemory::Clone(mData->mInterfaces[i], sizeof(nsIID))); if (!iid) { @@ -3336,7 +3336,7 @@ NS_IMETHODIMP nsDOMClassInfo::GetHelperForLanguage(PRUint32 language, nsISupports **_retval) { if (language == nsIProgrammingLanguage::JAVASCRIPT) { - *_retval = NS_STATIC_CAST(nsIXPCScriptable *, this); + *_retval = static_cast(this); NS_ADDREF(*_retval); } else { @@ -4885,7 +4885,7 @@ public: JSBool ok = ::JS_DefineUCProperty(cx, target, - NS_REINTERPRET_CAST(const jschar *, mClassName), + reinterpret_cast(mClassName), nsCRT::strlen(mClassName), thisAsVal, nsnull, nsnull, 0); @@ -5194,8 +5194,8 @@ nsWindowSH::GlobalResolve(nsGlobalWindow *aWin, JSContext *cx, // direct DOM class, create a constructor object... nsRefPtr constructor = - new nsDOMConstructor(NS_REINTERPRET_CAST(PRUnichar *, - ::JS_GetStringChars(str)), + new nsDOMConstructor(reinterpret_cast + (::JS_GetStringChars(str)), name_struct); if (!constructor) { return NS_ERROR_OUT_OF_MEMORY; @@ -5255,8 +5255,8 @@ nsWindowSH::GlobalResolve(nsGlobalWindow *aWin, JSContext *cx, } } - const PRUnichar *name = NS_REINTERPRET_CAST(PRUnichar *, - ::JS_GetStringChars(str)); + const PRUnichar *name = reinterpret_cast + (::JS_GetStringChars(str)); nsRefPtr constructor = new nsDOMConstructor(name, name_struct); if (!constructor) { @@ -5793,7 +5793,7 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx, const jschar *chars = ::JS_GetStringChars(str); - dsn->FindChildWithName(NS_REINTERPRET_CAST(const PRUnichar*, chars), + dsn->FindChildWithName(reinterpret_cast(chars), PR_FALSE, PR_TRUE, nsnull, nsnull, getter_AddRefs(child)); @@ -7213,7 +7213,7 @@ nsContentListSH::PreCreate(nsISupports *nativeObj, JSContext *cx, { nsCOMPtr nodeList(do_QueryInterface(nativeObj)); nsContentList *contentList = - NS_STATIC_CAST(nsContentList*, NS_STATIC_CAST(nsIDOMNodeList*, nodeList)); + static_cast(static_cast(nodeList)); if (!contentList) { return NS_OK; @@ -7589,8 +7589,8 @@ nsDocumentSH::PostCreate(nsIXPConnectWrappedNative *wrapper, JSContext *cx, NS_NAMED_LITERAL_STRING(doc_str, "document"); if (!::JS_DefineUCProperty(cx, JSVAL_TO_OBJECT(winVal), - NS_REINTERPRET_CAST(const jschar *, - doc_str.get()), + reinterpret_cast + (doc_str.get()), doc_str.Length(), OBJECT_TO_JSVAL(obj), nsnull, nsnull, JSPROP_READONLY | JSPROP_ENUMERATE)) { return NS_ERROR_FAILURE; @@ -7673,8 +7673,8 @@ nsHTMLDocumentSH::DocumentOpen(JSContext *cx, JSObject *obj, uintN argc, } replace = NS_LITERAL_STRING("replace"). - Equals(NS_REINTERPRET_CAST(const PRUnichar*, - ::JS_GetStringChars(jsstr))); + Equals(reinterpret_cast + (::JS_GetStringChars(jsstr))); } nsCOMPtr retval; @@ -8648,8 +8648,8 @@ nsHTMLFormElementSH::NewEnumerate(nsIXPConnectWrappedNative *wrapper, JSAutoRequest ar(cx); JSString *jsname = - JS_NewUCStringCopyN(cx, NS_REINTERPRET_CAST(const jschar *, - attr.get()), + JS_NewUCStringCopyN(cx, reinterpret_cast + (attr.get()), attr.Length()); NS_ENSURE_TRUE(jsname, NS_ERROR_OUT_OF_MEMORY); @@ -9564,7 +9564,7 @@ nsStringArraySH::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx, JSAutoRequest ar(cx); JSString *str = - ::JS_NewUCStringCopyN(cx, NS_REINTERPRET_CAST(const jschar *, val.get()), + ::JS_NewUCStringCopyN(cx, reinterpret_cast(val.get()), val.Length()); NS_ENSURE_TRUE(str, NS_ERROR_OUT_OF_MEMORY); @@ -9903,8 +9903,8 @@ nsStorageSH::NewEnumerate(nsIXPConnectWrappedNative *wrapper, JSContext *cx, if (keys->Length() != 0) { nsString& key = keys->ElementAt(0); JSString *str = - JS_NewUCStringCopyN(cx, NS_REINTERPRET_CAST(const jschar *, - key.get()), + JS_NewUCStringCopyN(cx, reinterpret_cast + (key.get()), key.Length()); NS_ENSURE_TRUE(str, NS_ERROR_OUT_OF_MEMORY); @@ -9992,7 +9992,7 @@ nsDOMConstructorSH::Call(nsIXPConnectWrappedNative *wrapper, JSContext *cx, PRBool *_retval) { nsDOMConstructor *wrapped = - NS_STATIC_CAST(nsDOMConstructor *, wrapper->Native()); + static_cast(wrapper->Native()); #ifdef DEBUG { @@ -10010,7 +10010,7 @@ nsDOMConstructorSH::Construct(nsIXPConnectWrappedNative *wrapper, JSContext *cx, jsval *vp, PRBool *_retval) { nsDOMConstructor *wrapped = - NS_STATIC_CAST(nsDOMConstructor *, wrapper->Native()); + static_cast(wrapper->Native()); #ifdef DEBUG { @@ -10028,7 +10028,7 @@ nsDOMConstructorSH::HasInstance(nsIXPConnectWrappedNative *wrapper, PRBool *bp, PRBool *_retval) { nsDOMConstructor *wrapped = - NS_STATIC_CAST(nsDOMConstructor *, wrapper->Native()); + static_cast(wrapper->Native()); #ifdef DEBUG { diff --git a/dom/src/base/nsFocusController.cpp b/dom/src/base/nsFocusController.cpp index d274082e6077..a7a33c715555 100644 --- a/dom/src/base/nsFocusController.cpp +++ b/dom/src/base/nsFocusController.cpp @@ -444,8 +444,8 @@ nsFocusController::GetControllerForCommand(const char * aCommand, } else if (mCurrentWindow) { nsGlobalWindow *win = - NS_STATIC_CAST(nsGlobalWindow *, - NS_STATIC_CAST(nsIDOMWindowInternal *, mCurrentWindow)); + static_cast + (static_cast(mCurrentWindow)); currentWindow = win->GetPrivateParent(); } else return NS_OK; @@ -465,8 +465,8 @@ nsFocusController::GetControllerForCommand(const char * aCommand, } nsGlobalWindow *win = - NS_STATIC_CAST(nsGlobalWindow *, - NS_STATIC_CAST(nsIDOMWindowInternal *, currentWindow)); + static_cast + (static_cast(currentWindow)); currentWindow = win->GetPrivateParent(); } diff --git a/dom/src/base/nsGlobalWindow.cpp b/dom/src/base/nsGlobalWindow.cpp index 30830b17b4bd..170c97362c17 100644 --- a/dom/src/base/nsGlobalWindow.cpp +++ b/dom/src/base/nsGlobalWindow.cpp @@ -557,7 +557,7 @@ nsGlobalWindow::~nsGlobalWindow() CleanUp(); #ifdef DEBUG - nsCycleCollector_DEBUG_wasFreed(NS_STATIC_CAST(nsIScriptGlobalObject*, this)); + nsCycleCollector_DEBUG_wasFreed(static_cast(this)); #endif delete mPendingStorageEvents; @@ -614,7 +614,7 @@ nsGlobalWindow::CleanUp() mArgumentsLast = nsnull; #ifdef DEBUG - nsCycleCollector_DEBUG_shouldBeFreed(NS_STATIC_CAST(nsIScriptGlobalObject*, this)); + nsCycleCollector_DEBUG_shouldBeFreed(static_cast(this)); #endif } @@ -680,7 +680,7 @@ nsGlobalWindow::FreeInnerObjects(PRBool aClearScope) } #ifdef DEBUG - nsCycleCollector_DEBUG_shouldBeFreed(NS_STATIC_CAST(nsIScriptGlobalObject*, this)); + nsCycleCollector_DEBUG_shouldBeFreed(static_cast(this)); #endif } @@ -1184,9 +1184,9 @@ WindowStateHolder::WindowStateHolder(nsGlobalWindow *aWindow, } focusedWindow = - NS_STATIC_CAST(nsGlobalWindow*, - NS_STATIC_CAST(nsPIDOMWindow*, - focusedWindow))->GetPrivateParent(); + static_cast + (static_cast + (focusedWindow))->GetPrivateParent(); } aWindow->SuspendTimeouts(); @@ -1291,7 +1291,7 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument, // and other browser commands. nsIDOMWindowInternal *internal = nsGlobalWindow::GetPrivateRoot(); - if (internal == NS_STATIC_CAST(nsIDOMWindowInternal *, this)) { + if (internal == static_cast(this)) { nsCOMPtr xblService = do_GetService("@mozilla.org/xbl;1"); if (xblService) { nsCOMPtr piTarget = @@ -1370,7 +1370,7 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument, nsRefPtr newInnerWindow; nsCOMPtr thisChrome = - do_QueryInterface(NS_STATIC_CAST(nsIDOMWindow *, this)); + do_QueryInterface(static_cast(this)); nsCOMPtr navigatorHolder; PRBool isChrome = PR_FALSE; @@ -1484,7 +1484,7 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument, // 163645 for more on why we need this. nsIDOMNavigator* navigator = - NS_STATIC_CAST(nsIDOMNavigator*, mNavigator.get()); + static_cast(mNavigator.get()); xpc->WrapNative(cx, currentInner->mJSObject, navigator, NS_GET_IID(nsIDOMNavigator), getter_AddRefs(navigatorHolder)); @@ -1514,8 +1514,8 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument, JSAutoRequest ar(cx); callerScx->SetTerminationFunction(ClearWindowScope, - NS_STATIC_CAST(nsIDOMWindow *, - currentInner)); + static_cast + (currentInner)); termFuncSet = PR_TRUE; } @@ -1789,7 +1789,7 @@ nsGlobalWindow::SetDocShell(nsIDocShell* aDocShell) } mContext = nsnull; // we nuked it above also #ifdef DEBUG - nsCycleCollector_DEBUG_shouldBeFreed(NS_STATIC_CAST(nsIScriptGlobalObject*, this)); + nsCycleCollector_DEBUG_shouldBeFreed(static_cast(this)); #endif } @@ -1828,7 +1828,7 @@ nsGlobalWindow::SetDocShell(nsIDocShell* aDocShell) // our window. nsCOMPtr parentWindow; GetParent(getter_AddRefs(parentWindow)); - if (parentWindow.get() != NS_STATIC_CAST(nsIDOMWindow*,this)) { + if (parentWindow.get() != static_cast(this)) { nsCOMPtr piWindow(do_QueryInterface(parentWindow)); mChromeEventHandler = piWindow->GetChromeEventHandler(); } @@ -1990,7 +1990,7 @@ nsGlobalWindow::DispatchDOMEvent(nsEvent* aEvent, nsEventStatus* aEventStatus) { return - nsEventDispatcher::DispatchDOMEvent(NS_STATIC_CAST(nsPIDOMWindow*, this), + nsEventDispatcher::DispatchDOMEvent(static_cast(this), aEvent, aDOMEvent, aPresContext, aEventStatus); } @@ -2130,7 +2130,7 @@ nsGlobalWindow::GetWindow(nsIDOMWindowInternal** aWindow) { FORWARD_TO_OUTER(GetWindow, (aWindow), NS_ERROR_NOT_INITIALIZED); - *aWindow = NS_STATIC_CAST(nsIDOMWindowInternal *, this); + *aWindow = static_cast(this); NS_ADDREF(*aWindow); return NS_OK; } @@ -2140,7 +2140,7 @@ nsGlobalWindow::GetSelf(nsIDOMWindowInternal** aWindow) { FORWARD_TO_OUTER(GetSelf, (aWindow), NS_ERROR_NOT_INITIALIZED); - *aWindow = NS_STATIC_CAST(nsIDOMWindowInternal *, this); + *aWindow = static_cast(this); NS_ADDREF(*aWindow); return NS_OK; } @@ -2222,7 +2222,7 @@ nsGlobalWindow::GetParent(nsIDOMWindow** aParent) NS_ERROR_FAILURE); } else { - *aParent = NS_STATIC_CAST(nsIDOMWindowInternal *, this); + *aParent = static_cast(this); NS_ADDREF(*aParent); } return NS_OK; @@ -2483,7 +2483,7 @@ nsGlobalWindow::GetFrames(nsIDOMWindowCollection** aFrames) } } - *aFrames = NS_STATIC_CAST(nsIDOMWindowCollection *, mFrames); + *aFrames = static_cast(mFrames); NS_IF_ADDREF(*aFrames); return NS_OK; } @@ -2535,7 +2535,7 @@ nsGlobalWindow::GetControllers(nsIControllers** aResult) nsCOMPtr controllerContext = do_QueryInterface(controller); if (!controllerContext) return NS_ERROR_FAILURE; - controllerContext->SetCommandContext(NS_STATIC_CAST(nsIDOMWindow*, this)); + controllerContext->SetCommandContext(static_cast(this)); } *aResult = mControllers; @@ -2844,7 +2844,7 @@ nsGlobalWindow::GetOuterWidth(PRInt32* aOuterWidth) NS_ENSURE_TRUE(treeOwnerAsWin, NS_ERROR_FAILURE); nsGlobalWindow* rootWindow = - NS_STATIC_CAST(nsGlobalWindow *, GetPrivateRoot()); + static_cast(GetPrivateRoot()); if (rootWindow) { rootWindow->FlushPendingNotifications(Flush_Layout); } @@ -2895,7 +2895,7 @@ nsGlobalWindow::GetOuterHeight(PRInt32* aOuterHeight) NS_ENSURE_TRUE(treeOwnerAsWin, NS_ERROR_FAILURE); nsGlobalWindow* rootWindow = - NS_STATIC_CAST(nsGlobalWindow *, GetPrivateRoot()); + static_cast(GetPrivateRoot()); if (rootWindow) { rootWindow->FlushPendingNotifications(Flush_Layout); } @@ -3080,7 +3080,7 @@ nsGlobalWindow::CheckSecurityLeftAndTop(PRInt32* aLeft, PRInt32* aTop) PRInt32 winLeft, winTop, winWidth, winHeight; nsGlobalWindow* rootWindow = - NS_STATIC_CAST(nsGlobalWindow*, GetPrivateRoot()); + static_cast(GetPrivateRoot()); if (rootWindow) { rootWindow->FlushPendingNotifications(Flush_Layout); } @@ -3266,8 +3266,7 @@ nsGlobalWindow::DispatchCustomEvent(const char *aEventName) PRBool defaultActionEnabled = PR_TRUE; nsCOMPtr doc(do_QueryInterface(mDocument)); nsContentUtils::DispatchTrustedEvent(doc, - NS_STATIC_CAST( - nsIScriptGlobalObject*, this), + static_cast(this), NS_ConvertASCIItoUTF16(aEventName), PR_TRUE, PR_TRUE, &defaultActionEnabled); @@ -3808,7 +3807,7 @@ nsGlobalWindow::Focus() NS_ASSERTION(treeItem, "What happened?"); treeItem->GetItemType(&itemType); if (itemType == nsIDocShellTreeItem::typeChrome && - GetPrivateRoot() == NS_STATIC_CAST(nsIDOMWindowInternal*, this) && + GetPrivateRoot() == static_cast(this) && mDocument) { nsCOMPtr doc(do_QueryInterface(mDocument)); NS_ASSERTION(doc, "Bogus doc?"); @@ -4529,7 +4528,7 @@ nsGlobalWindow::FireAbuseEvents(PRBool aBlocked, PRBool aWindow, } } if (!contextWindow) - contextWindow = NS_STATIC_CAST(nsIDOMWindow*,this); + contextWindow = static_cast(this); nsCOMPtr domdoc; contextWindow->GetDocument(getter_AddRefs(domdoc)); @@ -4830,8 +4829,8 @@ nsGlobalWindow::Close() // (which is what would tend to happen if we did this synchronously // here). rv = currentCX->SetTerminationFunction(CloseWindow, - NS_STATIC_CAST(nsIDOMWindow *, - this)); + static_cast + (this)); if (NS_SUCCEEDED(rv)) { mHavePendingClose = PR_TRUE; } @@ -4925,9 +4924,9 @@ nsGlobalWindow::EnterModalState() return; } - NS_STATIC_CAST(nsGlobalWindow *, - NS_STATIC_CAST(nsIDOMWindow *, - top.get()))->mModalStateDepth++; + static_cast + (static_cast + (top.get()))->mModalStateDepth++; } // static @@ -4972,9 +4971,9 @@ nsGlobalWindow::RunPendingTimeoutsRecursive(nsGlobalWindow *aTopWindow, } nsGlobalWindow *childWin = - NS_STATIC_CAST(nsGlobalWindow *, - NS_STATIC_CAST(nsIDOMWindow *, - child.get())); + static_cast + (static_cast + (child.get())); RunPendingTimeoutsRecursive(aTopWindow, childWin); } @@ -5013,9 +5012,9 @@ nsGlobalWindow::LeaveModalState() } nsGlobalWindow *topWin = - NS_STATIC_CAST(nsGlobalWindow *, - NS_STATIC_CAST(nsIDOMWindow *, - top.get())); + static_cast + (static_cast + (top.get())); topWin->mModalStateDepth--; @@ -5038,9 +5037,9 @@ nsGlobalWindow::IsInModalState() return PR_FALSE; } - return NS_STATIC_CAST(nsGlobalWindow *, - NS_STATIC_CAST(nsIDOMWindow *, - top.get()))->mModalStateDepth != 0; + return static_cast + (static_cast + (top.get()))->mModalStateDepth != 0; } NS_IMETHODIMP @@ -5410,7 +5409,7 @@ nsGlobalWindow::Atob(const nsAString& aAsciiBase64String, // the allocated memory (the PL_Base64Decode API should really // provide a guaranteed way to figure this out w/o needing to do the // above yourself). - char *dest = NS_STATIC_CAST(char *, nsMemory::Alloc(resultLen + 4)); + char *dest = static_cast(nsMemory::Alloc(resultLen + 4)); if (!dest) { return NS_ERROR_OUT_OF_MEMORY; } @@ -5632,7 +5631,7 @@ nsGlobalWindow::GetListenerManager(PRBool aCreateIfNotFound, mListenerManager = do_CreateInstance(kEventListenerManagerCID, &rv); NS_ENSURE_SUCCESS(rv, rv); mListenerManager->SetListenerTarget( - NS_STATIC_CAST(nsPIDOMEventTarget*, this)); + static_cast(this)); } NS_ADDREF(*aResult = mListenerManager); @@ -5663,7 +5662,7 @@ nsGlobalWindow::GetPrivateParent() nsCOMPtr parent; GetParent(getter_AddRefs(parent)); - if (NS_STATIC_CAST(nsIDOMWindow *, this) == parent.get()) { + if (static_cast(this) == parent.get()) { nsCOMPtr chromeElement(do_QueryInterface(mChromeEventHandler)); if (!chromeElement) return nsnull; // This is ok, just means a null parent. @@ -5680,8 +5679,8 @@ nsGlobalWindow::GetPrivateParent() } if (parent) { - return NS_STATIC_CAST(nsGlobalWindow *, - NS_STATIC_CAST(nsIDOMWindow*, parent.get())); + return static_cast + (static_cast(parent.get())); } return nsnull; @@ -5719,8 +5718,8 @@ nsGlobalWindow::GetPrivateRoot() } } - return NS_STATIC_CAST(nsGlobalWindow *, - NS_STATIC_CAST(nsIDOMWindow *, top)); + return static_cast + (static_cast(top)); } @@ -6167,7 +6166,7 @@ nsGlobalWindow::Observe(nsISupports* aSubject, const char* aTopic, PR_STATIC_CALLBACK(PLDHashOperator) FirePendingStorageEvents(const nsAString& aKey, PRBool aData, void *userArg) { - nsGlobalWindow *win = NS_STATIC_CAST(nsGlobalWindow *, userArg); + nsGlobalWindow *win = static_cast(userArg); nsCOMPtr storage; win->GetSessionStorage(getter_AddRefs(storage)); @@ -6212,8 +6211,8 @@ nsGlobalWindow::FireDelayedDOMEvents() nsCOMPtr pWin = do_GetInterface(childShell); if (pWin) { nsGlobalWindow *win = - NS_STATIC_CAST(nsGlobalWindow*, - NS_STATIC_CAST(nsPIDOMWindow*, pWin)); + static_cast + (static_cast(pWin)); win->FireDelayedDOMEvents(); } } @@ -6236,7 +6235,7 @@ nsGlobalWindow::GetParentInternal() nsCOMPtr parent; GetParent(getter_AddRefs(parent)); - if (parent && parent != NS_STATIC_CAST(nsIDOMWindow *, this)) { + if (parent && parent != static_cast(this)) { nsCOMPtr tmp(do_QueryInterface(parent)); NS_ASSERTION(parent, "Huh, parent not an nsIDOMWindowInternal?"); @@ -6250,8 +6249,8 @@ nsGlobalWindow::GetParentInternal() void nsGlobalWindow::CloseBlockScriptTerminationFunc(nsISupports *aRef) { - nsGlobalWindow* pwin = NS_STATIC_CAST(nsGlobalWindow*, - NS_STATIC_CAST(nsPIDOMWindow*, aRef)); + nsGlobalWindow* pwin = static_cast + (static_cast(aRef)); pwin->mBlockScriptedClosingFlag = PR_FALSE; } @@ -6344,8 +6343,8 @@ nsGlobalWindow::OpenInternal(const nsAString& aUrl, const nsAString& aName, if (mContext == GetScriptContextFromJSContext(aJSCallerContext)) { mBlockScriptedClosingFlag = PR_TRUE; mContext->SetTerminationFunction(CloseBlockScriptTerminationFunc, - NS_STATIC_CAST(nsPIDOMWindow*, - this)); + static_cast + (this)); } } @@ -6438,7 +6437,7 @@ nsGlobalWindow::OpenInternal(const nsAString& aUrl, const nsAString& aName, if (checkForPopup) { if (abuseLevel >= openControlled) { - nsGlobalWindow *opened = NS_STATIC_CAST(nsGlobalWindow *, *aReturn); + nsGlobalWindow *opened = static_cast(*aReturn); if (!opened->IsPopupSpamWindow()) { opened->SetPopupSpamWindow(PR_TRUE); ++gOpenPopupSpamCount; @@ -6452,7 +6451,7 @@ nsGlobalWindow::OpenInternal(const nsAString& aUrl, const nsAString& aName, // necessary. If the new window has the same domain as this window // did at the beginning of this function, the session storage data // for that domain, and only that domain, is copied over. - nsGlobalWindow *opened = NS_STATIC_CAST(nsGlobalWindow *, *aReturn); + nsGlobalWindow *opened = static_cast(*aReturn); nsIDocShell* newDocShell = opened->GetDocShell(); if (currentCodebase && newDocShell && mDocShell && url.get()) { @@ -6490,8 +6489,8 @@ nsGlobalWindow::CloseWindow(nsISupports *aWindow) nsCOMPtr win(do_QueryInterface(aWindow)); nsGlobalWindow* globalWin = - NS_STATIC_CAST(nsGlobalWindow *, - NS_STATIC_CAST(nsPIDOMWindow*, win)); + static_cast + (static_cast(win)); // Need to post an event for closing, otherwise window and // presshell etc. may get destroyed while creating frames, bug 338897. @@ -6858,7 +6857,7 @@ nsGlobalWindow::RunTimeout(nsTimeout *aTimeout) (PRTime)PR_USEC_PER_MSEC)); nsCOMPtr dummy; - nsCOMPtr me(NS_STATIC_CAST(nsIDOMWindow *, this)); + nsCOMPtr me(static_cast(this)); scx->CallEventHandler(me, GetScriptGlobal(handler->GetScriptTypeID()), scriptObject, handler->GetArgv(), @@ -7301,7 +7300,7 @@ nsGlobalWindow::BuildURIfromBase(const char *aURL, nsIURI **aBuiltURI, return NS_ERROR_FAILURE; nsCOMPtr chrome_win = - do_QueryInterface(NS_STATIC_CAST(nsIDOMWindow *, this)); + do_QueryInterface(static_cast(this)); if (nsContentUtils::IsCallerChrome() && !chrome_win) { // If open() is called from chrome on a non-chrome window, we'll @@ -7384,7 +7383,7 @@ nsGlobalWindow::EnsureSizeUpToDate() // crosses the content/chrome boundary, since chrome can have pending reflows // too. nsGlobalWindow *parent = - NS_STATIC_CAST(nsGlobalWindow *, GetPrivateParent()); + static_cast(GetPrivateParent()); if (parent) { parent->FlushPendingNotifications(Flush_Layout); } @@ -7547,8 +7546,8 @@ nsGlobalWindow::SuspendTimeouts() nsCOMPtr pWin = do_GetInterface(childShell); if (pWin) { nsGlobalWindow *win = - NS_STATIC_CAST(nsGlobalWindow*, - NS_STATIC_CAST(nsPIDOMWindow*, pWin)); + static_cast + (static_cast(pWin)); win->SuspendTimeouts(); @@ -7616,8 +7615,8 @@ nsGlobalWindow::ResumeTimeouts() nsCOMPtr pWin = do_GetInterface(childShell); if (pWin) { nsGlobalWindow *win = - NS_STATIC_CAST(nsGlobalWindow*, - NS_STATIC_CAST(nsPIDOMWindow*, pWin)); + static_cast + (static_cast(pWin)); NS_ASSERTION(win->IsOuterWindow(), "Expected outer window"); nsGlobalWindow* inner = win->GetCurrentInnerWindowInternal(); @@ -7922,7 +7921,7 @@ NS_NewScriptGlobalObject(PRBool aIsChrome, nsIScriptGlobalObject **aResult) NS_ENSURE_TRUE(global, NS_ERROR_OUT_OF_MEMORY); - return CallQueryInterface(NS_STATIC_CAST(nsIScriptGlobalObject *, global), + return CallQueryInterface(static_cast(global), aResult); } diff --git a/dom/src/base/nsGlobalWindow.h b/dom/src/base/nsGlobalWindow.h index a6628581aacf..9db140eef2c4 100644 --- a/dom/src/base/nsGlobalWindow.h +++ b/dom/src/base/nsGlobalWindow.h @@ -148,12 +148,12 @@ struct nsTimeout : PRCList nsTimeout* Next() { // Note: might not actually return an nsTimeout. Use IsTimeout to check. - return NS_STATIC_CAST(nsTimeout*, PR_NEXT_LINK(this)); + return static_cast(PR_NEXT_LINK(this)); } nsTimeout* Prev() { // Note: might not actually return an nsTimeout. Use IsTimeout to check. - return NS_STATIC_CAST(nsTimeout*, PR_PREV_LINK(this)); + return static_cast(PR_PREV_LINK(this)); } // Window for which this timeout fires @@ -303,11 +303,11 @@ public: virtual NS_HIDDEN_(nsPIDOMEventTarget*) GetTargetForDOMEvent() { - return NS_STATIC_CAST(nsPIDOMEventTarget*, GetOuterWindowInternal()); + return static_cast(GetOuterWindowInternal()); } virtual NS_HIDDEN_(nsPIDOMEventTarget*) GetTargetForEventTargetChain() { - return NS_STATIC_CAST(nsPIDOMEventTarget*, GetCurrentInnerWindowInternal()); + return static_cast(GetCurrentInnerWindowInternal()); } virtual NS_HIDDEN_(nsresult) PreHandleEvent(nsEventChainPreVisitor& aVisitor); virtual NS_HIDDEN_(nsresult) PostHandleEvent(nsEventChainPostVisitor& aVisitor); @@ -376,17 +376,17 @@ public: nsGlobalWindow *GetOuterWindowInternal() { - return NS_STATIC_CAST(nsGlobalWindow *, GetOuterWindow()); + return static_cast(GetOuterWindow()); } nsGlobalWindow *GetCurrentInnerWindowInternal() { - return NS_STATIC_CAST(nsGlobalWindow *, mInnerWindow); + return static_cast(mInnerWindow); } nsGlobalWindow *EnsureInnerWindowInternal() { - return NS_STATIC_CAST(nsGlobalWindow *, EnsureInnerWindow()); + return static_cast(EnsureInnerWindow()); } PRBool IsFrozen() const @@ -593,12 +593,12 @@ protected: nsTimeout* FirstTimeout() { // Note: might not actually return an nsTimeout. Use IsTimeout to check. - return NS_STATIC_CAST(nsTimeout*, PR_LIST_HEAD(&mTimeouts)); + return static_cast(PR_LIST_HEAD(&mTimeouts)); } nsTimeout* LastTimeout() { // Note: might not actually return an nsTimeout. Use IsTimeout to check. - return NS_STATIC_CAST(nsTimeout*, PR_LIST_TAIL(&mTimeouts)); + return static_cast(PR_LIST_TAIL(&mTimeouts)); } PRBool IsTimeout(PRCList* aList) { diff --git a/dom/src/base/nsGlobalWindowCommands.cpp b/dom/src/base/nsGlobalWindowCommands.cpp index b0263f69652b..b3aab4beea81 100644 --- a/dom/src/base/nsGlobalWindowCommands.cpp +++ b/dom/src/base/nsGlobalWindowCommands.cpp @@ -904,7 +904,7 @@ nsClipboardDragDropHookCommand::GetCommandStateParams(const char *aCommandName, NS_NEWXPCOM(theCmd, _cmdClass); \ if (!theCmd) return NS_ERROR_OUT_OF_MEMORY; \ rv = inCommandTable->RegisterCommand(_cmdName, \ - NS_STATIC_CAST(nsIControllerCommand *, theCmd)); \ + static_cast(theCmd)); \ } #define NS_REGISTER_FIRST_COMMAND(_cmdClass, _cmdName) \ @@ -913,15 +913,15 @@ nsClipboardDragDropHookCommand::GetCommandStateParams(const char *aCommandName, NS_NEWXPCOM(theCmd, _cmdClass); \ if (!theCmd) return NS_ERROR_OUT_OF_MEMORY; \ rv = inCommandTable->RegisterCommand(_cmdName, \ - NS_STATIC_CAST(nsIControllerCommand *, theCmd)); + static_cast(theCmd)); #define NS_REGISTER_NEXT_COMMAND(_cmdClass, _cmdName) \ rv = inCommandTable->RegisterCommand(_cmdName, \ - NS_STATIC_CAST(nsIControllerCommand *, theCmd)); + static_cast(theCmd)); #define NS_REGISTER_LAST_COMMAND(_cmdClass, _cmdName) \ rv = inCommandTable->RegisterCommand(_cmdName, \ - NS_STATIC_CAST(nsIControllerCommand *, theCmd)); \ + static_cast(theCmd)); \ } diff --git a/dom/src/base/nsJSEnvironment.cpp b/dom/src/base/nsJSEnvironment.cpp index 73027f51301f..00dcb708b464 100644 --- a/dom/src/base/nsJSEnvironment.cpp +++ b/dom/src/base/nsJSEnvironment.cpp @@ -294,8 +294,8 @@ NS_ScriptErrorReporter(JSContext *cx, if (report) { fileName.AssignWithConversion(report->filename); - const PRUnichar *m = NS_REINTERPRET_CAST(const PRUnichar*, - report->ucmessage); + const PRUnichar *m = reinterpret_cast + (report->ucmessage); if (m) { msg.Assign(m); @@ -371,8 +371,8 @@ NS_ScriptErrorReporter(JSContext *cx, PRUint32 column = report->uctokenptr - report->uclinebuf; rv = errorObject->Init(msg.get(), fileName.get(), - NS_REINTERPRET_CAST(const PRUnichar*, - report->uclinebuf), + reinterpret_cast + (report->uclinebuf), report->lineno, column, report->flags, category); } else if (message) { @@ -412,7 +412,7 @@ NS_ScriptErrorReporter(JSContext *cx, error.AppendInt(report->lineno, 10); error.Append(": "); if (report->ucmessage) { - AppendUTF16toUTF8(NS_REINTERPRET_CAST(const PRUnichar*, report->ucmessage), + AppendUTF16toUTF8(reinterpret_cast(report->ucmessage), error); } else { error.Append(message); @@ -502,7 +502,7 @@ LocaleToUnicode(JSContext *cx, char *src, jsval *rval) unichars = shrunkUnichars; } str = JS_NewUCString(cx, - NS_REINTERPRET_CAST(jschar*, unichars), + reinterpret_cast(unichars), unicharLength); } if (!str) @@ -611,8 +611,8 @@ JSObject2Win(JSContext *cx, JSObject *obj) if (wrapper) { nsCOMPtr win = do_QueryWrappedNative(wrapper); if (win) { - return NS_STATIC_CAST(nsGlobalWindow *, - NS_STATIC_CAST(nsPIDOMWindow *, win)); + return static_cast + (static_cast(win)); } } @@ -686,7 +686,7 @@ JSBool JS_DLL_CALLBACK nsJSContext::DOMBranchCallback(JSContext *cx, JSScript *script) { // Get the native context - nsJSContext *ctx = NS_STATIC_CAST(nsJSContext *, ::JS_GetContextPrivate(cx)); + nsJSContext *ctx = static_cast(::JS_GetContextPrivate(cx)); if (!ctx) { // Can happen; see bug 355811 @@ -891,7 +891,7 @@ static const char js_relimit_option_str[] = JS_OPTIONS_DOT_STR "relimit"; int PR_CALLBACK nsJSContext::JSOptionChangedCallback(const char *pref, void *data) { - nsJSContext *context = NS_REINTERPRET_CAST(nsJSContext *, data); + nsJSContext *context = reinterpret_cast(data); PRUint32 oldDefaultJSOptions = context->mDefaultJSOptions; PRUint32 newDefaultJSOptions = oldDefaultJSOptions; @@ -945,7 +945,7 @@ nsJSContext::nsJSContext(JSRuntime *aRuntime) : mGCOnDestruction(PR_TRUE) mContext = ::JS_NewContext(aRuntime, gStackSize); if (mContext) { - ::JS_SetContextPrivate(mContext, NS_STATIC_CAST(nsIScriptContext *, this)); + ::JS_SetContextPrivate(mContext, static_cast(this)); // Make sure the new context gets the default context options ::JS_SetOptions(mContext, mDefaultJSOptions); @@ -1045,7 +1045,7 @@ NoteContextChild(JSTracer *trc, void *thing, uint32 kind) if (kind == JSTRACE_OBJECT || kind == JSTRACE_NAMESPACE || kind == JSTRACE_QNAME || kind == JSTRACE_XML) { - ContextCallbackItem *item = NS_STATIC_CAST(ContextCallbackItem*, trc); + ContextCallbackItem *item = static_cast(trc); item->cb->NoteScriptChild(JAVASCRIPT, thing); } } @@ -1203,7 +1203,7 @@ nsJSContext::EvaluateStringWithValue(const nsAString& aScript, *aIsUndefined = JSVAL_IS_VOID(val); } - *NS_STATIC_CAST(jsval*, aRetValue) = val; + *static_cast(aRetValue) = val; // XXX - nsScriptObjectHolder should be used once this method moves to // the new world order. However, use of 'jsval' appears to make this // tricky... @@ -1241,8 +1241,8 @@ JSValueToAString(JSContext *cx, jsval val, nsAString *result, JSString* jsstring = ::JS_ValueToString(cx, val); if (jsstring) { - result->Assign(NS_REINTERPRET_CAST(const PRUnichar*, - ::JS_GetStringChars(jsstring)), + result->Assign(reinterpret_cast + (::JS_GetStringChars(jsstring)), ::JS_GetStringLength(jsstring)); } else { result->Truncate(); @@ -1778,7 +1778,7 @@ nsJSContext::CallEventHandler(nsISupports* aTarget, void *aScope, void *aHandler global->GetScriptContext(JAVASCRIPT); if (context && context != this) { JSContext* cx = - NS_STATIC_CAST(JSContext*, context->GetNativeContext()); + static_cast(context->GetNativeContext()); rv = stack->Push(cx); if (NS_SUCCEEDED(rv)) { rv = sSecurityManager->CheckFunctionAccess(cx, aHandler, @@ -1811,7 +1811,7 @@ nsJSContext::CallEventHandler(nsISupports* aTarget, void *aScope, void *aHandler // right scope anyway, and we want to make sure that the arguments end up // in the same scope as aTarget. rv = ConvertSupportsTojsvals(aargv, target, &argc, - NS_REINTERPRET_CAST(void **, &argv), &mark); + reinterpret_cast(&argv), &mark); if (NS_FAILED(rv)) { stack->Pop(nsnull); return rv; @@ -1960,8 +1960,8 @@ nsJSContext::Serialize(nsIObjectOutputStream* aStream, void *aScriptObject) xdr->userdata = (void*) aStream; JSAutoRequest ar(cx); - JSScript *script = NS_REINTERPRET_CAST(JSScript*, - ::JS_GetPrivate(cx, mJSObject)); + JSScript *script = reinterpret_cast + (::JS_GetPrivate(cx, mJSObject)); if (! ::JS_XDRScript(xdr, &script)) { rv = NS_ERROR_FAILURE; // likely to be a principals serialization error } else { @@ -1980,8 +1980,8 @@ nsJSContext::Serialize(nsIObjectOutputStream* aStream, void *aScriptObject) // one last buffer of data to write to aStream. uint32 size; - const char* data = NS_REINTERPRET_CAST(const char*, - ::JS_XDRMemGetData(xdr, &size)); + const char* data = reinterpret_cast + (::JS_XDRMemGetData(xdr, &size)); NS_ASSERTION(data, "no decoded JSXDRState data!"); rv = aStream->Write32(size); @@ -2136,7 +2136,7 @@ nsJSContext::CreateNativeGlobalForInner( getter_AddRefs(jsholder)); if (NS_FAILED(rv)) return rv; - jsholder->GetJSObject(NS_REINTERPRET_CAST(JSObject **, aNativeGlobal)); + jsholder->GetJSObject(reinterpret_cast(aNativeGlobal)); *aHolder = jsholder.get(); NS_ADDREF(*aHolder); return NS_OK; @@ -2346,7 +2346,7 @@ nsJSContext::SetProperty(void *aTarget, const char *aPropName, nsISupports *aArg nsresult rv; rv = ConvertSupportsTojsvals(aArgs, GetNativeGlobal(), &argc, - NS_REINTERPRET_CAST(void **, &argv), &mark); + reinterpret_cast(&argv), &mark); NS_ENSURE_SUCCESS(rv, rv); AutoFreeJSStack stackGuard(mContext, mark); // ensure always freed. @@ -2354,7 +2354,7 @@ nsJSContext::SetProperty(void *aTarget, const char *aPropName, nsISupports *aArg JSObject *args = ::JS_NewArrayObject(mContext, argc, argv); jsval vargs = OBJECT_TO_JSVAL(args); - rv = ::JS_SetProperty(mContext, NS_REINTERPRET_CAST(JSObject *, aTarget), aPropName, &vargs) ? + rv = ::JS_SetProperty(mContext, reinterpret_cast(aTarget), aPropName, &vargs) ? NS_OK : NS_ERROR_FAILURE; // free 'args'??? @@ -2509,7 +2509,7 @@ nsJSContext::AddSupportsPrimitiveTojsvals(nsISupports *aArg, jsval *aArgv) // to be equivalent; both unsigned 16-bit entities JSString *str = ::JS_NewUCStringCopyN(cx, - NS_REINTERPRET_CAST(const jschar *,data.get()), + reinterpret_cast(data.get()), data.Length()); NS_ENSURE_TRUE(str, NS_ERROR_OUT_OF_MEMORY); @@ -2983,7 +2983,7 @@ nsJSContext::InitClasses(void *aGlobalObj) { nsresult rv = NS_OK; - JSObject *globalObj = NS_STATIC_CAST(JSObject *, aGlobalObj); + JSObject *globalObj = static_cast(aGlobalObj); rv = InitializeExternalClasses(); NS_ENSURE_SUCCESS(rv, rv); @@ -3747,7 +3747,7 @@ nsresult NS_CreateJSArgv(JSContext *aContext, PRUint32 argc, void *argv, { nsresult rv; nsJSArgArray *ret = new nsJSArgArray(aContext, argc, - NS_STATIC_CAST(jsval *, argv), &rv); + static_cast(argv), &rv); if (ret == nsnull) return NS_ERROR_OUT_OF_MEMORY; if (NS_FAILED(rv)) { diff --git a/dom/src/base/nsJSTimeoutHandler.cpp b/dom/src/base/nsJSTimeoutHandler.cpp index 9cd574b8b911..91644af04a06 100644 --- a/dom/src/base/nsJSTimeoutHandler.cpp +++ b/dom/src/base/nsJSTimeoutHandler.cpp @@ -304,7 +304,7 @@ nsJSScriptTimeoutHandler::Init(nsIScriptContext *aContext, PRBool *aIsInterval, PRUint32 dummy; jsval *jsargv = nsnull; nsCOMPtr jsarray(do_QueryInterface(array)); - jsarray->GetArgs(&dummy, NS_REINTERPRET_CAST(void **, &jsargv)); + jsarray->GetArgs(&dummy, reinterpret_cast(&jsargv)); // must have worked - we own the impl! :) NS_ASSERTION(jsargv, "No argv!"); for (PRInt32 i = 2; (PRUint32)i < argc; ++i) { @@ -336,7 +336,7 @@ void nsJSScriptTimeoutHandler::SetLateness(PRIntervalTime aHowLate) if (jsarray) { PRUint32 argc; jsval *jsargv; - jsarray->GetArgs(&argc, NS_REINTERPRET_CAST(void **, &jsargv)); + jsarray->GetArgs(&argc, reinterpret_cast(&jsargv)); if (jsargv && argc) jsargv[argc-1] = INT_TO_JSVAL((jsint) aHowLate); } else { @@ -348,8 +348,8 @@ const PRUnichar * nsJSScriptTimeoutHandler::GetHandlerText() { NS_ASSERTION(mExpr, "No expression, so no handler text!"); - return NS_REINTERPRET_CAST(const PRUnichar *, - ::JS_GetStringChars(mExpr)); + return reinterpret_cast + (::JS_GetStringChars(mExpr)); } nsresult NS_CreateJSTimeoutHandler(nsIScriptContext *aContext, @@ -368,5 +368,5 @@ nsresult NS_CreateJSTimeoutHandler(nsIScriptContext *aContext, return rv; } return handler->QueryInterface(NS_GET_IID(nsIScriptTimeoutHandler), - NS_REINTERPRET_CAST(void **, aRet)); + reinterpret_cast(aRet)); } diff --git a/dom/src/base/nsJSUtils.cpp b/dom/src/base/nsJSUtils.cpp index c9aa982fad27..f233bbd48820 100644 --- a/dom/src/base/nsJSUtils.cpp +++ b/dom/src/base/nsJSUtils.cpp @@ -97,8 +97,8 @@ jsval nsJSUtils::ConvertStringToJSVal(const nsString& aProp, JSContext* aContext) { JSString *jsstring = - ::JS_NewUCStringCopyN(aContext, NS_REINTERPRET_CAST(const jschar*, - aProp.get()), + ::JS_NewUCStringCopyN(aContext, reinterpret_cast + (aProp.get()), aProp.Length()); // set the return value @@ -111,8 +111,8 @@ nsJSUtils::ConvertJSValToString(nsAString& aString, JSContext* aContext, { JSString *jsstring; if ((jsstring = ::JS_ValueToString(aContext, aValue)) != nsnull) { - aString.Assign(NS_REINTERPRET_CAST(const PRUnichar*, - ::JS_GetStringChars(jsstring)), + aString.Assign(reinterpret_cast + (::JS_GetStringChars(jsstring)), ::JS_GetStringLength(jsstring)); } else { diff --git a/dom/src/base/nsScriptNameSpaceManager.cpp b/dom/src/base/nsScriptNameSpaceManager.cpp index 3fe25de7d2f4..972d6a56d47e 100644 --- a/dom/src/base/nsScriptNameSpaceManager.cpp +++ b/dom/src/base/nsScriptNameSpaceManager.cpp @@ -71,7 +71,7 @@ public: PR_STATIC_CALLBACK(PLDHashNumber) GlobalNameHashHashKey(PLDHashTable *table, const void *key) { - const nsAString *str = NS_STATIC_CAST(const nsAString *, key); + const nsAString *str = static_cast(key); return HashString(*str); } @@ -81,8 +81,8 @@ GlobalNameHashMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry, const void *key) { const GlobalNameMapEntry *e = - NS_STATIC_CAST(const GlobalNameMapEntry *, entry); - const nsAString *str = NS_STATIC_CAST(const nsAString *, key); + static_cast(entry); + const nsAString *str = static_cast(key); return str->Equals(e->mKey); } @@ -90,7 +90,7 @@ GlobalNameHashMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry, PR_STATIC_CALLBACK(void) GlobalNameHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) { - GlobalNameMapEntry *e = NS_STATIC_CAST(GlobalNameMapEntry *, entry); + GlobalNameMapEntry *e = static_cast(entry); // An entry is being cleared, let the key (nsString) do its own // cleanup. @@ -120,8 +120,8 @@ PR_STATIC_CALLBACK(PRBool) GlobalNameHashInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, const void *key) { - GlobalNameMapEntry *e = NS_STATIC_CAST(GlobalNameMapEntry *, entry); - const nsAString *keyStr = NS_STATIC_CAST(const nsAString *, key); + GlobalNameMapEntry *e = static_cast(entry); + const nsAString *keyStr = static_cast(key); // Initialize the key in the entry with placement new new (&e->mKey) nsString(*keyStr); @@ -150,8 +150,8 @@ nsScriptNameSpaceManager::AddToHash(const char *aKey) { NS_ConvertASCIItoUTF16 key(aKey); GlobalNameMapEntry *entry = - NS_STATIC_CAST(GlobalNameMapEntry *, - PL_DHashTableOperate(&mGlobalNames, &key, PL_DHASH_ADD)); + static_cast + (PL_DHashTableOperate(&mGlobalNames, &key, PL_DHASH_ADD)); if (!entry) { return nsnull; @@ -167,8 +167,8 @@ nsScriptNameSpaceManager::GetConstructorProto(const nsGlobalNameStruct* aStruct) "This function only works on constructor aliases!"); if (!aStruct->mAlias->mProto) { GlobalNameMapEntry *proto = - NS_STATIC_CAST(GlobalNameMapEntry *, - PL_DHashTableOperate(&mGlobalNames, + static_cast + (PL_DHashTableOperate(&mGlobalNames, &aStruct->mAlias->mProtoName, PL_DHASH_LOOKUP)); @@ -509,7 +509,7 @@ PR_STATIC_CALLBACK(PLDHashOperator) NameSetInitCallback(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void *arg) { - GlobalNameMapEntry *entry = NS_STATIC_CAST(GlobalNameMapEntry *, hdr); + GlobalNameMapEntry *entry = static_cast(hdr); if (entry->mGlobalName.mType == nsGlobalNameStruct::eTypeStaticNameSet) { nsresult rv = NS_OK; @@ -517,7 +517,7 @@ NameSetInitCallback(PLDHashTable *table, PLDHashEntryHdr *hdr, do_CreateInstance(entry->mGlobalName.mCID, &rv); NS_ENSURE_SUCCESS(rv, PL_DHASH_NEXT); - NameSetClosure *closure = NS_STATIC_CAST(NameSetClosure *, arg); + NameSetClosure *closure = static_cast(arg); closure->rv = ns->InitializeNameSet(closure->ctx); if (NS_FAILED(closure->rv)) { NS_ERROR("Initing external script classes failed!"); @@ -545,8 +545,8 @@ nsScriptNameSpaceManager::LookupName(const nsAString& aName, const PRUnichar **aClassName) { GlobalNameMapEntry *entry = - NS_STATIC_CAST(GlobalNameMapEntry *, - PL_DHashTableOperate(&mGlobalNames, &aName, + static_cast + (PL_DHashTableOperate(&mGlobalNames, &aName, PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_BUSY(entry)) { diff --git a/dom/src/base/nsWindowRoot.cpp b/dom/src/base/nsWindowRoot.cpp index 1aed10f29ee2..3ffdd6b59533 100644 --- a/dom/src/base/nsWindowRoot.cpp +++ b/dom/src/base/nsWindowRoot.cpp @@ -67,10 +67,10 @@ nsWindowRoot::nsWindowRoot(nsIDOMWindow* aWindow) nsFocusController::Create(getter_AddRefs(mFocusController)); nsCOMPtr focusListener(do_QueryInterface(mFocusController)); - mRefCnt.incr(NS_STATIC_CAST(nsIDOMEventTarget*, this)); + mRefCnt.incr(static_cast(this)); AddEventListener(NS_LITERAL_STRING("focus"), focusListener, PR_TRUE); AddEventListener(NS_LITERAL_STRING("blur"), focusListener, PR_TRUE); - mRefCnt.decr(NS_STATIC_CAST(nsIDOMEventTarget*, this)); + mRefCnt.decr(static_cast(this)); } nsWindowRoot::~nsWindowRoot() @@ -111,7 +111,7 @@ nsWindowRoot::DispatchEvent(nsIDOMEvent* aEvt, PRBool *_retval) { nsEventStatus status = nsEventStatus_eIgnore; nsresult rv = nsEventDispatcher::DispatchDOMEvent( - NS_STATIC_CAST(nsPIDOMEventTarget*, this), nsnull, aEvt, nsnull, &status); + static_cast(this), nsnull, aEvt, nsnull, &status); *_retval = (status != nsEventStatus_eConsumeNoDefault); return rv; } @@ -122,7 +122,7 @@ nsWindowRoot::DispatchDOMEvent(nsEvent* aEvent, nsPresContext* aPresContext, nsEventStatus* aEventStatus) { - return nsEventDispatcher::DispatchDOMEvent(NS_STATIC_CAST(nsPIDOMEventTarget*, this), + return nsEventDispatcher::DispatchDOMEvent(static_cast(this), aEvent, aDOMEvent, aPresContext, aEventStatus); } @@ -220,7 +220,7 @@ nsWindowRoot::GetListenerManager(PRBool aCreateIfNotFound, mListenerManager = do_CreateInstance(kEventListenerManagerCID, &rv); if (NS_FAILED(rv)) return rv; mListenerManager->SetListenerTarget( - NS_STATIC_CAST(nsPIDOMEventTarget*, this)); + static_cast(this)); } *aResult = mListenerManager; diff --git a/dom/src/events/nsJSEventListener.cpp b/dom/src/events/nsJSEventListener.cpp index b02dbdf68357..fffb860a8538 100644 --- a/dom/src/events/nsJSEventListener.cpp +++ b/dom/src/events/nsJSEventListener.cpp @@ -162,7 +162,7 @@ nsJSEventListener::HandleEvent(nsIDOMEvent* aEvent) if (event->message == NS_LOAD_ERROR && event->eventStructType == NS_SCRIPT_ERROR_EVENT) { nsScriptErrorEvent *scriptEvent = - NS_STATIC_CAST(nsScriptErrorEvent*, event); + static_cast(event); // Create a temp argv for the error event. nsCOMPtr tempargv = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv); @@ -228,7 +228,7 @@ nsJSEventListener::HandleEvent(nsIDOMEvent* aEvent) NS_ERROR_UNEXPECTED); nsBeforePageUnloadEvent *beforeUnload = - NS_STATIC_CAST(nsBeforePageUnloadEvent *, event); + static_cast(event); if (dataType != nsIDataType::VTYPE_VOID) { aEvent->PreventDefault(); diff --git a/dom/src/storage/nsDOMStorage.cpp b/dom/src/storage/nsDOMStorage.cpp index e206e3cd615e..aa753d43f074 100644 --- a/dom/src/storage/nsDOMStorage.cpp +++ b/dom/src/storage/nsDOMStorage.cpp @@ -764,7 +764,7 @@ nsDOMStorage::ClearAll() PR_STATIC_CALLBACK(PLDHashOperator) CopyStorageItems(nsSessionStorageEntry* aEntry, void* userArg) { - nsDOMStorage* newstorage = NS_STATIC_CAST(nsDOMStorage*, userArg); + nsDOMStorage* newstorage = static_cast(userArg); newstorage->SetItem(aEntry->GetKey(), aEntry->mItem->GetValueInternal()); diff --git a/editor/composer/src/nsComposerCommandsUpdater.cpp b/editor/composer/src/nsComposerCommandsUpdater.cpp index 010647963684..ac2d90384ed3 100644 --- a/editor/composer/src/nsComposerCommandsUpdater.cpp +++ b/editor/composer/src/nsComposerCommandsUpdater.cpp @@ -262,7 +262,7 @@ nsComposerCommandsUpdater::PrimeUpdateTimer() } const PRUint32 kUpdateTimerDelay = 150; - return mUpdateTimer->InitWithCallback(NS_STATIC_CAST(nsITimerCallback*, this), + return mUpdateTimer->InitWithCallback(static_cast(this), kUpdateTimerDelay, nsITimer::TYPE_ONE_SHOT); } diff --git a/editor/composer/src/nsComposerController.cpp b/editor/composer/src/nsComposerController.cpp index 0670aa4b3470..88ab87fa747e 100644 --- a/editor/composer/src/nsComposerController.cpp +++ b/editor/composer/src/nsComposerController.cpp @@ -48,7 +48,7 @@ NS_NEWXPCOM(theCmd, _cmdClass); \ if (!theCmd) return NS_ERROR_OUT_OF_MEMORY; \ rv = inCommandTable->RegisterCommand(_cmdName, \ - NS_STATIC_CAST(nsIControllerCommand *, theCmd)); \ + static_cast(theCmd)); \ } #define NS_REGISTER_FIRST_COMMAND(_cmdClass, _cmdName) \ @@ -57,15 +57,15 @@ NS_NEWXPCOM(theCmd, _cmdClass); \ if (!theCmd) return NS_ERROR_OUT_OF_MEMORY; \ rv = inCommandTable->RegisterCommand(_cmdName, \ - NS_STATIC_CAST(nsIControllerCommand *, theCmd)); + static_cast(theCmd)); #define NS_REGISTER_NEXT_COMMAND(_cmdClass, _cmdName) \ rv = inCommandTable->RegisterCommand(_cmdName, \ - NS_STATIC_CAST(nsIControllerCommand *, theCmd)); + static_cast(theCmd)); #define NS_REGISTER_LAST_COMMAND(_cmdClass, _cmdName) \ rv = inCommandTable->RegisterCommand(_cmdName, \ - NS_STATIC_CAST(nsIControllerCommand *, theCmd)); \ + static_cast(theCmd)); \ } #define NS_REGISTER_STYLE_COMMAND(_cmdClass, _cmdName, _styleTag) \ @@ -73,7 +73,7 @@ _cmdClass* theCmd = new _cmdClass(_styleTag); \ if (!theCmd) return NS_ERROR_OUT_OF_MEMORY; \ rv = inCommandTable->RegisterCommand(_cmdName, \ - NS_STATIC_CAST(nsIControllerCommand *, theCmd)); \ + static_cast(theCmd)); \ } #define NS_REGISTER_TAG_COMMAND(_cmdClass, _cmdName, _tagName) \ @@ -81,7 +81,7 @@ _cmdClass* theCmd = new _cmdClass(_tagName); \ if (!theCmd) return NS_ERROR_OUT_OF_MEMORY; \ rv = inCommandTable->RegisterCommand(_cmdName, \ - NS_STATIC_CAST(nsIControllerCommand *, theCmd)); \ + static_cast(theCmd)); \ } diff --git a/editor/composer/src/nsEditingSession.cpp b/editor/composer/src/nsEditingSession.cpp index 19252e69a58e..c0a78234a138 100644 --- a/editor/composer/src/nsEditingSession.cpp +++ b/editor/composer/src/nsEditingSession.cpp @@ -205,7 +205,7 @@ nsEditingSession::MakeWindowEditable(nsIDOMWindow *aWindow, // the first is an editor controller rv = SetupEditorCommandController("@mozilla.org/editor/editorcontroller;1", aWindow, - NS_STATIC_CAST(nsIEditingSession*, this), + static_cast(this), &mBaseCommandControllerId); if (NS_FAILED(rv)) return rv; @@ -213,7 +213,7 @@ nsEditingSession::MakeWindowEditable(nsIDOMWindow *aWindow, // such as creation and "dirty flag" rv = SetupEditorCommandController("@mozilla.org/editor/editordocstatecontroller;1", aWindow, - NS_STATIC_CAST(nsIEditingSession*, this), + static_cast(this), &mDocStateControllerId); if (NS_FAILED(rv)) return rv; @@ -382,7 +382,7 @@ nsEditingSession::SetupEditorOnWindow(nsIDOMWindow *aWindow) // make the UI state maintainer nsComposerCommandsUpdater *stateMaintainer; NS_NEWXPCOM(stateMaintainer, nsComposerCommandsUpdater); - mStateMaintainer = NS_STATIC_CAST(nsISelectionListener*, stateMaintainer); + mStateMaintainer = static_cast(stateMaintainer); if (!mStateMaintainer) return NS_ERROR_OUT_OF_MEMORY; @@ -455,7 +455,7 @@ nsEditingSession::SetupEditorOnWindow(nsIDOMWindow *aWindow) // Set up as a doc state listener // Important! We must have this to broadcast the "obs_documentCreated" message rv = editor->AddDocumentStateListener( - NS_STATIC_CAST(nsIDocumentStateListener*, stateMaintainer)); + static_cast(stateMaintainer)); if (NS_FAILED(rv)) return rv; // XXXbz we really shouldn't need a presShell here! @@ -481,8 +481,8 @@ nsEditingSession::SetupEditorOnWindow(nsIDOMWindow *aWindow) nsCOMPtr txnMgr; editor->GetTransactionManager(getter_AddRefs(txnMgr)); if (txnMgr) - txnMgr->AddListener(NS_STATIC_CAST(nsITransactionListener*, - stateMaintainer)); + txnMgr->AddListener(static_cast + (stateMaintainer)); // Set context on all controllers to be the editor rv = SetEditorOnControllers(aWindow, editor); diff --git a/editor/libeditor/base/EditAggregateTxn.cpp b/editor/libeditor/base/EditAggregateTxn.cpp index 936d42ff6223..a8433f39ea79 100644 --- a/editor/libeditor/base/EditAggregateTxn.cpp +++ b/editor/libeditor/base/EditAggregateTxn.cpp @@ -216,7 +216,7 @@ NS_IMETHODIMP EditAggregateTxn::QueryInterface(REFNSIID aIID, void** aInstancePt if (!aInstancePtr) return NS_ERROR_NULL_POINTER; if (aIID.Equals(EditAggregateTxn::GetCID())) { - *aInstancePtr = NS_STATIC_CAST(EditAggregateTxn*, this); + *aInstancePtr = static_cast(this); NS_ADDREF_THIS(); return NS_OK; } diff --git a/editor/libeditor/base/nsEditor.cpp b/editor/libeditor/base/nsEditor.cpp index 08c3dc82b825..9e87379e7f18 100644 --- a/editor/libeditor/base/nsEditor.cpp +++ b/editor/libeditor/base/nsEditor.cpp @@ -2671,7 +2671,7 @@ NS_IMETHODIMP nsEditor::InsertTextIntoTextNodeImpl(const nsAString& aStringToIns { DeleteNode(mIMETextNode); mIMETextNode = nsnull; - NS_STATIC_CAST(IMETextTxn*, txn.get())->MarkFixed(); // mark the ime txn "fixed" + static_cast(txn.get())->MarkFixed(); // mark the ime txn "fixed" } } diff --git a/editor/libeditor/base/nsEditorController.cpp b/editor/libeditor/base/nsEditorController.cpp index f415fec1aeb3..9971a8f71332 100644 --- a/editor/libeditor/base/nsEditorController.cpp +++ b/editor/libeditor/base/nsEditorController.cpp @@ -51,7 +51,7 @@ NS_NEWXPCOM(theCmd, _cmdClass); \ if (!theCmd) return NS_ERROR_OUT_OF_MEMORY; \ rv = inCommandTable->RegisterCommand(_cmdName, \ - NS_STATIC_CAST(nsIControllerCommand *, theCmd)); \ + static_cast(theCmd)); \ } #define NS_REGISTER_FIRST_COMMAND(_cmdClass, _cmdName) \ @@ -60,15 +60,15 @@ NS_NEWXPCOM(theCmd, _cmdClass); \ if (!theCmd) return NS_ERROR_OUT_OF_MEMORY; \ rv = inCommandTable->RegisterCommand(_cmdName, \ - NS_STATIC_CAST(nsIControllerCommand *, theCmd)); + static_cast(theCmd)); #define NS_REGISTER_NEXT_COMMAND(_cmdClass, _cmdName) \ rv = inCommandTable->RegisterCommand(_cmdName, \ - NS_STATIC_CAST(nsIControllerCommand *, theCmd)); + static_cast(theCmd)); #define NS_REGISTER_LAST_COMMAND(_cmdClass, _cmdName) \ rv = inCommandTable->RegisterCommand(_cmdName, \ - NS_STATIC_CAST(nsIControllerCommand *, theCmd)); \ + static_cast(theCmd)); \ } diff --git a/editor/libeditor/html/nsHTMLCSSUtils.cpp b/editor/libeditor/html/nsHTMLCSSUtils.cpp index f115c0a26f60..1201484c3066 100644 --- a/editor/libeditor/html/nsHTMLCSSUtils.cpp +++ b/editor/libeditor/html/nsHTMLCSSUtils.cpp @@ -311,7 +311,7 @@ nsresult nsHTMLCSSUtils::Init(nsHTMLEditor *aEditor) { nsresult result = NS_OK; - mHTMLEditor = NS_STATIC_CAST(nsHTMLEditor*, aEditor); + mHTMLEditor = static_cast(aEditor); // let's retrieve the value of the "CSS editing" pref nsCOMPtr prefBranch = diff --git a/editor/libeditor/html/nsHTMLEditRules.cpp b/editor/libeditor/html/nsHTMLEditRules.cpp index c0fc553829ec..15571df651cd 100644 --- a/editor/libeditor/html/nsHTMLEditRules.cpp +++ b/editor/libeditor/html/nsHTMLEditRules.cpp @@ -243,7 +243,7 @@ NS_IMPL_QUERY_INTERFACE3(nsHTMLEditRules, nsIHTMLEditRules, nsIEditRules, nsIEdi NS_IMETHODIMP nsHTMLEditRules::Init(nsPlaintextEditor *aEditor, PRUint32 aFlags) { - mHTMLEditor = NS_STATIC_CAST(nsHTMLEditor*, aEditor); + mHTMLEditor = static_cast(aEditor); nsresult res; // call through to base class Init @@ -584,7 +584,7 @@ nsHTMLEditRules::WillDoAction(nsISelection *aSelection, *aHandled = PR_FALSE; // my kingdom for dynamic cast - nsTextRulesInfo *info = NS_STATIC_CAST(nsTextRulesInfo*, aInfo); + nsTextRulesInfo *info = static_cast(aInfo); // Deal with actions for which we don't need to check whether the selection is // editable. @@ -681,7 +681,7 @@ NS_IMETHODIMP nsHTMLEditRules::DidDoAction(nsISelection *aSelection, nsRulesInfo *aInfo, nsresult aResult) { - nsTextRulesInfo *info = NS_STATIC_CAST(nsTextRulesInfo*, aInfo); + nsTextRulesInfo *info = static_cast(aInfo); switch (info->action) { case kInsertBreak: diff --git a/editor/libeditor/html/nsHTMLEditor.cpp b/editor/libeditor/html/nsHTMLEditor.cpp index e97058f8573b..74e3a5468245 100644 --- a/editor/libeditor/html/nsHTMLEditor.cpp +++ b/editor/libeditor/html/nsHTMLEditor.cpp @@ -277,7 +277,7 @@ nsHTMLEditor::Init(nsIDOMDocument *aDoc, nsIPresShell *aPresShell, if (1) { // block to scope nsAutoEditInitRulesTrigger - nsAutoEditInitRulesTrigger rulesTrigger(NS_STATIC_CAST(nsPlaintextEditor*,this), rulesRes); + nsAutoEditInitRulesTrigger rulesTrigger(static_cast(this), rulesRes); // Init the plaintext editor result = nsPlaintextEditor::Init(aDoc, aPresShell, aRoot, aSelCon, aFlags); @@ -432,7 +432,7 @@ nsHTMLEditor::InitRules() nsresult res = NS_NewHTMLEditRules(getter_AddRefs(mRules)); if (NS_FAILED(res)) return res; if (!mRules) return NS_ERROR_UNEXPECTED; - res = mRules->Init(NS_STATIC_CAST(nsPlaintextEditor*,this), mFlags); + res = mRules->Init(static_cast(this), mFlags); return res; } @@ -712,7 +712,7 @@ nsHTMLEditor::SetDocumentTitle(const nsAString &aTitle) nsresult result = TransactionFactory::GetNewTransaction(SetDocTitleTxn::GetCID(), getter_AddRefs(txn)); if (NS_SUCCEEDED(result)) { - result = NS_STATIC_CAST(SetDocTitleTxn*, txn.get())->Init(this, &aTitle); + result = static_cast(txn.get())->Init(this, &aTitle); if (NS_SUCCEEDED(result)) { diff --git a/editor/libeditor/html/nsHTMLEditorStyle.cpp b/editor/libeditor/html/nsHTMLEditorStyle.cpp index f660f2a52816..75604d178f4c 100644 --- a/editor/libeditor/html/nsHTMLEditorStyle.cpp +++ b/editor/libeditor/html/nsHTMLEditorStyle.cpp @@ -1665,7 +1665,7 @@ nsHTMLEditor::RelativeFontChangeOnTextNode( PRInt32 aSizeChange, NS_NAMED_LITERAL_STRING(bigSize, "big"); NS_NAMED_LITERAL_STRING(smallSize, "small"); - const nsAString& nodeType = (aSizeChange==1) ? NS_STATIC_CAST(const nsAString&, bigSize) : NS_STATIC_CAST(const nsAString&, smallSize); + const nsAString& nodeType = (aSizeChange==1) ? static_cast(bigSize) : static_cast(smallSize); // look for siblings that are correct type of node nsCOMPtr sibling; GetPriorHTMLSibling(node, address_of(sibling)); diff --git a/editor/libeditor/html/nsHTMLURIRefObject.cpp b/editor/libeditor/html/nsHTMLURIRefObject.cpp index 569506e12cc2..adc378385424 100644 --- a/editor/libeditor/html/nsHTMLURIRefObject.cpp +++ b/editor/libeditor/html/nsHTMLURIRefObject.cpp @@ -86,7 +86,7 @@ nsCOMPtr theLoadGroup(do_CreateInstance(NS_LOADGROUP_CONTRACTID)); if (!theLoadGroup) error; - nsCOMPtr listener(NS_STATIC_CAST(nsIStreamListener*, qaBrowserImpl)); + nsCOMPtr listener(static_cast(qaBrowserImpl)); //nsCOMPtr thisListener(do_GetWeakReference(listener)); //qaWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsIStreamListener)); diff --git a/editor/libeditor/text/nsPlaintextEditor.cpp b/editor/libeditor/text/nsPlaintextEditor.cpp index 912660154abb..7f77615443de 100644 --- a/editor/libeditor/text/nsPlaintextEditor.cpp +++ b/editor/libeditor/text/nsPlaintextEditor.cpp @@ -864,7 +864,7 @@ nsPlaintextEditor::BeginComposition(nsTextEventReply* aReply) if(mFlags & nsIPlaintextEditor::eEditorPasswordMask) { if (mRules) { nsIEditRules *p = mRules.get(); - nsTextEditRules *textEditRules = NS_STATIC_CAST(nsTextEditRules *, p); + nsTextEditRules *textEditRules = static_cast(p); textEditRules->ResetIMETextPWBuf(); } else { diff --git a/editor/libeditor/text/nsTextEditRules.cpp b/editor/libeditor/text/nsTextEditRules.cpp index f78e18daf9d6..33d60f1f1acd 100644 --- a/editor/libeditor/text/nsTextEditRules.cpp +++ b/editor/libeditor/text/nsTextEditRules.cpp @@ -298,7 +298,7 @@ nsTextEditRules::WillDoAction(nsISelection *aSelection, *aHandled = PR_FALSE; // my kingdom for dynamic cast - nsTextRulesInfo *info = NS_STATIC_CAST(nsTextRulesInfo*, aInfo); + nsTextRulesInfo *info = static_cast(aInfo); switch (info->action) { @@ -348,7 +348,7 @@ nsTextEditRules::DidDoAction(nsISelection *aSelection, return NS_ERROR_NULL_POINTER; // my kingdom for dynamic cast - nsTextRulesInfo *info = NS_STATIC_CAST(nsTextRulesInfo*, aInfo); + nsTextRulesInfo *info = static_cast(aInfo); switch (info->action) { diff --git a/editor/txtsvc/src/nsTextServicesDocument.cpp b/editor/txtsvc/src/nsTextServicesDocument.cpp index ebcd26c83c1b..e9f1ec10e438 100644 --- a/editor/txtsvc/src/nsTextServicesDocument.cpp +++ b/editor/txtsvc/src/nsTextServicesDocument.cpp @@ -2724,7 +2724,7 @@ nsTextServicesDocument::CreateContentIterator(nsIDOMRange *aRange, nsIContentIte // This class wraps the ContentIterator in order to give itself a chance // to filter out certain content nodes nsFilteredContentIterator* filter = new nsFilteredContentIterator(mTxtSvcFilter); - *aIterator = NS_STATIC_CAST(nsIContentIterator *, filter); + *aIterator = static_cast(filter); if (*aIterator) { NS_IF_ADDREF(*aIterator); result = filter ? NS_OK : NS_ERROR_FAILURE; @@ -3067,7 +3067,7 @@ nsTextServicesDocument::DidSkip(nsIContentIterator* aFilteredIter) // So if the iterator bailed on one of the "filtered" content nodes then we // consider that to be a block and bail with PR_TRUE if (aFilteredIter) { - nsFilteredContentIterator* filter = NS_STATIC_CAST(nsFilteredContentIterator *, aFilteredIter); + nsFilteredContentIterator* filter = static_cast(aFilteredIter); if (filter && filter->DidSkip()) { return PR_TRUE; } @@ -3080,7 +3080,7 @@ nsTextServicesDocument::ClearDidSkip(nsIContentIterator* aFilteredIter) { // Clear filter's skip flag if (aFilteredIter) { - nsFilteredContentIterator* filter = NS_STATIC_CAST(nsFilteredContentIterator *, aFilteredIter); + nsFilteredContentIterator* filter = static_cast(aFilteredIter); filter->ClearDidSkip(); } } diff --git a/embedding/browser/activex/src/control/MozillaBrowser.cpp b/embedding/browser/activex/src/control/MozillaBrowser.cpp index b170ee71c500..c45632d7e027 100644 --- a/embedding/browser/activex/src/control/MozillaBrowser.cpp +++ b/embedding/browser/activex/src/control/MozillaBrowser.cpp @@ -1088,7 +1088,7 @@ HRESULT CMozillaBrowser::Initialize() // create our local object CWindowCreator *creator = new CWindowCreator(); nsCOMPtr windowCreator; - windowCreator = NS_STATIC_CAST(nsIWindowCreator *, creator); + windowCreator = static_cast(creator); // Attach it via the watcher service nsCOMPtr watcher = @@ -1213,12 +1213,12 @@ HRESULT CMozillaBrowser::CreateBrowser() mWebBrowserContainer->AddRef(); // Set up the browser with its chrome - mWebBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome*, mWebBrowserContainer)); + mWebBrowser->SetContainerWindow(static_cast(mWebBrowserContainer)); mWebBrowser->SetParentURIContentListener(mWebBrowserContainer); // Subscribe for progress notifications nsCOMPtr listener( - do_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, mWebBrowserContainer))); + do_GetWeakReference(static_cast(mWebBrowserContainer))); mWebBrowser->AddWebBrowserListener(listener, NS_GET_IID(nsIWebProgressListener)); // Visible diff --git a/embedding/browser/activex/src/control/WindowCreator.cpp b/embedding/browser/activex/src/control/WindowCreator.cpp index baf8aae93b2c..62d7cbbcfc4a 100644 --- a/embedding/browser/activex/src/control/WindowCreator.cpp +++ b/embedding/browser/activex/src/control/WindowCreator.cpp @@ -68,7 +68,7 @@ CWindowCreator::CreateChromeWindow(nsIWebBrowserChrome *aParent, PRUint32 aChrom return NS_ERROR_FAILURE; } - CWebBrowserContainer *pContainer = NS_STATIC_CAST(CWebBrowserContainer *, aParent); + CWebBrowserContainer *pContainer = static_cast(aParent); CComQIPtr dispNew; VARIANT_BOOL bCancel = VARIANT_FALSE; diff --git a/embedding/browser/activex/src/plugin/LegacyPlugin.cpp b/embedding/browser/activex/src/plugin/LegacyPlugin.cpp index aecbf06e9001..8ab3fe738dc5 100644 --- a/embedding/browser/activex/src/plugin/LegacyPlugin.cpp +++ b/embedding/browser/activex/src/plugin/LegacyPlugin.cpp @@ -432,7 +432,7 @@ GetPluginsContext(PluginInstanceData *pData) { nsCOMPtr window; NPN_GetValue(pData->pPluginInstance, NPNVDOMWindow, - NS_STATIC_CAST(nsIDOMWindow **, getter_AddRefs(window))); + static_cast(getter_AddRefs(window))); nsCOMPtr globalObject(do_QueryInterface(window)); if (!globalObject) @@ -443,7 +443,7 @@ GetPluginsContext(PluginInstanceData *pData) if (!scriptContext) return nsnull; - return NS_REINTERPRET_CAST(JSContext*, scriptContext->GetNativeContext()); + return reinterpret_cast(scriptContext->GetNativeContext()); } #endif @@ -835,7 +835,7 @@ NewControl(const char *pluginType, { nsCOMPtr element; NPN_GetValue(pData->pPluginInstance, NPNVDOMElement, - NS_STATIC_CAST(nsIDOMElement **, getter_AddRefs(element))); + static_cast(getter_AddRefs(element))); if (element) { nsCOMPtr tagAsNode (do_QueryInterface(element)); diff --git a/embedding/browser/activex/src/plugin/XPCBrowser.cpp b/embedding/browser/activex/src/plugin/XPCBrowser.cpp index 6c15bccd6ab8..269b50bd716e 100644 --- a/embedding/browser/activex/src/plugin/XPCBrowser.cpp +++ b/embedding/browser/activex/src/plugin/XPCBrowser.cpp @@ -65,7 +65,7 @@ HRESULT IEBrowser::Init(PluginInstanceData *pData) mData = pData; // Get the location URL NPN_GetValue(mData->pPluginInstance, NPNVDOMWindow, - NS_STATIC_CAST(nsIDOMWindow **,getter_AddRefs(mDOMWindow))); + static_cast(getter_AddRefs(mDOMWindow))); if (mDOMWindow) { mWebNavigation = do_GetInterface(mDOMWindow); diff --git a/embedding/browser/activex/src/plugin/XPCDocument.cpp b/embedding/browser/activex/src/plugin/XPCDocument.cpp index fd992300cf02..0113364a3b30 100644 --- a/embedding/browser/activex/src/plugin/XPCDocument.cpp +++ b/embedding/browser/activex/src/plugin/XPCDocument.cpp @@ -169,7 +169,7 @@ END_COM_MAP() // Get the DOM window nsCOMPtr domWindow; NPN_GetValue(mData->pPluginInstance, NPNVDOMWindow, - NS_STATIC_CAST(nsIDOMWindow **, getter_AddRefs(domWindow))); + static_cast(getter_AddRefs(domWindow))); if (!domWindow) { return E_FAIL; @@ -801,7 +801,7 @@ END_COM_MAP() nsCOMPtr domWindow; NPN_GetValue(mData->pPluginInstance, NPNVDOMWindow, - NS_STATIC_CAST(nsIDOMWindow **, getter_AddRefs(domWindow))); + static_cast(getter_AddRefs(domWindow))); if (!domWindow) { return E_UNEXPECTED; @@ -948,7 +948,7 @@ public: // Get the DOM document NPN_GetValue(mData->pPluginInstance, NPNVDOMElement, - NS_STATIC_CAST(nsIDOMElement **, getter_AddRefs(mDOMElement))); + static_cast(getter_AddRefs(mDOMElement))); if (mDOMElement) { mDOMElement->GetOwnerDocument(getter_AddRefs(mDOMDocument)); @@ -956,7 +956,7 @@ public: // Get the DOM window NPN_GetValue(mData->pPluginInstance, NPNVDOMWindow, - NS_STATIC_CAST(nsIDOMWindow **, getter_AddRefs(mDOMWindow))); + static_cast(getter_AddRefs(mDOMWindow))); if (mDOMWindow) { nsCOMPtr windowInternal = do_QueryInterface(mDOMWindow); diff --git a/embedding/browser/activex/src/plugin/XPConnect.cpp b/embedding/browser/activex/src/plugin/XPConnect.cpp index 9e97fbe43d2b..c5dc232d4672 100644 --- a/embedding/browser/activex/src/plugin/XPConnect.cpp +++ b/embedding/browser/activex/src/plugin/XPConnect.cpp @@ -107,11 +107,11 @@ nsScriptablePeer::QueryInterface(const nsIID & aIID, void **aInstancePtr) nsISupports* foundInterface = nsnull; if (aIID.Equals(NS_GET_IID(nsISupports))) - foundInterface = NS_STATIC_CAST(nsISupports *, NS_STATIC_CAST(nsIClassInfo *, this)); + foundInterface = static_cast(static_cast(this)); else if (aIID.Equals(NS_GET_IID(nsIClassInfo))) - foundInterface = NS_STATIC_CAST(nsIClassInfo*, this); + foundInterface = static_cast(this); else if (aIID.Equals(NS_GET_IID(nsIMozAxPlugin))) - foundInterface = NS_STATIC_CAST(nsIMozAxPlugin*, this); + foundInterface = static_cast(this); else if (memcmp(&aIID, &__uuidof(IDispatch), sizeof(nsID)) == 0) { HRESULT hr = mTearOff->QueryInterface(__uuidof(IDispatch), aInstancePtr); @@ -751,7 +751,7 @@ nsEventSink::InternalInvoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wF nsCOMPtr element; NPN_GetValue(mPlugin->pPluginInstance, NPNVDOMElement, - NS_STATIC_CAST(nsIDOMElement **, getter_AddRefs(element))); + static_cast(getter_AddRefs(element))); if (!element) { NS_ERROR("can't get the object element"); @@ -770,7 +770,7 @@ nsEventSink::InternalInvoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wF // Fire the script event handler... nsCOMPtr window; NPN_GetValue(mPlugin->pPluginInstance, NPNVDOMWindow, - NS_STATIC_CAST(nsIDOMWindow **, getter_AddRefs(window))); + static_cast(getter_AddRefs(window))); nsCOMPtr eventManager(do_GetInterface(window)); if (!eventManager) return S_OK; diff --git a/embedding/browser/cocoa/src/CHBrowserView.mm b/embedding/browser/cocoa/src/CHBrowserView.mm index 30975ae3a18e..ecc3d81d2625 100644 --- a/embedding/browser/cocoa/src/CHBrowserView.mm +++ b/embedding/browser/cocoa/src/CHBrowserView.mm @@ -120,10 +120,10 @@ const char kDirServiceContractID[] = "@mozilla.org/file/directory_service;1"; NS_ADDREF(_webBrowser); // Set the container nsIWebBrowserChrome - _webBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome *, _listener)); + _webBrowser->SetContainerWindow(static_cast(_listener)); // Register as a listener for web progress - nsCOMPtr weak = do_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, _listener)); + nsCOMPtr weak = do_GetWeakReference(static_cast(_listener)); _webBrowser->AddWebBrowserListener(weak, NS_GET_IID(nsIWebProgressListener)); // Hook up the widget hierarchy with us as the parent @@ -379,8 +379,7 @@ const char kDirServiceContractID[] = "@mozilla.org/file/directory_service;1"; if (_webBrowser) { // Set the container nsIWebBrowserChrome - _webBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome *, - _listener)); + _webBrowser->SetContainerWindow(static_cast(_listener)); NSRect frame = [self frame]; diff --git a/embedding/browser/cocoa/src/NSBrowserView.mm b/embedding/browser/cocoa/src/NSBrowserView.mm index 64df054c2c36..993aa86799da 100644 --- a/embedding/browser/cocoa/src/NSBrowserView.mm +++ b/embedding/browser/cocoa/src/NSBrowserView.mm @@ -591,11 +591,10 @@ nsCocoaBrowserListener::SetContainer(id aContainer) NS_ADDREF(_webBrowser); // Set the container nsIWebBrowserChrome - _webBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome *, - _listener)); + _webBrowser->SetContainerWindow(static_cast(_listener)); // Register as a listener for web progress - nsCOMPtr weak = do_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, _listener)); + nsCOMPtr weak = do_GetWeakReference(static_cast(_listener)); _webBrowser->AddWebBrowserListener(weak, NS_GET_IID(nsIWebProgressListener)); // Hook up the widget hierarchy with us as the parent @@ -790,8 +789,7 @@ nsCocoaBrowserListener::SetContainer(id aContainer) if (_webBrowser) { // Set the container nsIWebBrowserChrome - _webBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome *, - _listener)); + _webBrowser->SetContainerWindow(static_cast(_listener)); NSRect frame = [self frame]; diff --git a/embedding/browser/gtk/src/EmbedGlobalHistory.cpp b/embedding/browser/gtk/src/EmbedGlobalHistory.cpp index eb51de0f5ecc..0aefe8a6b678 100644 --- a/embedding/browser/gtk/src/EmbedGlobalHistory.cpp +++ b/embedding/browser/gtk/src/EmbedGlobalHistory.cpp @@ -562,8 +562,8 @@ nsresult EmbedGlobalHistory::RemoveEntries(const PRUnichar *url, int time) GList *node = g_list_find_custom(mURLList, NS_ConvertUTF16toUTF8(url).get(), (GCompareFunc) history_entry_find_exist); if (!node) return rv; if (node->data) { - HistoryEntry *entry = NS_STATIC_CAST(HistoryEntry *, - node->data); + HistoryEntry *entry = static_cast + (node->data); entry->mLastVisitTime = 0; delete entry; @@ -685,7 +685,7 @@ nsresult EmbedGlobalHistory::WriteEntryIfWritten(GList *list, OUTPUT_STREAM *fil unsigned int counter = g_list_length(list); while (counter > 0) { - HistoryEntry *entry = NS_STATIC_CAST(HistoryEntry*, g_list_nth_data(list, counter-1)); + HistoryEntry *entry = static_cast(g_list_nth_data(list, counter-1)); counter--; if (!entry || entryHasExpired(entry)) { continue; @@ -702,7 +702,7 @@ nsresult EmbedGlobalHistory::WriteEntryIfUnwritten(GList *list, OUTPUT_STREAM *f return NS_ERROR_FAILURE; unsigned int counter = g_list_length(list); while (counter > 0) { - HistoryEntry *entry = NS_STATIC_CAST(HistoryEntry*, g_list_nth_data(list, counter-1)); + HistoryEntry *entry = static_cast(g_list_nth_data(list, counter-1)); if (!entry || entryHasExpired(entry)) { counter--; continue; @@ -896,8 +896,8 @@ nsresult EmbedGlobalHistory::GetContentList(GtkMozHistoryItem **GtkHI, int *coun UNACCEPTABLE_CRASHY_GLIB_ALLOCATION(*GtkHI); GtkMozHistoryItem * item = (GtkMozHistoryItem *)*GtkHI; while (num_items < g_list_length(mURLList)) { - HistoryEntry *entry = NS_STATIC_CAST(HistoryEntry*, - g_list_nth_data(mURLList, num_items)); + HistoryEntry *entry = static_cast + (g_list_nth_data(mURLList, num_items)); // verify if the entry has expired and discard it if (entryHasExpired(entry)) { break; diff --git a/embedding/browser/gtk/src/EmbedPasswordMgr.cpp b/embedding/browser/gtk/src/EmbedPasswordMgr.cpp index 77ea28814cfb..d4b690f43e89 100644 --- a/embedding/browser/gtk/src/EmbedPasswordMgr.cpp +++ b/embedding/browser/gtk/src/EmbedPasswordMgr.cpp @@ -551,7 +551,7 @@ EmbedPasswordMgr::BuildArrayEnumerator(const nsACString& aKey, SignonHashEntry* aEntry, void* aUserData) { - nsIMutableArray* array = NS_STATIC_CAST(nsIMutableArray*, aUserData); + nsIMutableArray* array = static_cast(aUserData); for (SignonDataEntry* e = aEntry->head; e; e = e->next) array->AppendElement(new PasswordEntry(aKey, e), PR_FALSE); return PL_DHASH_NEXT; @@ -573,7 +573,7 @@ EmbedPasswordMgr::BuildRejectArrayEnumerator(const nsACString& aKey, PRInt32 aEntry, void* aUserData) { - nsIMutableArray* array = NS_STATIC_CAST(nsIMutableArray*, aUserData); + nsIMutableArray* array = static_cast(aUserData); nsCOMPtr passwordEntry = new PasswordEntry(aKey, nsnull); // if (!passwordEntry) { // // XXX handle oom @@ -622,7 +622,7 @@ EmbedPasswordMgr::FindEntryEnumerator(const nsACString& aKey, SignonHashEntry* aEntry, void* aUserData) { - findEntryContext* context = NS_STATIC_CAST(findEntryContext*, aUserData); + findEntryContext* context = static_cast(aUserData); EmbedPasswordMgr* manager = context->manager; nsresult rv; SignonDataEntry* entry = nsnull; @@ -1038,7 +1038,7 @@ done: nsCOMPtr targ = do_QueryInterface(domDoc); targ->AddEventListener( NS_LITERAL_STRING("unload"), - NS_STATIC_CAST(nsIDOMLoadListener*, this), + static_cast(this), PR_FALSE); return NS_OK; } @@ -1405,7 +1405,7 @@ EmbedPasswordMgr::GetPrompt(nsIDOMWindow* aParent, return NS_ERROR_OUT_OF_MEMORY; NS_ADDREF(wrapper); - *_retval = NS_STATIC_CAST(nsIAuthPrompt2*, wrapper); + *_retval = static_cast(wrapper); return NS_OK; } @@ -1428,7 +1428,7 @@ EmbedPasswordMgr::RemoveForDOMDocumentEnumerator(nsISupports* aKey, PRInt32& aEntry, void* aUserData) { - nsIDOMDocument* domDoc = NS_STATIC_CAST(nsIDOMDocument*, aUserData); + nsIDOMDocument* domDoc = static_cast(aUserData); nsCOMPtr element = do_QueryInterface(aKey); nsCOMPtr elementDoc; element->GetOwnerDocument(getter_AddRefs(elementDoc)); @@ -1465,7 +1465,7 @@ EmbedPasswordMgr::WriteRejectEntryEnumerator(const nsACString& aKey, PRInt32 aEntry, void* aUserData) { - nsIOutputStream* stream = NS_STATIC_CAST(nsIOutputStream*, aUserData); + nsIOutputStream* stream = static_cast(aUserData); PRUint32 bytesWritten; nsCAutoString buffer(aKey); buffer.Append(NS_LINEBREAK); @@ -1478,7 +1478,7 @@ EmbedPasswordMgr::WriteSignonEntryEnumerator(const nsACString& aKey, SignonHashEntry* aEntry, void* aUserData) { - nsIOutputStream* stream = NS_STATIC_CAST(nsIOutputStream*, aUserData); + nsIOutputStream* stream = static_cast(aUserData); PRUint32 bytesWritten; nsCAutoString buffer(aKey); buffer.Append(NS_LINEBREAK); @@ -1662,7 +1662,7 @@ EmbedPasswordMgr::FindPasswordEntryInternal(const SignonDataEntry* aEntry, break; } if (entry) { - *aResult = NS_CONST_CAST(SignonDataEntry*, entry); + *aResult = const_cast(entry); return NS_OK; } *aResult = nsnull; @@ -1728,7 +1728,7 @@ void EmbedPasswordMgr::AttachToInput(nsIDOMHTMLInputElement* aElement) { nsCOMPtr targ = do_QueryInterface(aElement); - nsIDOMEventListener* listener = NS_STATIC_CAST(nsIDOMFocusListener*, this); + nsIDOMEventListener* listener = static_cast(this); targ->AddEventListener(NS_LITERAL_STRING("blur"), listener, PR_FALSE); targ->AddEventListener(NS_LITERAL_STRING("DOMAutoComplete"), listener, PR_FALSE); mAutoCompleteInputs.Put(aElement, 1); diff --git a/embedding/browser/gtk/src/EmbedPrivate.cpp b/embedding/browser/gtk/src/EmbedPrivate.cpp index 761116b9ef86..cd7ec3e8375d 100644 --- a/embedding/browser/gtk/src/EmbedPrivate.cpp +++ b/embedding/browser/gtk/src/EmbedPrivate.cpp @@ -191,8 +191,8 @@ EmbedCommon::GetAnyLiveWidget() //FIXME need to choose right window GtkMozEmbed *ret = nsnull; for (int i = 0; i < count; i++) { - EmbedPrivate *tmpPrivate = NS_STATIC_CAST(EmbedPrivate *, - EmbedPrivate::sWindowList->ElementAt(i)); + EmbedPrivate *tmpPrivate = static_cast + (EmbedPrivate::sWindowList->ElementAt(i)); ret = tmpPrivate->mOwningWidget; } return ret; @@ -432,15 +432,15 @@ EmbedPrivate::Init(GtkMozEmbed *aOwningWidget) // initialize it. It is assumed that this window will be destroyed // when we go out of scope. mWindow = new EmbedWindow(); - mWindowGuard = NS_STATIC_CAST(nsIWebBrowserChrome *, mWindow); + mWindowGuard = static_cast(mWindow); mWindow->Init(this); // Create our progress listener object, make an owning reference, // and initialize it. It is assumed that this progress listener // will be destroyed when we go out of scope. mProgress = new EmbedProgress(); - mProgressGuard = NS_STATIC_CAST(nsIWebProgressListener *, - mProgress); + mProgressGuard = static_cast + (mProgress); mProgress->Init(this); // Create our content listener object, initialize it and attach it. @@ -468,7 +468,7 @@ EmbedPrivate::Init(GtkMozEmbed *aOwningWidget) // create our local object EmbedWindowCreator *creator = new EmbedWindowCreator(&mOpenBlock); nsCOMPtr windowCreator; - windowCreator = NS_STATIC_CAST(nsIWindowCreator *, creator); + windowCreator = static_cast(creator); // Attach it via the watcher service nsCOMPtr watcher = do_GetService(NS_WINDOWWATCHER_CONTRACTID); @@ -531,14 +531,14 @@ EmbedPrivate::Realize(PRBool *aAlreadyRealized) mWindow->mBaseWindow->GetMainWidget(getter_AddRefs(mozWidget)); // get the native drawing area GdkWindow *tmp_window = - NS_STATIC_CAST(GdkWindow *, - mozWidget->GetNativeData(NS_NATIVE_WINDOW)); + static_cast + (mozWidget->GetNativeData(NS_NATIVE_WINDOW)); // and, thanks to superwin we actually need the parent of that. tmp_window = gdk_window_get_parent(tmp_window); // save the widget ID - it should be the mozarea of the window. gpointer data = nsnull; gdk_window_get_user_data(tmp_window, &data); - mMozWindowWidget = NS_STATIC_CAST(GtkWidget *, data); + mMozWindowWidget = static_cast(data); // Apply the current chrome mask ApplyChromeMask(); @@ -789,8 +789,8 @@ EmbedPrivate::PushStartup(void) return; rv = XRE_InitEmbedding(greDir, binDir, - NS_CONST_CAST(GTKEmbedDirectoryProvider*, - &kDirectoryProvider), + const_cast + (&kDirectoryProvider), nsnull, nsnull); if (NS_FAILED(rv)) return; @@ -972,10 +972,10 @@ EmbedPrivate::FindPrivateForBrowser(nsIWebBrowserChrome *aBrowser) // creating a new window) so it's OK to walk the list of open // windows. for (int i = 0; i < count; i++) { - EmbedPrivate *tmpPrivate = NS_STATIC_CAST(EmbedPrivate *, sWindowList->ElementAt(i)); + EmbedPrivate *tmpPrivate = static_cast(sWindowList->ElementAt(i)); // get the browser object for that window nsIWebBrowserChrome *chrome = - NS_STATIC_CAST(nsIWebBrowserChrome *, tmpPrivate->mWindow); + static_cast(tmpPrivate->mWindow); if (chrome == aBrowser) return tmpPrivate; } @@ -1046,7 +1046,7 @@ EmbedPrivate::ContentFinishedLoading(void) GList *ptr = list_full; while(ptr) { - GtkMozLogin * login = NS_STATIC_CAST(GtkMozLogin*, ptr->data); + GtkMozLogin * login = static_cast(ptr->data); if (login && login->user) { users_list = g_list_append(users_list, NS_strdup(login->user)); NS_Free((void*)login->user); @@ -1139,8 +1139,8 @@ EmbedPrivate::AttachListeners(void) return; nsIDOMEventListener *eventListener = - NS_STATIC_CAST(nsIDOMEventListener *, - NS_STATIC_CAST(nsIDOMKeyListener *, mEventListener)); + static_cast + (static_cast(mEventListener)); // add the key listener nsresult rv; @@ -1200,8 +1200,8 @@ EmbedPrivate::DetachListeners(void) return; nsIDOMEventListener *eventListener = - NS_STATIC_CAST(nsIDOMEventListener *, - NS_STATIC_CAST(nsIDOMKeyListener *, mEventListener)); + static_cast + (static_cast(mEventListener)); nsresult rv; rv = mEventTarget->RemoveEventListenerByIID( diff --git a/embedding/browser/gtk/src/EmbedProgress.cpp b/embedding/browser/gtk/src/EmbedProgress.cpp index f6eb8c68fce7..0ddd377ef5d8 100644 --- a/embedding/browser/gtk/src/EmbedProgress.cpp +++ b/embedding/browser/gtk/src/EmbedProgress.cpp @@ -257,9 +257,9 @@ EmbedProgress::OnStatusChange(nsIWebProgress *aWebProgress, gtk_signal_emit(GTK_OBJECT(mOwner->mOwningWidget), moz_embed_signals[STATUS_CHANGE], - NS_STATIC_CAST(void *, aRequest), - NS_STATIC_CAST(gint, aStatus), - NS_STATIC_CAST(void *, tmpString)); + static_cast(aRequest), + static_cast(aStatus), + static_cast(tmpString)); NS_Free(tmpString); @@ -273,7 +273,7 @@ EmbedProgress::OnSecurityChange(nsIWebProgress *aWebProgress, { gtk_signal_emit(GTK_OBJECT(mOwner->mOwningWidget), moz_embed_signals[SECURITY_CHANGE], - NS_STATIC_CAST(void *, aRequest), + static_cast(aRequest), aState); return NS_OK; } diff --git a/embedding/browser/gtk/src/EmbedWindow.cpp b/embedding/browser/gtk/src/EmbedWindow.cpp index eefa77de6b1f..e923c5d7f061 100644 --- a/embedding/browser/gtk/src/EmbedWindow.cpp +++ b/embedding/browser/gtk/src/EmbedWindow.cpp @@ -76,7 +76,7 @@ EmbedWindow::Init(EmbedPrivate *aOwner) if (!mWebBrowser) return NS_ERROR_FAILURE; - mWebBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome *, this)); + mWebBrowser->SetContainerWindow(static_cast(this)); nsCOMPtr item = do_QueryInterface(mWebBrowser); item->SetItemType(nsIDocShellTreeItem::typeContentWrapper); @@ -335,7 +335,7 @@ NS_IMETHODIMP EmbedWindow::GetSiteWindow(void **aSiteWindow) { GtkWidget *ownerAsWidget(GTK_WIDGET(mOwner->mOwningWidget)); - *aSiteWindow = NS_STATIC_CAST(void *, ownerAsWidget); + *aSiteWindow = static_cast(ownerAsWidget); return NS_OK; } @@ -398,8 +398,8 @@ EmbedWindow::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords, nsCOMPtr mainWidget; mBaseWindow->GetMainWidget(getter_AddRefs(mainWidget)); GdkWindow *window; - window = NS_STATIC_CAST(GdkWindow *, - mainWidget->GetNativeData(NS_NATIVE_WINDOW)); + window = static_cast + (mainWidget->GetNativeData(NS_NATIVE_WINDOW)); gint root_x, root_y; gdk_window_get_origin(window, &root_x, &root_y); diff --git a/embedding/browser/gtk/src/EmbedWindowCreator.cpp b/embedding/browser/gtk/src/EmbedWindowCreator.cpp index 7cd48c5666e7..32df005f4af1 100644 --- a/embedding/browser/gtk/src/EmbedWindowCreator.cpp +++ b/embedding/browser/gtk/src/EmbedWindowCreator.cpp @@ -98,15 +98,15 @@ EmbedWindowCreator::CreateChromeWindow(nsIWebBrowserChrome *aParent, // realized before that can happen. gtk_widget_realize(GTK_WIDGET(newEmbed)); - EmbedPrivate *newEmbedPrivate = NS_STATIC_CAST(EmbedPrivate *, - newEmbed->data); + EmbedPrivate *newEmbedPrivate = static_cast + (newEmbed->data); // set the chrome flag on the new window if it's a chrome open if (aChromeFlags & nsIWebBrowserChrome::CHROME_OPENAS_CHROME) newEmbedPrivate->mIsChrome = PR_TRUE; - *_retval = NS_STATIC_CAST(nsIWebBrowserChrome *, - (newEmbedPrivate->mWindow)); + *_retval = static_cast + ((newEmbedPrivate->mWindow)); if (*_retval) { NS_ADDREF(*_retval); diff --git a/embedding/browser/gtk/src/gtkmozembed2.cpp b/embedding/browser/gtk/src/gtkmozembed2.cpp index 4610453e8638..dadfaaea4936 100644 --- a/embedding/browser/gtk/src/gtkmozembed2.cpp +++ b/embedding/browser/gtk/src/gtkmozembed2.cpp @@ -793,8 +793,8 @@ gtk_moz_embed_get_accessible (GtkWidget *widget) GtkMozEmbed *embed = GTK_MOZ_EMBED(widget);; EmbedPrivate *embedPrivate = (EmbedPrivate *)embed->data; - return NS_STATIC_CAST(AtkObject *, - embedPrivate->GetAtkObjectForCurrentDocument()); + return static_cast + (embedPrivate->GetAtkObjectForCurrentDocument()); } #endif /* MOZ_ACCESSIBILITY_ATK */ diff --git a/embedding/browser/photon/src/EmbedPrivate.cpp b/embedding/browser/photon/src/EmbedPrivate.cpp index b5d596df0cbf..7b73c131f775 100644 --- a/embedding/browser/photon/src/EmbedPrivate.cpp +++ b/embedding/browser/photon/src/EmbedPrivate.cpp @@ -154,15 +154,15 @@ EmbedPrivate::Init(PtWidget_t *aOwningWidget) // initialize it. It is assumed that this window will be destroyed // when we go out of scope. mWindow = new EmbedWindow(); - mWindowGuard = NS_STATIC_CAST(nsIWebBrowserChrome *, mWindow); + mWindowGuard = static_cast(mWindow); mWindow->Init(this); // Create our progress listener object, make an owning reference, // and initialize it. It is assumed that this progress listener // will be destroyed when we go out of scope. mProgress = new EmbedProgress(); - mProgressGuard = NS_STATIC_CAST(nsIWebProgressListener *, - mProgress); + mProgressGuard = static_cast + (mProgress); mProgress->Init(this); // Create our content listener object, initialize it and attach it. @@ -176,15 +176,15 @@ EmbedPrivate::Init(PtWidget_t *aOwningWidget) // that this will be destroyed before we go out of scope. mEventListener = new EmbedEventListener(); mEventListenerGuard = - NS_STATIC_CAST(nsISupports *, NS_STATIC_CAST(nsIDOMKeyListener *, - mEventListener)); + static_cast(static_cast + (mEventListener)); mEventListener->Init(this); // Create our print listener object, make an owning reference, // and initialize it. It is assumed that this print listener // will be destroyed when we go out of scope. mPrint = new EmbedPrintListener(); - mPrintGuard = NS_STATIC_CAST(nsIWebProgressListener *, mPrint); + mPrintGuard = static_cast(mPrint); mPrint->Init(this); // has the window creator service been set up? @@ -199,7 +199,7 @@ EmbedPrivate::Init(PtWidget_t *aOwningWidget) // create our local object EmbedWindowCreator *creator = new EmbedWindowCreator(); nsCOMPtr windowCreator; - windowCreator = NS_STATIC_CAST(nsIWindowCreator *, creator); + windowCreator = static_cast(creator); // Attach it via the watcher service nsCOMPtr watcher = do_GetService(sWatcherContractID); @@ -714,11 +714,11 @@ EmbedPrivate::FindPrivateForBrowser(nsIWebBrowserChrome *aBrowser) // windows. for (int i = 0; i < count; i++) { - EmbedPrivate *tmpPrivate = NS_STATIC_CAST(EmbedPrivate *, - sWindowList->ElementAt(i)); + EmbedPrivate *tmpPrivate = static_cast + (sWindowList->ElementAt(i)); // get the browser object for that window - nsIWebBrowserChrome *chrome = NS_STATIC_CAST(nsIWebBrowserChrome *, - tmpPrivate->mWindow); + nsIWebBrowserChrome *chrome = static_cast + (tmpPrivate->mWindow); if (chrome == aBrowser) return tmpPrivate; } @@ -874,8 +874,8 @@ EmbedPrivate::AttachListeners(void) return; nsIDOMEventListener *eventListener = - NS_STATIC_CAST(nsIDOMEventListener *, - NS_STATIC_CAST(nsIDOMKeyListener *, mEventListener)); + static_cast + (static_cast(mEventListener)); // add the key listener nsresult rv; @@ -904,8 +904,8 @@ EmbedPrivate::DetachListeners(void) return; nsIDOMEventListener *eventListener = - NS_STATIC_CAST(nsIDOMEventListener *, - NS_STATIC_CAST(nsIDOMKeyListener *, mEventListener)); + static_cast + (static_cast(mEventListener)); nsresult rv; rv = mEventTarget->RemoveEventListenerByIID(eventListener, diff --git a/embedding/browser/photon/src/EmbedStream.cpp b/embedding/browser/photon/src/EmbedStream.cpp index f2cebef68024..113f30129863 100644 --- a/embedding/browser/photon/src/EmbedStream.cpp +++ b/embedding/browser/photon/src/EmbedStream.cpp @@ -134,7 +134,7 @@ EmbedStream::OpenStream(const char *aBaseURI, const char *aContentType) // create a new input stream channel rv = NS_NewInputStreamChannel(getter_AddRefs(mChannel), uri, - NS_STATIC_CAST(nsIInputStream *, this), + static_cast(this), nsDependentCString(aContentType)); if (NS_FAILED(rv)) return rv; @@ -203,7 +203,7 @@ EmbedStream::AppendToStream(const char *aData, int aLen) nsCOMPtr request = do_QueryInterface(mChannel); rv = mStreamListener->OnDataAvailable(request, NULL, - NS_STATIC_CAST(nsIInputStream *, this), + static_cast(this), mOffset, /* offset */ aLen); /* len */ // move our counter diff --git a/embedding/browser/photon/src/EmbedWindow.cpp b/embedding/browser/photon/src/EmbedWindow.cpp index aa9d0efd506a..2d7fccf657fb 100644 --- a/embedding/browser/photon/src/EmbedWindow.cpp +++ b/embedding/browser/photon/src/EmbedWindow.cpp @@ -90,7 +90,7 @@ EmbedWindow::Init(EmbedPrivate *aOwner) if (!mWebBrowser) return NS_ERROR_FAILURE; - mWebBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome *, this)); + mWebBrowser->SetContainerWindow(static_cast(this)); // get the doc shel for cut/copy/paste //mRootDocShell = do_GetInterface(mWebBrowser); @@ -462,7 +462,7 @@ NS_IMETHODIMP EmbedWindow::GetSiteWindow(void **aSiteWindow) { PtWidget_t *ownerAsWidget = (PtWidget_t *)(mOwner->mOwningWidget); - *aSiteWindow = NS_STATIC_CAST(void *, ownerAsWidget); + *aSiteWindow = static_cast(ownerAsWidget); return NS_OK; } @@ -501,7 +501,7 @@ EmbedWindow::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords, nsCOMPtr mainWidget; mBaseWindow->GetMainWidget(getter_AddRefs(mainWidget)); PtWidget_t *window; - window = NS_STATIC_CAST(PtWidget_t *, mainWidget->GetNativeData(NS_NATIVE_WINDOW)); + window = static_cast(mainWidget->GetNativeData(NS_NATIVE_WINDOW)); PgExtentText(&extent, &pos, font, tipString, 0); w = extent.lr.x - extent.ul.x + 1; diff --git a/embedding/browser/photon/src/EmbedWindowCreator.cpp b/embedding/browser/photon/src/EmbedWindowCreator.cpp index cb3cb7c5470d..97c96d2fff02 100644 --- a/embedding/browser/photon/src/EmbedWindowCreator.cpp +++ b/embedding/browser/photon/src/EmbedWindowCreator.cpp @@ -92,7 +92,7 @@ EmbedWindowCreator::CreateChromeWindow(nsIWebBrowserChrome *aParent, if (aChromeFlags & nsIWebBrowserChrome::CHROME_OPENAS_CHROME) newEmbedPrivate->mIsChrome = PR_TRUE; - *_retval = NS_STATIC_CAST(nsIWebBrowserChrome *, (newEmbedPrivate->mWindow)); + *_retval = static_cast((newEmbedPrivate->mWindow)); if (*_retval) { diff --git a/embedding/browser/webBrowser/nsCommandHandler.cpp b/embedding/browser/webBrowser/nsCommandHandler.cpp index 82fb6138a921..197dfc251bd3 100644 --- a/embedding/browser/webBrowser/nsCommandHandler.cpp +++ b/embedding/browser/webBrowser/nsCommandHandler.cpp @@ -83,7 +83,7 @@ nsresult nsCommandHandler::GetCommandHandler(nsICommandHandler **aCommandHandler nsCOMPtr realTreeOwner(do_QueryInterface(treeOwner)); if (realTreeOwner) { - nsDocShellTreeOwner *tree = NS_STATIC_CAST(nsDocShellTreeOwner *, treeOwner); + nsDocShellTreeOwner *tree = static_cast(treeOwner); if (tree->mTreeOwner) { nsresult rv; diff --git a/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp b/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp index bfe4ba3bdf9a..2e02fc19da1d 100644 --- a/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp +++ b/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp @@ -909,7 +909,7 @@ nsDocShellTreeOwner::AddChromeListeners() nsCOMPtr piTarget; GetPIDOMEventTarget(mWebBrowser, getter_AddRefs(piTarget)); nsCOMPtr target(do_QueryInterface(piTarget)); - mChromeDragHandler->HookupTo(target, NS_STATIC_CAST(nsIWebNavigation*, mWebBrowser)); + mChromeDragHandler->HookupTo(target, static_cast(mWebBrowser)); } } @@ -942,7 +942,7 @@ nsDocShellTreeOwner::GetWebBrowserChrome() if (mWebBrowserChromeWeak != nsnull) { mWebBrowserChromeWeak-> QueryReferent(NS_GET_IID(nsIWebBrowserChrome), - NS_REINTERPRET_CAST(void**, &chrome)); + reinterpret_cast(&chrome)); } else if (mWebBrowserChrome) { chrome = mWebBrowserChrome; NS_ADDREF(mWebBrowserChrome); @@ -958,7 +958,7 @@ nsDocShellTreeOwner::GetOwnerWin() if (mWebBrowserChromeWeak != nsnull) { mWebBrowserChromeWeak-> QueryReferent(NS_GET_IID(nsIEmbeddingSiteWindow), - NS_REINTERPRET_CAST(void**, &win)); + reinterpret_cast(&win)); } else if (mOwnerWin) { win = mOwnerWin; NS_ADDREF(mOwnerWin); @@ -974,7 +974,7 @@ nsDocShellTreeOwner::GetOwnerRequestor() if (mWebBrowserChromeWeak != nsnull) { mWebBrowserChromeWeak-> QueryReferent(NS_GET_IID(nsIInterfaceRequestor), - NS_REINTERPRET_CAST(void**, &req)); + reinterpret_cast(&req)); } else if (mOwnerRequestor) { req = mOwnerRequestor; NS_ADDREF(mOwnerRequestor); @@ -1145,7 +1145,7 @@ NS_IMETHODIMP ChromeTooltipListener::AddTooltipListener() { if (mEventTarget) { - nsIDOMMouseListener *pListener = NS_STATIC_CAST(nsIDOMMouseListener *, this); + nsIDOMMouseListener *pListener = static_cast(this); nsresult rv = mEventTarget->AddEventListenerByIID(pListener, NS_GET_IID(nsIDOMMouseListener)); nsresult rv2 = mEventTarget->AddEventListenerByIID(pListener, NS_GET_IID(nsIDOMMouseMotionListener)); nsresult rv3 = mEventTarget->AddEventListenerByIID(pListener, NS_GET_IID(nsIDOMKeyListener)); @@ -1190,7 +1190,7 @@ NS_IMETHODIMP ChromeTooltipListener::RemoveTooltipListener() { if (mEventTarget) { - nsIDOMMouseListener *pListener = NS_STATIC_CAST(nsIDOMMouseListener *, this); + nsIDOMMouseListener *pListener = static_cast(this); nsresult rv = mEventTarget->RemoveEventListenerByIID(pListener, NS_GET_IID(nsIDOMMouseListener)); nsresult rv2 = mEventTarget->RemoveEventListenerByIID(pListener, NS_GET_IID(nsIDOMMouseMotionListener)); nsresult rv3 = mEventTarget->RemoveEventListenerByIID(pListener, NS_GET_IID(nsIDOMKeyListener)); @@ -1420,8 +1420,8 @@ void ChromeTooltipListener::sTooltipCallback(nsITimer *aTimer, void *aChromeTooltipListener) { - ChromeTooltipListener* self = NS_STATIC_CAST(ChromeTooltipListener*, - aChromeTooltipListener); + ChromeTooltipListener* self = static_cast + (aChromeTooltipListener); if ( self && self->mPossibleTooltipNode ){ // The actual coordinates we want to put the tooltip at are relative to the // toplevel docshell of our mWebBrowser. We know what the screen @@ -1430,7 +1430,7 @@ ChromeTooltipListener::sTooltipCallback(nsITimer *aTimer, // find those short of groveling for the presentation in that docshell and // finding the screen coords of its toplevel widget... nsCOMPtr docShell = - do_GetInterface(NS_STATIC_CAST(nsIWebBrowser*, self->mWebBrowser)); + do_GetInterface(static_cast(self->mWebBrowser)); nsCOMPtr shell; if (docShell) { docShell->GetPresShell(getter_AddRefs(shell)); @@ -1516,7 +1516,7 @@ ChromeTooltipListener::CreateAutoHideTimer() void ChromeTooltipListener::sAutoHideCallback(nsITimer *aTimer, void* aListener) { - ChromeTooltipListener* self = NS_STATIC_CAST(ChromeTooltipListener*, aListener); + ChromeTooltipListener* self = static_cast(aListener); if ( self ) self->HideTooltip(); @@ -1570,7 +1570,7 @@ NS_IMETHODIMP ChromeContextMenuListener::AddContextMenuListener() { if (mEventTarget) { - nsIDOMContextMenuListener *pListener = NS_STATIC_CAST(nsIDOMContextMenuListener *, this); + nsIDOMContextMenuListener *pListener = static_cast(this); nsresult rv = mEventTarget->AddEventListenerByIID(pListener, NS_GET_IID(nsIDOMContextMenuListener)); if (NS_SUCCEEDED(rv)) mContextMenuListenerInstalled = PR_TRUE; @@ -1589,7 +1589,7 @@ NS_IMETHODIMP ChromeContextMenuListener::RemoveContextMenuListener() { if (mEventTarget) { - nsIDOMContextMenuListener *pListener = NS_STATIC_CAST(nsIDOMContextMenuListener *, this); + nsIDOMContextMenuListener *pListener = static_cast(this); nsresult rv = mEventTarget->RemoveEventListenerByIID(pListener, NS_GET_IID(nsIDOMContextMenuListener)); if (NS_SUCCEEDED(rv)) mContextMenuListenerInstalled = PR_FALSE; diff --git a/embedding/browser/webBrowser/nsEmbedStream.cpp b/embedding/browser/webBrowser/nsEmbedStream.cpp index 16793ae3cfcf..6b6a4fe9bdea 100644 --- a/embedding/browser/webBrowser/nsEmbedStream.cpp +++ b/embedding/browser/webBrowser/nsEmbedStream.cpp @@ -120,7 +120,7 @@ nsEmbedStream::OpenStream(nsIURI *aBaseURI, const nsACString& aContentType) // create a new input stream channel rv = NS_NewInputStreamChannel(getter_AddRefs(mChannel), aBaseURI, - NS_STATIC_CAST(nsIInputStream *, this), + static_cast(this), aContentType); if (NS_FAILED(rv)) return rv; @@ -194,7 +194,7 @@ nsEmbedStream::AppendToStream(const PRUint8 *aData, PRUint32 aLen) // notify our listeners rv = mStreamListener->OnDataAvailable(mChannel, NULL, - NS_STATIC_CAST(nsIInputStream *, this), + static_cast(this), mOffset, /* offset */ aLen); /* len */ // move our counter @@ -231,7 +231,7 @@ NS_METHOD nsEmbedStream::Append(const PRUint8 *aData, PRUint32 aLen) { PRUint32 bytesWritten = 0; - nsresult rv = mOutputStream->Write(NS_REINTERPRET_CAST(const char*, aData), + nsresult rv = mOutputStream->Write(reinterpret_cast(aData), aLen, &bytesWritten); if (NS_FAILED(rv)) return rv; diff --git a/embedding/browser/webBrowser/nsWebBrowser.cpp b/embedding/browser/webBrowser/nsWebBrowser.cpp index 678bf7aaaf96..38bd0ebb308a 100644 --- a/embedding/browser/webBrowser/nsWebBrowser.cpp +++ b/embedding/browser/webBrowser/nsWebBrowser.cpp @@ -379,7 +379,7 @@ NS_IMETHODIMP nsWebBrowser::EnableGlobalHistory(PRBool aEnable) #if (defined(XP_MAC) || defined(XP_MACOSX)) && !defined(MOZ_WIDGET_COCOA) NS_IMETHODIMP nsWebBrowser::EnsureTopLevelWidget(nativeWindow aWindow) { - WindowPtr macWindow = NS_STATIC_CAST(WindowPtr, aWindow); + WindowPtr macWindow = static_cast(aWindow); nsIWidget *widget = nsnull; nsCOMPtr newWidget; nsresult rv = NS_ERROR_FAILURE; @@ -546,7 +546,7 @@ NS_IMETHODIMP nsWebBrowser::GetSameTypeParent(nsIDocShellTreeItem** aParent) NS_IMETHODIMP nsWebBrowser::GetRootTreeItem(nsIDocShellTreeItem** aRootTreeItem) { NS_ENSURE_ARG_POINTER(aRootTreeItem); - *aRootTreeItem = NS_STATIC_CAST(nsIDocShellTreeItem*, this); + *aRootTreeItem = static_cast(this); nsCOMPtr parent; NS_ENSURE_SUCCESS(GetParent(getter_AddRefs(parent)), NS_ERROR_FAILURE); @@ -562,7 +562,7 @@ NS_IMETHODIMP nsWebBrowser::GetRootTreeItem(nsIDocShellTreeItem** aRootTreeItem) NS_IMETHODIMP nsWebBrowser::GetSameTypeRootTreeItem(nsIDocShellTreeItem** aRootTreeItem) { NS_ENSURE_ARG_POINTER(aRootTreeItem); - *aRootTreeItem = NS_STATIC_CAST(nsIDocShellTreeItem*, this); + *aRootTreeItem = static_cast(this); nsCOMPtr parent; NS_ENSURE_SUCCESS(GetSameTypeParent(getter_AddRefs(parent)), NS_ERROR_FAILURE); @@ -584,7 +584,7 @@ NS_IMETHODIMP nsWebBrowser::FindItemWithName(const PRUnichar *aName, NS_ASSERTION(mDocShellTreeOwner, "This should always be set when in this situation"); return mDocShellAsItem->FindItemWithName(aName, - NS_STATIC_CAST(nsIDocShellTreeOwner*, mDocShellTreeOwner), + static_cast(mDocShellTreeOwner), aOriginalRequestor, _retval); } @@ -1178,7 +1178,7 @@ NS_IMETHODIMP nsWebBrowser::Create() widgetInit.mWindowType = eWindowType_child; nsRect bounds(mInitInfo->x, mInitInfo->y, mInitInfo->cx, mInitInfo->cy); - mInternalWidget->SetClientData(NS_STATIC_CAST(nsWebBrowser *, this)); + mInternalWidget->SetClientData(static_cast(this)); mInternalWidget->Create(mParentNativeWindow, bounds, nsWebBrowser::HandleEvent, nsnull, nsnull, nsnull, &widgetInit); } @@ -1218,7 +1218,7 @@ NS_IMETHODIMP nsWebBrowser::Create() // nsIWebProgressListener. nsCOMPtr supports = nsnull; (void)mDocShellTreeOwner->QueryInterface(NS_GET_IID(nsIWebProgressListener), - NS_STATIC_CAST(void**, getter_AddRefs(supports))); + static_cast(getter_AddRefs(supports))); (void)BindListener(supports, NS_GET_IID(nsIWebProgressListener)); NS_ENSURE_SUCCESS(mDocShellAsWin->InitWindow(nsnull, @@ -1713,12 +1713,12 @@ nsEventStatus PR_CALLBACK nsWebBrowser::HandleEvent(nsGUIEvent *aEvent) if (!data) return result; - browser = NS_STATIC_CAST(nsWebBrowser *, data); + browser = static_cast(data); switch(aEvent->message) { case NS_PAINT: { - nsPaintEvent *paintEvent = NS_STATIC_CAST(nsPaintEvent *, aEvent); + nsPaintEvent *paintEvent = static_cast(aEvent); nsIRenderingContext *rc = paintEvent->renderingContext; nscolor oldColor; rc->GetColor(oldColor); diff --git a/embedding/components/commandhandler/src/nsCommandGroup.cpp b/embedding/components/commandhandler/src/nsCommandGroup.cpp index 5e227c48b051..73667ee9e958 100644 --- a/embedding/components/commandhandler/src/nsCommandGroup.cpp +++ b/embedding/components/commandhandler/src/nsCommandGroup.cpp @@ -137,8 +137,8 @@ nsGroupsEnumerator::GetNext(nsISupports **_retval) PRBool nsGroupsEnumerator::HashEnum(nsHashKey *aKey, void *aData, void* aClosure) { - nsGroupsEnumerator* groupsEnum = NS_REINTERPRET_CAST(nsGroupsEnumerator *, aClosure); - nsCStringKey* stringKey = NS_STATIC_CAST(nsCStringKey*, aKey); + nsGroupsEnumerator* groupsEnum = reinterpret_cast(aClosure); + nsCStringKey* stringKey = static_cast(aKey); groupsEnum->mGroupNames[groupsEnum->mIndex] = (char*)stringKey->GetString(); groupsEnum->mIndex ++; diff --git a/embedding/components/commandhandler/src/nsCommandManager.cpp b/embedding/components/commandhandler/src/nsCommandManager.cpp index 368f21071866..3f6d38d444ba 100644 --- a/embedding/components/commandhandler/src/nsCommandManager.cpp +++ b/embedding/components/commandhandler/src/nsCommandManager.cpp @@ -75,7 +75,7 @@ TraverseCommandObservers(const char* aKey, nsCOMArray* aObservers, void* aClosure) { nsCycleCollectionTraversalCallback *cb = - NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aClosure); + static_cast(aClosure); PRInt32 i, numItems = aObservers->Count(); for (i = 0; i < numItems; ++i) { diff --git a/embedding/components/commandhandler/src/nsCommandParams.cpp b/embedding/components/commandhandler/src/nsCommandParams.cpp index 252e729e4304..7ee1a278cf5d 100644 --- a/embedding/components/commandhandler/src/nsCommandParams.cpp +++ b/embedding/components/commandhandler/src/nsCommandParams.cpp @@ -293,7 +293,7 @@ nsCommandParams::GetNamedEntry(const char * name) nsCommandParams::HashEntry* nsCommandParams::GetIndexedEntry(PRInt32 index) { - HashEntry* entry = NS_REINTERPRET_CAST(HashEntry*, mValuesHash.entryStore); + HashEntry* entry = reinterpret_cast(mValuesHash.entryStore); HashEntry* limit = entry + PL_DHASH_TABLE_SIZE(&mValuesHash); PRUint32 entryCount = 0; @@ -315,7 +315,7 @@ nsCommandParams::GetIndexedEntry(PRInt32 index) PRUint32 nsCommandParams::GetNumEntries() { - HashEntry* entry = NS_REINTERPRET_CAST(HashEntry*, mValuesHash.entryStore); + HashEntry* entry = reinterpret_cast(mValuesHash.entryStore); HashEntry* limit = entry + PL_DHASH_TABLE_SIZE(&mValuesHash); PRUint32 entryCount = 0; @@ -364,7 +364,7 @@ nsCommandParams::HashMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry, const void *key) { const char* keyString = (const char*)key; - const HashEntry* thisEntry = NS_STATIC_CAST(const HashEntry*, entry); + const HashEntry* thisEntry = static_cast(entry); return thisEntry->mEntryName.Equals(keyString); } @@ -373,8 +373,8 @@ void nsCommandParams::HashMoveEntry(PLDHashTable *table, const PLDHashEntryHdr *from, PLDHashEntryHdr *to) { - const HashEntry* fromEntry = NS_STATIC_CAST(const HashEntry*, from); - HashEntry* toEntry = NS_STATIC_CAST(HashEntry*, to); + const HashEntry* fromEntry = static_cast(from); + HashEntry* toEntry = static_cast(to); *toEntry = *fromEntry; // we leave from dirty, but that's OK @@ -383,7 +383,7 @@ nsCommandParams::HashMoveEntry(PLDHashTable *table, const PLDHashEntryHdr *from, void nsCommandParams::HashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) { - HashEntry* thisEntry = NS_STATIC_CAST(HashEntry*, entry); + HashEntry* thisEntry = static_cast(entry); thisEntry->~HashEntry(); // call dtor explicitly memset(thisEntry, 0, sizeof(HashEntry)); // and clear out } diff --git a/embedding/components/commandhandler/src/nsControllerCommandTable.cpp b/embedding/components/commandhandler/src/nsControllerCommandTable.cpp index ed12ee1e5be2..620d5ca8fce6 100644 --- a/embedding/components/commandhandler/src/nsControllerCommandTable.cpp +++ b/embedding/components/commandhandler/src/nsControllerCommandTable.cpp @@ -110,7 +110,7 @@ nsControllerCommandTable::FindCommandHandler(const char * aCommandName, nsIContr if (!foundCommand) return NS_ERROR_FAILURE; // no need to addref since the .Get does it for us - *outCommand = NS_REINTERPRET_CAST(nsIControllerCommand*, foundCommand); + *outCommand = reinterpret_cast(foundCommand); return NS_OK; } diff --git a/embedding/components/printingui/src/mac/nsPrintProgress.cpp b/embedding/components/printingui/src/mac/nsPrintProgress.cpp index 6d7e9a6ff9f2..f5ea31b18c2f 100644 --- a/embedding/components/printingui/src/mac/nsPrintProgress.cpp +++ b/embedding/components/printingui/src/mac/nsPrintProgress.cpp @@ -97,7 +97,7 @@ NS_IMETHODIMP nsPrintProgress::OpenProgressDialog(nsIDOMWindowInternal *parent, do_CreateInstance(NS_SUPPORTS_INTERFACE_POINTER_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); - ifptr->SetData(NS_STATIC_CAST(nsIPrintProgress*, this)); + ifptr->SetData(static_cast(this)); ifptr->SetDataIID(&NS_GET_IID(nsIPrintProgress)); array->AppendElement(ifptr); diff --git a/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp b/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp index 47641d8003d6..22b060e04e40 100644 --- a/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp +++ b/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp @@ -448,7 +448,7 @@ nsPrintingPromptService::ShowProgress(nsIDOMWindow* parent, } } - *webProgressListener = NS_STATIC_CAST(nsIWebProgressListener*, this); + *webProgressListener = static_cast(this); NS_ADDREF(*webProgressListener); return rv; diff --git a/embedding/components/printingui/src/os2/nsPrintProgress.cpp b/embedding/components/printingui/src/os2/nsPrintProgress.cpp index 8767bcaa4d03..cbb4075f0cfa 100644 --- a/embedding/components/printingui/src/os2/nsPrintProgress.cpp +++ b/embedding/components/printingui/src/os2/nsPrintProgress.cpp @@ -97,7 +97,7 @@ NS_IMETHODIMP nsPrintProgress::OpenProgressDialog(nsIDOMWindowInternal *parent, do_CreateInstance(NS_SUPPORTS_INTERFACE_POINTER_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); - ifptr->SetData(NS_STATIC_CAST(nsIPrintProgress*, this)); + ifptr->SetData(static_cast(this)); ifptr->SetDataIID(&NS_GET_IID(nsIPrintProgress)); array->AppendElement(ifptr); diff --git a/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp b/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp index 30edcfdf5636..6a681ebb131a 100644 --- a/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp +++ b/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp @@ -170,7 +170,7 @@ nsPrintingPromptService::ShowProgress(nsIDOMWindow* parent, } } - *webProgressListener = NS_STATIC_CAST(nsIWebProgressListener*, this); + *webProgressListener = static_cast(this); NS_ADDREF(*webProgressListener); return rv; diff --git a/embedding/components/printingui/src/unixshared/nsPrintProgress.cpp b/embedding/components/printingui/src/unixshared/nsPrintProgress.cpp index 2f6e67e98170..e6a5f90a044b 100644 --- a/embedding/components/printingui/src/unixshared/nsPrintProgress.cpp +++ b/embedding/components/printingui/src/unixshared/nsPrintProgress.cpp @@ -98,7 +98,7 @@ NS_IMETHODIMP nsPrintProgress::OpenProgressDialog(nsIDOMWindowInternal *parent, do_CreateInstance(NS_SUPPORTS_INTERFACE_POINTER_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); - ifptr->SetData(NS_STATIC_CAST(nsIPrintProgress*, this)); + ifptr->SetData(static_cast(this)); ifptr->SetDataIID(&NS_GET_IID(nsIPrintProgress)); array->AppendElement(ifptr); diff --git a/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp b/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp index 0f5abf7e0809..a897df008ca7 100644 --- a/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp +++ b/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp @@ -165,7 +165,7 @@ nsPrintingPromptService::ShowProgress(nsIDOMWindow* parent, } } - *webProgressListener = NS_STATIC_CAST(nsIWebProgressListener*, this); + *webProgressListener = static_cast(this); NS_ADDREF(*webProgressListener); return rv; diff --git a/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp b/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp index 390f01834966..ee178ce2f660 100644 --- a/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp +++ b/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp @@ -761,7 +761,7 @@ static HGLOBAL CreateGlobalDevModeAndInit(LPCTSTR aPrintName, nsIPrintSettings* nsresult rv = NS_ERROR_FAILURE; HANDLE hPrinter = NULL; // const cast kludge for silly Win32 api's - LPTSTR printName = NS_CONST_CAST(char*, aPrintName); + LPTSTR printName = const_cast(aPrintName); BOOL status = ::OpenPrinter(printName, &hPrinter, NULL); if (status) { @@ -885,7 +885,7 @@ ShowNativePrintDialog(HWND aHWnd, HANDLE hPrinter = NULL; nsCAutoString printerNameNative; NS_CopyUnicodeToNative(nsDependentString(printerName), printerNameNative); - LPTSTR tempPrinterName = NS_CONST_CAST(char*, printerNameNative.get()); + LPTSTR tempPrinterName = const_cast(printerNameNative.get()); if(!::OpenPrinter(tempPrinterName, &hPrinter, NULL)) { // If the last used printer is not found, we should use default printer. printerName = GetDefaultPrinterNameFromGlobalPrinters(); diff --git a/embedding/components/printingui/src/win/nsPrintProgress.cpp b/embedding/components/printingui/src/win/nsPrintProgress.cpp index 8c86ff155f4d..ce030304e6ae 100644 --- a/embedding/components/printingui/src/win/nsPrintProgress.cpp +++ b/embedding/components/printingui/src/win/nsPrintProgress.cpp @@ -127,7 +127,7 @@ NS_IMETHODIMP nsPrintProgress::OpenProgressDialog(nsIDOMWindowInternal *parent, do_CreateInstance(NS_SUPPORTS_INTERFACE_POINTER_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); - ifptr->SetData(NS_STATIC_CAST(nsIPrintProgress*, this)); + ifptr->SetData(static_cast(this)); ifptr->SetDataIID(&NS_GET_IID(nsIPrintProgress)); array->AppendElement(ifptr); diff --git a/embedding/components/printingui/src/win/nsPrintingPromptService.cpp b/embedding/components/printingui/src/win/nsPrintingPromptService.cpp index 3e58df96a2e6..d6c087054197 100644 --- a/embedding/components/printingui/src/win/nsPrintingPromptService.cpp +++ b/embedding/components/printingui/src/win/nsPrintingPromptService.cpp @@ -246,7 +246,7 @@ nsPrintingPromptService::ShowProgress(nsIDOMWindow* parent, } } - *webProgressListener = NS_STATIC_CAST(nsIWebProgressListener*, this); + *webProgressListener = static_cast(this); NS_ADDREF(*webProgressListener); return rv; diff --git a/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp b/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp index e47e034102de..fcbe90548985 100644 --- a/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp +++ b/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp @@ -1231,7 +1231,7 @@ nsresult nsWebBrowserPersist::SaveURIInternal( // Open a channel to the URI nsCOMPtr inputChannel; rv = NS_NewChannel(getter_AddRefs(inputChannel), aURI, - nsnull, nsnull, NS_STATIC_CAST(nsIInterfaceRequestor *, this), + nsnull, nsnull, static_cast(this), loadFlags); if (NS_FAILED(rv) || inputChannel == nsnull) @@ -3571,7 +3571,7 @@ nsWebBrowserPersist::CreateChannelFromURI(nsIURI *aURI, nsIChannel **aChannel) NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_ARG_POINTER(*aChannel); - rv = (*aChannel)->SetNotificationCallbacks(NS_STATIC_CAST(nsIInterfaceRequestor *, this)); + rv = (*aChannel)->SetNotificationCallbacks(static_cast(this)); NS_ENSURE_SUCCESS(rv, rv); return NS_OK; } diff --git a/embedding/components/windowwatcher/src/nsPrompt.cpp b/embedding/components/windowwatcher/src/nsPrompt.cpp index 442614ab0e87..ee6712217389 100644 --- a/embedding/components/windowwatcher/src/nsPrompt.cpp +++ b/embedding/components/windowwatcher/src/nsPrompt.cpp @@ -126,7 +126,7 @@ NS_NewAuthPrompter2(nsIAuthPrompt2 **result, nsIDOMWindow *aParent) // We just delegate everything to the pw mgr. return factory->GetPrompt(aParent, NS_GET_IID(nsIAuthPrompt2), - NS_REINTERPRET_CAST(void**, result)); + reinterpret_cast(result)); } nsresult rv; diff --git a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp index a0e38af699aa..3fe881431b2f 100644 --- a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp +++ b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp @@ -967,13 +967,13 @@ nsWindowWatcher::GetPrompt(nsIDOMWindow *aParent, const nsIID& aIID, void **_retval) { if (aIID.Equals(NS_GET_IID(nsIPrompt))) - return NS_NewPrompter(NS_REINTERPRET_CAST(nsIPrompt**, _retval), aParent); + return NS_NewPrompter(reinterpret_cast(_retval), aParent); if (aIID.Equals(NS_GET_IID(nsIAuthPrompt))) - return NS_NewAuthPrompter(NS_REINTERPRET_CAST(nsIAuthPrompt**, _retval), + return NS_NewAuthPrompter(reinterpret_cast(_retval), aParent); if (aIID.Equals(NS_GET_IID(nsIAuthPrompt2))) { - nsresult rv = NS_NewAuthPrompter2(NS_REINTERPRET_CAST(nsIAuthPrompt2**, - _retval), + nsresult rv = NS_NewAuthPrompter2(reinterpret_cast + (_retval), aParent); if (rv == NS_NOINTERFACE) { // Return an wrapped nsIAuthPrompt (if we can) @@ -981,7 +981,7 @@ nsWindowWatcher::GetPrompt(nsIDOMWindow *aParent, const nsIID& aIID, rv = NS_NewAuthPrompter(getter_AddRefs(prompt), aParent); if (NS_SUCCEEDED(rv)) { NS_WrapAuthPrompt(prompt, - NS_REINTERPRET_CAST(nsIAuthPrompt2**, _retval)); + reinterpret_cast(_retval)); if (!*_retval) rv = NS_ERROR_NOT_AVAILABLE; } @@ -1208,7 +1208,7 @@ nsWindowWatcher::GetChromeForWindow(nsIDOMWindow *aWindow, nsIWebBrowserChrome * if (info->mChromeWeak != nsnull) { return info->mChromeWeak-> QueryReferent(NS_GET_IID(nsIWebBrowserChrome), - NS_REINTERPRET_CAST(void**, _retval)); + reinterpret_cast(_retval)); } *_retval = info->mChrome; NS_IF_ADDREF(*_retval); diff --git a/embedding/lite/nsEmbedGlobalHistory.cpp b/embedding/lite/nsEmbedGlobalHistory.cpp index 1a61742e58f1..476e7297ae2d 100644 --- a/embedding/lite/nsEmbedGlobalHistory.cpp +++ b/embedding/lite/nsEmbedGlobalHistory.cpp @@ -216,7 +216,7 @@ NS_IMETHODIMP nsEmbedGlobalHistory::AddPage(const char *aURL) NS_ENSURE_SUCCESS(rv, rv); nsCStringKey asKey(aURL); - HistoryEntry *entry = NS_STATIC_CAST(HistoryEntry *, mURLTable->Get(&asKey)); + HistoryEntry *entry = static_cast(mURLTable->Get(&asKey)); if (!entry) { if (++mEntriesAddedSinceFlush >= kNewEntriesBetweenFlush) @@ -371,10 +371,10 @@ PRBool nsEmbedGlobalHistory::EntryHasExpired(HistoryEntry *entry) PRIntn PR_CALLBACK nsEmbedGlobalHistory::enumRemoveEntryIfExpired(nsHashKey *aKey, void *aData, void* closure) { - HistoryEntry *entry = NS_STATIC_CAST(HistoryEntry*, aData); + HistoryEntry *entry = static_cast(aData); if (!entry) return PR_FALSE; - nsEmbedGlobalHistory *history = NS_STATIC_CAST(nsEmbedGlobalHistory*, closure); + nsEmbedGlobalHistory *history = static_cast(closure); if (!history) return kHashEnumerateStop; @@ -507,13 +507,13 @@ nsresult writeEntry(FILE *outStm, nsCStringKey *url, HistoryEntry *entry) PRIntn PR_CALLBACK enumWriteEntry(nsHashKey *aKey, void *aData, void* closure) { - FILE *outStm = NS_STATIC_CAST(FILE*, closure); + FILE *outStm = static_cast(closure); if (!outStm) return kHashEnumerateStop; - nsCStringKey *stringKey = NS_STATIC_CAST(nsCStringKey*, aKey); + nsCStringKey *stringKey = static_cast(aKey); if (!stringKey) return kHashEnumerateStop; - HistoryEntry *entry = NS_STATIC_CAST(HistoryEntry*, aData); + HistoryEntry *entry = static_cast(aData); if (!entry) return kHashEnumerateStop; @@ -524,13 +524,13 @@ PRIntn PR_CALLBACK enumWriteEntry(nsHashKey *aKey, void *aData, void* closure) PRIntn PR_CALLBACK enumWriteEntryIfUnwritten(nsHashKey *aKey, void *aData, void* closure) { - FILE *outStm = NS_STATIC_CAST(FILE*, closure); + FILE *outStm = static_cast(closure); if (!outStm) return kHashEnumerateStop; - nsCStringKey *stringKey = NS_STATIC_CAST(nsCStringKey*, aKey); + nsCStringKey *stringKey = static_cast(aKey); if (!stringKey) return kHashEnumerateStop; - HistoryEntry *entry = NS_STATIC_CAST(HistoryEntry*, aData); + HistoryEntry *entry = static_cast(aData); if (!entry) return kHashEnumerateStop; @@ -543,7 +543,7 @@ PRIntn PR_CALLBACK enumWriteEntryIfUnwritten(nsHashKey *aKey, void *aData, void* PRIntn PR_CALLBACK enumDeleteEntry(nsHashKey *aKey, void *aData, void* closure) { - HistoryEntry *entry = NS_STATIC_CAST(HistoryEntry*, aData); + HistoryEntry *entry = static_cast(aData); delete entry; return kHashEnumerateNext; diff --git a/embedding/qa/mozembed/src/mozEmbed.cpp b/embedding/qa/mozembed/src/mozEmbed.cpp index 56f4d7751ac8..3a616d061dc3 100644 --- a/embedding/qa/mozembed/src/mozEmbed.cpp +++ b/embedding/qa/mozembed/src/mozEmbed.cpp @@ -319,7 +319,7 @@ nsresult InitializeWindowCreator() WindowCreator *creatorCallback = new WindowCreator(); if (creatorCallback) { - nsCOMPtr windowCreator(NS_STATIC_CAST(nsIWindowCreator *, creatorCallback)); + nsCOMPtr windowCreator(static_cast(creatorCallback)); if (windowCreator) { nsCOMPtr wwatch(do_GetService("@mozilla.org/embedcomp/window-watcher;1")); diff --git a/embedding/qa/testembed/BrowserImpl.cpp b/embedding/qa/testembed/BrowserImpl.cpp index 25048538d281..2b1954775ba9 100644 --- a/embedding/qa/testembed/BrowserImpl.cpp +++ b/embedding/qa/testembed/BrowserImpl.cpp @@ -420,7 +420,7 @@ NS_IMETHODIMP CBrowserImpl::GetSiteWindow(void** aSiteWindow) *aSiteWindow = 0; if (m_pBrowserFrameGlue) { HWND w = m_pBrowserFrameGlue->GetBrowserFrameNativeWnd(); - *aSiteWindow = NS_REINTERPRET_CAST(void *, w); + *aSiteWindow = reinterpret_cast(w); } return NS_OK; } diff --git a/embedding/qa/testembed/BrowserView.cpp b/embedding/qa/testembed/BrowserView.cpp index 77dd4eac3e42..7167d52609e6 100644 --- a/embedding/qa/testembed/BrowserView.cpp +++ b/embedding/qa/testembed/BrowserView.cpp @@ -220,7 +220,7 @@ HRESULT CBrowserView::CreateBrowser() mpBrowserImpl->Init(mpBrowserFrameGlue, mWebBrowser); mpBrowserImpl->AddRef(); - mWebBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome*, mpBrowserImpl)); + mWebBrowser->SetContainerWindow(static_cast(mpBrowserImpl)); rv = NS_OK; nsCOMPtr dsti = do_QueryInterface(mWebBrowser, &rv); @@ -257,7 +257,7 @@ HRESULT CBrowserView::CreateBrowser() // These callbacks will be used to update the status/progress bars /* // from WinEmbed.cpp - nsCOMPtr listener(NS_STATIC_CAST(nsIWebProgressListener*, this)); + nsCOMPtr listener(static_cast(this)); nsCOMPtr thisListener(do_GetWeakReference(listener)); (void)mWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsIWebProgressListener)); @@ -289,7 +289,7 @@ HRESULT CBrowserView::DestroyBrowser() } /* nsWeakPtr weakling( - do_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, mpBrowserImpl))); + do_GetWeakReference(static_cast(mpBrowserImpl))); nsresult rv; rv = mWebBrowser->RemoveWebBrowserListener(weakling, NS_GET_IID(nsIWebProgressListener)); if (NS_FAILED(rv)) diff --git a/embedding/qa/testembed/PrintProgressDialog.cpp b/embedding/qa/testembed/PrintProgressDialog.cpp index 3808356c9938..bcc60910eed4 100644 --- a/embedding/qa/testembed/PrintProgressDialog.cpp +++ b/embedding/qa/testembed/PrintProgressDialog.cpp @@ -194,7 +194,7 @@ int CPrintProgressDialog::DoModal( ) m_PrintListener = new CDlgPrintListener(this); // constructor addrefs if (m_PrintListener) { // doModal will be set to false if the print job was cancelled - nsIWebProgressListener * wpl = NS_STATIC_CAST(nsIWebProgressListener*, m_PrintListener); + nsIWebProgressListener * wpl = static_cast(m_PrintListener); doModal = NS_SUCCEEDED(print->Print(m_PrintSettings, wpl)) == PR_TRUE; } } diff --git a/embedding/qa/testembed/TestEmbed.cpp b/embedding/qa/testembed/TestEmbed.cpp index b289a22e5eb9..0829f98d4ad7 100644 --- a/embedding/qa/testembed/TestEmbed.cpp +++ b/embedding/qa/testembed/TestEmbed.cpp @@ -577,7 +577,7 @@ nsresult CTestEmbedApp::InitializePrefs() nsresult CTestEmbedApp::InitializeWindowCreator() { // give an nsIWindowCreator to the WindowWatcher service - nsCOMPtr windowCreator(NS_STATIC_CAST(nsIWindowCreator *, this)); + nsCOMPtr windowCreator(static_cast(this)); if (windowCreator) { nsCOMPtr wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID)); if (wwatch) { @@ -661,7 +661,7 @@ NS_IMETHODIMP CTestEmbedApp::CreateChromeWindow(nsIWebBrowserChrome *parent, CBrowserFrame *pBrowserFrame = CreateNewBrowserFrame(chromeFlags); if(pBrowserFrame) { - *_retval = NS_STATIC_CAST(nsIWebBrowserChrome *, pBrowserFrame->GetBrowserImpl()); + *_retval = static_cast(pBrowserFrame->GetBrowserImpl()); NS_ADDREF(*_retval); } return NS_OK; diff --git a/embedding/qa/testembed/Tests.cpp b/embedding/qa/testembed/Tests.cpp index 231fa2006fe8..c2b985c96ea0 100644 --- a/embedding/qa/testembed/Tests.cpp +++ b/embedding/qa/testembed/Tests.cpp @@ -488,7 +488,7 @@ void CTests::OnTestsCreateprofile() void CTests::OnTestsAddTooltipListener() { nsWeakPtr weakling( - do_GetWeakReference(NS_STATIC_CAST(nsITooltipListener*, qaBrowserImpl))); + do_GetWeakReference(static_cast(qaBrowserImpl))); rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsITooltipListener)); RvTestResult(rv, "AddWebBrowserListener(). Add Tooltip Listener test", 2); @@ -499,7 +499,7 @@ void CTests::OnTestsAddTooltipListener() void CTests::OnTestsAddWebProgListener() { nsWeakPtr weakling( - do_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, qaBrowserImpl))); + do_GetWeakReference(static_cast(qaBrowserImpl))); rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIWebProgressListener)); RvTestResult(rv, "AddWebBrowserListener(). Add Web Prog Lstnr test", 2); @@ -512,7 +512,7 @@ void CTests::OnTestsAddHistoryListener() // addSHistoryListener test nsWeakPtr weakling( - do_GetWeakReference(NS_STATIC_CAST(nsISHistoryListener*, qaBrowserImpl))); + do_GetWeakReference(static_cast(qaBrowserImpl))); rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsISHistoryListener)); RvTestResult(rv, "AddWebBrowserListener(). Add History Lstnr test", 2); @@ -525,7 +525,7 @@ void CTests::OnTestsRemovehistorylistener() // RemoveSHistoryListener test nsWeakPtr weakling( - do_GetWeakReference(NS_STATIC_CAST(nsISHistoryListener*, qaBrowserImpl))); + do_GetWeakReference(static_cast(qaBrowserImpl))); rv = qaWebBrowser->RemoveWebBrowserListener(weakling, NS_GET_IID(nsISHistoryListener)); RvTestResult(rv, "RemoveWebBrowserListener(). Remove History Lstnr test", 2); @@ -536,7 +536,7 @@ void CTests::OnTestsRemovehistorylistener() void CTests::OnTestsAddUriContentListenerByWebBrowser() { nsWeakPtr weakling( - do_GetWeakReference(NS_STATIC_CAST(nsIURIContentListener*, qaBrowserImpl))); + do_GetWeakReference(static_cast(qaBrowserImpl))); rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIURIContentListener)); RvTestResult(rv, "AddWebBrowserListener(). add nsIURIContentListener test", 2); @@ -554,7 +554,7 @@ void CTests::OnTestsAddUriContentListenerByUriLoader() return; } - nsCOMPtr cntListener(NS_STATIC_CAST(nsIURIContentListener*, qaBrowserImpl)); + nsCOMPtr cntListener(static_cast(qaBrowserImpl)); if (!cntListener) { QAOutput("Didn't get urIContentListener object. test failed", 2); @@ -882,7 +882,7 @@ void CTests::OnVerifybugs70228() void CTests::OnVerifybugs90195() { nsWeakPtr weakling( - do_GetWeakReference(NS_STATIC_CAST(nsITooltipListener*, qaBrowserImpl))); + do_GetWeakReference(static_cast(qaBrowserImpl))); rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsITooltipListener)); RvTestResult(rv, "AddWebBrowserListener(). Add Tool Tip Lstnr test", 2); diff --git a/embedding/qa/testembed/nsIObserServ.cpp b/embedding/qa/testembed/nsIObserServ.cpp index 8a1123f03591..e64be6869a83 100644 --- a/embedding/qa/testembed/nsIObserServ.cpp +++ b/embedding/qa/testembed/nsIObserServ.cpp @@ -238,7 +238,7 @@ void CnsIObserServ::EnumerateObserversTest(int displayType) RvTestResultDlg(rv, "nsIObserver() test"); // compare 'this' with observer object - if( this == NS_REINTERPRET_CAST(CnsIObserServ*,NS_REINTERPRET_CAST(void*, observer.get()))) + if( this == reinterpret_cast(reinterpret_cast(observer.get()))) { QAOutput("observers match. Test passes."); bLoop = PR_FALSE; diff --git a/embedding/qa/testembed/nsIWebBrow.cpp b/embedding/qa/testembed/nsIWebBrow.cpp index 96ef3b1c844f..40995ed74833 100644 --- a/embedding/qa/testembed/nsIWebBrow.cpp +++ b/embedding/qa/testembed/nsIWebBrow.cpp @@ -73,7 +73,7 @@ void CNsIWebBrowser::WBAddListener(PRInt16 displayMode) { // AddWebBrowserListener nsWeakPtr weakling( - do_GetWeakReference(NS_STATIC_CAST(nsIContextMenuListener*, qaBrowserImpl))); + do_GetWeakReference(static_cast(qaBrowserImpl))); rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIContextMenuListener)); RvTestResult(rv, "AddWebBrowserListener(). nsIContextMenuListener test", displayMode); RvTestResultDlg(rv, "AddWebBrowserListener(). nsIContextMenuListener test", true); @@ -83,7 +83,7 @@ void CNsIWebBrowser::WBRemoveListener(PRInt16 displayMode) { // RemoveWebBrowserListener nsWeakPtr weakling( - do_GetWeakReference(NS_STATIC_CAST(nsIContextMenuListener*, qaBrowserImpl))); + do_GetWeakReference(static_cast(qaBrowserImpl))); rv = qaWebBrowser->RemoveWebBrowserListener(weakling, NS_GET_IID(nsIContextMenuListener)); RvTestResult(rv, "RemoveWebBrowserListener(). nsIContextMenuListener test", displayMode); @@ -110,7 +110,7 @@ void CNsIWebBrowser::WBSetContainerWindow(PRInt16 displayMode) { // SetContainerWindow - rv = qaWebBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome*, qaBrowserImpl)); + rv = qaWebBrowser->SetContainerWindow(static_cast(qaBrowserImpl)); RvTestResult(rv, "nsIWebBrowser::SetContainerWindow() test", displayMode); RvTestResultDlg(rv, "nsIWebBrowser::SetContainerWindow() test"); } @@ -136,7 +136,7 @@ void CNsIWebBrowser::WBSetURIContentListener(PRInt16 displayMode) { // SetParentURIContentListener - rv = qaWebBrowser->SetParentURIContentListener(NS_STATIC_CAST(nsIURIContentListener*, qaBrowserImpl)); + rv = qaWebBrowser->SetParentURIContentListener(static_cast(qaBrowserImpl)); RvTestResult(rv, "nsIWebBrowser::SetParentURIContentListener() test", displayMode); RvTestResultDlg(rv, "nsIWebBrowser::SetParentURIContentListener() test"); } diff --git a/embedding/qa/testembed/nsIWebProg.cpp b/embedding/qa/testembed/nsIWebProg.cpp index 68491ab6fa6f..1b1559bfa0c7 100644 --- a/embedding/qa/testembed/nsIWebProg.cpp +++ b/embedding/qa/testembed/nsIWebProg.cpp @@ -98,7 +98,7 @@ void CnsiWebProg::AddWebProgLstnr(PRUint32 theFlag, PRInt16 displayMode) // addWebProgListener qaWebProgress = GetWebProgObject(); - nsCOMPtr listener(NS_STATIC_CAST(nsIWebProgressListener*, qaBrowserImpl)); + nsCOMPtr listener(static_cast(qaBrowserImpl)); rv = qaWebProgress->AddProgressListener(listener, theFlag); // StoreWebProgFlag(theFlag); RvTestResult(rv, "nsIWebProgress::AddProgressListener() test", displayMode); @@ -110,7 +110,7 @@ void CnsiWebProg::RemoveWebProgLstnr(PRInt16 displayMode) { // removeWebProgListener qaWebProgress = GetWebProgObject(); - nsCOMPtr listener(NS_STATIC_CAST(nsIWebProgressListener*, qaBrowserImpl)); + nsCOMPtr listener(static_cast(qaBrowserImpl)); rv = qaWebProgress->RemoveProgressListener(listener); RvTestResult(rv, "nsIWebProgress::RemoveProgressListener() test", displayMode); RvTestResultDlg(rv, "nsIWebProgress::RemoveProgressListener() test"); diff --git a/embedding/qa/testembed/nsichanneltests.cpp b/embedding/qa/testembed/nsichanneltests.cpp index 9897375f704a..fdc79e5267b5 100644 --- a/embedding/qa/testembed/nsichanneltests.cpp +++ b/embedding/qa/testembed/nsichanneltests.cpp @@ -353,7 +353,7 @@ void CnsIChannelTests::OpenTest(nsIChannel *theChannel, PRInt16 displayMode) void CnsIChannelTests::AsyncOpenTest(nsIChannel *theChannel, PRInt16 displayMode) { - nsCOMPtr listener(NS_STATIC_CAST(nsIStreamListener*, qaBrowserImpl)); + nsCOMPtr listener(static_cast(qaBrowserImpl)); nsCOMPtr thisListener(do_GetWeakReference(listener)); qaWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsIStreamListener)); if (!theChannel) diff --git a/embedding/qa/testembed/nsirequest.cpp b/embedding/qa/testembed/nsirequest.cpp index 3496dd06db2f..a951cf195efa 100644 --- a/embedding/qa/testembed/nsirequest.cpp +++ b/embedding/qa/testembed/nsirequest.cpp @@ -252,7 +252,7 @@ nsIChannel * CNsIRequest::GetTheChannel(int i, nsILoadGroup *theLoadGroup) RvTestResultDlg(rv, "NS_NewChannel"); } - nsCOMPtr listener(NS_STATIC_CAST(nsIStreamListener*, qaBrowserImpl)); + nsCOMPtr listener(static_cast(qaBrowserImpl)); nsCOMPtr thisListener(do_GetWeakReference(listener)); qaWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsIStreamListener)); diff --git a/embedding/tests/os2Embed/WebBrowserChrome.cpp b/embedding/tests/os2Embed/WebBrowserChrome.cpp index a21608e56173..8509506fb77b 100644 --- a/embedding/tests/os2Embed/WebBrowserChrome.cpp +++ b/embedding/tests/os2Embed/WebBrowserChrome.cpp @@ -76,14 +76,14 @@ nsresult WebBrowserChrome::CreateBrowser(PRInt32 aX, PRInt32 aY, if (!mWebBrowser) return NS_ERROR_FAILURE; - (void)mWebBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome*, this)); + (void)mWebBrowser->SetContainerWindow(static_cast(this)); nsCOMPtr dsti = do_QueryInterface(mWebBrowser); dsti->SetItemType(nsIDocShellTreeItem::typeContentWrapper); nsCOMPtr browserBaseWindow = do_QueryInterface(mWebBrowser); - mNativeWindow = WebBrowserChromeUI::CreateNativeWindow(NS_STATIC_CAST(nsIWebBrowserChrome*, this)); + mNativeWindow = WebBrowserChromeUI::CreateNativeWindow(static_cast(this)); if (!mNativeWindow) return NS_ERROR_FAILURE; @@ -93,7 +93,7 @@ nsresult WebBrowserChrome::CreateBrowser(PRInt32 aX, PRInt32 aY, aX, aY, aCX, aCY); browserBaseWindow->Create(); - nsCOMPtr listener(NS_STATIC_CAST(nsIWebProgressListener*, this)); + nsCOMPtr listener(static_cast(this)); nsCOMPtr thisListener(do_GetWeakReference(listener)); (void)mWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsIWebProgressListener)); diff --git a/embedding/tests/os2Embed/os2Embed.cpp b/embedding/tests/os2Embed/os2Embed.cpp index 914718793c6e..e590cb6843fa 100644 --- a/embedding/tests/os2Embed/os2Embed.cpp +++ b/embedding/tests/os2Embed/os2Embed.cpp @@ -172,9 +172,9 @@ int main(int argc, char *argv[]) ProfileChangeObserver *observer = new ProfileChangeObserver; observer->AddRef(); - observerService->AddObserver(NS_STATIC_CAST(nsIObserver *, observer), "profile-approve-change", PR_TRUE); - observerService->AddObserver(NS_STATIC_CAST(nsIObserver *, observer), "profile-change-teardown", PR_TRUE); - observerService->AddObserver(NS_STATIC_CAST(nsIObserver *, observer), "profile-after-change", PR_TRUE); + observerService->AddObserver(static_cast(observer), "profile-approve-change", PR_TRUE); + observerService->AddObserver(static_cast(observer), "profile-change-teardown", PR_TRUE); + observerService->AddObserver(static_cast(observer), "profile-after-change", PR_TRUE); InitializeWindowCreator(); @@ -264,7 +264,7 @@ nsresult InitializeWindowCreator() WindowCreator *creatorCallback = new WindowCreator(); if (creatorCallback) { - nsCOMPtr windowCreator(NS_STATIC_CAST(nsIWindowCreator *, creatorCallback)); + nsCOMPtr windowCreator(static_cast(creatorCallback)); if (windowCreator) { nsCOMPtr wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID)); @@ -1410,7 +1410,7 @@ nsresult CreateBrowserWindow(PRUint32 aChromeFlags, // the interface to return and one addref, which we assume will be // immediately released - CallQueryInterface(NS_STATIC_CAST(nsIWebBrowserChrome*, chrome), aNewWindow); + CallQueryInterface(static_cast(chrome), aNewWindow); // now an extra addref; the window owns itself (to be released by // WebBrowserChromeUI::Destroy) NS_ADDREF(*aNewWindow); @@ -1425,12 +1425,12 @@ nsresult CreateBrowserWindow(PRUint32 aChromeFlags, return NS_ERROR_FAILURE; // Place it where we want it. - ResizeEmbedding(NS_STATIC_CAST(nsIWebBrowserChrome*, chrome)); + ResizeEmbedding(static_cast(chrome)); // Subscribe new window to profile changes so it can kill itself when one happens nsCOMPtr observerService(do_GetService("@mozilla.org/observer-service;1")); if (observerService) - observerService->AddObserver(NS_STATIC_CAST(nsIObserver *, chrome), + observerService->AddObserver(static_cast(chrome), "profile-change-teardown", PR_TRUE); // if opened as chrome, it'll be made visible after the chrome has loaded. diff --git a/embedding/tests/winEmbed/WebBrowserChrome.cpp b/embedding/tests/winEmbed/WebBrowserChrome.cpp index 713c2b627555..c0da83d6db09 100644 --- a/embedding/tests/winEmbed/WebBrowserChrome.cpp +++ b/embedding/tests/winEmbed/WebBrowserChrome.cpp @@ -77,11 +77,11 @@ nsresult WebBrowserChrome::CreateBrowser(PRInt32 aX, PRInt32 aY, if (!mWebBrowser) return NS_ERROR_FAILURE; - (void)mWebBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome*, this)); + (void)mWebBrowser->SetContainerWindow(static_cast(this)); nsCOMPtr browserBaseWindow = do_QueryInterface(mWebBrowser); - mNativeWindow = WebBrowserChromeUI::CreateNativeWindow(NS_STATIC_CAST(nsIWebBrowserChrome*, this)); + mNativeWindow = WebBrowserChromeUI::CreateNativeWindow(static_cast(this)); if (!mNativeWindow) return NS_ERROR_FAILURE; @@ -91,7 +91,7 @@ nsresult WebBrowserChrome::CreateBrowser(PRInt32 aX, PRInt32 aY, aX, aY, aCX, aCY); browserBaseWindow->Create(); - nsCOMPtr listener(NS_STATIC_CAST(nsIWebProgressListener*, this)); + nsCOMPtr listener(static_cast(this)); nsCOMPtr thisListener(do_GetWeakReference(listener)); (void)mWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsIWebProgressListener)); diff --git a/embedding/tests/winEmbed/winEmbed.cpp b/embedding/tests/winEmbed/winEmbed.cpp index 03f2d63f0b28..3be299fef41a 100644 --- a/embedding/tests/winEmbed/winEmbed.cpp +++ b/embedding/tests/winEmbed/winEmbed.cpp @@ -1099,7 +1099,7 @@ nsresult AppCallbacks::CreateBrowserWindow(PRUint32 aChromeFlags, // the interface to return and one addref, which we assume will be // immediately released - CallQueryInterface(NS_STATIC_CAST(nsIWebBrowserChrome*, chrome), aNewWindow); + CallQueryInterface(static_cast(chrome), aNewWindow); // now an extra addref; the window owns itself (to be released by // WebBrowserChromeUI::Destroy) NS_ADDREF(*aNewWindow); @@ -1114,7 +1114,7 @@ nsresult AppCallbacks::CreateBrowserWindow(PRUint32 aChromeFlags, return NS_ERROR_FAILURE; // Place it where we want it. - ResizeEmbedding(NS_STATIC_CAST(nsIWebBrowserChrome*, chrome)); + ResizeEmbedding(static_cast(chrome)); // if opened as chrome, it'll be made visible after the chrome has loaded. // otherwise, go ahead and show it now. diff --git a/embedding/tests/wxEmbed/EmbedApp.cpp b/embedding/tests/wxEmbed/EmbedApp.cpp index 3dc1fb3c7098..6e283b1cdcc0 100644 --- a/embedding/tests/wxEmbed/EmbedApp.cpp +++ b/embedding/tests/wxEmbed/EmbedApp.cpp @@ -121,7 +121,7 @@ bool EmbedApp::OnInit() GeckoWindowCreator *creatorCallback = new GeckoWindowCreator(); if (creatorCallback) { - nsCOMPtr windowCreator(NS_STATIC_CAST(nsIWindowCreator *, creatorCallback)); + nsCOMPtr windowCreator(static_cast(creatorCallback)); if (windowCreator) { nsCOMPtr wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID)); diff --git a/embedding/tests/wxEmbed/GeckoContainer.cpp b/embedding/tests/wxEmbed/GeckoContainer.cpp index fc8f601ed38b..03c4cac406e4 100644 --- a/embedding/tests/wxEmbed/GeckoContainer.cpp +++ b/embedding/tests/wxEmbed/GeckoContainer.cpp @@ -76,7 +76,7 @@ nsresult GeckoContainer::CreateBrowser(PRInt32 aX, PRInt32 aY, if (!mWebBrowser || NS_FAILED(rv)) return NS_ERROR_FAILURE; - mWebBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome *, this)); + mWebBrowser->SetContainerWindow(static_cast(this)); nsCOMPtr dsti = do_QueryInterface(mWebBrowser); dsti->SetItemType( @@ -96,13 +96,13 @@ nsresult GeckoContainer::CreateBrowser(PRInt32 aX, PRInt32 aY, aX, aY, aCX, aCY); browserBaseWindow->Create(); - nsCOMPtr listener(NS_STATIC_CAST(nsIWebProgressListener*, this)); + nsCOMPtr listener(static_cast(this)); nsCOMPtr thisListener(do_GetWeakReference(listener)); (void)mWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsIWebProgressListener)); if (mIsURIContentListener) - mWebBrowser->SetParentURIContentListener(NS_STATIC_CAST(nsIURIContentListener *, this)); + mWebBrowser->SetParentURIContentListener(static_cast(this)); // The window has been created. Now register for history notifications diff --git a/embedding/tests/wxEmbed/GeckoProtocolHandler.cpp b/embedding/tests/wxEmbed/GeckoProtocolHandler.cpp index af4cbe769571..cbb4af4b5d99 100644 --- a/embedding/tests/wxEmbed/GeckoProtocolHandler.cpp +++ b/embedding/tests/wxEmbed/GeckoProtocolHandler.cpp @@ -367,7 +367,7 @@ GeckoProtocolChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *aCont if (stricmp(scheme.get(), gCallbacks[i].mScheme.get()) == 0) { rv = gCallbacks[i].mCallback->GetData( - mURI, NS_STATIC_CAST(nsIChannel *,this), mContentType, &mData, &mContentLength); + mURI, static_cast(this), mContentType, &mData, &mContentLength); if (NS_FAILED(rv)) return rv; rv = NS_NewByteInputStream(getter_AddRefs(mContentStream), diff --git a/embedding/wrappers/DotNETEmbed/DotNETEmbed.cpp b/embedding/wrappers/DotNETEmbed/DotNETEmbed.cpp index 21207185f93a..27796e887136 100644 --- a/embedding/wrappers/DotNETEmbed/DotNETEmbed.cpp +++ b/embedding/wrappers/DotNETEmbed/DotNETEmbed.cpp @@ -280,7 +280,7 @@ WebBrowserChrome::CreateBrowser(HWND hWnd, PRInt32 aX, PRInt32 aY, PRInt32 aCX, if (!mWebBrowser) return NS_ERROR_FAILURE; - mWebBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome*, this)); + mWebBrowser->SetContainerWindow(static_cast(this)); nsCOMPtr dsti = do_QueryInterface(mWebBrowser); dsti->SetItemType(nsIDocShellTreeItem::typeContentWrapper); diff --git a/embedding/wrappers/DotNETEmbed/WebChrome.cpp b/embedding/wrappers/DotNETEmbed/WebChrome.cpp index 173780295c9c..f94091e89624 100644 --- a/embedding/wrappers/DotNETEmbed/WebChrome.cpp +++ b/embedding/wrappers/DotNETEmbed/WebChrome.cpp @@ -201,7 +201,7 @@ nsresult WebBrowserChrome::CreateBrowser(HWND hWnd, PRInt32 aX, PRInt32 aY, if (!mWebBrowser) return NS_ERROR_FAILURE; - (void)mWebBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome*, this)); + (void)mWebBrowser->SetContainerWindow(static_cast(this)); nsCOMPtr dsti = do_QueryInterface(mWebBrowser); dsti->SetItemType(nsIDocShellTreeItem::typeContentWrapper); diff --git a/extensions/access-builtin/accessproxy/nsAccessProxy.cpp b/extensions/access-builtin/accessproxy/nsAccessProxy.cpp index f11718c34a80..c77e15369e4a 100644 --- a/extensions/access-builtin/accessproxy/nsAccessProxy.cpp +++ b/extensions/access-builtin/accessproxy/nsAccessProxy.cpp @@ -189,7 +189,7 @@ NS_IMETHODIMP nsAccessProxy::Observe(nsISupports *aSubject, const char *aTopic, nsCOMPtr progress(do_GetService(NS_DOCUMENTLOADER_SERVICE_CONTRACTID)); rv = NS_ERROR_FAILURE; if (progress) { - rv = progress->AddProgressListener(NS_STATIC_CAST(nsIWebProgressListener*,this), + rv = progress->AddProgressListener(static_cast(this), nsIWebProgress::NOTIFY_STATE_DOCUMENT); if (NS_SUCCEEDED(rv)) AddRef(); diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp index 44272d3cb6ec..b0bd5b803ce0 100644 --- a/extensions/auth/nsAuthSambaNTLM.cpp +++ b/extensions/auth/nsAuthSambaNTLM.cpp @@ -194,7 +194,7 @@ static PRUint8* ExtractMessage(const nsACString& aLine, PRUint32* aLen) break; } *aLen = (length/4)*3 - numEquals; - return NS_REINTERPRET_CAST(PRUint8*, PL_Base64Decode(s, length, nsnull)); + return reinterpret_cast(PL_Base64Decode(s, length, nsnull)); } nsresult @@ -208,7 +208,7 @@ nsAuthSambaNTLM::SpawnNTLMAuthHelper() "ntlm_auth", "--helper-protocol", "ntlmssp-client-1", "--use-cached-creds", - "--username", NS_CONST_CAST(char*, username), + "--username", const_cast(username), nsnull }; @@ -261,7 +261,7 @@ nsAuthSambaNTLM::GetNextToken(const void *inToken, } /* inToken must be a type 2 message. Get ntlm_auth to generate our response */ - char* encoded = PL_Base64Encode(NS_STATIC_CAST(const char*, inToken), inTokenLen, nsnull); + char* encoded = PL_Base64Encode(static_cast(inToken), inTokenLen, nsnull); if (!encoded) return NS_ERROR_OUT_OF_MEMORY; diff --git a/extensions/cookie/nsPermissionManager.cpp b/extensions/cookie/nsPermissionManager.cpp index 8353626a07c4..6407f309e1e0 100644 --- a/extensions/cookie/nsPermissionManager.cpp +++ b/extensions/cookie/nsPermissionManager.cpp @@ -66,7 +66,7 @@ ArenaStrDup(const char* str, PLArenaPool* aArena) PL_ARENA_ALLOCATE(mem, aArena, size); if (mem) memcpy(mem, str, size); - return NS_STATIC_CAST(char*, mem); + return static_cast(mem); } nsHostEntry::nsHostEntry(const char* aHost) @@ -455,7 +455,7 @@ AddHostToList(nsHostEntry *entry, void *arg) // so we dereference it twice to assign the |const char*| string // and once so we can increment the |const char**| array location // ready for the next assignment. - const char*** elementPtr = NS_STATIC_CAST(const char***, arg); + const char*** elementPtr = static_cast(arg); **elementPtr = entry->GetKey(); ++(*elementPtr); return PL_DHASH_NEXT; @@ -476,7 +476,7 @@ NS_IMETHODIMP nsPermissionManager::GetEnumerator(nsISimpleEnumerator **aEnum) const char** hostListCopy = hostList; mHostTable.EnumerateEntries(AddHostToList, &hostListCopy); - nsPermissionEnumerator* permissionEnum = new nsPermissionEnumerator(&mHostTable, hostList, mHostCount, NS_CONST_CAST(const char**, mTypeArray)); + nsPermissionEnumerator* permissionEnum = new nsPermissionEnumerator(&mHostTable, hostList, mHostCount, const_cast(mTypeArray)); if (!permissionEnum) { delete[] hostList; return NS_ERROR_OUT_OF_MEMORY; @@ -833,7 +833,7 @@ AddEntryToList(nsHostEntry *entry, void *arg) // so we dereference it twice to assign the |nsHostEntry*| // and once so we can increment the |nsHostEntry**| array location // ready for the next assignment. - nsHostEntry*** elementPtr = NS_STATIC_CAST(nsHostEntry***, arg); + nsHostEntry*** elementPtr = static_cast(arg); **elementPtr = entry; ++(*elementPtr); return PL_DHASH_NEXT; @@ -857,7 +857,7 @@ void nsPermissionManager::DoLazyWrite(nsITimer *aTimer, void *aClosure) { - nsPermissionManager *service = NS_REINTERPRET_CAST(nsPermissionManager*, aClosure); + nsPermissionManager *service = reinterpret_cast(aClosure); service->Write(); service->mWriteTimer = 0; } @@ -940,7 +940,7 @@ nsPermissionManager::Write() mHostTable.EnumerateEntries(AddEntryToList, &hostListCopy); for (i = 0; i < mHostCount; ++i) { - nsHostEntry *entry = NS_STATIC_CAST(nsHostEntry*, hostList[i]); + nsHostEntry *entry = static_cast(hostList[i]); NS_ASSERTION(entry, "corrupt permission list"); for (PRInt32 type = 0; type < NUMBER_OF_TYPES; ++type) { diff --git a/extensions/cookie/nsPermissionManager.h b/extensions/cookie/nsPermissionManager.h index 38aaa8d13fcd..48e3228ecb02 100644 --- a/extensions/cookie/nsPermissionManager.h +++ b/extensions/cookie/nsPermissionManager.h @@ -122,8 +122,8 @@ public: PRBool PermissionsAreEmpty() const { // Cast to PRUint32, to make this faster. Only 2 checks instead of 8 - return (*NS_REINTERPRET_CAST(const PRUint32*, &mPermissions[0])==0 && - *NS_REINTERPRET_CAST(const PRUint32*, &mPermissions[4])==0 ); + return (*reinterpret_cast(&mPermissions[0])==0 && + *reinterpret_cast(&mPermissions[4])==0 ); } private: diff --git a/extensions/java/xpcom/src/nsAppFileLocProviderProxy.cpp b/extensions/java/xpcom/src/nsAppFileLocProviderProxy.cpp index ff4bd56fe814..c10bf4c1834d 100644 --- a/extensions/java/xpcom/src/nsAppFileLocProviderProxy.cpp +++ b/extensions/java/xpcom/src/nsAppFileLocProviderProxy.cpp @@ -112,8 +112,8 @@ public: : mIndex(0) { JNIEnv* env = GetJNIEnv(); - mJavaFileArray = NS_STATIC_CAST(jobjectArray, - env->NewGlobalRef(aJavaFileArray)); + mJavaFileArray = static_cast + (env->NewGlobalRef(aJavaFileArray)); mArraySize = env->GetArrayLength(aJavaFileArray); } @@ -222,8 +222,8 @@ nsAppFileLocProviderProxy::GetFiles(const char* aProp, if (NS_SUCCEEDED(rv)) { // Parse return value - *aResult = new DirectoryEnumerator(NS_STATIC_CAST(jobjectArray, - javaFileArray)); + *aResult = new DirectoryEnumerator(static_cast + (javaFileArray)); NS_ADDREF(*aResult); return NS_OK; } diff --git a/extensions/java/xpcom/src/nsJavaInterfaces.cpp b/extensions/java/xpcom/src/nsJavaInterfaces.cpp index bafe8babe8f7..c95f9c47d18d 100644 --- a/extensions/java/xpcom/src/nsJavaInterfaces.cpp +++ b/extensions/java/xpcom/src/nsJavaInterfaces.cpp @@ -302,7 +302,7 @@ GRE_NATIVE(lockProfileDirectory) (JNIEnv* env, jobject, jobject aDirectory) if (clazz) { jmethodID mid = env->GetMethodID(clazz, "", "(J)V"); if (mid) { - return env->NewObject(clazz, mid, NS_REINTERPRET_CAST(jlong, lock)); + return env->NewObject(clazz, mid, reinterpret_cast(lock)); } } @@ -392,7 +392,7 @@ JXUTILS_NATIVE(wrapJavaObject) (JNIEnv* env, jobject, jobject aJavaObject, if (NS_FAILED(rv)) { ThrowException(env, rv, "Failed to create XPCOM proxy for Java object"); } - return NS_REINTERPRET_CAST(jlong, xpcomObject); + return reinterpret_cast(xpcomObject); } extern "C" NS_EXPORT jobject JNICALL @@ -401,7 +401,7 @@ JXUTILS_NATIVE(wrapXPCOMObject) (JNIEnv* env, jobject, jlong aXPCOMObject, { nsresult rv; jobject javaObject = nsnull; - nsISupports* xpcomObject = NS_REINTERPRET_CAST(nsISupports*, aXPCOMObject); + nsISupports* xpcomObject = reinterpret_cast(aXPCOMObject); if (!xpcomObject || !aIID) { rv = NS_ERROR_NULL_POINTER; diff --git a/extensions/java/xpcom/src/nsJavaWrapper.cpp b/extensions/java/xpcom/src/nsJavaWrapper.cpp index 592efac5ecc4..d38a092e5a9a 100644 --- a/extensions/java/xpcom/src/nsJavaWrapper.cpp +++ b/extensions/java/xpcom/src/nsJavaWrapper.cpp @@ -162,73 +162,73 @@ GetNativeArrayElement(PRUint8 aType, void* aArray, PRUint32 aIndex, { case nsXPTType::T_I8: case nsXPTType::T_U8: - aResult->val.u8 = NS_STATIC_CAST(PRUint8*, aArray)[aIndex]; + aResult->val.u8 = static_cast(aArray)[aIndex]; break; case nsXPTType::T_I16: case nsXPTType::T_U16: - aResult->val.u16 = NS_STATIC_CAST(PRUint16*, aArray)[aIndex]; + aResult->val.u16 = static_cast(aArray)[aIndex]; break; case nsXPTType::T_I32: case nsXPTType::T_U32: - aResult->val.u32 = NS_STATIC_CAST(PRUint32*, aArray)[aIndex]; + aResult->val.u32 = static_cast(aArray)[aIndex]; break; case nsXPTType::T_I64: case nsXPTType::T_U64: - aResult->val.u64 = NS_STATIC_CAST(PRUint64*, aArray)[aIndex]; + aResult->val.u64 = static_cast(aArray)[aIndex]; break; case nsXPTType::T_FLOAT: - aResult->val.f = NS_STATIC_CAST(float*, aArray)[aIndex]; + aResult->val.f = static_cast(aArray)[aIndex]; break; case nsXPTType::T_DOUBLE: - aResult->val.d = NS_STATIC_CAST(double*, aArray)[aIndex]; + aResult->val.d = static_cast(aArray)[aIndex]; break; case nsXPTType::T_BOOL: - aResult->val.b = NS_STATIC_CAST(PRBool*, aArray)[aIndex]; + aResult->val.b = static_cast(aArray)[aIndex]; break; case nsXPTType::T_CHAR: - aResult->val.c = NS_STATIC_CAST(char*, aArray)[aIndex]; + aResult->val.c = static_cast(aArray)[aIndex]; break; case nsXPTType::T_WCHAR: - aResult->val.wc = NS_STATIC_CAST(PRUnichar*, aArray)[aIndex]; + aResult->val.wc = static_cast(aArray)[aIndex]; break; case nsXPTType::T_CHAR_STR: - aResult->val.p = NS_STATIC_CAST(char**, aArray)[aIndex]; + aResult->val.p = static_cast(aArray)[aIndex]; break; case nsXPTType::T_WCHAR_STR: - aResult->val.p = NS_STATIC_CAST(PRUnichar**, aArray)[aIndex]; + aResult->val.p = static_cast(aArray)[aIndex]; break; case nsXPTType::T_IID: - aResult->val.p = NS_STATIC_CAST(nsID**, aArray)[aIndex]; + aResult->val.p = static_cast(aArray)[aIndex]; break; case nsXPTType::T_INTERFACE: case nsXPTType::T_INTERFACE_IS: - aResult->val.p = NS_STATIC_CAST(nsISupports**, aArray)[aIndex]; + aResult->val.p = static_cast(aArray)[aIndex]; break; case nsXPTType::T_ASTRING: case nsXPTType::T_DOMSTRING: - aResult->val.p = NS_STATIC_CAST(nsString**, aArray)[aIndex]; + aResult->val.p = static_cast(aArray)[aIndex]; break; case nsXPTType::T_UTF8STRING: case nsXPTType::T_CSTRING: - aResult->val.p = NS_STATIC_CAST(nsCString**, aArray)[aIndex]; + aResult->val.p = static_cast(aArray)[aIndex]; break; case nsXPTType::T_VOID: - aResult->val.p = NS_STATIC_CAST(void**, aArray)[aIndex]; + aResult->val.p = static_cast(aArray)[aIndex]; break; default: @@ -345,7 +345,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, } aVariant.SetPtrIsData(); } else { // 'array' - NS_STATIC_CAST(PRInt8*, aVariant.val.p)[aIndex] = value; + static_cast(aVariant.val.p)[aIndex] = value; } } break; @@ -380,9 +380,9 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, aVariant.SetPtrIsData(); } else { // 'array' if (aType == nsXPTType::T_I16) - NS_STATIC_CAST(PRInt16*, aVariant.val.p)[aIndex] = value; + static_cast(aVariant.val.p)[aIndex] = value; else - NS_STATIC_CAST(PRUint8*, aVariant.val.p)[aIndex] = value; + static_cast(aVariant.val.p)[aIndex] = value; } } break; @@ -417,9 +417,9 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, aVariant.SetPtrIsData(); } else { // 'array' if (aType == nsXPTType::T_I32) - NS_STATIC_CAST(PRInt32*, aVariant.val.p)[aIndex] = value; + static_cast(aVariant.val.p)[aIndex] = value; else - NS_STATIC_CAST(PRUint16*, aVariant.val.p)[aIndex] = value; + static_cast(aVariant.val.p)[aIndex] = value; } } break; @@ -454,9 +454,9 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, aVariant.SetPtrIsData(); } else { // 'array' if (aType == nsXPTType::T_I64) - NS_STATIC_CAST(PRInt64*, aVariant.val.p)[aIndex] = value; + static_cast(aVariant.val.p)[aIndex] = value; else - NS_STATIC_CAST(PRUint32*, aVariant.val.p)[aIndex] = value; + static_cast(aVariant.val.p)[aIndex] = value; } } break; @@ -482,7 +482,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, } aVariant.SetPtrIsData(); } else { // 'array' - NS_STATIC_CAST(float*, aVariant.val.p)[aIndex] = value; + static_cast(aVariant.val.p)[aIndex] = value; } } break; @@ -498,7 +498,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, if (aType == nsXPTType::T_DOUBLE) aVariant.val.d = value; else - aVariant.val.u64 = NS_STATIC_CAST(PRUint64, value); + aVariant.val.u64 = static_cast(value); } else { // 'inout' & 'array' jdouble value; if (aParam) { @@ -510,7 +510,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, if (aType == nsXPTType::T_DOUBLE) aVariant.val.d = value; else - aVariant.val.u64 = NS_STATIC_CAST(PRUint64, value); + aVariant.val.u64 = static_cast(value); aVariant.ptr = &aVariant.val; } else { aVariant.ptr = nsnull; @@ -518,10 +518,10 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, aVariant.SetPtrIsData(); } else { // 'array' if (aType == nsXPTType::T_DOUBLE) - NS_STATIC_CAST(double*, aVariant.val.p)[aIndex] = value; + static_cast(aVariant.val.p)[aIndex] = value; else - NS_STATIC_CAST(PRUint64*, aVariant.val.p)[aIndex] = - NS_STATIC_CAST(PRUint64, value); + static_cast(aVariant.val.p)[aIndex] = + static_cast(value); } } break; @@ -547,7 +547,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, } aVariant.SetPtrIsData(); } else { // 'array' - NS_STATIC_CAST(PRBool*, aVariant.val.p)[aIndex] = value; + static_cast(aVariant.val.p)[aIndex] = value; } } break; @@ -573,7 +573,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, } aVariant.SetPtrIsData(); } else { // 'array' - NS_STATIC_CAST(char*, aVariant.val.p)[aIndex] = value; + static_cast(aVariant.val.p)[aIndex] = value; } } break; @@ -599,7 +599,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, } aVariant.SetPtrIsData(); } else { // 'array' - NS_STATIC_CAST(PRUnichar*, aVariant.val.p)[aIndex] = value; + static_cast(aVariant.val.p)[aIndex] = value; } } break; @@ -629,7 +629,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, break; } - char* char_str = NS_STATIC_CAST(char*, buf); + char* char_str = static_cast(buf); env->GetStringUTFRegion(data, 0, uniLength, char_str); char_str[utf8Length] = '\0'; @@ -640,7 +640,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, break; } - jchar* jchar_str = NS_STATIC_CAST(jchar*, buf); + jchar* jchar_str = static_cast(buf); env->GetStringRegion(data, 0, uniLength, jchar_str); jchar_str[uniLength] = '\0'; } @@ -663,11 +663,11 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, } } else { // 'array' if (aType == nsXPTType::T_CHAR_STR) { - char* str = NS_STATIC_CAST(char*, buf); - NS_STATIC_CAST(char**, aVariant.val.p)[aIndex] = str; + char* str = static_cast(buf); + static_cast(aVariant.val.p)[aIndex] = str; } else { - PRUnichar* str = NS_STATIC_CAST(PRUnichar*, buf); - NS_STATIC_CAST(PRUnichar**, aVariant.val.p)[aIndex] = str; + PRUnichar* str = static_cast(buf); + static_cast(aVariant.val.p)[aIndex] = str; } } break; @@ -711,7 +711,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, aVariant.SetPtrIsData(); } } else { // 'array' - NS_STATIC_CAST(nsID**, aVariant.val.p)[aIndex] = iid; + static_cast(aVariant.val.p)[aIndex] = iid; } break; } @@ -778,7 +778,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, aVariant.SetPtrIsData(); } } else { // 'array' - NS_STATIC_CAST(void**, aVariant.val.p)[aIndex] = xpcom_obj; + static_cast(aVariant.val.p)[aIndex] = xpcom_obj; } break; } @@ -794,7 +794,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, break; } - jstring jstr = NS_STATIC_CAST(jstring, aParam); + jstring jstr = static_cast(aParam); nsAString* str = jstring_to_nsAString(env, jstr); if (!str) { rv = NS_ERROR_OUT_OF_MEMORY; @@ -817,7 +817,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, break; } - jstring jstr = NS_STATIC_CAST(jstring, aParam); + jstring jstr = static_cast(aParam); nsACString* str = jstring_to_nsACString(env, jstr); if (!str) { rv = NS_ERROR_OUT_OF_MEMORY; @@ -839,7 +839,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, LOG(("long (void*)\n")); if (!aIsOut && !aIsArrayElement) { // 'in' aVariant.val.p = - NS_REINTERPRET_CAST(void*, env->CallLongMethod(aParam, longValueMID)); + reinterpret_cast(env->CallLongMethod(aParam, longValueMID)); } else { // 'inout' & 'array' jlong value; if (aParam) { @@ -848,15 +848,15 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, if (aIsOut) { // 'inout' if (aParam) { - aVariant.val.p = NS_REINTERPRET_CAST(void*, value); + aVariant.val.p = reinterpret_cast(value); aVariant.ptr = &aVariant.val; } else { aVariant.ptr = nsnull; } aVariant.SetPtrIsData(); } else { // 'array' - NS_STATIC_CAST(void**, aVariant.val.p)[aIndex] = - NS_REINTERPRET_CAST(void*, value); + static_cast(aVariant.val.p)[aIndex] = + reinterpret_cast(value); } } break; @@ -868,7 +868,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, if (!aIsOut) { // 'in' sourceArray = aParam; } else if (aParam) { // 'inout' - jobjectArray array = NS_STATIC_CAST(jobjectArray, aParam); + jobjectArray array = static_cast(aParam); sourceArray = env->GetObjectArrayElement(array, 0); } @@ -935,7 +935,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, memcpy(buf, str, length); env->ReleaseStringUTFChars(data, str); } else { - jchar* jchar_str = NS_STATIC_CAST(jchar*, buf); + jchar* jchar_str = static_cast(buf); env->GetStringRegion(data, 0, length, jchar_str); } } @@ -1129,7 +1129,7 @@ FinalizeParams(JNIEnv *env, const nsXPTParamInfo &aParamInfo, PRUint8 aType, case nsXPTType::T_IID: { - nsID* iid = NS_STATIC_CAST(nsID*, aVariant.val.p); + nsID* iid = static_cast(aVariant.val.p); if ((aParamInfo.IsOut() || aIsArrayElement) && NS_SUCCEEDED(aInvokeResult)) @@ -1168,7 +1168,7 @@ FinalizeParams(JNIEnv *env, const nsXPTParamInfo &aParamInfo, PRUint8 aType, case nsXPTType::T_INTERFACE: case nsXPTType::T_INTERFACE_IS: { - nsISupports* xpcom_obj = NS_STATIC_CAST(nsISupports*, aVariant.val.p); + nsISupports* xpcom_obj = static_cast(aVariant.val.p); if ((aParamInfo.IsOut() || aIsArrayElement) && NS_SUCCEEDED(aInvokeResult)) @@ -1204,7 +1204,7 @@ FinalizeParams(JNIEnv *env, const nsXPTParamInfo &aParamInfo, PRUint8 aType, break; } - nsString* str = NS_STATIC_CAST(nsString*, aVariant.val.p); + nsString* str = static_cast(aVariant.val.p); if (NS_SUCCEEDED(aInvokeResult) && aParamInfo.IsDipper()) { // Create Java string from returned nsString jstring jstr = nsnull; @@ -1235,7 +1235,7 @@ FinalizeParams(JNIEnv *env, const nsXPTParamInfo &aParamInfo, PRUint8 aType, break; } - nsCString* str = NS_STATIC_CAST(nsCString*, aVariant.val.p); + nsCString* str = static_cast(aVariant.val.p); if (NS_SUCCEEDED(aInvokeResult) && aParamInfo.IsDipper()) { // Create Java string from returned nsString jstring jstr = nsnull; @@ -1260,7 +1260,7 @@ FinalizeParams(JNIEnv *env, const nsXPTParamInfo &aParamInfo, PRUint8 aType, case nsXPTType::T_VOID: { if (NS_SUCCEEDED(aInvokeResult)) { - jlong value = NS_REINTERPRET_CAST(jlong, aVariant.val.p); + jlong value = reinterpret_cast(aVariant.val.p); if (aParamInfo.IsRetval() && !aIsArrayElement) { *aParam = env->NewObject(longClass, longInitMID, value); } else if ((aParamInfo.IsOut() || aIsArrayElement) && *aParam) { @@ -1481,7 +1481,7 @@ JAVAPROXY_NATIVE(callXPCOMMethod) (JNIEnv *env, jclass that, jobject aJavaProxy, ThrowException(env, 0, "Failed to get matching XPCOM object"); return nsnull; } - JavaXPCOMInstance* inst = NS_STATIC_CAST(JavaXPCOMInstance*, xpcom_obj); + JavaXPCOMInstance* inst = static_cast(xpcom_obj); // Get method info PRUint16 methodIndex; @@ -1791,7 +1791,7 @@ GetNewOrUsedJavaWrapper(JNIEnv* env, nsISupports* aXPCOMObject, if (ifaceClass) { java_obj = env->CallStaticObjectMethod(xpcomJavaProxyClass, createProxyMID, ifaceClass, - NS_REINTERPRET_CAST(jlong, inst)); + reinterpret_cast(inst)); if (env->ExceptionCheck()) java_obj = nsnull; } @@ -1836,9 +1836,9 @@ GetXPCOMInstFromProxy(JNIEnv* env, jobject aJavaObject, void** aResult) return NS_ERROR_FAILURE; } - *aResult = NS_REINTERPRET_CAST(void*, xpcom_obj); + *aResult = reinterpret_cast(xpcom_obj); #ifdef DEBUG_JAVAXPCOM - JavaXPCOMInstance* inst = NS_STATIC_CAST(JavaXPCOMInstance*, *aResult); + JavaXPCOMInstance* inst = static_cast(*aResult); nsIID* iid; inst->InterfaceInfo()->GetInterfaceIID(&iid); char* iid_str = iid->ToString(); @@ -1878,9 +1878,9 @@ JAVAPROXY_NATIVE(finalizeProxy) (JNIEnv *env, jclass that, jobject aJavaProxy) void* xpcom_obj; nsresult rv = GetXPCOMInstFromProxy(env, aJavaProxy, &xpcom_obj); if (NS_SUCCEEDED(rv)) { - JavaXPCOMInstance* inst = NS_STATIC_CAST(JavaXPCOMInstance*, xpcom_obj); + JavaXPCOMInstance* inst = static_cast(xpcom_obj); #ifdef DEBUG_JAVAXPCOM - xpcom_addr = NS_REINTERPRET_CAST(PRUint32, inst->GetInstance()); + xpcom_addr = reinterpret_cast(inst->GetInstance()); #endif nsIID* iid; rv = inst->InterfaceInfo()->GetInterfaceIID(&iid); @@ -1917,8 +1917,8 @@ JAVAPROXY_NATIVE(isSameXPCOMObject) (JNIEnv *env, jclass that, void* xpcom_obj2; rv = GetXPCOMInstFromProxy(env, aProxy2, &xpcom_obj2); if (NS_SUCCEEDED(rv)) { - JavaXPCOMInstance* inst1 = NS_STATIC_CAST(JavaXPCOMInstance*, xpcom_obj1); - JavaXPCOMInstance* inst2 = NS_STATIC_CAST(JavaXPCOMInstance*, xpcom_obj2); + JavaXPCOMInstance* inst1 = static_cast(xpcom_obj1); + JavaXPCOMInstance* inst2 = static_cast(xpcom_obj2); if (inst1->GetInstance() == inst2->GetInstance()) { return JNI_TRUE; } @@ -1937,7 +1937,7 @@ LOCKPROXY_NATIVE(release) (JNIEnv *env, jclass that, jlong aLockObject) nsresult rv = NS_ERROR_FAILURE; nsCOMPtr thread = do_GetMainThread(); if (thread) { - rv = NS_ProxyRelease(thread, NS_REINTERPRET_CAST(nsISupports*, aLockObject)); + rv = NS_ProxyRelease(thread, reinterpret_cast(aLockObject)); } NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to release using NS_ProxyRelease"); } diff --git a/extensions/java/xpcom/src/nsJavaXPCOMBindingUtils.cpp b/extensions/java/xpcom/src/nsJavaXPCOMBindingUtils.cpp index 33ccb8887eba..19967ead8c21 100644 --- a/extensions/java/xpcom/src/nsJavaXPCOMBindingUtils.cpp +++ b/extensions/java/xpcom/src/nsJavaXPCOMBindingUtils.cpp @@ -469,9 +469,9 @@ PLDHashOperator DestroyJavaProxyMappingEnum(PLDHashTable* aTable, PLDHashEntryHdr* aHeader, PRUint32 aNumber, void* aData) { - JNIEnv* env = NS_STATIC_CAST(JNIEnv*, aData); + JNIEnv* env = static_cast(aData); NativeToJavaProxyMap::Entry* entry = - NS_STATIC_CAST(NativeToJavaProxyMap::Entry*, aHeader); + static_cast(aHeader); // first, delete XPCOM instances from the Java proxies nsresult rv; @@ -483,7 +483,7 @@ DestroyJavaProxyMappingEnum(PLDHashTable* aTable, PLDHashEntryHdr* aHeader, NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to get XPCOM instance from Java proxy"); if (NS_SUCCEEDED(rv)) { - JavaXPCOMInstance* inst = NS_STATIC_CAST(JavaXPCOMInstance*, xpcom_obj); + JavaXPCOMInstance* inst = static_cast(xpcom_obj); #ifdef DEBUG_JAVAXPCOM char* iid_str = item->iid.ToString(); LOG(("- NativeToJavaProxyMap (Java=%08x | XPCOM=%08x | IID=%s)\n", @@ -524,7 +524,7 @@ NativeToJavaProxyMap::Add(JNIEnv* env, nsISupports* aXPCOMObject, { nsAutoLock lock(gJavaXPCOMLock); - Entry* e = NS_STATIC_CAST(Entry*, PL_DHashTableOperate(mHashTable, + Entry* e = static_cast(PL_DHashTableOperate(mHashTable, aXPCOMObject, PL_DHASH_ADD)); if (!e) @@ -564,7 +564,7 @@ NativeToJavaProxyMap::Find(JNIEnv* env, nsISupports* aNativeObject, nsAutoLock lock(gJavaXPCOMLock); *aResult = nsnull; - Entry* e = NS_STATIC_CAST(Entry*, PL_DHashTableOperate(mHashTable, + Entry* e = static_cast(PL_DHashTableOperate(mHashTable, aNativeObject, PL_DHASH_LOOKUP)); @@ -601,7 +601,7 @@ NativeToJavaProxyMap::Remove(JNIEnv* env, nsISupports* aNativeObject, // This is only called from finalizeProxy(), which already holds the lock. // nsAutoLock lock(gJavaXPCOMLock); - Entry* e = NS_STATIC_CAST(Entry*, PL_DHashTableOperate(mHashTable, + Entry* e = static_cast(PL_DHashTableOperate(mHashTable, aNativeObject, PL_DHASH_LOOKUP)); @@ -661,7 +661,7 @@ DestroyXPTCMappingEnum(PLDHashTable* aTable, PLDHashEntryHdr* aHeader, PRUint32 aNumber, void* aData) { JavaToXPTCStubMap::Entry* entry = - NS_STATIC_CAST(JavaToXPTCStubMap::Entry*, aHeader); + static_cast(aHeader); // The XPTC stub will be released by the XPCOM side, if it hasn't been // already. We just need to delete the Java global ref held by the XPTC stub, @@ -689,8 +689,8 @@ JavaToXPTCStubMap::Add(jint aJavaObjectHashCode, nsJavaXPTCStub* aProxy) { nsAutoLock lock(gJavaXPCOMLock); - Entry* e = NS_STATIC_CAST(Entry*, - PL_DHashTableOperate(mHashTable, + Entry* e = static_cast + (PL_DHashTableOperate(mHashTable, NS_INT32_TO_PTR(aJavaObjectHashCode), PL_DHASH_ADD)); if (!e) @@ -727,8 +727,8 @@ JavaToXPTCStubMap::Find(jint aJavaObjectHashCode, const nsIID& aIID, nsAutoLock lock(gJavaXPCOMLock); *aResult = nsnull; - Entry* e = NS_STATIC_CAST(Entry*, - PL_DHashTableOperate(mHashTable, + Entry* e = static_cast + (PL_DHashTableOperate(mHashTable, NS_INT32_TO_PTR(aJavaObjectHashCode), PL_DHASH_LOOKUP)); @@ -845,7 +845,7 @@ JavaObjectToNativeInterface(JNIEnv* env, jobject aJavaObject, const nsIID& aIID, NS_ENSURE_SUCCESS(rv, rv); nsISupports* rootObject = - NS_STATIC_CAST(JavaXPCOMInstance*, inst)->GetInstance(); + static_cast(inst)->GetInstance(); rv = rootObject->QueryInterface(aIID, aResult); NS_ENSURE_SUCCESS(rv, rv); diff --git a/extensions/java/xpcom/src/nsJavaXPTCStub.cpp b/extensions/java/xpcom/src/nsJavaXPTCStub.cpp index 4283d3733e10..229b0aeff443 100644 --- a/extensions/java/xpcom/src/nsJavaXPTCStub.cpp +++ b/extensions/java/xpcom/src/nsJavaXPTCStub.cpp @@ -250,7 +250,7 @@ nsJavaXPTCStub::QueryInterface(const nsID &aIID, void **aInstancePtr) // All Java objects support weak references if (aIID.Equals(NS_GET_IID(nsISupportsWeakReference))) { - *aInstancePtr = NS_STATIC_CAST(nsISupportsWeakReference*, master); + *aInstancePtr = static_cast(master); NS_ADDREF(master); return NS_OK; } @@ -816,7 +816,7 @@ nsJavaXPTCStub::SetupJavaParams(const nsXPTParamInfo &aParamInfo, if (!aParamInfo.IsOut()) { // 'in' ptr = aVariant.val.p; } else if (aVariant.val.p) { // 'inout' & 'out' - void** variant = NS_STATIC_CAST(void**, aVariant.val.p); + void** variant = static_cast(aVariant.val.p); ptr = *variant; } @@ -858,9 +858,9 @@ nsJavaXPTCStub::SetupJavaParams(const nsXPTParamInfo &aParamInfo, { nsID* iid = nsnull; if (!aParamInfo.IsOut()) { // 'in' - iid = NS_STATIC_CAST(nsID*, aVariant.val.p); + iid = static_cast(aVariant.val.p); } else if (aVariant.val.p) { // 'inout' & 'out' - nsID** variant = NS_STATIC_CAST(nsID**, aVariant.val.p); + nsID** variant = static_cast(aVariant.val.p); iid = *variant; } @@ -900,9 +900,9 @@ nsJavaXPTCStub::SetupJavaParams(const nsXPTParamInfo &aParamInfo, { nsISupports* xpcom_obj = nsnull; if (!aParamInfo.IsOut()) { // 'in' - xpcom_obj = NS_STATIC_CAST(nsISupports*, aVariant.val.p); + xpcom_obj = static_cast(aVariant.val.p); } else if (aVariant.val.p) { // 'inout' & 'out' - nsISupports** variant = NS_STATIC_CAST(nsISupports**, aVariant.val.p); + nsISupports** variant = static_cast(aVariant.val.p); xpcom_obj = *variant; } @@ -972,7 +972,7 @@ nsJavaXPTCStub::SetupJavaParams(const nsXPTParamInfo &aParamInfo, break; } - nsString* str = NS_STATIC_CAST(nsString*, aVariant.val.p); + nsString* str = static_cast(aVariant.val.p); if (!str) { rv = NS_ERROR_FAILURE; break; @@ -1003,7 +1003,7 @@ nsJavaXPTCStub::SetupJavaParams(const nsXPTParamInfo &aParamInfo, break; } - nsCString* str = NS_STATIC_CAST(nsCString*, aVariant.val.p); + nsCString* str = static_cast(aVariant.val.p); if (!str) { rv = NS_ERROR_FAILURE; break; @@ -1027,7 +1027,7 @@ nsJavaXPTCStub::SetupJavaParams(const nsXPTParamInfo &aParamInfo, case nsXPTType::T_VOID: { if (!aParamInfo.IsOut()) { // 'in' - aJValue.j = NS_REINTERPRET_CAST(jlong, aVariant.val.p); + aJValue.j = reinterpret_cast(aVariant.val.p); aMethodSig.Append('J'); } else { // 'inout' & 'out' if (aVariant.val.p) { @@ -1282,7 +1282,7 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo, if (tag == nsXPTType::T_DOUBLE) *((double *) aVariant.val.p) = value; else - *((PRUint64 *) aVariant.val.p) = NS_STATIC_CAST(PRUint64, value); + *((PRUint64 *) aVariant.val.p) = static_cast(value); } } break; @@ -1333,7 +1333,7 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo, str = (jstring) env->GetObjectArrayElement((jobjectArray) aJValue.l, 0); } - char** variant = NS_STATIC_CAST(char**, aVariant.val.p); + char** variant = static_cast(aVariant.val.p); if (str) { // Get string buffer const char* char_ptr = env->GetStringUTFChars(str, nsnull); @@ -1379,7 +1379,7 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo, str = (jstring) env->GetObjectArrayElement((jobjectArray) aJValue.l, 0); } - PRUnichar** variant = NS_STATIC_CAST(PRUnichar**, aVariant.val.p); + PRUnichar** variant = static_cast(aVariant.val.p); if (str) { // Get string buffer const jchar* wchar_ptr = env->GetStringChars(str, nsnull); @@ -1429,7 +1429,7 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo, str = (jstring) env->GetObjectArrayElement((jobjectArray) aJValue.l, 0); } - nsID** variant = NS_STATIC_CAST(nsID**, aVariant.val.p); + nsID** variant = static_cast(aVariant.val.p); if (str) { // Get string buffer const char* char_ptr = env->GetStringUTFChars(str, nsnull); @@ -1526,7 +1526,7 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo, // For 'inout' params, if the resulting xpcom value is different than the // one passed in, then we must release the incoming xpcom value. - nsISupports** variant = NS_STATIC_CAST(nsISupports**, aVariant.val.p); + nsISupports** variant = static_cast(aVariant.val.p); if (aParamInfo.IsIn() && *variant) { nsCOMPtr in = do_QueryInterface(*variant); nsCOMPtr out = do_QueryInterface((nsISupports*) xpcom_obj); @@ -1535,7 +1535,7 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo, } } - *(NS_STATIC_CAST(void**, aVariant.val.p)) = xpcom_obj; + *(static_cast(aVariant.val.p)) = xpcom_obj; } break; @@ -1549,7 +1549,7 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo, } jstring jstr = (jstring) aJValue.l; - nsString* variant = NS_STATIC_CAST(nsString*, aVariant.val.p); + nsString* variant = static_cast(aVariant.val.p); if (jstr) { // Get string buffer @@ -1579,7 +1579,7 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo, } jstring jstr = (jstring) aJValue.l; - nsCString* variant = NS_STATIC_CAST(nsCString*, aVariant.val.p); + nsCString* variant = static_cast(aVariant.val.p); if (jstr) { // Get string buffer @@ -1602,7 +1602,7 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo, case nsXPTType::T_VOID: { if (aParamInfo.IsRetval()) { // 'retval' - aVariant.val.p = NS_REINTERPRET_CAST(void*, aJValue.j); + aVariant.val.p = reinterpret_cast(aJValue.j); } else if (aJValue.l) { // 'inout' & 'out' env->GetLongArrayRegion((jlongArray) aJValue.l, 0, 1, (jlong*) aVariant.val.p); diff --git a/extensions/layout-debug/src/nsLayoutDebuggingTools.cpp b/extensions/layout-debug/src/nsLayoutDebuggingTools.cpp index 4471801266c5..090b18e4e3f0 100644 --- a/extensions/layout-debug/src/nsLayoutDebuggingTools.cpp +++ b/extensions/layout-debug/src/nsLayoutDebuggingTools.cpp @@ -348,11 +348,11 @@ static void DumpAWebShell(nsIDocShellTreeItem* aShellItem, FILE* out, PRInt32 aI for (i = aIndent; --i >= 0; ) fprintf(out, " "); - fprintf(out, "%p '", NS_STATIC_CAST(void*, aShellItem)); + fprintf(out, "%p '", static_cast(aShellItem)); aShellItem->GetName(getter_Copies(name)); aShellItem->GetSameTypeParent(getter_AddRefs(parent)); fputs(NS_LossyConvertUTF16toASCII(name).get(), out); - fprintf(out, "' parent=%p <\n", NS_STATIC_CAST(void*, parent)); + fprintf(out, "' parent=%p <\n", static_cast(parent)); ++aIndent; nsCOMPtr shellAsNode(do_QueryInterface(aShellItem)); @@ -384,7 +384,7 @@ DumpContentRecur(nsIDocShell* aDocShell, FILE* out) { #ifdef DEBUG if (nsnull != aDocShell) { - fprintf(out, "docshell=%p \n", NS_STATIC_CAST(void*, aDocShell)); + fprintf(out, "docshell=%p \n", static_cast(aDocShell)); nsCOMPtr doc(document(aDocShell)); if (doc) { nsIContent *root = doc->GetRootContent(); @@ -422,7 +422,7 @@ static void DumpFramesRecur(nsIDocShell* aDocShell, FILE* out) { if (nsnull != aDocShell) { - fprintf(out, "webshell=%p \n", NS_STATIC_CAST(void*, aDocShell)); + fprintf(out, "webshell=%p \n", static_cast(aDocShell)); nsCOMPtr shell(pres_shell(aDocShell)); if (shell) { nsIFrame* root = shell->GetRootFrame(); @@ -465,7 +465,7 @@ DumpViewsRecur(nsIDocShell* aDocShell, FILE* out) { #ifdef DEBUG if (aDocShell) { - fprintf(out, "docshell=%p \n", NS_STATIC_CAST(void*, aDocShell)); + fprintf(out, "docshell=%p \n", static_cast(aDocShell)); nsCOMPtr vm(view_manager(aDocShell)); if (vm) { nsIView* root; diff --git a/extensions/metrics/src/nsLoadCollector.cpp b/extensions/metrics/src/nsLoadCollector.cpp index 9c374ff504f6..20eb7cb6150e 100644 --- a/extensions/metrics/src/nsLoadCollector.cpp +++ b/extensions/metrics/src/nsLoadCollector.cpp @@ -475,8 +475,8 @@ nsLoadCollector::OnAttach() nsLoadCollector::RemoveDocumentFromMap(const nsIDocument *document, DocumentEntry &entry, void *userData) { - nsIDocument *mutable_doc = NS_CONST_CAST(nsIDocument*, document); - mutable_doc->RemoveObserver(NS_STATIC_CAST(nsLoadCollector*, userData)); + nsIDocument *mutable_doc = const_cast(document); + mutable_doc->RemoveObserver(static_cast(userData)); return PL_DHASH_REMOVE; } @@ -526,7 +526,7 @@ nsLoadCollector::EndUpdate(nsIDocument *document, nsUpdateType updateType) void nsLoadCollector::NodeWillBeDestroyed(const nsINode *node) { - const nsIDocument* document = NS_STATIC_CAST(const nsIDocument*, node); + const nsIDocument* document = static_cast(node); // Look up the document to get its id. DocumentEntry entry; if (!mDocumentMap.Get(document, &entry)) { diff --git a/extensions/metrics/src/nsMetricsConfig.cpp b/extensions/metrics/src/nsMetricsConfig.cpp index 836d16530448..74b46a09aa7b 100644 --- a/extensions/metrics/src/nsMetricsConfig.cpp +++ b/extensions/metrics/src/nsMetricsConfig.cpp @@ -417,7 +417,7 @@ nsMetricsConfig::ClearEvents() /* static */ PLDHashOperator PR_CALLBACK nsMetricsConfig::CopyKey(nsStringHashKey *entry, void *userData) { - NS_STATIC_CAST(nsTArray *, userData)-> + static_cast *>(userData)-> AppendElement(entry->GetKey()); return PL_DHASH_NEXT; } diff --git a/extensions/metrics/src/nsMetricsService.cpp b/extensions/metrics/src/nsMetricsService.cpp index 8be5f4bafca2..2c2012697b35 100644 --- a/extensions/metrics/src/nsMetricsService.cpp +++ b/extensions/metrics/src/nsMetricsService.cpp @@ -273,7 +273,7 @@ nsMetricsService::BadCertListener::GetInterface(const nsIID &uuid, NS_ENSURE_ARG_POINTER(result); if (uuid.Equals(NS_GET_IID(nsIBadCertListener))) { - *result = NS_STATIC_CAST(nsIBadCertListener *, this); + *result = static_cast(this); NS_ADDREF_THIS(); return NS_OK; } @@ -871,7 +871,7 @@ nsMetricsService::PruneDisabledCollectors(const nsAString &key, void *userData) { DisabledCollectorsClosure *dc = - NS_STATIC_CAST(DisabledCollectorsClosure *, userData); + static_cast(userData); // The frozen string API doesn't expose operator==, so we can't use // IndexOf() here. @@ -951,7 +951,7 @@ CopySegmentToStream(nsIInputStream *inStr, PRUint32 count, PRUint32 *countWritten) { - nsIOutputStream *outStr = NS_STATIC_CAST(nsIOutputStream *, closure); + nsIOutputStream *outStr = static_cast(closure); *countWritten = 0; while (count) { PRUint32 n; @@ -1552,7 +1552,7 @@ nsMetricsService::GenerateClientID(nsCString &clientID) nsMetricsUtils::GetRandomNoise(input.b, sizeof(input.b)); return HashBytes( - NS_REINTERPRET_CAST(const PRUint8 *, &input), sizeof(input), clientID); + reinterpret_cast(&input), sizeof(input), clientID); } nsresult @@ -1574,7 +1574,7 @@ nsMetricsService::HashBytes(const PRUint8 *bytes, PRUint32 length, return NS_ERROR_OUT_OF_MEMORY; } - PL_Base64Encode(NS_REINTERPRET_CAST(char*, buf), resultLength, resultBuffer); + PL_Base64Encode(reinterpret_cast(buf), resultLength, resultBuffer); // Size the string to its null-terminated length result.SetLength(strlen(resultBuffer)); @@ -1626,7 +1626,7 @@ nsMetricsService::HashUTF8(const nsCString &str, nsCString &hashed) } return HashBytes( - NS_REINTERPRET_CAST(const PRUint8 *, str.get()), str.Length(), hashed); + reinterpret_cast(str.get()), str.Length(), hashed); } /* static */ nsresult @@ -1727,7 +1727,7 @@ nsMetricsUtils::GetRandomNoise(void *buf, PRSize size) PRSize nbytes = 0; while (nbytes < size) { PRSize n = PR_GetRandomNoise( - NS_STATIC_CAST(char *, buf) + nbytes, size - nbytes); + static_cast(buf) + nbytes, size - nbytes); if (n == 0) { MS_LOG(("Couldn't get any random bytes")); return PR_FALSE; diff --git a/extensions/metrics/src/nsUICommandCollector.cpp b/extensions/metrics/src/nsUICommandCollector.cpp index 1faf34a943f4..db8c89bde55a 100644 --- a/extensions/metrics/src/nsUICommandCollector.cpp +++ b/extensions/metrics/src/nsUICommandCollector.cpp @@ -71,14 +71,14 @@ PLDHashOperator PR_CALLBACK nsUICommandCollector::AddCommandEventListener( const nsIDOMWindow* key, PRUint32 windowID, void* userArg) { nsCOMPtr windowTarget = - do_QueryInterface(NS_CONST_CAST(nsIDOMWindow *, key)); + do_QueryInterface(const_cast(key)); if (!windowTarget) { MS_LOG(("Error casting domeventtarget")); return PL_DHASH_NEXT; } - nsUICommandCollector* collector = NS_STATIC_CAST(nsUICommandCollector*, - userArg); + nsUICommandCollector* collector = static_cast + (userArg); collector->AddEventListeners(windowTarget); return PL_DHASH_NEXT; } @@ -88,14 +88,14 @@ PLDHashOperator PR_CALLBACK nsUICommandCollector::RemoveCommandEventListener( const nsIDOMWindow* key, PRUint32 windowID, void* userArg) { nsCOMPtr windowTarget = - do_QueryInterface(NS_CONST_CAST(nsIDOMWindow *, key)); + do_QueryInterface(const_cast(key)); if (!windowTarget) { MS_LOG(("Error casting domeventtarget")); return PL_DHASH_NEXT; } - nsUICommandCollector* collector = NS_STATIC_CAST(nsUICommandCollector*, - userArg); + nsUICommandCollector* collector = static_cast + (userArg); collector->RemoveEventListeners(windowTarget); return PL_DHASH_NEXT; } @@ -127,7 +127,7 @@ nsUICommandCollector::OnAttach() NS_ENSURE_STATE(ms); ms->WindowMap().EnumerateRead(AddCommandEventListener, - NS_STATIC_CAST(nsIDOMEventListener*, this)); + static_cast(this)); return NS_OK; } @@ -152,7 +152,7 @@ nsUICommandCollector::OnDetach() NS_ENSURE_STATE(ms); ms->WindowMap().EnumerateRead(RemoveCommandEventListener, - NS_STATIC_CAST(nsIDOMEventListener*, this)); + static_cast(this)); return NS_OK; } diff --git a/extensions/metrics/src/nsWindowCollector.cpp b/extensions/metrics/src/nsWindowCollector.cpp index 25ef15aa5e2b..06661223cd8d 100644 --- a/extensions/metrics/src/nsWindowCollector.cpp +++ b/extensions/metrics/src/nsWindowCollector.cpp @@ -125,7 +125,7 @@ struct WindowOpenClosure /* static */ void nsWindowCollector::WindowOpenCallback(nsITimer *timer, void *closure) { - WindowOpenClosure *wc = NS_STATIC_CAST(WindowOpenClosure *, closure); + WindowOpenClosure *wc = static_cast(closure); wc->collector->LogWindowOpen(timer, wc->subject); delete wc; diff --git a/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp b/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp index 3fb1cd734789..159cc7cfb449 100644 --- a/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp +++ b/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp @@ -156,7 +156,7 @@ nsresult CentralizedAdminPrefManagerInit() // Create a new Security Manger and set it for the new JS context nsCOMPtr secman = - NS_STATIC_CAST(nsIXPCSecurityManager*, new AutoConfigSecMan()); + static_cast(new AutoConfigSecMan()); xpc->SetSecurityManagerForJSContext(autoconfig_cx, secman, 0); autoconfig_glob = JS_NewObject(autoconfig_cx, &global_class, NULL, NULL); diff --git a/extensions/pref/autoconfig/src/nsLDAPSyncQuery.cpp b/extensions/pref/autoconfig/src/nsLDAPSyncQuery.cpp index 1de5f1f0eb3c..5d6e41112562 100644 --- a/extensions/pref/autoconfig/src/nsLDAPSyncQuery.cpp +++ b/extensions/pref/autoconfig/src/nsLDAPSyncQuery.cpp @@ -146,7 +146,7 @@ nsLDAPSyncQuery::OnLDAPInit(nsILDAPConnection *aConn, nsresult aStatus) // rv = NS_GetProxyForObject(NS_PROXY_TO_CURRENT_THREAD, NS_GET_IID(nsILDAPMessageListener), - NS_STATIC_CAST(nsILDAPMessageListener *, this), + static_cast(this), NS_PROXY_ASYNC | NS_PROXY_ALWAYS, getter_AddRefs(selfProxy)); if (NS_FAILED(rv)) { @@ -285,7 +285,7 @@ nsLDAPSyncQuery::StartLDAPSearch() // rv = NS_GetProxyForObject(NS_PROXY_TO_CURRENT_THREAD, NS_GET_IID(nsILDAPMessageListener), - NS_STATIC_CAST(nsILDAPMessageListener *, this), + static_cast(this), NS_PROXY_ASYNC | NS_PROXY_ALWAYS, getter_AddRefs(selfProxy)); if (NS_FAILED(rv)) { @@ -343,7 +343,7 @@ nsLDAPSyncQuery::StartLDAPSearch() // time to kick off the search. // rv = mOperation->SearchExt(dn, scope, urlFilter, mAttrCount, - NS_CONST_CAST(const char **, mAttrs), 0, 0); + const_cast(mAttrs), 0, 0); if (NS_FAILED(rv)) { FinishLDAPQuery(); @@ -409,7 +409,7 @@ nsresult nsLDAPSyncQuery::InitConnection() // rv = NS_GetProxyForObject(NS_PROXY_TO_CURRENT_THREAD, NS_GET_IID(nsILDAPMessageListener), - NS_STATIC_CAST(nsILDAPMessageListener *, this), + static_cast(this), NS_PROXY_ASYNC | NS_PROXY_ALWAYS, getter_AddRefs(selfProxy)); if (NS_FAILED(rv)) { diff --git a/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp b/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp index a7071c813910..67af7d254753 100644 --- a/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp +++ b/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp @@ -212,7 +212,7 @@ struct SysPrefCallbackData { PRBool PR_CALLBACK sysPrefDeleteObserver(void *aElement, void *aData) { SysPrefCallbackData *pElement = - NS_STATIC_CAST(SysPrefCallbackData *, aElement); + static_cast(aElement); NS_RELEASE(pElement->observer); nsMemory::Free(pElement); return PR_TRUE; @@ -520,7 +520,7 @@ nsSystemPrefService::OnPrefChange(PRUint32 aPrefAtom, void *aData) observer = do_QueryInterface(pData->observer); if (observer) - observer->Observe(NS_STATIC_CAST(nsIPrefBranch *, this), + observer->Observe(static_cast(this), NS_SYSTEMPREF_PREFCHANGE_TOPIC_ID, NS_ConvertUTF8toUTF16(mGConf->GetMozKey(aPrefAtom)). get()); @@ -908,7 +908,7 @@ void gconf_key_listener (void* client, guint cnxn_id, SYSPREF_LOG(("...SYSPREF_LOG...key listener get called \n")); if (!user_data) return; - GConfCallbackData *pData = NS_REINTERPRET_CAST(GConfCallbackData *, - user_data); + GConfCallbackData *pData = reinterpret_cast + (user_data); pData->proxy->OnNotify(client, entry, cnxn_id, pData); } diff --git a/extensions/python/dom/src/nsPyTimeout.cpp b/extensions/python/dom/src/nsPyTimeout.cpp index 74d56a2894ee..14516be44cdc 100644 --- a/extensions/python/dom/src/nsPyTimeout.cpp +++ b/extensions/python/dom/src/nsPyTimeout.cpp @@ -146,5 +146,5 @@ nsresult CreatePyTimeoutHandler(const nsAString &aExpr, if (!aRet) return NS_ERROR_OUT_OF_MEMORY; return (*aRet)->QueryInterface(NS_GET_IID(nsIScriptTimeoutHandler), - NS_REINTERPRET_CAST(void **, aRet)); + reinterpret_cast(aRet)); } diff --git a/extensions/python/xpcom/src/PyIComponentManager.cpp b/extensions/python/xpcom/src/PyIComponentManager.cpp index c3b891120d42..44ae4c5f42d5 100644 --- a/extensions/python/xpcom/src/PyIComponentManager.cpp +++ b/extensions/python/xpcom/src/PyIComponentManager.cpp @@ -54,7 +54,7 @@ static nsIComponentManager *GetI(PyObject *self) { PyErr_SetString(PyExc_TypeError, "This object is not the correct interface"); return NULL; } - return NS_STATIC_CAST(nsIComponentManager*, Py_nsISupports::GetI(self)); + return static_cast(Py_nsISupports::GetI(self)); } static PyObject *PyCreateInstanceByContractID(PyObject *self, PyObject *args) diff --git a/extensions/spellcheck/src/mozInlineSpellChecker.cpp b/extensions/spellcheck/src/mozInlineSpellChecker.cpp index 0fb1a12b2682..eb3ac08e9123 100644 --- a/extensions/spellcheck/src/mozInlineSpellChecker.cpp +++ b/extensions/spellcheck/src/mozInlineSpellChecker.cpp @@ -628,9 +628,9 @@ mozInlineSpellChecker::RegisterEventListeners() nsCOMPtr piTarget = do_QueryInterface(doc, &rv); NS_ENSURE_SUCCESS(rv, rv); - piTarget->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*, this), + piTarget->AddEventListenerByIID(static_cast(this), NS_GET_IID(nsIDOMMouseListener)); - piTarget->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*, this), + piTarget->AddEventListenerByIID(static_cast(this), NS_GET_IID(nsIDOMKeyListener)); return NS_OK; @@ -653,9 +653,9 @@ mozInlineSpellChecker::UnregisterEventListeners() nsCOMPtr piTarget = do_QueryInterface(doc); NS_ENSURE_TRUE(piTarget, NS_ERROR_NULL_POINTER); - piTarget->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*, this), + piTarget->RemoveEventListenerByIID(static_cast(this), NS_GET_IID(nsIDOMMouseListener)); - piTarget->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*, this), + piTarget->RemoveEventListenerByIID(static_cast(this), NS_GET_IID(nsIDOMKeyListener)); return NS_OK; diff --git a/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp b/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp index bb71b996e887..900380daa5c0 100644 --- a/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp +++ b/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp @@ -536,7 +536,7 @@ static void CheckLeavingBreakElement(nsIDOMNode* aNode, void* aClosure) { CheckLeavingBreakElementClosure* cl = - NS_STATIC_CAST(CheckLeavingBreakElementClosure*, aClosure); + static_cast(aClosure); if (!cl->mLeftBreakElement && IsBreakElement(cl->mDocView, aNode)) { cl->mLeftBreakElement = PR_TRUE; } diff --git a/extensions/spellcheck/src/mozPersonalDictionary.cpp b/extensions/spellcheck/src/mozPersonalDictionary.cpp index 2805f6e234df..e4c907ceefa2 100644 --- a/extensions/spellcheck/src/mozPersonalDictionary.cpp +++ b/extensions/spellcheck/src/mozPersonalDictionary.cpp @@ -158,7 +158,7 @@ NS_IMETHODIMP mozPersonalDictionary::Load() PR_STATIC_CALLBACK(PLDHashOperator) AddHostToStringArray(nsUniCharEntry *aEntry, void *aArg) { - NS_STATIC_CAST(nsStringArray*, aArg)->AppendString(nsDependentString(aEntry->GetKey())); + static_cast(aArg)->AppendString(nsDependentString(aEntry->GetKey())); return PL_DHASH_NEXT; } diff --git a/gfx/src/beos/nsDeviceContextBeOS.cpp b/gfx/src/beos/nsDeviceContextBeOS.cpp index c3693c5a134a..53f401824a06 100644 --- a/gfx/src/beos/nsDeviceContextBeOS.cpp +++ b/gfx/src/beos/nsDeviceContextBeOS.cpp @@ -97,7 +97,7 @@ NS_IMETHODIMP nsDeviceContextBeOS::Init(nsNativeWidget aNativeWidget) screen->GetPixelDepth ( &depth ); mWidthFloat = float(width); mHeightFloat = float(height); - mDepth = NS_STATIC_CAST ( PRUint32, depth ); + mDepth = static_cast(depth); } } diff --git a/gfx/src/beos/nsImageBeOS.cpp b/gfx/src/beos/nsImageBeOS.cpp index 9aebe6ade81f..98b5177c85e4 100644 --- a/gfx/src/beos/nsImageBeOS.cpp +++ b/gfx/src/beos/nsImageBeOS.cpp @@ -607,7 +607,7 @@ NS_IMETHODIMP nsImageBeOS::DrawToImage(nsIImage* aDstImage, nscoord aDX, nscoord aDY, nscoord aDWidth, nscoord aDHeight) { - nsImageBeOS *dest = NS_STATIC_CAST(nsImageBeOS *, aDstImage); + nsImageBeOS *dest = static_cast(aDstImage); if (!dest) return NS_ERROR_FAILURE; diff --git a/gfx/src/mac/nsDeviceContextMac.cpp b/gfx/src/mac/nsDeviceContextMac.cpp index 878e0afcb7d8..105bc160d36f 100644 --- a/gfx/src/mac/nsDeviceContextMac.cpp +++ b/gfx/src/mac/nsDeviceContextMac.cpp @@ -379,7 +379,7 @@ NS_IMETHODIMP nsDeviceContextMac::GetDepth(PRUint32& aDepth) if ( screen ) { PRInt32 depth; screen->GetPixelDepth ( &depth ); - aDepth = NS_STATIC_CAST ( PRUint32, depth ); + aDepth = static_cast(depth); } else aDepth = 1; @@ -401,7 +401,7 @@ NS_IMETHODIMP nsDeviceContextMac::GetDepth(PRUint32& aDepth) PRInt32 depth; mPrimaryScreen->GetPixelDepth ( &depth ); - aDepth = NS_STATIC_CAST ( PRUint32, depth ); + aDepth = static_cast(depth); return NS_OK; } @@ -495,8 +495,8 @@ NS_IMETHODIMP nsDeviceContextMac::GetDeviceSurfaceDimensions(PRInt32 & outWidth, if( mSpec ) { // we have a printer device - outWidth = NS_STATIC_CAST(PRInt32, (mPageRect.right-mPageRect.left)*mDevUnitsToAppUnits); - outHeight = NS_STATIC_CAST(PRInt32, (mPageRect.bottom-mPageRect.top)*mDevUnitsToAppUnits); + outWidth = static_cast((mPageRect.right-mPageRect.left)*mDevUnitsToAppUnits); + outHeight = static_cast((mPageRect.bottom-mPageRect.top)*mDevUnitsToAppUnits); } else { // we have a screen device. find the screen that the window is on and @@ -531,8 +531,8 @@ nsDeviceContextMac::GetRect(nsRect &aRect) // we have a printer device aRect.x = 0; aRect.y = 0; - aRect.width = NS_STATIC_CAST(nscoord, (mPageRect.right-mPageRect.left)*mDevUnitsToAppUnits); - aRect.height = NS_STATIC_CAST(nscoord, (mPageRect.bottom-mPageRect.top)*mDevUnitsToAppUnits); + aRect.width = static_cast((mPageRect.right-mPageRect.left)*mDevUnitsToAppUnits); + aRect.height = static_cast((mPageRect.bottom-mPageRect.top)*mDevUnitsToAppUnits); } else { // we have a screen device. find the screen that the window is on and @@ -567,8 +567,8 @@ NS_IMETHODIMP nsDeviceContextMac::GetClientRect(nsRect &aRect) if( mSpec ) { // we have a printer device aRect.x = aRect.y = 0; - aRect.width = NS_STATIC_CAST(nscoord, (mPageRect.right-mPageRect.left)*mDevUnitsToAppUnits); - aRect.height = NS_STATIC_CAST(nscoord, (mPageRect.bottom-mPageRect.top)*mDevUnitsToAppUnits); + aRect.width = static_cast((mPageRect.right-mPageRect.left)*mDevUnitsToAppUnits); + aRect.height = static_cast((mPageRect.bottom-mPageRect.top)*mDevUnitsToAppUnits); } else { // we have a screen device. find the screen that the window is on and diff --git a/gfx/src/mac/nsDrawingSurfaceMac.cpp b/gfx/src/mac/nsDrawingSurfaceMac.cpp index bb9a793b0859..e953af80b71f 100644 --- a/gfx/src/mac/nsDrawingSurfaceMac.cpp +++ b/gfx/src/mac/nsDrawingSurfaceMac.cpp @@ -345,7 +345,7 @@ static OSStatus CreatePathFromRectsProc(UInt16 aMessage, RgnHandle aRegion, const Rect* aRect, void* aData) { - CGContextRef context = NS_STATIC_CAST(CGContextRef, aData); + CGContextRef context = static_cast(aData); if (aMessage == kQDRegionToRectsMsgParse) { diff --git a/gfx/src/mac/nsImageMac.cpp b/gfx/src/mac/nsImageMac.cpp index b0fdc17a82fe..69a1bd861caa 100644 --- a/gfx/src/mac/nsImageMac.cpp +++ b/gfx/src/mac/nsImageMac.cpp @@ -208,7 +208,7 @@ PRBool nsImageMac::GetIsImageComplete() { void DataProviderReleaseFunc(void *info, const void *data, size_t size) { - PR_Free(NS_CONST_CAST(void*, data)); + PR_Free(const_cast(data)); } @@ -398,7 +398,7 @@ NS_IMETHODIMP nsImageMac::DrawToImage(nsIImage* aDstImage, PRInt32 aDX, PRInt32 aDY, PRInt32 aDWidth, PRInt32 aDHeight) { - nsImageMac* dest = NS_STATIC_CAST(nsImageMac*, aDstImage); + nsImageMac* dest = static_cast(aDstImage); nsresult rv = EnsureCachedImage(); NS_ENSURE_SUCCESS(rv, rv); @@ -680,7 +680,7 @@ PRBool nsImageMac::RenderingToPrinter(nsIRenderingContext &aContext) nsCOMPtr dc; // (this screams for a private interface, sigh!) aContext.GetDeviceContext(*getter_AddRefs(dc)); // a weird and wonderful world of scanky casts and oddly-named intefaces. - nsDeviceContextMac* theDevContext = NS_REINTERPRET_CAST(nsDeviceContextMac*, dc.get()); + nsDeviceContextMac* theDevContext = reinterpret_cast(dc.get()); return theDevContext && theDevContext->IsPrinter(); } diff --git a/gfx/src/mac/nsRegionMac.cpp b/gfx/src/mac/nsRegionMac.cpp index 9328c8250264..958cdd48eb32 100644 --- a/gfx/src/mac/nsRegionMac.cpp +++ b/gfx/src/mac/nsRegionMac.cpp @@ -48,7 +48,7 @@ static OSStatus AddRectToArrayProc(UInt16 message, RgnHandle rgn, const Rect *inRect, void *inArray) { if (message == kQDRegionToRectsMsgParse) { - nsRegionRectSet* rects = NS_REINTERPRET_CAST(nsRegionRectSet*, inArray); + nsRegionRectSet* rects = reinterpret_cast(inArray); nsRegionRect* rect = &rects->mRects[rects->mNumRects++]; rect->x = inRect->left; rect->y = inRect->top; @@ -64,7 +64,7 @@ static OSStatus CountRectProc(UInt16 message, RgnHandle rgn, const Rect* inRect, void* rectCount) { if (message == kQDRegionToRectsMsgParse) - ++(*NS_REINTERPRET_CAST(long*, rectCount)); + ++(*reinterpret_cast(rectCount)); return noErr; } diff --git a/gfx/src/mac/nsRenderingContextMac.cpp b/gfx/src/mac/nsRenderingContextMac.cpp index 55f0bd811860..2b154bf06a7e 100644 --- a/gfx/src/mac/nsRenderingContextMac.cpp +++ b/gfx/src/mac/nsRenderingContextMac.cpp @@ -1232,7 +1232,7 @@ PRInt32 nsRenderingContextMac::GetMaxStringLength() { if (!mGS->mFontMetrics) return 1; - return NS_STATIC_CAST(nsFontMetricsMac*, mGS->mFontMetrics)->GetMaxStringLength(); + return static_cast(mGS->mFontMetrics)->GetMaxStringLength(); } #pragma mark - diff --git a/gfx/src/nsDeviceContext.cpp b/gfx/src/nsDeviceContext.cpp index 2259b8996137..6a26919eb336 100644 --- a/gfx/src/nsDeviceContext.cpp +++ b/gfx/src/nsDeviceContext.cpp @@ -474,7 +474,7 @@ nsFontCache::GetMetricsFor(const nsFont& aFont, nsIAtom* aLangGroup, nsIFontMetrics* fm; PRInt32 n = mFontMetrics.Count() - 1; for (PRInt32 i = n; i >= 0; --i) { - fm = NS_STATIC_CAST(nsIFontMetrics*, mFontMetrics[i]); + fm = static_cast(mFontMetrics[i]); if (fm->Font().Equals(aFont)) { nsCOMPtr langGroup; fm->GetLangGroup(getter_AddRefs(langGroup)); @@ -527,7 +527,7 @@ nsFontCache::GetMetricsFor(const nsFont& aFont, nsIAtom* aLangGroup, n = mFontMetrics.Count() - 1; // could have changed in Compact() if (n >= 0) { - aMetrics = NS_STATIC_CAST(nsIFontMetrics*, mFontMetrics[n]); + aMetrics = static_cast(mFontMetrics[n]); NS_ADDREF(aMetrics); return NS_OK; } @@ -556,7 +556,7 @@ nsresult nsFontCache::Compact() { // Need to loop backward because the running element can be removed on the way for (PRInt32 i = mFontMetrics.Count()-1; i >= 0; --i) { - nsIFontMetrics* fm = NS_STATIC_CAST(nsIFontMetrics*, mFontMetrics[i]); + nsIFontMetrics* fm = static_cast(mFontMetrics[i]); nsIFontMetrics* oldfm = fm; // Destroy() isn't here because we want our device context to be notified NS_RELEASE(fm); // this will reset fm to nsnull @@ -573,7 +573,7 @@ nsresult nsFontCache::Compact() nsresult nsFontCache::Flush() { for (PRInt32 i = mFontMetrics.Count()-1; i >= 0; --i) { - nsIFontMetrics* fm = NS_STATIC_CAST(nsIFontMetrics*, mFontMetrics[i]); + nsIFontMetrics* fm = static_cast(mFontMetrics[i]); // Destroy() will unhook our device context from the fm so that we won't // waste time in triggering the notification of FontMetricsDeleted() // in the subsequent release diff --git a/gfx/src/nsFontList.cpp b/gfx/src/nsFontList.cpp index dba6dc87eac3..b101969ef1b7 100644 --- a/gfx/src/nsFontList.cpp +++ b/gfx/src/nsFontList.cpp @@ -148,7 +148,7 @@ nsFontListEnumerator::GetNext(nsISupports **aFont) NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_TRUE(fontNameWrapper, NS_ERROR_OUT_OF_MEMORY); fontNameWrapper->SetData(nsDependentString(fontName)); - *aFont = NS_STATIC_CAST(nsISupports*, fontNameWrapper); + *aFont = static_cast(fontNameWrapper); NS_ADDREF(*aFont); return NS_OK; } @@ -167,7 +167,7 @@ nsFontList::AvailableFonts(const PRUnichar *aLangGroup, nsresult rv = fontListEnum->Init(aLangGroup, aFontType); NS_ENSURE_SUCCESS(rv, rv); - *aFontEnumerator = NS_STATIC_CAST(nsISimpleEnumerator*, fontListEnum); + *aFontEnumerator = static_cast(fontListEnum); NS_ADDREF(*aFontEnumerator); return NS_OK; } diff --git a/gfx/src/nsRegion.cpp b/gfx/src/nsRegion.cpp index 2e74c2791e28..8d7120252272 100644 --- a/gfx/src/nsRegion.cpp +++ b/gfx/src/nsRegion.cpp @@ -116,8 +116,8 @@ class RgnRectMemoryAllocator void* AllocChunk (PRUint32 aEntries, void* aNextChunk, nsRegion::RgnRect* aTailDest) { PRUint8* pBuf = new PRUint8 [aEntries * sizeof (nsRegion::RgnRect) + sizeof (void*)]; - *NS_REINTERPRET_CAST (void**, pBuf) = aNextChunk; - nsRegion::RgnRect* pRect = NS_REINTERPRET_CAST (nsRegion::RgnRect*, pBuf + sizeof (void*)); + *reinterpret_cast(pBuf) = aNextChunk; + nsRegion::RgnRect* pRect = reinterpret_cast(pBuf + sizeof (void*)); for (PRUint32 cnt = 0 ; cnt < aEntries - 1 ; cnt++) pRect [cnt].next = &pRect [cnt + 1]; @@ -128,10 +128,10 @@ class RgnRectMemoryAllocator } void FreeChunk (void* aChunk) { delete [] (PRUint8 *) aChunk; } - void* NextChunk (void* aThisChunk) const { return *NS_STATIC_CAST (void**, aThisChunk); } + void* NextChunk (void* aThisChunk) const { return *static_cast(aThisChunk); } nsRegion::RgnRect* ChunkHead (void* aThisChunk) const - { return NS_REINTERPRET_CAST (nsRegion::RgnRect*, NS_STATIC_CAST (PRUint8*, aThisChunk) + sizeof (void*)); } + { return reinterpret_cast(static_cast(aThisChunk) + sizeof (void*)); } public: RgnRectMemoryAllocator (PRUint32 aNumOfEntries); @@ -216,7 +216,7 @@ inline void* nsRegion::RgnRect::operator new (size_t) CPP_THROW_NEW inline void nsRegion::RgnRect::operator delete (void* aRect, size_t) { - gRectPool.Free (NS_STATIC_CAST (RgnRect*, aRect)); + gRectPool.Free (static_cast(aRect)); } @@ -485,7 +485,7 @@ void nsRegion::Optimize () void nsRegion::MoveInto (nsRegion& aDestRegion, const RgnRect* aStartRect) { - RgnRect* pRect = NS_CONST_CAST (RgnRect*, aStartRect); + RgnRect* pRect = const_cast(aStartRect); RgnRect* pPrev = pRect->prev; while (pRect != &mRectListHead) @@ -595,8 +595,8 @@ nsRegion& nsRegion::Copy (const nsRect& aRect) else { SetToElements (1); - *mRectListHead.next = NS_STATIC_CAST (const RgnRect&, aRect); - mBoundRect = NS_STATIC_CAST (const nsRectFast&, aRect); + *mRectListHead.next = static_cast(aRect); + mBoundRect = static_cast(aRect); } return *this; @@ -634,8 +634,8 @@ nsRegion& nsRegion::And (const nsRegion& aRgn1, const nsRegion& aRgn2) else { nsRegion TmpRegion; - nsRegion* pSrcRgn1 = NS_CONST_CAST (nsRegion*, &aRgn1); - nsRegion* pSrcRgn2 = NS_CONST_CAST (nsRegion*, &aRgn2); + nsRegion* pSrcRgn1 = const_cast(&aRgn1); + nsRegion* pSrcRgn2 = const_cast(&aRgn2); if (&aRgn1 == this) // Copy region if it is both source and result { @@ -714,7 +714,7 @@ nsRegion& nsRegion::And (const nsRegion& aRegion, const nsRect& aRect) SetEmpty (); else // Intersect region with rectangle { - const nsRectFast& aRectFast = NS_STATIC_CAST (const nsRectFast&, aRect); + const nsRectFast& aRectFast = static_cast(aRect); nsRectFast TmpRect; if (aRegion.mRectCount == 1) // Intersect rectangle with rectangle @@ -732,7 +732,7 @@ nsRegion& nsRegion::And (const nsRegion& aRegion, const nsRect& aRect) else { nsRegion TmpRegion; - nsRegion* pSrcRegion = NS_CONST_CAST (nsRegion*, &aRegion); + nsRegion* pSrcRegion = const_cast(&aRegion); if (&aRegion == this) // Copy region if it is both source and result { @@ -807,7 +807,7 @@ nsRegion& nsRegion::Or (const nsRegion& aRegion, const nsRect& aRect) Copy (aRegion); else { - const nsRectFast& aRectFast = NS_STATIC_CAST (const nsRectFast&, aRect); + const nsRectFast& aRectFast = static_cast(aRect); if (!aRectFast.Intersects (aRegion.mBoundRect)) // Rectangle does not intersect region { @@ -885,7 +885,7 @@ nsRegion& nsRegion::Xor (const nsRegion& aRegion, const nsRect& aRect) Copy (aRegion); else { - const nsRectFast& aRectFast = NS_STATIC_CAST (const nsRectFast&, aRect); + const nsRectFast& aRectFast = static_cast(aRect); if (!aRectFast.Intersects (aRegion.mBoundRect)) // Rectangle does not intersect region { @@ -955,7 +955,7 @@ nsRegion& nsRegion::Sub (const nsRegion& aRegion, const nsRect& aRect) Copy (aRegion); else { - const nsRectFast& aRectFast = NS_STATIC_CAST (const nsRectFast&, aRect); + const nsRectFast& aRectFast = static_cast(aRect); if (!aRectFast.Intersects (aRegion.mBoundRect)) // Rectangle does not intersect region Copy (aRegion); @@ -1066,7 +1066,7 @@ void nsRegion::SubRect (const nsRectFast& aRect, nsRegion& aResult, nsRegion& aC aResult.SetToElements (0); - (NS_CONST_CAST (nsRegion*, pSrcRegion))->mRectListHead.y = PR_INT32_MAX; + (const_cast(pSrcRegion))->mRectListHead.y = PR_INT32_MAX; const RgnRect* pSrcRect = pSrcRegion->mRectListHead.next; for ( ; pSrcRect->y < aRect.YMost () ; pSrcRect = pSrcRect->next) diff --git a/gfx/src/os2/nsFontMetricsOS2.cpp b/gfx/src/os2/nsFontMetricsOS2.cpp index 5bec93f7d356..ed616067a8d7 100644 --- a/gfx/src/os2/nsFontMetricsOS2.cpp +++ b/gfx/src/os2/nsFontMetricsOS2.cpp @@ -813,9 +813,9 @@ nsFontMetricsOS2::InitializeGlobalFonts() PL_strcasestr(font->szFacename, "regular") != nsnull || PL_strcasestr(font->szFacename, "-normal") != nsnull) { - f = NS_STATIC_CAST(char*, font->szFamilyname); + f = static_cast(font->szFamilyname); } else { - f = NS_STATIC_CAST(char*, font->szFacename); + f = static_cast(font->szFacename); } nsAutoChar16Buffer fontname; PRInt32 len; @@ -2053,7 +2053,7 @@ struct FindGlobalFontData PR_STATIC_CALLBACK(PLDHashOperator) FindGlobalFontEnumFunc(GlobalFontEntry* aEntry, void* aData) { - FindGlobalFontData* data = NS_STATIC_CAST(FindGlobalFontData*, aData); + FindGlobalFontData* data = static_cast(aData); strcpy(data->font->mFattrs.szFacename, aEntry->mMetrics->szFacename); #ifdef PERF_HASGLYPH_CHAR_MAP if (aEntry->mHaveCheckedCharMap == nsnull) { @@ -2676,7 +2676,7 @@ struct EnumerateAllFontsData PR_STATIC_CALLBACK(PLDHashOperator) EnumerateAllFontsCallback(GlobalFontEntry* aEntry, void* aData) { - EnumerateAllFontsData* data = NS_STATIC_CAST(EnumerateAllFontsData*, aData); + EnumerateAllFontsData* data = static_cast(aData); data->array[data->count++] = ToNewUnicode(aEntry->GetKey()); return PL_DHASH_NEXT; } diff --git a/gfx/src/os2/nsImageOS2.cpp b/gfx/src/os2/nsImageOS2.cpp index cac7e9e96915..d6d4ec92f178 100644 --- a/gfx/src/os2/nsImageOS2.cpp +++ b/gfx/src/os2/nsImageOS2.cpp @@ -951,7 +951,7 @@ NS_IMETHODIMP nsImageOS2::DrawToImage(nsIImage* aDstImage, GFX (::GpiCreateLogColorTable (MemPS, 0, LCOLF_RGB, 0, 0, 0), FALSE); - nsImageOS2* destImg = NS_STATIC_CAST(nsImageOS2*, aDstImage); + nsImageOS2* destImg = static_cast(aDstImage); HBITMAP hTmpBitmap = GFX (::GpiCreateBitmap (MemPS, (PBITMAPINFOHEADER2)destImg->mInfo, CBM_INIT, (PBYTE)destImg->mImageBits, diff --git a/gfx/src/os2/nsRegionOS2.cpp b/gfx/src/os2/nsRegionOS2.cpp index 9f49f6266af0..8d6ec2e63ab7 100644 --- a/gfx/src/os2/nsRegionOS2.cpp +++ b/gfx/src/os2/nsRegionOS2.cpp @@ -118,7 +118,7 @@ nsresult nsRegionOS2::Init (void) void nsRegionOS2::SetTo (const nsIRegion &aRegion) { - const nsRegionOS2* pRegion = NS_STATIC_CAST (const nsRegionOS2*, &aRegion); + const nsRegionOS2* pRegion = static_cast(&aRegion); mRegion = pRegion->mRegion; } @@ -129,7 +129,7 @@ void nsRegionOS2::SetTo (PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight void nsRegionOS2::Intersect (const nsIRegion &aRegion) { - const nsRegionOS2* pRegion = NS_STATIC_CAST (const nsRegionOS2*, &aRegion); + const nsRegionOS2* pRegion = static_cast(&aRegion); mRegion.And (mRegion, pRegion->mRegion); } @@ -140,7 +140,7 @@ void nsRegionOS2::Intersect (PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHe void nsRegionOS2::Union (const nsIRegion &aRegion) { - const nsRegionOS2* pRegion = NS_STATIC_CAST (const nsRegionOS2*, &aRegion); + const nsRegionOS2* pRegion = static_cast(&aRegion); mRegion.Or (mRegion, pRegion->mRegion); } @@ -151,7 +151,7 @@ void nsRegionOS2::Union (PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight void nsRegionOS2::Subtract (const nsIRegion &aRegion) { - const nsRegionOS2* pRegion = NS_STATIC_CAST (const nsRegionOS2*, &aRegion); + const nsRegionOS2* pRegion = static_cast(&aRegion); mRegion.Sub (mRegion, pRegion->mRegion); } @@ -167,7 +167,7 @@ PRBool nsRegionOS2::IsEmpty (void) PRBool nsRegionOS2::IsEqual (const nsIRegion &aRegion) { - const nsRegionOS2* pRegion = NS_STATIC_CAST (const nsRegionOS2*, &aRegion); + const nsRegionOS2* pRegion = static_cast(&aRegion); return mRegion.IsEqual (pRegion->mRegion); } @@ -203,15 +203,15 @@ nsresult nsRegionOS2::GetRects (nsRegionRectSet **aRects) if (!pRegionSet) // Not yet allocated { PRUint8* pBuf = new PRUint8 [sizeof (nsRegionRectSet) + NumRects * sizeof (nsRegionRect)]; - pRegionSet = NS_REINTERPRET_CAST (nsRegionRectSet*, pBuf); + pRegionSet = reinterpret_cast(pBuf); pRegionSet->mRectsLen = NumRects + 1; } else // Already allocated in previous call { if (NumRects > pRegionSet->mRectsLen) // passed array is not big enough - reallocate it. { - delete [] NS_REINTERPRET_CAST (PRUint8*, pRegionSet); + delete [] reinterpret_cast(pRegionSet); PRUint8* pBuf = new PRUint8 [sizeof (nsRegionRectSet) + NumRects * sizeof (nsRegionRect)]; - pRegionSet = NS_REINTERPRET_CAST (nsRegionRectSet*, pBuf); + pRegionSet = reinterpret_cast(pBuf); pRegionSet->mRectsLen = NumRects + 1; } } @@ -241,7 +241,7 @@ nsresult nsRegionOS2::FreeRects (nsRegionRectSet *aRects) if (!aRects) return NS_ERROR_NULL_POINTER; - delete [] NS_REINTERPRET_CAST (PRUint8*, aRects); + delete [] reinterpret_cast(aRects); return NS_OK; } diff --git a/gfx/src/photon/nsDeviceContextSpecPh.cpp b/gfx/src/photon/nsDeviceContextSpecPh.cpp index c4146a5a79a3..1a287c6afa6d 100644 --- a/gfx/src/photon/nsDeviceContextSpecPh.cpp +++ b/gfx/src/photon/nsDeviceContextSpecPh.cpp @@ -257,7 +257,7 @@ NS_IMETHODIMP nsPrinterEnumeratorPh::GetDefaultPrinterName(PRUnichar * *aDefault if( pc ) { PpLoadDefaultPrinter( pc ); PpGetPC( pc, Pp_PC_NAME, &printer ); - if( printer ) *aDefaultPrinterName = ToNewUnicode( NS_STATIC_CAST(const nsAFlatString&, NS_MULTILINE_LITERAL_STRING(printer)) ); + if( printer ) *aDefaultPrinterName = ToNewUnicode( static_cast(NS_MULTILINE_LITERAL_STRING(printer)) ); PpReleasePC( pc ); } diff --git a/gfx/src/photon/nsFontMetricsPh.cpp b/gfx/src/photon/nsFontMetricsPh.cpp index 0e89ce374af9..e55ee3428036 100644 --- a/gfx/src/photon/nsFontMetricsPh.cpp +++ b/gfx/src/photon/nsFontMetricsPh.cpp @@ -316,7 +316,7 @@ static PRIntn EnumerateFamily( PLHashEntry* he, PRIntn i, void* arg ) EnumerateFamilyInfo* info = (EnumerateFamilyInfo*) arg; PRUnichar** array = info->mArray; int j = info->mIndex; - PRUnichar* str = ToNewUnicode(*NS_STATIC_CAST(const nsString*, he->key)); + PRUnichar* str = ToNewUnicode(*static_cast(he->key)); if (!str) { diff --git a/gfx/src/photon/nsImagePh.cpp b/gfx/src/photon/nsImagePh.cpp index cf6c17ebaaee..88fc035a655f 100644 --- a/gfx/src/photon/nsImagePh.cpp +++ b/gfx/src/photon/nsImagePh.cpp @@ -537,7 +537,7 @@ NS_IMETHODIMP nsImagePh::DrawToImage(nsIImage* aDstImage, nscoord aDX, nscoord aDY, nscoord aDWidth, nscoord aDHeight) { - nsImagePh *dest = NS_STATIC_CAST(nsImagePh *, aDstImage); + nsImagePh *dest = static_cast(aDstImage); if (!dest) return NS_ERROR_FAILURE; diff --git a/gfx/src/photon/nsRenderingContextPh.h b/gfx/src/photon/nsRenderingContextPh.h index 285b474adae2..c41b3bb12c5e 100644 --- a/gfx/src/photon/nsRenderingContextPh.h +++ b/gfx/src/photon/nsRenderingContextPh.h @@ -150,7 +150,7 @@ public: inline NS_IMETHODIMP CopyClipRegion(nsIRegion &aRegion) { if( !mClipRegion ) return NS_ERROR_FAILURE; - aRegion.SetTo(*NS_STATIC_CAST(nsIRegion*, mClipRegion)); + aRegion.SetTo(*static_cast(mClipRegion)); return NS_OK; } diff --git a/gfx/src/thebes/nsThebesFontEnumerator.cpp b/gfx/src/thebes/nsThebesFontEnumerator.cpp index 0e995afe0e6a..c45d4fda63c0 100644 --- a/gfx/src/thebes/nsThebesFontEnumerator.cpp +++ b/gfx/src/thebes/nsThebesFontEnumerator.cpp @@ -88,8 +88,8 @@ nsThebesFontEnumerator::EnumerateFonts(const char *aLangGroup, return NS_OK; } - PRUnichar **fs = NS_STATIC_CAST(PRUnichar **, - nsMemory::Alloc(fontList.Count() * sizeof(PRUnichar*))); + PRUnichar **fs = static_cast + (nsMemory::Alloc(fontList.Count() * sizeof(PRUnichar*))); for (int i = 0; i < fontList.Count(); i++) { fs[i] = ToNewUnicode(*fontList[i]); } diff --git a/gfx/src/thebes/nsThebesFontMetrics.h b/gfx/src/thebes/nsThebesFontMetrics.h index fca08d0755c1..f58aeabcea7f 100644 --- a/gfx/src/thebes/nsThebesFontMetrics.h +++ b/gfx/src/thebes/nsThebesFontMetrics.h @@ -160,9 +160,9 @@ protected: AutoTextRun(nsThebesFontMetrics* aMetrics, nsIRenderingContext* aRC, const char* aString, PRInt32 aLength, PRBool aEnableSpacing) { mTextRun = gfxTextRunCache::MakeTextRun( - NS_REINTERPRET_CAST(const PRUint8*, aString), aLength, + reinterpret_cast(aString), aLength, aMetrics->mFontGroup, - NS_STATIC_CAST(gfxContext*, aRC->GetNativeGraphicData(nsIRenderingContext::NATIVE_THEBES_CONTEXT)), + static_cast(aRC->GetNativeGraphicData(nsIRenderingContext::NATIVE_THEBES_CONTEXT)), aMetrics->mP2A, ComputeFlags(aMetrics, aEnableSpacing)); } @@ -170,7 +170,7 @@ protected: const PRUnichar* aString, PRInt32 aLength, PRBool aEnableSpacing) { mTextRun = gfxTextRunCache::MakeTextRun( aString, aLength, aMetrics->mFontGroup, - NS_STATIC_CAST(gfxContext*, aRC->GetNativeGraphicData(nsIRenderingContext::NATIVE_THEBES_CONTEXT)), + static_cast(aRC->GetNativeGraphicData(nsIRenderingContext::NATIVE_THEBES_CONTEXT)), aMetrics->mP2A, ComputeFlags(aMetrics, aEnableSpacing)); } diff --git a/gfx/src/thebes/nsThebesImage.cpp b/gfx/src/thebes/nsThebesImage.cpp index e4cd6f2b5513..6606f3f0e8a9 100644 --- a/gfx/src/thebes/nsThebesImage.cpp +++ b/gfx/src/thebes/nsThebesImage.cpp @@ -336,7 +336,7 @@ nsThebesImage::Draw(nsIRenderingContext &aContext, return NS_OK; } - nsThebesRenderingContext *thebesRC = NS_STATIC_CAST(nsThebesRenderingContext*, &aContext); + nsThebesRenderingContext *thebesRC = static_cast(&aContext); gfxContext *ctx = thebesRC->Thebes(); #if 0 @@ -587,7 +587,7 @@ nsThebesImage::ThebesDrawTile(gfxContext *thebesContext, NS_IMETHODIMP nsThebesImage::DrawToImage(nsIImage* aDstImage, PRInt32 aDX, PRInt32 aDY, PRInt32 aDWidth, PRInt32 aDHeight) { - nsThebesImage *dstThebesImage = NS_STATIC_CAST(nsThebesImage*, aDstImage); + nsThebesImage *dstThebesImage = static_cast(aDstImage); nsRefPtr dst = new gfxContext(dstThebesImage->ThebesSurface()); diff --git a/gfx/src/thebes/nsThebesRegion.cpp b/gfx/src/thebes/nsThebesRegion.cpp index 3df1b73d5123..d8bbb6081bd0 100644 --- a/gfx/src/thebes/nsThebesRegion.cpp +++ b/gfx/src/thebes/nsThebesRegion.cpp @@ -54,7 +54,7 @@ nsresult nsThebesRegion::Init (void) void nsThebesRegion::SetTo (const nsIRegion &aRegion) { - const nsThebesRegion* pRegion = NS_STATIC_CAST (const nsThebesRegion*, &aRegion); + const nsThebesRegion* pRegion = static_cast(&aRegion); mRegion = pRegion->mRegion; } @@ -65,7 +65,7 @@ void nsThebesRegion::SetTo (PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHei void nsThebesRegion::Intersect (const nsIRegion &aRegion) { - const nsThebesRegion* pRegion = NS_STATIC_CAST (const nsThebesRegion*, &aRegion); + const nsThebesRegion* pRegion = static_cast(&aRegion); mRegion.And (mRegion, pRegion->mRegion); } @@ -76,7 +76,7 @@ void nsThebesRegion::Intersect (PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 void nsThebesRegion::Union (const nsIRegion &aRegion) { - const nsThebesRegion* pRegion = NS_STATIC_CAST (const nsThebesRegion*, &aRegion); + const nsThebesRegion* pRegion = static_cast(&aRegion); mRegion.Or (mRegion, pRegion->mRegion); } @@ -87,7 +87,7 @@ void nsThebesRegion::Union (PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHei void nsThebesRegion::Subtract (const nsIRegion &aRegion) { - const nsThebesRegion* pRegion = NS_STATIC_CAST (const nsThebesRegion*, &aRegion); + const nsThebesRegion* pRegion = static_cast(&aRegion); mRegion.Sub (mRegion, pRegion->mRegion); } @@ -103,7 +103,7 @@ PRBool nsThebesRegion::IsEmpty (void) PRBool nsThebesRegion::IsEqual (const nsIRegion &aRegion) { - const nsThebesRegion* pRegion = NS_STATIC_CAST (const nsThebesRegion*, &aRegion); + const nsThebesRegion* pRegion = static_cast(&aRegion); return mRegion.IsEqual (pRegion->mRegion); } @@ -141,15 +141,15 @@ nsThebesRegion::GetRects (nsRegionRectSet **aRects) if (pRegionSet == nsnull) // Not yet allocated { PRUint8* pBuf = new PRUint8 [sizeof (nsRegionRectSet) + NumRects * sizeof (nsRegionRect)]; - pRegionSet = NS_REINTERPRET_CAST (nsRegionRectSet*, pBuf); + pRegionSet = reinterpret_cast(pBuf); pRegionSet->mRectsLen = NumRects + 1; } else // Already allocated in previous call { if (NumRects > pRegionSet->mRectsLen) // passed array is not big enough - reallocate it. { - delete [] NS_REINTERPRET_CAST (PRUint8*, pRegionSet); + delete [] reinterpret_cast(pRegionSet); PRUint8* pBuf = new PRUint8 [sizeof (nsRegionRectSet) + NumRects * sizeof (nsRegionRect)]; - pRegionSet = NS_REINTERPRET_CAST (nsRegionRectSet*, pBuf); + pRegionSet = reinterpret_cast(pBuf); pRegionSet->mRectsLen = NumRects + 1; } } @@ -180,7 +180,7 @@ nsThebesRegion::FreeRects (nsRegionRectSet *aRects) if (!aRects) return NS_ERROR_NULL_POINTER; - delete [] NS_REINTERPRET_CAST (PRUint8*, aRects); + delete [] reinterpret_cast(aRects); return NS_OK; } diff --git a/gfx/src/thebes/nsThebesRenderingContext.cpp b/gfx/src/thebes/nsThebesRenderingContext.cpp index d8e317b4ece7..5e283deaf964 100644 --- a/gfx/src/thebes/nsThebesRenderingContext.cpp +++ b/gfx/src/thebes/nsThebesRenderingContext.cpp @@ -98,7 +98,7 @@ nsThebesRenderingContext::Init(nsIDeviceContext* aContext, gfxASurface *aThebesS { PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::Init ctx %p thebesSurface %p\n", this, aContext, aThebesSurface)); - nsThebesDeviceContext *thebesDC = NS_STATIC_CAST(nsThebesDeviceContext*, aContext); + nsThebesDeviceContext *thebesDC = static_cast(aContext); mDeviceContext = aContext; mWidget = nsnull; @@ -126,7 +126,7 @@ nsThebesRenderingContext::Init(nsIDeviceContext* aContext, nsIWidget *aWidget) { PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::Init ctx %p widget %p\n", this, aContext, aWidget)); - nsThebesDeviceContext *thebesDC = NS_STATIC_CAST(nsThebesDeviceContext*, aContext); + nsThebesDeviceContext *thebesDC = static_cast(aContext); mDeviceContext = aContext; mWidget = aWidget; @@ -269,7 +269,7 @@ nsThebesRenderingContext::SetClipRegion(const nsIRegion& pxRegion, mThebes->ResetClip(); // GetBoundingBox, GetRects, FreeRects are non-const - nsIRegion *evilPxRegion = NS_CONST_CAST(nsIRegion*, &pxRegion); + nsIRegion *evilPxRegion = const_cast(&pxRegion); if (cplx == eRegionComplexity_rect) { PRInt32 x, y, w, h; evilPxRegion->GetBoundingBox(&x, &y, &w, &h); @@ -706,7 +706,7 @@ nsThebesRenderingContext::GetNativeGraphicData(GraphicDataType aType) #ifdef XP_WIN if (aType == NATIVE_WINDOWS_DC) { nsRefPtr surf(mThebes->CurrentSurface()); - return NS_STATIC_CAST(gfxWindowsSurface*, NS_STATIC_CAST(gfxASurface*, surf.get()))->GetDC(); + return static_cast(static_cast(surf.get()))->GetDC(); } #endif @@ -780,7 +780,7 @@ nsThebesRenderingContext::DrawTile(imgIContainer *aImage, nsCOMPtr img(do_GetInterface(imgFrame)); if (!img) return NS_ERROR_FAILURE; - nsThebesImage *thebesImage = NS_STATIC_CAST(nsThebesImage*, (nsIImage*) img.get()); + nsThebesImage *thebesImage = static_cast((nsIImage*) img.get()); /* Phase offset of the repeated image from the origin */ gfxPoint phase(FROM_TWIPS(twXOffset), FROM_TWIPS(twYOffset)); @@ -838,7 +838,7 @@ nsThebesRenderingContext::SetFont(const nsFont& aFont, nsIAtom* aLangGroup) nsCOMPtr newMetrics; mDeviceContext->GetMetricsFor(aFont, aLangGroup, *getter_AddRefs(newMetrics)); - mFontMetrics = NS_REINTERPRET_CAST(nsIThebesFontMetrics*, newMetrics.get()); + mFontMetrics = reinterpret_cast(newMetrics.get()); return NS_OK; } @@ -847,7 +847,7 @@ nsThebesRenderingContext::SetFont(nsIFontMetrics *aFontMetrics) { PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::SetFont[Metrics] %p\n", this, aFontMetrics)); - mFontMetrics = NS_STATIC_CAST(nsIThebesFontMetrics*, aFontMetrics); + mFontMetrics = static_cast(aFontMetrics); return NS_OK; } diff --git a/gfx/src/windows/nsDeviceContextWin.cpp b/gfx/src/windows/nsDeviceContextWin.cpp index 7607c878bfdf..28e157363609 100644 --- a/gfx/src/windows/nsDeviceContextWin.cpp +++ b/gfx/src/windows/nsDeviceContextWin.cpp @@ -228,7 +228,7 @@ nsDeviceContextWin :: FindScreen ( nsIScreen** outScreen ) { // now then, if we have more than one screen, we need to find which screen this // window is on. - HWND window = NS_REINTERPRET_CAST(HWND, mWidget); + HWND window = reinterpret_cast(mWidget); if ( window ) { RECT globalPosition; ::GetWindowRect ( window, &globalPosition ); diff --git a/gfx/src/windows/nsFontMetricsWin.cpp b/gfx/src/windows/nsFontMetricsWin.cpp index a32783c650dc..1256c34ec041 100644 --- a/gfx/src/windows/nsFontMetricsWin.cpp +++ b/gfx/src/windows/nsFontMetricsWin.cpp @@ -1499,7 +1499,7 @@ PR_STATIC_CALLBACK(PLHashEntry*) fontmap_AllocEntry(void *pool, const void *key) PR_STATIC_CALLBACK(void) fontmap_FreeEntry(void *pool, PLHashEntry *he, PRUint32 flag) { if (flag == HT_FREE_ENTRY) { - nsFontInfo *fontInfo = NS_STATIC_CAST(nsFontInfo *, he); + nsFontInfo *fontInfo = static_cast(he); if (fontInfo->mCCMap && (fontInfo->mCCMap != nsFontMetricsWin::gEmptyCCMap)) FreeCCMap(fontInfo->mCCMap); #ifdef MOZ_MATHML @@ -1825,7 +1825,7 @@ nsFontMetricsWin::GetCCMAP(HDC aDC, const char* aShortName, if (he) { // an identical map has already been added delete name; - info = NS_STATIC_CAST(nsFontInfo *, he); + info = static_cast(he); if (aCharset) { *aCharset = info->mCharset; } @@ -1889,7 +1889,7 @@ nsFontMetricsWin::GetCCMAP(HDC aDC, const char* aShortName, NS_ASSERTION(hep, "bad code"); he = PL_HashTableRawAdd(gFontMaps, hep, hash, name, nsnull); if (he) { - info = NS_STATIC_CAST(nsFontInfo*, he); + info = static_cast(he); he->value = info; // so PL_HashTableLookup returns an nsFontInfo* info->mType = fontType; info->mCharset = charset; @@ -3005,7 +3005,7 @@ PR_STATIC_CALLBACK(PLHashEntry*) fontweight_AllocEntry(void *pool, const void *k PR_STATIC_CALLBACK(void) fontweight_FreeEntry(void *pool, PLHashEntry *he, PRUint32 flag) { if (flag == HT_FREE_ENTRY) { - nsFontWeightEntry *fontWeightEntry = NS_STATIC_CAST(nsFontWeightEntry *, he); + nsFontWeightEntry *fontWeightEntry = static_cast(he); delete fontWeightEntry; } } @@ -3290,7 +3290,7 @@ nsFontMetricsWin::LookForFontWeightTable(HDC aDC, const nsString& aName) he = *hep; if (he) { // an identical fontweight has already been added - weightEntry = NS_STATIC_CAST(nsFontWeightEntry *, he); + weightEntry = static_cast(he); return weightEntry->mWeightTable; } @@ -3301,7 +3301,7 @@ nsFontMetricsWin::LookForFontWeightTable(HDC aDC, const nsString& aName) // Store it in font weight HashTable. he = PL_HashTableRawAdd(gFontWeights, hep, hash, &searchEntry, nsnull); if (he) { - weightEntry = NS_STATIC_CAST(nsFontWeightEntry*, he); + weightEntry = static_cast(he); weightEntry->mFontName = low; weightEntry->mWeightTable = weightTable; he->key = weightEntry; diff --git a/gfx/src/windows/nsImageWin.cpp b/gfx/src/windows/nsImageWin.cpp index 7143f76a65a9..57e8b13b18b3 100644 --- a/gfx/src/windows/nsImageWin.cpp +++ b/gfx/src/windows/nsImageWin.cpp @@ -597,7 +597,7 @@ nsImageWin::Draw(nsIRenderingContext &aContext, nsIDrawingSurface* aSurface, aContext.GetDeviceContext(dx); nsIDrawingSurface* ds; - NS_STATIC_CAST(nsDeviceContextWin*, dx)->GetDrawingSurface(aContext, ds); + static_cast(dx)->GetDrawingSurface(aContext, ds); nsDrawingSurfaceWin *srcDS = (nsDrawingSurfaceWin *)ds; if (!srcDS) { @@ -1823,7 +1823,7 @@ NS_IMETHODIMP nsImageWin::DrawToImage(nsIImage* aDstImage, nscoord aDX, nscoord if (mAlphaDepth > 1) return NS_ERROR_UNEXPECTED; - nsImageWin *dest = NS_STATIC_CAST(nsImageWin *, aDstImage); + nsImageWin *dest = static_cast(aDstImage); if (!dest) return NS_ERROR_FAILURE; @@ -2076,7 +2076,7 @@ CompositeBitsInMemory(HDC aTheHDC, int aDX, int aDY, int aDWidth, int aDHeight, void nsImageWin::TimerCallBack(nsITimer *aTimer, void *aClosure) { - nsImageWin *entry = NS_STATIC_CAST(nsImageWin*, aClosure); + nsImageWin *entry = static_cast(aClosure); if (!entry) return; diff --git a/gfx/src/windows/nsRenderingContextWin.cpp b/gfx/src/windows/nsRenderingContextWin.cpp index 19bd389e7339..359588bc01c9 100644 --- a/gfx/src/windows/nsRenderingContextWin.cpp +++ b/gfx/src/windows/nsRenderingContextWin.cpp @@ -2433,7 +2433,7 @@ PRInt32 nsRenderingContextWin::GetMaxStringLength() { if (!mFontMetrics) return 1; - return NS_STATIC_CAST(nsFontMetricsWin*, mFontMetrics)->GetMaxStringLength(); + return static_cast(mFontMetrics)->GetMaxStringLength(); } NS_IMETHODIMP nsRenderingContextWin :: CopyOffScreenBits(nsIDrawingSurface* aSrcSurf, diff --git a/gfx/thebes/public/gfxAtsuiFonts.h b/gfx/thebes/public/gfxAtsuiFonts.h index 6bb0c109e2dc..db1f58c18282 100644 --- a/gfx/thebes/public/gfxAtsuiFonts.h +++ b/gfx/thebes/public/gfxAtsuiFonts.h @@ -123,7 +123,7 @@ public: ATSUFontFallbacks *GetATSUFontFallbacksPtr() { return &mFallbacks; } gfxAtsuiFont* GetFontAt(PRInt32 i) { - return NS_STATIC_CAST(gfxAtsuiFont*, NS_STATIC_CAST(gfxFont*, mFonts[i])); + return static_cast(static_cast(mFonts[i])); } gfxAtsuiFont* FindFontFor(ATSUFontID fid); diff --git a/gfx/thebes/public/gfxFont.h b/gfx/thebes/public/gfxFont.h index d5197fc9b1f4..03ef48947eac 100644 --- a/gfx/thebes/public/gfxFont.h +++ b/gfx/thebes/public/gfxFont.h @@ -811,8 +811,8 @@ public: { return (mFlags & gfxTextRunFactory::TEXT_IS_8BIT) ? nsnull : mText.mDouble; } const void *GetTextAt(PRUint32 aIndex) { return (mFlags & gfxTextRunFactory::TEXT_IS_8BIT) - ? NS_STATIC_CAST(const void *, mText.mSingle + aIndex) - : NS_STATIC_CAST(const void *, mText.mDouble + aIndex); + ? static_cast(mText.mSingle + aIndex) + : static_cast(mText.mDouble + aIndex); } const PRUnichar GetChar(PRUint32 i) const { return (mFlags & gfxTextRunFactory::TEXT_IS_8BIT) ? mText.mSingle[i] : mText.mDouble[i]; } @@ -1150,7 +1150,7 @@ public: } virtual gfxFont *GetFontAt(PRInt32 i) { - return NS_STATIC_CAST(gfxFont*, mFonts[i]); + return static_cast(mFonts[i]); } virtual PRUint32 FontListLength() const { return mFonts.Length(); diff --git a/gfx/thebes/public/gfxOS2Fonts.h b/gfx/thebes/public/gfxOS2Fonts.h index e312c4fb497f..eb3692a9209d 100644 --- a/gfx/thebes/public/gfxOS2Fonts.h +++ b/gfx/thebes/public/gfxOS2Fonts.h @@ -100,7 +100,7 @@ public: printf("gfxOS2FontGroup[%#x]::GetFontAt(%d), %#x, %#x\n", (unsigned)this, i, (unsigned)&mFonts, (unsigned)&mFonts[i]); #endif - return NS_STATIC_CAST(gfxOS2Font*, NS_STATIC_CAST(gfxFont*, mFonts[i])); + return static_cast(static_cast(mFonts[i])); } gfxOS2Font *GetCachedFont(const nsAString& aName) const { diff --git a/gfx/thebes/public/gfxPangoFonts.h b/gfx/thebes/public/gfxPangoFonts.h index 9032a9aa5f50..7061e66266d7 100644 --- a/gfx/thebes/public/gfxPangoFonts.h +++ b/gfx/thebes/public/gfxPangoFonts.h @@ -131,8 +131,7 @@ public: const Parameters *aParams, PRUint32 aFlags); gfxPangoFont *GetFontAt(PRInt32 i) { - return NS_STATIC_CAST(gfxPangoFont*, - NS_STATIC_CAST(gfxFont*, mFonts[i])); + return static_cast(static_cast(mFonts[i])); } protected: diff --git a/gfx/thebes/src/gfxAtsuiFonts.cpp b/gfx/thebes/src/gfxAtsuiFonts.cpp index 2423434a2557..701b98e4a5e0 100644 --- a/gfx/thebes/src/gfxAtsuiFonts.cpp +++ b/gfx/thebes/src/gfxAtsuiFonts.cpp @@ -361,7 +361,7 @@ gfxAtsuiFontGroup::gfxAtsuiFontGroup(const nsAString& families, fids = static_fids; for (unsigned int i = 0; i < mFonts.Length(); i++) { - gfxAtsuiFont* atsuiFont = NS_STATIC_CAST(gfxAtsuiFont*, NS_STATIC_CAST(gfxFont*, mFonts[i])); + gfxAtsuiFont* atsuiFont = static_cast(static_cast(mFonts[i])); fids[i] = atsuiFont->GetATSUFontID(); } ATSUSetObjFontFallbacks(mFallbacks, @@ -785,10 +785,10 @@ PostLayoutCallback(ATSULineRef aLine, gfxTextRun *aRun, PRUint32 aSegmentStart, PRUint32 aSegmentLength) { // AutoLayoutDataArrayPtr advanceDeltasArray(aLine, kATSUDirectDataAdvanceDeltaFixedArray); - // Fixed *advanceDeltas = NS_STATIC_CAST(Fixed *, advanceDeltasArray.mArray); + // Fixed *advanceDeltas = static_cast(advanceDeltasArray.mArray); // AutoLayoutDataArrayPtr deviceDeltasArray(aLine, kATSUDirectDataDeviceDeltaSInt16Array); AutoLayoutDataArrayPtr baselineDeltasArray(aLine, kATSUDirectDataBaselineDeltaFixedArray); - Fixed *baselineDeltas = NS_STATIC_CAST(Fixed *, baselineDeltasArray.mArray); + Fixed *baselineDeltas = static_cast(baselineDeltasArray.mArray); AutoLayoutDataArrayPtr glyphRecordsArray(aLine, kATSUDirectDataLayoutRecordATSLayoutRecordCurrent); PRUint32 numGlyphs = glyphRecordsArray.mItemCount; @@ -796,7 +796,7 @@ PostLayoutCallback(ATSULineRef aLine, gfxTextRun *aRun, NS_WARNING("Failed to retrieve key glyph data"); return PR_FALSE; } - ATSLayoutRecord *glyphRecords = NS_STATIC_CAST(ATSLayoutRecord *, glyphRecordsArray.mArray); + ATSLayoutRecord *glyphRecords = static_cast(glyphRecordsArray.mArray); NS_ASSERTION(!baselineDeltas || baselineDeltasArray.mItemCount == numGlyphs, "Mismatched glyph counts"); NS_ASSERTION(glyphRecords[numGlyphs - 1].flags & kATSGlyphInfoTerminatorGlyph, diff --git a/gfx/thebes/src/gfxFont.cpp b/gfx/thebes/src/gfxFont.cpp index 79f34e90e920..acedc9125673 100644 --- a/gfx/thebes/src/gfxFont.cpp +++ b/gfx/thebes/src/gfxFont.cpp @@ -662,7 +662,7 @@ gfxTextRun::gfxTextRun(const gfxTextRunFactory::Parameters *aParams, const void } } if (mFlags & gfxTextRunFactory::TEXT_IS_8BIT) { - mText.mSingle = NS_STATIC_CAST(const PRUint8 *, aText); + mText.mSingle = static_cast(aText); if (!(mFlags & gfxTextRunFactory::TEXT_IS_PERSISTENT)) { PRUint8 *newText = new PRUint8[aLength]; if (!newText) { @@ -674,7 +674,7 @@ gfxTextRun::gfxTextRun(const gfxTextRunFactory::Parameters *aParams, const void mText.mSingle = newText; } } else { - mText.mDouble = NS_STATIC_CAST(const PRUnichar *, aText); + mText.mDouble = static_cast(aText); if (!(mFlags & gfxTextRunFactory::TEXT_IS_PERSISTENT)) { PRUnichar *newText = new PRUnichar[aLength]; if (!newText) { diff --git a/gfx/thebes/src/gfxOS2Fonts.cpp b/gfx/thebes/src/gfxOS2Fonts.cpp index a2287ee60e38..bcb4ea4a51cb 100644 --- a/gfx/thebes/src/gfxOS2Fonts.cpp +++ b/gfx/thebes/src/gfxOS2Fonts.cpp @@ -437,7 +437,7 @@ gfxTextRun *gfxOS2FontGroup::MakeTextRun(const PRUint8* aString, PRUint32 aLengt if (!textRun) return nsnull; - const char *chars = NS_REINTERPRET_CAST(const char *, aString); + const char *chars = reinterpret_cast(aString); PRBool isRTL = textRun->IsRightToLeft(); if ((aFlags & TEXT_IS_ASCII) && !isRTL) { // We don't need to send an override character here, the characters must be all @@ -590,7 +590,7 @@ PRBool gfxOS2FontGroup::FontCallback(const nsAString& aFontName, const nsACString& aGenericName, void *aClosure) { - nsStringArray *sa = NS_STATIC_CAST(nsStringArray*, aClosure); + nsStringArray *sa = static_cast(aClosure); if (sa->IndexOf(aFontName) < 0) { sa->AppendString(aFontName); } diff --git a/gfx/thebes/src/gfxPangoFonts.cpp b/gfx/thebes/src/gfxPangoFonts.cpp index 227fe19bd24b..05dc7b734102 100644 --- a/gfx/thebes/src/gfxPangoFonts.cpp +++ b/gfx/thebes/src/gfxPangoFonts.cpp @@ -123,7 +123,7 @@ gfxPangoFontGroup::FontCallback (const nsAString& fontName, const nsACString& genericName, void *closure) { - nsStringArray *sa = NS_STATIC_CAST(nsStringArray*, closure); + nsStringArray *sa = static_cast(closure); if (FFRECountHyphens(fontName) < 3 && sa->IndexOf(fontName) < 0) { sa->AppendString(fontName); @@ -813,10 +813,10 @@ gfxPangoFontGroup::MakeTextRun(const PRUint8 *aString, PRUint32 aLength, if ((aFlags & TEXT_IS_ASCII) && !isRTL) { // We don't need to send an override character here, the characters must be all // LTR - const gchar *utf8Chars = NS_REINTERPRET_CAST(const gchar*, aString); + const gchar *utf8Chars = reinterpret_cast(aString); InitTextRun(run, utf8Chars, aLength, 0); } else { - const char *chars = NS_REINTERPRET_CAST(const char*, aString); + const char *chars = reinterpret_cast(aString); // XXX this could be more efficient. // Although chars in not necessarily ASCII (as it may point to the low // bytes of any UCS-2 characters < 256), NS_ConvertASCIItoUTF16 seems @@ -1336,7 +1336,7 @@ public: if (aName.IsEmpty()) return PR_TRUE; - FontSelector *fs = NS_STATIC_CAST(FontSelector*, closure); + FontSelector *fs = static_cast(closure); // XXX do something better than this to remove dups if (ExistsFont(fs, aName)) diff --git a/gfx/thebes/src/gfxTextRunWordCache.cpp b/gfx/thebes/src/gfxTextRunWordCache.cpp index c9099ac62a18..21d81a0f57d7 100644 --- a/gfx/thebes/src/gfxTextRunWordCache.cpp +++ b/gfx/thebes/src/gfxTextRunWordCache.cpp @@ -569,8 +569,8 @@ static void * GetFontOrGroup(gfxFontGroup *aFontGroup, PRBool aUseFont) { return aUseFont - ? NS_STATIC_CAST(void *, aFontGroup->GetFontAt(0)) - : NS_STATIC_CAST(void *, aFontGroup); + ? static_cast(aFontGroup->GetFontAt(0)) + : static_cast(aFontGroup); } PRBool @@ -592,12 +592,12 @@ TextRunWordCache::CacheHashEntry::KeyEquals(const KeyTypePointer aKey) const if (!aKey->mIsDoubleByteText) return memcmp(text, aKey->mString, length) == 0; return CompareDifferentWidthStrings(text, - NS_STATIC_CAST(const PRUnichar *, aKey->mString), length); + static_cast(aKey->mString), length); } else { const PRUnichar *text = mTextRun->GetTextUnicode() + mWordOffset; if (aKey->mIsDoubleByteText) return memcmp(text, aKey->mString, length*sizeof(PRUnichar)) == 0; - return CompareDifferentWidthStrings(NS_STATIC_CAST(const PRUint8 *, aKey->mString), + return CompareDifferentWidthStrings(static_cast(aKey->mString), text, length); } } diff --git a/gfx/thebes/src/gfxWindowsFonts.cpp b/gfx/thebes/src/gfxWindowsFonts.cpp index 70a1394a46b6..947675d28e23 100644 --- a/gfx/thebes/src/gfxWindowsFonts.cpp +++ b/gfx/thebes/src/gfxWindowsFonts.cpp @@ -84,7 +84,7 @@ GetDCFromSurface(gfxASurface *aSurface) NS_ERROR("GetDCFromSurface: Context target is not win32!"); return nsnull; } - return NS_STATIC_CAST(gfxWindowsSurface*, aSurface)->GetDC(); + return static_cast(aSurface)->GetDC(); } /********************************************************************** @@ -452,7 +452,7 @@ AddFontEntryToArray(const nsAString& aName, void *closure) { if (!aName.IsEmpty()) { - nsTArray > *list = NS_STATIC_CAST(nsTArray >*, closure); + nsTArray > *list = static_cast >*>(closure); nsRefPtr fe = gfxWindowsPlatform::GetPlatform()->FindFontEntry(aName); if (list->IndexOf(fe) == list->NoIndex) @@ -495,7 +495,7 @@ gfxWindowsFontGroup::GetFontAt(PRInt32 i) mFonts[i] = font; } - return NS_STATIC_CAST(gfxWindowsFont*, mFonts[i].get()); + return static_cast(mFonts[i].get()); } gfxFontGroup * diff --git a/gfx/thebes/src/gfxWindowsNativeDrawing.cpp b/gfx/thebes/src/gfxWindowsNativeDrawing.cpp index 582d48f1cf24..f1125c49b269 100644 --- a/gfx/thebes/src/gfxWindowsNativeDrawing.cpp +++ b/gfx/thebes/src/gfxWindowsNativeDrawing.cpp @@ -91,7 +91,7 @@ gfxWindowsNativeDrawing::BeginNativeDrawing() mTranslation = m.GetTranslation(); - mWinSurface = NS_STATIC_CAST(gfxWindowsSurface*, NS_STATIC_CAST(gfxASurface*, surf.get())); + mWinSurface = static_cast(static_cast(surf.get())); } else if (((mTransformType == AXIS_ALIGNED_SCALE) && (mNativeDrawFlags & CAN_AXIS_ALIGNED_SCALE)) || (mNativeDrawFlags & CAN_COMPLEX_TRANSFORM)) @@ -104,7 +104,7 @@ gfxWindowsNativeDrawing::BeginNativeDrawing() mWorldTransform.eDy = (FLOAT) m.y0; mRenderState = RENDER_STATE_NATIVE_DRAWING; - mWinSurface = NS_STATIC_CAST(gfxWindowsSurface*, NS_STATIC_CAST(gfxASurface*, surf.get())); + mWinSurface = static_cast(static_cast(surf.get())); } } diff --git a/gfx/thebes/test/gfxFontSelectionTest.cpp b/gfx/thebes/test/gfxFontSelectionTest.cpp index 6e68d079c769..57dc91b395b8 100644 --- a/gfx/thebes/test/gfxFontSelectionTest.cpp +++ b/gfx/thebes/test/gfxFontSelectionTest.cpp @@ -302,7 +302,7 @@ RunTest (TestEntry *test, gfxContext *ctx) { if (test->stringType == S_ASCII) { flags |= gfxTextRunFactory::TEXT_IS_ASCII | gfxTextRunFactory::TEXT_IS_8BIT; length = strlen(test->string); - textRun = gfxTextRunWordCache::MakeTextRun(NS_REINTERPRET_CAST(PRUint8*, test->string), length, fontGroup, ¶ms, flags); + textRun = gfxTextRunWordCache::MakeTextRun(reinterpret_cast(test->string), length, fontGroup, ¶ms, flags); } else { flags |= gfxTextRunFactory::TEXT_HAS_SURROGATES; // just in case NS_ConvertUTF8toUTF16 str(nsDependentCString(test->string)); diff --git a/gfx/thebes/test/gfxTextRunPerfTest.cpp b/gfx/thebes/test/gfxTextRunPerfTest.cpp index 9620906998f6..0a5d96941341 100644 --- a/gfx/thebes/test/gfxTextRunPerfTest.cpp +++ b/gfx/thebes/test/gfxTextRunPerfTest.cpp @@ -116,7 +116,7 @@ RunTest (TestEntry *test, gfxContext *ctx) { flags |= gfxTextRunFactory::TEXT_IS_ASCII | gfxTextRunFactory::TEXT_IS_8BIT; length = strlen(test->mString); - textRun = fontGroup->MakeTextRun(NS_REINTERPRET_CAST(const PRUint8*, test->mString), length, ¶ms, flags); + textRun = fontGroup->MakeTextRun(reinterpret_cast(test->mString), length, ¶ms, flags); } else { flags |= gfxTextRunFactory::TEXT_HAS_SURROGATES; // just in case NS_ConvertUTF8toUTF16 str(nsDependentCString(test->mString)); diff --git a/intl/locale/src/os2/nsCollationOS2.cpp b/intl/locale/src/os2/nsCollationOS2.cpp index 9358416267be..4fa136840932 100644 --- a/intl/locale/src/os2/nsCollationOS2.cpp +++ b/intl/locale/src/os2/nsCollationOS2.cpp @@ -144,7 +144,7 @@ nsresult nsCollationOS2::AllocateRawSortKey(PRInt32 strength, UniCreateLocaleObject(UNI_UCS_STRING_POINTER, (UniChar *)L"C", &locObj); res = NS_ERROR_FAILURE; // From here on out assume failure... - int length = UniStrxfrm(locObj, NULL, NS_REINTERPRET_CAST(const UniChar *,stringNormalized.get()),0); + int length = UniStrxfrm(locObj, NULL, reinterpret_cast(stringNormalized.get()),0); if (length >= 0) { length += 5; // Allow for the "extra" chars UniStrxfrm() // will out put (overrunning the buffer if @@ -164,7 +164,7 @@ nsresult nsCollationOS2::AllocateRawSortKey(PRInt32 strength, pLocalBuffer = (UniChar*) malloc(sizeof(UniChar) * iBufferLength); if (pLocalBuffer) { // Do the Xfrm - int uLen = UniStrxfrm(locObj, pLocalBuffer, NS_REINTERPRET_CAST(const UniChar *,stringNormalized.get()), iBufferLength); + int uLen = UniStrxfrm(locObj, pLocalBuffer, reinterpret_cast(stringNormalized.get()), iBufferLength); // See how big the result really is uLen = UniStrlen(pLocalBuffer); // make sure it will fit in the output buffer... diff --git a/intl/locale/src/os2/nsDateTimeFormatOS2.cpp b/intl/locale/src/os2/nsDateTimeFormatOS2.cpp index 4aab9c00e16e..c64dfc9ef9b2 100644 --- a/intl/locale/src/os2/nsDateTimeFormatOS2.cpp +++ b/intl/locale/src/os2/nsDateTimeFormatOS2.cpp @@ -160,7 +160,7 @@ nsresult nsDateTimeFormatOS2::FormatTMTime(nsILocale* locale, UniStrcat( uFmtD, (UniChar*)L" "); } UniStrcat( uFmtD, uFmtT); - int length = UniStrftime(locObj, NS_REINTERPRET_CAST(UniChar *, buffer), + int length = UniStrftime(locObj, reinterpret_cast(buffer), NSDATETIME_FORMAT_BUFFER_LEN, uFmtD, tmTime); UniFreeLocaleObject(locObj); diff --git a/intl/locale/src/windows/nsDateTimeFormatWin.cpp b/intl/locale/src/windows/nsDateTimeFormatWin.cpp index 305d8768a484..7821907272db 100644 --- a/intl/locale/src/windows/nsDateTimeFormatWin.cpp +++ b/intl/locale/src/windows/nsDateTimeFormatWin.cpp @@ -275,8 +275,8 @@ int nsDateTimeFormatWin::nsGetTimeFormatW(DWORD dwFlags, const SYSTEMTIME *lpTim int len = 0; len = GetTimeFormatW(mLCID, dwFlags, lpTime, format ? - NS_CONST_CAST(LPCWSTR, - NS_ConvertASCIItoUTF16(format).get()) : + const_cast + (NS_ConvertASCIItoUTF16(format).get()) : NULL, (LPWSTR) timeStr, cchTime); return len; @@ -288,8 +288,8 @@ int nsDateTimeFormatWin::nsGetDateFormatW(DWORD dwFlags, const SYSTEMTIME *lpDat int len = 0; len = GetDateFormatW(mLCID, dwFlags, lpDate, format ? - NS_CONST_CAST(LPCWSTR, - NS_ConvertASCIItoUTF16(format).get()) : + const_cast + (NS_ConvertASCIItoUTF16(format).get()) : NULL, (LPWSTR) dateStr, cchDate); return len; diff --git a/intl/uconv/native/nsNativeUConvService.cpp b/intl/uconv/native/nsNativeUConvService.cpp index 036103124f68..03f35a53a3df 100644 --- a/intl/uconv/native/nsNativeUConvService.cpp +++ b/intl/uconv/native/nsNativeUConvService.cpp @@ -378,7 +378,7 @@ NativeUConvService::GetNativeConverter(const char* from, //nsRefPtr ucl = new IConvAdaptor(); IConvAdaptor *adaptor=new IConvAdaptor(); - nsCOMPtr ucl(NS_STATIC_CAST(nsIUnicodeDecoder*,adaptor)); + nsCOMPtr ucl(static_cast(adaptor)); if (!ucl) return NS_ERROR_OUT_OF_MEMORY; diff --git a/intl/uconv/src/nsConverterInputStream.cpp b/intl/uconv/src/nsConverterInputStream.cpp index a81a6171e04e..b2951622bcef 100644 --- a/intl/uconv/src/nsConverterInputStream.cpp +++ b/intl/uconv/src/nsConverterInputStream.cpp @@ -178,8 +178,7 @@ nsConverterInputStream::ReadString(PRUint32 aCount, nsAString& aString, if (readCount > aCount) { readCount = aCount; } - const PRUnichar* buf = NS_REINTERPRET_CAST(const PRUnichar*, - mUnicharData->GetBuffer() + + const PRUnichar* buf = reinterpret_cast(mUnicharData->GetBuffer() + mUnicharDataOffset); aString.Assign(buf, readCount); mUnicharDataOffset += readCount; diff --git a/intl/uconv/src/nsScriptableUConv.cpp b/intl/uconv/src/nsScriptableUConv.cpp index 160d11e55d0c..30a0ecb9f801 100644 --- a/intl/uconv/src/nsScriptableUConv.cpp +++ b/intl/uconv/src/nsScriptableUConv.cpp @@ -152,7 +152,7 @@ nsScriptableUnicodeConverter::ConvertToUnicode(const nsACString& aSrc, nsAString { nsACString::const_iterator i; aSrc.BeginReading(i); - return ConvertFromByteArray(NS_REINTERPRET_CAST(const PRUint8*, i.get()), + return ConvertFromByteArray(reinterpret_cast(i.get()), aSrc.Length(), _retval); } @@ -171,7 +171,7 @@ nsScriptableUnicodeConverter::ConvertFromByteArray(const PRUint8* aData, nsresult rv = NS_OK; PRInt32 inLength = aCount; PRInt32 outLength; - rv = mDecoder->GetMaxLength(NS_REINTERPRET_CAST(const char*, aData), + rv = mDecoder->GetMaxLength(reinterpret_cast(aData), inLength, &outLength); if (NS_SUCCEEDED(rv)) { @@ -179,7 +179,7 @@ nsScriptableUnicodeConverter::ConvertFromByteArray(const PRUint8* aData, if (!buf) return NS_ERROR_OUT_OF_MEMORY; - rv = mDecoder->Convert(NS_REINTERPRET_CAST(const char*, aData), + rv = mDecoder->Convert(reinterpret_cast(aData), &inLength, buf, &outLength); if (NS_SUCCEEDED(rv)) { @@ -217,8 +217,8 @@ nsScriptableUnicodeConverter::ConvertToByteArray(const nsAString& aString, str.Append(data, len); nsMemory::Free(data); // NOTE: this being a byte array, it needs no null termination - *_aData = NS_REINTERPRET_CAST(PRUint8*, - nsMemory::Clone(str.get(), str.Length())); + *_aData = reinterpret_cast + (nsMemory::Clone(str.get(), str.Length())); if (!*_aData) return NS_ERROR_OUT_OF_MEMORY; *aLen = str.Length(); @@ -242,7 +242,7 @@ nsScriptableUnicodeConverter::ConvertToInputStream(const nsAString& aString, if (NS_FAILED(rv)) return rv; - rv = inputStream->AdoptData(NS_REINTERPRET_CAST(char*, data), dataLen); + rv = inputStream->AdoptData(reinterpret_cast(data), dataLen); if (NS_FAILED(rv)) { nsMemory::Free(data); return rv; diff --git a/intl/uconv/util/nsUnicodeDecodeHelper.cpp b/intl/uconv/util/nsUnicodeDecodeHelper.cpp index f2f20de26504..bc45f0b3ecd7 100644 --- a/intl/uconv/util/nsUnicodeDecodeHelper.cpp +++ b/intl/uconv/util/nsUnicodeDecodeHelper.cpp @@ -65,11 +65,11 @@ nsresult nsUnicodeDecodeHelper::ConvertByTable( if (aScanClass == uMultibytesCharset) { NS_ASSERTION(aShiftInTable, "shift table missing"); charFound = uScanShift(aShiftInTable, NULL, (PRUint8 *)src, - NS_REINTERPRET_CAST(PRUint16*, &med), srcLen, + reinterpret_cast(&med), srcLen, (PRUint32 *)&bcr); } else { charFound = uScan(aScanClass, NULL, (PRUint8 *)src, - NS_REINTERPRET_CAST(PRUint16*, &med), + reinterpret_cast(&med), srcLen, (PRUint32 *)&bcr); } if (!charFound) { @@ -77,7 +77,7 @@ nsresult nsUnicodeDecodeHelper::ConvertByTable( break; } - if (!uMapCode((uTable*) aMappingTable, NS_STATIC_CAST(PRUint16, med), NS_REINTERPRET_CAST(PRUint16*, dest))) { + if (!uMapCode((uTable*) aMappingTable, static_cast(med), reinterpret_cast(dest))) { if (med < 0x20) { // somehow some table miss the 0x00 - 0x20 part *dest = med; @@ -130,13 +130,13 @@ nsresult nsUnicodeDecodeHelper::ConvertByMultiTable( { passRangeCheck = PR_TRUE; if (uScan(aScanClassArray[i], NULL, src, - NS_REINTERPRET_CAST(PRUint16*, &med), srcLen, + reinterpret_cast(&med), srcLen, (PRUint32 *)&bcr)) { passScan = PR_TRUE; done = uMapCode((uTable*) aMappingTable[i], - NS_STATIC_CAST(PRUint16, med), - NS_REINTERPRET_CAST(PRUint16*, dest)); + static_cast(med), + reinterpret_cast(dest)); } // if (uScan ... ) } // if Range } // for loop @@ -162,7 +162,7 @@ nsresult nsUnicodeDecodeHelper::ConvertByMultiTable( if ((aRangeArray[i].min <= *src) && (*src <= aRangeArray[i].max)) { if (uScan(aScanClassArray[i], NULL, src, - NS_REINTERPRET_CAST(PRUint16*, &med), srcLen, + reinterpret_cast(&med), srcLen, (PRUint32*)&bcr)) { // match the patten diff --git a/intl/uconv/util/nsUnicodeEncodeHelper.cpp b/intl/uconv/util/nsUnicodeEncodeHelper.cpp index d4be40d4387d..e46af6e68e6b 100644 --- a/intl/uconv/util/nsUnicodeEncodeHelper.cpp +++ b/intl/uconv/util/nsUnicodeEncodeHelper.cpp @@ -61,7 +61,7 @@ nsresult nsUnicodeEncodeHelper::ConvertByTable( nsresult res = NS_OK; while (src < srcEnd) { - if (!uMapCode((uTable*) aMappingTable, NS_STATIC_CAST(PRUnichar, *(src++)), NS_REINTERPRET_CAST(PRUint16*, &med))) { + if (!uMapCode((uTable*) aMappingTable, static_cast(*(src++)), reinterpret_cast(&med))) { res = NS_ERROR_UENC_NOMAPPING; break; } @@ -114,7 +114,7 @@ nsresult nsUnicodeEncodeHelper::ConvertByMultiTable( while (src < srcEnd) { for (i=0; i(*src), reinterpret_cast(&med))) break; src++; if (i == aTableCount) { diff --git a/intl/unicharutil/src/nsCaseConversionImp2.cpp b/intl/unicharutil/src/nsCaseConversionImp2.cpp index 7afbaef3d4d4..0d22c27f7f3c 100644 --- a/intl/unicharutil/src/nsCaseConversionImp2.cpp +++ b/intl/unicharutil/src/nsCaseConversionImp2.cpp @@ -152,12 +152,12 @@ struct nsCompressedMap { }; static nsCompressedMap gUpperMap = { - NS_REINTERPRET_CAST(const PRUnichar*, &gToUpper[0]), + reinterpret_cast(&gToUpper[0]), gToUpperItems }; static nsCompressedMap gLowerMap = { - NS_REINTERPRET_CAST(const PRUnichar*, &gToLower[0]), + reinterpret_cast(&gToLower[0]), gToLowerItems }; diff --git a/ipc/ipcd/client/src/ipcdclient.cpp b/ipc/ipcd/client/src/ipcdclient.cpp index 2cc3d90c478c..dea8357f8bf0 100644 --- a/ipc/ipcd/client/src/ipcdclient.cpp +++ b/ipc/ipcd/client/src/ipcdclient.cpp @@ -449,7 +449,7 @@ private: static void RunEvent(void *arg) { - nsIRunnable *ev = NS_STATIC_CAST(nsIRunnable *, arg); + nsIRunnable *ev = static_cast(arg); ev->Run(); NS_RELEASE(ev); } diff --git a/js/jsd/jsd_xpc.cpp b/js/jsd/jsd_xpc.cpp index 524ee96e1f5d..6f236bf5eb4f 100644 --- a/js/jsd/jsd_xpc.cpp +++ b/js/jsd/jsd_xpc.cpp @@ -173,8 +173,8 @@ jsds_FindEphemeral (LiveEphemeral **listHead, void *key) return nsnull; LiveEphemeral *lv_record = - NS_REINTERPRET_CAST (LiveEphemeral *, - PR_NEXT_LINK(&(*listHead)->links)); + reinterpret_cast + (PR_NEXT_LINK(&(*listHead)->links)); do { if (lv_record->key == key) @@ -182,8 +182,8 @@ jsds_FindEphemeral (LiveEphemeral **listHead, void *key) NS_IF_ADDREF(lv_record->value); return lv_record->value; } - lv_record = NS_REINTERPRET_CAST (LiveEphemeral *, - PR_NEXT_LINK(&lv_record->links)); + lv_record = reinterpret_cast + (PR_NEXT_LINK(&lv_record->links)); } while (lv_record != *listHead); @@ -194,13 +194,13 @@ void jsds_InvalidateAllEphemerals (LiveEphemeral **listHead) { LiveEphemeral *lv_record = - NS_REINTERPRET_CAST (LiveEphemeral *, - PR_NEXT_LINK(&(*listHead)->links)); + reinterpret_cast + (PR_NEXT_LINK(&(*listHead)->links)); while (*listHead) { LiveEphemeral *next = - NS_REINTERPRET_CAST (LiveEphemeral *, - PR_NEXT_LINK(&lv_record->links)); + reinterpret_cast + (PR_NEXT_LINK(&lv_record->links)); lv_record->value->Invalidate(); lv_record = next; } @@ -222,8 +222,8 @@ jsds_InsertEphemeral (LiveEphemeral **listHead, LiveEphemeral *item) void jsds_RemoveEphemeral (LiveEphemeral **listHead, LiveEphemeral *item) { - LiveEphemeral *next = NS_REINTERPRET_CAST (LiveEphemeral *, - PR_NEXT_LINK(&item->links)); + LiveEphemeral *next = reinterpret_cast + (PR_NEXT_LINK(&item->links)); if (next == item) { @@ -356,8 +356,8 @@ jsds_FindFilter (jsdIFilter *filter) do { if (current->filterObject == filter) return current; - current = NS_REINTERPRET_CAST(FilterRecord *, - PR_NEXT_LINK(¤t->links)); + current = reinterpret_cast + (PR_NEXT_LINK(¤t->links)); } while (current != gFilters); return nsnull; @@ -368,7 +368,7 @@ PRBool jsds_FilterHook (JSDContext *jsdc, JSDThreadState *state) { JSContext *cx = JSD_GetJSContext (jsdc, state); - void *glob = NS_STATIC_CAST(void *, JS_GetGlobalObject (cx)); + void *glob = static_cast(JS_GetGlobalObject (cx)); if (!glob) { NS_WARNING("No global in threadstate"); @@ -449,8 +449,8 @@ jsds_FilterHook (JSDContext *jsdc, JSDThreadState *state) } } } - currentFilter = NS_REINTERPRET_CAST(FilterRecord *, - PR_NEXT_LINK(¤tFilter->links)); + currentFilter = reinterpret_cast + (PR_NEXT_LINK(¤tFilter->links)); } while (currentFilter != gFilters); return PR_TRUE; @@ -487,8 +487,8 @@ jsds_NotifyPendingDeadScripts (JSContext *cx) #endif } /* get next deleted script */ - gDeadScripts = NS_REINTERPRET_CAST(DeadScript *, - PR_NEXT_LINK(&ds->links)); + gDeadScripts = reinterpret_cast + (PR_NEXT_LINK(&ds->links)); if (gDeadScripts == ds) { /* last script in the list */ gDeadScripts = nsnull; @@ -729,7 +729,7 @@ jsds_ScriptHookProc (JSDContext* jsdc, JSDScript* jsdscript, JSBool creating, * we'll still need to invalidate the jsdIScript record, in order * to remove the reference held in the JSDScript private data. */ nsCOMPtr jsdis = - NS_STATIC_CAST(jsdIScript *, JSD_GetScriptPrivate(jsdscript)); + static_cast(JSD_GetScriptPrivate(jsdscript)); if (!jsdis) return; @@ -1058,8 +1058,8 @@ jsdScript::CreatePPLineMap() /* allocate worst case size of map (number of lines in script + 1 * for our 0 record), we'll shrink it with a realloc later. */ mPPLineMap = - NS_STATIC_CAST(PCMapEntry *, - PR_Malloc((scriptExtent + 1) * sizeof (PCMapEntry))); + static_cast + (PR_Malloc((scriptExtent + 1) * sizeof (PCMapEntry))); if (mPPLineMap) { mPCMapSize = 0; for (PRUint32 line = baseLine; line < scriptExtent + baseLine; ++line) { @@ -1072,8 +1072,8 @@ jsdScript::CreatePPLineMap() } if (scriptExtent != mPCMapSize) { mPPLineMap = - NS_STATIC_CAST(PCMapEntry *, - PR_Realloc(mPPLineMap, + static_cast + (PR_Realloc(mPPLineMap, mPCMapSize * sizeof(PCMapEntry))); } } @@ -1134,7 +1134,7 @@ jsdScript::GetVersion (PRInt32 *_rval) ASSERT_VALID_EPHEMERAL; JSContext *cx = JSD_GetDefaultJSContext (mCx); JSScript *script = JSD_GetJSScript(mCx, mScript); - *_rval = NS_STATIC_CAST (PRInt32, JS_GetScriptVersion(cx, script)); + *_rval = static_cast(JS_GetScriptVersion(cx, script)); return NS_OK; } @@ -1155,8 +1155,8 @@ jsdScript::Invalidate() mValid = PR_FALSE; /* release the addref we do in FromPtr */ - jsdIScript *script = NS_STATIC_CAST(jsdIScript *, - JSD_GetScriptPrivate(mScript)); + jsdIScript *script = static_cast + (JSD_GetScriptPrivate(mScript)); NS_ASSERTION (script == this, "That's not my script!"); NS_RELEASE(script); JSD_SetScriptPrivate(mScript, NULL); @@ -1176,7 +1176,7 @@ jsdScript::InvalidateAll () JSD_LockScriptSubsystem(cx); while((script = JSD_IterateScripts(cx, &iter)) != NULL) { nsCOMPtr jsdis = - NS_STATIC_CAST(jsdIScript *, JSD_GetScriptPrivate(script)); + static_cast(JSD_GetScriptPrivate(script)); if (jsdis) jsdis->Invalidate(); } @@ -1275,7 +1275,7 @@ jsdScript::GetFunctionSource(nsAString & aFunctionSource) if (!jsstr) return NS_ERROR_FAILURE; - aFunctionSource = NS_REINTERPRET_CAST(PRUnichar*, JS_GetStringChars(jsstr)); + aFunctionSource = reinterpret_cast(JS_GetStringChars(jsstr)); return NS_OK; } @@ -1426,7 +1426,7 @@ jsdScript::SetBreakpoint(PRUint32 aPC) ASSERT_VALID_EPHEMERAL; jsuword pc = mFirstPC + aPC; JSD_SetExecutionHook (mCx, mScript, pc, jsds_ExecutionHookProc, - NS_REINTERPRET_CAST(void *, PRIVATE_TO_JSVAL(NULL))); + reinterpret_cast(PRIVATE_TO_JSVAL(NULL))); return NS_OK; } @@ -1463,7 +1463,7 @@ jsdContext::FromPtr (JSDContext *aJSDCx, JSContext *aJSCx) nsCOMPtr jsdicx; nsCOMPtr eph = - jsds_FindEphemeral (&gLiveContexts, NS_STATIC_CAST(void *, aJSCx)); + jsds_FindEphemeral (&gLiveContexts, static_cast(aJSCx)); if (eph) { jsdicx = do_QueryInterface(eph); @@ -1471,7 +1471,7 @@ jsdContext::FromPtr (JSDContext *aJSDCx, JSContext *aJSCx) else { nsCOMPtr iscx = - NS_STATIC_CAST(nsISupports *, JS_GetContextPrivate(aJSCx)); + static_cast(JS_GetContextPrivate(aJSCx)); if (!iscx) return nsnull; @@ -1490,7 +1490,7 @@ jsdContext::jsdContext (JSDContext *aJSDCx, JSContext *aJSCx, { DEBUG_CREATE ("jsdContext", gContextCount); mLiveListEntry.value = this; - mLiveListEntry.key = NS_STATIC_CAST (void *, aJSCx); + mLiveListEntry.key = static_cast(aJSCx); jsds_InsertEphemeral (&gLiveContexts, &mLiveListEntry); } @@ -1565,7 +1565,7 @@ jsdContext::GetPrivateData(nsISupports **_rval) PRUint32 options = JS_GetOptions(mJSCx); if (options & JSOPTION_PRIVATE_IS_NSISUPPORTS) { - *_rval = NS_STATIC_CAST(nsISupports*, JS_GetContextPrivate(mJSCx)); + *_rval = static_cast(JS_GetContextPrivate(mJSCx)); NS_IF_ADDREF(*_rval); } else @@ -1600,7 +1600,7 @@ NS_IMETHODIMP jsdContext::GetVersion (PRInt32 *_rval) { ASSERT_VALID_EPHEMERAL; - *_rval = NS_STATIC_CAST (PRInt32, JS_GetVersion(mJSCx)); + *_rval = static_cast(JS_GetVersion(mJSCx)); return NS_OK; } @@ -1608,7 +1608,7 @@ NS_IMETHODIMP jsdContext::SetVersion (PRInt32 id) { ASSERT_VALID_EPHEMERAL; - JSVersion ver = NS_STATIC_CAST (JSVersion, id); + JSVersion ver = static_cast(id); JS_SetVersion(mJSCx, ver); return NS_OK; } @@ -1691,7 +1691,7 @@ jsdStackFrame::FromPtr (JSDContext *aCx, JSDThreadState *aThreadState, nsCOMPtr eph = jsds_FindEphemeral (&gLiveStackFrames, - NS_REINTERPRET_CAST(void *, aStackFrameInfo)); + reinterpret_cast(aStackFrameInfo)); if (eph) { @@ -1906,7 +1906,7 @@ jsdStackFrame::Eval (const nsAString &bytes, const char *fileName, // get pointer to buffer contained in |bytes| nsAString::const_iterator h; bytes.BeginReading(h); - const jschar *char_bytes = NS_REINTERPRET_CAST(const jschar *, h.get()); + const jschar *char_bytes = reinterpret_cast(h.get()); JSExceptionState *estate = 0; jsval jv; @@ -2208,8 +2208,8 @@ jsdValue::GetProperties (jsdIProperty ***propArray, PRUint32 *length) NS_ENSURE_TRUE(prop_count, NS_OK); jsdIProperty **pa_temp = - NS_STATIC_CAST(jsdIProperty **, - nsMemory::Alloc(sizeof (jsdIProperty *) * + static_cast + (nsMemory::Alloc(sizeof (jsdIProperty *) * prop_count)); NS_ENSURE_TRUE(pa_temp, NS_ERROR_OUT_OF_MEMORY); @@ -2820,8 +2820,8 @@ jsdService::RemoveFilter (jsdIFilter *filter) return NS_ERROR_INVALID_ARG; if (gFilters == rec) { - gFilters = NS_REINTERPRET_CAST(FilterRecord *, - PR_NEXT_LINK(&rec->links)); + gFilters = reinterpret_cast + (PR_NEXT_LINK(&rec->links)); /* If we're the only filter left, null out the list head. */ if (gFilters == rec) gFilters = nsnull; @@ -2882,8 +2882,8 @@ jsdService::EnumerateFilters (jsdIFilterEnumerator *enumerator) if (NS_FAILED(rv)) return rv; } - current = NS_REINTERPRET_CAST(FilterRecord *, - PR_NEXT_LINK (¤t->links)); + current = reinterpret_cast + (PR_NEXT_LINK (¤t->links)); } while (current != gFilters); return NS_OK; @@ -2901,11 +2901,11 @@ jsdService::ClearFilters () if (!gFilters) return NS_OK; - FilterRecord *current = NS_REINTERPRET_CAST(FilterRecord *, - PR_NEXT_LINK (&gFilters->links)); + FilterRecord *current = reinterpret_cast + (PR_NEXT_LINK (&gFilters->links)); do { - FilterRecord *next = NS_REINTERPRET_CAST(FilterRecord *, - PR_NEXT_LINK (¤t->links)); + FilterRecord *next = reinterpret_cast + (PR_NEXT_LINK (¤t->links)); PR_REMOVE_AND_INIT_LINK(¤t->links); jsds_FreeFilter(current); current = next; diff --git a/js/jsd/jsd_xpc.h b/js/jsd/jsd_xpc.h index 7ada2a0c93ed..0bc575863115 100644 --- a/js/jsd/jsd_xpc.h +++ b/js/jsd/jsd_xpc.h @@ -150,12 +150,12 @@ class jsdScript : public jsdIScript jsdIScript *rv; if (data) { - rv = NS_STATIC_CAST(jsdIScript *, data); + rv = static_cast(data); } else { rv = new jsdScript (aCx, aScript); NS_IF_ADDREF(rv); /* addref for the SetScriptPrivate, released in * Invalidate() */ - JSD_SetScriptPrivate (aScript, NS_STATIC_CAST(void *, rv)); + JSD_SetScriptPrivate (aScript, static_cast(rv)); } NS_IF_ADDREF(rv); /* addref for return value */ @@ -343,11 +343,11 @@ class jsdContext : public jsdIContext jsdIContext *rv; if (data) { - rv = NS_STATIC_CAST(jsdIContext *, data); + rv = static_cast(data); } else { rv = new jsdContext (aCx); NS_IF_ADDREF(rv); // addref for the SetContextPrivate - JSD_SetContextPrivate (aCx, NS_STATIC_CAST(void *, rv)); + JSD_SetContextPrivate (aCx, static_cast(rv)); } NS_IF_ADDREF(rv); // addref for the return value diff --git a/js/src/xpconnect/loader/mozJSComponentLoader.cpp b/js/src/xpconnect/loader/mozJSComponentLoader.cpp index b4350cb3de3e..44969aca19e7 100644 --- a/js/src/xpconnect/loader/mozJSComponentLoader.cpp +++ b/js/src/xpconnect/loader/mozJSComponentLoader.cpp @@ -146,11 +146,11 @@ mozJSLoaderErrorReporter(JSContext *cx, const char *message, JSErrorReport *rep) PRUint32 column = rep->uctokenptr - rep->uclinebuf; - rv = errorObject->Init(NS_REINTERPRET_CAST(const PRUnichar*, - rep->ucmessage), + rv = errorObject->Init(reinterpret_cast + (rep->ucmessage), fileUni.get(), - NS_REINTERPRET_CAST(const PRUnichar*, - rep->uclinebuf), + reinterpret_cast + (rep->uclinebuf), rep->lineno, column, rep->flags, "component javascript"); if (NS_SUCCEEDED(rv)) { @@ -391,7 +391,7 @@ ReadScriptFromStream(JSContext *cx, nsIObjectInputStream *stream, // doesn't get passed to ::JS_free by ::JS_XDRDestroy. uint32 length; - data = NS_STATIC_CAST(char*, JS_XDRMemGetData(xdr, &length)); + data = static_cast(JS_XDRMemGetData(xdr, &length)); if (data) { JS_XDRMemSetData(xdr, nsnull, 0); } @@ -435,8 +435,8 @@ WriteScriptToStream(JSContext *cx, JSScript *script, // one last buffer of data to write to aStream. uint32 size; - const char* data = NS_REINTERPRET_CAST(const char*, - JS_XDRMemGetData(xdr, &size)); + const char* data = reinterpret_cast + (JS_XDRMemGetData(xdr, &size)); NS_ASSERTION(data, "no decoded JSXDRState data!"); rv = stream->Write32(size); @@ -797,7 +797,7 @@ FastLoadStateHolder::pop() void mozJSComponentLoader::CloseFastLoad(nsITimer *timer, void *closure) { - NS_STATIC_CAST(mozJSComponentLoader*, closure)->CloseFastLoad(); + static_cast(closure)->CloseFastLoad(); } void @@ -1181,7 +1181,7 @@ mozJSComponentLoader::GlobalForLocation(nsILocalFile *aComponent, PRUint32 fileSize32; LL_L2UI(fileSize32, fileSize); - char *buf = NS_STATIC_CAST(char*, PR_MemMap(map, 0, fileSize32)); + char *buf = static_cast(PR_MemMap(map, 0, fileSize32)); if (!buf) { NS_WARNING("Failed to map file"); return NS_ERROR_FAILURE; diff --git a/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp b/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp index 084298dff5bf..a52c6874302f 100644 --- a/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp +++ b/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp @@ -223,7 +223,7 @@ mozJSSubScriptLoader::LoadSubScript (const PRUnichar * /*url*/ goto return_exception; } - rv = serv->NewChannel(nsDependentCString(url), nsnull, NS_STATIC_CAST(nsIURI *, nsnull), + rv = serv->NewChannel(nsDependentCString(url), nsnull, static_cast(nsnull), getter_AddRefs(chan)); if (NS_FAILED(rv)) { @@ -260,7 +260,7 @@ mozJSSubScriptLoader::LoadSubScript (const PRUnichar * /*url*/ readcount += lastReadCount; } while (lastReadCount && readcount != PRUint32(len)); - if (NS_STATIC_CAST(PRUint32, len) != readcount) + if (static_cast(len) != readcount) { errmsg = JS_NewStringCopyZ (cx, LOAD_ERROR_READUNDERFLOW); goto return_exception; diff --git a/js/src/xpconnect/src/XPCDispConvert.cpp b/js/src/xpconnect/src/XPCDispConvert.cpp index de90e2da8671..ed94fdf95741 100644 --- a/js/src/xpconnect/src/XPCDispConvert.cpp +++ b/js/src/xpconnect/src/XPCDispConvert.cpp @@ -112,7 +112,7 @@ JSBool XPCDispConvert::JSArrayToCOMArray(XPCCallContext& ccx, JSObject *obj, err = NS_ERROR_OUT_OF_MEMORY; return JS_FALSE; } - if(FAILED(SafeArrayAccessData(array, NS_REINTERPRET_CAST(void**,&varArray)))) + if(FAILED(SafeArrayAccessData(array, reinterpret_cast(&varArray)))) { err = NS_ERROR_FAILURE; return JS_FALSE; @@ -296,7 +296,7 @@ JSBool XPCDispConvert::JSToCOM(XPCCallContext& ccx, } CComBSTR val(JS_GetStringLength(str), - NS_REINTERPRET_CAST(const WCHAR *, chars)); + reinterpret_cast(chars)); varDest->bstrVal = val.Detach(); } break; @@ -339,8 +339,8 @@ JSBool XPCDispConvert::JSToCOM(XPCCallContext& ccx, } varDest->vt = VT_DISPATCH; pUnknown->QueryInterface(IID_IDispatch, - NS_REINTERPRET_CAST(void**, - &varDest->pdispVal)); + reinterpret_cast + (&varDest->pdispVal)); NS_IF_RELEASE(pUnknown); } break; @@ -453,7 +453,7 @@ inline jsval StringToJSVal(JSContext* cx, const PRUnichar * str, PRUint32 len) { JSString * s = JS_NewUCStringCopyN(cx, - NS_REINTERPRET_CAST(const jschar *, str), + reinterpret_cast(str), len); if(s) return STRING_TO_JSVAL(s); @@ -561,8 +561,8 @@ JSBool XPCDispConvert::COMToJS(XPCCallContext& ccx, const VARIANT& src, { return JS_NewNumberValue( ccx, - NS_STATIC_CAST(double, - isPtr ? src.pcyVal->int64 : + static_cast + (isPtr ? src.pcyVal->int64 : src.cyVal.int64) / 100.0, &dest); } @@ -574,8 +574,8 @@ JSBool XPCDispConvert::COMToJS(XPCCallContext& ccx, const VARIANT& src, default: { // Last ditch effort to convert to string - if(FAILED(VariantChangeType(NS_CONST_CAST(VARIANT*,&src), - NS_CONST_CAST(VARIANT*,&src), + if(FAILED(VariantChangeType(const_cast(&src), + const_cast(&src), VARIANT_ALPHABOOL, VT_BSTR))) { err = NS_ERROR_XPC_BAD_CONVERT_JS; diff --git a/js/src/xpconnect/src/XPCDispInlines.h b/js/src/xpconnect/src/XPCDispInlines.h index 33b62c6f8f43..07efa451cfd9 100644 --- a/js/src/xpconnect/src/XPCDispInlines.h +++ b/js/src/xpconnect/src/XPCDispInlines.h @@ -424,7 +424,7 @@ DISPID XPCDispNameArray::Find(const nsAString &target) const for(PRUint32 index = 0; index < mCount; ++index) { if(mNames[index].Equals(target)) - return NS_STATIC_CAST(DISPID, index + 1); + return static_cast(index + 1); } return 0; } @@ -443,8 +443,7 @@ jsval XPCDispIDArray::Item(JSContext* cx, PRUint32 index) const { jsval val; if(!JS_IdToValue(cx, - NS_REINTERPRET_CAST(jsid, - mIDArray.ElementAt(index)), &val)) + reinterpret_cast(mIDArray.ElementAt(index)), &val)) return JSVAL_NULL; return val; } @@ -467,7 +466,7 @@ JSBool XPCDispIDArray::IsMarked() const inline FUNCDESC* XPCDispTypeInfo::FuncDescArray::Get(PRUint32 index) { - return NS_REINTERPRET_CAST(FUNCDESC*,mArray[index]); + return reinterpret_cast(mArray[index]); } inline @@ -547,7 +546,7 @@ const nsAString & XPCDispJSPropertyInfo::GetName() const inline XPCDispJSPropertyInfo::property_type XPCDispJSPropertyInfo::PropertyType() const { - return NS_STATIC_CAST(property_type,mPropertyType & ~SETTER_MODE); + return static_cast(mPropertyType & ~SETTER_MODE); } //============================================================================= @@ -557,28 +556,28 @@ inline const nsIID & XPCDispIID2nsIID(const IID & iid) { NS_ASSERTION(sizeof(IID) == sizeof(nsIID), "IID is not the same size as nsIID"); - return NS_REINTERPRET_CAST(const nsIID &,iid); + return reinterpret_cast(iid); } inline const IID & XPCDispIID2IID(const nsIID & iid) { NS_ASSERTION(sizeof(IID) == sizeof(nsIID), "IID is not the same size as nsIID"); - return NS_REINTERPRET_CAST(const IID &, iid); + return reinterpret_cast(iid); } inline const nsCID & XPCDispCLSID2nsCID(const CLSID & clsid) { NS_ASSERTION(sizeof(CLSID) == sizeof(nsCID), "CLSID is not the same size as nsCID"); - return NS_REINTERPRET_CAST(const nsCID &,clsid); + return reinterpret_cast(clsid); } inline const CLSID & XPCDispnsCID2CLSID(const nsCID & clsid) { NS_ASSERTION(sizeof(CLSID) == sizeof(nsCID), "CLSID is not the same size as nsCID"); - return NS_REINTERPRET_CAST(const CLSID &, clsid); + return reinterpret_cast(clsid); } //============================================================================= @@ -601,7 +600,7 @@ VARIANT & XPCDispParams::GetParamRef(PRUint32 index) inline _variant_t XPCDispParams::GetParam(PRUint32 index) const { - return NS_CONST_CAST(XPCDispParams*,this)->GetParamRef(index); + return const_cast(this)->GetParamRef(index); } inline @@ -663,6 +662,6 @@ PRUnichar* xpc_JSString2PRUnichar(XPCCallContext& ccx, jsval val, return nsnull; if(length) *length = JS_GetStringLength(str); - return NS_REINTERPRET_CAST(PRUnichar*,JS_GetStringChars(str)); + return reinterpret_cast(JS_GetStringChars(str)); } diff --git a/js/src/xpconnect/src/XPCDispInterface.cpp b/js/src/xpconnect/src/XPCDispInterface.cpp index c816b4e28554..da4847f09f62 100644 --- a/js/src/xpconnect/src/XPCDispInterface.cpp +++ b/js/src/xpconnect/src/XPCDispInterface.cpp @@ -112,7 +112,7 @@ PRUint32 XPCDispInterface::Allocator::Count() const XPCDispInterface* XPCDispInterface::NewInstance(JSContext* cx, nsISupports * pIface) { - CComQIPtr pDispatch(NS_REINTERPRET_CAST(IUnknown*,pIface)); + CComQIPtr pDispatch(reinterpret_cast(pIface)); if(pDispatch) { @@ -181,7 +181,7 @@ PRBool InitializeMember(JSContext * cx, ITypeInfo * pTypeInfo, if(nameCount != 1) return PR_FALSE; JSString* str = JS_InternUCStringN(cx, - NS_REINTERPRET_CAST(const jschar *, name), + reinterpret_cast(name), ::SysStringLen(name)); ::SysFreeString(name); if(!str) @@ -374,8 +374,8 @@ JSBool XPCDispInterface::Member::GetValue(XPCCallContext& ccx, { // scoped lock XPCAutoLock lock(ccx.GetRuntime()->GetMapLock()); - NS_CONST_CAST(Member*,this)->mVal = OBJECT_TO_JSVAL(funobj); - NS_CONST_CAST(Member*,this)->mType |= RESOLVED; + const_cast(this)->mVal = OBJECT_TO_JSVAL(funobj); + const_cast(this)->mType |= RESOLVED; } } *retval = mVal; diff --git a/js/src/xpconnect/src/XPCDispObject.cpp b/js/src/xpconnect/src/XPCDispObject.cpp index 603a195fd00c..677cd6cdc5cf 100644 --- a/js/src/xpconnect/src/XPCDispObject.cpp +++ b/js/src/xpconnect/src/XPCDispObject.cpp @@ -60,7 +60,7 @@ XPCDispObject::WrapIDispatch(IDispatch *pDispatch, XPCCallContext &ccx, // Wrap the desired COM object nsCOMPtr holder; nsresult rv = ccx.GetXPConnect()->WrapNative( - ccx, obj, NS_REINTERPRET_CAST(nsISupports*, pDispatch), NSID_IDISPATCH, + ccx, obj, reinterpret_cast(pDispatch), NSID_IDISPATCH, getter_AddRefs(holder)); if(NS_FAILED(rv) || !holder) { @@ -274,7 +274,7 @@ JSBool XPCDispObject::Invoke(XPCCallContext & ccx, CallMode mode) } // TODO: Remove type cast and change GetIDispatchMember to use the correct type - XPCDispInterface::Member* member = NS_REINTERPRET_CAST(XPCDispInterface::Member*,ccx.GetIDispatchMember()); + XPCDispInterface::Member* member = reinterpret_cast(ccx.GetIDispatchMember()); XPCJSRuntime* rt = ccx.GetRuntime(); XPCContext* xpcc = ccx.GetXPCContext(); XPCPerThreadData* tls = ccx.GetThreadData(); @@ -322,8 +322,8 @@ JSBool XPCDispObject::Invoke(XPCCallContext & ccx, CallMode mode) return JS_FALSE; } - IDispatch * pObj = NS_REINTERPRET_CAST(IDispatch*, - ccx.GetTearOff()->GetNative()); + IDispatch * pObj = reinterpret_cast + (ccx.GetTearOff()->GetNative()); PRUint32 args = member->GetParamCount(); uintN err; // Make sure setter has one argument @@ -423,12 +423,12 @@ JSBool GetMember(XPCCallContext& ccx, JSObject* funobj, XPCNativeInterface*& ifa return JS_FALSE; if(!JSVAL_IS_INT(val)) return JS_FALSE; - iface = NS_REINTERPRET_CAST(XPCNativeInterface*,JSVAL_TO_PRIVATE(val)); + iface = reinterpret_cast(JSVAL_TO_PRIVATE(val)); if(!JS_GetReservedSlot(ccx, funobj, 0, &val)) return JS_FALSE; if(!JSVAL_IS_INT(val)) return JS_FALSE; - member = NS_REINTERPRET_CAST(XPCDispInterface::Member*,JSVAL_TO_PRIVATE(val)); + member = reinterpret_cast(JSVAL_TO_PRIVATE(val)); return JS_TRUE; } diff --git a/js/src/xpconnect/src/XPCDispParamPropJSClass.cpp b/js/src/xpconnect/src/XPCDispParamPropJSClass.cpp index 9b3c38aca514..8f685e1ab728 100644 --- a/js/src/xpconnect/src/XPCDispParamPropJSClass.cpp +++ b/js/src/xpconnect/src/XPCDispParamPropJSClass.cpp @@ -52,8 +52,7 @@ inline XPCDispParamPropJSClass* GetParamProp(JSContext* cx, JSObject* obj) { - return NS_REINTERPRET_CAST(XPCDispParamPropJSClass*, - JS_GetPrivate(cx, obj)); + return reinterpret_cast(JS_GetPrivate(cx, obj)); } /** @@ -211,8 +210,8 @@ XPCDispParamPropJSClass::XPCDispParamPropJSClass(XPCWrappedNative* wrapper, { NS_ADDREF(mWrapper); dispObj->QueryInterface(NSID_IDISPATCH, - NS_REINTERPRET_CAST(void**, - &mDispObj)); + reinterpret_cast + (&mDispObj)); } XPCDispParamPropJSClass::~XPCDispParamPropJSClass() diff --git a/js/src/xpconnect/src/XPCDispPrivate.h b/js/src/xpconnect/src/XPCDispPrivate.h index ccfbfadfa04a..47e4796788b1 100644 --- a/js/src/xpconnect/src/XPCDispPrivate.h +++ b/js/src/xpconnect/src/XPCDispPrivate.h @@ -91,7 +91,7 @@ STDMETHODIMP _class::QueryInterface(REFIID aIID, void** aInstancePtr) \ #define NS_IMPL_COM_QUERY_BODY(_interface) \ if(IsEqualIID(aIID, __uuidof(_interface)) ) \ - foundInterface = NS_STATIC_CAST(_interface*, this); \ + foundInterface = static_cast<_interface*>(this); \ else #define NS_IMPL_COM_QUERY_TAIL_GUTS \ @@ -1228,7 +1228,7 @@ public: * Returns a DISPPARAMS structure pointer for the parameters * @return a DISPPARAMS structure pointer for the parameters */ - DISPPARAMS* GetDispParams() const { return &NS_CONST_CAST(XPCDispParams*,this)->mDispParams; } + DISPPARAMS* GetDispParams() const { return &const_cast(this)->mDispParams; } /** * Returns the number of parameters * @return the number of parameters diff --git a/js/src/xpconnect/src/XPCDispTearOff.cpp b/js/src/xpconnect/src/XPCDispTearOff.cpp index 6b576b196148..19ed3051bac9 100644 --- a/js/src/xpconnect/src/XPCDispTearOff.cpp +++ b/js/src/xpconnect/src/XPCDispTearOff.cpp @@ -172,14 +172,14 @@ STDMETHODIMP XPCDispatchTearOff::QueryInterface(const struct _GUID & guid, { if(IsEqualIID(guid, IID_IDispatch)) { - *pPtr = NS_STATIC_CAST(IDispatch*,this); + *pPtr = static_cast(this); NS_ADDREF_THIS(); return NS_OK; } if(IsEqualIID(guid, IID_ISupportErrorInfo)) { - *pPtr = NS_STATIC_CAST(IDispatch*,this); + *pPtr = static_cast(this); NS_ADDREF_THIS(); return NS_OK; } diff --git a/js/src/xpconnect/src/XPCDispTypeInfo.cpp b/js/src/xpconnect/src/XPCDispTypeInfo.cpp index e7762c5dbbba..ecd3689d0bc0 100644 --- a/js/src/xpconnect/src/XPCDispTypeInfo.cpp +++ b/js/src/xpconnect/src/XPCDispTypeInfo.cpp @@ -119,7 +119,7 @@ XPCDispJSPropertyInfo::XPCDispJSPropertyInfo(JSContext* cx, PRUint32 memid, if(!chars) return; - mName = nsString(NS_REINTERPRET_CAST(const PRUnichar *, chars), len); + mName = nsString(reinterpret_cast(chars), len); JSBool found; uintN attr; // Get the property's attributes, and make sure it's found and enumerable @@ -213,7 +213,7 @@ XPCDispTypeInfo::FuncDescArray::~FuncDescArray() PRUint32 size = mArray.Count(); for(PRUint32 index = 0; index < size; ++index) { - FUNCDESC* funcDesc = NS_REINTERPRET_CAST(FUNCDESC*,mArray.ElementAt(index)); + FUNCDESC* funcDesc = reinterpret_cast(mArray.ElementAt(index)); delete [] funcDesc->lprgelemdescParam; delete funcDesc; } @@ -311,8 +311,8 @@ STDMETHODIMP XPCDispTypeInfo::GetIDsOfNames( // lookup each name for(UINT index = 0; index < cNames; ++index) { - nsDependentString buffer(NS_STATIC_CAST(const PRUnichar *, - rgszNames[index]), + nsDependentString buffer(static_cast + (rgszNames[index]), wcslen(rgszNames[index])); pMemId[index] = mNameArray.Find(buffer); @@ -329,7 +329,7 @@ STDMETHODIMP XPCDispTypeInfo::Invoke( /* [out] */ EXCEPINFO __RPC_FAR *pExcepInfo, /* [out] */ UINT __RPC_FAR *puArgErr) { - CComQIPtr pDisp(NS_REINTERPRET_CAST(IUnknown*,pvInstance)); + CComQIPtr pDisp(reinterpret_cast(pvInstance)); if(pDisp) { return pDisp->Invoke(memid, IID_NULL, LOCALE_SYSTEM_DEFAULT, wFlags, @@ -438,8 +438,8 @@ XPCDispIDArray::XPCDispIDArray(XPCCallContext& ccx, JSIdArray* array) : // copy the JS ID Array to our internal array for(jsint index = 0; index < array->length; ++index) { - mIDArray.ReplaceElementAt(NS_REINTERPRET_CAST(void*, - array->vector[index]), + mIDArray.ReplaceElementAt(reinterpret_cast + (array->vector[index]), index); } } @@ -461,7 +461,7 @@ void XPCDispIDArray::TraceJS(JSTracer* trc) for(PRInt32 index = 0; index < count; ++index) { if(JS_IdToValue(trc->context, - NS_REINTERPRET_CAST(jsid, mIDArray.ElementAt(index)), + reinterpret_cast(mIDArray.ElementAt(index)), &val)) { JS_CALL_VALUE_TRACER(trc, val, "disp_id_array_element"); diff --git a/js/src/xpconnect/src/XPCIDispatchClassInfo.cpp b/js/src/xpconnect/src/XPCIDispatchClassInfo.cpp index 0654c1784dc5..4b6bf0d9e14d 100644 --- a/js/src/xpconnect/src/XPCIDispatchClassInfo.cpp +++ b/js/src/xpconnect/src/XPCIDispatchClassInfo.cpp @@ -65,10 +65,10 @@ NS_IMETHODIMP XPCIDispatchClassInfo::GetInterfaces(PRUint32 *count, nsIID * **array) { *count = 0; - *array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(sizeof(nsIID*))); + *array = static_cast(nsMemory::Alloc(sizeof(nsIID*))); NS_ENSURE_TRUE(*array, NS_ERROR_OUT_OF_MEMORY); - **array = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NSID_IDISPATCH, + **array = static_cast(nsMemory::Clone(&NSID_IDISPATCH, sizeof(NSID_IDISPATCH))); if(!**array) { diff --git a/js/src/xpconnect/src/XPCIDispatchExtension.cpp b/js/src/xpconnect/src/XPCIDispatchExtension.cpp index ab516b118e93..41b3e554dc2d 100644 --- a/js/src/xpconnect/src/XPCIDispatchExtension.cpp +++ b/js/src/xpconnect/src/XPCIDispatchExtension.cpp @@ -91,7 +91,7 @@ CommonConstructor(JSContext *cx, int name, JSObject *obj, uintN argc, } jschar * className = JS_GetStringChars(str); - CComBSTR bstrClassName(len, NS_REINTERPRET_CAST(const WCHAR *, className)); + CComBSTR bstrClassName(len, reinterpret_cast(className)); if(!bstrClassName) { XPCThrower::Throw(NS_ERROR_XPC_COM_INVALID_CLASS_ID, ccx); @@ -109,7 +109,7 @@ CommonConstructor(JSContext *cx, int name, JSObject *obj, uintN argc, // Get a wrapper for our object nsCOMPtr holder; nsresult nsrv = ccx.GetXPConnect()->WrapNative( - ccx, ccx.GetOperandJSObject(), NS_REINTERPRET_CAST(nsISupports*, pDispatch.p), + ccx, ccx.GetOperandJSObject(), reinterpret_cast(pDispatch.p), NSID_IDISPATCH, getter_AddRefs(holder)); if(NS_FAILED(nsrv)) { @@ -169,7 +169,7 @@ ActiveXSupports(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, } PRUint32 len; jschar * className = xpc_JSString2String(ccx, argv[0], &len); - CComBSTR bstrClassName(len, NS_REINTERPRET_CAST(const WCHAR *, className)); + CComBSTR bstrClassName(len, reinterpret_cast(className)); if(!className) { XPCThrower::Throw(NS_ERROR_XPC_COM_INVALID_CLASS_ID, ccx); diff --git a/js/src/xpconnect/src/XPCNativeWrapper.cpp b/js/src/xpconnect/src/XPCNativeWrapper.cpp index 8ebf8e566ef4..c143c909a114 100644 --- a/js/src/xpconnect/src/XPCNativeWrapper.cpp +++ b/js/src/xpconnect/src/XPCNativeWrapper.cpp @@ -714,8 +714,8 @@ JSBool MaybePreserveWrapper(JSContext* cx, XPCWrappedNative *wn, uintN flags) if ((flags & JSRESOLVE_ASSIGNING) && (::JS_GetOptions(cx) & JSOPTION_PRIVATE_IS_NSISUPPORTS)) { nsCOMPtr scriptNotify = - do_QueryInterface(NS_STATIC_CAST(nsISupports*, - JS_GetContextPrivate(cx))); + do_QueryInterface(static_cast + (JS_GetContextPrivate(cx))); if (scriptNotify) { return NS_SUCCEEDED(scriptNotify->PreserveWrapper(wn)); } @@ -1340,8 +1340,8 @@ XPC_NW_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, // toString() called on XPCNativeWrapper.prototype NS_NAMED_LITERAL_STRING(protoString, "[object XPCNativeWrapper]"); JSString *str = - ::JS_NewUCStringCopyN(cx, NS_REINTERPRET_CAST(const jschar*, - protoString.get()), + ::JS_NewUCStringCopyN(cx, reinterpret_cast + (protoString.get()), protoString.Length()); NS_ENSURE_TRUE(str, JS_FALSE); *rval = STRING_TO_JSVAL(str); @@ -1415,8 +1415,8 @@ XPC_NW_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, resultString.Append(']'); - str = ::JS_NewUCStringCopyN(cx, NS_REINTERPRET_CAST(const jschar *, - resultString.get()), + str = ::JS_NewUCStringCopyN(cx, reinterpret_cast + (resultString.get()), resultString.Length()); } diff --git a/js/src/xpconnect/src/nsXPConnect.cpp b/js/src/xpconnect/src/nsXPConnect.cpp index 54ad5518638c..93e657b55065 100644 --- a/js/src/xpconnect/src/nsXPConnect.cpp +++ b/js/src/xpconnect/src/nsXPConnect.cpp @@ -332,7 +332,7 @@ nsXPConnect::ReleaseXPConnectSingleton() if(dumpFile) { JS_DumpHeap(ccx, dumpFile, nsnull, 0, nsnull, - NS_STATIC_CAST(size_t, -1), nsnull); + static_cast(-1), nsnull); if(dumpFile != stdout) fclose(dumpFile); } @@ -531,7 +531,7 @@ void XPCMarkNotification(void *thing, uint8 flags, void *closure) ty != GCX_XML) return; - JSObjectRefcounts* jsr = NS_STATIC_CAST(JSObjectRefcounts*, closure); + JSObjectRefcounts* jsr = static_cast(closure); // We're marking after a mark phase ended, so the GC restarted itself and // we want to clear the refcounts first. if(jsr->mMarkEnded) @@ -608,7 +608,7 @@ nsXPConnect::Unlink(void *p) return NS_ERROR_FAILURE; uint8 ty = *js_GetGCThingFlags(p) & GCF_TYPEMASK; if(ty == GCX_OBJECT) - JS_ClearScope(*mCycleCollectionContext, NS_STATIC_CAST(JSObject*, p)); + JS_ClearScope(*mCycleCollectionContext, static_cast(p)); return NS_OK; } @@ -643,7 +643,7 @@ NoteJSChild(JSTracer *trc, void *thing, uint32 kind) if(kind == JSTRACE_OBJECT || kind == JSTRACE_NAMESPACE || kind == JSTRACE_QNAME || kind == JSTRACE_XML) { - ContextCallbackItem *item = NS_STATIC_CAST(ContextCallbackItem*, trc); + ContextCallbackItem *item = static_cast(trc); item->cb->NoteScriptChild(nsIProgrammingLanguage::JAVASCRIPT, thing); } } @@ -679,7 +679,7 @@ nsXPConnect::Traverse(void *p, nsCycleCollectionTraversalCallback &cb) #ifdef DEBUG_CC if(ty == GCX_OBJECT) { - JSObject *obj = NS_STATIC_CAST(JSObject*, p); + JSObject *obj = static_cast(p); JSClass *clazz = OBJ_GET_CLASS(cx, obj); char name[72]; if(XPCNativeWrapper::IsNativeWrapperClass(clazz)) @@ -790,7 +790,7 @@ nsXPConnect::Traverse(void *p, nsCycleCollectionTraversalCallback &cb) if(ty != GCX_OBJECT) return NS_OK; - JSObject *obj = NS_STATIC_CAST(JSObject*, p); + JSObject *obj = static_cast(p); JSClass* clazz = OBJ_GET_CLASS(cx, obj); if(clazz == &XPC_WN_Tearoff_JSClass) @@ -810,7 +810,7 @@ nsXPConnect::Traverse(void *p, nsCycleCollectionTraversalCallback &cb) clazz->flags & JSCLASS_PRIVATE_IS_NSISUPPORTS && !XPCNativeWrapper::IsNativeWrapperClass(clazz)) { - cb.NoteXPCOMChild(NS_STATIC_CAST(nsISupports*, JS_GetPrivate(cx, obj))); + cb.NoteXPCOMChild(static_cast(JS_GetPrivate(cx, obj))); } #ifndef XPCONNECT_STANDALONE @@ -978,7 +978,7 @@ nsXPConnect::InitClassesWithNewWrappedGlobal(JSContext * aJSContext, return UnexpectedFailure(NS_ERROR_FAILURE); XPCWrappedNative* wrapper = - NS_REINTERPRET_CAST(XPCWrappedNative*, holder.get()); + reinterpret_cast(holder.get()); XPCWrappedNativeScope* scope = wrapper->GetScope(); if(!scope) @@ -1160,7 +1160,7 @@ nsXPConnect::GetWrappedNativeOfNativeObject(JSContext * aJSContext, &wrapper); if(NS_FAILED(rv)) return NS_ERROR_FAILURE; - *_retval = NS_STATIC_CAST(nsIXPConnectWrappedNative*, wrapper); + *_retval = static_cast(wrapper); return NS_OK; } @@ -1196,7 +1196,7 @@ MoveableWrapperFinder(JSDHashTable *table, JSDHashEntryHdr *hdr, uint32 number, void *arg) { // Every element counts. - nsVoidArray *va = NS_STATIC_CAST(nsVoidArray *,arg); + nsVoidArray *va = static_cast(arg); va->AppendElement(((Native2WrappedNativeMap::Entry*)hdr)->value); return JS_DHASH_NEXT; } @@ -1238,7 +1238,7 @@ nsXPConnect::ReparentScopeAwareWrappers(JSContext *aJSContext, // reparented. XPCWrappedNative *wrapper = - NS_STATIC_CAST(XPCWrappedNative *, wrappersToMove[i]); + static_cast(wrappersToMove[i]); nsISupports *identity = wrapper->GetIdentityObject(); nsCOMPtr info(do_QueryInterface(identity)); diff --git a/js/src/xpconnect/src/xpccallcontext.cpp b/js/src/xpconnect/src/xpccallcontext.cpp index e2cfa0dc297d..e348f295d0de 100644 --- a/js/src/xpconnect/src/xpccallcontext.cpp +++ b/js/src/xpconnect/src/xpccallcontext.cpp @@ -494,7 +494,7 @@ XPCCallContext::SetIDispatchInfo(XPCNativeInterface* iface, mInterface = iface; mMember = nsnull; mIDispatchMember = member; - mName = NS_REINTERPRET_CAST(XPCDispInterface::Member*,member)->GetName(); + mName = reinterpret_cast(member)->GetName(); if(mState < HAVE_NAME) mState = HAVE_NAME; diff --git a/js/src/xpconnect/src/xpccomponents.cpp b/js/src/xpconnect/src/xpccomponents.cpp index 71f8f7796e1c..2ca59438855e 100644 --- a/js/src/xpconnect/src/xpccomponents.cpp +++ b/js/src/xpconnect/src/xpccomponents.cpp @@ -115,14 +115,14 @@ nsXPCComponents_Interfaces::GetInterfaces(PRUint32 *aCount, nsIID * **aArray) #endif *aCount = count; nsIID **array; - *aArray = array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(count * sizeof(nsIID*))); + *aArray = array = static_cast(nsMemory::Alloc(count * sizeof(nsIID*))); if(!array) return NS_ERROR_OUT_OF_MEMORY; PRUint32 index = 0; nsIID* clone; #define PUSH_IID(id) \ - clone = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NS_GET_IID( id ), \ + clone = static_cast(nsMemory::Clone(&NS_GET_IID( id ), \ sizeof(nsIID))); \ if (!clone) \ goto oom; \ @@ -344,7 +344,7 @@ nsXPCComponents_Interfaces::NewResolve(nsIXPConnectWrappedNative *wrapper, return NS_OK; nsCOMPtr nsid = - dont_AddRef(NS_STATIC_CAST(nsIJSIID*, nsJSIID::NewID(info))); + dont_AddRef(static_cast(nsJSIID::NewID(info))); if(nsid) { @@ -354,7 +354,7 @@ nsXPCComponents_Interfaces::NewResolve(nsIXPConnectWrappedNative *wrapper, { nsCOMPtr holder; if(NS_SUCCEEDED(xpc->WrapNative(cx, obj, - NS_STATIC_CAST(nsIJSIID*,nsid), + static_cast(nsid), NS_GET_IID(nsIJSIID), getter_AddRefs(holder)))) { @@ -460,14 +460,14 @@ nsXPCComponents_InterfacesByID::GetInterfaces(PRUint32 *aCount, nsIID * **aArray #endif *aCount = count; nsIID **array; - *aArray = array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(count * sizeof(nsIID*))); + *aArray = array = static_cast(nsMemory::Alloc(count * sizeof(nsIID*))); if(!array) return NS_ERROR_OUT_OF_MEMORY; PRUint32 index = 0; nsIID* clone; #define PUSH_IID(id) \ - clone = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NS_GET_IID( id ), \ + clone = static_cast(nsMemory::Clone(&NS_GET_IID( id ), \ sizeof(nsIID))); \ if (!clone) \ goto oom; \ @@ -675,8 +675,8 @@ nsXPCComponents_InterfacesByID::NewResolve(nsIXPConnectWrappedNative *wrapper, nsnull != (name = JS_GetStringChars(JSVAL_TO_STRING(id)))) { nsID iid; - if (!iid.Parse(NS_ConvertUTF16toUTF8(NS_REINTERPRET_CAST(const PRUnichar*, -name)).get())) + if (!iid.Parse(NS_ConvertUTF16toUTF8(reinterpret_cast + (name)).get())) return NS_OK; nsCOMPtr info; @@ -685,7 +685,7 @@ name)).get())) return NS_OK; nsCOMPtr nsid = - dont_AddRef(NS_STATIC_CAST(nsIJSIID*, nsJSIID::NewID(info))); + dont_AddRef(static_cast(nsJSIID::NewID(info))); if (!nsid) return NS_ERROR_OUT_OF_MEMORY; @@ -696,7 +696,7 @@ name)).get())) { nsCOMPtr holder; if(NS_SUCCEEDED(xpc->WrapNative(cx, obj, - NS_STATIC_CAST(nsIJSIID*,nsid), + static_cast(nsid), NS_GET_IID(nsIJSIID), getter_AddRefs(holder)))) { @@ -791,14 +791,14 @@ nsXPCComponents_Classes::GetInterfaces(PRUint32 *aCount, nsIID * **aArray) PRUint32 count = 2; *aCount = count; nsIID **array; - *aArray = array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(count * sizeof(nsIID*))); + *aArray = array = static_cast(nsMemory::Alloc(count * sizeof(nsIID*))); if(!array) return NS_ERROR_OUT_OF_MEMORY; PRUint32 index = 0; nsIID* clone; #define PUSH_IID(id) \ - clone = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NS_GET_IID( id ), \ + clone = static_cast(nsMemory::Clone(&NS_GET_IID( id ), \ sizeof(nsIID))); \ if (!clone) \ goto oom; \ @@ -981,7 +981,7 @@ nsXPCComponents_Classes::NewResolve(nsIXPConnectWrappedNative *wrapper, name[0] != '{') // we only allow contractids here { nsCOMPtr nsid = - dont_AddRef(NS_STATIC_CAST(nsIJSCID*,nsJSCID::NewID(name))); + dont_AddRef(static_cast(nsJSCID::NewID(name))); if(nsid) { nsCOMPtr xpc; @@ -990,7 +990,7 @@ nsXPCComponents_Classes::NewResolve(nsIXPConnectWrappedNative *wrapper, { nsCOMPtr holder; if(NS_SUCCEEDED(xpc->WrapNative(cx, obj, - NS_STATIC_CAST(nsIJSCID*,nsid), + static_cast(nsid), NS_GET_IID(nsIJSCID), getter_AddRefs(holder)))) { @@ -1046,14 +1046,14 @@ nsXPCComponents_ClassesByID::GetInterfaces(PRUint32 *aCount, nsIID * **aArray) PRUint32 count = 2; *aCount = count; nsIID **array; - *aArray = array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(count * sizeof(nsIID*))); + *aArray = array = static_cast(nsMemory::Alloc(count * sizeof(nsIID*))); if(!array) return NS_ERROR_OUT_OF_MEMORY; PRUint32 index = 0; nsIID* clone; #define PUSH_IID(id) \ - clone = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NS_GET_IID( id ), \ + clone = static_cast(nsMemory::Clone(&NS_GET_IID( id ), \ sizeof(nsIID))); \ if (!clone) \ goto oom; \ @@ -1253,7 +1253,7 @@ nsXPCComponents_ClassesByID::NewResolve(nsIXPConnectWrappedNative *wrapper, IsRegisteredCLSID(name)) // we only allow canonical CLSIDs here { nsCOMPtr nsid = - dont_AddRef(NS_STATIC_CAST(nsIJSCID*,nsJSCID::NewID(name))); + dont_AddRef(static_cast(nsJSCID::NewID(name))); if(nsid) { nsCOMPtr xpc; @@ -1262,7 +1262,7 @@ nsXPCComponents_ClassesByID::NewResolve(nsIXPConnectWrappedNative *wrapper, { nsCOMPtr holder; if(NS_SUCCEEDED(xpc->WrapNative(cx, obj, - NS_STATIC_CAST(nsIJSCID*,nsid), + static_cast(nsid), NS_GET_IID(nsIJSCID), getter_AddRefs(holder)))) { @@ -1320,14 +1320,14 @@ nsXPCComponents_Results::GetInterfaces(PRUint32 *aCount, nsIID * **aArray) PRUint32 count = 2; *aCount = count; nsIID **array; - *aArray = array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(count * sizeof(nsIID*))); + *aArray = array = static_cast(nsMemory::Alloc(count * sizeof(nsIID*))); if(!array) return NS_ERROR_OUT_OF_MEMORY; PRUint32 index = 0; nsIID* clone; #define PUSH_IID(id) \ - clone = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NS_GET_IID( id ), \ + clone = static_cast(nsMemory::Clone(&NS_GET_IID( id ), \ sizeof(nsIID))); \ if (!clone) \ goto oom; \ @@ -1552,14 +1552,14 @@ nsXPCComponents_ID::GetInterfaces(PRUint32 *aCount, nsIID * **aArray) PRUint32 count = 2; *aCount = count; nsIID **array; - *aArray = array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(count * sizeof(nsIID*))); + *aArray = array = static_cast(nsMemory::Alloc(count * sizeof(nsIID*))); if(!array) return NS_ERROR_OUT_OF_MEMORY; PRUint32 index = 0; nsIID* clone; #define PUSH_IID(id) \ - clone = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NS_GET_IID( id ), \ + clone = static_cast(nsMemory::Clone(&NS_GET_IID( id ), \ sizeof(nsIID))); \ if (!clone) \ goto oom; \ @@ -1779,14 +1779,14 @@ nsXPCComponents_Exception::GetInterfaces(PRUint32 *aCount, nsIID * **aArray) PRUint32 count = 2; *aCount = count; nsIID **array; - *aArray = array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(count * sizeof(nsIID*))); + *aArray = array = static_cast(nsMemory::Alloc(count * sizeof(nsIID*))); if(!array) return NS_ERROR_OUT_OF_MEMORY; PRUint32 index = 0; nsIID* clone; #define PUSH_IID(id) \ - clone = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NS_GET_IID( id ), \ + clone = static_cast(nsMemory::Clone(&NS_GET_IID( id ), \ sizeof(nsIID))); \ if (!clone) \ goto oom; \ @@ -2072,14 +2072,14 @@ nsXPCConstructor::GetInterfaces(PRUint32 *aCount, nsIID * **aArray) PRUint32 count = 2; *aCount = count; nsIID **array; - *aArray = array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(count * sizeof(nsIID*))); + *aArray = array = static_cast(nsMemory::Alloc(count * sizeof(nsIID*))); if(!array) return NS_ERROR_OUT_OF_MEMORY; PRUint32 index = 0; nsIID* clone; #define PUSH_IID(id) \ - clone = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NS_GET_IID( id ), \ + clone = static_cast(nsMemory::Clone(&NS_GET_IID( id ), \ sizeof(nsIID))); \ if (!clone) \ goto oom; \ @@ -2337,14 +2337,14 @@ nsXPCComponents_Constructor::GetInterfaces(PRUint32 *aCount, nsIID * **aArray) PRUint32 count = 2; *aCount = count; nsIID **array; - *aArray = array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(count * sizeof(nsIID*))); + *aArray = array = static_cast(nsMemory::Alloc(count * sizeof(nsIID*))); if(!array) return NS_ERROR_OUT_OF_MEMORY; PRUint32 index = 0; nsIID* clone; #define PUSH_IID(id) \ - clone = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NS_GET_IID( id ), \ + clone = static_cast(nsMemory::Clone(&NS_GET_IID( id ), \ sizeof(nsIID))); \ if (!clone) \ goto oom; \ @@ -2565,7 +2565,7 @@ nsXPCComponents_Constructor::CallOrConstruct(nsIXPConnectWrappedNative *wrapper, { cInterfaceID = dont_AddRef( - NS_STATIC_CAST(nsIJSIID*, nsJSIID::NewID(info))); + static_cast(nsJSIID::NewID(info))); } if(!cInterfaceID) return ThrowAndFail(NS_ERROR_XPC_UNEXPECTED, cx, _retval); @@ -2614,8 +2614,8 @@ nsXPCComponents_Constructor::CallOrConstruct(nsIXPConnectWrappedNative *wrapper, } nsCOMPtr ctor = - NS_STATIC_CAST(nsIXPCConstructor*, - new nsXPCConstructor(cClassID, cInterfaceID, cInitializer)); + static_cast + (new nsXPCConstructor(cClassID, cInterfaceID, cInitializer)); if(!ctor) return ThrowAndFail(NS_ERROR_XPC_UNEXPECTED, cx, _retval); @@ -2750,8 +2750,8 @@ nsXPCComponents_Utils::LookupMethod() nsCOMPtr callee; cc->GetCallee(getter_AddRefs(callee)); if(!callee || callee.get() != - NS_STATIC_CAST(const nsISupports*, - NS_STATIC_CAST(const nsIXPCComponents_Utils*,this))) + static_cast + (static_cast(this))) return NS_ERROR_FAILURE; #endif @@ -2876,8 +2876,8 @@ nsXPCComponents_Utils::ReportError() nsCOMPtr callee; cc->GetCallee(getter_AddRefs(callee)); if(!callee || callee.get() != - NS_STATIC_CAST(const nsISupports*, - NS_STATIC_CAST(const nsIXPCComponents_Utils*,this))) { + static_cast + (static_cast(this))) { NS_ERROR("reportError() must only be called from JS!"); return NS_ERROR_FAILURE; } @@ -2912,11 +2912,11 @@ nsXPCComponents_Utils::ReportError() PRUint32 column = err->uctokenptr - err->uclinebuf; - rv = scripterr->Init(NS_REINTERPRET_CAST(const PRUnichar*, - err->ucmessage), + rv = scripterr->Init(reinterpret_cast + (err->ucmessage), fileUni.get(), - NS_REINTERPRET_CAST(const PRUnichar*, - err->uclinebuf), + reinterpret_cast + (err->uclinebuf), err->lineno, column, err->flags, @@ -2948,8 +2948,8 @@ nsXPCComponents_Utils::ReportError() frame->GetLineNumber(&lineNo); } - rv = scripterr->Init(NS_REINTERPRET_CAST(const PRUnichar*, - JS_GetStringChars(msgstr)), + rv = scripterr->Init(reinterpret_cast + (JS_GetStringChars(msgstr)), NS_ConvertUTF8toUTF16(fileName).get(), nsnull, lineNo, 0, @@ -3280,8 +3280,8 @@ nsXPCComponents_utils_Sandbox::CallOrConstruct(nsIXPConnectWrappedNative *wrappe nsISupports *prinOrSop = nsnull; if (JSVAL_IS_STRING(argv[0])) { JSString *codebasestr = JSVAL_TO_STRING(argv[0]); - nsAutoString codebase(NS_REINTERPRET_CAST(PRUnichar*, - JS_GetStringChars(codebasestr)), + nsAutoString codebase(reinterpret_cast + (JS_GetStringChars(codebasestr)), JS_GetStringLength(codebasestr)); nsCOMPtr uri; rv = NS_NewURI(getter_AddRefs(uri), codebase); @@ -3386,7 +3386,7 @@ JSBool JS_DLL_CALLBACK ContextHolder::ContextHolderBranchCallback(JSContext *cx, JSScript *script) { ContextHolder* thisObject = - NS_STATIC_CAST(ContextHolder*, JS_GetContextPrivate(cx)); + static_cast(JS_GetContextPrivate(cx)); NS_ASSERTION(thisObject, "How did that happen?"); if (thisObject->mOrigBranchCallback) { @@ -3523,8 +3523,8 @@ xpc_EvalInSandbox(JSContext *cx, JSObject *sandbox, const nsAString& source, AutoJSRequestWithNoCallContext req(sandcx->GetJSContext()); if (!JS_EvaluateUCScriptForPrincipals(sandcx->GetJSContext(), sandbox, jsPrincipals, - NS_REINTERPRET_CAST(const jschar *, - PromiseFlatString(source).get()), + reinterpret_cast + (PromiseFlatString(source).get()), source.Length(), filename, lineNo, rval)) { jsval exn; @@ -3671,14 +3671,14 @@ nsXPCComponents::GetInterfaces(PRUint32 *aCount, nsIID * **aArray) #endif *aCount = count; nsIID **array; - *aArray = array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(count * sizeof(nsIID*))); + *aArray = array = static_cast(nsMemory::Alloc(count * sizeof(nsIID*))); if(!array) return NS_ERROR_OUT_OF_MEMORY; PRUint32 index = 0; nsIID* clone; #define PUSH_IID(id) \ - clone = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NS_GET_IID( id ), \ + clone = static_cast(nsMemory::Clone(&NS_GET_IID( id ), \ sizeof(nsIID))); \ if (!clone) \ goto oom; \ diff --git a/js/src/xpconnect/src/xpcconvert.cpp b/js/src/xpconnect/src/xpcconvert.cpp index 0e4409353297..37893ebf6c65 100644 --- a/js/src/xpconnect/src/xpcconvert.cpp +++ b/js/src/xpconnect/src/xpcconvert.cpp @@ -983,7 +983,7 @@ XPCConvert::JSData2Native(XPCCallContext& ccx, void* d, jsval s, XPCVariant* variant = XPCVariant::newVariant(ccx, s); if(!variant) return JS_FALSE; - *((nsISupports**)d) = NS_STATIC_CAST(nsIVariant*, variant); + *((nsISupports**)d) = static_cast(variant); return JS_TRUE; } else if(iid->Equals(NS_GET_IID(nsIAtom)) && @@ -992,7 +992,7 @@ XPCConvert::JSData2Native(XPCCallContext& ccx, void* d, jsval s, // We're trying to pass a string as an nsIAtom. Let's atomize! JSString* str = JSVAL_TO_STRING(s); PRUnichar* chars = - NS_REINTERPRET_CAST(PRUnichar*, JS_GetStringChars(str)); + reinterpret_cast(JS_GetStringChars(str)); if (!chars) { if (pErr) *pErr = NS_ERROR_XPC_BAD_CONVERT_JS_NULL_REF; @@ -1191,7 +1191,7 @@ XPCConvert::NativeInterface2JSObject(XPCCallContext& ccx, } } - *dest = NS_STATIC_CAST(nsIXPConnectJSObjectHolder*, wrapper); + *dest = static_cast(wrapper); return JS_TRUE; } @@ -1407,8 +1407,8 @@ XPCConvert::JSValToXPCException(XPCCallContext& ccx, nsnull, &jswrapper); if(NS_FAILED(rv)) return rv; - *exceptn = NS_REINTERPRET_CAST(nsIException*, - jswrapper); + *exceptn = reinterpret_cast + (jswrapper); return NS_OK; } } diff --git a/js/src/xpconnect/src/xpcexception.cpp b/js/src/xpconnect/src/xpcexception.cpp index 326d975599b1..dab5b42639ca 100644 --- a/js/src/xpconnect/src/xpcexception.cpp +++ b/js/src/xpconnect/src/xpcexception.cpp @@ -478,6 +478,6 @@ nsXPCException::NewException(const char *aMessage, if(!e) return NS_ERROR_FAILURE; - *exceptn = NS_STATIC_CAST(nsIXPCException*, e); + *exceptn = static_cast(e); return NS_OK; } diff --git a/js/src/xpconnect/src/xpcinlines.h b/js/src/xpconnect/src/xpcinlines.h index d220156fbd4e..6a6a7cf71e32 100644 --- a/js/src/xpconnect/src/xpcinlines.h +++ b/js/src/xpconnect/src/xpcinlines.h @@ -395,7 +395,7 @@ XPCNativeInterface::FindMember(jsval name) const const XPCNativeMember* member = mMembers; for(int i = (int) mMemberCount; i > 0; i--, member++) if(member->GetName() == name) - return NS_CONST_CAST(XPCNativeMember*, member); + return const_cast(member); return nsnull; } @@ -644,8 +644,8 @@ XPCWrappedNativeTearOff::GetIDispatchInfo() const { NS_ASSERTION((jsword)mJSObject & 2, "XPCWrappedNativeTearOff::GetIDispatchInfo " "called on a non IDispatch interface"); - return NS_REINTERPRET_CAST(XPCDispInterface*, - (((jsword)mJSObject) & ~JSOBJECT_MASK)); + return reinterpret_cast + ((((jsword)mJSObject) & ~JSOBJECT_MASK)); } inline JSBool diff --git a/js/src/xpconnect/src/xpcjsid.cpp b/js/src/xpconnect/src/xpcjsid.cpp index 4a274bae6cf8..ee0d80b3b42c 100644 --- a/js/src/xpconnect/src/xpcjsid.cpp +++ b/js/src/xpconnect/src/xpcjsid.cpp @@ -980,7 +980,7 @@ xpc_NewIDObject(JSContext *cx, JSObject* jsobj, const nsID& aID) if(idString) { nsCOMPtr iid = - dont_AddRef(NS_STATIC_CAST(nsIJSID*, nsJSID::NewID(idString))); + dont_AddRef(static_cast(nsJSID::NewID(idString))); PR_Free(idString); if(iid) { @@ -989,7 +989,7 @@ xpc_NewIDObject(JSContext *cx, JSObject* jsobj, const nsID& aID) { nsCOMPtr holder; nsresult rv = xpc->WrapNative(cx, jsobj, - NS_STATIC_CAST(nsISupports*,iid), + static_cast(iid), NS_GET_IID(nsIJSID), getter_AddRefs(holder)); if(NS_SUCCEEDED(rv) && holder) diff --git a/js/src/xpconnect/src/xpcjsruntime.cpp b/js/src/xpconnect/src/xpcjsruntime.cpp index bc0e7158ff50..8e2ae32825b6 100644 --- a/js/src/xpconnect/src/xpcjsruntime.cpp +++ b/js/src/xpconnect/src/xpcjsruntime.cpp @@ -278,13 +278,13 @@ void XPCJSRuntime::TraceJS(JSTracer* trc, void* data) XPCWrappedNativeScope::TraceJS(trc, self); for (XPCRootSetElem *e = self->mVariantRoots; e ; e = e->GetNextRoot()) - NS_STATIC_CAST(XPCTraceableVariant*, e)->TraceJS(trc); + static_cast(e)->TraceJS(trc); for (XPCRootSetElem *e = self->mWrappedJSRoots; e ; e = e->GetNextRoot()) - NS_STATIC_CAST(nsXPCWrappedJS*, e)->TraceJS(trc); + static_cast(e)->TraceJS(trc); for (XPCRootSetElem *e = self->mObjectHolderRoots; e ; e = e->GetNextRoot()) - NS_STATIC_CAST(XPCJSObjectHolder*, e)->TraceJS(trc); + static_cast(e)->TraceJS(trc); } // static @@ -371,8 +371,8 @@ JSBool XPCJSRuntime::GCCallback(JSContext *cx, JSGCStatus status) dyingWrappedJSArray->Compact(); break; } - wrapper = NS_STATIC_CAST(nsXPCWrappedJS*, - dyingWrappedJSArray->ElementAt(count-1)); + wrapper = static_cast + (dyingWrappedJSArray->ElementAt(count-1)); dyingWrappedJSArray->RemoveElementAt(count-1); } NS_RELEASE(wrapper); @@ -596,8 +596,8 @@ JSBool XPCJSRuntime::GCCallback(JSContext *cx, JSGCStatus status) array->Compact(); break; } - obj = NS_REINTERPRET_CAST(nsISupports*, - array->ElementAt(count-1)); + obj = reinterpret_cast + (array->ElementAt(count-1)); array->RemoveElementAt(count-1); } NS_RELEASE(obj); diff --git a/js/src/xpconnect/src/xpcruntimesvc.cpp b/js/src/xpconnect/src/xpcruntimesvc.cpp index 8514040cf050..8cd37e505b1c 100644 --- a/js/src/xpconnect/src/xpcruntimesvc.cpp +++ b/js/src/xpconnect/src/xpcruntimesvc.cpp @@ -93,14 +93,14 @@ BackstagePass::GetInterfaces(PRUint32 *aCount, nsIID * **aArray) #endif *aCount = count; nsIID **array; - *aArray = array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(count * sizeof(nsIID*))); + *aArray = array = static_cast(nsMemory::Alloc(count * sizeof(nsIID*))); if(!array) return NS_ERROR_OUT_OF_MEMORY; PRUint32 index = 0; nsIID* clone; #define PUSH_IID(id) \ - clone = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NS_GET_IID( id ), \ + clone = static_cast(nsMemory::Clone(&NS_GET_IID( id ), \ sizeof(nsIID))); \ if (!clone) \ goto oom; \ diff --git a/js/src/xpconnect/src/xpcstring.cpp b/js/src/xpconnect/src/xpcstring.cpp index ef8a83511839..b421d4605c30 100644 --- a/js/src/xpconnect/src/xpcstring.cpp +++ b/js/src/xpconnect/src/xpcstring.cpp @@ -97,7 +97,7 @@ XPCStringConvert::ReadableToJSString(JSContext *cx, } str = JS_NewExternalString(cx, - NS_REINTERPRET_CAST(jschar *, buf->Data()), + reinterpret_cast(buf->Data()), length, sDOMStringFinalizerIndex); if (str) @@ -107,14 +107,14 @@ XPCStringConvert::ReadableToJSString(JSContext *cx, { // blech, have to copy. - jschar *chars = NS_REINTERPRET_CAST(jschar *, - JS_malloc(cx, (length + 1) * + jschar *chars = reinterpret_cast + (JS_malloc(cx, (length + 1) * sizeof(jschar))); if (!chars) return NULL; if (length && !CopyUnicodeTo(readable, 0, - NS_REINTERPRET_CAST(PRUnichar *, chars), + reinterpret_cast(chars), length)) { JS_free(cx, chars); @@ -135,7 +135,7 @@ XPCReadableJSStringWrapper * XPCStringConvert::JSStringToReadable(JSString *str) { return new - XPCReadableJSStringWrapper(NS_REINTERPRET_CAST(PRUnichar *, - JS_GetStringChars(str)), + XPCReadableJSStringWrapper(reinterpret_cast + (JS_GetStringChars(str)), JS_GetStringLength(str)); } diff --git a/js/src/xpconnect/src/xpcthreadcontext.cpp b/js/src/xpconnect/src/xpcthreadcontext.cpp index 02dc332db383..fed607f79aec 100644 --- a/js/src/xpconnect/src/xpcthreadcontext.cpp +++ b/js/src/xpconnect/src/xpcthreadcontext.cpp @@ -155,7 +155,7 @@ SafeFinalize(JSContext* cx, JSObject* obj) { #ifndef XPCONNECT_STANDALONE nsIScriptObjectPrincipal* sop = - NS_STATIC_CAST(nsIScriptObjectPrincipal*, JS_GetPrivate(cx, obj)); + static_cast(JS_GetPrivate(cx, obj)); NS_IF_RELEASE(sop); #endif } @@ -199,7 +199,7 @@ XPCJSContextStack::GetSafeJSContext(JSContext * *aSafeJSContext) XPCJSRuntime* xpcrt; nsXPConnect* xpc = nsXPConnect::GetXPConnect(); - nsCOMPtr xpcholder(NS_STATIC_CAST(nsIXPConnect*, xpc)); + nsCOMPtr xpcholder(static_cast(xpc)); if(xpc && (xpcrt = xpc->GetRuntime()) && (rt = xpcrt->GetJSRuntime())) { @@ -667,7 +667,7 @@ nsXPCJSContextStackIterator::Reset(nsIJSContextStack *aStack) { // XXX This is pretty ugly. nsXPCThreadJSContextStackImpl *impl = - NS_STATIC_CAST(nsXPCThreadJSContextStackImpl*, aStack); + static_cast(aStack); XPCJSContextStack *stack = impl->GetStackForCurrentThread(); if(!stack) return NS_ERROR_FAILURE; diff --git a/js/src/xpconnect/src/xpcthrower.cpp b/js/src/xpconnect/src/xpcthrower.cpp index a33163dc1545..f807dcc40a35 100644 --- a/js/src/xpconnect/src/xpcthrower.cpp +++ b/js/src/xpconnect/src/xpcthrower.cpp @@ -187,8 +187,7 @@ XPCThrower::Verbosify(XPCCallContext& ccx, if(ccx.GetIDispatchMember()) { XPCDispInterface::Member * member = - NS_REINTERPRET_CAST(XPCDispInterface::Member*, - ccx.GetIDispatchMember()); + reinterpret_cast(ccx.GetIDispatchMember()); if(member && JSVAL_IS_STRING(member->GetName())) { name = JS_GetStringBytes(JSVAL_TO_STRING(member->GetName())); @@ -305,13 +304,13 @@ XPCThrower::ThrowCOMError(JSContext* cx, unsigned long COMErrorCode, msg = format; if(exception) { - msg += NS_STATIC_CAST(const char *, - _bstr_t(exception->bstrSource, false)); + msg += static_cast + (_bstr_t(exception->bstrSource, false)); msg += " : "; - msg.AppendInt(NS_STATIC_CAST(PRUint32, COMErrorCode)); + msg.AppendInt(static_cast(COMErrorCode)); msg += " - "; - msg += NS_STATIC_CAST(const char *, - _bstr_t(exception->bstrDescription, false)); + msg += static_cast + (_bstr_t(exception->bstrDescription, false)); } else { @@ -324,23 +323,23 @@ XPCThrower::ThrowCOMError(JSContext* cx, unsigned long COMErrorCode, if(SUCCEEDED(pError->GetSource(&bstrSource)) && bstrSource) { _bstr_t src(bstrSource, false); - msg += NS_STATIC_CAST(const char *,src); + msg += static_cast(src); msg += " : "; } - msg.AppendInt(NS_STATIC_CAST(PRUint32, COMErrorCode), 16); + msg.AppendInt(static_cast(COMErrorCode), 16); BSTR bstrDesc = NULL; if(SUCCEEDED(pError->GetDescription(&bstrDesc)) && bstrDesc) { msg += " - "; _bstr_t desc(bstrDesc, false); - msg += NS_STATIC_CAST(const char *,desc); + msg += static_cast(desc); } } else { // No error object, so just report the result msg += "COM Error Result = "; - msg.AppendInt(NS_STATIC_CAST(PRUint32, COMErrorCode), 16); + msg.AppendInt(static_cast(COMErrorCode), 16); } } diff --git a/js/src/xpconnect/src/xpcvariant.cpp b/js/src/xpconnect/src/xpcvariant.cpp index 1335b28ee68e..69455c2ee3a2 100644 --- a/js/src/xpconnect/src/xpcvariant.cpp +++ b/js/src/xpconnect/src/xpcvariant.cpp @@ -298,7 +298,7 @@ JSBool XPCVariant::InitializeData(XPCCallContext& ccx) "Why do we already have data?"); mData.u.wstr.mWStringValue = - NS_REINTERPRET_CAST(PRUnichar*, JS_GetStringChars(str)); + reinterpret_cast(JS_GetStringChars(str)); // Use C-style cast, because reinterpret cast from size_t to // PRUint32 is not valid on some platforms. mData.u.wstr.mWStringLength = (PRUint32)JS_GetStringLength(str); diff --git a/js/src/xpconnect/src/xpcwrappedjs.cpp b/js/src/xpconnect/src/xpcwrappedjs.cpp index 7a42b649f1f1..32cd5edcf712 100644 --- a/js/src/xpconnect/src/xpcwrappedjs.cpp +++ b/js/src/xpconnect/src/xpcwrappedjs.cpp @@ -69,12 +69,12 @@ NS_CYCLE_COLLECTION_CLASSNAME(nsXPCWrappedJS)::Traverse // Put the nsCOMPtr in a local scope, to avoid messing up the refcount // below. nsCOMPtr owner = - do_QueryInterface(NS_STATIC_CAST(nsISupports*, p), &rv); + do_QueryInterface(static_cast(p), &rv); if (NS_FAILED(rv)) return rv; base = owner.get(); - tmp = NS_STATIC_CAST(nsXPCWrappedJS*, base); + tmp = static_cast(base); NS_ASSERTION(tmp->mRefCnt.get() > 2, "How can this be, no one else holds a strong ref?"); } @@ -107,7 +107,7 @@ NS_CYCLE_COLLECTION_CLASSNAME(nsXPCWrappedJS)::Traverse cb.NoteXPCOMChild(tmp->GetAggregatedNativeObject()); else // Non-root wrappers keep their root alive. - cb.NoteXPCOMChild(NS_STATIC_CAST(nsIXPConnectWrappedJS*, root)); + cb.NoteXPCOMChild(static_cast(root)); return NS_OK; } @@ -138,7 +138,7 @@ nsXPCWrappedJS::AggregatedQueryInterface(REFNSIID aIID, void** aInstancePtr) if(aIID.Equals(NS_GET_IID(nsIXPConnectWrappedJS))) { NS_ADDREF(this); - *aInstancePtr = (void*) NS_STATIC_CAST(nsIXPConnectWrappedJS*,this); + *aInstancePtr = (void*) static_cast(this); return NS_OK; } @@ -175,7 +175,7 @@ nsXPCWrappedJS::QueryInterface(REFNSIID aIID, void** aInstancePtr) if(aIID.Equals(NS_GET_IID(nsIXPConnectWrappedJS))) { NS_ADDREF(this); - *aInstancePtr = (void*) NS_STATIC_CAST(nsIXPConnectWrappedJS*,this); + *aInstancePtr = (void*) static_cast(this); return NS_OK; } @@ -272,8 +272,8 @@ nsXPCWrappedJS::TraceJS(JSTracer* trc) void nsXPCWrappedJS::PrintTraceName(JSTracer* trc, char *buf, size_t bufsize) { - const nsXPCWrappedJS* self = NS_STATIC_CAST(const nsXPCWrappedJS*, - trc->debugPrintArg); + const nsXPCWrappedJS* self = static_cast + (trc->debugPrintArg); JS_snprintf(buf, bufsize, "nsXPCWrappedJS[%s,0x%p].mJSObj", self->GetClass()->GetInterfaceName(), self); } diff --git a/js/src/xpconnect/src/xpcwrappedjsclass.cpp b/js/src/xpconnect/src/xpcwrappedjsclass.cpp index 849d79f290c3..8c032ff1fbf2 100644 --- a/js/src/xpconnect/src/xpcwrappedjsclass.cpp +++ b/js/src/xpconnect/src/xpcwrappedjsclass.cpp @@ -100,8 +100,8 @@ AutoScriptEvaluate::~AutoScriptEvaluate() if (JS_GetOptions(mJSContext) & JSOPTION_PRIVATE_IS_NSISUPPORTS) { nsCOMPtr scriptNotify = - do_QueryInterface(NS_STATIC_CAST(nsISupports*, - JS_GetContextPrivate(mJSContext))); + do_QueryInterface(static_cast + (JS_GetContextPrivate(mJSContext))); if(scriptNotify) scriptNotify->ScriptExecuted(); } @@ -508,7 +508,7 @@ nsXPCWrappedJSClass::DelegatedQueryInterface(nsXPCWrappedJS* self, if(aIID.Equals(NS_GET_IID(nsIXPConnectJSObjectHolder))) { NS_ADDREF(self); - *aInstancePtr = (void*) NS_STATIC_CAST(nsIXPConnectJSObjectHolder*,self); + *aInstancePtr = (void*) static_cast(self); return NS_OK; } @@ -540,7 +540,7 @@ nsXPCWrappedJSClass::DelegatedQueryInterface(nsXPCWrappedJS* self, } NS_ADDREF(root); - *aInstancePtr = (void*) NS_STATIC_CAST(nsIPropertyBag*,root); + *aInstancePtr = (void*) static_cast(root); return NS_OK; } @@ -567,7 +567,7 @@ nsXPCWrappedJSClass::DelegatedQueryInterface(nsXPCWrappedJS* self, } NS_ADDREF(root); - *aInstancePtr = (void*) NS_STATIC_CAST(nsISupportsWeakReference*,root); + *aInstancePtr = (void*) static_cast(root); return NS_OK; } @@ -1177,8 +1177,8 @@ nsXPCWrappedJSClass::CallMethod(nsXPCWrappedJS* wrapper, uint16 methodIndex, { if(!newWrapperIID) newWrapperIID = - NS_CONST_CAST(nsIID*, - &NS_GET_IID(nsISupports)); + const_cast + (&NS_GET_IID(nsISupports)); nsCOMPtr holder; JSBool ok = XPCConvert::NativeInterface2JSObject(ccx, diff --git a/js/src/xpconnect/src/xpcwrappednative.cpp b/js/src/xpconnect/src/xpcwrappednative.cpp index 7f1a63ab8029..fddda492a5ab 100644 --- a/js/src/xpconnect/src/xpcwrappednative.cpp +++ b/js/src/xpconnect/src/xpcwrappednative.cpp @@ -53,7 +53,7 @@ NS_IMETHODIMP NS_CYCLE_COLLECTION_CLASSNAME(XPCWrappedNative)::Traverse(void *p, nsCycleCollectionTraversalCallback &cb) { - XPCWrappedNative *tmp = NS_STATIC_CAST(XPCWrappedNative*, p); + XPCWrappedNative *tmp = static_cast(p); if(!tmp->IsValid()) return NS_OK; @@ -346,8 +346,8 @@ XPCWrappedNative::GetNewOrUsed(XPCCallContext& ccx, // we'll provide a default one if(isIDispatch && !info) { - info = dont_AddRef(NS_STATIC_CAST(nsIClassInfo*, - XPCIDispatchClassInfo::GetSingleton())); + info = dont_AddRef(static_cast + (XPCIDispatchClassInfo::GetSingleton())); } #endif @@ -1022,7 +1022,7 @@ XPCWrappedNative::SystemIsBeingShutDown(JSContext* cx) #ifdef DEBUG_xpc_hacker { printf("Removing root for still-live XPCWrappedNative %p wrapping:\n", - NS_STATIC_CAST(void*, this)); + static_cast(this)); for(PRUint16 i = 0, i_end = mSet->GetInterfaceCount(); i < i_end; ++i) { nsXPIDLCString name; diff --git a/js/src/xpconnect/tests/TestXPC.cpp b/js/src/xpconnect/tests/TestXPC.cpp index ac69642ab9b2..3d540276b518 100644 --- a/js/src/xpconnect/tests/TestXPC.cpp +++ b/js/src/xpconnect/tests/TestXPC.cpp @@ -467,7 +467,7 @@ TestArgFormatter(JSContext* jscontext, JSObject* glob, nsIXPConnect* xpc) a_in, &NS_GET_IID(nsITestXPCFoo2), b_in.get(), c_in.get(), - NS_STATIC_CAST(const nsAString*, &d_in), + static_cast(&d_in), e_in); if(!argv) @@ -478,9 +478,9 @@ TestArgFormatter(JSContext* jscontext, JSObject* glob, nsIXPConnect* xpc) if(!JS_ConvertArguments(jscontext, 5, argv, "s %ip %iv %is s", &a_out, - NS_STATIC_CAST(nsISupports**, getter_AddRefs(b_out)), - NS_STATIC_CAST(nsIVariant**, getter_AddRefs(c_out)), - NS_STATIC_CAST(nsAString*, &d_out), + static_cast(getter_AddRefs(b_out)), + static_cast(getter_AddRefs(c_out)), + static_cast(&d_out), &e_out)) { printf(" could not convert from JS to native -- FAILED!\n"); diff --git a/js/src/xpconnect/tests/components/xpctest_child.cpp b/js/src/xpconnect/tests/components/xpctest_child.cpp index 40715e78c67b..035c24285dc1 100644 --- a/js/src/xpconnect/tests/components/xpctest_child.cpp +++ b/js/src/xpconnect/tests/components/xpctest_child.cpp @@ -163,7 +163,7 @@ xpctestChild::QueryInterface(REFNSIID iid, void** result) if (iid.Equals(NS_GET_IID(nsIXPCTestChild)) || iid.Equals(NS_GET_IID(nsIXPCTestParent)) || iid.Equals(NS_GET_IID(nsISupports))) { - *result = NS_STATIC_CAST(nsIXPCTestChild*, this); + *result = static_cast(this); NS_ADDREF(this); return NS_OK; } diff --git a/js/src/xpconnect/tests/components/xpctest_echo.cpp b/js/src/xpconnect/tests/components/xpctest_echo.cpp index 147bef3a9455..15e4aba49836 100644 --- a/js/src/xpconnect/tests/components/xpctest_echo.cpp +++ b/js/src/xpconnect/tests/components/xpctest_echo.cpp @@ -447,7 +447,7 @@ xpctestEcho::PrintArgTypes(void) nsCOMPtr callee; if(NS_FAILED(cc->GetCallee(getter_AddRefs(callee))) || - callee != NS_STATIC_CAST(nsIEcho*, this)) + callee != static_cast(this)) return NS_ERROR_FAILURE; PRUint32 argc; @@ -503,7 +503,7 @@ xpctestEcho::ThrowArg(void) nsCOMPtr callee; if(NS_FAILED(cc->GetCallee(getter_AddRefs(callee))) || - callee != NS_STATIC_CAST(nsIEcho*, this)) + callee != static_cast(this)) return NS_ERROR_FAILURE; PRUint32 argc; @@ -537,7 +537,7 @@ xpctestEcho::CallReceiverSometimeLater(void) timer = do_CreateInstance("@mozilla.org/timer;1", &rv); if(NS_FAILED(rv)) return NS_ERROR_FAILURE; - timer->InitWithCallback(NS_STATIC_CAST(nsITimerCallback*,this), 2000, + timer->InitWithCallback(static_cast(this), 2000, nsITimer::TYPE_ONE_SHOT); return NS_OK; #else diff --git a/js/src/xpconnect/tests/components/xpctest_noisy.cpp b/js/src/xpconnect/tests/components/xpctest_noisy.cpp index 02c4de91fa3e..10f50ca008eb 100644 --- a/js/src/xpconnect/tests/components/xpctest_noisy.cpp +++ b/js/src/xpconnect/tests/components/xpctest_noisy.cpp @@ -91,7 +91,7 @@ xpctestNoisy::QueryInterface(REFNSIID iid, void** result) if (iid.Equals(NS_GET_IID(nsIXPCTestNoisy)) || iid.Equals(NS_GET_IID(nsISupports))) { - *result = NS_STATIC_CAST(nsIXPCTestNoisy*, this); + *result = static_cast(this); printf("Noisy %d - QueryInterface called and succeeding\n", mID); NS_ADDREF(this); return NS_OK; diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index 7b6db481265e..2e63a2660115 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -417,7 +417,7 @@ SVG_TestLanguage(const nsSubstring& lstr, const nsSubstring& prefs) } const nsDefaultStringComparator defaultComparator; const nsStringComparator& comparator = - NS_STATIC_CAST(const nsStringComparator&, defaultComparator); + static_cast(defaultComparator); if (nsStyleUtil::DashMatchCompare(Substring(lstr, vbegin, vend-vbegin), Substring(prefs, gbegin, gend-gbegin), comparator)) { @@ -460,7 +460,7 @@ GetSpecialSibling(nsFrameManager* aFrameManager, nsIFrame* aFrame, nsIFrame** aR void* value = aFrame->GetProperty(nsGkAtoms::IBSplitSpecialSibling); - *aResult = NS_STATIC_CAST(nsIFrame*, value); + *aResult = static_cast(value); } static nsIFrame* @@ -616,8 +616,8 @@ DoCleanupFrameReferences(nsFrameManager* aFrameManager, nsIContent* content = aFrameIn->GetContent(); if (aFrameIn->GetType() == nsGkAtoms::placeholderFrame) { - nsPlaceholderFrame* placeholder = NS_STATIC_CAST(nsPlaceholderFrame*, - aFrameIn); + nsPlaceholderFrame* placeholder = static_cast + (aFrameIn); // if the frame is a placeholder use the out of flow frame aFrameIn = nsPlaceholderFrame::GetRealFrameForPlaceholder(placeholder); @@ -880,14 +880,14 @@ nsPseudoFrameData::Dump() { nsIFrame* main = nsnull; nsIFrame* second = nsnull; - printf(" %p\n", NS_STATIC_CAST(void*, mFrame)); + printf(" %p\n", static_cast(mFrame)); main = mChildList.childList; second = mChildList2.childList; while (main || second) { - printf(" %p %p\n", NS_STATIC_CAST(void*, main), - NS_STATIC_CAST(void*, second)); + printf(" %p %p\n", static_cast(main), + static_cast(second)); if (main) main = main->GetNextSibling(); if (second) @@ -2668,7 +2668,7 @@ ProcessPseudoFrames(nsFrameConstructorState& aState, #ifdef DEBUG if (gTablePseudoFrame) { printf("*** ProcessPseudoFrames complete leave, highestframe:%p***\n", - NS_STATIC_CAST(void*, highestFrame)); + static_cast(highestFrame)); aState.mPseudoFrames.Dump(); } #endif @@ -2708,7 +2708,7 @@ ProcessPseudoFrames(nsFrameConstructorState& aState, #ifdef DEBUG if (gTablePseudoFrame) { printf("*** ProcessPseudoFrames limited leave:%p***\n", - NS_STATIC_CAST(void*, highestFrame)); + static_cast(highestFrame)); aState.mPseudoFrames.Dump(); } #endif @@ -4651,7 +4651,7 @@ nsCSSFrameConstructor::CreatePlaceholderFrameFor(nsIPresShell* aPresShell, // Add mapping from absolutely positioned frame to its placeholder frame aFrameManager->RegisterPlaceholderFrame(placeholderFrame); - *aPlaceholderFrame = NS_STATIC_CAST(nsIFrame*, placeholderFrame); + *aPlaceholderFrame = static_cast(placeholderFrame); return NS_OK; } @@ -8257,7 +8257,7 @@ nsCSSFrameConstructor::ContentAppended(nsIContent* aContainer, #ifdef DEBUG if (gNoisyContentUpdates) { printf("nsCSSFrameConstructor::ContentAppended container=%p index=%d\n", - NS_STATIC_CAST(void*, aContainer), aNewIndexInContainer); + static_cast(aContainer), aNewIndexInContainer); if (gReallyNoisyContentUpdates && aContainer) { aContainer->List(stdout, 0); } @@ -8746,7 +8746,7 @@ PRBool NotifyListBoxBody(nsPresContext* aPresContext, if (listBoxObject) { nsIListBoxObject* listboxBody = listBoxObject->GetListBoxBody(); if (listboxBody) { - nsListBoxBodyFrame *listBoxBodyFrame = NS_STATIC_CAST(nsListBoxBodyFrame*, listboxBody); + nsListBoxBodyFrame *listBoxBodyFrame = static_cast(listboxBody); if (aOperation == CONTENT_REMOVED) { // Except if we have an aChildFrame and its parent is not the right // thing, then we don't do this. Pseudo frames are so much fun.... @@ -8793,8 +8793,8 @@ nsCSSFrameConstructor::ContentInserted(nsIContent* aContainer, #ifdef DEBUG if (gNoisyContentUpdates) { printf("nsCSSFrameConstructor::ContentInserted container=%p child=%p index=%d\n", - NS_STATIC_CAST(void*, aContainer), - NS_STATIC_CAST(void*, aChild), + static_cast(aContainer), + static_cast(aChild), aIndexInContainer); if (gReallyNoisyContentUpdates) { (aContainer ? aContainer : aChild)->List(stdout, 0); @@ -9046,8 +9046,8 @@ nsCSSFrameConstructor::ContentInserted(nsIContent* aContainer, nsFrame::ListTag(stdout, parentFrame); printf(" is special inline\n"); printf(" ==> blockContent=%p, parentContainer=%p\n", - NS_STATIC_CAST(void*, blockContent), - NS_STATIC_CAST(void*, parentContainer)); + static_cast(blockContent), + static_cast(parentContainer)); } #endif @@ -9354,7 +9354,7 @@ DeletingFrameSubtree(nsFrameManager* aFrameManager, // Now destroy any out-of-flow frames that have been enqueued for // destruction. for (PRInt32 i = destroyQueue.Count() - 1; i >= 0; --i) { - nsIFrame* outOfFlowFrame = NS_STATIC_CAST(nsIFrame*, destroyQueue[i]); + nsIFrame* outOfFlowFrame = static_cast(destroyQueue[i]); // Ask the out-of-flow's parent to delete the out-of-flow // frame from the right list. @@ -9396,8 +9396,8 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer, #ifdef DEBUG if (gNoisyContentUpdates) { printf("nsCSSFrameConstructor::ContentRemoved container=%p child=%p index=%d\n", - NS_STATIC_CAST(void*, aContainer), - NS_STATIC_CAST(void*, aChild), + static_cast(aContainer), + static_cast(aChild), aIndexInContainer); if (gReallyNoisyContentUpdates) { aContainer->List(stdout, 0); @@ -10298,8 +10298,8 @@ nsCSSFrameConstructor::CreateContinuingTableFrame(nsIPresShell* aPresShell, GetAbsoluteContainingBlock(newFrame), nsnull); - headerFooterFrame = NS_STATIC_CAST(nsTableRowGroupFrame*, - NS_NewTableRowGroupFrame(aPresShell, rowGroupFrame->GetStyleContext())); + headerFooterFrame = static_cast + (NS_NewTableRowGroupFrame(aPresShell, rowGroupFrame->GetStyleContext())); nsIContent* headerFooter = rowGroupFrame->GetContent(); headerFooterFrame->Init(headerFooter, newFrame, nsnull); ProcessChildren(state, headerFooter, headerFooterFrame, @@ -12725,8 +12725,8 @@ nsCSSFrameConstructor::WipeContainingBlock(nsFrameConstructorState& aState, #ifdef DEBUG if (gNoisyContentUpdates) { printf("nsCSSFrameConstructor::WipeContainingBlock: blockContent=%p parentContainer=%p\n", - NS_STATIC_CAST(void*, blockContent), - NS_STATIC_CAST(void*, parentContainer)); + static_cast(blockContent), + static_cast(parentContainer)); } #endif if (parentContainer) { @@ -12749,7 +12749,7 @@ nsCSSFrameConstructor::ReframeContainingBlock(nsIFrame* aFrame) // very poorly if (gNoisyContentUpdates) { printf("nsCSSFrameConstructor::ReframeContainingBlock frame=%p\n", - NS_STATIC_CAST(void*, aFrame)); + static_cast(aFrame)); } #endif @@ -12783,8 +12783,8 @@ nsCSSFrameConstructor::ReframeContainingBlock(nsIFrame* aFrame) #ifdef DEBUG if (gNoisyContentUpdates) { printf(" ==> blockContent=%p, parentContainer=%p\n", - NS_STATIC_CAST(void*, blockContent), - NS_STATIC_CAST(void*, parentContainer)); + static_cast(blockContent), + static_cast(parentContainer)); } #endif return ReinsertContent(parentContainer, blockContent); @@ -12814,7 +12814,7 @@ nsresult nsCSSFrameConstructor::RemoveFixedItems(const nsFrameConstructorState& nsGkAtoms::placeholderFrame, "Wrong type"); aState.mFrameManager->UnregisterPlaceholderFrame( - NS_STATIC_CAST(nsPlaceholderFrame*, placeholderFrame)); + static_cast(placeholderFrame)); nsIFrame* placeholderParent = placeholderFrame->GetParent(); ::DeletingFrameSubtree(aState.mFrameManager, placeholderFrame); rv = aState.mFrameManager->RemoveFrame(placeholderParent, nsnull, @@ -12846,11 +12846,11 @@ CollectRestyles(nsISupports* aContent, void* aRestyleArrayPtr) { nsCSSFrameConstructor::RestyleEnumerateData** restyleArrayPtr = - NS_STATIC_CAST(nsCSSFrameConstructor::RestyleEnumerateData**, - aRestyleArrayPtr); + static_cast + (aRestyleArrayPtr); nsCSSFrameConstructor::RestyleEnumerateData* currentRestyle = *restyleArrayPtr; - currentRestyle->mContent = NS_STATIC_CAST(nsIContent*, aContent); + currentRestyle->mContent = static_cast(aContent); currentRestyle->mRestyleHint = aData.mRestyleHint; currentRestyle->mChangeHint = aData.mChangeHint; @@ -13017,7 +13017,7 @@ nsCSSFrameConstructor::LazyGenerateChildrenEvent::Run() // it is possible that the frame is different than the one that requested // the lazy generation, but as long as it's a popup frame that hasn't // generated its children yet, that's OK. - nsMenuPopupFrame* menuPopupFrame = NS_STATIC_CAST(nsMenuPopupFrame *, frame); + nsMenuPopupFrame* menuPopupFrame = static_cast(frame); if (menuPopupFrame->HasGeneratedChildren()) return NS_OK; diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp index dd105adbfe6c..ba600bb5422e 100644 --- a/layout/base/nsCaret.cpp +++ b/layout/base/nsCaret.cpp @@ -1128,7 +1128,7 @@ void nsCaret::InvalidateRects(const nsRect &aRect, const nsRect &aHook, /* static */ void nsCaret::CaretBlinkCallback(nsITimer *aTimer, void *aClosure) { - nsCaret *theCaret = NS_REINTERPRET_CAST(nsCaret*, aClosure); + nsCaret *theCaret = reinterpret_cast(aClosure); if (!theCaret) return; theCaret->DrawCaret(PR_TRUE); diff --git a/layout/base/nsCounterManager.cpp b/layout/base/nsCounterManager.cpp index d257b5b8b149..12b1ebad8022 100644 --- a/layout/base/nsCounterManager.cpp +++ b/layout/base/nsCounterManager.cpp @@ -72,7 +72,7 @@ nsCounterUseNode::GetText(nsString& aResult) aResult.Truncate(); nsAutoVoidArray stack; - stack.AppendElement(NS_STATIC_CAST(nsCounterNode*, this)); + stack.AppendElement(static_cast(this)); if (mAllCounters && mScopeStart) for (nsCounterNode *n = mScopeStart; n->mScopePrev; n = n->mScopeStart) @@ -84,7 +84,7 @@ nsCounterUseNode::GetText(nsString& aResult) separator = mCounterStyle->Item(1).GetStringBufferValue(); for (PRInt32 i = stack.Count() - 1;; --i) { - nsCounterNode *n = NS_STATIC_CAST(nsCounterNode*, stack[i]); + nsCounterNode *n = static_cast(stack[i]); nsBulletFrame::AppendCounterText(style, n->mValueAfter, aResult); if (i == 0) break; @@ -295,7 +295,7 @@ struct DestroyNodesData { PR_STATIC_CALLBACK(PLDHashOperator) DestroyNodesInList(const nsAString& aKey, nsCounterList* aList, void* aClosure) { - DestroyNodesData *data = NS_STATIC_CAST(DestroyNodesData*, aClosure); + DestroyNodesData *data = static_cast(aClosure); if (aList->DestroyNodesFor(data->mFrame)) { data->mDestroyedAny = PR_TRUE; aList->SetDirty(); diff --git a/layout/base/nsCounterManager.h b/layout/base/nsCounterManager.h index 3b7773a8863b..b46e45377090 100644 --- a/layout/base/nsCounterManager.h +++ b/layout/base/nsCounterManager.h @@ -167,13 +167,13 @@ struct nsCounterChangeNode : public nsCounterNode { inline nsCounterUseNode* nsCounterNode::UseNode() { NS_ASSERTION(mType == USE, "wrong type"); - return NS_STATIC_CAST(nsCounterUseNode*, this); + return static_cast(this); } inline nsCounterChangeNode* nsCounterNode::ChangeNode() { NS_ASSERTION(mType == INCREMENT || mType == RESET, "wrong type"); - return NS_STATIC_CAST(nsCounterChangeNode*, this); + return static_cast(this); } inline void nsCounterNode::Calc(nsCounterList* aList) @@ -200,14 +200,14 @@ public: } nsCounterNode* First() { - return NS_STATIC_CAST(nsCounterNode*, mFirstNode); + return static_cast(mFirstNode); } static nsCounterNode* Next(nsCounterNode* aNode) { - return NS_STATIC_CAST(nsCounterNode*, nsGenConList::Next(aNode)); + return static_cast(nsGenConList::Next(aNode)); } static nsCounterNode* Prev(nsCounterNode* aNode) { - return NS_STATIC_CAST(nsCounterNode*, nsGenConList::Prev(aNode)); + return static_cast(nsGenConList::Prev(aNode)); } static PRInt32 ValueBefore(nsCounterNode* aNode) { diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp index b1edff68e0ca..35b140f12830 100644 --- a/layout/base/nsDisplayList.cpp +++ b/layout/base/nsDisplayList.cpp @@ -86,7 +86,7 @@ DestroyRectFunc(void* aFrame, void* aPropertyValue, void* aDtorData) { - delete NS_STATIC_CAST(nsRect*, aPropertyValue); + delete static_cast(aPropertyValue); } static void MarkFrameForDisplay(nsIFrame* aFrame, nsIFrame* aStopAtFrame) { @@ -268,9 +268,9 @@ nsDisplayList::OptimizeVisibility(nsDisplayListBuilder* aBuilder, FlattenTo(&elements); for (PRInt32 i = elements.Count() - 1; i >= 0; --i) { - nsDisplayItem* item = NS_STATIC_CAST(nsDisplayItem*, elements.ElementAt(i)); + nsDisplayItem* item = static_cast(elements.ElementAt(i)); nsDisplayItem* belowItem = i < 1 ? nsnull : - NS_STATIC_CAST(nsDisplayItem*, elements.ElementAt(i - 1)); + static_cast(elements.ElementAt(i - 1)); if (belowItem && item->TryMerge(aBuilder, belowItem)) { belowItem->~nsDisplayItem(); @@ -336,7 +336,7 @@ nsIFrame* nsDisplayList::HitTest(nsDisplayListBuilder* aBuilder, nsPoint aPt) co elements.AppendElement(item); } for (PRInt32 i = elements.Count() - 1; i >= 0; --i) { - item = NS_STATIC_CAST(nsDisplayItem*, elements.ElementAt(i)); + item = static_cast(elements.ElementAt(i)); if (item->GetBounds(aBuilder).Contains(aPt)) { nsIFrame* f = item->HitTest(aBuilder, aPt); // Handle the XUL 'mousethrough' feature. @@ -395,7 +395,7 @@ static PRBool IsContentLEQ(nsDisplayItem* aItem1, nsDisplayItem* aItem2, return nsLayoutUtils::CompareTreePosition( aItem1->GetUnderlyingFrame()->GetContent(), aItem2->GetUnderlyingFrame()->GetContent(), - NS_STATIC_CAST(nsIContent*, aClosure)) <= 0; + static_cast(aClosure)) <= 0; } static PRBool IsZOrderLEQ(nsDisplayItem* aItem1, nsDisplayItem* aItem2, @@ -432,7 +432,7 @@ void nsDisplayList::ExplodeAnonymousChildLists(nsDisplayListBuilder* aBuilder) { list->ExplodeAnonymousChildLists(aBuilder); nsDisplayItem* j; while ((j = list->RemoveBottom()) != nsnull) { - tmp.AppendToTop(NS_STATIC_CAST(nsDisplayWrapList*, i)-> + tmp.AppendToTop(static_cast(i)-> WrapWithClone(aBuilder, j)); } i->~nsDisplayItem(); @@ -827,7 +827,7 @@ PRBool nsDisplayOpacity::TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* // aItem->GetUnderlyingFrame() returns non-null because it's nsDisplayOpacity if (aItem->GetUnderlyingFrame()->GetContent() != mFrame->GetContent()) return PR_FALSE; - mList.AppendToBottom(&NS_STATIC_CAST(nsDisplayOpacity*, aItem)->mList); + mList.AppendToBottom(&static_cast(aItem)->mList); return PR_TRUE; } @@ -881,7 +881,7 @@ PRBool nsDisplayClip::TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) { if (aItem->GetType() != TYPE_CLIP) return PR_FALSE; - nsDisplayClip* other = NS_STATIC_CAST(nsDisplayClip*, aItem); + nsDisplayClip* other = static_cast(aItem); if (other->mClip != mClip) return PR_FALSE; mList.AppendToBottom(&other->mList); diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h index e8fe8090f348..b4d3e4ec0304 100644 --- a/layout/base/nsDisplayList.h +++ b/layout/base/nsDisplayList.h @@ -580,7 +580,7 @@ public: * @return the item at the top of the list, or null if the list is empty */ nsDisplayItem* GetTop() const { - return mTop != &mSentinel ? NS_STATIC_CAST(nsDisplayItem*, mTop) : nsnull; + return mTop != &mSentinel ? static_cast(mTop) : nsnull; } /** * @return the item at the bottom of the list, or null if the list is empty diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp index 8f8f8866da7d..ca677c76152f 100644 --- a/layout/base/nsDocumentViewer.cpp +++ b/layout/base/nsDocumentViewer.cpp @@ -2006,7 +2006,7 @@ DocumentViewerImpl::RequestWindowClose(PRBool* aCanClose) PR_STATIC_CALLBACK(PRBool) AppendAgentSheet(nsIStyleSheet *aSheet, void *aData) { - nsStyleSet *styleSet = NS_STATIC_CAST(nsStyleSet*, aData); + nsStyleSet *styleSet = static_cast(aData); styleSet->AppendStyleSheet(nsStyleSet::eAgentSheet, aSheet); return PR_TRUE; } @@ -2014,7 +2014,7 @@ AppendAgentSheet(nsIStyleSheet *aSheet, void *aData) PR_STATIC_CALLBACK(PRBool) PrependUserSheet(nsIStyleSheet *aSheet, void *aData) { - nsStyleSet *styleSet = NS_STATIC_CAST(nsStyleSet*, aData); + nsStyleSet *styleSet = static_cast(aData); styleSet->PrependStyleSheet(nsStyleSet::eUserSheet, aSheet); return PR_TRUE; } @@ -2574,7 +2574,7 @@ DocumentViewerImpl::GetTextZoom(float* aTextZoom) static void SetChildAuthorStyleDisabled(nsIMarkupDocumentViewer* aChild, void* aClosure) { - PRBool styleDisabled = *NS_STATIC_CAST(PRBool*, aClosure); + PRBool styleDisabled = *static_cast(aClosure); aChild->SetAuthorStyleDisabled(styleDisabled); } @@ -2622,7 +2622,7 @@ DocumentViewerImpl::GetDefaultCharacterSet(nsACString& aDefaultCharacterSet) static void SetChildDefaultCharacterSet(nsIMarkupDocumentViewer* aChild, void* aClosure) { - const nsACString* charset = NS_STATIC_CAST(nsACString*, aClosure); + const nsACString* charset = static_cast(aClosure); aChild->SetDefaultCharacterSet(*charset); } @@ -2647,7 +2647,7 @@ NS_IMETHODIMP DocumentViewerImpl::GetForceCharacterSet(nsACString& aForceCharact static void SetChildForceCharacterSet(nsIMarkupDocumentViewer* aChild, void* aClosure) { - const nsACString* charset = NS_STATIC_CAST(nsACString*, aClosure); + const nsACString* charset = static_cast(aClosure); aChild->SetForceCharacterSet(*charset); } @@ -2695,7 +2695,7 @@ NS_IMETHODIMP DocumentViewerImpl::GetPrevDocCharacterSet(nsACString& aPrevDocCha static void SetChildPrevDocCharacterSet(nsIMarkupDocumentViewer* aChild, void* aClosure) { - const nsACString* charset = NS_STATIC_CAST(nsACString*, aClosure); + const nsACString* charset = static_cast(aClosure); aChild->SetPrevDocCharacterSet(*charset); } @@ -2728,7 +2728,7 @@ DocumentViewerImpl::SetHintCharacterSetSource(PRInt32 aHintCharacterSetSource) static void SetChildHintCharacterSet(nsIMarkupDocumentViewer* aChild, void* aClosure) { - const nsACString* charset = NS_STATIC_CAST(nsACString*, aClosure); + const nsACString* charset = static_cast(aClosure); aChild->SetHintCharacterSet(*charset); } diff --git a/layout/base/nsFrameManager.cpp b/layout/base/nsFrameManager.cpp index 620208c91fde..6360130b4e0d 100644 --- a/layout/base/nsFrameManager.cpp +++ b/layout/base/nsFrameManager.cpp @@ -128,7 +128,7 @@ PlaceholderMapMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr, const void *key) { const PlaceholderMapEntry *entry = - NS_STATIC_CAST(const PlaceholderMapEntry*, hdr); + static_cast(hdr); NS_ASSERTION(entry->placeholderFrame->GetOutOfFlowFrame() != (void*)0xdddddddd, "Dead placeholder in placeholder map"); @@ -165,7 +165,7 @@ PrimaryFrameMapMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr, const void *key) { const PrimaryFrameMapEntry *entry = - NS_STATIC_CAST(const PrimaryFrameMapEntry*, hdr); + static_cast(hdr); return entry->frame->GetContent() == key; } @@ -335,8 +335,8 @@ nsFrameManager::GetPrimaryFrameFor(nsIContent* aContent, } if (mPrimaryFrameMap.ops) { - PrimaryFrameMapEntry *entry = NS_STATIC_CAST(PrimaryFrameMapEntry*, - PL_DHashTableOperate(&mPrimaryFrameMap, aContent, PL_DHASH_LOOKUP)); + PrimaryFrameMapEntry *entry = static_cast + (PL_DHashTableOperate(&mPrimaryFrameMap, aContent, PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_BUSY(entry)) { return entry->frame; } @@ -374,8 +374,8 @@ nsFrameManager::GetPrimaryFrameFor(nsIContent* aContent, prevSibling->IsNodeOfType(nsINode::eCOMMENT) || prevSibling->IsNodeOfType(nsINode::ePROCESSING_INSTRUCTION))); if (prevSibling) { - entry = NS_STATIC_CAST(PrimaryFrameMapEntry*, - PL_DHashTableOperate(&mPrimaryFrameMap, prevSibling, + entry = static_cast + (PL_DHashTableOperate(&mPrimaryFrameMap, prevSibling, PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_BUSY(entry)) hint.mPrimaryFrameForPrevSibling = entry->frame; @@ -421,8 +421,8 @@ nsFrameManager::SetPrimaryFrameFor(nsIContent* aContent, } // Add a mapping to the hash table - PrimaryFrameMapEntry *entry = NS_STATIC_CAST(PrimaryFrameMapEntry*, - PL_DHashTableOperate(&mPrimaryFrameMap, aContent, PL_DHASH_ADD)); + PrimaryFrameMapEntry *entry = static_cast + (PL_DHashTableOperate(&mPrimaryFrameMap, aContent, PL_DHASH_ADD)); #ifdef DEBUG_dbaron if (entry->frame) { NS_WARNING("already have primary frame for content"); @@ -440,8 +440,8 @@ nsFrameManager::RemoveAsPrimaryFrame(nsIContent* aContent, { NS_PRECONDITION(aPrimaryFrame, "Must have a frame"); if (aContent && mPrimaryFrameMap.ops) { - PrimaryFrameMapEntry *entry = NS_STATIC_CAST(PrimaryFrameMapEntry*, - PL_DHashTableOperate(&mPrimaryFrameMap, aContent, PL_DHASH_LOOKUP)); + PrimaryFrameMapEntry *entry = static_cast + (PL_DHashTableOperate(&mPrimaryFrameMap, aContent, PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_BUSY(entry) && entry->frame == aPrimaryFrame) { // Don't use PL_DHashTableRawRemove, since we want the table to // shrink as needed. @@ -468,8 +468,8 @@ nsFrameManager::GetPlaceholderFrameFor(nsIFrame* aFrame) NS_PRECONDITION(aFrame, "null param unexpected"); if (mPlaceholderMap.ops) { - PlaceholderMapEntry *entry = NS_STATIC_CAST(PlaceholderMapEntry*, - PL_DHashTableOperate(NS_CONST_CAST(PLDHashTable*, &mPlaceholderMap), + PlaceholderMapEntry *entry = static_cast + (PL_DHashTableOperate(const_cast(&mPlaceholderMap), aFrame, PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_BUSY(entry)) { return entry->placeholderFrame; @@ -492,8 +492,7 @@ nsFrameManager::RegisterPlaceholderFrame(nsPlaceholderFrame* aPlaceholderFrame) return NS_ERROR_OUT_OF_MEMORY; } } - PlaceholderMapEntry *entry = NS_STATIC_CAST(PlaceholderMapEntry*, - PL_DHashTableOperate(&mPlaceholderMap, + PlaceholderMapEntry *entry = static_cast(PL_DHashTableOperate(&mPlaceholderMap, aPlaceholderFrame->GetOutOfFlowFrame(), PL_DHASH_ADD)); if (!entry) @@ -523,7 +522,7 @@ PR_STATIC_CALLBACK(PLDHashOperator) UnregisterPlaceholders(PLDHashTable* table, PLDHashEntryHdr* hdr, PRUint32 number, void* arg) { - PlaceholderMapEntry* entry = NS_STATIC_CAST(PlaceholderMapEntry*, hdr); + PlaceholderMapEntry* entry = static_cast(hdr); entry->placeholderFrame->SetOutOfFlowFrame(nsnull); return PL_DHASH_NEXT; } @@ -701,8 +700,8 @@ nsFrameManager::NotifyDestroyingFrame(nsIFrame* aFrame) // during frame destruction, since this problem keeps coming back to // bite us. We may want to remove the previous caller. if (mPrimaryFrameMap.ops) { - PrimaryFrameMapEntry *entry = NS_STATIC_CAST(PrimaryFrameMapEntry*, - PL_DHashTableOperate(&mPrimaryFrameMap, aFrame->GetContent(), PL_DHASH_LOOKUP)); + PrimaryFrameMapEntry *entry = static_cast + (PL_DHashTableOperate(&mPrimaryFrameMap, aFrame->GetContent(), PL_DHASH_LOOKUP)); if (PL_DHASH_ENTRY_IS_BUSY(entry) && entry->frame == aFrame) { NS_NOTREACHED("frame was not removed from primary frame map before " "destruction or was readded to map after being removed"); @@ -724,10 +723,10 @@ DumpContext(nsIFrame* aFrame, nsStyleContext* aContext) frameDebug->GetFrameName(name); fputs(NS_LossyConvertUTF16toASCII(name).get(), stdout); } - fprintf(stdout, " (%p)", NS_STATIC_CAST(void*, aFrame)); + fprintf(stdout, " (%p)", static_cast(aFrame)); } if (aContext) { - fprintf(stdout, " style: %p ", NS_STATIC_CAST(void*, aContext)); + fprintf(stdout, " style: %p ", static_cast(aContext)); nsIAtom* pseudoTag = aContext->GetPseudoType(); if (pseudoTag) { @@ -980,7 +979,7 @@ nsFrameManager::ReParentStyleContext(nsIFrame* aFrame) // oldContext)" check will prevent us from redoing work. if ((aFrame->GetStateBits() & NS_FRAME_IS_SPECIAL) && !aFrame->GetPrevInFlow()) { - nsIFrame* sib = NS_STATIC_CAST(nsIFrame*, aFrame->GetProperty(nsGkAtoms::IBSplitSpecialSibling)); + nsIFrame* sib = static_cast(aFrame->GetProperty(nsGkAtoms::IBSplitSpecialSibling)); if (sib) { ReParentStyleContext(sib); } @@ -1238,8 +1237,8 @@ nsFrameManager::ReResolveStyleContext(nsPresContext *aPresContext, if (display->mDisplay != NS_STYLE_DISPLAY_NONE) { aChangeList->AppendChange(nsnull, undisplayed->mContent - ? NS_STATIC_CAST(nsIContent*, - undisplayed->mContent) + ? static_cast + (undisplayed->mContent) : localContent, NS_STYLE_HINT_FRAMECHANGE); // The node should be removed from the undisplayed map when @@ -1436,8 +1435,8 @@ nsFrameManager::ComputeStyleChangeFor(nsIFrame *aFrame, return topLevelChange; } - frame2 = NS_STATIC_CAST(nsIFrame*, - propTable->GetProperty(frame2, nsGkAtoms::IBSplitSpecialSibling)); + frame2 = static_cast + (propTable->GetProperty(frame2, nsGkAtoms::IBSplitSpecialSibling)); frame = frame2; } while (frame2); return topLevelChange; diff --git a/layout/base/nsFrameTraversal.cpp b/layout/base/nsFrameTraversal.cpp index bc9e50bca4f9..811485f9564b 100644 --- a/layout/base/nsFrameTraversal.cpp +++ b/layout/base/nsFrameTraversal.cpp @@ -183,7 +183,7 @@ NS_NewFrameTraversal(nsIBidirectionalEnumerator **aEnumerator, } if (!trav) return NS_ERROR_OUT_OF_MEMORY; - *aEnumerator = NS_STATIC_CAST(nsIBidirectionalEnumerator*, trav); + *aEnumerator = static_cast(trav); NS_ADDREF(trav); return NS_OK; } @@ -209,7 +209,7 @@ NS_IMETHODIMP PRBool aFollowOOFs) { return NS_NewFrameTraversal(aEnumerator, aPresContext, aStart, - NS_STATIC_CAST(nsIteratorType, aType), + static_cast(aType), aVisual, aLockInScrollView, aFollowOOFs); } diff --git a/layout/base/nsGenConList.h b/layout/base/nsGenConList.h index 30ea87680511..776e64900757 100644 --- a/layout/base/nsGenConList.h +++ b/layout/base/nsGenConList.h @@ -95,10 +95,10 @@ public: ~nsGenConList() { Clear(); } void Clear(); static nsGenConNode* Next(nsGenConNode* aNode) { - return NS_STATIC_CAST(nsGenConNode*, PR_NEXT_LINK(aNode)); + return static_cast(PR_NEXT_LINK(aNode)); } static nsGenConNode* Prev(nsGenConNode* aNode) { - return NS_STATIC_CAST(nsGenConNode*, PR_PREV_LINK(aNode)); + return static_cast(PR_PREV_LINK(aNode)); } void Insert(nsGenConNode* aNode); // returns whether any nodes have been destroyed diff --git a/layout/base/nsIPresShell.h b/layout/base/nsIPresShell.h index 049e055d9898..a713e35a17aa 100644 --- a/layout/base/nsIPresShell.h +++ b/layout/base/nsIPresShell.h @@ -205,8 +205,8 @@ public: } nsFrameManager* FrameManager() const { - return NS_REINTERPRET_CAST(nsFrameManager*, - &NS_CONST_CAST(nsIPresShell*, this)->mFrameManager); + return reinterpret_cast + (&const_cast(this)->mFrameManager); } #endif diff --git a/layout/base/nsLayoutDebugger.cpp b/layout/base/nsLayoutDebugger.cpp index 884a81ed3152..eaec77eee98e 100644 --- a/layout/base/nsLayoutDebugger.cpp +++ b/layout/base/nsLayoutDebugger.cpp @@ -170,7 +170,7 @@ PrintDisplayListTo(nsDisplayListBuilder* aBuilder, const nsDisplayList& aList, nsRect rect = i->GetBounds(aBuilder); switch (i->GetType()) { case nsDisplayItem::TYPE_CLIP: { - nsDisplayClip* c = NS_STATIC_CAST(nsDisplayClip*, i); + nsDisplayClip* c = static_cast(i); rect = c->GetClipRect(); break; } diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index 6ba589bba912..c59eea4d2541 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -248,7 +248,7 @@ nsLayoutUtils::GetCrossDocParentFrame(nsIFrame* aFrame) v = v->GetParent(); // subdocumentframe's view if (!v) return nsnull; - return NS_STATIC_CAST(nsIFrame*, v->GetClientData()); + return static_cast(v->GetClientData()); } // static @@ -332,8 +332,8 @@ nsLayoutUtils::DoCompareTreePosition(nsIContent* aContent1, nsINode* content1Ancestor = nsnull; nsINode* content2Ancestor = nsnull; while (last1 >= 0 && last2 >= 0 - && ((content1Ancestor = NS_STATIC_CAST(nsINode*, content1Ancestors.ElementAt(last1))) - == (content2Ancestor = NS_STATIC_CAST(nsINode*, content2Ancestors.ElementAt(last2))))) { + && ((content1Ancestor = static_cast(content1Ancestors.ElementAt(last1))) + == (content2Ancestor = static_cast(content2Ancestors.ElementAt(last2))))) { last1--; last2--; } @@ -475,16 +475,16 @@ nsIFrame* nsLayoutUtils::GetLastSibling(nsIFrame* aFrame) { // static nsIView* nsLayoutUtils::FindSiblingViewFor(nsIView* aParentView, nsIFrame* aFrame) { - nsIFrame* parentViewFrame = NS_STATIC_CAST(nsIFrame*, aParentView->GetClientData()); + nsIFrame* parentViewFrame = static_cast(aParentView->GetClientData()); nsIContent* parentViewContent = parentViewFrame ? parentViewFrame->GetContent() : nsnull; for (nsIView* insertBefore = aParentView->GetFirstChild(); insertBefore; insertBefore = insertBefore->GetNextSibling()) { - nsIFrame* f = NS_STATIC_CAST(nsIFrame*, insertBefore->GetClientData()); + nsIFrame* f = static_cast(insertBefore->GetClientData()); if (!f) { // this view could be some anonymous view attached to a meaningful parent for (nsIView* searchView = insertBefore->GetParent(); searchView; searchView = searchView->GetParent()) { - f = NS_STATIC_CAST(nsIFrame*, searchView->GetClientData()); + f = static_cast(searchView->GetClientData()); if (f) { break; } @@ -598,7 +598,7 @@ nsLayoutUtils::GetEventCoordinatesRelativeTo(const nsEvent* aEvent, nsIFrame* aF aEvent->eventStructType != NS_MOUSE_SCROLL_EVENT)) return nsPoint(NS_UNCONSTRAINEDSIZE, NS_UNCONSTRAINEDSIZE); - const nsGUIEvent* GUIEvent = NS_STATIC_CAST(const nsGUIEvent*, aEvent); + const nsGUIEvent* GUIEvent = static_cast(aEvent); if (!GUIEvent->widget) return nsPoint(NS_UNCONSTRAINEDSIZE, NS_UNCONSTRAINEDSIZE); @@ -608,7 +608,7 @@ nsLayoutUtils::GetEventCoordinatesRelativeTo(const nsEvent* aEvent, nsIFrame* aF for (nsIFrame* f = aFrame; f; f = GetCrossDocParentFrame(f)) { #ifdef MOZ_SVG_FOREIGNOBJECT if (f->IsFrameOfType(nsIFrame::eSVGForeignObject) && f->GetFirstChild(nsnull)) { - nsSVGForeignObjectFrame* fo = NS_STATIC_CAST(nsSVGForeignObjectFrame*, f); + nsSVGForeignObjectFrame* fo = static_cast(f); nsIFrame* outer = nsSVGUtils::GetOuterSVGFrame(fo); return fo->TransformPointFromOuter( GetEventCoordinatesRelativeTo(aEvent, outer)) - @@ -641,7 +641,7 @@ nsLayoutUtils::GetEventCoordinatesForNearestView(nsEvent* aEvent, aEvent->eventStructType != NS_MOUSE_SCROLL_EVENT)) return nsPoint(NS_UNCONSTRAINEDSIZE, NS_UNCONSTRAINEDSIZE); - nsGUIEvent* GUIEvent = NS_STATIC_CAST(nsGUIEvent*, aEvent); + nsGUIEvent* GUIEvent = static_cast(aEvent); if (!GUIEvent->widget) return nsPoint(NS_UNCONSTRAINEDSIZE, NS_UNCONSTRAINEDSIZE); @@ -850,7 +850,7 @@ AddItemsToRegion(nsDisplayListBuilder* aBuilder, nsDisplayList* aList, if (sublist) { if (item->GetType() == nsDisplayItem::TYPE_CLIP) { nsRect clip; - clip.IntersectRect(aClipRect, NS_STATIC_CAST(nsDisplayClip*, item)->GetClipRect()); + clip.IntersectRect(aClipRect, static_cast(item)->GetClipRect()); AddItemsToRegion(aBuilder, sublist, aRect, clip, aDelta, aRegion); } else { // opacity, or a generic sublist @@ -1148,7 +1148,7 @@ nsLayoutUtils::GetClosestCommonAncestorViaPlaceholders(nsIFrame* aFrame1, PRInt32 last1 = frame1Ancestors.Count() - 1; PRInt32 last2 = frame2Ancestors.Count() - 1; while (last1 >= 0 && last2 >= 0) { - nsIFrame* frame1 = NS_STATIC_CAST(nsIFrame*, frame1Ancestors.ElementAt(last1)); + nsIFrame* frame1 = static_cast(frame1Ancestors.ElementAt(last1)); if (frame1 != frame2Ancestors.ElementAt(last2)) break; lastCommonFrame = frame1; @@ -1171,7 +1171,7 @@ nsLayoutUtils::GetNextContinuationOrSpecialSibling(nsIFrame *aFrame) aFrame = aFrame->GetFirstInFlow(); void* value = aFrame->GetProperty(nsGkAtoms::IBSplitSpecialSibling); - return NS_STATIC_CAST(nsIFrame*, value); + return static_cast(value); } return nsnull; @@ -1356,7 +1356,7 @@ nsLayoutUtils::IntrinsicForContainer(nsIRenderingContext *aRenderingContext, #ifdef DEBUG_INTRINSIC_WIDTH nsFrame::IndentBy(stdout, gNoiseIndent); - NS_STATIC_CAST(nsFrame*, aFrame)->ListTag(stdout); + static_cast(aFrame)->ListTag(stdout); printf(" %s intrinsic width for container:\n", aType == MIN_WIDTH ? "min" : "pref"); #endif @@ -1407,7 +1407,7 @@ nsLayoutUtils::IntrinsicForContainer(nsIRenderingContext *aRenderingContext, #ifdef DEBUG_INTRINSIC_WIDTH --gNoiseIndent; nsFrame::IndentBy(stdout, gNoiseIndent); - NS_STATIC_CAST(nsFrame*, aFrame)->ListTag(stdout); + static_cast(aFrame)->ListTag(stdout); printf(" %s intrinsic width from frame is %d.\n", aType == MIN_WIDTH ? "min" : "pref", result); #endif @@ -1553,7 +1553,7 @@ nsLayoutUtils::IntrinsicForContainer(nsIRenderingContext *aRenderingContext, #ifdef DEBUG_INTRINSIC_WIDTH nsFrame::IndentBy(stdout, gNoiseIndent); - NS_STATIC_CAST(nsFrame*, aFrame)->ListTag(stdout); + static_cast(aFrame)->ListTag(stdout); printf(" %s intrinsic width for container is %d twips.\n", aType == MIN_WIDTH ? "min" : "pref", result); #endif @@ -1975,7 +1975,7 @@ nsLayoutUtils::GetStringWidth(const nsIFrame* aFrame, nsLayoutUtils::GetFirstLineBaseline(const nsIFrame* aFrame, nscoord* aResult) { const nsBlockFrame* block; - if (NS_FAILED(NS_CONST_CAST(nsIFrame*, aFrame)-> + if (NS_FAILED(const_cast(aFrame)-> QueryInterface(kBlockFrameCID, (void**)&block))) { // For the first-line baseline we also have to check for a table, and if // so, use the baseline of its first row. @@ -1988,8 +1988,8 @@ nsLayoutUtils::GetFirstLineBaseline(const nsIFrame* aFrame, nscoord* aResult) // For first-line baselines, we have to consider scroll frames. if (fType == nsGkAtoms::scrollFrame) { nsIScrollableFrame *sFrame; - if (NS_FAILED(CallQueryInterface(NS_CONST_CAST(nsIFrame*, - aFrame), &sFrame)) || !sFrame) { + if (NS_FAILED(CallQueryInterface(const_cast + (aFrame), &sFrame)) || !sFrame) { NS_NOTREACHED("not scroll frame"); } nscoord kidBaseline; @@ -2033,7 +2033,7 @@ nsLayoutUtils::GetFirstLineBaseline(const nsIFrame* aFrame, nscoord* aResult) nsLayoutUtils::GetLastLineBaseline(const nsIFrame* aFrame, nscoord* aResult) { const nsBlockFrame* block; - if (NS_FAILED(NS_CONST_CAST(nsIFrame*, aFrame)-> + if (NS_FAILED(const_cast(aFrame)-> QueryInterface(kBlockFrameCID, (void**)&block))) // No baseline. (We intentionally don't descend into scroll frames.) return PR_FALSE; @@ -2123,8 +2123,8 @@ nsLayoutUtils::DrawImage(nsIRenderingContext* aRenderingContext, aRenderingContext->GetDeviceContext(*getter_AddRefs(dc)); PRInt32 d2a = dc->AppUnitsPerDevPixel(); - nsRefPtr ctx = NS_STATIC_CAST(gfxContext*, - aRenderingContext->GetNativeGraphicData( + nsRefPtr ctx = static_cast + (aRenderingContext->GetNativeGraphicData( nsIRenderingContext::NATIVE_THEBES_CONTEXT)); // the dest rect is affected by the current transform; that'll be diff --git a/layout/base/nsLayoutUtils.h b/layout/base/nsLayoutUtils.h index 24d860bffc5a..aa4fdd604219 100644 --- a/layout/base/nsLayoutUtils.h +++ b/layout/base/nsLayoutUtils.h @@ -244,7 +244,7 @@ public: * @return the root frame for the view */ static nsIFrame* GetFrameFor(nsIView *aView) - { return NS_STATIC_CAST(nsIFrame*, aView->GetClientData()); } + { return static_cast(aView->GetClientData()); } /** * GetScrollableFrameFor returns the scrollable frame for a scrollable view diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp index 0bdcf10fa045..b280dc268d8f 100644 --- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -2455,7 +2455,7 @@ PresShell::InitialReflow(nscoord aWidth, nscoord aHeight) void PresShell::sPaintSuppressionCallback(nsITimer *aTimer, void* aPresShell) { - PresShell* self = NS_STATIC_CAST(PresShell*, aPresShell); + PresShell* self = static_cast(aPresShell); if (self) self->UnsuppressPainting(); } @@ -2538,7 +2538,7 @@ PresShell::KillResizeEventTimer() void PresShell::sResizeEventCallback(nsITimer *aTimer, void* aPresShell) { - PresShell* self = NS_STATIC_CAST(PresShell*, aPresShell); + PresShell* self = static_cast(aPresShell); if (self) { self->FireResizeEvent(); } @@ -3130,7 +3130,7 @@ PresShell::FrameNeedsReflow(nsIFrame *aFrame, IntrinsicDirty aIntrinsicDirty, while (stack.Count() != 0) { nsIFrame *f = - NS_STATIC_CAST(nsIFrame*, stack.FastElementAt(stack.Count() - 1)); + static_cast(stack.FastElementAt(stack.Count() - 1)); stack.RemoveElementAt(stack.Count() - 1); PRInt32 childListIndex = 0; @@ -4633,8 +4633,8 @@ PresShell::ComputeRepaintRegionForCopy(nsIView* aRootView, nsRegion* aRepaintRegion) { return nsLayoutUtils::ComputeRepaintRegionForCopy( - NS_STATIC_CAST(nsIFrame*, aRootView->GetClientData()), - NS_STATIC_CAST(nsIFrame*, aMovingView->GetClientData()), + static_cast(aRootView->GetClientData()), + static_cast(aMovingView->GetClientData()), aDelta, aCopyRect, aRepaintRegion); } @@ -4842,7 +4842,7 @@ PresShell::CreateRangePaintInfo(nsIDOMRange* aRange, if (!ancestor || !ancestor->IsNodeOfType(nsINode::eCONTENT)) return nsnull; - nsIContent* ancestorContent = NS_STATIC_CAST(nsIContent*, ancestor); + nsIContent* ancestorContent = static_cast(ancestor); ancestorFrame = GetPrimaryFrameFor(ancestorContent); // use the nearest ancestor frame that includes all continuations as the @@ -5101,7 +5101,7 @@ PresShell::Paint(nsIView* aView, NS_ASSERTION(!(nsnull == aView), "null view"); - frame = NS_STATIC_CAST(nsIFrame*, aView->GetClientData()); + frame = static_cast(aView->GetClientData()); nscolor backgroundColor; mViewManager->GetDefaultBackgroundColor(&backgroundColor); for (nsIView *view = aView; view; view = view->GetParent()) { @@ -5290,7 +5290,7 @@ PresShell::HandleEvent(nsIView *aView, return NS_OK; } - nsIFrame* frame = NS_STATIC_CAST(nsIFrame*, aView->GetClientData()); + nsIFrame* frame = static_cast(aView->GetClientData()); PRBool dispatchUsingCoordinates = !NS_IS_KEY_EVENT(aEvent) && !NS_IS_IME_EVENT(aEvent) && @@ -5308,7 +5308,7 @@ PresShell::HandleEvent(nsIView *aView, if (targetView) { aView = targetView; - frame = NS_STATIC_CAST(nsIFrame*, aView->GetClientData()); + frame = static_cast(aView->GetClientData()); } } @@ -5345,7 +5345,7 @@ PresShell::HandleEvent(nsIView *aView, nsIFrame* targetFrame = nsLayoutUtils::GetFrameForPoint(frame, eventPoint); if (targetFrame) { PresShell* shell = - NS_STATIC_CAST(PresShell*, targetFrame->PresContext()->PresShell()); + static_cast(targetFrame->PresContext()->PresShell()); if (shell != this) { // Handle the event in the correct shell. // Prevent deletion until we're done with event handling (bug 336582). @@ -5547,7 +5547,7 @@ inline PRBool IsSynthesizedMouseMove(nsEvent* aEvent) { return aEvent->eventStructType == NS_MOUSE_EVENT && - NS_STATIC_CAST(nsMouseEvent*, aEvent)->reason != nsMouseEvent::eReal; + static_cast(aEvent)->reason != nsMouseEvent::eReal; } nsresult @@ -5557,7 +5557,7 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView, #ifdef ACCESSIBILITY if (aEvent->eventStructType == NS_ACCESSIBLE_EVENT) { - NS_STATIC_CAST(nsAccessibleEvent*, aEvent)->accessible = nsnull; + static_cast(aEvent)->accessible = nsnull; nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); if (accService) { @@ -5574,7 +5574,7 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView, // Addref this - it's not a COM Ptr // We'll make sure the right number of Addref's occur before // handing this back to the accessibility client - NS_STATIC_CAST(nsAccessibleEvent*, aEvent)->accessible = acc; + static_cast(aEvent)->accessible = acc; // Ensure this is set in case a11y was activated before any // nsPresShells existed to observe "a11y-init-or-shutdown" topic gIsAccessibilityActive = PR_TRUE; @@ -6087,7 +6087,7 @@ PresShell::ProcessReflowCommands(PRBool aInterruptible) do { // Send an incremental reflow notification to the target frame. PRInt32 idx = mDirtyRoots.Count() - 1; - nsIFrame *target = NS_STATIC_CAST(nsIFrame*, mDirtyRoots[idx]); + nsIFrame *target = static_cast(mDirtyRoots[idx]); mDirtyRoots.RemoveElementAt(idx); if (!NS_SUBTREE_DIRTY(target)) { @@ -6173,14 +6173,14 @@ ReResolveMenusAndTrees(nsIFrame *aFrame, void *aClosure) // have to special-case them on a skin switch, and ensure that the // popup frames just get destroyed completely. if (aFrame && aFrame->GetType() == nsGkAtoms::menuFrame) - (NS_STATIC_CAST(nsMenuFrame *, aFrame))->CloseMenu(PR_TRUE); + (static_cast(aFrame))->CloseMenu(PR_TRUE); return PR_TRUE; } PR_STATIC_CALLBACK(PRBool) ReframeImageBoxes(nsIFrame *aFrame, void *aClosure) { - nsStyleChangeList *list = NS_STATIC_CAST(nsStyleChangeList*, aClosure); + nsStyleChangeList *list = static_cast(aClosure); if (aFrame->GetType() == nsGkAtoms::imageBoxFrame) { list->AppendChange(aFrame, aFrame->GetContent(), NS_STYLE_HINT_FRAMECHANGE); @@ -6478,12 +6478,12 @@ CompareTrees(nsPresContext* aFirstPresContext, nsIFrame* aFirstFrame, // verify that neither frame has a space manager, // or they both do and the space managers are equivalent - nsSpaceManager *sm1 = NS_STATIC_CAST(nsSpaceManager*, - k1->GetProperty(nsGkAtoms::spaceManagerProperty)); + nsSpaceManager *sm1 = static_cast + (k1->GetProperty(nsGkAtoms::spaceManagerProperty)); // look at the test frame - nsSpaceManager *sm2 = NS_STATIC_CAST(nsSpaceManager*, - k2->GetProperty(nsGkAtoms::spaceManagerProperty)); + nsSpaceManager *sm2 = static_cast + (k2->GetProperty(nsGkAtoms::spaceManagerProperty)); // now compare the space managers if (((nsnull == sm1) && (nsnull != sm2)) || diff --git a/layout/base/nsQuoteList.cpp b/layout/base/nsQuoteList.cpp index 4395593aed82..3810b4275e58 100644 --- a/layout/base/nsQuoteList.cpp +++ b/layout/base/nsQuoteList.cpp @@ -109,7 +109,7 @@ nsQuoteList::PrintChain() } nsQuoteNode* node = FirstNode(); do { - printf(" %p %d - ", NS_STATIC_CAST(void*, node), node->mDepthBefore); + printf(" %p %d - ", static_cast(node), node->mDepthBefore); switch(node->mType) { case (eStyleContentType_OpenQuote): printf("open"); diff --git a/layout/base/nsQuoteList.h b/layout/base/nsQuoteList.h index 1e6b062d0ba3..02f47cda4402 100644 --- a/layout/base/nsQuoteList.h +++ b/layout/base/nsQuoteList.h @@ -105,17 +105,17 @@ struct nsQuoteNode : public nsGenConNode { class nsQuoteList : public nsGenConList { private: - nsQuoteNode* FirstNode() { return NS_STATIC_CAST(nsQuoteNode*, mFirstNode); } + nsQuoteNode* FirstNode() { return static_cast(mFirstNode); } public: // assign the correct |mDepthBefore| value to a node that has been inserted // Should be called immediately after calling |Insert|. void Calc(nsQuoteNode* aNode); nsQuoteNode* Next(nsQuoteNode* aNode) { - return NS_STATIC_CAST(nsQuoteNode*, nsGenConList::Next(aNode)); + return static_cast(nsGenConList::Next(aNode)); } nsQuoteNode* Prev(nsQuoteNode* aNode) { - return NS_STATIC_CAST(nsQuoteNode*, nsGenConList::Prev(aNode)); + return static_cast(nsGenConList::Prev(aNode)); } void RecalcAll(); diff --git a/layout/build/nsContentDLF.cpp b/layout/build/nsContentDLF.cpp index c284bb62da92..070589e4c9f9 100644 --- a/layout/build/nsContentDLF.cpp +++ b/layout/build/nsContentDLF.cpp @@ -308,10 +308,10 @@ nsContentDLF::CreateInstanceForDocument(nsISupports* aContainer, if (NS_FAILED(rv)) break; - docv->SetUAStyleSheet(NS_STATIC_CAST(nsIStyleSheet*, gUAStyleSheet)); + docv->SetUAStyleSheet(static_cast(gUAStyleSheet)); // Bind the document to the Content Viewer - nsIContentViewer* cv = NS_STATIC_CAST(nsIContentViewer*, docv.get()); + nsIContentViewer* cv = static_cast(docv.get()); rv = cv->LoadStart(aDocument); NS_ADDREF(*aDocViewerResult = cv); } while (PR_FALSE); diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp index 4caf9ae775a5..b986acde90d4 100644 --- a/layout/forms/nsComboboxControlFrame.cpp +++ b/layout/forms/nsComboboxControlFrame.cpp @@ -293,25 +293,25 @@ nsComboboxControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) NS_PRECONDITION(aInstancePtr, "null out param"); if (aIID.Equals(NS_GET_IID(nsIComboboxControlFrame))) { - *aInstancePtr = NS_STATIC_CAST(nsIComboboxControlFrame*, this); + *aInstancePtr = static_cast(this); return NS_OK; } else if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) { - *aInstancePtr = NS_STATIC_CAST(nsIFormControlFrame*, this); + *aInstancePtr = static_cast(this); return NS_OK; } else if (aIID.Equals(NS_GET_IID(nsIAnonymousContentCreator))) { - *aInstancePtr = NS_STATIC_CAST(nsIAnonymousContentCreator*, this); + *aInstancePtr = static_cast(this); return NS_OK; } else if (aIID.Equals(NS_GET_IID(nsISelectControlFrame))) { - *aInstancePtr = NS_STATIC_CAST(nsISelectControlFrame*, this); + *aInstancePtr = static_cast(this); return NS_OK; } else if (aIID.Equals(NS_GET_IID(nsIStatefulFrame))) { - *aInstancePtr = NS_STATIC_CAST(nsIStatefulFrame*, this); + *aInstancePtr = static_cast(this); return NS_OK; } else if (aIID.Equals(NS_GET_IID(nsIRollupListener))) { - *aInstancePtr = NS_STATIC_CAST(nsIRollupListener*, this); + *aInstancePtr = static_cast(this); return NS_OK; } else if (aIID.Equals(NS_GET_IID(nsIScrollableViewProvider))) { - *aInstancePtr = NS_STATIC_CAST(nsIScrollableViewProvider*, this); + *aInstancePtr = static_cast(this); return NS_OK; } @@ -877,7 +877,7 @@ nsComboboxControlFrame::AddOption(nsPresContext* aPresContext, PRInt32 aIndex) ++mDisplayedIndex; } - nsListControlFrame* lcf = NS_STATIC_CAST(nsListControlFrame*, mDropdownFrame); + nsListControlFrame* lcf = static_cast(mDropdownFrame); return lcf->AddOption(aPresContext, aIndex); } @@ -898,7 +898,7 @@ nsComboboxControlFrame::RemoveOption(nsPresContext* aPresContext, PRInt32 aIndex RedisplayText(-1); } - nsListControlFrame* lcf = NS_STATIC_CAST(nsListControlFrame*, mDropdownFrame); + nsListControlFrame* lcf = static_cast(mDropdownFrame); return lcf->RemoveOption(aPresContext, aIndex); } @@ -1205,7 +1205,7 @@ nsComboboxControlFrame::Destroy() // Revoke any pending RedisplayTextEvent mRedisplayTextEvent.Revoke(); - nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_FALSE); + nsFormControlFrame::RegUnRegAccessKey(static_cast(this), PR_FALSE); if (mDroppedDown) { // Get parent view @@ -1333,7 +1333,7 @@ public: void nsDisplayComboboxFocus::Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx, const nsRect& aDirtyRect) { - NS_STATIC_CAST(nsComboboxControlFrame*, mFrame) + static_cast(mFrame) ->PaintFocus(*aCtx, aBuilder->ToReferenceFrame(mFrame)); } diff --git a/layout/forms/nsFieldSetFrame.cpp b/layout/forms/nsFieldSetFrame.cpp index 43ae052f045b..1ce03eb93230 100644 --- a/layout/forms/nsFieldSetFrame.cpp +++ b/layout/forms/nsFieldSetFrame.cpp @@ -202,7 +202,7 @@ void nsDisplayFieldSetBorderBackground::Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx, const nsRect& aDirtyRect) { - NS_STATIC_CAST(nsFieldSetFrame*, mFrame)-> + static_cast(mFrame)-> PaintBorderBackground(*aCtx, aBuilder->ToReferenceFrame(mFrame), aDirtyRect); } @@ -708,7 +708,7 @@ NS_IMETHODIMP nsFieldSetFrame::GetAccessible(nsIAccessible** aAccessible) nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); if (accService) { - return accService->CreateHTMLGroupboxAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible); + return accService->CreateHTMLGroupboxAccessible(static_cast(this), aAccessible); } return NS_ERROR_FAILURE; diff --git a/layout/forms/nsFileControlFrame.cpp b/layout/forms/nsFileControlFrame.cpp index d8af55774902..4d6117cc7dcb 100644 --- a/layout/forms/nsFileControlFrame.cpp +++ b/layout/forms/nsFileControlFrame.cpp @@ -211,11 +211,11 @@ nsFileControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) NS_PRECONDITION(aInstancePtr, "null out param"); if (aIID.Equals(NS_GET_IID(nsIAnonymousContentCreator))) { - *aInstancePtr = NS_STATIC_CAST(nsIAnonymousContentCreator*, this); + *aInstancePtr = static_cast(this); return NS_OK; } if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) { - *aInstancePtr = NS_STATIC_CAST(nsIFormControlFrame*, this); + *aInstancePtr = static_cast(this); return NS_OK; } diff --git a/layout/forms/nsFormControlFrame.cpp b/layout/forms/nsFormControlFrame.cpp index 8c52d5c7e811..1c4507c532a7 100644 --- a/layout/forms/nsFormControlFrame.cpp +++ b/layout/forms/nsFormControlFrame.cpp @@ -58,7 +58,7 @@ void nsFormControlFrame::Destroy() { // Unregister the access key registered in reflow - nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_FALSE); + nsFormControlFrame::RegUnRegAccessKey(static_cast(this), PR_FALSE); nsLeafFrame::Destroy(); } @@ -69,7 +69,7 @@ nsFormControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) NS_PRECONDITION(aInstancePtr, "null out param"); if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) { - *aInstancePtr = NS_STATIC_CAST(nsIFormControlFrame*, this); + *aInstancePtr = static_cast(this); return NS_OK; } @@ -104,7 +104,7 @@ nsFormControlFrame::Reflow(nsPresContext* aPresContext, DISPLAY_REFLOW(aPresContext, this, aReflowState, aDesiredSize, aStatus); if (mState & NS_FRAME_FIRST_REFLOW) { - RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_TRUE); + RegUnRegAccessKey(static_cast(this), PR_TRUE); } return nsLeafFrame::Reflow(aPresContext, aDesiredSize, aReflowState, diff --git a/layout/forms/nsGfxButtonControlFrame.cpp b/layout/forms/nsGfxButtonControlFrame.cpp index 693c91c7fead..40e5eeb6d5ee 100644 --- a/layout/forms/nsGfxButtonControlFrame.cpp +++ b/layout/forms/nsGfxButtonControlFrame.cpp @@ -165,7 +165,7 @@ nsGfxButtonControlFrame::GetFormProperty(nsIAtom* aName, nsAString& aValue) cons // This property is used by accessibility to get // the default label of the button. nsXPIDLString temp; - rv = NS_CONST_CAST(nsGfxButtonControlFrame*, this)->GetDefaultLabel(temp); + rv = const_cast(this)->GetDefaultLabel(temp); aValue = temp; } else { aValue.Truncate(); @@ -179,7 +179,7 @@ NS_IMETHODIMP nsGfxButtonControlFrame::GetAccessible(nsIAccessible** aAccessible nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); if (accService) { - return accService->CreateHTMLButtonAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible); + return accService->CreateHTMLButtonAccessible(static_cast(this), aAccessible); } return NS_ERROR_FAILURE; @@ -193,7 +193,7 @@ nsGfxButtonControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) NS_PRECONDITION(aInstancePtr, "null out param"); if (aIID.Equals(NS_GET_IID(nsIAnonymousContentCreator))) { - *aInstancePtr = NS_STATIC_CAST(nsIAnonymousContentCreator*, this); + *aInstancePtr = static_cast(this); return NS_OK; } diff --git a/layout/forms/nsGfxCheckboxControlFrame.cpp b/layout/forms/nsGfxCheckboxControlFrame.cpp index bfdaf44d4a1a..b5cbb860cf3a 100644 --- a/layout/forms/nsGfxCheckboxControlFrame.cpp +++ b/layout/forms/nsGfxCheckboxControlFrame.cpp @@ -103,7 +103,7 @@ nsGfxCheckboxControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr NS_PRECONDITION(aInstancePtr, "null out param"); if (aIID.Equals(NS_GET_IID(nsICheckboxControlFrame))) { - *aInstancePtr = NS_STATIC_CAST(nsICheckboxControlFrame*, this); + *aInstancePtr = static_cast(this); return NS_OK; } @@ -116,7 +116,7 @@ NS_IMETHODIMP nsGfxCheckboxControlFrame::GetAccessible(nsIAccessible** aAccessib nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); if (accService) { - return accService->CreateHTMLCheckboxAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible); + return accService->CreateHTMLCheckboxAccessible(static_cast(this), aAccessible); } return NS_ERROR_FAILURE; @@ -171,7 +171,7 @@ nsGfxCheckboxControlFrame::OnChecked(nsPresContext* aPresContext, static void PaintCheckMarkFromStyle(nsIFrame* aFrame, nsIRenderingContext* aCtx, const nsRect& aDirtyRect, nsPoint aPt) { - NS_STATIC_CAST(nsGfxCheckboxControlFrame*, aFrame) + static_cast(aFrame) ->PaintCheckBoxFromStyle(*aCtx, aPt, aDirtyRect); } @@ -195,7 +195,7 @@ public: void nsDisplayCheckMark::Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx, const nsRect& aDirtyRect) { - NS_STATIC_CAST(nsGfxCheckboxControlFrame*, mFrame)-> + static_cast(mFrame)-> PaintCheckBox(*aCtx, aBuilder->ToReferenceFrame(mFrame), aDirtyRect); } diff --git a/layout/forms/nsGfxRadioControlFrame.cpp b/layout/forms/nsGfxRadioControlFrame.cpp index dcc1fcca133e..b36f57658b6e 100644 --- a/layout/forms/nsGfxRadioControlFrame.cpp +++ b/layout/forms/nsGfxRadioControlFrame.cpp @@ -68,7 +68,7 @@ nsGfxRadioControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) NS_PRECONDITION(aInstancePtr, "null out param"); if (aIID.Equals(NS_GET_IID(nsIRadioControlFrame))) { - *aInstancePtr = NS_STATIC_CAST(nsIRadioControlFrame*, this); + *aInstancePtr = static_cast(this); return NS_OK; } @@ -81,7 +81,7 @@ NS_IMETHODIMP nsGfxRadioControlFrame::GetAccessible(nsIAccessible** aAccessible) nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); if (accService) { - return accService->CreateHTMLRadioButtonAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible); + return accService->CreateHTMLRadioButtonAccessible(static_cast(this), aAccessible); } return NS_ERROR_FAILURE; @@ -179,7 +179,7 @@ public: void nsDisplayRadioButtonFromStyle::Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx, const nsRect& aDirtyRect) { - NS_STATIC_CAST(nsGfxRadioControlFrame*, mFrame)-> + static_cast(mFrame)-> PaintRadioButtonFromStyle(*aCtx, aBuilder->ToReferenceFrame(mFrame), aDirtyRect); } diff --git a/layout/forms/nsHTMLButtonControlFrame.cpp b/layout/forms/nsHTMLButtonControlFrame.cpp index 1ab551a26bab..e6882c0cda64 100644 --- a/layout/forms/nsHTMLButtonControlFrame.cpp +++ b/layout/forms/nsHTMLButtonControlFrame.cpp @@ -88,7 +88,7 @@ nsHTMLButtonControlFrame::~nsHTMLButtonControlFrame() void nsHTMLButtonControlFrame::Destroy() { - nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_FALSE); + nsFormControlFrame::RegUnRegAccessKey(static_cast(this), PR_FALSE); nsHTMLContainerFrame::Destroy(); } @@ -124,7 +124,7 @@ nsHTMLButtonControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) NS_PRECONDITION(aInstancePtr, "null out param"); if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) { - *aInstancePtr = NS_STATIC_CAST(nsIFormControlFrame*, this); + *aInstancePtr = static_cast(this); return NS_OK; } @@ -140,10 +140,10 @@ NS_IMETHODIMP nsHTMLButtonControlFrame::GetAccessible(nsIAccessible** aAccessibl nsIContent* content = GetContent(); nsCOMPtr buttonElement(do_QueryInterface(content)); if (buttonElement) //If turned XBL-base form control off, the frame contains HTML 4 button - return accService->CreateHTML4ButtonAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible); + return accService->CreateHTML4ButtonAccessible(static_cast(this), aAccessible); nsCOMPtr inputElement(do_QueryInterface(content)); if (inputElement) //If turned XBL-base form control on, the frame contains normal HTML button - return accService->CreateHTMLButtonAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible); + return accService->CreateHTMLButtonAccessible(static_cast(this), aAccessible); } return NS_ERROR_FAILURE; @@ -283,7 +283,7 @@ nsHTMLButtonControlFrame::Reflow(nsPresContext* aPresContext, "Should have real computed width by now"); if (mState & NS_FRAME_FIRST_REFLOW) { - nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_TRUE); + nsFormControlFrame::RegUnRegAccessKey(static_cast(this), PR_TRUE); } // Reflow the child diff --git a/layout/forms/nsImageControlFrame.cpp b/layout/forms/nsImageControlFrame.cpp index 8f988486845b..935c4054bd57 100644 --- a/layout/forms/nsImageControlFrame.cpp +++ b/layout/forms/nsImageControlFrame.cpp @@ -64,7 +64,7 @@ void IntPointDtorFunc(void *aObject, nsIAtom *aPropertyName, void *aPropertyValue, void *aData) { - nsIntPoint *propertyValue = NS_STATIC_CAST(nsIntPoint*, aPropertyValue); + nsIntPoint *propertyValue = static_cast(aPropertyValue); delete propertyValue; } @@ -129,7 +129,7 @@ nsImageControlFrame::~nsImageControlFrame() void nsImageControlFrame::Destroy() { - nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_FALSE); + nsFormControlFrame::RegUnRegAccessKey(static_cast(this), PR_FALSE); nsImageControlFrameSuper::Destroy(); } @@ -161,7 +161,7 @@ nsImageControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) NS_PRECONDITION(aInstancePtr, "null out param"); if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) { - *aInstancePtr = NS_STATIC_CAST(nsIFormControlFrame*, this); + *aInstancePtr = static_cast(this); return NS_OK; } @@ -175,10 +175,10 @@ NS_IMETHODIMP nsImageControlFrame::GetAccessible(nsIAccessible** aAccessible) if (accService) { if (mContent->Tag() == nsGkAtoms::button) { - return accService->CreateHTML4ButtonAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible); + return accService->CreateHTML4ButtonAccessible(static_cast(this), aAccessible); } else if (mContent->Tag() == nsGkAtoms::input) { - return accService->CreateHTMLButtonAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible); + return accService->CreateHTMLButtonAccessible(static_cast(this), aAccessible); } } @@ -213,7 +213,7 @@ nsImageControlFrame::Reflow(nsPresContext* aPresContext, DO_GLOBAL_REFLOW_COUNT("nsImageControlFrame"); DISPLAY_REFLOW(aPresContext, this, aReflowState, aDesiredSize, aStatus); if (mState & NS_FRAME_FIRST_REFLOW) { - nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_TRUE); + nsFormControlFrame::RegUnRegAccessKey(static_cast(this), PR_TRUE); } return nsImageControlFrameSuper::Reflow(aPresContext, aDesiredSize, aReflowState, aStatus); } @@ -243,12 +243,12 @@ nsImageControlFrame::HandleEvent(nsPresContext* aPresContext, if (aEvent->eventStructType == NS_MOUSE_EVENT && aEvent->message == NS_MOUSE_BUTTON_UP && - NS_STATIC_CAST(nsMouseEvent*, aEvent)->button == nsMouseEvent::eLeftButton) { + static_cast(aEvent)->button == nsMouseEvent::eLeftButton) { // Store click point for nsHTMLInputElement::SubmitNamesValues // Do this on MouseUp because the specs don't say and that's what IE does nsIntPoint* lastClickPoint = - NS_STATIC_CAST(nsIntPoint*, - mContent->GetProperty(nsGkAtoms::imageClickedPoint)); + static_cast + (mContent->GetProperty(nsGkAtoms::imageClickedPoint)); if (lastClickPoint) { // normally lastClickedPoint is not null, as it's allocated in Init() nsPoint pt = nsLayoutUtils::GetEventCoordinatesRelativeTo(aEvent, this); diff --git a/layout/forms/nsIsIndexFrame.cpp b/layout/forms/nsIsIndexFrame.cpp index 845b1d452a6a..ba7b36a2027c 100644 --- a/layout/forms/nsIsIndexFrame.cpp +++ b/layout/forms/nsIsIndexFrame.cpp @@ -241,15 +241,15 @@ nsIsIndexFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) NS_PRECONDITION(aInstancePtr, "null out param"); if (aIID.Equals(NS_GET_IID(nsIAnonymousContentCreator))) { - *aInstancePtr = NS_STATIC_CAST(nsIAnonymousContentCreator*, this); + *aInstancePtr = static_cast(this); return NS_OK; } if (aIID.Equals(NS_GET_IID(nsIStatefulFrame))) { - *aInstancePtr = NS_STATIC_CAST(nsIStatefulFrame*, this); + *aInstancePtr = static_cast(this); return NS_OK; } if (aIID.Equals(NS_GET_IID(nsIDOMKeyListener))) { - *aInstancePtr = NS_STATIC_CAST(nsIDOMKeyListener*, this); + *aInstancePtr = static_cast(this); return NS_OK; } diff --git a/layout/forms/nsLegendFrame.cpp b/layout/forms/nsLegendFrame.cpp index b2d2312a066c..abc4a08c4469 100644 --- a/layout/forms/nsLegendFrame.cpp +++ b/layout/forms/nsLegendFrame.cpp @@ -73,7 +73,7 @@ nsLegendFrame::GetType() const void nsLegendFrame::Destroy() { - nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_FALSE); + nsFormControlFrame::RegUnRegAccessKey(static_cast(this), PR_FALSE); nsAreaFrame::Destroy(); } @@ -100,7 +100,7 @@ nsLegendFrame::Reflow(nsPresContext* aPresContext, DO_GLOBAL_REFLOW_COUNT("nsLegendFrame"); DISPLAY_REFLOW(aPresContext, this, aReflowState, aDesiredSize, aStatus); if (mState & NS_FRAME_FIRST_REFLOW) { - nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_TRUE); + nsFormControlFrame::RegUnRegAccessKey(static_cast(this), PR_TRUE); } return nsAreaFrame::Reflow(aPresContext, aDesiredSize, aReflowState, aStatus); } diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp index 1f34dbed1a5e..b0dcd4eebd32 100644 --- a/layout/forms/nsListControlFrame.cpp +++ b/layout/forms/nsListControlFrame.cpp @@ -201,19 +201,19 @@ nsListControlFrame::Destroy() mEventListener->SetFrame(nsnull); - mContent->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*, - mEventListener), + mContent->RemoveEventListenerByIID(static_cast + (mEventListener), NS_GET_IID(nsIDOMMouseListener)); - mContent->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseMotionListener*, - mEventListener), + mContent->RemoveEventListenerByIID(static_cast + (mEventListener), NS_GET_IID(nsIDOMMouseMotionListener)); - mContent->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*, - mEventListener), + mContent->RemoveEventListenerByIID(static_cast + (mEventListener), NS_GET_IID(nsIDOMKeyListener)); - nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_FALSE); + nsFormControlFrame::RegUnRegAccessKey(static_cast(this), PR_FALSE); nsHTMLScrollFrame::Destroy(); } @@ -383,15 +383,15 @@ nsListControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) NS_PRECONDITION(aInstancePtr, "null out param"); if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) { - *aInstancePtr = NS_STATIC_CAST(nsIFormControlFrame*, this); + *aInstancePtr = static_cast(this); return NS_OK; } if (aIID.Equals(NS_GET_IID(nsIListControlFrame))) { - *aInstancePtr = NS_STATIC_CAST(nsIListControlFrame*, this); + *aInstancePtr = static_cast(this); return NS_OK; } if (aIID.Equals(NS_GET_IID(nsISelectControlFrame))) { - *aInstancePtr = NS_STATIC_CAST(nsISelectControlFrame*, this); + *aInstancePtr = static_cast(this); return NS_OK; } @@ -1123,16 +1123,16 @@ nsListControlFrame::Init(nsIContent* aContent, if (!mEventListener) return NS_ERROR_OUT_OF_MEMORY; - mContent->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*, - mEventListener), + mContent->AddEventListenerByIID(static_cast + (mEventListener), NS_GET_IID(nsIDOMMouseListener)); - mContent->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseMotionListener*, - mEventListener), + mContent->AddEventListenerByIID(static_cast + (mEventListener), NS_GET_IID(nsIDOMMouseMotionListener)); - mContent->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*, - mEventListener), + mContent->AddEventListenerByIID(static_cast + (mEventListener), NS_GET_IID(nsIDOMKeyListener)); mStartSelectionIndex = kNothingSelected; @@ -2643,7 +2643,7 @@ nsListControlFrame::KeyPress(nsIDOMEvent* aKeyEvent) gLastKeyTime = keyTime; // Append this keystroke to the search string. - PRUnichar uniChar = ToLowerCase(NS_STATIC_CAST(PRUnichar, charcode)); + PRUnichar uniChar = ToLowerCase(static_cast(charcode)); GetIncrementalString().Append(uniChar); // See bug 188199, if all letters in incremental string are same, just try to match the first one diff --git a/layout/forms/nsListControlFrame.h b/layout/forms/nsListControlFrame.h index a8bc60a6744d..84a993f4aa19 100644 --- a/layout/forms/nsListControlFrame.h +++ b/layout/forms/nsListControlFrame.h @@ -401,7 +401,7 @@ protected: void InitSelectionRange(PRInt32 aClickedIndex); nsSelectsAreaFrame* GetOptionsContainer() const { - return NS_STATIC_CAST(nsSelectsAreaFrame*, GetScrolledFrame()); + return static_cast(GetScrolledFrame()); } nscoord HeightOfARow() { diff --git a/layout/forms/nsSelectsAreaFrame.cpp b/layout/forms/nsSelectsAreaFrame.cpp index f4a9df5e3286..a41dcba0e3a4 100644 --- a/layout/forms/nsSelectsAreaFrame.cpp +++ b/layout/forms/nsSelectsAreaFrame.cpp @@ -147,7 +147,7 @@ static nsListControlFrame* GetEnclosingListFrame(nsIFrame* aSelectsAreaFrame) nsIFrame* frame = aSelectsAreaFrame->GetParent(); while (frame) { if (frame->GetType() == nsGkAtoms::listControlFrame) - return NS_STATIC_CAST(nsListControlFrame*, frame); + return static_cast(frame); frame = frame->GetParent(); } return nsnull; diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp index db75dfc40e1e..395e4385afd9 100644 --- a/layout/forms/nsTextControlFrame.cpp +++ b/layout/forms/nsTextControlFrame.cpp @@ -373,7 +373,7 @@ nsTextInputListener::Blur(nsIDOMEvent* aEvent) static void DoCommandCallback(const char *aCommand, void *aData) { - nsTextControlFrame *frame = NS_STATIC_CAST(nsTextControlFrame*, aData); + nsTextControlFrame *frame = static_cast(aData); nsIContent *content = frame->GetContent(); nsCOMPtr controllers; @@ -986,23 +986,23 @@ nsTextControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) NS_PRECONDITION(aInstancePtr, "null out param"); if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) { - *aInstancePtr = NS_STATIC_CAST(nsIFormControlFrame*, this); + *aInstancePtr = static_cast(this); return NS_OK; } if (aIID.Equals(NS_GET_IID(nsIAnonymousContentCreator))) { - *aInstancePtr = NS_STATIC_CAST(nsIAnonymousContentCreator*, this); + *aInstancePtr = static_cast(this); return NS_OK; } if (aIID.Equals(NS_GET_IID(nsITextControlFrame))) { - *aInstancePtr = NS_STATIC_CAST(nsITextControlFrame*, this); + *aInstancePtr = static_cast(this); return NS_OK; } if (aIID.Equals(NS_GET_IID(nsIScrollableViewProvider)) && IsScrollable()) { - *aInstancePtr = NS_STATIC_CAST(nsIScrollableViewProvider*, this); + *aInstancePtr = static_cast(this); return NS_OK; } if (aIID.Equals(NS_GET_IID(nsIPhonetic))) { - *aInstancePtr = NS_STATIC_CAST(nsIPhonetic*, this); + *aInstancePtr = static_cast(this); return NS_OK; } @@ -1015,7 +1015,7 @@ NS_IMETHODIMP nsTextControlFrame::GetAccessible(nsIAccessible** aAccessible) nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); if (accService) { - return accService->CreateHTMLTextFieldAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible); + return accService->CreateHTMLTextFieldAccessible(static_cast(this), aAccessible); } return NS_ERROR_FAILURE; @@ -1130,12 +1130,12 @@ nsTextControlFrame::PreDestroy() //unregister self from content mTextListener->SetFrame(nsnull); - nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_FALSE); + nsFormControlFrame::RegUnRegAccessKey(static_cast(this), PR_FALSE); if (mTextListener) { if (mContent) { - mContent->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *,mTextListener), NS_GET_IID(nsIDOMFocusListener)); + mContent->RemoveEventListenerByIID(static_cast(mTextListener), NS_GET_IID(nsIDOMFocusListener)); } nsCOMPtr systemGroup; @@ -1143,8 +1143,8 @@ nsTextControlFrame::PreDestroy() nsCOMPtr dom3Targ = do_QueryInterface(mContent); if (dom3Targ) { // cast because of ambiguous base - nsIDOMEventListener *listener = NS_STATIC_CAST(nsIDOMKeyListener*, - mTextListener); + nsIDOMEventListener *listener = static_cast + (mTextListener); dom3Targ->RemoveGroupedEventListener(NS_LITERAL_STRING("keydown"), listener, PR_FALSE, systemGroup); @@ -1387,8 +1387,8 @@ nsTextControlFrame::CreateFrameFor(nsIContent* aContent) // Create a SelectionController - mSelCon = NS_STATIC_CAST(nsISelectionController*, - new nsTextInputSelectionImpl(mFrameSel, shell, aContent)); + mSelCon = static_cast + (new nsTextInputSelectionImpl(mFrameSel, shell, aContent)); if (!mSelCon) return nsnull; mTextListener = new nsTextInputListener(); @@ -1516,8 +1516,8 @@ nsTextControlFrame::CreateFrameFor(nsIContent* aContent) } } - selPriv->AddSelectionListener(NS_STATIC_CAST(nsISelectionListener*, - mTextListener)); + selPriv->AddSelectionListener(static_cast + (mTextListener)); } if (mContent) { @@ -2732,7 +2732,7 @@ nsTextControlFrame::SetInitialChildList(nsIAtom* aListName, //register focus and key listeners if (mContent) { // register the event listeners with the DOM event receiver - rv = mContent->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *,mTextListener), + rv = mContent->AddEventListenerByIID(static_cast(mTextListener), NS_GET_IID(nsIDOMFocusListener)); NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register focus listener"); // XXXbryner do we need to check for a null presshell here? @@ -2745,8 +2745,8 @@ nsTextControlFrame::SetInitialChildList(nsIAtom* aListName, nsCOMPtr dom3Targ = do_QueryInterface(mContent); if (dom3Targ) { // cast because of ambiguous base - nsIDOMEventListener *listener = NS_STATIC_CAST(nsIDOMKeyListener*, - mTextListener); + nsIDOMEventListener *listener = static_cast + (mTextListener); dom3Targ->AddGroupedEventListener(NS_LITERAL_STRING("keydown"), listener, PR_FALSE, systemGroup); diff --git a/layout/generic/nsBRFrame.cpp b/layout/generic/nsBRFrame.cpp index dce1186397bd..3ab544c71c8e 100644 --- a/layout/generic/nsBRFrame.cpp +++ b/layout/generic/nsBRFrame.cpp @@ -273,7 +273,7 @@ NS_IMETHODIMP BRFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); if (accService) { - return accService->CreateHTMLBRAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible); + return accService->CreateHTMLBRAccessible(static_cast(this), aAccessible); } return NS_ERROR_FAILURE; } diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp index 8d66572f0cc6..21b9d4e0a518 100644 --- a/layout/generic/nsBlockFrame.cpp +++ b/layout/generic/nsBlockFrame.cpp @@ -333,7 +333,7 @@ nsBlockFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) NS_PRECONDITION(aInstancePtr, "null out param"); if (aIID.Equals(kBlockFrameCID)) { - *aInstancePtr = NS_STATIC_CAST(void*, NS_STATIC_CAST(nsBlockFrame*, this)); + *aInstancePtr = static_cast(static_cast(this)); return NS_OK; } if (aIID.Equals(NS_GET_IID(nsILineIterator)) || @@ -352,7 +352,7 @@ nsBlockFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) NS_RELEASE(it); return rv; } - *aInstancePtr = NS_STATIC_CAST(nsILineIteratorNavigator*, it); + *aInstancePtr = static_cast(it); return NS_OK; } @@ -375,18 +375,18 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const fprintf(out, " [parent=%p]", mParent); #endif if (HasView()) { - fprintf(out, " [view=%p]", NS_STATIC_CAST(void*, GetView())); + fprintf(out, " [view=%p]", static_cast(GetView())); } if (nsnull != mNextSibling) { - fprintf(out, " next=%p", NS_STATIC_CAST(void*, mNextSibling)); + fprintf(out, " next=%p", static_cast(mNextSibling)); } // Output the flow linkage if (nsnull != GetPrevInFlow()) { - fprintf(out, " prev-in-flow=%p", NS_STATIC_CAST(void*, GetPrevInFlow())); + fprintf(out, " prev-in-flow=%p", static_cast(GetPrevInFlow())); } if (nsnull != GetNextInFlow()) { - fprintf(out, " next-in-flow=%p", NS_STATIC_CAST(void*, GetNextInFlow())); + fprintf(out, " next-in-flow=%p", static_cast(GetNextInFlow())); } // Output the rect and state @@ -394,7 +394,7 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const if (0 != mState) { fprintf(out, " [state=%08x]", mState); } - nsBlockFrame* f = NS_CONST_CAST(nsBlockFrame*, this); + nsBlockFrame* f = const_cast(this); nsRect* overflowArea = f->GetOverflowAreaProperty(PR_FALSE); if (overflowArea) { fprintf(out, " [overflow=%d,%d,%d,%d]", overflowArea->x, overflowArea->y, @@ -414,7 +414,7 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const } } fprintf(out, " sc=%p(i=%d,b=%d)", - NS_STATIC_CAST(void*, mStyleContext), numInlineLines, numBlockLines); + static_cast(mStyleContext), numInlineLines, numBlockLines); nsIAtom* pseudoTag = mStyleContext->GetPseudoType(); if (pseudoTag) { nsAutoString atomString; @@ -861,7 +861,7 @@ nsBlockFrame::Reflow(nsPresContext* aPresContext, nsSize oldSize = GetSize(); // Should we create a space manager? - nsAutoSpaceManager autoSpaceManager(NS_CONST_CAST(nsHTMLReflowState &, aReflowState)); + nsAutoSpaceManager autoSpaceManager(const_cast(aReflowState)); // XXXldb If we start storing the space manager in the frame rather // than keeping it around only during reflow then we should create it @@ -1385,7 +1385,7 @@ nsBlockFrame::MarkLineDirty(line_iterator aLine) if (gNoisyReflow) { IndentBy(stdout, gNoiseIndent); ListTag(stdout); - printf(": mark line %p dirty\n", NS_STATIC_CAST(void*, aLine.get())); + printf(": mark line %p dirty\n", static_cast(aLine.get())); } #endif @@ -1401,7 +1401,7 @@ nsBlockFrame::MarkLineDirty(line_iterator aLine) IndentBy(stdout, gNoiseIndent); ListTag(stdout); printf(": mark prev-line %p dirty\n", - NS_STATIC_CAST(void*, aLine.prev().get())); + static_cast(aLine.prev().get())); } #endif } @@ -1485,8 +1485,8 @@ nsBlockFrame::PrepareResizeReflow(nsBlockReflowState& aState) if (gNoisyReflow && !line->IsDirty()) { IndentBy(stdout, gNoiseIndent + 1); printf("skipped: line=%p next=%p %s %s%s%s breakTypeBefore/After=%d/%d xmost=%d\n", - NS_STATIC_CAST(void*, line.get()), - NS_STATIC_CAST(void*, (line.next() != end_lines() ? line.next().get() : nsnull)), + static_cast(line.get()), + static_cast((line.next() != end_lines() ? line.next().get() : nsnull)), line->IsBlock() ? "block" : "inline", line->HasBreakAfter() ? "has-break-after " : "", line->HasFloats() ? "has-floats " : "", @@ -1639,7 +1639,7 @@ static void DumpLine(const nsBlockReflowState& aState, nsLineBox* aLine, nsRect lca(aLine->GetCombinedArea()); nsBlockFrame::IndentBy(stdout, nsBlockFrame::gNoiseIndent + aDeltaIndent); printf("line=%p mY=%d dirty=%s oldBounds={%d,%d,%d,%d} oldCombinedArea={%d,%d,%d,%d} deltaY=%d mPrevBottomMargin=%d childCount=%d\n", - NS_STATIC_CAST(void*, aLine), aState.mY, + static_cast(aLine), aState.mY, aLine->IsDirty() ? "yes" : "no", aLine->mBounds.x, aLine->mBounds.y, aLine->mBounds.width, aLine->mBounds.height, @@ -1959,7 +1959,7 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState) } if (!overflowLines) { aState.mNextInFlow = - NS_STATIC_CAST(nsBlockFrame*, nextInFlow->GetNextInFlow()); + static_cast(nextInFlow->GetNextInFlow()); continue; } nifLine = overflowLines->begin(); @@ -2198,7 +2198,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState, printf("%p invalidate (%d, %d, %d, %d)\n", this, dirtyRect.x, dirtyRect.y, dirtyRect.width, dirtyRect.height); if (aLine->IsForceInvalidate()) - printf(" dirty line is %p\n", NS_STATIC_CAST(void*, aLine.get()); + printf(" dirty line is %p\n", static_cast(aLine.get()); #endif Invalidate(dirtyRect); } @@ -2652,7 +2652,7 @@ nsBlockFrame::UndoSplitPlaceholders(nsBlockReflowState& aState, aState.mOverflowPlaceholders.SetFrames(nsnull); } // remove the next in flows of the placeholders that need to be removed - for (nsPlaceholderFrame* placeholder = NS_STATIC_CAST(nsPlaceholderFrame*, undoPlaceholder); + for (nsPlaceholderFrame* placeholder = static_cast(undoPlaceholder); placeholder; ) { NS_ASSERTION(!placeholder->GetNextInFlow(), "Must be the last placeholder"); @@ -2664,7 +2664,7 @@ nsBlockFrame::UndoSplitPlaceholders(nsBlockReflowState& aState, nsSplittableFrame::RemoveFromFlow(placeholder); nsIFrame* savePlaceholder = placeholder; - placeholder = NS_STATIC_CAST(nsPlaceholderFrame*, placeholder->GetNextSibling()); + placeholder = static_cast(placeholder->GetNextSibling()); savePlaceholder->Destroy(); } } @@ -2989,7 +2989,7 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState, // the line is already marked dirty, so just handle the // first case. if (!madeContinuation) { - nsBlockFrame* nifBlock = NS_STATIC_CAST(nsBlockFrame*, nextFrame->GetParent()); + nsBlockFrame* nifBlock = static_cast(nextFrame->GetParent()); NS_ASSERTION(nifBlock->GetType() == nsGkAtoms::blockFrame || nifBlock->GetType() == nsGkAtoms::areaFrame, "A block's child's next in flow's parent must be a block!"); @@ -3449,7 +3449,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState, if (frameReflowStatus & NS_FRAME_REFLOW_NEXTINFLOW) { // we need to ensure that the frame's nextinflow gets reflowed. aState.mReflowStatus |= NS_FRAME_REFLOW_NEXTINFLOW; - nsBlockFrame* ourNext = NS_STATIC_CAST(nsBlockFrame*, GetNextInFlow()); + nsBlockFrame* ourNext = static_cast(GetNextInFlow()); if (ourNext && aFrame->GetNextInFlow()) { line_iterator f = ourNext->FindLineFor(aFrame->GetNextInFlow()); if (f != ourNext->end_lines()) { @@ -3711,7 +3711,7 @@ nsBlockFrame::SplitLine(nsBlockReflowState& aState, if (gNoisyReflow) { nsFrame::IndentBy(stdout, gNoiseIndent); printf("split line: from line=%p pushCount=%d aFrame=", - NS_STATIC_CAST(void*, aLine.get()), pushCount); + static_cast(aLine.get()), pushCount); if (aFrame) { nsFrame::ListTag(stdout, aFrame); } @@ -3841,7 +3841,7 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState, if (abs(aLine->mBounds.y - lastHeight) > CRAZY_H/10) { nsFrame::ListTag(stdout); printf(": line=%p y=%d line.bounds.height=%d\n", - NS_STATIC_CAST(void*, aLine.get()), + static_cast(aLine.get()), aLine->mBounds.y, aLine->mBounds.height); } } @@ -4109,7 +4109,7 @@ nsBlockFrame::HandleOverflowPlaceholdersForPulledFrame( return PR_FALSE; } - nsBlockFrame* parent = NS_STATIC_CAST(nsBlockFrame*, frame->GetParent()); + nsBlockFrame* parent = static_cast(frame->GetParent()); // Remove aFrame and all its next in flows from their parents, but // don't destroy the frames. #ifdef DEBUG @@ -4123,7 +4123,7 @@ nsBlockFrame::HandleOverflowPlaceholdersForPulledFrame( NS_ASSERTION(IsContinuationPlaceholder(frame), "Should only be dealing with continuation placeholders here"); - parent = NS_STATIC_CAST(nsBlockFrame*, frame->GetParent()); + parent = static_cast(frame->GetParent()); ReparentFrame(frame, parent, this); // continuation placeholders are always direct children of a block @@ -4300,8 +4300,8 @@ nsBlockFrame::DrainOverflowLines(nsBlockReflowState& aState) nsLineBox* line = iter; iter = ll->erase(iter); nsIFrame* next; - for (nsPlaceholderFrame* f = NS_STATIC_CAST(nsPlaceholderFrame*, line->mFirstChild); - n > 0; --n, f = NS_STATIC_CAST(nsPlaceholderFrame*, next)) { + for (nsPlaceholderFrame* f = static_cast(line->mFirstChild); + n > 0; --n, f = static_cast(next)) { if (!IsContinuationPlaceholder(f)) { NS_ASSERTION(IsContinuationPlaceholder(f), "Line frames should all be continuation placeholders"); @@ -4361,7 +4361,7 @@ nsBlockFrame::DrainOverflowLines(nsBlockReflowState& aState) nsLineBox* newLine = aState.NewLineBox(f, 1, PR_FALSE); if (newLine) { nsBlockFrame* target = - NS_STATIC_CAST(nsBlockFrame*, fpAncestor->GetNextInFlow()); + static_cast(fpAncestor->GetNextInFlow()); if (!target->mLines.empty()) { f->SetNextSibling(target->mLines.front()->mFirstChild); } else { @@ -4443,8 +4443,8 @@ nsBlockFrame::GetOverflowLines() const if (!(GetStateBits() & NS_BLOCK_HAS_OVERFLOW_LINES)) { return nsnull; } - nsLineList* lines = NS_STATIC_CAST(nsLineList*, - GetProperty(nsGkAtoms::overflowLinesProperty)); + nsLineList* lines = static_cast + (GetProperty(nsGkAtoms::overflowLinesProperty)); NS_ASSERTION(lines && !lines->empty(), "value should always be stored and non-empty when state set"); return lines; @@ -4456,8 +4456,8 @@ nsBlockFrame::RemoveOverflowLines() if (!(GetStateBits() & NS_BLOCK_HAS_OVERFLOW_LINES)) { return nsnull; } - nsLineList* lines = NS_STATIC_CAST(nsLineList*, - UnsetProperty(nsGkAtoms::overflowLinesProperty)); + nsLineList* lines = static_cast + (UnsetProperty(nsGkAtoms::overflowLinesProperty)); NS_ASSERTION(lines && !lines->empty(), "value should always be stored and non-empty when state set"); RemoveStateBits(NS_BLOCK_HAS_OVERFLOW_LINES); @@ -4472,8 +4472,8 @@ DestroyOverflowLines(void* aFrame, void* aDtorData) { if (aPropertyValue) { - nsLineList* lines = NS_STATIC_CAST(nsLineList*, aPropertyValue); - nsPresContext *context = NS_STATIC_CAST(nsPresContext*, aDtorData); + nsLineList* lines = static_cast(aPropertyValue); + nsPresContext *context = static_cast(aDtorData); nsLineBox::DeleteLineList(context, *lines); delete lines; } @@ -4505,8 +4505,8 @@ nsBlockFrame::GetOverflowOutOfFlows() const if (!(GetStateBits() & NS_BLOCK_HAS_OVERFLOW_OUT_OF_FLOWS)) { return nsFrameList(); } - nsIFrame* result = NS_STATIC_CAST(nsIFrame*, - GetProperty(nsGkAtoms::overflowOutOfFlowsProperty)); + nsIFrame* result = static_cast + (GetProperty(nsGkAtoms::overflowOutOfFlowsProperty)); NS_ASSERTION(result, "value should always be non-empty when state set"); return nsFrameList(result); } @@ -4519,8 +4519,8 @@ nsBlockFrame::SetOverflowOutOfFlows(const nsFrameList& aList) if (!(GetStateBits() & NS_BLOCK_HAS_OVERFLOW_OUT_OF_FLOWS)) { return; } - nsIFrame* result = NS_STATIC_CAST(nsIFrame*, - UnsetProperty(nsGkAtoms::overflowOutOfFlowsProperty)); + nsIFrame* result = static_cast + (UnsetProperty(nsGkAtoms::overflowOutOfFlowsProperty)); NS_ASSERTION(result, "value should always be non-empty when state set"); RemoveStateBits(NS_BLOCK_HAS_OVERFLOW_OUT_OF_FLOWS); } else { @@ -4536,8 +4536,8 @@ nsBlockFrame::GetOverflowPlaceholders() const if (!(GetStateBits() & NS_BLOCK_HAS_OVERFLOW_PLACEHOLDERS)) { return nsnull; } - nsFrameList* result = NS_STATIC_CAST(nsFrameList*, - GetProperty(nsGkAtoms::overflowPlaceholdersProperty)); + nsFrameList* result = static_cast + (GetProperty(nsGkAtoms::overflowPlaceholdersProperty)); NS_ASSERTION(result, "value should always be non-empty when state set"); return result; } @@ -4830,7 +4830,7 @@ static void MarkAllDescendantLinesDirty(nsBlockFrame* aBlock) nsIFrame* f = line->mFirstChild; void* bf; if (NS_SUCCEEDED(f->QueryInterface(kBlockFrameCID, &bf))) { - MarkAllDescendantLinesDirty(NS_STATIC_CAST(nsBlockFrame*, f)); + MarkAllDescendantLinesDirty(static_cast(f)); } } line->MarkDirty(); @@ -4847,7 +4847,7 @@ static void MarkSameSpaceManagerLinesDirty(nsBlockFrame* aBlock) QueryInterface(kBlockFrameCID, &bf))) { break; } - blockWithSpaceMgr = NS_STATIC_CAST(nsBlockFrame*, blockWithSpaceMgr->GetParent()); + blockWithSpaceMgr = static_cast(blockWithSpaceMgr->GetParent()); } // Mark every line at and below the line where the float was @@ -4865,7 +4865,7 @@ static PRBool BlockHasAnyFloats(nsIFrame* aFrame) void* bf; if (NS_FAILED(aFrame->QueryInterface(kBlockFrameCID, &bf))) return PR_FALSE; - nsBlockFrame* block = NS_STATIC_CAST(nsBlockFrame*, aFrame); + nsBlockFrame* block = static_cast(aFrame); if (block->GetFirstChild(nsGkAtoms::floatList)) return PR_TRUE; @@ -4976,7 +4976,7 @@ static nsresult RemoveBlockChild(nsIFrame* aFrame, PRBool aDestroyFrames) if (!aFrame) return NS_OK; - nsBlockFrame* nextBlock = NS_STATIC_CAST(nsBlockFrame*, aFrame->GetParent()); + nsBlockFrame* nextBlock = static_cast(aFrame->GetParent()); NS_ASSERTION(nextBlock->GetType() == nsGkAtoms::blockFrame || nextBlock->GetType() == nsGkAtoms::areaFrame, "Our child's continuation's parent is not a block?"); @@ -5329,7 +5329,7 @@ nsBlockFrame::ReflowFloat(nsBlockReflowState& aState, // XXX won't this be done later in nsLineLayout::ReflowFrame anyway?? nsIFrame* nextInFlow = aPlaceholder->GetNextInFlow(); if (nextInFlow) { - NS_STATIC_CAST(nsHTMLContainerFrame*, nextInFlow->GetParent()) + static_cast(nextInFlow->GetParent()) ->DeleteNextInFlowChild(aState.mPresContext, nextInFlow); // that takes care of all subsequent nextinflows too } @@ -5535,7 +5535,7 @@ static void DebugOutputDrawLine(PRInt32 aDepth, nsLineBox* aLine, PRBool aDrawn) nsRect lineArea = aLine->GetCombinedArea(); printf("%s line=%p bounds=%d,%d,%d,%d ca=%d,%d,%d,%d\n", aDrawn ? "draw" : "skip", - NS_STATIC_CAST(void*, aLine), + static_cast(aLine), aLine->mBounds.x, aLine->mBounds.y, aLine->mBounds.width, aLine->mBounds.height, lineArea.x, lineArea.y, @@ -5718,7 +5718,7 @@ NS_IMETHODIMP nsBlockFrame::GetAccessible(nsIAccessible** aAccessible) // block frame may be for
if (mContent->Tag() == nsGkAtoms::hr) { - return accService->CreateHTMLHRAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible); + return accService->CreateHTMLHRAccessible(static_cast(this), aAccessible); } nsPresContext *aPresContext = PresContext(); @@ -5742,7 +5742,7 @@ NS_IMETHODIMP nsBlockFrame::GetAccessible(nsIAccessible** aAccessible) } // Not a bullet, treat as normal HTML container - return accService->CreateHyperTextAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible); + return accService->CreateHyperTextAccessible(static_cast(this), aAccessible); } // Create special list bullet accessible @@ -5757,8 +5757,8 @@ NS_IMETHODIMP nsBlockFrame::GetAccessible(nsIAccessible** aAccessible) mBullet->GetListItemText(*myList, bulletText); } - return accService->CreateHTMLLIAccessible(NS_STATIC_CAST(nsIFrame*, this), - NS_STATIC_CAST(nsIFrame*, mBullet), + return accService->CreateHTMLLIAccessible(static_cast(this), + static_cast(mBullet), bulletText, aAccessible); } @@ -5789,8 +5789,8 @@ nsLineBox* nsBlockFrame::GetFirstLineContaining(nscoord y) { return nsnull; } - nsLineBox* property = NS_STATIC_CAST(nsLineBox*, - GetProperty(nsGkAtoms::lineCursorProperty)); + nsLineBox* property = static_cast + (GetProperty(nsGkAtoms::lineCursorProperty)); line_iterator cursor = mLines.begin(property); nsRect cursorArea = cursor->GetCombinedArea(); @@ -6110,7 +6110,7 @@ nsBlockFrame::RenumberListsInBlock(nsPresContext* aPresContext, } // Advance to the next continuation - aBlockFrame = NS_STATIC_CAST(nsBlockFrame*, aBlockFrame->GetNextInFlow()); + aBlockFrame = static_cast(aBlockFrame->GetNextInFlow()); } return renumberedABullet; diff --git a/layout/generic/nsBlockReflowContext.cpp b/layout/generic/nsBlockReflowContext.cpp index ad46e9ae510d..9b0581b1aacd 100644 --- a/layout/generic/nsBlockReflowContext.cpp +++ b/layout/generic/nsBlockReflowContext.cpp @@ -122,8 +122,8 @@ nsBlockReflowContext::ComputeCollapsedTopMargin(const nsHTMLReflowState& aRS, // for example, if A contains B and A->nextinflow contains // B->nextinflow, we'll traverse B->nextinflow twice. But this is // OK because our traversal is idempotent. - for (nsBlockFrame* block = NS_STATIC_CAST(nsBlockFrame*, frame); - block; block = NS_STATIC_CAST(nsBlockFrame*, block->GetNextInFlow())) { + for (nsBlockFrame* block = static_cast(frame); + block; block = static_cast(block->GetNextInFlow())) { for (PRBool overflowLines = PR_FALSE; overflowLines <= PR_TRUE; ++overflowLines) { nsBlockFrame::line_iterator line; nsBlockFrame::line_iterator line_end; @@ -200,7 +200,7 @@ nsBlockReflowContext::ComputeCollapsedTopMargin(const nsHTMLReflowState& aRS, aMargin->Include(innerReflowState.mComputedMargin.bottom); } if (outerReflowState != &aRS) { - delete NS_CONST_CAST(nsHTMLReflowState*, outerReflowState); + delete const_cast(outerReflowState); } } if (!isEmpty) { @@ -240,7 +240,7 @@ static void nsPointDtor(void *aFrame, nsIAtom *aPropertyName, void *aPropertyValue, void *aDtorData) { - nsPoint *point = NS_STATIC_CAST(nsPoint*, aPropertyValue); + nsPoint *point = static_cast(aPropertyValue); delete point; } @@ -264,8 +264,8 @@ nsBlockReflowContext::ReflowBlock(const nsRect& aSpace, if (NS_STYLE_POSITION_RELATIVE == display->mPosition) { nsPropertyTable *propTable = mPresContext->PropertyTable(); - nsPoint *offsets = NS_STATIC_CAST(nsPoint*, - propTable->GetProperty(mFrame, nsGkAtoms::computedOffsetProperty)); + nsPoint *offsets = static_cast + (propTable->GetProperty(mFrame, nsGkAtoms::computedOffsetProperty)); if (offsets) offsets->MoveTo(aComputedOffsets.left, aComputedOffsets.top); @@ -409,7 +409,7 @@ nsBlockReflowContext::ReflowBlock(const nsRect& aSpace, // Floats will eventually be removed via nsBlockFrame::RemoveFloat // which detaches the placeholder from the float. /* XXX promote DeleteChildsNextInFlow to nsIFrame to elminate this cast */ - NS_STATIC_CAST(nsHTMLContainerFrame*, kidNextInFlow->GetParent()) + static_cast(kidNextInFlow->GetParent()) ->DeleteNextInFlowChild(mPresContext, kidNextInFlow); } } diff --git a/layout/generic/nsBlockReflowState.cpp b/layout/generic/nsBlockReflowState.cpp index 9c0ea3e62dd8..c5f28e8bc60c 100644 --- a/layout/generic/nsBlockReflowState.cpp +++ b/layout/generic/nsBlockReflowState.cpp @@ -104,7 +104,7 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState, mReflowStatus = NS_FRAME_COMPLETE; mPresContext = aPresContext; - mNextInFlow = NS_STATIC_CAST(nsBlockFrame*, mBlock->GetNextInFlow()); + mNextInFlow = static_cast(mBlock->GetNextInFlow()); NS_ASSERTION(NS_UNCONSTRAINEDSIZE != aReflowState.ComputedWidth(), "no unconstrained widths should be present anymore"); @@ -411,8 +411,8 @@ nsBlockReflowState::RecoverFloats(nsLineList::iterator aLine, // accordingly so that we consider relatively positioned frames // at their original position. if (NS_STYLE_POSITION_RELATIVE == kid->GetStyleDisplay()->mPosition) { - nsPoint *offsets = NS_STATIC_CAST(nsPoint*, - mPresContext->PropertyTable()->GetProperty(kid, + nsPoint *offsets = static_cast + (mPresContext->PropertyTable()->GetProperty(kid, nsGkAtoms::computedOffsetProperty)); if (offsets) { @@ -939,8 +939,8 @@ nsBlockReflowState::FlowAndPlaceFloat(nsFloatCache* aFloatCache, // If float is relatively positioned, factor that in as well if (NS_STYLE_POSITION_RELATIVE == floatDisplay->mPosition) { - nsPoint *offsets = NS_STATIC_CAST(nsPoint*, - floatFrame->GetProperty(nsGkAtoms::computedOffsetProperty)); + nsPoint *offsets = static_cast + (floatFrame->GetProperty(nsGkAtoms::computedOffsetProperty)); if (offsets) { origin += *offsets; } @@ -1018,7 +1018,7 @@ nsBlockReflowState::PlaceBelowCurrentLineFloats(nsFloatCacheFreeList& aList, PRB nsIFrame* nextPlaceholder = fc->mPlaceholder->GetNextInFlow(); if (nextPlaceholder) { nsHTMLContainerFrame* parent = - NS_STATIC_CAST(nsHTMLContainerFrame*, nextPlaceholder->GetParent()); + static_cast(nextPlaceholder->GetParent()); parent->DeleteNextInFlowChild(mPresContext, nextPlaceholder); } } diff --git a/layout/generic/nsBulletFrame.cpp b/layout/generic/nsBulletFrame.cpp index 05145e34bfcd..d8e7495ebe66 100644 --- a/layout/generic/nsBulletFrame.cpp +++ b/layout/generic/nsBulletFrame.cpp @@ -103,7 +103,7 @@ nsBulletFrame::Destroy() } if (mListener) - NS_REINTERPRET_CAST(nsBulletListener*, mListener.get())->SetFrame(nsnull); + reinterpret_cast(mListener.get())->SetFrame(nsnull); // Let base class do the rest nsFrame::Destroy(); @@ -194,7 +194,7 @@ public: void nsDisplayBullet::Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx, const nsRect& aDirtyRect) { - NS_STATIC_CAST(nsBulletFrame*, mFrame)-> + static_cast(mFrame)-> PaintBullet(*aCtx, aBuilder->ToReferenceFrame(mFrame), aDirtyRect); } diff --git a/layout/generic/nsColumnSetFrame.cpp b/layout/generic/nsColumnSetFrame.cpp index 291ddd259b76..4d842407af01 100644 --- a/layout/generic/nsColumnSetFrame.cpp +++ b/layout/generic/nsColumnSetFrame.cpp @@ -615,7 +615,7 @@ nsColumnSetFrame::DrainOverflowColumns() { // First grab the prev-in-flows overflows and reparent them to this // frame. - nsColumnSetFrame* prev = NS_STATIC_CAST(nsColumnSetFrame*, GetPrevInFlow()); + nsColumnSetFrame* prev = static_cast(GetPrevInFlow()); if (prev) { nsIFrame* overflows = prev->GetOverflowFrames(PresContext(), PR_TRUE); if (overflows) { diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp index 47ee56beb03e..8500d49519aa 100644 --- a/layout/generic/nsContainerFrame.cpp +++ b/layout/generic/nsContainerFrame.cpp @@ -199,7 +199,7 @@ nsContainerFrame::RemoveFrame(nsIAtom* aListName, PRBool generateReflowCommand = aOldFrame->GetType() == nsGkAtoms::brFrame; - nsContainerFrame* parent = NS_STATIC_CAST(nsContainerFrame*, aOldFrame->GetParent()); + nsContainerFrame* parent = static_cast(aOldFrame->GetParent()); while (aOldFrame) { #ifdef IBMBIDI if (nsGkAtoms::nextBidi != aListName) { @@ -221,7 +221,7 @@ nsContainerFrame::RemoveFrame(nsIAtom* aListName, parent->mFrames.DestroyFrame(aOldFrame); aOldFrame = oldFrameNextContinuation; if (aOldFrame) { - parent = NS_STATIC_CAST(nsContainerFrame*, aOldFrame->GetParent()); + parent = static_cast(aOldFrame->GetParent()); } } @@ -602,10 +602,10 @@ nsContainerFrame::DoInlineIntrinsicWidth(nsIRenderingContext *aRenderingContext, kid = kid->GetNextSibling()) { if (aType == nsLayoutUtils::MIN_WIDTH) kid->AddInlineMinWidth(aRenderingContext, - NS_STATIC_CAST(InlineMinWidthData*, aData)); + static_cast(aData)); else kid->AddInlinePrefWidth(aRenderingContext, - NS_STATIC_CAST(InlinePrefWidthData*, aData)); + static_cast(aData)); } } @@ -683,7 +683,7 @@ nsContainerFrame::ReflowChild(nsIFrame* aKidFrame, // Remove all of the childs next-in-flows. Make sure that we ask // the right parent to do the removal (it's possible that the // parent is not this because we are executing pullup code) - NS_STATIC_CAST(nsContainerFrame*, kidNextInFlow->GetParent()) + static_cast(kidNextInFlow->GetParent()) ->DeleteNextInFlowChild(aPresContext, kidNextInFlow); } } @@ -811,8 +811,8 @@ nsContainerFrame::DeleteNextInFlowChild(nsPresContext* aPresContext, frames.AppendElement(f); } for (PRInt32 i = frames.Count() - 1; i >= 0; --i) { - nsIFrame* delFrame = NS_STATIC_CAST(nsIFrame*, frames.ElementAt(i)); - NS_STATIC_CAST(nsContainerFrame*, delFrame->GetParent()) + nsIFrame* delFrame = static_cast(frames.ElementAt(i)); + static_cast(delFrame->GetParent()) ->DeleteNextInFlowChild(aPresContext, delFrame); } } @@ -988,32 +988,32 @@ nsContainerFrame::List(FILE* out, PRInt32 aIndent) const IndentBy(out, aIndent); ListTag(out); #ifdef DEBUG_waterson - fprintf(out, " [parent=%p]", NS_STATIC_CAST(void*, mParent)); + fprintf(out, " [parent=%p]", static_cast(mParent)); #endif if (HasView()) { - fprintf(out, " [view=%p]", NS_STATIC_CAST(void*, GetView())); + fprintf(out, " [view=%p]", static_cast(GetView())); } if (nsnull != mNextSibling) { - fprintf(out, " next=%p", NS_STATIC_CAST(void*, mNextSibling)); + fprintf(out, " next=%p", static_cast(mNextSibling)); } if (nsnull != GetPrevContinuation()) { - fprintf(out, " prev-continuation=%p", NS_STATIC_CAST(void*, GetPrevContinuation())); + fprintf(out, " prev-continuation=%p", static_cast(GetPrevContinuation())); } if (nsnull != GetNextContinuation()) { - fprintf(out, " next-continuation=%p", NS_STATIC_CAST(void*, GetNextContinuation())); + fprintf(out, " next-continuation=%p", static_cast(GetNextContinuation())); } fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height); if (0 != mState) { fprintf(out, " [state=%08x]", mState); } - fprintf(out, " [content=%p]", NS_STATIC_CAST(void*, mContent)); - nsContainerFrame* f = NS_CONST_CAST(nsContainerFrame*, this); + fprintf(out, " [content=%p]", static_cast(mContent)); + nsContainerFrame* f = const_cast(this); nsRect* overflowArea = f->GetOverflowAreaProperty(PR_FALSE); if (overflowArea) { fprintf(out, " [overflow=%d,%d,%d,%d]", overflowArea->x, overflowArea->y, overflowArea->width, overflowArea->height); } - fprintf(out, " [sc=%p]", NS_STATIC_CAST(void*, mStyleContext)); + fprintf(out, " [sc=%p]", static_cast(mStyleContext)); nsIAtom* pseudoTag = mStyleContext->GetPseudoType(); if (pseudoTag) { nsAutoString atomString; diff --git a/layout/generic/nsFirstLetterFrame.cpp b/layout/generic/nsFirstLetterFrame.cpp index a1729a01833e..c0e258d527b3 100644 --- a/layout/generic/nsFirstLetterFrame.cpp +++ b/layout/generic/nsFirstLetterFrame.cpp @@ -291,7 +291,7 @@ nsFirstLetterFrame::Reflow(nsPresContext* aPresContext, nsIFrame* kidNextInFlow = kid->GetNextInFlow(); if (kidNextInFlow) { // Remove all of the childs next-in-flows - NS_STATIC_CAST(nsContainerFrame*, kidNextInFlow->GetParent()) + static_cast(kidNextInFlow->GetParent()) ->DeleteNextInFlowChild(aPresContext, kidNextInFlow); } } diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index 05003c63710a..7b428e0f29fe 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -513,14 +513,14 @@ nsFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) #ifdef DEBUG if (aIID.Equals(NS_GET_IID(nsIFrameDebug))) { - *aInstancePtr = NS_STATIC_CAST(nsIFrameDebug*, this); + *aInstancePtr = static_cast(this); return NS_OK; } #endif if (aIID.Equals(NS_GET_IID(nsIFrame)) || aIID.Equals(NS_GET_IID(nsISupports))) { - *aInstancePtr = NS_STATIC_CAST(nsIFrame*, this); + *aInstancePtr = static_cast(this); return NS_OK; } @@ -690,8 +690,8 @@ nsIFrame::GetUsedMargin() const nsMargin margin(0, 0, 0, 0); if (!GetStyleMargin()->GetMargin(margin)) { - nsMargin *m = NS_STATIC_CAST(nsMargin*, - GetProperty(nsGkAtoms::usedMarginProperty)); + nsMargin *m = static_cast + (GetProperty(nsGkAtoms::usedMarginProperty)); NS_ASSERTION(m, "used margin property missing (out of memory?)"); if (m) { margin = *m; @@ -708,7 +708,7 @@ nsIFrame::GetUsedBorder() const "cannot call on a dirty frame not currently being reflowed"); // Theme methods don't use const-ness. - nsIFrame *mutable_this = NS_CONST_CAST(nsIFrame*, this); + nsIFrame *mutable_this = const_cast(this); const nsStyleDisplay *disp = GetStyleDisplay(); if (mutable_this->IsThemed(disp)) { @@ -737,7 +737,7 @@ nsIFrame::GetUsedPadding() const nsMargin padding(0, 0, 0, 0); // Theme methods don't use const-ness. - nsIFrame *mutable_this = NS_CONST_CAST(nsIFrame*, this); + nsIFrame *mutable_this = const_cast(this); const nsStyleDisplay *disp = GetStyleDisplay(); if (mutable_this->IsThemed(disp)) { @@ -754,8 +754,8 @@ nsIFrame::GetUsedPadding() const } } if (!GetStylePadding()->GetPadding(padding)) { - nsMargin *p = NS_STATIC_CAST(nsMargin*, - GetProperty(nsGkAtoms::usedPaddingProperty)); + nsMargin *p = static_cast + (GetProperty(nsGkAtoms::usedPaddingProperty)); NS_ASSERTION(p, "used padding property missing (out of memory?)"); if (p) { padding = *p; @@ -1452,7 +1452,7 @@ nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder* aBuilder, nsIAtom* childType = aChild->GetType(); if (childType == nsGkAtoms::placeholderFrame) { - nsPlaceholderFrame* placeholder = NS_STATIC_CAST(nsPlaceholderFrame*, aChild); + nsPlaceholderFrame* placeholder = static_cast(aChild); aChild = placeholder->GetOutOfFlowFrame(); NS_ASSERTION(aChild, "No out of flow frame?"); if (!aChild) @@ -1466,8 +1466,8 @@ nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder* aBuilder, // Recheck NS_FRAME_IS_FLOWABLE if (aChild->GetStateBits() & NS_FRAME_IS_UNFLOWABLE) return NS_OK; - nsRect* savedDirty = NS_STATIC_CAST(nsRect*, - aChild->GetProperty(nsGkAtoms::outOfFlowDirtyRectProperty)); + nsRect* savedDirty = static_cast + (aChild->GetProperty(nsGkAtoms::outOfFlowDirtyRectProperty)); if (savedDirty) { dirty = *savedDirty; } else { @@ -1676,7 +1676,7 @@ nsFrame::HandleEvent(nsPresContext* aPresContext, } if (aEvent->eventStructType == NS_MOUSE_EVENT && - NS_STATIC_CAST(nsMouseEvent*, aEvent)->button == nsMouseEvent::eLeftButton) { + static_cast(aEvent)->button == nsMouseEvent::eLeftButton) { if (aEvent->message == NS_MOUSE_BUTTON_DOWN) { HandlePress(aPresContext, aEvent, aEventStatus); } else if (aEvent->message == NS_MOUSE_BUTTON_UP) { @@ -2123,7 +2123,7 @@ nsFrame::HandleMultiplePress(nsPresContext* aPresContext, if (!theFrame) return NS_ERROR_FAILURE; - nsFrame* frame = NS_STATIC_CAST(nsFrame*, theFrame); + nsFrame* frame = static_cast(theFrame); return frame->PeekBackwardAndForward(beginAmount, endAmount, offsets.offset, aPresContext, @@ -2422,7 +2422,7 @@ NS_IMETHODIMP nsFrame::HandleRelease(nsPresContext* aPresContext, // trickle down here. Make sure that document's frame selection is notified. // Note, this may cause the current nsFrame object to be deleted, bug 336592. if (activeFrame != this && - NS_STATIC_CAST(nsFrame*, activeFrame)->DisplaySelection(activeFrame->PresContext()) + static_cast(activeFrame)->DisplaySelection(activeFrame->PresContext()) != nsISelectionController::SELECTION_OFF) { nsRefPtr frameSelection = activeFrame->GetFrameSelection(); @@ -2870,7 +2870,7 @@ nsIFrame::ContentOffsets nsIFrame::GetContentOffsetsFromPoint(nsPoint aPoint, return offsets; } nsPoint pt = aPoint - closest.frame->GetOffsetTo(this); - return NS_STATIC_CAST(nsFrame*, closest.frame)->CalcContentOffsetsFromFramePoint(pt); + return static_cast(closest.frame)->CalcContentOffsetsFromFramePoint(pt); // XXX should I add some kind of offset standardization? // consider xxxxxzzzzz; should any click between the last @@ -2970,7 +2970,7 @@ nsIFrame::InlineMinWidthData::ForceBreak(nsIRenderingContext *aRenderingContext) currentLine = trailingWhitespace = 0; for (PRInt32 i = 0, i_end = floats.Count(); i != i_end; ++i) { - nsIFrame *floatFrame = NS_STATIC_CAST(nsIFrame*, floats[i]); + nsIFrame *floatFrame = static_cast(floats[i]); nscoord float_min = nsLayoutUtils::IntrinsicForContainer(aRenderingContext, floatFrame, nsLayoutUtils::MIN_WIDTH); @@ -3009,7 +3009,7 @@ nsIFrame::InlinePrefWidthData::ForceBreak(nsIRenderingContext *aRenderingContext floats_cur_right = 0; for (PRInt32 i = 0, i_end = floats.Count(); i != i_end; ++i) { - nsIFrame *floatFrame = NS_STATIC_CAST(nsIFrame*, floats[i]); + nsIFrame *floatFrame = static_cast(floats[i]); const nsStyleDisplay *floatDisp = floatFrame->GetStyleDisplay(); if (floatDisp->mBreakType == NS_STYLE_CLEAR_LEFT || floatDisp->mBreakType == NS_STYLE_CLEAR_RIGHT || @@ -3448,7 +3448,7 @@ nsIFrame::GetView() const NS_ENSURE_SUCCESS(rv, nsnull); NS_ASSERTION(value, "frame state bit was set but frame has no view"); - return NS_STATIC_CAST(nsIView*, value); + return static_cast(value); } /* virtual */ nsIView* @@ -3757,7 +3757,7 @@ nsIFrame::GetOverflowRect() const // of child frames. That's OK because any reflow that updates these // areas will invalidate the appropriate area, so any (mis)uses of // this method will be fixed up. - nsRect* storedOA = NS_CONST_CAST(nsIFrame*, this) + nsRect* storedOA = const_cast(this) ->GetOverflowAreaProperty(PR_FALSE); if (storedOA) { return *storedOA; @@ -3887,10 +3887,10 @@ nsFrame::List(FILE* out, PRInt32 aIndent) const IndentBy(out, aIndent); ListTag(out); #ifdef DEBUG_waterson - fprintf(out, " [parent=%p]", NS_STATIC_CAST(void*, mParent)); + fprintf(out, " [parent=%p]", static_cast(mParent)); #endif if (HasView()) { - fprintf(out, " [view=%p]", NS_STATIC_CAST(void*, GetView())); + fprintf(out, " [view=%p]", static_cast(GetView())); } fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height); if (0 != mState) { @@ -3899,13 +3899,13 @@ nsFrame::List(FILE* out, PRInt32 aIndent) const nsIFrame* prevInFlow = GetPrevInFlow(); nsIFrame* nextInFlow = GetNextInFlow(); if (nsnull != prevInFlow) { - fprintf(out, " prev-in-flow=%p", NS_STATIC_CAST(void*, prevInFlow)); + fprintf(out, " prev-in-flow=%p", static_cast(prevInFlow)); } if (nsnull != nextInFlow) { - fprintf(out, " next-in-flow=%p", NS_STATIC_CAST(void*, nextInFlow)); + fprintf(out, " next-in-flow=%p", static_cast(nextInFlow)); } - fprintf(out, " [content=%p]", NS_STATIC_CAST(void*, mContent)); - nsFrame* f = NS_CONST_CAST(nsFrame*, this); + fprintf(out, " [content=%p]", static_cast(mContent)); + nsFrame* f = const_cast(this); nsRect* overflowArea = f->GetOverflowAreaProperty(PR_FALSE); if (overflowArea) { fprintf(out, " [overflow=%d,%d,%d,%d]", overflowArea->x, overflowArea->y, @@ -5287,7 +5287,7 @@ DestroyRectFunc(void* aFrame, void* aPropertyValue, void* aDtorData) { - delete NS_STATIC_CAST(nsRect*, aPropertyValue); + delete static_cast(aPropertyValue); } nsRect* @@ -5435,8 +5435,8 @@ GetIBSpecialSibling(nsPresContext* aPresContext, * interested in. */ nsresult rv; - nsIFrame *specialSibling = NS_STATIC_CAST(nsIFrame*, - aPresContext->PropertyTable()->GetProperty(aFrame, + nsIFrame *specialSibling = static_cast + (aPresContext->PropertyTable()->GetProperty(aFrame, nsGkAtoms::IBSplitSpecialPrevSibling, &rv)); if (NS_PROPTABLE_PROP_NOT_THERE == rv) { @@ -5585,7 +5585,7 @@ nsFrame::DoGetParentStyleContextFrame(nsPresContext* aPresContext, GetCorrectedParent(aPresContext, this, aProviderFrame); return NS_ERROR_FAILURE; } - return NS_STATIC_CAST(nsFrame*, placeholder)-> + return static_cast(placeholder)-> GetParentStyleContextFrame(aPresContext, aProviderFrame, aIsChild); } @@ -5871,7 +5871,7 @@ nsFrame::RefreshSizeCache(nsBoxLayoutState& aState) metrics->mBlockMinSize.height = 0; // ok we need the max ascent of the items on the line. So to do this // ask the block for its line iterator. Get the max ascent. - nsCOMPtr lines = do_QueryInterface(NS_STATIC_CAST(nsIFrame*, this)); + nsCOMPtr lines = do_QueryInterface(static_cast(this)); if (lines) { metrics->mBlockMinSize.height = 0; @@ -6369,7 +6369,7 @@ nsBoxLayoutMetrics* nsFrame::BoxMetrics() const { nsBoxLayoutMetrics* metrics = - NS_STATIC_CAST(nsBoxLayoutMetrics*, GetProperty(nsGkAtoms::boxMetricsProperty)); + static_cast(GetProperty(nsGkAtoms::boxMetricsProperty)); NS_ASSERTION(metrics, "A box layout method was called but InitBoxMetrics was never called"); return metrics; } @@ -6402,7 +6402,7 @@ DeleteBoxMetrics(void *aObject, void *aPropertyValue, void *aData) { - delete NS_STATIC_CAST(nsBoxLayoutMetrics*, aPropertyValue); + delete static_cast(aPropertyValue); } void diff --git a/layout/generic/nsFrame.h b/layout/generic/nsFrame.h index 21a848f0b5b1..4fe4cd0681f3 100644 --- a/layout/generic/nsFrame.h +++ b/layout/generic/nsFrame.h @@ -440,7 +440,7 @@ public: frameDebug->GetFrameName(tmp); } fputs(NS_LossyConvertUTF16toASCII(tmp).get(), out); - fprintf(out, "@%p", NS_STATIC_CAST(void*, aFrame)); + fprintf(out, "@%p", static_cast(aFrame)); } static void IndentBy(FILE* out, PRInt32 aIndent) { diff --git a/layout/generic/nsFrameFrame.cpp b/layout/generic/nsFrameFrame.cpp index 05b2f5ca90e3..a654fb0f0226 100644 --- a/layout/generic/nsFrameFrame.cpp +++ b/layout/generic/nsFrameFrame.cpp @@ -205,7 +205,7 @@ nsSubDocumentFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) NS_PRECONDITION(aInstancePtr, "null out param"); if (aIID.Equals(NS_GET_IID(nsIFrameFrame))) { - *aInstancePtr = NS_STATIC_CAST(nsIFrameFrame*, this); + *aInstancePtr = static_cast(this); return NS_OK; } @@ -300,7 +300,7 @@ nsSubDocumentFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, nsIView* subdocView = mInnerView->GetFirstChild(); if (!subdocView) return NS_OK; - nsIFrame* f = NS_STATIC_CAST(nsIFrame*, subdocView->GetClientData()); + nsIFrame* f = static_cast(subdocView->GetClientData()); if (!f) return NS_OK; diff --git a/layout/generic/nsFrameList.cpp b/layout/generic/nsFrameList.cpp index 77c252db1ec5..6b534f55df34 100644 --- a/layout/generic/nsFrameList.cpp +++ b/layout/generic/nsFrameList.cpp @@ -304,8 +304,8 @@ nsFrameList::GetLength() const static int PR_CALLBACK CompareByContentOrder(const void* aF1, const void* aF2, void* aDummy) { - const nsIFrame* f1 = NS_STATIC_CAST(const nsIFrame*, aF1); - const nsIFrame* f2 = NS_STATIC_CAST(const nsIFrame*, aF2); + const nsIFrame* f1 = static_cast(aF1); + const nsIFrame* f2 = static_cast(aF2); if (f1->GetContent() != f2->GetContent()) { return nsLayoutUtils::CompareTreePosition(f1->GetContent(), f2->GetContent()); } @@ -344,9 +344,9 @@ nsFrameList::SortByContentOrder() array.AppendElement(f); } array.Sort(CompareByContentOrder, nsnull); - f = mFirstChild = NS_STATIC_CAST(nsIFrame*, array.FastElementAt(0)); + f = mFirstChild = static_cast(array.FastElementAt(0)); for (PRInt32 i = 1; i < array.Count(); ++i) { - nsIFrame* ff = NS_STATIC_CAST(nsIFrame*, array.FastElementAt(i)); + nsIFrame* ff = static_cast(array.FastElementAt(i)); f->SetNextSibling(ff); f = ff; } diff --git a/layout/generic/nsFrameSetFrame.cpp b/layout/generic/nsFrameSetFrame.cpp index f5b835e35e9a..bf94e96b1545 100644 --- a/layout/generic/nsFrameSetFrame.cpp +++ b/layout/generic/nsFrameSetFrame.cpp @@ -268,7 +268,7 @@ int nsHTMLFramesetFrame::FrameResizePrefCallback(const char* aPref, void* aClosure) { nsHTMLFramesetFrame *frame = - NS_REINTERPRET_CAST(nsHTMLFramesetFrame *, aClosure); + reinterpret_cast(aClosure); nsIDocument* doc = frame->mContent->GetDocument(); mozAutoDocUpdate updateBatch(doc, UPDATE_CONTENT_MODEL, PR_TRUE); @@ -791,7 +791,7 @@ NS_METHOD nsHTMLFramesetFrame::HandleEvent(nsPresContext* aPresContext, break; case NS_MOUSE_BUTTON_UP: if (aEvent->eventStructType == NS_MOUSE_EVENT && - NS_STATIC_CAST(nsMouseEvent*, aEvent)->button == + static_cast(aEvent)->button == nsMouseEvent::eLeftButton) { EndMouseDrag(aPresContext); } @@ -1680,7 +1680,7 @@ public: void nsDisplayFramesetBorder::Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx, const nsRect& aDirtyRect) { - NS_STATIC_CAST(nsHTMLFramesetBorderFrame*, mFrame)-> + static_cast(mFrame)-> PaintBorder(*aCtx, aBuilder->ToReferenceFrame(mFrame)); } @@ -1793,7 +1793,7 @@ nsHTMLFramesetBorderFrame::HandleEvent(nsPresContext* aPresContext, if (aEvent->eventStructType == NS_MOUSE_EVENT && aEvent->message == NS_MOUSE_BUTTON_DOWN && - NS_STATIC_CAST(nsMouseEvent*, aEvent)->button == nsMouseEvent::eLeftButton) { + static_cast(aEvent)->button == nsMouseEvent::eLeftButton) { nsHTMLFramesetFrame* parentFrame; nsIFrame* fptr = GetParent(); parentFrame = (nsHTMLFramesetFrame*) fptr; diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp index a58362920de8..5de52542c0a9 100644 --- a/layout/generic/nsGfxScrollFrame.cpp +++ b/layout/generic/nsGfxScrollFrame.cpp @@ -422,8 +422,7 @@ nsHTMLScrollFrame::ReflowScrolledFrame(const ScrollReflowState& aState, if (aAssumeVScroll) { nsSize vScrollbarPrefSize = - mInner.mVScrollbarBox->GetPrefSize(NS_CONST_CAST(nsBoxLayoutState&, - aState.mBoxState)); + mInner.mVScrollbarBox->GetPrefSize(const_cast(aState.mBoxState)); availWidth = PR_MAX(0, availWidth - vScrollbarPrefSize.width); } // pixel align the content @@ -837,7 +836,7 @@ NS_IMETHODIMP nsHTMLScrollFrame::GetAccessible(nsIAccessible** aAccessible) nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); if (accService) { - return accService->CreateHTMLGenericAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible); + return accService->CreateHTMLGenericAccessible(static_cast(this), aAccessible); } return NS_ERROR_FAILURE; diff --git a/layout/generic/nsHTMLCanvasFrame.cpp b/layout/generic/nsHTMLCanvasFrame.cpp index b12eba102fdd..52f70a225b0e 100644 --- a/layout/generic/nsHTMLCanvasFrame.cpp +++ b/layout/generic/nsHTMLCanvasFrame.cpp @@ -221,7 +221,7 @@ nsHTMLCanvasFrame::PaintCanvas(nsIRenderingContext& aRenderingContext, static void PaintCanvas(nsIFrame* aFrame, nsIRenderingContext* aCtx, const nsRect& aDirtyRect, nsPoint aPt) { - NS_STATIC_CAST(nsHTMLCanvasFrame*, aFrame)->PaintCanvas(*aCtx, aDirtyRect, aPt); + static_cast(aFrame)->PaintCanvas(*aCtx, aDirtyRect, aPt); } NS_IMETHODIMP diff --git a/layout/generic/nsHTMLContainerFrame.cpp b/layout/generic/nsHTMLContainerFrame.cpp index b69aee2a246c..7529f3c8d28d 100644 --- a/layout/generic/nsHTMLContainerFrame.cpp +++ b/layout/generic/nsHTMLContainerFrame.cpp @@ -112,7 +112,7 @@ nsDisplayTextDecoration::Paint(nsDisplayListBuilder* aBuilder, // REVIEW: From nsHTMLContainerFrame::PaintTextDecorations nscoord ascent, offset, size; - nsHTMLContainerFrame* f = NS_STATIC_CAST(nsHTMLContainerFrame*, mFrame); + nsHTMLContainerFrame* f = static_cast(mFrame); fm->GetMaxAscent(ascent); if (mDecoration != NS_STYLE_TEXT_DECORATION_LINE_THROUGH) { fm->GetUnderline(offset, size); diff --git a/layout/generic/nsHTMLFrame.cpp b/layout/generic/nsHTMLFrame.cpp index cead8c5072ca..133fb49f489d 100644 --- a/layout/generic/nsHTMLFrame.cpp +++ b/layout/generic/nsHTMLFrame.cpp @@ -165,11 +165,11 @@ CanvasFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) NS_PRECONDITION(aInstancePtr, "null out param"); if (aIID.Equals(NS_GET_IID(nsIScrollPositionListener))) { - *aInstancePtr = NS_STATIC_CAST(nsIScrollPositionListener*, this); + *aInstancePtr = static_cast(this); return NS_OK; } if (aIID.Equals(NS_GET_IID(nsICanvasFrame))) { - *aInstancePtr = NS_STATIC_CAST(nsICanvasFrame*, this); + *aInstancePtr = static_cast(this); return NS_OK; } @@ -361,14 +361,14 @@ public: virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder) { - CanvasFrame* frame = NS_STATIC_CAST(CanvasFrame*, mFrame); + CanvasFrame* frame = static_cast(mFrame); return frame->CanvasArea() + aBuilder->ToReferenceFrame(mFrame); } virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx, const nsRect& aDirtyRect) { - CanvasFrame* frame = NS_STATIC_CAST(CanvasFrame*, mFrame); + CanvasFrame* frame = static_cast(mFrame); nsPoint offset = aBuilder->ToReferenceFrame(mFrame); nsRect bgClipRect = frame->CanvasArea() + offset; nsCSSRendering::PaintBackground(mFrame->PresContext(), *aCtx, mFrame, @@ -398,14 +398,14 @@ public: virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder) { // This is an overestimate, but that's not a problem. - CanvasFrame* frame = NS_STATIC_CAST(CanvasFrame*, mFrame); + CanvasFrame* frame = static_cast(mFrame); return frame->CanvasArea() + aBuilder->ToReferenceFrame(mFrame); } virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx, const nsRect& aDirtyRect) { - CanvasFrame* frame = NS_STATIC_CAST(CanvasFrame*, mFrame); + CanvasFrame* frame = static_cast(mFrame); frame->PaintFocus(*aCtx, aBuilder->ToReferenceFrame(mFrame)); } diff --git a/layout/generic/nsHTMLReflowState.cpp b/layout/generic/nsHTMLReflowState.cpp index 683443d2e5cd..b36ef9495c2a 100644 --- a/layout/generic/nsHTMLReflowState.cpp +++ b/layout/generic/nsHTMLReflowState.cpp @@ -914,7 +914,7 @@ nsHTMLReflowState::CalculateHypotheticalBox(nsPresContext* aPresContext, // First, determine the hypothetical box's mTop nsBlockFrame* blockFrame; if (NS_SUCCEEDED(aContainingBlock->QueryInterface(kBlockFrameCID, - NS_REINTERPRET_CAST(void**, &blockFrame)))) { + reinterpret_cast(&blockFrame)))) { // We need the immediate child of the block frame, and that may not be // the placeholder frame nsIFrame *blockChild = @@ -1574,8 +1574,8 @@ static eNormalLineHeightControl GetNormalLineHeightCalcControl(void) // browser.display.normal_lineheight_calc_control is not user // changeable, so no need to register callback for it. sNormalLineHeightControl = - NS_STATIC_CAST(eNormalLineHeightControl, - nsContentUtils::GetIntPref("browser.display.normal_lineheight_calc_control", eNoExternalLeading)); + static_cast + (nsContentUtils::GetIntPref("browser.display.normal_lineheight_calc_control", eNoExternalLeading)); } return sNormalLineHeightControl; } @@ -1863,7 +1863,7 @@ nsCSSOffsetState::InitOffsets(nscoord aContainingBlockWidth, mComputedBorderPadding += mComputedPadding; if (frame->GetType() == nsGkAtoms::tableFrame) { - nsTableFrame *tableFrame = NS_STATIC_CAST(nsTableFrame*, frame); + nsTableFrame *tableFrame = static_cast(frame); if (tableFrame->IsBorderCollapse()) { // border-collapsed tables don't use any of their padding, and @@ -2086,7 +2086,7 @@ nsCSSOffsetState::DestroyMarginFunc(void* aFrame, void* aPropertyValue, void* aDtorData) { - delete NS_STATIC_CAST(nsMargin*, aPropertyValue); + delete static_cast(aPropertyValue); } void diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h index 98b33907b5cc..97b1272af676 100644 --- a/layout/generic/nsIFrame.h +++ b/layout/generic/nsIFrame.h @@ -616,7 +616,7 @@ public: #else #define STYLE_STRUCT(name_, checkdata_cb_, ctor_args_) \ const nsStyle##name_ * GetStyle##name_ () const { \ - return NS_STATIC_CAST(const nsStyle##name_*, \ + return static_cast(\ GetStyleDataExternal(eStyleStruct_##name_)); \ } #endif @@ -1011,10 +1011,10 @@ public: virtual nsIFrame* GetNextContinuation() const = 0; NS_IMETHOD SetNextContinuation(nsIFrame*) = 0; virtual nsIFrame* GetFirstContinuation() const { - return NS_CONST_CAST(nsIFrame*, this); + return const_cast(this); } virtual nsIFrame* GetLastContinuation() const { - return NS_CONST_CAST(nsIFrame*, this); + return const_cast(this); } /** @@ -1032,14 +1032,14 @@ public: * Return the first frame in our current flow. */ virtual nsIFrame* GetFirstInFlow() const { - return NS_CONST_CAST(nsIFrame*, this); + return const_cast(this); } /** * Return the last frame in our current flow. */ virtual nsIFrame* GetLastInFlow() const { - return NS_CONST_CAST(nsIFrame*, this); + return const_cast(this); } diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp index 626a2b3f3363..dfb1ba7540d8 100644 --- a/layout/generic/nsImageFrame.cpp +++ b/layout/generic/nsImageFrame.cpp @@ -191,7 +191,7 @@ nsImageFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) NS_PRECONDITION(aInstancePtr, "null out param"); if (aIID.Equals(NS_GET_IID(nsIImageFrame))) { - *aInstancePtr = NS_STATIC_CAST(nsIImageFrame*, this); + *aInstancePtr = static_cast(this); return NS_OK; } @@ -204,7 +204,7 @@ NS_IMETHODIMP nsImageFrame::GetAccessible(nsIAccessible** aAccessible) nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); if (accService) { - return accService->CreateHTMLImageAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible); + return accService->CreateHTMLImageAccessible(static_cast(this), aAccessible); } return NS_ERROR_FAILURE; @@ -241,7 +241,7 @@ nsImageFrame::Destroy() imageLoader->RemoveObserver(mListener); } - NS_REINTERPRET_CAST(nsImageListener*, mListener.get())->SetFrame(nsnull); + reinterpret_cast(mListener.get())->SetFrame(nsnull); } mListener = nsnull; @@ -1108,7 +1108,7 @@ nsImageFrame::DisplayAltFeedback(nsIRenderingContext& aRenderingContext, static void PaintAltFeedback(nsIFrame* aFrame, nsIRenderingContext* aCtx, const nsRect& aDirtyRect, nsPoint aPt) { - nsImageFrame* f = NS_STATIC_CAST(nsImageFrame*, aFrame); + nsImageFrame* f = static_cast(aFrame); f->DisplayAltFeedback(*aCtx, aDirtyRect, IMAGE_OK(f->GetContent()->IntrinsicState(), PR_TRUE) @@ -1120,7 +1120,7 @@ static void PaintAltFeedback(nsIFrame* aFrame, nsIRenderingContext* aCtx, #ifdef NS_DEBUG static void PaintDebugImageMap(nsIFrame* aFrame, nsIRenderingContext* aCtx, const nsRect& aDirtyRect, nsPoint aPt) { - nsImageFrame* f = NS_STATIC_CAST(nsImageFrame*, aFrame); + nsImageFrame* f = static_cast(aFrame); nsRect inner = f->GetInnerArea() + aPt; nsPresContext* pc = f->PresContext(); @@ -1157,7 +1157,7 @@ private: void nsDisplayImage::Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx, const nsRect& aDirtyRect) { - NS_STATIC_CAST(nsImageFrame*, mFrame)-> + static_cast(mFrame)-> PaintImage(*aCtx, aBuilder->ToReferenceFrame(mFrame), aDirtyRect, mImage); } @@ -1469,7 +1469,7 @@ nsImageFrame::HandleEvent(nsPresContext* aPresContext, if (aEvent->eventStructType == NS_MOUSE_EVENT && (aEvent->message == NS_MOUSE_BUTTON_UP && - NS_STATIC_CAST(nsMouseEvent*, aEvent)->button == nsMouseEvent::eLeftButton) || + static_cast(aEvent)->button == nsMouseEvent::eLeftButton) || aEvent->message == NS_MOUSE_MOVE) { map = GetImageMap(aPresContext); PRBool isServerMap = IsServerImageMap(); diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp index 5bf3699a5d5f..3ccf389839ec 100644 --- a/layout/generic/nsInlineFrame.cpp +++ b/layout/generic/nsInlineFrame.cpp @@ -798,11 +798,11 @@ NS_IMETHODIMP nsInlineFrame::GetAccessible(nsIAccessible** aAccessible) if (!accService) return NS_ERROR_FAILURE; if (tagAtom == nsGkAtoms::input) // Broken - return accService->CreateHTMLButtonAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible); + return accService->CreateHTMLButtonAccessible(static_cast(this), aAccessible); else if (tagAtom == nsGkAtoms::img) // Create accessible for broken - return accService->CreateHTMLImageAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible); + return accService->CreateHTMLImageAccessible(static_cast(this), aAccessible); else if (tagAtom == nsGkAtoms::label) // Creat accessible for