Ticket #7052: Deskbar Style Changes and Refactoring 3.diff

src/apps/deskbar/BarApp.cpp

@@ -60 +60 @@
 #include "PublicCommands.h"
 #include "ResourceSet.h"
 #include "Switcher.h"
-#include "TeamMenu.h"
-#include "WindowMenuItem.h"
 
 
 BLocker TBarApp::sSubscriberLock;
@@ -72 +70 @@
 const uint32 kShowBeMenu = 'BeMn';
 const uint32 kShowTeamMenu = 'TmMn';
 
-const BRect kIconSize(0.0f, 0.0f, 15.0f, 15.0f);
 
+const BRect kIconRect(0.0f, 0.0f, 15.0f, 15.0f);
 static const color_space kIconFormat = B_RGBA32;
 
 
@@ -190 +188 @@
         storedSettings.AddFloat("width", fSettings.width);
         storedSettings.AddBool("showTime", fSettings.showTime);
         storedSettings.AddPoint("switcherLoc", fSettings.switcherLoc);
-        storedSettings.AddInt32("recentAppsCount",
-            fSettings.recentAppsCount);
-        storedSettings.AddInt32("recentDocsCount",
-            fSettings.recentDocsCount);
-        storedSettings.AddBool("timeShowSeconds",
-            fSettings.timeShowSeconds);
+        storedSettings.AddInt32("recentAppsCount", fSettings.recentAppsCount);
+        storedSettings.AddInt32("recentDocsCount", fSettings.recentDocsCount);
+        storedSettings.AddBool("timeShowSeconds", fSettings.timeShowSeconds);
         storedSettings.AddInt32("recentFoldersCount",
             fSettings.recentFoldersCount);
         storedSettings.AddBool("alwaysOnTop", fSettings.alwaysOnTop);
         storedSettings.AddBool("timeFullDate", fSettings.timeFullDate);
         storedSettings.AddBool("trackerAlwaysFirst",
             fSettings.trackerAlwaysFirst);
-        storedSettings.AddBool("sortRunningApps",
-            fSettings.sortRunningApps);
-        storedSettings.AddBool("superExpando",
-            fSettings.superExpando);
-        storedSettings.AddBool("expandNewTeams",
-            fSettings.expandNewTeams);
-        storedSettings.AddBool("autoRaise",
-            fSettings.autoRaise);
+        storedSettings.AddBool("sortRunningApps", fSettings.sortRunningApps);
+        storedSettings.AddBool("superExpando", fSettings.superExpando);
+        storedSettings.AddBool("expandNewTeams", fSettings.expandNewTeams);
+        storedSettings.AddBool("autoRaise", fSettings.autoRaise);
         storedSettings.AddBool("recentAppsEnabled",
             fSettings.recentAppsEnabled);
         storedSettings.AddBool("recentDocsEnabled",
@@ -291 +282 @@
                 &settings.trackerAlwaysFirst);
             storedSettings.FindBool("sortRunningApps",
                 &settings.sortRunningApps);
-            storedSettings.FindBool("superExpando",
-                &settings.superExpando);
-            storedSettings.FindBool("expandNewTeams",
-                &settings.expandNewTeams);
-            storedSettings.FindBool("autoRaise",
-                &settings.autoRaise);
+            storedSettings.FindBool("superExpando", &settings.superExpando);
+            storedSettings.FindBool("expandNewTeams", &settings.expandNewTeams);
+            storedSettings.FindBool("autoRaise", &settings.autoRaise);
             storedSettings.FindBool("recentAppsEnabled",
                 &settings.recentAppsEnabled);
             storedSettings.FindBool("recentDocsEnabled",
@@ -313 +301 @@
 void
 TBarApp::MessageReceived(BMessage* message)
 {
-    int32 count;
-    bool enabled;
     switch (message->what) {
         case 'gloc':
         case 'sloc':
@@ -353 +339 @@
             break;
 
         case kUpdateRecentCounts:
+            int32 count;
+            bool enabled;
+
             if (message->FindInt32("applications", &count) == B_OK)
                 fSettings.recentAppsCount = count;
             if (message->FindBool("applicationsEnabled", &enabled) == B_OK)
@@ -423 +412 @@
         {
             fSettings.autoRaise = !fSettings.autoRaise;
 
-            TBarView* barView = static_cast<TBarApp*>(be_app)->BarView();
             fBarWindow->Lock();
-            barView->UpdateAutoRaise();
+            BarView()->UpdateAutoRaise();
             fBarWindow->Unlock();
             break;
         }
@@ -434 +422 @@
         {
             fSettings.trackerAlwaysFirst = !fSettings.trackerAlwaysFirst;
 
-            TBarView* barView = static_cast<TBarApp*>(be_app)->BarView();
             fBarWindow->Lock();
-            barView->UpdatePlacement();
+            BarView()->UpdatePlacement();
             fBarWindow->Unlock();
             break;
         }
@@ -445 +432 @@
         {
             fSettings.sortRunningApps = !fSettings.sortRunningApps;
 
-            TBarView* barView = static_cast<TBarApp*>(be_app)->BarView();
             fBarWindow->Lock();
-            barView->UpdatePlacement();
+            BarView()->UpdatePlacement();
             fBarWindow->Unlock();
             break;
         }
@@ -464 +450 @@
         {
             fSettings.superExpando = !fSettings.superExpando;
 
-            TBarView* barView = static_cast<TBarApp*>(be_app)->BarView();
             fBarWindow->Lock();
-            barView->UpdatePlacement();
+            BarView()->UpdatePlacement();
             fBarWindow->Unlock();
             break;
         }
@@ -475 +460 @@
         {
             fSettings.expandNewTeams = !fSettings.expandNewTeams;
 
-            TBarView* barView = static_cast<TBarApp*>(be_app)->BarView();
             fBarWindow->Lock();
-            barView->UpdatePlacement();
+            BarView()->UpdatePlacement();
             fBarWindow->Unlock();
             break;
         }
@@ -636 +620 @@
     BAppFileInfo appMime(&file);
 
     BarTeamInfo* barInfo = new BarTeamInfo(new BList(), flags, strdup(sig),
-        new BBitmap(kIconSize, kIconFormat), strdup(ref->name));
+        new BBitmap(kIconRect, kIconFormat), strdup(ref->name));
 
     barInfo->teams->AddItem((void*)team);
     if (appMime.GetIcon(barInfo->icon, B_MINI_ICON) != B_OK)

src/apps/deskbar/BarApp.h

@@ -141 +141 @@
         static void Unsubscribe(const BMessenger &subscriber);
 
     private:
-        void AddTeam(team_id team, uint32 flags, const char *sig, entry_ref *);
+        void AddTeam(team_id team, uint32 flags, const char *sig, entry_ref*);
         void RemoveTeam(team_id);
 
         void InitSettings();

src/apps/deskbar/BarMenuBar.cpp

@@ -180 +180 @@
 
     BMenu* windowMenu = item->Submenu();
     if (windowMenu) 
-        //  have a menu, set the tracking hook
+        // have a menu, set the tracking hook
         windowMenu->SetTrackingHook(hookFunction, state);                   
 }
 
@@ -192 +192 @@
     BPoint loc;
     uint32 buttons;
     GetMouse(&loc, &buttons);
-    //  set the hook functions for the two menus
-    //  will always have the be menu
-    //  may have the app menu as well (mini mode)
+    // set the hook functions for the two menus
+    // will always have the be menu
+    // may have the app menu as well (mini mode)
     if (fBeMenuItem->Frame().Contains(loc) || both) 
         init_tracking_hook(fBeMenuItem, hookFunction, state);
 

src/apps/deskbar/BarMenuBar.h

@@ -63 +63 @@
 
         void InitTrackingHook(bool (* hookfunction)(BMenu*, void*), void* state,
             bool both = false);
-    
+
     private:
         TBarView* fBarView;
         TBarMenuTitle* fBeMenuItem;

src/apps/deskbar/BarMenuTitle.cpp

@@ -123 +123 @@
             dstRect.OffsetBy(rintf(((frame.Width() - dstRect.Width()) / 2)
                 - 1.0f), rintf(((frame.Height() - dstRect.Height()) / 2)
                 - 0.0f));
-    
+
             menu->DrawBitmapAsync(fIcon, dstRect);
         }
         return;
@@ -204 +204 @@
             looper->Unlock();
         }
     }
-        
+
     return BMenuItem::Invoke(message);
 }
 

src/apps/deskbar/BarMenuTitle.h

@@ -46 +46 @@
 
 class TBarMenuTitle : public BMenuItem {
 public:
-    TBarMenuTitle(float width,float height, const BBitmap* icon,
-        BMenu* menu, bool inexpando = false);
+    TBarMenuTitle(float width, float height, const BBitmap* icon,
+        BMenu* menu, bool inexpando = false);
     virtual ~TBarMenuTitle();
 
     void SetWidthHeight(float width, float height);
     void Draw();
 
     status_t Invoke(BMessage* message);
-        
+
 protected:
     void DrawContent();
     void GetContentSize(float* width, float* height);

src/apps/deskbar/BarView.cpp

@@ -206 +206 @@
         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 +217 @@
         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;
         
@@ -404 +404 @@
     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 +424 @@
 void
 TBarView::UpdatePlacement()
 {
-    ChangeState(fState, fVertical, fLeft, fTop);    
+    ChangeState(fState, fVertical, fLeft, fTop);
 }
 
 
@@ -455 +455 @@
     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 +469 @@
         }
     }
 
