Tracker: style fixes to ContainerWindow

src/kits/tracker/ContainerWindow.cpp

@@ -167,7 +167,7 @@ ActivateWindowFilter(BMessage*, BHandler** target, BMessageFilter*)
 
 	// activate the window if no PoseView or DraggableContainerIcon had been
 	// pressed (those will activate the window themselves, if necessary)
-	if (view
+	if (view != NULL
 		&& !dynamic_cast<BPoseView*>(view)
 		&& !dynamic_cast<DraggableContainerIcon*>(view)
 		&& view->Window())
@@ -310,7 +310,7 @@ AddMimeTypeString(BObjectList<BString> &list, Model* model)
 }
 
 
-//	#pragma mark -
+//	#pragma mark - DraggableContainerIcon
 
 
 DraggableContainerIcon::DraggableContainerIcon(BRect rect, const char* name,
@@ -519,7 +519,7 @@ DraggableContainerIcon::Draw(BRect updateRect)
 }
 
 
-//	#pragma mark -
+//	#pragma mark - BContainerWindow
 
 
 BContainerWindow::BContainerWindow(LockingList<BWindow>* list,
@@ -1064,7 +1064,7 @@ BContainerWindow::RestoreStateCommon()
 	WindowStateNodeOpener opener(this, false);
 
 	bool isDesktop = dynamic_cast<BDeskWindow*>(this) != NULL;
-	if (!TargetModel()->IsRoot() && opener.Node()) {
+	if (!TargetModel()->IsRoot() && opener.Node() != NULL) {
 		// don't pick up background image for root disks
 		// to do this, would have to have a unique attribute for the
 		// disks window that doesn't collide with the desktop
@@ -1115,7 +1115,7 @@ BContainerWindow::UpdateBackgroundImage()
 	bool isDesktop = dynamic_cast<BDeskWindow*>(this) != NULL;
 	WindowStateNodeOpener opener(this, false);
 
-	if (!TargetModel()->IsRoot() && opener.Node()) {
+	if (!TargetModel()->IsRoot() && opener.Node() != NULL) {
 		fBackgroundImage = BackgroundImage::Refresh(fBackgroundImage,
 			opener.Node(), isDesktop, PoseView());
 	}
@@ -1225,7 +1225,7 @@ BContainerWindow::SaveState(bool hide)
 {
 	if (SaveStateIsEnabled()) {
 		WindowStateNodeOpener opener(this, true);
-		if (opener.StreamNode())
+		if (opener.StreamNode() != NULL)
 			SaveWindowState(opener.StreamNode());
 
 		if (hide)
@@ -1729,6 +1729,7 @@ BContainerWindow::MessageReceived(BMessage* message)
 
 					default:
 						_inherited::MessageReceived(message);
+						break;
 				}
 			}
 			break;
@@ -1742,13 +1743,15 @@ BContainerWindow::MessageReceived(BMessage* message)
 			FSUndo();
 			break;
 
-		//case B_REDO:	// only defined in Dano/Zeta/OpenBeOS
+		//case B_REDO:
+			// only defined in Dano/Zeta/OpenBeOS
 		case kRedo:
 			FSRedo();
 			break;
 
 		default:
 			_inherited::MessageReceived(message);
+			break;
 	}
 }
 
@@ -3185,10 +3188,10 @@ BContainerWindow::UpdateMenu(BMenu* menu, UpdateMenuContext context)
 		EnableNamedMenuItem(menu, B_SELECT_ALL, count > 0);
 
 		BMenuItem* item = menu->FindItem(B_TRANSLATE("New"));
-		if (item) {
+		if (item != NULL) {
 			TemplatesMenu* templateMenu = dynamic_cast<TemplatesMenu*>
 				(item->Submenu());
-			if (templateMenu)
+			if (templateMenu != NULL)
 				templateMenu->UpdateMenuState();
 		}
 	}
@@ -3661,9 +3664,10 @@ BContainerWindow::NeedsDefaultStateSetup()
 		return false;
 
 	WindowStateNodeOpener opener(this, false);
-	if (!opener.StreamNode())
+	if (opener.StreamNode() == NULL) {
 		// can't read state, give up
 		return false;
+	}
 
 	return !NodeHasSavedState(opener.Node());
 }
@@ -3736,7 +3740,7 @@ BContainerWindow::SetUpDefaultState()
 
 	WindowStateNodeOpener opener(this, true);
 		// this is our destination node, whatever it is for this window
-	if (!opener.StreamNode())
+	if (opener.StreamNode() == NULL)
 		return;
 
 	if (!TargetModel()->IsRoot()) {
@@ -3806,7 +3810,7 @@ BContainerWindow::SetUpDefaultState()
 void
 BContainerWindow::RestoreWindowState(AttributeStreamNode* node)
 {
-	if (node == NULL || dynamic_cast<BDeskWindow*>(this)) {
+	if (node == NULL || dynamic_cast<BDeskWindow*>(this) != NULL) {
 		// don't restore any window state if we are a desktop window
 		return;
 	}
@@ -4218,12 +4222,13 @@ BContainerWindow::PopulateArrangeByMenu(BMenu* menu)
 }
 
 
-//	#pragma mark -
+//	#pragma mark - WindowStateNodeOpener
 
 
 WindowStateNodeOpener::WindowStateNodeOpener(BContainerWindow* window,
 	bool forWriting)
-	:	fModelOpener(NULL),
+	:
+	fModelOpener(NULL),
 	fNode(NULL),
 	fStreamNode(NULL)
 {
@@ -4314,11 +4319,12 @@ WindowStateNodeOpener::Node() const
 }
 
 
-//	#pragma mark -
+//	#pragma mark - BackgroundView
 
 
 BackgroundView::BackgroundView(BRect frame)
-	:	BView(frame, "", B_FOLLOW_ALL,
+	:
+	BView(frame, "", B_FOLLOW_ALL,
 		B_FRAME_EVENTS | B_WILL_DRAW | B_PULSE_NEEDED)
 {
 }
@@ -4431,4 +4437,3 @@ BackgroundView::Pulse()
 	if (window)
 		window->PulseTaskLoop();
 }
-

src/kits/tracker/ContainerWindow.h

@@ -56,14 +56,17 @@ class Model;
 class ModelNodeLazyOpener;
 class SelectionWindow;
 
+
 #define kDefaultFolderTemplate "DefaultFolderTemplate"
 
+
 extern const char* kAddOnsMenuName;
 
 const window_feel kPrivateDesktopWindowFeel = window_feel(1024);
 const window_look kPrivateDesktopWindowLook = window_look(4);
 	// this is a mirror of an app server private values
 
+
 enum {
 	// flags that describe opening of the window
 	kRestoreWorkspace	= 0x1,
@@ -72,6 +75,7 @@ enum {
 	kRestoreDecor		= 0x4
 };
 
+
 struct AddonShortcut {
 	Model*	model;
 	char	key;
@@ -79,6 +83,7 @@ struct AddonShortcut {
 	uint32	modifiers;
 };
 
+
 class BContainerWindow : public BWindow {
 public:
 	BContainerWindow(LockingList<BWindow>* windowList,
@@ -325,6 +330,7 @@ class BContainerWindow : public BWindow {
 	void _UpdateSelectionMIMEInfo();
 };
 
+
 class WindowStateNodeOpener {
 // this class manages opening and closing the proper node for
 // state restoring / saving; the constructor knows how to decide whether
@@ -348,6 +354,7 @@ class WindowStateNodeOpener {
 	AttributeStreamNode* fStreamNode;
 };
 
+
 class BackgroundView : public BView {
 // background view placed in a BContainerWindow, under the pose view
 public:
@@ -366,8 +373,10 @@ class BackgroundView : public BView {
 	typedef BView _inherited;
 };
 
+
 int CompareLabels(const BMenuItem*, const BMenuItem*);
 
+
 // inlines ---------
 
 inline BNavigator*
@@ -376,74 +385,84 @@ BContainerWindow::Navigator() const
 	return fNavigator;
 }
 
+
 inline BPoseView*
 BContainerWindow::PoseView() const
 {
 	return fPoseView;
 }
 
+
 inline bool
 BContainerWindow::IsTrash() const
 {
 	return fIsTrash;
 }
 
+
 inline bool
 BContainerWindow::InTrash() const
 {
 	return fInTrash;
 }
 
+
 inline bool
 BContainerWindow::IsPrintersDir() const
 {
 	return fIsPrinters;
 }
 
+
 inline void
 BContainerWindow::SetUpDiskMenu(BMenu*)
 {
 	// nothing at this level
 }
 
+
 inline BPopUpMenu*
 BContainerWindow::ContextMenu()
 {
 	return fContextMenu;
 }
 
+
 inline bool
 BContainerWindow::Dragging() const
 {
 	return fDragMessage && fCachedTypesList;
 }
 
+
 inline BMessage*
 BContainerWindow::DragMessage() const
 {
 	return fDragMessage;
 }
-inline
+
-bool
+
+inline bool
 BContainerWindow::SaveStateIsEnabled() const
 {
 	return fSaveStateIsEnabled;
 }
 
-inline
+
-void
+inline void
 BContainerWindow::SetSaveStateEnabled(bool value)
 {
 	fSaveStateIsEnabled = value;
 }
 
-inline
+
-bool
+inline bool
 BContainerWindow::IsPathWatchingEnabled() const
 {
 	return fIsWatchingPath;
 }
 
+
 filter_result ActivateWindowFilter(BMessage* message, BHandler** target,
 	BMessageFilter* messageFilter);
 
@@ -451,4 +470,5 @@ filter_result ActivateWindowFilter(BMessage* message, BHandler** target,
 
 using namespace BPrivate;
 
-#endif
+
+#endif	// _CONTAINER_WINDOW_H