[haiku-commits] haiku: hrev44095 - src/apps/deskbar
- From: jscipione@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 3 May 2012 02:31:06 +0200 (CEST)
hrev44095 adds 1 changeset to branch 'master'
old head: bb4e1d3e6fe169a8b55dc0f6f83cb5ed4f3058ca
new head: 1cd61330ecd8257551d58f204332d00145c855ec
----------------------------------------------------------------------------
1cd6133: Style fixes including reordering #include's in Deskbar
* Reorder includes according to the Style Guide.
* Whitespace changes, mostly making sure there are 2 newlines
between things and making sure there is 1 newline at the end of
each file.
* Make end of header files all in the style of
#endif\t/* _HEADER_GAURD_H_ */
* The one change that is not purely style is to #include <Path.h>
in DeskbarUtils.h instead of DeskbarUtils.cpp because it is used
to define entry_ref for the AddRefsToDeskbarMenu() prototype.
[ John Scipione <jscipione@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev44095
Commit: 1cd61330ecd8257551d58f204332d00145c855ec
URL: http://cgit.haiku-os.org/haiku/commit/?id=1cd6133
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Thu May 3 00:24:01 2012 UTC
----------------------------------------------------------------------------
36 files changed, 111 insertions(+), 106 deletions(-)
src/apps/deskbar/BarApp.h | 2 +-
src/apps/deskbar/BarMenuBar.cpp | 3 +--
src/apps/deskbar/BarMenuBar.h | 7 ++++---
src/apps/deskbar/BarMenuTitle.cpp | 3 +--
src/apps/deskbar/BarMenuTitle.h | 8 +++++---
src/apps/deskbar/BarView.cpp | 3 +--
src/apps/deskbar/BarView.h | 3 +--
src/apps/deskbar/BarWindow.cpp | 4 +---
src/apps/deskbar/BarWindow.h | 3 +--
src/apps/deskbar/CalendarMenuWindow.cpp | 2 --
src/apps/deskbar/CalendarMenuWindow.h | 4 +---
src/apps/deskbar/DeskbarMenu.cpp | 6 +++---
src/apps/deskbar/DeskbarMenu.h | 1 -
src/apps/deskbar/DeskbarUtils.cpp | 10 +++++-----
src/apps/deskbar/DeskbarUtils.h | 7 +++++--
src/apps/deskbar/ExpandoMenuBar.cpp | 12 ++++++------
src/apps/deskbar/ExpandoMenuBar.h | 4 +++-
src/apps/deskbar/PreferencesWindow.h | 3 ++-
src/apps/deskbar/ResourceSet.cpp | 14 ++++++--------
src/apps/deskbar/ResourceSet.h | 4 +++-
src/apps/deskbar/ShowHideMenuItem.cpp | 8 +++++---
src/apps/deskbar/ShowHideMenuItem.h | 9 ++++-----
src/apps/deskbar/StatusView.cpp | 7 ++++---
src/apps/deskbar/StatusView.h | 4 ++--
src/apps/deskbar/StatusViewShelf.cpp | 7 ++++---
src/apps/deskbar/StatusViewShelf.h | 8 +++++---
src/apps/deskbar/Switcher.cpp | 19 +++++++++----------
src/apps/deskbar/Switcher.h | 3 ++-
src/apps/deskbar/TeamMenu.cpp | 5 +++--
src/apps/deskbar/TeamMenu.h | 9 ++++++---
src/apps/deskbar/TeamMenuItem.cpp | 3 +--
src/apps/deskbar/TeamMenuItem.h | 7 ++++---
src/apps/deskbar/WindowMenu.cpp | 9 +++++----
src/apps/deskbar/WindowMenu.h | 7 ++++---
src/apps/deskbar/WindowMenuItem.cpp | 2 +-
src/apps/deskbar/WindowMenuItem.h | 7 ++-----
----------------------------------------------------------------------------
diff --git a/src/apps/deskbar/BarApp.h b/src/apps/deskbar/BarApp.h
index a184e32..6dfac18 100644
--- a/src/apps/deskbar/BarApp.h
+++ b/src/apps/deskbar/BarApp.h
@@ -167,4 +167,4 @@ class TBarApp : public BApplication {
};
-#endif // BAR_APP_H
+#endif /* BAR_APP_H */
diff --git a/src/apps/deskbar/BarMenuBar.cpp b/src/apps/deskbar/BarMenuBar.cpp
index b03936e..3289779 100644
--- a/src/apps/deskbar/BarMenuBar.cpp
+++ b/src/apps/deskbar/BarMenuBar.cpp
@@ -33,13 +33,13 @@ holders.
All rights reserved.
*/
-#include <Debug.h>
#include "BarMenuBar.h"
#include <string.h>
#include <Bitmap.h>
+#include <Debug.h>
#include <NodeInfo.h>
#include "icons.h"
@@ -203,4 +203,3 @@ TBarMenuBar::InitTrackingHook(bool (*hookFunction)(BMenu*,
void*),
if (fAppListMenuItem && (fAppListMenuItem->Frame().Contains(loc) ||
both))
init_tracking_hook(fAppListMenuItem, hookFunction, state);
}
-
diff --git a/src/apps/deskbar/BarMenuBar.h b/src/apps/deskbar/BarMenuBar.h
index 3adaa97..a10630d 100644
--- a/src/apps/deskbar/BarMenuBar.h
+++ b/src/apps/deskbar/BarMenuBar.h
@@ -32,13 +32,14 @@ brand product names are registered trademarks or trademarks
of their respective
holders.
All rights reserved.
*/
+#ifndef BARMENUBAR_H
+#define BARMENUBAR_H
+
// Be Menu, used in vertical mode, expanded and mini
// - in mini mode will have team menu next to Be menu
// - Be menu in horizontal mode is embedded in ExpandoMenuBar
-#ifndef BARMENUBAR_H
-#define BARMENUBAR_H
#include <MenuBar.h>
@@ -71,5 +72,5 @@ class TBarMenuBar : public BMenuBar {
TBarMenuTitle* fAppListMenuItem;
};
-#endif /* BARMENUBAR_H */
+#endif /* BARMENUBAR_H */
diff --git a/src/apps/deskbar/BarMenuTitle.cpp
b/src/apps/deskbar/BarMenuTitle.cpp
index 903d81e..4704b6c 100644
--- a/src/apps/deskbar/BarMenuTitle.cpp
+++ b/src/apps/deskbar/BarMenuTitle.cpp
@@ -33,12 +33,12 @@ holders.
All rights reserved.
*/
-#include <Debug.h>
#include "BarMenuTitle.h"
#include <Bitmap.h>
#include <ControlLook.h>
+#include <Debug.h>
#include "BarApp.h"
#include "BarView.h"
@@ -208,4 +208,3 @@ TBarMenuTitle::Invoke(BMessage* message)
return BMenuItem::Invoke(message);
}
-
diff --git a/src/apps/deskbar/BarMenuTitle.h b/src/apps/deskbar/BarMenuTitle.h
index 543cc51..0a4a9f6 100644
--- a/src/apps/deskbar/BarMenuTitle.h
+++ b/src/apps/deskbar/BarMenuTitle.h
@@ -32,16 +32,18 @@ brand product names are registered trademarks or trademarks
of their respective
holders.
All rights reserved.
*/
+#ifndef BARMENUTITLE_H
+#define BARMENUTITLE_H
+
//
// Be Menu - Be Logo menu item in expanded mode
// Team/App menu item in mini mode
-#ifndef BARMENUTITLE_H
-#define BARMENUTITLE_H
#include <MenuItem.h>
+
class BBitmap;
class BMenu;
@@ -67,5 +69,5 @@ private:
const BBitmap* fIcon;
};
-#endif /* BARMENUTITLE_H */
+#endif /* BARMENUTITLE_H */
diff --git a/src/apps/deskbar/BarView.cpp b/src/apps/deskbar/BarView.cpp
index 34a09ae..4e5e499 100644
--- a/src/apps/deskbar/BarView.cpp
+++ b/src/apps/deskbar/BarView.cpp
@@ -33,7 +33,6 @@ holders.
All rights reserved.
*/
-#include <Debug.h>
#include "BarView.h"
@@ -43,6 +42,7 @@ All rights reserved.
#include <AppFileInfo.h>
#include <Bitmap.h>
+#include <Debug.h>
#include <Directory.h>
#include <LocaleRoster.h>
#include <NodeInfo.h>
@@ -1063,4 +1063,3 @@ TBarView::IconFrame(const char* name) const
{
return OffsetIconFrame(fReplicantTray->IconFrame(name));
}
-
diff --git a/src/apps/deskbar/BarView.h b/src/apps/deskbar/BarView.h
index 22f4a69..71da63b 100644
--- a/src/apps/deskbar/BarView.h
+++ b/src/apps/deskbar/BarView.h
@@ -32,7 +32,6 @@ brand product names are registered trademarks or trademarks
of their respective
holders.
All rights reserved.
*/
-
#ifndef BARVIEW_H
#define BARVIEW_H
@@ -229,5 +228,5 @@ TBarView::CachedTypesList() const
return fCachedTypesList;
}
-#endif /* BARVIEW_H */
+#endif /* BARVIEW_H */
diff --git a/src/apps/deskbar/BarWindow.cpp b/src/apps/deskbar/BarWindow.cpp
index badd8dd..0b05dbb 100644
--- a/src/apps/deskbar/BarWindow.cpp
+++ b/src/apps/deskbar/BarWindow.cpp
@@ -48,6 +48,7 @@ All rights reserved.
#include <Locale.h>
#include <MenuItem.h>
#include <MessageFilter.h>
+#include <MessagePrivate.h>
#include <Screen.h>
#include "BarApp.h"
@@ -58,8 +59,6 @@ All rights reserved.
#include "StatusView.h"
#include "tracker_private.h"
-#include <MessagePrivate.h>
-
#undef B_TRANSLATION_CONTEXT
#define B_TRANSLATION_CONTEXT "MainWindow"
@@ -611,4 +610,3 @@ TBarWindow::_IsFocusMessage(BMessage* message)
return true;
}
-
diff --git a/src/apps/deskbar/BarWindow.h b/src/apps/deskbar/BarWindow.h
index f3f8ccc..170b40c 100644
--- a/src/apps/deskbar/BarWindow.h
+++ b/src/apps/deskbar/BarWindow.h
@@ -43,7 +43,6 @@ All rights reserved.
class TDeskbarMenu;
class TBarView;
-
class TBarWindow : public BWindow {
public:
TBarWindow();
@@ -92,5 +91,5 @@ private:
TBarView* fBarView;
};
-#endif /* BAR_WINDOW_H */
+#endif /* BAR_WINDOW_H */
diff --git a/src/apps/deskbar/CalendarMenuWindow.cpp
b/src/apps/deskbar/CalendarMenuWindow.cpp
index aa59b35..14a314c 100644
--- a/src/apps/deskbar/CalendarMenuWindow.cpp
+++ b/src/apps/deskbar/CalendarMenuWindow.cpp
@@ -21,7 +21,6 @@
using BPrivate::BCalendarView;
-
enum {
kInvokationMessage,
kMonthDownMessage,
@@ -249,4 +248,3 @@ CalendarMenuWindow::_SetupButton(const char* label, uint32
what, float height)
return button;
}
-
diff --git a/src/apps/deskbar/CalendarMenuWindow.h
b/src/apps/deskbar/CalendarMenuWindow.h
index 7ff5069..10dd585 100644
--- a/src/apps/deskbar/CalendarMenuWindow.h
+++ b/src/apps/deskbar/CalendarMenuWindow.h
@@ -13,14 +13,12 @@
class BMessage;
class BStringView;
-
namespace BPrivate {
class BCalendarView;
}
using BPrivate::BCalendarView;
-
class CalendarMenuWindow : public BWindow {
public:
CalendarMenuWindow(BPoint where);
@@ -43,4 +41,4 @@ private:
};
-#endif // _CALENDAR_MENU_WINDOW_H_
+#endif /* _CALENDAR_MENU_WINDOW_H_ */
diff --git a/src/apps/deskbar/DeskbarMenu.cpp b/src/apps/deskbar/DeskbarMenu.cpp
index e6839b7..bd0bd65 100644
--- a/src/apps/deskbar/DeskbarMenu.cpp
+++ b/src/apps/deskbar/DeskbarMenu.cpp
@@ -33,6 +33,9 @@ holders.
All rights reserved.
*/
+
+#include "DeskbarMenu.h"
+
#include <Debug.h>
#include <Bitmap.h>
#include <Catalog.h>
@@ -42,7 +45,6 @@ All rights reserved.
#include <MenuItem.h>
#include <Roster.h>
-#include "DeskbarMenu.h"
#include "BarApp.h"
#include "BarView.h"
#include "DeskbarUtils.h"
@@ -685,6 +687,4 @@ DeskbarMountMenu::AddDynamicItem(add_state s)
return false;
}
-
#endif
-
diff --git a/src/apps/deskbar/DeskbarMenu.h b/src/apps/deskbar/DeskbarMenu.h
index c845402..ce9b7a6 100644
--- a/src/apps/deskbar/DeskbarMenu.h
+++ b/src/apps/deskbar/DeskbarMenu.h
@@ -32,7 +32,6 @@ brand product names are registered trademarks or trademarks
of their respective
holders.
All rights reserved.
*/
-
#ifndef _DESKBAR_MENU_H_
#define _DESKBAR_MENU_H_
diff --git a/src/apps/deskbar/DeskbarUtils.cpp
b/src/apps/deskbar/DeskbarUtils.cpp
index c0c0e59..ed8f9ae 100644
--- a/src/apps/deskbar/DeskbarUtils.cpp
+++ b/src/apps/deskbar/DeskbarUtils.cpp
@@ -33,25 +33,26 @@ holders.
All rights reserved.
*/
+
+#include "DeskbarUtils.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <Debug.h>
-#include <Window.h>
#include <AppFileInfo.h>
+#include <Debug.h>
#include <Directory.h>
#include <FilePanel.h>
#include <FindDirectory.h>
#include <List.h>
#include <Mime.h>
#include <NodeInfo.h>
-#include <Path.h>
#include <Screen.h>
#include <SymLink.h>
+#include <Window.h>
#include "BarMenuBar.h"
-#include "DeskbarUtils.h"
#include "ExpandoMenuBar.h"
void
@@ -100,4 +101,3 @@ AddRefsToDeskbarMenu(const BMessage* m, entry_ref*
subdirectory)
}
}
}
-
diff --git a/src/apps/deskbar/DeskbarUtils.h b/src/apps/deskbar/DeskbarUtils.h
index 33d9908..7da0f27 100644
--- a/src/apps/deskbar/DeskbarUtils.h
+++ b/src/apps/deskbar/DeskbarUtils.h
@@ -32,15 +32,18 @@ brand product names are registered trademarks or trademarks
of their respective
holders.
All rights reserved.
*/
-
#ifndef DB_UTILS_H
#define DB_UTILS_H
+
+#include <Path.h>
+
#include "tracker_private.h"
+class BMessage;
+
void AddRefsToDeskbarMenu(const BMessage* m, entry_ref* subdirectory);
#endif /* DB_UTILS_H */
-
diff --git a/src/apps/deskbar/ExpandoMenuBar.cpp
b/src/apps/deskbar/ExpandoMenuBar.cpp
index eecb285..0034374 100644
--- a/src/apps/deskbar/ExpandoMenuBar.cpp
+++ b/src/apps/deskbar/ExpandoMenuBar.cpp
@@ -33,26 +33,27 @@ holders.
All rights reserved.
*/
-#include <Debug.h>
+
+#include "ExpandoMenuBar.h"
#include <string.h>
#include <Autolock.h>
#include <Bitmap.h>
#include <ControlLook.h>
+#include <Debug.h>
#include <NodeInfo.h>
#include <Roster.h>
#include <Screen.h>
-#include "icons.h"
-#include "icons_logo.h"
#include "BarApp.h"
#include "BarMenuTitle.h"
#include "BarView.h"
#include "BarWindow.h"
#include "DeskbarMenu.h"
#include "DeskbarUtils.h"
-#include "ExpandoMenuBar.h"
+#include "icons.h"
+#include "icons_logo.h"
#include "ResourceSet.h"
#include "ShowHideMenuItem.h"
#include "StatusView.h"
@@ -60,6 +61,7 @@ All rights reserved.
#include "WindowMenu.h"
#include "WindowMenuItem.h"
+
const float kDefaultDeskbarMenuWidth = 50.0f;
const float kSepItemWidth = 5.0f;
const float kIconPadding = 8.0f;
@@ -67,7 +69,6 @@ const float kIconPadding = 8.0f;
const uint32 kMinimizeTeam = 'mntm';
const uint32 kBringTeamToFront = 'bftm';
-
bool TExpandoMenuBar::sDoMonitor = false;
thread_id TExpandoMenuBar::sMonThread = B_ERROR;
BLocker TExpandoMenuBar::sMonLocker("expando monitor");
@@ -921,4 +922,3 @@ TExpandoMenuBar::_FinishedDrag(bool invoke)
if (!invoke && fBarView->Dragging())
fBarView->DragStop(true);
}
-
diff --git a/src/apps/deskbar/ExpandoMenuBar.h
b/src/apps/deskbar/ExpandoMenuBar.h
index a0fbfdf..4eabc96 100644
--- a/src/apps/deskbar/ExpandoMenuBar.h
+++ b/src/apps/deskbar/ExpandoMenuBar.h
@@ -35,6 +35,7 @@ All rights reserved.
#ifndef EXPANDO_MENU_BAR_H
#define EXPANDO_MENU_BAR_H
+
// application list
// top level at window
// in expanded mode horizontal and vertical
@@ -43,6 +44,7 @@ All rights reserved.
#include <MenuBar.h>
#include <Locker.h>
+
class BBitmap;
class TBarView;
class TBarMenuTitle;
@@ -117,5 +119,5 @@ class TExpandoMenuBar : public BMenuBar {
static BLocker sMonLocker;
};
-#endif /* EXPANDO_MENU_BAR_H */
+#endif /* EXPANDO_MENU_BAR_H */
diff --git a/src/apps/deskbar/PreferencesWindow.h
b/src/apps/deskbar/PreferencesWindow.h
index d777126..86fd9c2 100644
--- a/src/apps/deskbar/PreferencesWindow.h
+++ b/src/apps/deskbar/PreferencesWindow.h
@@ -27,6 +27,7 @@ const uint32 kShowHideTime = 'ShTm';
const uint32 kShowSeconds = 'SwSc';
const uint32 kShowDayOfWeek = 'SwDw';
+
class BBox;
class BButton;
class BCheckBox;
@@ -77,4 +78,4 @@ private:
};
-#endif // _PREFERENCES_WINDOW_H
+#endif /* _PREFERENCES_WINDOW_H */
diff --git a/src/apps/deskbar/ResourceSet.cpp b/src/apps/deskbar/ResourceSet.cpp
index 7fd0f29..17469b2 100644
--- a/src/apps/deskbar/ResourceSet.cpp
+++ b/src/apps/deskbar/ResourceSet.cpp
@@ -33,10 +33,15 @@ holders.
All rights reserved.
*/
+
#define USE_RESOURCES 1
#include "ResourceSet.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include <ctype.h>
+
#include <Application.h>
#include <Autolock.h>
#include <Bitmap.h>
@@ -47,24 +52,18 @@ All rights reserved.
#include <Path.h>
#include <String.h>
-
#if USE_RESOURCES
#include <Resources.h>
#endif
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <ctype.h>
-
#if USE_RESOURCES
#define RESOURCES_ONLY(x) x
#else
#define RESOURCES_ONLY(x)
#endif
-namespace TResourcePrivate {
+namespace TResourcePrivate {
class TypeObject {
public:
TypeObject()
@@ -914,4 +913,3 @@ AppResSet()
gResourceLocker.Unlock();
return gResources;
}
-
diff --git a/src/apps/deskbar/ResourceSet.h b/src/apps/deskbar/ResourceSet.h
index a5a92b9..c79bf2d 100644
--- a/src/apps/deskbar/ResourceSet.h
+++ b/src/apps/deskbar/ResourceSet.h
@@ -35,10 +35,12 @@ All rights reserved.
#ifndef _T_RESOURCE_SET_H
#define _T_RESOURCE_SET_H
+
#include <List.h>
#include <Locker.h>
#include <SupportDefs.h>
+
class BBitmap;
class BResources;
class BDataIO;
@@ -115,5 +117,5 @@ private:
TResourceSet* AppResSet();
-#endif
+#endif /* _T_RESOURCE_SET_H */
diff --git a/src/apps/deskbar/ShowHideMenuItem.cpp
b/src/apps/deskbar/ShowHideMenuItem.cpp
index b793426..2c70197 100644
--- a/src/apps/deskbar/ShowHideMenuItem.cpp
+++ b/src/apps/deskbar/ShowHideMenuItem.cpp
@@ -33,13 +33,16 @@ holders.
All rights reserved.
*/
-#include <Debug.h>
+
+#include "ShowHideMenuItem.h"
+
#include <malloc.h>
#include <stdio.h>
#include <string.h>
+
+#include <Debug.h>
#include <Roster.h>
-#include "ShowHideMenuItem.h"
#include "WindowMenuItem.h"
#include "tracker_private.h"
@@ -141,4 +144,3 @@ TShowHideMenuItem::TeamShowHideCommon(int32 action, const
BList* teamList,
return B_OK;
}
-
diff --git a/src/apps/deskbar/ShowHideMenuItem.h
b/src/apps/deskbar/ShowHideMenuItem.h
index 159dde1..0a090f6 100644
--- a/src/apps/deskbar/ShowHideMenuItem.h
+++ b/src/apps/deskbar/ShowHideMenuItem.h
@@ -32,13 +32,13 @@ brand product names are registered trademarks or trademarks
of their respective
holders.
All rights reserved.
*/
+#ifndef SHOWHIDEMENUITEM_H
+#define SHOWHIDEMENUITEM_H
+
// window control menu items (Show All, Hide All, Close All)
// in WindowMenu
-#ifndef SHOWHIDEMENUITEM_H
-#define SHOWHIDEMENUITEM_H
-
#include <MenuItem.h>
@@ -66,5 +66,4 @@ private:
};
-#endif /* SHOWHIDEMENUITEM_H */
-
+#endif /* SHOWHIDEMENUITEM_H */
diff --git a/src/apps/deskbar/StatusView.cpp b/src/apps/deskbar/StatusView.cpp
index dd95966..d2f3698 100644
--- a/src/apps/deskbar/StatusView.cpp
+++ b/src/apps/deskbar/StatusView.cpp
@@ -33,7 +33,8 @@ holders.
All rights reserved.
*/
-#include <Debug.h>
+
+#include "StatusView.h"
#include <errno.h>
#include <stdio.h>
@@ -50,6 +51,7 @@ All rights reserved.
#include <Bitmap.h>
#include <Catalog.h>
#include <ControlLook.h>
+#include <Debug.h>
#include <Directory.h>
#include <FindDirectory.h>
#include <Locale.h>
@@ -64,11 +66,10 @@ All rights reserved.
#include <VolumeRoster.h>
#include <Window.h>
-#include "icons_logo.h"
#include "BarApp.h"
#include "DeskbarUtils.h"
+#include "icons_logo.h"
#include "ResourceSet.h"
-#include "StatusView.h"
#include "StatusViewShelf.h"
#include "TimeView.h"
diff --git a/src/apps/deskbar/StatusView.h b/src/apps/deskbar/StatusView.h
index 2fd756d..a497000 100644
--- a/src/apps/deskbar/StatusView.h
+++ b/src/apps/deskbar/StatusView.h
@@ -32,10 +32,10 @@ brand product names are registered trademarks or trademarks
of their respective
holders.
All rights reserved.
*/
-
#ifndef __STATUS_VIEW__
#define __STATUS_VIEW__
+
#include <Control.h>
#include <Node.h>
#include <Query.h>
@@ -221,5 +221,5 @@ private:
int32 fDragLocation;
};
-#endif
+#endif /* __STATUS_VIEW__ */
diff --git a/src/apps/deskbar/StatusViewShelf.cpp
b/src/apps/deskbar/StatusViewShelf.cpp
index 38cd445..4cd15bb 100644
--- a/src/apps/deskbar/StatusViewShelf.cpp
+++ b/src/apps/deskbar/StatusViewShelf.cpp
@@ -33,13 +33,15 @@ holders.
All rights reserved.
*/
-#include <Debug.h>
+
+#include "StatusViewShelf.h"
+
#include <stdio.h>
#include <string.h>
+#include <Debug.h>
#include <InterfaceDefs.h>
-#include "StatusViewShelf.h"
#include "StatusView.h"
@@ -137,4 +139,3 @@ void
TReplicantShelf::ReplicantDeleted(int32, const BMessage*, const BView*)
{
}
-
diff --git a/src/apps/deskbar/StatusViewShelf.h
b/src/apps/deskbar/StatusViewShelf.h
index 181b4a8..45a4627 100644
--- a/src/apps/deskbar/StatusViewShelf.h
+++ b/src/apps/deskbar/StatusViewShelf.h
@@ -32,15 +32,17 @@ brand product names are registered trademarks or trademarks
of their respective
holders.
All rights reserved.
*/
+#ifndef __STATUS_VIEW_SHELF__
+#define __STATUS_VIEW_SHELF__
+
// overrides BShelf; rejects draggers that won't fit into the shelf
// alligns received draggers into a grid
-#ifndef __STATUS_VIEW_SHELF__
-#define __STATUS_VIEW_SHELF__
#include <Shelf.h>
+
class TReplicantTray;
class TReplicantShelf : public BShelf {
public:
@@ -58,5 +60,5 @@ private:
TReplicantTray* fParent;
};
-#endif
+#endif /* __STATUS_VIEW_SHELF__ */
diff --git a/src/apps/deskbar/Switcher.cpp b/src/apps/deskbar/Switcher.cpp
index 106dbfd..7ba23b2 100644
--- a/src/apps/deskbar/Switcher.cpp
+++ b/src/apps/deskbar/Switcher.cpp
@@ -34,12 +34,11 @@ All rights reserved.
*/
-#include "tracker_private.h"
-#include "BarApp.h"
#include "Switcher.h"
-#include "ResourceSet.h"
-#include "WindowMenuItem.h"
-#include "icons.h"
+
+#include <string.h>
+#include <stdlib.h>
+#include <float.h>
#include <Bitmap.h>
#include <Debug.h>
@@ -51,10 +50,11 @@ All rights reserved.
#include <Screen.h>
#include <String.h>
-#include <string.h>
-#include <stdlib.h>
-#include <float.h>
-
+#include "BarApp.h"
+#include "ResourceSet.h"
+#include "WindowMenuItem.h"
+#include "icons.h"
+#include "tracker_private.h"
#define _ALLOW_STICKY_ 0
// allows you to press 's' to keep the switcher window on screen
@@ -2394,4 +2394,3 @@ TWindowView::Pulse()
} else
free(windowInfo);
}
-
diff --git a/src/apps/deskbar/Switcher.h b/src/apps/deskbar/Switcher.h
index b727c99..7e868f7 100644
--- a/src/apps/deskbar/Switcher.h
+++ b/src/apps/deskbar/Switcher.h
@@ -35,6 +35,7 @@ All rights reserved.
#ifndef SWITCHER_H
#define SWITCHER_H
+
#include <Box.h>
#include <List.h>
#include <OS.h>
@@ -103,5 +104,5 @@ private:
int32 fWindowID;
};
-#endif /* SWITCHER_H */
+#endif /* SWITCHER_H */
diff --git a/src/apps/deskbar/TeamMenu.cpp b/src/apps/deskbar/TeamMenu.cpp
index fcf3400..1d30258 100644
--- a/src/apps/deskbar/TeamMenu.cpp
+++ b/src/apps/deskbar/TeamMenu.cpp
@@ -33,6 +33,9 @@ holders.
All rights reserved.
*/
+
+#include "TeamMenu.h"
+
#include <string.h>
#include <Application.h>
@@ -43,7 +46,6 @@ All rights reserved.
#include "BarMenuBar.h"
#include "DeskbarUtils.h"
#include "TeamMenuItem.h"
-#include "TeamMenu.h"
TTeamMenu::TTeamMenu()
@@ -155,4 +157,3 @@ void
TTeamMenu::DrawBackground(BRect)
{
}
-
diff --git a/src/apps/deskbar/TeamMenu.h b/src/apps/deskbar/TeamMenu.h
index b4239c9..244ead8 100644
--- a/src/apps/deskbar/TeamMenu.h
+++ b/src/apps/deskbar/TeamMenu.h
@@ -32,18 +32,21 @@ brand product names are registered trademarks or trademarks
of their respective
holders.
All rights reserved.
*/
+#ifndef TEAMMENU_H
+#define TEAMMENU_H
+
// listing of running applications
// menu of BarMenuTitle
// in mini mode only
-#ifndef TEAMMENU_H
-#define TEAMMENU_H
#include <Menu.h>
+
#include "BarMenuBar.h"
#include "TeamMenuItem.h"
+
class TTeamMenu : public BMenu {
public:
TTeamMenu();
@@ -56,5 +59,5 @@ class TTeamMenu : public BMenu {
static int CompareByName(const void* first, const void* second);
};
-#endif /* TEAMMENU_H */
+#endif /* TEAMMENU_H */
diff --git a/src/apps/deskbar/TeamMenuItem.cpp
b/src/apps/deskbar/TeamMenuItem.cpp
index 14588a8..43eeed0 100644
--- a/src/apps/deskbar/TeamMenuItem.cpp
+++ b/src/apps/deskbar/TeamMenuItem.cpp
@@ -33,7 +33,6 @@ holders.
All rights reserved.
*/
-#include <Debug.h>
#include "TeamMenuItem.h"
@@ -43,6 +42,7 @@ All rights reserved.
#include <Bitmap.h>
#include <ControlLook.h>
+#include <Debug.h>
#include <Font.h>
#include <Region.h>
#include <Roster.h>
@@ -625,4 +625,3 @@ TTeamMenuItem::_IsSelected() const
{
return IsSelected() || fOverriddenSelected;
}
-
diff --git a/src/apps/deskbar/TeamMenuItem.h b/src/apps/deskbar/TeamMenuItem.h
index 443a84d..1e242a9 100644
--- a/src/apps/deskbar/TeamMenuItem.h
+++ b/src/apps/deskbar/TeamMenuItem.h
@@ -35,9 +35,11 @@ All rights reserved.
#ifndef TEAMMENUITEM_H
#define TEAMMENUITEM_H
+
// Individual team/application listing
// item for TeamMenu in mini/vertical mode
-// item for ExpandoMenuBar in vertical or horizontal expanded mode
+// item for ExpandoMenuBar in vertical or horizontal expanded mode
+
#include <MenuItem.h>
@@ -47,7 +49,6 @@ All rights reserved.
class BBitmap;
-
class TTeamMenuItem : public BMenuItem {
public:
TTeamMenuItem(BList* team, BBitmap* icon, char* name, char* sig,
@@ -107,5 +108,5 @@ class TTeamMenuItem : public BMenuItem {
bool fOverriddenSelected;
};
-#endif /* TEAMMENUITEM_H */
+#endif /* TEAMMENUITEM_H */
diff --git a/src/apps/deskbar/WindowMenu.cpp b/src/apps/deskbar/WindowMenu.cpp
index 1342c93..65d98f2 100644
--- a/src/apps/deskbar/WindowMenu.cpp
+++ b/src/apps/deskbar/WindowMenu.cpp
@@ -33,9 +33,13 @@ holders.
All rights reserved.
*/
+
+#include "WindowMenu.h"
+
#include <malloc.h>
#include <stdio.h>
#include <string.h>
+
#include <Catalog.h>
#include <Locale.h>
#include <Window.h>
@@ -46,10 +50,8 @@ All rights reserved.
#include "ShowHideMenuItem.h"
#include "TeamMenu.h"
#include "TeamMenuItem.h"
-#include "WindowMenuItem.h"
-#include "WindowMenu.h"
-
#include "tracker_private.h"
+#include "WindowMenuItem.h"
const int32 kDesktopWindow = 1024;
@@ -257,4 +259,3 @@ TWindowMenu::SetExpanded(bool status, int lastIndex)
fExpanded = status;
fExpandedIndex = lastIndex;
}
-
diff --git a/src/apps/deskbar/WindowMenu.h b/src/apps/deskbar/WindowMenu.h
index 4204c07..d479453 100644
--- a/src/apps/deskbar/WindowMenu.h
+++ b/src/apps/deskbar/WindowMenu.h
@@ -32,13 +32,14 @@ brand product names are registered trademarks or trademarks
of their respective
holders.
All rights reserved.
*/
+#ifndef WINDOWMENU_H
+#define WINDOWMENU_H
+
// list of windows for a specific application
// always submenu for a TeamMenuItem
// all DB positions
-#ifndef WINDOWMENU_H
-#define WINDOWMENU_H
#include <Menu.h>
#include <String.h>
@@ -62,5 +63,5 @@ class TWindowMenu : public BMenu {
int fExpandedIndex;
};
-#endif /* WINDOWMENU_H */
+#endif /* WINDOWMENU_H */
diff --git a/src/apps/deskbar/WindowMenuItem.cpp
b/src/apps/deskbar/WindowMenuItem.cpp
index 70469cd..a9ed150 100644
--- a/src/apps/deskbar/WindowMenuItem.cpp
+++ b/src/apps/deskbar/WindowMenuItem.cpp
@@ -33,6 +33,7 @@ holders.
All rights reserved.
*/
+
#include "WindowMenuItem.h"
#include <stdio.h>
@@ -329,4 +330,3 @@ TWindowMenuItem::RequiresUpdate()
{
return fRequireUpdate;
}
-
diff --git a/src/apps/deskbar/WindowMenuItem.h
b/src/apps/deskbar/WindowMenuItem.h
index d777b73..ecabcd0 100644
--- a/src/apps/deskbar/WindowMenuItem.h
+++ b/src/apps/deskbar/WindowMenuItem.h
@@ -43,10 +43,8 @@ All rights reserved.
class BBitmap;
-
-/*! Individual windows of an application item for WindowMenu,
- sub of TeamMenuItem all DB positions
-*/
+// Individual windows of an application item for WindowMenu,
+// sub of TeamMenuItem all DB positions
class TWindowMenuItem : public BMenuItem {
public:
TWindowMenuItem(const char* title, int32 id,
@@ -92,4 +90,3 @@ private:
#endif /* WINDOWMENUITEM_H */
-
Other related posts:
- » [haiku-commits] haiku: hrev44095 - src/apps/deskbar - jscipione
