[haiku-commits] r40818 - haiku/trunk/src/apps/deskbar

  • From: fredrik.holmqvist@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 5 Mar 2011 17:33:57 +0100 (CET)

Author: tqh
Date: 2011-03-05 17:33:57 +0100 (Sat, 05 Mar 2011)
New Revision: 40818
Changeset: http://dev.haiku-os.org/changeset/40818

Modified:
   haiku/trunk/src/apps/deskbar/BarWindow.cpp
   haiku/trunk/src/apps/deskbar/BarWindow.h
   haiku/trunk/src/apps/deskbar/BeMenu.cpp
Log:
Missed these as part of r40817. Style cleanup by John Scipione from bug 7052.


Modified: haiku/trunk/src/apps/deskbar/BarWindow.cpp
===================================================================
--- haiku/trunk/src/apps/deskbar/BarWindow.cpp  2011-03-05 16:22:42 UTC (rev 
40817)
+++ haiku/trunk/src/apps/deskbar/BarWindow.cpp  2011-03-05 16:33:57 UTC (rev 
40818)
@@ -26,9 +26,10 @@
 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 @@
 #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 @@
 #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 @@
        if (menuBar == NULL)
                return;
 
-       BMenuBar_StartMenuBar_Hack(menuBar,0,true,true,NULL);
+       BMenuBar_StartMenuBar_Hack(menuBar, 0, true, true, NULL);
 }
 
 
@@ -331,11 +333,11 @@
        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 @@
                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"));
@@ -584,8 +585,8 @@
        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 @@
 #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 @@
 
        return true;
 }
+

Modified: haiku/trunk/src/apps/deskbar/BarWindow.h
===================================================================
--- haiku/trunk/src/apps/deskbar/BarWindow.h    2011-03-05 16:22:42 UTC (rev 
40817)
+++ haiku/trunk/src/apps/deskbar/BarWindow.h    2011-03-05 16:33:57 UTC (rev 
40818)
@@ -26,9 +26,10 @@
 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

Modified: haiku/trunk/src/apps/deskbar/BeMenu.cpp
===================================================================
--- haiku/trunk/src/apps/deskbar/BeMenu.cpp     2011-03-05 16:22:42 UTC (rev 
40817)
+++ haiku/trunk/src/apps/deskbar/BeMenu.cpp     2011-03-05 16:33:57 UTC (rev 
40818)
@@ -26,9 +26,10 @@
 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 @@
 void
 TRecentsMenu::DetachedFromWindow()
 {
-       //
-       //      BNavMenu::DetachedFromWindow sets the TypesList to NULL
-       //
+       // BNavMenu::DetachedFromWindow sets the TypesList to NULL
        BMenu::DetachedFromWindow();
 }
 


Other related posts:

  • » [haiku-commits] r40818 - haiku/trunk/src/apps/deskbar - fredrik . holmqvist