From cb7c5f05bb564cf484b0ba38d3f200406c59640f Mon Sep 17 00:00:00 2001
From: John Scipione <jscipione@gmail.com>
Date: Wed, 14 Nov 2012 14:00:25 -0500
Subject: [PATCH] Use a static_cast when removing menu item from BarMenuBar

... instead of a C-style cast. Also some minor style fixes.

Might fix #9151 although since I can't reproduce the bug here I have
no way of knowing.
---
 src/apps/deskbar/BarMenuBar.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/apps/deskbar/BarMenuBar.cpp b/src/apps/deskbar/BarMenuBar.cpp
index afacc894c1..f40abc8f5e 100644
--- a/src/apps/deskbar/BarMenuBar.cpp
+++ b/src/apps/deskbar/BarMenuBar.cpp
@@ -109,11 +109,12 @@ TBarMenuBar::AddTeamMenu()
 		return;
 
 	BRect frame(Frame());
-	delete fAppListMenuItem;
 
+	delete fAppListMenuItem;
 	fAppListMenuItem = new TBarMenuTitle(0.0f, 0.0f,
 		AppResSet()->FindBitmap(B_MESSAGE_TYPE, R_TeamIcon), new TTeamMenu());
 	AddItem(fAppListMenuItem);
+
 	SmartResize(frame.Width() - 1.0f, frame.Height());
 }
 
@@ -124,13 +125,13 @@ TBarMenuBar::RemoveTeamMenu()
 	if (CountItems() < 2)
 		return;
 
-	if (fAppListMenuItem) {
-		RemoveItem((BMenuItem*)fAppListMenuItem);
+	if (fAppListMenuItem != NULL) {
+		RemoveItem(static_cast<BMenuItem*>(fAppListMenuItem));
 		delete fAppListMenuItem;
 		fAppListMenuItem = NULL;
 	}
 
-	BRect frame = Frame();
+	BRect frame(Frame());
 	SmartResize(frame.Width(), frame.Height());
 }
 
@@ -142,12 +143,13 @@ TBarMenuBar::AddSeperatorItem()
 		return;
 
 	BRect frame(Frame());
-	delete fSeparatorItem;
 
+	delete fSeparatorItem;
 	fSeparatorItem = new TTeamMenuItem(kSepItemWidth,
 		frame.Height() - 2, false);
 	AddItem(fSeparatorItem);
 	fSeparatorItem->SetEnabled(false);
+
 	SmartResize(frame.Width() - 1.0f, frame.Height());
 }
 
@@ -158,13 +160,13 @@ TBarMenuBar::RemoveSeperatorItem()
 	if (CountItems() < 2)
 		return;
 
-	if (fSeparatorItem) {
-		RemoveItem((BMenuItem*)fSeparatorItem);
+	if (fSeparatorItem != NULL) {
+		RemoveItem(static_cast<BMenuItem*>(fSeparatorItem));
 		delete fSeparatorItem;
 		fSeparatorItem = NULL;
 	}
 
-	BRect frame = Frame();
+	BRect frame(Frame());
 	SmartResize(frame.Width(), frame.Height());
 }