From 19e9930c2ab584c67c965ae5169d4376447b8af3 Mon Sep 17 00:00:00 2001 From: Alexandre Deckner Date: Wed, 12 Aug 2009 11:40:42 +0000 Subject: [PATCH] * More style fixes git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32273 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/mail/DeskbarView.cpp | 13 ++++---- src/servers/mail/DeskbarView.h | 56 ++++++++++++++++---------------- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/src/servers/mail/DeskbarView.cpp b/src/servers/mail/DeskbarView.cpp index b82db091d2..d55461ca17 100644 --- a/src/servers/mail/DeskbarView.cpp +++ b/src/servers/mail/DeskbarView.cpp @@ -1,9 +1,14 @@ -/* DeskbarView - main_daemon's deskbar menu and view +/* DeskbarView - mail_daemon's deskbar menu and view * * Copyright 2001 Dr. Zoidberg Enterprises. All rights reserved. */ +#include "DeskbarView.h" + +#include +#include + #include #include #include @@ -27,18 +32,14 @@ #include #include -#include -#include - #include #include #include #include -#include "DeskbarView.h" #include "DeskbarViewIcons.h" -const char *kTrackerSignature = "application/x-vnd.Be-TRAK"; +const char* kTrackerSignature = "application/x-vnd.Be-TRAK"; //-----The following #defines get around a bug in get_image_info on ppc--- diff --git a/src/servers/mail/DeskbarView.h b/src/servers/mail/DeskbarView.h index 5157f85d2c..000c1c6b38 100644 --- a/src/servers/mail/DeskbarView.h +++ b/src/servers/mail/DeskbarView.h @@ -1,9 +1,10 @@ +/* DeskbarView - mail_daemon's deskbar menu and view + * + * Copyright 2001 Dr. Zoidberg Enterprises. All rights reserved. + */ #ifndef DESKBAR_VIEW_H #define DESKBAR_VIEW_H -/* DeskbarView - main_daemon's deskbar menu and view -** -** Copyright 2001 Dr. Zoidberg Enterprises. All rights reserved. -*/ + #include @@ -32,35 +33,34 @@ class BEntry; class BPath; class _EXPORT DeskbarView : public BView { - public: - DeskbarView (BRect frame); - DeskbarView (BMessage* data); +public: + DeskbarView(BRect frame); + DeskbarView(BMessage* data); + virtual ~DeskbarView(); - virtual ~DeskbarView(); + virtual void Draw(BRect updateRect); + virtual void AttachedToWindow(); + static DeskbarView* Instantiate(BMessage* data); + virtual status_t Archive(BMessage* data, bool deep = true) const; + virtual void MouseDown(BPoint); + virtual void MouseUp(BPoint); + virtual void MessageReceived(BMessage* message); + virtual void Pulse(); - virtual void Draw(BRect updateRect); - virtual void AttachedToWindow(); - static DeskbarView* Instantiate(BMessage* data); - virtual status_t Archive(BMessage* data, bool deep = true) const; - virtual void MouseDown(BPoint); - virtual void MouseUp(BPoint); - virtual void MessageReceived(BMessage *message); - virtual void Pulse(); +private: + void _RefreshMailQuery(); + bool _CreateMenuLinks(BDirectory&, BPath&); + void _CreateNewMailQuery(BEntry&); + BPopUpMenu* _BuildMenu(); + void _InitBitmaps(); - private: - void _RefreshMailQuery(); - bool _CreateMenuLinks(BDirectory&, BPath&); - void _CreateNewMailQuery(BEntry&); - BPopUpMenu* _BuildMenu(); - void _InitBitmaps(); + BBitmap* fBitmaps[kStatusCount]; + int32 fStatus; - BBitmap* fBitmaps[kStatusCount]; - int32 fStatus; + BList fNewMailQueries; + int32 fNewMessages; - BList fNewMailQueries; - int32 fNewMessages; - - int32 fLastButtons; + int32 fLastButtons; }; #endif /* DESKBAR_VIEW_H */