From aaa6b1228a1e37c0cdb91d3dc2b9c183577cc7d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Wed, 26 Aug 2009 10:45:36 +0000 Subject: [PATCH] Updated indentation style. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32690 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/interface/Deskbar.h | 56 ++++++------ headers/os/interface/Dragger.h | 158 +++++++++++++++++---------------- 2 files changed, 110 insertions(+), 104 deletions(-) diff --git a/headers/os/interface/Deskbar.h b/headers/os/interface/Deskbar.h index 30d4489cdc..c6367a3353 100644 --- a/headers/os/interface/Deskbar.h +++ b/headers/os/interface/Deskbar.h @@ -1,6 +1,6 @@ /* - * Copyright 2006-2007, Haiku, Inc. All Rights Reserved. - * Distributed under the terms of the MIT License. + * Copyright 2006-2009, Haiku, Inc. All Rights Reserved. + * Distributed under the terms of the MIT license. */ #ifndef _DESKBAR_H #define _DESKBAR_H @@ -24,35 +24,39 @@ enum deskbar_location { }; class BDeskbar { - public: - BDeskbar(); - ~BDeskbar(); +public: + BDeskbar(); + ~BDeskbar(); - bool IsRunning() const; + bool IsRunning() const; - // Location member functions - BRect Frame() const; - deskbar_location Location(bool* _isExpanded = NULL) const; - status_t SetLocation(deskbar_location location, bool expanded = false); - bool IsExpanded() const; - status_t Expand(bool expand); + // Location member functions + BRect Frame() const; + deskbar_location Location(bool* _isExpanded = NULL) const; + status_t SetLocation(deskbar_location location, + bool expanded = false); + bool IsExpanded() const; + status_t Expand(bool expand); - // Item querying member functions - status_t GetItemInfo(int32 id, const char** _name) const; - status_t GetItemInfo(const char* name, int32* _id) const; - bool HasItem(int32 id) const; - bool HasItem(const char* name) const; - uint32 CountItems() const; + // Item querying member functions + status_t GetItemInfo(int32 id, + const char** _name) const; + status_t GetItemInfo(const char* name, + int32* _id) const; + bool HasItem(int32 id) const; + bool HasItem(const char* name) const; + uint32 CountItems() const; - // Item modification member functions - status_t AddItem(BView* archivableView, int32* _id = NULL); - status_t AddItem(entry_ref* addOn, int32* _id = NULL); - status_t RemoveItem(int32 id); - status_t RemoveItem(const char* name); + // Item modification member functions + status_t AddItem(BView* archivableView, + int32* _id = NULL); + status_t AddItem(entry_ref* addOn, int32* _id = NULL); + status_t RemoveItem(int32 id); + status_t RemoveItem(const char* name); - private: - BMessenger* fMessenger; - uint32 _reserved[12]; +private: + BMessenger* fMessenger; + uint32 _reserved[12]; }; #endif // _DESKBAR_H diff --git a/headers/os/interface/Dragger.h b/headers/os/interface/Dragger.h index b1300b87a0..94a596d280 100644 --- a/headers/os/interface/Dragger.h +++ b/headers/os/interface/Dragger.h @@ -1,6 +1,6 @@ /* * Copyright 2006-2009, Haiku, Inc. All Rights Reserved. - * Distributed under the terms of the MIT License. + * Distributed under the terms of the MIT license. */ #ifndef _DRAGGER_H #define _DRAGGER_H @@ -22,102 +22,104 @@ namespace BPrivate { class BDragger : public BView { - public: - BDragger(BRect bounds, BView* target, - uint32 resizingMask = B_FOLLOW_NONE, - uint32 flags = B_WILL_DRAW); - BDragger(BMessage* data); - virtual ~BDragger(); +public: + BDragger(BRect bounds, BView* target, + uint32 resizingMask = B_FOLLOW_NONE, + uint32 flags = B_WILL_DRAW); + BDragger(BMessage* data); + virtual ~BDragger(); - static BArchivable* Instantiate(BMessage* data); - virtual status_t Archive(BMessage* data, bool deep = true) const; + static BArchivable* Instantiate(BMessage* data); + virtual status_t Archive(BMessage* data, + bool deep = true) const; - virtual void AttachedToWindow(); - virtual void DetachedFromWindow(); + virtual void AttachedToWindow(); + virtual void DetachedFromWindow(); - virtual void Draw(BRect updateRect); - virtual void MouseDown(BPoint where); - virtual void MouseUp(BPoint where); - virtual void MouseMoved(BPoint where, uint32 transit, - const BMessage* dragMessage); - virtual void MessageReceived(BMessage* message); - virtual void FrameMoved(BPoint newPosition); - virtual void FrameResized(float newWidth, float newHeight); + virtual void Draw(BRect updateRect); + virtual void MouseDown(BPoint where); + virtual void MouseUp(BPoint where); + virtual void MouseMoved(BPoint where, uint32 transit, + const BMessage* dragMessage); + virtual void MessageReceived(BMessage* message); + virtual void FrameMoved(BPoint newPosition); + virtual void FrameResized(float newWidth, float newHeight); - static status_t ShowAllDraggers(); - static status_t HideAllDraggers(); - static bool AreDraggersDrawn(); + static status_t ShowAllDraggers(); + static status_t HideAllDraggers(); + static bool AreDraggersDrawn(); - virtual BHandler* ResolveSpecifier(BMessage* message, int32 index, - BMessage* specifier, int32 form, - const char* property); - virtual status_t GetSupportedSuites(BMessage* data); - virtual status_t Perform(perform_code d, void* arg); + virtual BHandler* ResolveSpecifier(BMessage* message, + int32 index, BMessage* specifier, + int32 form, const char* property); + virtual status_t GetSupportedSuites(BMessage* data); + virtual status_t Perform(perform_code code, void* data); - virtual void ResizeToPreferred(); - virtual void GetPreferredSize(float* _width, float* _height); - virtual void MakeFocus(bool focus = true); - virtual void AllAttached(); - virtual void AllDetached(); + virtual void ResizeToPreferred(); + virtual void GetPreferredSize(float* _width, + float* _height); + virtual void MakeFocus(bool focus = true); + virtual void AllAttached(); + virtual void AllDetached(); - status_t SetPopUp(BPopUpMenu* contextMenu); - BPopUpMenu* PopUp() const; + status_t SetPopUp(BPopUpMenu* contextMenu); + BPopUpMenu* PopUp() const; - bool InShelf() const; - BView* Target() const; + bool InShelf() const; + BView* Target() const; - virtual BBitmap* DragBitmap(BPoint* offset, drawing_mode *mode); + virtual BBitmap* DragBitmap(BPoint* offset, drawing_mode* mode); - class Private; + class Private; - protected: - bool IsVisibilityChanging() const; +protected: + bool IsVisibilityChanging() const; - private: - friend class BPrivate::ShelfContainerViewFilter; - friend class BPrivate::replicant_data; - friend class Private; - friend class BShelf; +private: + friend class BPrivate::ShelfContainerViewFilter; + friend class BPrivate::replicant_data; + friend class Private; + friend class BShelf; - virtual void _ReservedDragger2(); - virtual void _ReservedDragger3(); - virtual void _ReservedDragger4(); + virtual void _ReservedDragger2(); + virtual void _ReservedDragger3(); + virtual void _ReservedDragger4(); - static void _UpdateShowAllDraggers(bool visible); + static void _UpdateShowAllDraggers(bool visible); - BDragger& operator=(const BDragger& other); + BDragger& operator=(const BDragger& other); - void _AddToList(); - void _RemoveFromList(); - status_t _DetermineRelationship(); - status_t _SetViewToDrag(BView* target); - void _SetShelf(BShelf* shelf); - void _SetZombied(bool state); - void _BuildDefaultPopUp(); - void _ShowPopUp(BView* target, BPoint where); + void _AddToList(); + void _RemoveFromList(); + status_t _DetermineRelationship(); + status_t _SetViewToDrag(BView* target); + void _SetShelf(BShelf* shelf); + void _SetZombied(bool state); + void _BuildDefaultPopUp(); + void _ShowPopUp(BView* target, BPoint where); - static bool sVisible; - static bool sVisibleInitialized; - static BLocker sLock; - static BList sList; + static bool sVisible; + static bool sVisibleInitialized; + static BLocker sLock; + static BList sList; - enum relation { - TARGET_UNKNOWN, - TARGET_IS_CHILD, - TARGET_IS_PARENT, - TARGET_IS_SIBLING - }; + enum relation { + TARGET_UNKNOWN, + TARGET_IS_CHILD, + TARGET_IS_PARENT, + TARGET_IS_SIBLING + }; - BView* fTarget; - relation fRelation; - BShelf* fShelf; - bool fTransition; - bool fIsZombie; - char fErrCount; - bool fPopUpIsCustom; - BBitmap* fBitmap; - BPopUpMenu* fPopUp; - uint32 _reserved[3]; + BView* fTarget; + relation fRelation; + BShelf* fShelf; + bool fTransition; + bool fIsZombie; + char fErrCount; + bool fPopUpIsCustom; + BBitmap* fBitmap; + BPopUpMenu* fPopUp; + uint32 _reserved[3]; }; #endif /* _DRAGGER_H */