From dbe62cc77f6a4cc2a2e282107235b178421b0c83 Mon Sep 17 00:00:00 2001
From: John Scipione <jscipione@gmail.com>
Date: Fri, 20 Jun 2014 18:38:35 -0400
Subject: [PATCH] Tracker: style fixes to MountMenu class

---
 src/kits/tracker/MountMenu.cpp | 37 +++++++++++++++++++++-------------
 src/kits/tracker/MountMenu.h   |  9 ++++-----
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/kits/tracker/MountMenu.cpp b/src/kits/tracker/MountMenu.cpp
index e00810be6b..a84304335d 100644
--- a/src/kits/tracker/MountMenu.cpp
+++ b/src/kits/tracker/MountMenu.cpp
@@ -34,6 +34,9 @@ All rights reserved.
 
 // MountMenu implements a context menu used for mounting/unmounting volumes
 
+
+#include "MountMenu.h"
+
 #include <Catalog.h>
 #include <Debug.h>
 #include <Locale.h>
@@ -42,10 +45,10 @@ All rights reserved.
 #include <InterfaceDefs.h>
 #include <VolumeRoster.h>
 #include <Volume.h>
+
 #include <fs_info.h>
 
 #include "Commands.h"
-#include "MountMenu.h"
 #include "IconMenuItem.h"
 #include "Tracker.h"
 #include "Bitmaps.h"
@@ -55,20 +58,26 @@ All rights reserved.
 
 #define SHOW_NETWORK_VOLUMES
 
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MountMenu"
+
 
 class AddMenuItemVisitor : public BDiskDeviceVisitor {
-	public:
-		AddMenuItemVisitor(BMenu* menu);
-		virtual ~AddMenuItemVisitor();
+public:
+	AddMenuItemVisitor(BMenu* menu);
+	virtual ~AddMenuItemVisitor();
 
-		virtual bool Visit(BDiskDevice* device);
-		virtual bool Visit(BPartition* partition, int32 level);
+	virtual bool Visit(BDiskDevice* device);
+	virtual bool Visit(BPartition* partition, int32 level);
 
-	private:
-		BMenu* fMenu;
+private:
+	BMenu* fMenu;
 };
 
 
+//	#pragma mark - AddMenuItemVisitor
+
+
 AddMenuItemVisitor::AddMenuItemVisitor(BMenu* menu)
 	:
 	fMenu(menu)
@@ -153,12 +162,9 @@ AddMenuItemVisitor::Visit(BPartition* partition, int32 level)
 }
 
 
-//	#pragma mark -
+//	#pragma mark - MountMenu
 
 
-#undef B_TRANSLATION_CONTEXT
-#define B_TRANSLATION_CONTEXT "MountMenu"
-
 MountMenu::MountMenu(const char* name)
 	: BMenu(name)
 {
@@ -200,8 +206,11 @@ MountMenu::AddDynamicItem(add_state)
 				continue;
 			}
 			// Use the shared icon instead of the device icon
-			if (get_device_icon(info.device_name, icon->Bits(), B_MINI_ICON) != B_OK)
-				GetTrackerResources()->GetIconResource(R_ShareIcon, B_MINI_ICON, icon);
+			if (get_device_icon(info.device_name, icon->Bits(), B_MINI_ICON)
+					!= B_OK) {
+				GetTrackerResources()->GetIconResource(R_ShareIcon,
+					B_MINI_ICON, icon);
+			}
 
 			BMessage* message = new BMessage(kUnmountVolume);
 			message->AddInt32("device_id", volume.Device());
diff --git a/src/kits/tracker/MountMenu.h b/src/kits/tracker/MountMenu.h
index 1d4d093bad..fb16ba1dad 100644
--- a/src/kits/tracker/MountMenu.h
+++ b/src/kits/tracker/MountMenu.h
@@ -31,8 +31,8 @@ of Be Incorporated in the United States and other countries. Other brand product
 names are registered trademarks or trademarks of their respective holders.
 All rights reserved.
 */
-#ifndef MOUNTMENU_H
-#define MOUNTMENU_H
+#ifndef _MOUNT_MENU_H
+#define _MOUNT_MENU_H
 
 
 #include <Menu.h>
@@ -42,11 +42,9 @@ namespace BPrivate {
 
 class MountMenu : public BMenu {
 public:
-
 	MountMenu(const char*);
 
 protected:
-
 	virtual bool AddDynamicItem(add_state state);
 
 };
@@ -55,4 +53,5 @@ protected:
 
 using namespace BPrivate;
 
-#endif	// MOUNTMENU_H
+
+#endif	// _MOUNT_MENU_H