From 1075cc34a094612437a6c05c4c4b6cb9863cbe2d Mon Sep 17 00:00:00 2001 From: Fredrik Holmqvist Date: Sat, 5 Mar 2011 16:33:57 +0000 Subject: [PATCH] Missed these as part of r40817. Style cleanup by John Scipione from bug 7052. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40818 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/deskbar/BarWindow.cpp | 30 ++++++++++++++++-------------- src/apps/deskbar/BarWindow.h | 7 ++++--- src/apps/deskbar/BeMenu.cpp | 11 +++++------ 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/src/apps/deskbar/BarWindow.cpp b/src/apps/deskbar/BarWindow.cpp index b32a0aa295..39e7ce68e2 100644 --- a/src/apps/deskbar/BarWindow.cpp +++ b/src/apps/deskbar/BarWindow.cpp @@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Be Incorporated. -Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks -of Be Incorporated in the United States and other countries. Other brand product -names are registered trademarks or trademarks of their respective holders. +Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered +trademarks 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. */ @@ -63,8 +64,8 @@ All rights reserved. #define B_TRANSLATE_CONTEXT "MainWindow" -// This is a very ugly hack to be able to call the private BMenuBar::StartMenuBar() -// method from the TBarWindow::ShowBeMenu() method. +// This is a very ugly hack to be able to call the private +// BMenuBar::StartMenuBar() method from the TBarWindow::ShowBeMenu() method. // Don't do this at home -- but why the hell is this method private? #if __MWERKS__ #define BMenuBar_StartMenuBar_Hack StartMenuBar__8BMenuBarFlbbP5BRect @@ -75,7 +76,8 @@ All rights reserved. #else # error "You may want to port this ugly hack to your compiler ABI" #endif -extern "C" void BMenuBar_StartMenuBar_Hack(BMenuBar*,int32,bool,bool,BRect*); +extern "C" void + BMenuBar_StartMenuBar_Hack(BMenuBar*, int32, bool, bool, BRect*); TBeMenu* TBarWindow::sBeMenu = NULL; @@ -317,7 +319,7 @@ TBarWindow::ShowBeMenu() if (menuBar == NULL) return; - BMenuBar_StartMenuBar_Hack(menuBar,0,true,true,NULL); + BMenuBar_StartMenuBar_Hack(menuBar, 0, true, true, NULL); } @@ -331,11 +333,11 @@ TBarWindow::ShowTeamMenu() if (KeyMenuBar() == NULL) return; - BMenuBar_StartMenuBar_Hack(KeyMenuBar(),index,true,true,NULL); + BMenuBar_StartMenuBar_Hack(KeyMenuBar(), index, true, true, NULL); } -/** determines the actual location of the window */ +// determines the actual location of the window deskbar_location TBarWindow::DeskbarLocation() const @@ -557,7 +559,6 @@ TBarWindow::AddItem(BMessage* message) if (err < B_OK) delete archive; } else if (message->FindRef("addon", &ref) == B_OK) { - // // exposing the name of the view here is not so great TReplicantTray* tray = dynamic_cast(FindView("Status")); @@ -584,8 +585,8 @@ TBarWindow::RemoveItem(BMessage* message) int32 id; const char* name; - // ids ought to be unique across all shelves, assuming, of course, - // that sometime in the future there may be more than one + // ids ought to be unique across all shelves, assuming, of course, + // that sometime in the future there may be more than one #if SHELF_AWARE if (message->FindInt32("shelf", (int32*)&shelf) == B_OK) { if (message->FindString("name", &name) == B_OK) @@ -594,8 +595,8 @@ TBarWindow::RemoveItem(BMessage* message) #endif if (message->FindInt32("id", &id) == B_OK) { fBarView->RemoveItem(id); - // remove the following two lines if and when the - // shelf option returns + // remove the following two lines if and when the + // shelf option returns } else if (message->FindString("name", &name) == B_OK) fBarView->RemoveItem(name, B_DESKBAR_TRAY); @@ -637,3 +638,4 @@ TBarWindow::_IsFocusMessage(BMessage* message) return true; } + diff --git a/src/apps/deskbar/BarWindow.h b/src/apps/deskbar/BarWindow.h index ac274100b5..73568f1eaf 100644 --- a/src/apps/deskbar/BarWindow.h +++ b/src/apps/deskbar/BarWindow.h @@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Be Incorporated. -Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks -of Be Incorporated in the United States and other countries. Other brand product -names are registered trademarks or trademarks of their respective holders. +Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered +trademarks 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 BAR_WINDOW_H diff --git a/src/apps/deskbar/BeMenu.cpp b/src/apps/deskbar/BeMenu.cpp index 7f22518fd7..005fb07909 100644 --- a/src/apps/deskbar/BeMenu.cpp +++ b/src/apps/deskbar/BeMenu.cpp @@ -26,9 +26,10 @@ Except as contained in this notice, the name of Be Incorporated shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Be Incorporated. -Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks -of Be Incorporated in the United States and other countries. Other brand product -names are registered trademarks or trademarks of their respective holders. +Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered +trademarks 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. */ @@ -476,9 +477,7 @@ TRecentsMenu::~TRecentsMenu() void TRecentsMenu::DetachedFromWindow() { - // - // BNavMenu::DetachedFromWindow sets the TypesList to NULL - // + // BNavMenu::DetachedFromWindow sets the TypesList to NULL BMenu::DetachedFromWindow(); }