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.
git-svn-id: svn://10.0.0.236/trunk@229504 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -88,7 +88,7 @@ nsHTMLButtonControlFrame::~nsHTMLButtonControlFrame()
|
||||
void
|
||||
nsHTMLButtonControlFrame::Destroy()
|
||||
{
|
||||
nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_FALSE);
|
||||
nsFormControlFrame::RegUnRegAccessKey(static_cast<nsIFrame*>(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<nsIFormControlFrame*>(this);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@@ -140,10 +140,10 @@ NS_IMETHODIMP nsHTMLButtonControlFrame::GetAccessible(nsIAccessible** aAccessibl
|
||||
nsIContent* content = GetContent();
|
||||
nsCOMPtr<nsIDOMHTMLButtonElement> 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<nsIFrame*>(this), aAccessible);
|
||||
nsCOMPtr<nsIDOMHTMLInputElement> 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<nsIFrame*>(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<nsIFrame*>(this), PR_TRUE);
|
||||
}
|
||||
|
||||
// Reflow the child
|
||||
|
||||
Reference in New Issue
Block a user