-    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 +505 @@
 }
 
 
-//  window placement functions
+// window placement functions
 
 bool
 TBarView::Vertical() const
@@ -586 +586 @@
 TBarView::CacheDragData(const BMessage* incoming)
 {
     if (!incoming)
-        return; 
+        return;
 
     if (Dragging() && SpringLoadedFolderCompareMessages(incoming, fDragMessage))
         return;
@@ -614 +614 @@
 
 status_t
 TBarView::DragStart()
-{   
+{
     if (!Dragging())
         return B_OK;
 
@@ -634 +634 @@
             if (item == fLastDragItem)
                 return B_OK;
 
-            fLastDragItem = item;       
-        }                   
+            fLastDragItem = item;
+        }
     }
 
     return B_OK;

src/apps/deskbar/BarWindow.cpp

@@ -58 +58 @@
 #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
@@ -312 +312 @@
     if (menuBar == NULL)
         return;
 
-    BMenuBar_StartMenuBar_Hack(menuBar,0,true,true,NULL);
+    BMenuBar_StartMenuBar_Hack(menuBar, 0, true, true, NULL);
 }
 
 
@@ -326 +326 @@
     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
@@ -632 +632 @@
 
     return true;
 }
+

src/apps/deskbar/BeMenu.h

@@ -42 +42 @@
 class TBarView;
 
 enum recent_type {
-    kRecentDocuments    = 0,
+    kRecentDocuments = 0,
     kRecentApplications,
     kRecentFolders,
     kRecentAppDocuments
@@ -118 +118 @@
 
         bool            AddStandardBeMenuItems();
 
-    private:        
-        virtual bool    StartBuildingItemList();
+    private:
+        virtual bool    StartBuildingItemList();
         virtual void    DoneBuildingItemList();
-        virtual bool    AddNextItem();
-        virtual void    ClearMenuBuildingState();
+        virtual bool    AddNextItem();
+        virtual void    ClearMenuBuildingState();
 
-        //  to keep track of the menu building state
+        // to keep track of the menu building state
         State           fAddState;  
-        TBarView        *fBarView;
+        TBarView*       fBarView;
 };
 
 #endif  /* _BE_MENU_H_ */

src/apps/deskbar/CalendarMenuWindow.cpp

@@ -24 +24 @@
 using BPrivate::B_WEEK_START_MONDAY;
 
 
-// #pragma mark -- FlatButton
+//  #pragma mark -- FlatButton
 
 
 class FlatButton : public BButton {
@@ -66 +66 @@
 }
 
 
-// #pragma mark -- CalendarMenuWindow
+//  #pragma mark -- CalendarMenuWindow
 
 
 enum {

src/apps/deskbar/CalendarMenuWindow.h

@@ -25 +25 @@
                     CalendarMenuWindow(BPoint where);
     virtual         ~CalendarMenuWindow();
 
-    virtual void    Show();
-    virtual void    WindowActivated(bool active);
-    virtual void    MessageReceived(BMessage* message);
+    virtual void    Show();
+    virtual void    WindowActivated(bool active);
+    virtual void    MessageReceived(BMessage* message);
 
 private:
     void            _UpdateUI(const BDate& date);

src/apps/deskbar/DeskBarUtils.cpp

@@ -60 +60 @@
         int32 count = 0;
         uint32 type = 0;
         entry_ref ref;
-        
+
         m->GetInfo("refs", &type, &count);
         if (count <= 0)
             return;
-            
+
         BPath path;
         BSymLink link;
         BDirectory dir;
@@ -72 +72 @@
             ref = *subdirectory;
             BEntry entry(&ref);
             if (entry.Exists()) {
-                //  if the ref is a file
-                //  get the parent and convert it to a ref
+                // if the ref is a file get the parent and convert it to a ref
                 if (entry.IsFile()) {
                     BEntry parent;
                     entry.GetParent(&parent);
@@ -81 +80 @@
                 }
             } else
                 return;
-                
+
             dir.SetTo(&ref);
         } else {
             if (find_directory(B_USER_DESKBAR_DIRECTORY, &path) == B_OK)
@@ -89 +88 @@
             else
                 return;
         }
-            
+
         for (long i = 0; i < count; i++) {
             if (m->FindRef("refs", i, &ref) == B_NO_ERROR) {
-
                 BEntry entry(&ref);
                 entry.GetPath(&path);
-                
+
                 dir.CreateSymLink(ref.name, path.Path(), &link);
             }
         }

src/apps/deskbar/ExpandoMenuBar.cpp

@@ -118 +118 @@
             R_BeLogoIcon);
         if (logoBitmap != NULL)
             fBeMenuWidth = logoBitmap->Bounds().Width() + 16;
-        fBeMenuItem = new TBarMenuTitle(fBeMenuWidth, Frame().Height(),
-            logoBitmap, beMenu, true);
+        fBeMenuItem = new TBarMenuTitle(fBeMenuWidth, Frame().Height(),
+            logoBitmap, beMenu, true);
         AddItem(fBeMenuItem);
 
         fSeparatorItem = new TTeamMenuItem(kSepItemWidth, height, fVertical);
@@ -584 +584 @@
                 RemoveItem(i);
 
                 if (fVertical) {
-                    //  instead of resizing the window here and there in the
-                    //  code the resize method will be centered in one place
-                    //  thus, the same behavior (good or bad) will be used
-                    //  whereever window sizing is done
+                    // instead of resizing the window here and there in the
+                    // code the resize method will be centered in one place
+                    // thus, the same behavior (good or bad) will be used
+                    // whereever window sizing is done
                     fBarView->SizeWindow(BScreen(Window()).Frame());
                 } else
                     CheckItemSizes(-1);
