Ticket #7052: Deskbar_BarView_cpp_style_fix.diff

src/apps/deskbar/BarView.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.
 */
 
@@ -135 +136 @@
     rgb_color light = tint_color(ViewColor(), B_LIGHTEN_2_TINT);
 
     SetHighColor(hilite);
-    if (AcrossTop()) 
+    if (AcrossTop())
         StrokeLine(bounds.LeftBottom(), bounds.RightBottom());
-    else if (AcrossBottom()) 
+    else if (AcrossBottom())
         StrokeLine(bounds.LeftTop(), bounds.RightTop());
 
     if (Vertical() && Expando()) {
@@ -166 +167 @@
             // so that I can follow the common pathway
             // for adding icons to the tray
             int32 id;
-            AddItem(new BMessage(*message), B_DESKBAR_TRAY, &id); 
+            AddItem(new BMessage(*message), B_DESKBAR_TRAY, &id);
             break;
         }
 
@@ -206 +207 @@
         fBarMenuBar = NULL;
     }
 
-    //  top or bottom expando mode has Be menu built in for tracking
-    //  only for vertical mini or expanded
-    //  mini mode will have team menu added as part of BarMenuBar
+    // top or bottom expando mode has Be menu built in for tracking
+    // only for vertical mini or expanded
+    // mini mode will have team menu added as part of BarMenuBar
     if (fVertical && !fBarMenuBar) {
         //  create the Be menu
         BRect mbarFrame(Bounds());
@@ -217 +218 @@
         AddChild(fBarMenuBar);
     }
 
-    //  if there isn't a bemenu at this point,
-    //  DB should be in top/bottom mode, else error
+    // if there isn't a bemenu at this point,
+    // DB should be in top/bottom mode, else error
     if (!fBarMenuBar)
         return;
-        
+
     float width = sMinimumWindowWidth;
     BPoint loc(B_ORIGIN);
     BRect menuFrame(fBarMenuBar->Frame());
@@ -237 +238 @@
         else
             width = floorf(width) / 2;
         loc = Bounds().LeftTop();
-    } else 
+    } else {
         // mini mode, BeMenu next to team menu
         fBarMenuBar->AddTeamMenu();
+    }
 
     fBarMenuBar->SmartResize(width, menuFrame.Height());
     fBarMenuBar->MoveTo(loc);
@@ -257 +259 @@
         fDragRegion->MoveTo(statusLoc);
 
         if (!fReplicantTray->IsHidden())
-            fReplicantTray->Hide(); 
+            fReplicantTray->Hide();
 
         return;
     }
 
     if (fReplicantTray->IsHidden())
-        fReplicantTray->Show(); 
+        fReplicantTray->Show();
 
     if (fTrayLocation != 0) {
         fReplicantTray->SetMultiRow(fVertical);
@@ -347 +349 @@
         }
     } else {
         // four corners
-        if (fTrayLocation != 0)     
+        if (fTrayLocation != 0)
             windowHeight = fDragRegion->Frame().bottom;
         else
             windowHeight = fBarMenuBar->Frame().bottom;
@@ -404 +406 @@
     settings->state = (uint32)State();
     settings->width = 0;
     settings->showTime = ShowingClock();
-    
+
     fReplicantTray->RememberClockSettings();
-    settings->alwaysOnTop = (Window()->Feel() & B_FLOATING_ALL_WINDOW_FEEL)
-        != 0;
+    settings->alwaysOnTop
+        = (Window()->Feel() & B_FLOATING_ALL_WINDOW_FEEL) != 0;
 }
 
 
@@ -424 +426 @@
 void
 TBarView::UpdatePlacement()
 {
-    ChangeState(fState, fVertical, fLeft, fTop);    
+    ChangeState(fState, fVertical, fLeft, fTop);
 }
 
 
@@ -455 +457 @@
     BString* signature = NULL;
     if (fVertical && Expando()
         && static_cast<TBarApp*>(be_app)->Settings()->superExpando) {
-        // Get a list of the signatures of expanded apps. Can't use 
+        // Get a list of the signatures of expanded apps. Can't use
         // team_id because there can be more than one team per application
         if (fVertical && Expando() && vertical && fExpando) {
             for (int index = 0; index < fExpando->CountItems(); index++) {
@@ -469 +471 @@
         }
     }
 
-    PlaceApplicationBar(screenFrame);
-    SizeWindow(screenFrame);
-    PositionWindow(screenFrame);
-    Window()->UpdateIfNeeded();
+    PlaceApplicationBar(screenFrame);
+    SizeWindow(screenFrame);
+    PositionWindow(screenFrame);
+    Window()->UpdateIfNeeded();
 
     // Re-expand those apps.
     if (expandedItems.CountItems() > 0) {
@@ -505 +507 @@
 }
 
 
-//  window placement functions
+// window placement functions
 
 bool
 TBarView::Vertical() const
@@ -558 +560 @@
 
 // optional functionality functions
 
-bool 
+bool
 TBarView::MilTime() const
 {
     return fShowInterval;
@@ -586 +588 @@
 TBarView::CacheDragData(const BMessage* incoming)
 {
     if (!incoming)
-        return; 
+        return;
 
     if (Dragging() && SpringLoadedFolderCompareMessages(incoming, fDragMessage))
         return;
@@ -614 +616 @@
 
 status_t
 TBarView::DragStart()
-{   
+{
     if (!Dragging())
         return B_OK;
 
@@ -624 +626 @@
 
     if (fExpando && fExpando->Frame().Contains(loc)) {
         ConvertToScreen(&loc);
-        BPoint expandoLocation = fExpando->ConvertFromScreen(loc);      
+        BPoint expandoLocation = fExpando->ConvertFromScreen(loc);
         TTeamMenuItem* item = fExpando->TeamItemAtPoint(expandoLocation);
 
         if (fLastDragItem)
@@ -634 +636 @@
             if (item == fLastDragItem)
                 return B_OK;
 
-            fLastDragItem = item;       
-        }                   
+            fLastDragItem = item;
+        }
     }
 
     return B_OK;
@@ -676 +678 @@
 
             if (bemenu && bemenu->LockLooper()) {
                 bemenu->ConvertFromScreen(&location);
-                if (bemenu->Frame().Contains(location)) 
+                if (bemenu->Frame().Contains(location))
                     endMenu = false;
 
                 bemenu->UnlockLooper();
@@ -685 +687 @@
             if (endMenu && expando) {
                 expando->ConvertFromScreen(&location);
                 BMenuItem* item = expando->TeamItemAtPoint(location);
-                if (item) 
+                if (item)
                     endMenu = false;
             }
             barview->UnlockLooper();
@@ -757 +759 @@
     if (appmime.GetAppHint(&hintref) != B_OK)
         return false;
 
-    // an app was found, now see if it supports any of 
+    // an app was found, now see if it supports any of
     // the refs in the message
     BFile file(&hintref, O_RDONLY);
     BAppFileInfo fileinfo(&file);
@@ -768 +770 @@
 
     int32 count = fCachedTypesList->CountItems();
     for (int32 i = 0 ; i < count ; i++) {
-        if (fileinfo.IsSupportedType(fCachedTypesList->ItemAt(i)->String())) 
+        if (fileinfo.IsSupportedType(fCachedTypesList->ItemAt(i)->String()))
             return true;
     }
 
@@ -910 +912 @@
 
 int32
 TBarView::CountItems(DeskbarShelf)
-{   
-    return fReplicantTray->IconCount(); 
-}   
+{
+    return fReplicantTray->IconCount();
+}
 
 
 status_t