Ticket #7052: Deskbar_BarWindow_cpp_style_fix.diff

src/apps/deskbar/BarWindow.cpp

@@ -26 +26 @@
 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.
 */
 
@@ -58 +59 @@
 #include <MessagePrivate.h>
 
 
-// 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
@@ -70 +71 @@
 #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;
@@ -312 +314 @@
     if (menuBar == NULL)
         return;
 
-    BMenuBar_StartMenuBar_Hack(menuBar,0,true,true,NULL);
+    BMenuBar_StartMenuBar_Hack(menuBar, 0, true, true, NULL);
 }
 
 
@@ -326 +328 @@
     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
@@ -552 +554 @@
         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<TReplicantTray*>(FindView("Status"));
@@ -579 +580 @@
     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)
@@ -589 +590 @@
 #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);
 
@@ -632 +633 @@
 
     return true;
 }
+