@@ -613 +613 @@
 
     if (!fBarView->Vertical()) {
         // in this case there are 2 extra items:
-        //      The Be Menu
-        //      The little separator item
+        //   - The Be Menu
+        //   - The little separator item
         fullWidth = fullWidth - (sMinimumWindowWidth * 2)
             + (fBeMenuWidth + kSepItemWidth);
         width -= (fBeMenuWidth + kSepItemWidth);
@@ -713 +713 @@
 TExpandoMenuBar::CheckForSizeOverrun()
 {
     BRect screenFrame = (BScreen(Window())).Frame();
-    if (fVertical)
-        fIsScrolling = Window()->Frame().bottom > screenFrame.bottom;
-    else
-        fIsScrolling = false;
+
+    fIsScrolling = fVertical ? Window()->Frame().bottom > screenFrame.bottom
+                             : false;
 }
 
 
@@ -744 +743 @@
             // Set all WindowMenuItems to require an update.
             TWindowMenuItem* item = NULL;
             for (int32 i = 0; i < totalItems; i++) {
-                if (!teamMenu->SubmenuAt(i)){
+                if (!teamMenu->SubmenuAt(i)) {
                     item = static_cast<TWindowMenuItem*>(teamMenu->ItemAt(i));
                     item->SetRequireUpdate();
                 }
@@ -814 +813 @@
 
             // Remove any remaining items which require an update.
             for (int32 i = 0; i < totalItems; i++) {
-                if (!teamMenu->SubmenuAt(i)){
+                if (!teamMenu->SubmenuAt(i)) {
                     item = static_cast<TWindowMenuItem*>(teamMenu->ItemAt(i));
                     if (item && item->RequiresUpdate()) {
                         item = static_cast<TWindowMenuItem*>

src/apps/deskbar/ExpandoMenuBar.h

@@ -34 +34 @@
 #ifndef EXPANDO_MENU_BAR_H
 #define EXPANDO_MENU_BAR_H
 
-//  application list
-//  top level at window
-//  in expanded mode horizontal and vertical
+// application list
+// top level at window
+// in expanded mode horizontal and vertical
 
 
 #include <MenuBar.h>

src/apps/deskbar/PreferencesWindow.cpp

@@ -35 +35 @@
     // Controls
     fMenuRecentDocuments = new BCheckBox(B_TRANSLATE("Recent documents:"),
         new BMessage(kUpdateRecentCounts));
-    fMenuRecentApplications = new BCheckBox(
-        B_TRANSLATE("Recent applications:"),
+    fMenuRecentApplications = new BCheckBox(B_TRANSLATE("Recent applications:"),
         new BMessage(kUpdateRecentCounts));
     fMenuRecentFolders = new BCheckBox(B_TRANSLATE("Recent folders:"),
         new BMessage(kUpdateRecentCounts));
@@ -52 +51 @@
         new BMessage(kSortRunningApps));
     fAppsSortTrackerFirst = new BCheckBox(B_TRANSLATE("Tracker always first"),
         new BMessage(kTrackerFirst));
-    fAppsShowExpanders = new BCheckBox(
-        B_TRANSLATE("Show application expander"),
+    fAppsShowExpanders = new BCheckBox(B_TRANSLATE("Show application expander"),
         new BMessage(kSuperExpando));
     fAppsExpandNew = new BCheckBox(B_TRANSLATE("Expand new applications"),
         new BMessage(kExpandNewTeams));
@@ -83 +81 @@
 
     // Values
     TBarApp* barApp = static_cast<TBarApp*>(be_app);
-    desk_settings* appSettings = barApp->Settings();;
+    desk_settings* appSettings = barApp->Settings();
 
     fAppsSort->SetValue(appSettings->sortRunningApps);
     fAppsSortTrackerFirst->SetValue(appSettings->trackerAlwaysFirst);

src/apps/deskbar/PreferencesWindow.h

@@ -28 +28 @@
                             PreferencesWindow(BRect frame);
                             ~PreferencesWindow();
 
-    virtual void            MessageReceived(BMessage* message);
-    virtual void            WindowActivated(bool active);
+    virtual void            MessageReceived(BMessage* message);
+    virtual void            WindowActivated(bool active);
 
 private:
             void            _UpdateRecentCounts();

src/apps/deskbar/ResourceSet.cpp

@@ -70 +70 @@
             :   fDeleteOK(false)
         {
         }
-        
+
         virtual ~TypeObject()
         {
             if (!fDeleteOK)
                 debugger("deleting object owned by BResourceSet");
         }
-        
+
         void Delete()
         {
             fDeleteOK = true;
         }
-        
+
     private:
         TypeObject(const TypeObject &);
         TypeObject &operator=(const TypeObject &);
         bool operator==(const TypeObject &);
         bool operator!=(const TypeObject &);
-        
+
         bool fDeleteOK;
     };
-    
+
     class BitmapTypeItem : public BBitmap, public TypeObject {
     public:
         BitmapTypeItem(BRect bounds, uint32 flags, color_space depth,
@@ -99 +99 @@
             :   BBitmap(bounds, flags, depth, bytesPerRow, screenID)
         {
         }
-        
+
         BitmapTypeItem(const BBitmap* source, bool accepts_views = false,
             bool need_contiguous = false)
             :   BBitmap(source, accepts_views, need_contiguous)
         {
         }
-        
+
         BitmapTypeItem(BMessage* data)
             :   BBitmap(data)
         {
         }
-        
+
         virtual ~BitmapTypeItem()
         {
         }
     };
-    
+
     class StringBlockTypeItem : public TStringBlock, public TypeObject {
     public:
         StringBlockTypeItem(BDataIO* data)
             :   TStringBlock(data)
         {
         }
-        
+
         StringBlockTypeItem(const void* block, size_t size)
             :   TStringBlock(block, size)
         {
         }
-        
+
         virtual ~StringBlockTypeItem()
         {
         }
     };
-    
+
     class TypeItem {
     public:
         TypeItem(int32 id, const char* name, const void* data, size_t size)
@@ -141 +141 @@
               fOwnData(false), fSourceIsFile(false)
         {
         }
-        
+
         TypeItem(int32 id, const char* name, BFile* file)
             :   fID(id),
                 fName(name),
@@ -162 +162 @@
                 }
             }
         }
-        
+
         virtual ~TypeItem()
         {
             if (fOwnData) {
@@ -172 +172 @@
             }
             SetObject(NULL);
         }
-        
+
         int32 ID() const
-            { return fID; }
+        {
+            return fID;
+        }
 
         const char* Name() const
-            { return fName.String(); }
+        {
+            return fName.String();
+        }
 
         const void* Data() const
-            { return fData; }
+        {
+            return fData;
+        }
 
         size_t Size() const
-            { return fSize; }
-        
+        {
+            return fSize;
+        }
+
         void SetObject(TypeObject* object)
         {
             if (object == fObject)
@@ -195 +203 @@
         }
 
         TypeObject* Object() const
-            { return fObject; }
-        
+        {
+            return fObject;
+        }
+
         void SetSourceIsFile(bool state)
-            { fSourceIsFile = state; }
+        {
+            fSourceIsFile = state;
+        }
 
         bool SourceIsFile() const
-            { return fSourceIsFile; }
-        
+        {
+            return fSourceIsFile;
+        }
+
     private:
         int32 fID;
         BString fName;
@@ -225 +239 @@
             :   fType(type)
         {
         }
-        
+
         virtual ~TypeList()
         {
             fItems.DoForEach(FreeTypeItemFunc);
             fItems.MakeEmpty();
         }
-        
+
         type_code Type() const
-            { return fType; }
-        
+        {
+            return fType;
+        }
+
         TypeItem* FindItemByID(int32 id)
         {
             for (int32 i = 0; i < fItems.CountItems(); i++ ) {
@@ -254 +270 @@
             }
             return NULL;
         }
-        
+
         void AddItem(TypeItem* item)
         {
             fItems.AddItem(item);
         }
-        
+
     private:
         type_code fType;
         BList fItems;
     };
-
 }
 
 using namespace TResourcePrivate;
@@ -288 +303 @@
     }
     if (amount > 0)
         pos += amount;
-    
+
     fNumEntries = PreIndex(fStrings, amount);
     fIndex = (size_t*)malloc(sizeof(size_t) * fNumEntries);
     MakeIndex(fStrings, amount, fNumEntries, fIndex);
@@ -304 +319 @@
 {
     fIndex = (size_t*)const_cast<void*>(block);
     fStrings = (char*)const_cast<void*>(block);
-    
+
     // Figure out how many entries there are.
     size_t last_off = 0;
     while (fIndex[fNumEntries] > last_off && fIndex[fNumEntries] < size ) {
@@ -339 +354 @@
 TStringBlock::PreIndex(char* strings, ssize_t len)
 {
     size_t count = 0;
-    
     char* orig = strings;
     char* end = strings + len;
     bool in_cr = false;
     bool first = true;
     bool skipping = false;
+
     while (orig < end) {
         if (*orig == '\n' || *orig == '\r' || *orig == 0) {
             if (!in_cr && *orig == '\r')
@@ -371 +386 @@
                 case '\\':
                     *strings = '\\';
                     break;
-                    
+
                 case '\n':
                     *strings = '\n';
                     break;
-                    
+
                 case '\r':
                     *strings = '\r';
                     break;
-                    
+
                 case '\t':
                     *strings = '\t';
                     break;
-                    
+
                 default:
                     *strings = *orig;
                     break;
@@ -394 +409 @@
         orig++;
         strings++;
     }
-    
     return count;
 }
 
@@ -405 +419 @@
 {
     *resultingIndex++ = 0;
     indexLength--;
-    
+
     ssize_t pos = 0;
     while (pos < len && indexLength > 0) {
         if (strings[pos] == 0 ) {
@@ -475 +489 @@
 #if USE_RESOURCES
     if (!resources)
         return B_BAD_VALUE;
-    
+
     BAutolock lock(&fLock);
     status_t err = fResources.AddItem(resources) ? B_OK : B_ERROR;
     if (err != B_OK)
@@ -499 +513 @@
         delete path;
         return err;
     }
-    
+
     BAutolock lock(&fLock);
     err = fDirectories.AddItem(path) ? B_OK : B_ERROR;
     if (err != B_OK)
@@ -514 +528 @@
 {
     BString buf;
     status_t err = ExpandString(&buf, in);
-    
+
     if (err != B_OK) {
         if (defaultValue)
             return AddDirectory(defaultValue);
         return err;
     }
-    
+
     return AddDirectory(buf.String());
 }
 
@@ -529 +543 @@
 TResourceSet::ExpandString(BString* out, const char* in)
 {
     const char* start = in;
+
     while (*in) {
         if (*in == '$') {
             if (start < in)
                  out->Append(start, (int32)(in - start));
-            
+
             in++;
             char variableName[1024];
             size_t i = 0;
@@ -549 +564 @@
                 while ((isalnum(*in) || *in == '_') && i
                     < sizeof(variableName) - 1)
                     variableName[i++] = *in++;
-            
+
             start = in;
-            
             variableName[i] = '\0';
-            
+
             const char* val = getenv(variableName);
             if (!val) {
                 PRINT(("Error: env var %s not found.\n", &variableName[0]));
                 return B_NAME_NOT_FOUND;
             }
-            
+
             status_t err = ExpandString(out, val);
             if (err != B_OK)
                 return err;
-            
+
         } else if (*in == '\\') {
             if (start < in)
                 out->Append(start, (int32)(in - start));
@@ -576 +590 @@
 
     if (start < in)
         out->Append(start, (int32)(in - start));
-    
+
     return B_OK;
 }
 
@@ -585 +599 @@
 TResourceSet::FindResource(type_code type, int32 id, size_t* outSize)
 {
     TypeItem* item = FindItemID(type, id);
-    
+
     if (outSize)
         *outSize = item ? item->Size() : 0;
 
@@ -597 +611 @@
 TResourceSet::FindResource(type_code type, const char* name, size_t* outSize)
 {
     TypeItem* item = FindItemName(type, name);
-    
+
     if (outSize)
         *outSize = item ? item->Size() : 0;
 
@@ -632 +646 @@
     return ReturnStringBlockItem(FindItemName(type, name));
 }
 
-    
+
 const char*
 TResourceSet::FindString(type_code type, int32 id, uint32 index)
 {
     const TStringBlock* stringBlock = FindStringBlock(type, id);
+
     if (!stringBlock)
         return NULL;
 
@@ -648 +663 @@
 TResourceSet::FindString(type_code type, const char* name, uint32 index)
 {
     const TStringBlock* stringBlock = FindStringBlock(type, name);
+
     if (!stringBlock)
         return NULL;
 
     return stringBlock->String(index);
 }
 
-    
+
 TypeList*
 TResourceSet::FindTypeList(type_code type)
 {
     BAutolock lock(&fLock);
-    
+
     int32 count = fTypes.CountItems();
     for (int32 i = 0; i < count; i++ ) {
         TypeList* list = (TypeList*)fTypes.ItemAt(i);
         if (list && list->Type() == type)
             return list;
     }
-    
+
     return NULL;
 }
 
@@ -676 +692 @@
 {
     TypeList* list = FindTypeList(type);
     TypeItem* item = NULL;
-    
-    if (list) item = list->FindItemByID(id);
-    
+
+    if (list)
+        item = list->FindItemByID(id);
+
     if (!item)
         item = LoadResource(type, id, 0, &list);
-    
+
     return item;
 }
 
@@ -691 +708 @@
 {
     TypeList* list = FindTypeList(type);
     TypeItem* item = NULL;
-    
+
     if (list)
         item = list->FindItemByName(name);
-    
+
     if (!item)
         item = LoadResource(type, -1, name, &list);
-    
+
     return item;
 }
 
@@ -707 +724 @@
     TypeList** inOutList)
 {
     TypeItem* item = NULL;
-    
+
     if (name) {
         BEntry entry;
-        
+
         // If a named resource, first look in directories.
         fLock.Lock();
         int32 count = fDirectories.CountItems();
@@ -731 +748 @@
         }
         fLock.Unlock();
     }
-    
+
 #if USE_RESOURCES
     if (!item) {
         // Look through resource objects for data.
@@ -746 +763 @@
                     data = resource->LoadResource(type, id, &size);
                 else if (name != NULL)
                     data = resource->LoadResource(type, name, &size);
-                    
+
                 if (data && size) {
                     item = new TypeItem(id, name, data, size);
                     item->SetSourceIsFile(false);
@@ -803 +820 @@
     // Try to read as an archived bitmap.
     stream.Seek(0, SEEK_SET);
     BMessage archive;
-    if (archive.Unflatten(&stream) == B_OK ) {
+    if (archive.Unflatten(&stream) == B_OK) {
         bitmap = new BitmapTypeItem(&archive);
         if (bitmap && bitmap->InitCheck() != B_OK) {
-            bitmap->Delete();   // allows us to delete this bitmap...
+            // allows us to delete this bitmap...
+            bitmap->Delete();
             delete bitmap;
             bitmap = NULL;
         }
@@ -815 +833 @@
     if (bitmap) {
         BAutolock lock(&fLock);
         if (from->Object() != NULL) {
-            // Whoops!  Someone snuck in under us.
+            // Whoops! Someone snuck in under us.
             bitmap->Delete();
             delete bitmap;
             bitmap = dynamic_cast<BitmapTypeItem*>(from->Object());
-        } else 
+        } else
             from->SetObject(bitmap);
     }
 
@@ -832 +850 @@
 {
     if (!from)
         return NULL;
-    
+
     TypeObject* obj = from->Object();
     StringBlockTypeItem* stringBlock = dynamic_cast<StringBlockTypeItem*>(obj);
     if (stringBlock)
         return stringBlock;
-    
+
     // Can't change an existing object.
     if (obj)
         return NULL;
-    
+
     // Don't have a string block in the item -- we'll create one.
     if (from->SourceIsFile() ) {
         BMemoryIO stream(from->Data(), from->Size());
         stringBlock = new StringBlockTypeItem(&stream);
     } else
         stringBlock = new StringBlockTypeItem(from->Data(), from->Size());
-    
+
     if (stringBlock) {
         BAutolock lock(&fLock);
         if (from->Object() != NULL) {
-            // Whoops!  Someone snuck in under us.
+            // Whoops! Someone snuck in under us.
             delete stringBlock;
             stringBlock = dynamic_cast<StringBlockTypeItem*>(from->Object());
         } else
             from->SetObject(stringBlock);
     }
-    
+
     return stringBlock;
 }
 
@@ -867 +885 @@
 
 
 namespace TResourcePrivate {
-
     TResourceSet* gResources = NULL;
     BLocker gResourceLocker;
-    
 }
 
 
@@ -880 +896 @@
     // If already have it, return immediately.
     if (gResources)
         return gResources;
-    
+
     // Don't have 'em, lock access to make 'em.
     if (!gResourceLocker.Lock())
         return NULL;
@@ -889 +905 @@
         gResourceLocker.Unlock();
         return gResources;
     }
-    
+
     // Make 'em.
     gResources = new TResourceSet;
     gResources->AddResources(BApplication::AppResources());

src/apps/deskbar/ResourceSet.h

@@ -57 +57 @@
     TStringBlock(BDataIO* data);
     TStringBlock(const void* block, size_t size);
     virtual ~TStringBlock();
-    
+
     const char* String(size_t index) const;
 
 private:
     size_t PreIndex(char* strings, ssize_t len);
-    void MakeIndex(const char* strings, ssize_t len,
-        size_t indexLen, size_t* outIndex);
-    
+    void MakeIndex(const char* strings, ssize_t len, size_t indexLen,
+        size_t* outIndex);
+
     size_t fNumEntries;
     size_t* fIndex;
     char* fStrings;
@@ -81 +81 @@
     status_t AddEnvDirectory(const char* envPath,
         const char* defaultValue = NULL);
     
-    const void* FindResource(type_code type, int32 id,
-        size_t* outSize);
-    const void* FindResource(type_code type, const char* name,
-        size_t* outSize);
-    
+    const void* FindResource(type_code type, int32 id, size_t* outSize);
+    const void* FindResource(type_code type, const char* name, size_t* outSize);
+
     const BBitmap* FindBitmap(type_code type, int32 id);
     const BBitmap* FindBitmap(type_code type, const char* name);
-    
+
     const TStringBlock* FindStringBlock(type_code type, int32 id);
     const TStringBlock* FindStringBlock(type_code type, const char* name);
-    
+
     const char* FindString(type_code type, int32 id, uint32 index);
     const char* FindString(type_code type, const char* name, uint32 index);
-    
+
 private:
     status_t ExpandString(BString* out, const char* in);
     TypeList* FindTypeList(type_code type);
-    
+
     TypeItem* FindItemID(type_code type, int32 id);
     TypeItem* FindItemName(type_code type, const char* name);
-    
+
     TypeItem* LoadResource(type_code type, int32 id, const char* name,
         TypeList** inoutList = NULL);
-    
+
     BBitmap* ReturnBitmapItem(type_code type, TypeItem* from);
     TStringBlock* ReturnStringBlockItem(TypeItem* from);
-    
+
     BLocker fLock;              // access control.
     BList fResources;           // containing BResources objects.
     BList fDirectories;         // containing BPath objects.

src/apps/deskbar/StatusView.cpp

@@ -74 +74 @@
 using std::max;
 
 #ifdef DB_ADDONS
-//  Add-on support
+// Add-on support
 //
-//  Item - internal item list (node, eref, etc)
-//  Icon - physical replicant handed to the DeskbarClass class
-//  AddOn - attribute based add-on
+// Item - internal item list (node, eref, etc)
+// Icon - physical replicant handed to the DeskbarClass class
+// AddOn - attribute based add-on
 
 const char* const kInstantiateItemCFunctionName = "instantiate_deskbar_item";
 const char* const kInstantiateEntryCFunctionName = "instantiate_deskbar_entry";
@@ -240 +240 @@
 }
 
 
-/*!
-    Width is set to a minimum of kMinimumReplicantCount by kMaxReplicantWidth
+/*! Width is set to a minimum of kMinimumReplicantCount by kMaxReplicantWidth
     if not in multirowmode and greater than kMinimumReplicantCount
     the width should be calculated based on the actual
     replicant widths
@@ -255 +254 @@
         if (fShelf->CountReplicants() > 0)
             height = fRightBottomReplicant.bottom;
 
-        // the height will be uniform for the number of rows
-        // necessary to show all the reps + any gutters
-        // necessary for spacing
+        // the height will be uniform for the number of rows necessary to show
+        // all the reps + any gutters necessary for spacing
         int32 rowCount = (int32)(height / kMaxReplicantHeight);
         height = kGutter + (rowCount * kMaxReplicantHeight)
             + ((rowCount - 1) * kIconGap) + kGutter;
         height = max(kMinimumTrayHeight, height);
         width = fMinimumTrayWidth;
     } else {
-        // if last replicant overruns clock then
-        // resize to accomodate
+        // if last replicant overruns clock then resize to accomodate
         if (fShelf->CountReplicants() > 0) {
             if (fBarView->ShowingClock()
                 && fRightBottomReplicant.right + 6 >= fClock->Frame().left) {
@@ -274 +271 @@
             } else
                 width = fRightBottomReplicant.right + 3;
         }
+
         // this view has a fixed minimum width
         width = max(fMinimumTrayWidth, width);
     }
 
     *preferredWidth = width;
-    // add 2 for the border
+    // add 1 for the border
     *preferredHeight = height + 1;
 }
 
@@ -350 +348 @@
     BPopUpMenu* menu = new BPopUpMenu("", false, false);
     menu->SetFont(be_plain_font);
 
-    // If the clock is visible, show the extended menu
-    // otheriwse, show "Show Time".
+    // If clock is visible show the extended menu, otherwise show "Show Time"
 
     if (fBarView->ShowingClock())
         fClock->ShowClockOptions(ConvertToScreen(point));
@@ -375 +372 @@
         DumpList(fItemList);
 #endif
 
-    uint32  buttons;
+    uint32 buttons;
 
     Window()->CurrentMessage()->FindInt32("buttons", (int32*)&buttons);
     if (buttons == B_SECONDARY_MOUSE_BUTTON) {
@@ -412 +409 @@
 {
     // list to maintain refs to each rep added/deleted
     fItemList = new BList();
-
     bool haveKey = false;
-    BPath path;
+    BPath path;
+
     if (find_directory(B_USER_SETTINGS_DIRECTORY, &path, true) == B_OK) {
         path.Append(kDeskbarSecurityCodeFile);
 
         BFile file(path.Path(),B_READ_ONLY);
         if (file.InitCheck() == B_OK
-            && file.Read(&fDeskbarSecurityCode, sizeof(fDeskbarSecurityCode))
+            && file.Read(&fDeskbarSecurityCode, sizeof(fDeskbarSecurityCode))
                 == sizeof(fDeskbarSecurityCode))
             haveKey = true;
     }
@@ -443 +440 @@
         }
     }
 
-    // for each volume currently mounted
-    //      index the volume with our indices
+    // for each volume currently mounted index the volume with our indices
     BVolumeRoster roster;
     BVolume volume;
     while (roster.GetNextVolume(&volume) == B_OK) {
@@ -488 +484 @@
         || fs_stat_index(volume->Device(), kStatusPredicate, &info) != 0)
         return;
 
-    // run a new query on a specific volume
-    // make it live
+    // run a new query on a specific volume and make it live
     BQuery query;
     query.SetVolume(volume);
     query.SetPredicate(predicate);
@@ -557 +552 @@
 }
 
 
-/*! This handles B_NODE_MONITOR & B_QUERY_UPDATE messages received
+/*! This handles B_NODE_MONITOR & B_QUERY_UPDATE messages received
     for the registered add-ons.
 */
 void
@@ -697 +692 @@
 }
 
 
-/*!
-    The add-ons must support the exported C function API
+/*! The add-ons must support the exported C function API
     if they do, they will be loaded and added to deskbar
     primary function is the Instantiate function
 */
@@ -989 +983 @@
 }
 
 
-/*! Message must contain an archivable view for later rehydration.
+/*! Message must contain an archivable view for later rehydration.
     This function takes over ownership of the provided message on success
     only.
     Returns the current replicant ID.
@@ -1003 +997 @@
     // find entry_ref
 
     entry_ref ref;
-    if (addOn) {
-        // Use it if we got it
-        ref = *addOn;
-    } else {
+    if (addOn)
+        ref = *addOn; // Use it if we got it
+    else {
         const char* signature;
+
         status_t status = archive->FindString("add_on", &signature);
         if (status == B_OK) {
             BRoster roster;
@@ -1028 +1022 @@
         return status;
 
     BEntry entry(&ref, true);
-        // ToDo: this resolves an eventual link for the item
-        // being added - this is okay for now, but in multi-user
-        // environments, one might want to have links that
-        // carry the be:deskbar_item_status attribute
+    // TODO: this resolves an eventual link for the item being added - this is
+    // okay for now, but in multi-user environments, one might want to have
+    // links that carry the be:deskbar_item_status attribute
     status = entry.InitCheck();
     if (status != B_OK)
         return status;
@@ -1041 +1034 @@
         archive->what = 0;
 
     BRect originalBounds = archive->FindRect("_frame");
-        // this is a work-around for buggy replicants that change their
-        // size in AttachedToWindow() (such as "SVM")
+    // this is a work-around for buggy replicants that change their size in
+    // AttachedToWindow() (such as "SVM")
 
-    // !! check for name collisions?
+    // TODO: check for name collisions?
     status = fShelf->AddReplicant(archive, BPoint(1, 1));
     if (status != B_OK)
         return status;
@@ -1070 +1063 @@
     // add the item to the add-on list
 
     AddItem(*id, nodeRef, entry, addOn != NULL);
-    return B_OK;
+    return B_OK;
 }
 
 
@@ -1129 +1122 @@
     float width, height;
     GetPreferredSize(&width, &height);
     if (oldWidth != width || oldHeight != height) {
-        // resize view to accomodate the replicants
-        // redraw as necessary
+        // resize view to accomodate the replicants, redraw as necessary
         AdjustPlacement();
     }
 }
@@ -1165 +1157 @@
             }
         }
     }
-
     return NULL;
 }
 
@@ -1189 +1180 @@
             return view;
         }
     }
-
     return NULL;
 }
 
@@ -1353 +1343 @@
 //  #pragma mark -
 
 
-/*! Draggable region that is asynchronous so that dragging does not block
+/*! Draggable region that is asynchronous so that dragging does not block
     other activities.
 */
 TDragRegion::TDragRegion(TBarView* parent, BView* child)
@@ -1544 +1534 @@
     BRect dragRegion(DragRegion());
 
     dragRegion.InsetBy(-2.0f, -2.0f);
-        // DragRegion() is designed for drawing, not clicking
+    // DragRegion() is designed for drawing, not clicking
 
     if (!dragRegion.Contains(thePoint))
         return;
@@ -1584 +1574 @@
     bool newVertical, bool newLeft, bool newTop, int32 newState)
 {
     if (!rect.Contains(mouse))
-        // not our rect
-        return false;
+        return false; // not our rect
 
-    if (newVertical == fBarView->Vertical()
-        && newLeft == fBarView->Left()
-        && newTop == fBarView->Top()
-        && newState == fBarView->State())
-        // already in the correct mode
-        return true;
+    if (newVertical == fBarView->Vertical() && newLeft == fBarView->Left()
+        && newTop == fBarView->Top() && newState == fBarView->State())
+        return true; // already in the correct mode
 
     fBarView->ChangeState(newState, newVertical, newLeft, newTop);
     return true;

src/apps/deskbar/StatusView.h

@@ -51 +51 @@
 const int32 kGutter = 1;
 const int32 kDragRegionWidth = 6;
 
-//  1 pixel left gutter
-//  space for replicant tray (6 items)
-//  6 pixel drag region
-const float kMinimumTrayWidth = kIconGap
-        + (kMinimumReplicantCount * kIconGap)
-        + (kMinimumReplicantCount * kMaxReplicantWidth) + kGutter;
+// 1 pixel left gutter
+// space for replicant tray (6 items)
+// 6 pixel drag region
+const float kMinimumTrayWidth = kIconGap + (kMinimumReplicantCount * kIconGap)
+    + (kMinimumReplicantCount * kMaxReplicantWidth) + kGutter;
 const float kMinimumTrayHeight = kGutter + kMaxReplicantHeight + kGutter;
 
 extern float sMinimumWindowWidth;

src/apps/deskbar/StatusViewShelf.cpp

@@ -77 +77 @@
             while (message->FindMessage("specifiers", index++, &repspec)
                 == B_OK) {
                 const char* str;
+
                 if (repspec.FindString("property", &str) == B_OK) {
                     if (strcmp(str, "Replicant") == 0) {
                         int32 index;

src/apps/deskbar/StatusViewShelf.h

@@ -50 +50 @@
         
 protected:
         bool            CanAcceptReplicantView(BRect, BView*, BMessage*) const;
-        BPoint          AdjustReplicantBy(BRect, BMessage*) const;
+        BPoint          AdjustReplicantBy(BRect, BMessage*) const;
         void            ReplicantDeleted(int32, const BMessage*, const BView*);
 
 private:

src/apps/deskbar/Switcher.cpp

@@ -56 +56 @@
 
 
 #define _ALLOW_STICKY_ 0
-    // allows you to press 's' to keep the switcher window on screen
+// allows you to press 's' to keep the switcher window on screen
 
 
 static const color_space kIconFormat = B_RGBA32;
@@ -99 +99 @@
                                 TSwitchManager* manager);
     virtual                 ~TSwitcherWindow();
 
-    virtual bool            QuitRequested();
-    virtual void            MessageReceived(BMessage* message);
-    virtual void            Show();
-    virtual void            Hide();
-    virtual void            WindowActivated(bool state);
+    virtual bool            QuitRequested();
+    virtual void            MessageReceived(BMessage* message);
+    virtual void            Show();
+    virtual void            Hide();
+    virtual void            WindowActivated(bool state);
 
             void            DoKey(uint32 key, uint32 modifiers);
             TIconView*      IconView();
@@ -133 +133 @@
             void            UpdateGroup(int32 groupIndex, int32 windowIndex);
 
     virtual void            AttachedToWindow();
-    virtual void            Draw(BRect update);
-    virtual void            Pulse();
-    virtual void            GetPreferredSize(float* w, float* h);
+    virtual void            Draw(BRect update);
+    virtual void            Pulse();
+    virtual void            GetPreferredSize(float* w, float* h);
             void            ScrollTo(float x, float y)
                                 { ScrollTo(BPoint(x,y)); }
-    virtual void            ScrollTo(BPoint where);
+    virtual void            ScrollTo(BPoint where);
 
             void            ShowIndex(int32 windex);
             BRect           FrameOf(int32 index) const;
@@ -161 +161 @@
             void            Hiding();
 
     virtual void            KeyDown(const char* bytes, int32 numBytes);
-    virtual void            Pulse();
-    virtual void            MouseDown(BPoint point);
-    virtual void            Draw(BRect updateRect);
+    virtual void            Pulse();
+    virtual void            MouseDown(BPoint point);
+    virtual void            Draw(BRect updateRect);
 
             void            ScrollTo(float x, float y)
                                 { ScrollTo(BPoint(x,y)); }
-    virtual void    ScrollTo(BPoint where);
+    virtual void    ScrollTo(BPoint where);
             void            Update(int32 previous, int32 current,
                                 int32 previousSlot, int32 currentSlot,
                                 bool forward);
@@ -199 +199 @@
 
     virtual void            Draw(BRect update);
     virtual void            AllAttached();
-    virtual void            DrawIconScrollers(bool force);
-    virtual void            DrawWindowScrollers(bool force);
-    virtual void            MouseDown(BPoint where);
+    virtual void            DrawIconScrollers(bool force);
+    virtual void            DrawWindowScrollers(bool force);
+    virtual void            MouseDown(BPoint where);
 
 private:
             TSwitchManager* fManager;
@@ -252 +252 @@
 inline bool
 IsVisibleInCurrentWorkspace(const window_info* windowInfo)
 {
-    /*
-     The window list is always ordered from the top
-     front visible window (the first on the list), going down through all
-     the other visible windows, then all the hidden or non workspace
-     visible window at the end.
-
-     layer > 2 : normal visible window.
-     layer == 2 : reserved for the desktop window (visible also).
-     layer < 2 : hidden (0) and non workspace visible window (1)
-    */
+    // The window list is always ordered from the top
+    // front visible window (the first on the list), going down through all
+    // the other visible windows, then all the hidden or non workspace
+    // visible window at the end.
+    //
+    // layer > 2 : normal visible window.
+    // layer == 2 : reserved for the desktop window (visible also).
+    // layer < 2 : hidden (0) and non workspace visible window (1)
     return windowInfo->layer > 2;
 }
 
@@ -284 +282 @@
     // show_hide >= 1 means that the window is hidden.
     //
     // If the window is both minimized and hidden, then you get :
-    //   TWindow->is_mini = false;
-    //   TWindow->was_mini = true;
-    //   TWindow->show_hide >= 1;
+    //   TWindow->is_mini = false;
+    //   TWindow->was_mini = true;
+    //   TWindow->show_hide >= 1;
 
     if (windowInfo->feel != _STD_W_TYPE_)
         return false;
@@ -333 +331 @@
             continue;
         }
         if (*s1 != *s2)
-            return 1;       // they differ
+            return 1; // they differ
         s1++;
         s2++;
     }
 
     // if one of the strings ended before the other
-    // ??? could process trailing spaces & underscores!
+    // TODO: could process trailing spaces and underscores
     if (*s1)
         return 1;
     if (*s2)
@@ -448 +446 @@
     TBarApp::Subscribe(BMessenger(this), &tmpList);
 
     for (int32 i = 0; ; i++) {
-        BarTeamInfo *barTeamInfo = (BarTeamInfo *)tmpList.ItemAt(i);
+        BarTeamInfo* barTeamInfo = (BarTeamInfo*)tmpList.ItemAt(i);
         if (!barTeamInfo)
             break;
 
@@ -485 +483 @@
             int i = 0;
             TTeamGroup* tinfo;
             message->FindInt32("team", &teamID);
+
             while ((tinfo = (TTeamGroup*)fGroupList.ItemAt(i)) != NULL) {
                 if (tinfo->TeamList()->HasItem((void*)teamID)) {
                     fGroupList.RemoveItem(i);
@@ -519 +518 @@
                 delete teams;
                 break;
             }
+
             delete smallIcon;
+
             if (message->FindString("sig", &signature) != B_OK) {
                 delete teams;
                 break;
             }
+
             if (message->FindInt32("flags", (int32*)&flags) != B_OK) {
                 delete teams;
                 break;
             }
+
             if (message->FindString("name", &name) != B_OK) {
                 delete teams;
                 break;
@@ -548 +551 @@
             const char* signature = message->FindString("sig");
             team_id team = message->FindInt32("team");
 
-            int32 numItems = fGroupList.CountItems();
-            for (int32 i = 0; i < numItems; i++) {
+            for (int32 i = 0; i < fGroupList.CountItems(); i++) {
                 TTeamGroup* tinfo = (TTeamGroup*)fGroupList.ItemAt(i);
                 if (strcasecmp(tinfo->Signature(), signature) == 0) {
                     if (!(tinfo->TeamList()->HasItem((void*)team)))
@@ -564 +566 @@
         {
             team_id team = message->FindInt32("team");
 
-            int32 numItems = fGroupList.CountItems();
-            for (int32 i = 0; i < numItems; i++) {
+            for (int32 i = 0; i < fGroupList.CountItems(); i++) {
                 TTeamGroup* tinfo = (TTeamGroup*)fGroupList.ItemAt(i);
                 if (tinfo->TeamList()->HasItem((void*)team)) {
                     tinfo->TeamList()->RemoveItem((void*)team);
@@ -586 +587 @@
             // starts differentiating initial key_downs from KeyDowns generated
             // by auto-repeat. Until then the fSkipUntil stuff helps, but it
             // isn't perfect.
-
             if (time < fSkipUntil)
                 break;
 
@@ -622 +622 @@
     team_id* teams;
     int32 count;
     if (BPrivate::get_application_order(current_workspace(), &teams, &count)
-            != B_OK)
+        != B_OK)
         return;
 
     BList groups;
@@ -658 +658 @@
 {
     bigtime_t now = system_time();
     bigtime_t timeout = now + 180000;
-        // The delay above was arrived at by trial and error and
-        // has a good "feel"
+    // The delay above was arrived at by trial and error and has a good "feel"
 
     app_info appInfo;
     be_roster->GetActiveAppInfo(&appInfo);
@@ -695 +694 @@
             QuickSwitch(message);
             return;
         }
-        snooze(20000);
-            // Must be a multiple of the delay used above
+        snooze(20000); // Must be a multiple of the delay used above
     }
 
     Process((modifierKeys & B_SHIFT_KEY) == 0, key == 0x11);
@@ -887 +885 @@
             if (fCurrentIndex < 0)
                 fCurrentIndex = max - 1;
         }
+
         if (fCurrentIndex == startIndex) {
             // we've gone completely through the list without finding
             // a good app. Oh well.
@@ -932 +931 @@
 
     int32 currentWorkspace = current_workspace();
     TTeamGroup* teamGroup = (TTeamGroup*)fGroupList.ItemAt(fCurrentIndex);
+
     // Let's handle the easy case first: There's only 1 team in the group
     if (teamGroup->TeamList()->CountItems() == 1) {
         bool result;
@@ -990 +990 @@
     if (tokens == NULL) {
         ASSERT(windowInfo);
         free(windowInfo);
-        return true;    // weird error, so don't try to recover
+        return true; // weird error, so don't try to recover
     }
 
     BList windowsToActivate;
@@ -1042 +1042 @@
 
     TTeamGroup* teamGroup;
     int32 count = 0;
+
     for (int32 i = fCurrentIndex + 1; i < fGroupList.CountItems(); i++) {
         teamGroup = (TTeamGroup*)fGroupList.ItemAt(i);
 
@@ -1382 +1383 @@
     BeginLineArray(50);
 
     // The main frame around the icon view
-    AddLine(box.LeftTop(), BPoint(center-kWedge, box.top), veryDarkGray);
-    AddLine(BPoint(center+kWedge, box.top), box.RightTop(), veryDarkGray);
+    AddLine(box.LeftTop(), BPoint(center - kWedge, box.top), veryDarkGray);
+    AddLine(BPoint(center + kWedge, box.top), box.RightTop(), veryDarkGray);
 
-    AddLine(box.LeftBottom(), BPoint(center-kWedge, box.bottom), veryDarkGray);
-    AddLine(BPoint(center+kWedge, box.bottom), box.RightBottom(), veryDarkGray);
+    AddLine(box.LeftBottom(), BPoint(center - kWedge, box.bottom),
+        veryDarkGray);
+    AddLine(BPoint(center + kWedge, box.bottom), box.RightBottom(),
+        veryDarkGray);
     AddLine(box.LeftBottom() + BPoint(1, 1),
-        BPoint(center-kWedge, box.bottom + 1), white);
-    AddLine(BPoint(center+kWedge, box.bottom) + BPoint(0, 1),
+        BPoint(center - kWedge, box.bottom + 1), white);
+    AddLine(BPoint(center + kWedge, box.bottom) + BPoint(0, 1),
         box.RightBottom() + BPoint(1, 1), white);
 
     AddLine(box.LeftTop(), box.LeftBottom(), veryDarkGray);
     AddLine(box.RightTop(), box.RightBottom(), veryDarkGray);
-    AddLine(box.RightTop() + BPoint(1, 1),
-        box.RightBottom() + BPoint(1, 1), white);
+    AddLine(box.RightTop() + BPoint(1, 1), box.RightBottom() + BPoint(1, 1),
+        white);
 
     // downward pointing area at top of frame
     BPoint point(center - kWedge, box.top);
     AddLine(point, point + BPoint(kWedge, kWedge), veryDarkGray);
-    AddLine(point + BPoint(kWedge, kWedge),
-        BPoint(center+kWedge, point.y), veryDarkGray);
+    AddLine(point + BPoint(kWedge, kWedge), BPoint(center + kWedge, point.y),
+        veryDarkGray);
 
-    AddLine(point + BPoint(1, 0),
-        point + BPoint(1, 0) + BPoint(kWedge - 1, kWedge - 1), white);
+    AddLine(point + BPoint(1, 0), point + BPoint(1, 0)
+        + BPoint(kWedge - 1, kWedge - 1), white);
 
     AddLine(point + BPoint(2, -1) + BPoint(kWedge - 1, kWedge - 1),
-        BPoint(center+kWedge-1, point.y), darkGray);
+        BPoint(center + kWedge - 1, point.y), darkGray);
 
     BPoint topPoint = point;
 
@@ -1416 +1419 @@
     point.x = center - kWedge;
     AddLine(point, point + BPoint(kWedge, -kWedge), veryDarkGray);
     AddLine(point + BPoint(kWedge, -kWedge),
-        BPoint(center+kWedge, point.y), veryDarkGray);
+        BPoint(center + kWedge, point.y), veryDarkGray);
 
     AddLine(point + BPoint(1, 0),
         point + BPoint(1, 0) + BPoint(kWedge - 1, -(kWedge - 1)), white);
@@ -1467 +1470 @@
     }
 
     int32 maxIndex = fManager->GroupList()->CountItems() - 1;
-            // last_frame is in fIconView coordinate space
+    // last_frame is in fIconView coordinate space
     BRect lastFrame = fIconView->FrameOf(maxIndex);
 
     if (lastFrame.right > rect.right) {
@@ -1893 +1896 @@
 void
 TIconView::AnimateIcon(BBitmap* startIcon, BBitmap* endIcon)
 {
-    BRect centerRect(kCenterSlot*kSlotSize, 0,
+    BRect centerRect(kCenterSlot * kSlotSize, 0,
         (kCenterSlot + 1) * kSlotSize - 1, kSlotSize - 1);
     BRect startIconBounds = startIcon->Bounds();
     BRect bounds = Bounds();
@@ -2054 +2057 @@
 TIconView::SlotOf(int32 index) const
 {
     BRect rect = FrameOf(index);
+
     return (int32)(rect.left / kSlotSize) - kCenterSlot;
 }
 
@@ -2063 +2067 @@
 {
     BList* list = fManager->GroupList();
     int32 visible = kCenterSlot - 1;
-        // first few slots in view are empty
+    // first few slots in view are empty
 
     TTeamGroup* teamGroup;
     for (int32 i = 0; i <= index; i++) {
@@ -2274 +2278 @@
     int32 groupIndex = fManager->CurrentIndex();
     TTeamGroup* teamGroup
         = (TTeamGroup*)fManager->GroupList()->ItemAt(groupIndex);
+
     if (teamGroup == NULL)
         return;
 

src/apps/deskbar/Switcher.h

@@ -53 +53 @@
                             TSwitchManager(BPoint where);
     virtual                 ~TSwitchManager();
 
-    virtual void            MessageReceived(BMessage* message);
+    virtual void            MessageReceived(BMessage* message);
 
             void            Stop(bool doAction, uint32 modifiers);
             void            Unblock();

src/apps/deskbar/TeamMenu.h

@@ -32 +32 @@
 All rights reserved.
 */
 
-//  listing of running applications
-//  menu of BarMenuTitle
-//  in mini mode only
+// listing of running applications
+// menu of BarMenuTitle
+// in mini mode only
 
 #ifndef TEAMMENU_H
 #define TEAMMENU_H

src/apps/deskbar/TeamMenuItem.cpp

@@ -71 +71 @@
 }
 
 
-TTeamMenuItem::TTeamMenuItem(float width,float height,bool vertical)
+TTeamMenuItem::TTeamMenuItem(float width, float height, bool vertical)
     :   BMenuItem("", NULL)
 {
     InitData(NULL, NULL, strdup(""), strdup(""), width, height, false, vertical);
@@ -233 +233 @@
     BMenu* menu = Menu();
     menu->PushState();
     rgb_color menuColor = menu->LowColor();
-
     TBarView* barview = (static_cast<TBarApp*>(be_app))->BarView();
+
     bool canHandle = !barview->Dragging()
         || barview->AppCanHandleTypes(Signature());
 
@@ -314 +314 @@
 
         // these continue the dark grey border on the left or top edge
         menu->SetHighColor(tint_color(menuColor, B_DARKEN_4_TINT));
-        if (fVertical)
+        if (fVertical) {
             // dark line at top
             menu->StrokeLine(frame.LeftTop(), frame.RightTop());
-        else
+        } else {
             // dark line on the left
             menu->StrokeLine(frame.LeftTop(), frame.LeftBottom());
+        }
     } else 
         menu->SetLowColor(menuColor);
 
@@ -337 +338 @@
         if (fIcon->ColorSpace() == B_RGBA32) {
             menu->SetDrawingMode(B_OP_ALPHA);
             menu->SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
-        } else {
+        } else
             menu->SetDrawingMode(B_OP_OVER);
-        }
-        BRect frame(Frame());
 
+        BRect frame(Frame());
         BRect iconBounds(fIcon->Bounds());
         BRect dstRect(iconBounds);
         float extra = fVertical ? 0.0f : 1.0f;
         BPoint contLoc = ContentLocation();
+
         dstRect.OffsetTo(BPoint(contLoc.x + kHPad, contLoc.y + 
             ((frame.Height() - iconBounds.Height()) / 2) + extra));
         menu->DrawBitmapAsync(fIcon, dstRect);
@@ -357 +358 @@
         menu->MovePenTo(drawLoc);
     }
 
-    //  set the pen to black so that either method will draw in the same color
-    //  low color is set in inherited::DrawContent, override makes sure its
-    //  what we want
+    // set the pen to black so that either method will draw in the same color
+    // low color is set in inherited::DrawContent, override makes sure its
+    // what we want
     if (fDrawLabel) {
         menu->SetDrawingMode(B_OP_OVER);
         menu->SetHighColor(0, 0, 0);
 
-        //  override the drawing of the content when the item is disabled
-        //  the wrong lowcolor is used when the item is disabled since the
-        //  text color does not change
+        // override the drawing of the content when the item is disabled
+        // the wrong lowcolor is used when the item is disabled since the
+        // text color does not change
         DrawContentLabel(); 
     }
 
@@ -387 +388 @@
         } else {
             rgb_color outlineColor = {80, 80, 80, 255};
             rgb_color middleColor = {200, 200, 200, 255};
-    
+
             menu->SetDrawingMode(B_OP_OVER);
-    
+
             if (!fExpanded) {
                 menu->BeginLineArray(6);
-    
+
                 menu->AddLine(BPoint(rect.left + 3, rect.top + 1), 
                     BPoint(rect.left + 3, rect.bottom - 1), outlineColor);
                 menu->AddLine(BPoint(rect.left + 3, rect.top + 1), 
                     BPoint(rect.left + 7, rect.top + 5), outlineColor);
                 menu->AddLine(BPoint(rect.left + 7, rect.top + 5), 
                     BPoint(rect.left + 3, rect.bottom - 1), outlineColor);
-    
+
                 menu->AddLine(BPoint(rect.left + 4, rect.top + 3), 
                     BPoint(rect.left + 4, rect.bottom - 3), middleColor);
                 menu->AddLine(BPoint(rect.left + 5, rect.top + 4), 
@@ -409 +410 @@
                 menu->EndLineArray();
             } else {
                 // expanded state
-    
+
                 menu->BeginLineArray(6);
                 menu->AddLine(BPoint(rect.left + 1, rect.top + 3), 
                     BPoint(rect.right - 3, rect.top + 3), outlineColor);
@@ -417 +418 @@
                     BPoint(rect.left + 5, rect.top + 7), outlineColor);
                 menu->AddLine(BPoint(rect.left + 5, rect.top + 7), 
                     BPoint(rect.right - 3, rect.top + 3), outlineColor);
-    
+
                 menu->AddLine(BPoint(rect.left + 3, rect.top + 4), 
                     BPoint(rect.right - 5, rect.top + 4), middleColor);
                 menu->AddLine(BPoint(rect.left + 4, rect.top + 5), 
@@ -444 +445 @@
     const char* label = Label();
     char* truncLabel = NULL;
     float max = 0;
+
     if (static_cast<TBarApp*>(be_app)->Settings()->superExpando && fVertical)
         max = menu->MaxContentWidth() - kSwitchWidth;
     else
@@ -491 +493 @@
 TTeamMenuItem::ToggleExpandState(bool resizeWindow)
 {
     fExpanded = !fExpanded;
-    
+
     if (fExpanded) {
         // Populate Menu() with the stuff from SubMenu().
         TWindowMenu* sub = (static_cast<TWindowMenu*>(Submenu()));
@@ -503 +505 @@
             if (locked)
                 sub->UnlockLooper();
 
-            if (sub->CountItems() > 1){
+            if (sub->CountItems() > 1) {
                 TExpandoMenuBar* parent = static_cast<TExpandoMenuBar*>(Menu());
                 int myindex = parent->IndexOf(this) + 1;
 
@@ -553 +555 @@
 TWindowMenuItem*
 TTeamMenuItem::ExpandedWindowItem(int32 id)
 {
-    if (!fExpanded) // Paranoia
+    if (!fExpanded) {
+        // Paranoia
         return NULL;
+    }
 
     TExpandoMenuBar* parent = static_cast<TExpandoMenuBar*>(Menu());
     int childIndex = parent->IndexOf(this) + 1;

src/apps/deskbar/TimeView.cpp

@@ -154 +154 @@
 
     GetCurrentTime();
 
-    // TODO: SetOrientation never gets called, fix that
-    // When in vertical mode, we want to limit the width so that it can't
-    // overlap the bevels in the parent view.
+    // TODO: SetOrientation never gets called, fix that when in vertical mode,
+    // we want to limit the width so that it can't overlap the bevels in the
+    // parent view.
     *width = fOrientation ?
         min_c(fMaxWidth - kHMargin, kHMargin + StringWidth(fTimeStr))
         : kHMargin + StringWidth(fTimeStr);
@@ -217 +217 @@
 
         default:
             BView::MessageReceived(message);
+            break;
     }
 }
 
@@ -262 +263 @@
 
     fLocale.FormatDate(tmp, 64, fTime, B_FULL_DATE_FORMAT);
 
-    //  remove leading 0 from date when month is less than 10 (MM/DD/YY)
-    //  or remove leading 0 from date when day is less than 10 (DD/MM/YY)
+    // remove leading 0 from date when month is less than 10 (MM/DD/YY)
+    // or remove leading 0 from date when day is less than 10 (DD/MM/YY)
     const char* str = tmp;
     if (str[0] == '0')
         str++;
@@ -325 +326 @@
         // For dates, Update() could be called two times in a row,
         // but that should only happen very rarely
         if ((fLastTimeStr[1] != fTimeStr[1]
-                && (fLastTimeStr[1] == ':' || fTimeStr[1] == ':'))
+            && (fLastTimeStr[1] == ':' || fTimeStr[1] == ':'))
             || !fLastTimeStr[0])
             Update();
 
@@ -361 +362 @@
     GetCurrentTime();
     GetCurrentDate();
 
-
     SetToolTip(fDateStr);
 
     ResizeToPreferred();
@@ -370 +370 @@
     if (fParent) {
         BMessage reformat('Trfm');
         fParent->MessageReceived(&reformat);
-            // time string format realign
+        // time string format realign
         fParent->Invalidate();
     }
 }

src/apps/deskbar/TimeView.h

@@ -73 +73 @@
         void        MouseDown(BPoint where);
         void        Pulse();
 
-        bool        ShowingSeconds()    { return fShowSeconds; }
+        bool        ShowingSeconds() { return fShowSeconds; }
         void        ShowSeconds(bool);
         void        ShowCalendar(BPoint where);
 
@@ -110 +110 @@
 
         float       fMaxWidth;
         float       fHeight;
-        bool        fOrientation;       // vertical = true
+        bool        fOrientation; // vertical = true
         BPoint      fTimeLocation;
         BPoint      fDateLocation;
 

src/apps/deskbar/WindowMenu.cpp

@@ -88 +88 @@
 TWindowMenu::AttachedToWindow()
 {
     SetFont(be_plain_font);
-
     RemoveItems(0, CountItems(), true);
-
     int32 miniCount = 0;
 
     bool dragging = false;
     TBarView* barview =(static_cast<TBarApp*>(be_app))->BarView();
     if (barview && barview->LockLooper()) {
-        //  'dragging' mode set in BarView::CacheDragData
-        //      invoke in MouseEnter in ExpandoMenuBar
+        // 'dragging' mode set in BarView::CacheDragData
+        // invoke in MouseEnter in ExpandoMenuBar
         dragging = barview->Dragging();
         if (dragging) {
             // We don't want to show the menu when dragging, but it's not
@@ -105 +103 @@
             // Don't call BMenu::Hide(), it causes the menu to pop up every now
             // and then.
             Window()->Hide();
-            //  if in expando (horizontal or vertical)
+            // if in expando (horizontal or vertical)
             if (barview->Expando()) {
                 SetTrackingHook(barview->MenuTrackingHook,
                     barview->GetTrackingHookData());
@@ -192 +190 @@
                 fTeam, B_QUIT_REQUESTED));
         }
     } else {
-        //  if we are in drag mode, then don't add the window controls
-        //  to the menu
+        // if we are in drag mode, then don't add the window controls
+        // to the menu
         if (!dragging) {
             TShowHideMenuItem* hide =
                 new TShowHideMenuItem(B_TRANSLATE("Hide all"), fTeam,
@@ -230 +228 @@
     TBarView* barview = (dynamic_cast<TBarApp*>(be_app))->BarView();
     if (barview && barview->Expando() && barview->Dragging()
         && barview->LockLooper()) {
-        // We changed the show level in AttachedToWindow().  Undo it.
+        // We changed the show level in AttachedToWindow(). Undo it.
         Window()->Show();
         barview->DragStop();
         barview->UnlockLooper();

src/apps/deskbar/WindowMenuItem.cpp

@@ -48 +48 @@
 #include "WindowMenu.h"
 
 
-const float kHPad = 10.0f;
-const float kVPad = 2.0f;
-const float kLabelOffset = 8.0f;
-const BRect kIconRect(1.0f, 1.0f, 13.0f, 14.0f);
+const float kHPad = 10.0f;
+const float kVPad = 2.0f;
+const float kLabelOffset = 8.0f;
+const BRect kIconRect(1.0f, 1.0f, 13.0f, 14.0f);
 
 
 TWindowMenuItem::TWindowMenuItem(const char* title, int32 id, bool mini,
@@ -204 +204 @@
 
     menu->PushState();
 
-    //  if not selected or being tracked on, fill with gray
+    // if not selected or being tracked on, fill with gray
     TBarView* barview = (static_cast<TBarApp*>(be_app))->BarView();
     if ((!IsSelected() && !menu->IsRedrawAfterSticky())
         || barview->Dragging() || !IsEnabled()) {
@@ -241 +241 @@
 
     BRect frame(Frame());
     BPoint contLoc = ContentLocation() + BPoint(kHPad, kVPad);
-//  if (fExpanded)
-//      contLoc.x += kHPad;
+    //if (fExpanded)
+    //  contLoc.x += kHPad;
 
     if (fID >= 0) {
         menu->SetDrawingMode(B_OP_OVER);

src/apps/deskbar/WindowMenuItem.h

@@ -69 +69 @@
 
 protected:
             void                Initialize(const char* title);
-    virtual void                GetContentSize(float* width, float* height);
+    virtual void                GetContentSize(float* width, float* height);
     virtual void                DrawContent();
     virtual status_t            Invoke(BMessage* message = NULL);
     virtual void                Draw();
@@ -91 +91 @@
 
 
 #endif  /* WINDOWMENUITEM_H */
+