From a92ef26cd77d57b8448c07a8fb96e6ec5f02af69 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Tue, 3 Aug 2010 20:32:37 +0000 Subject: [PATCH] Fix coding style. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37886 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/DecorManager.h | 4 +--- src/servers/app/Decorator.h | 2 +- src/servers/app/DefaultDecorator.h | 1 - src/servers/app/DefaultWindowBehaviour.h | 10 ++++------ src/servers/app/DesktopListener.cpp | 1 + src/servers/app/DesktopListener.h | 16 +++++++--------- src/servers/app/ServerPicture.cpp | 1 + src/servers/app/WindowBehaviour.h | 8 +++----- 8 files changed, 18 insertions(+), 25 deletions(-) diff --git a/src/servers/app/DecorManager.h b/src/servers/app/DecorManager.h index 30fc3e051e..15dc6c1e4a 100644 --- a/src/servers/app/DecorManager.h +++ b/src/servers/app/DecorManager.h @@ -6,7 +6,6 @@ * DarkWyrm * Clemens Zeidler */ - #ifndef DECOR_MANAGER_H #define DECOR_MANAGER_H @@ -29,8 +28,7 @@ class WindowBehaviour; typedef BObjectList DesktopListenerList; -class DecorAddOn -{ +class DecorAddOn { public: DecorAddOn(image_id id, const char* name); virtual ~DecorAddOn(); diff --git a/src/servers/app/Decorator.h b/src/servers/app/Decorator.h index c5d8fd667e..2c10c1bbf3 100644 --- a/src/servers/app/Decorator.h +++ b/src/servers/app/Decorator.h @@ -7,7 +7,6 @@ * Stephan Aßmus * Clemens Zeidler */ - #ifndef DECORATOR_H #define DECORATOR_H @@ -46,6 +45,7 @@ enum click_type { CLICK_RESIZE_RB }; + class Decorator { public: Decorator(DesktopSettings& settings, BRect rect, diff --git a/src/servers/app/DefaultDecorator.h b/src/servers/app/DefaultDecorator.h index b682665fd7..8571b95400 100644 --- a/src/servers/app/DefaultDecorator.h +++ b/src/servers/app/DefaultDecorator.h @@ -7,7 +7,6 @@ * Stephan Aßmus * Clemens Zeidler */ - #ifndef DEFAULT_DECORATOR_H #define DEFAULT_DECORATOR_H diff --git a/src/servers/app/DefaultWindowBehaviour.h b/src/servers/app/DefaultWindowBehaviour.h index c20267cc4a..3b1e332717 100644 --- a/src/servers/app/DefaultWindowBehaviour.h +++ b/src/servers/app/DefaultWindowBehaviour.h @@ -10,7 +10,6 @@ * Brecht Machiels * Clemens Zeidler */ - #ifndef DEFAULT_WINDOW_BEHAVIOUR_H #define DEFAULT_WINDOW_BEHAVIOUR_H @@ -24,9 +23,8 @@ class Desktop; class Window; -class DefaultWindowBehaviour : public WindowBehaviour -{ - public: +class DefaultWindowBehaviour : public WindowBehaviour { +public: DefaultWindowBehaviour(Window* window); virtual ~DefaultWindowBehaviour(); @@ -35,7 +33,7 @@ class DefaultWindowBehaviour : public WindowBehaviour virtual void MouseMoved(BMessage *message, BPoint where, bool isFake); - protected: +protected: Window* fWindow; Desktop* fDesktop; @@ -50,7 +48,7 @@ class DefaultWindowBehaviour : public WindowBehaviour bigtime_t fLastMoveTime; bigtime_t fLastSnapTime; - private: +private: int32 _ExtractButtons(const BMessage* message) const; int32 _ExtractModifiers(const BMessage* message) const; click_type _ActionFor(const BMessage* message) const; diff --git a/src/servers/app/DesktopListener.cpp b/src/servers/app/DesktopListener.cpp index ac32e9bf9e..eef443d9c7 100644 --- a/src/servers/app/DesktopListener.cpp +++ b/src/servers/app/DesktopListener.cpp @@ -6,6 +6,7 @@ * Clemens Zeidler */ + #include "DesktopListener.h" diff --git a/src/servers/app/DesktopListener.h b/src/servers/app/DesktopListener.h index 55037a3454..5171eaca41 100644 --- a/src/servers/app/DesktopListener.h +++ b/src/servers/app/DesktopListener.h @@ -5,10 +5,10 @@ * Authors: * Clemens Zeidler */ - #ifndef DESKTOP_LISTENER_H #define DESKTOP_LISTENER_H + #include #include @@ -18,9 +18,8 @@ class BMessage; class Window; -class DesktopListener : public DoublyLinkedListLinkImpl -{ - public: +class DesktopListener : public DoublyLinkedListLinkImpl { +public: virtual ~DesktopListener(); virtual void AddWindow(Window* window) = 0; @@ -58,9 +57,8 @@ class DesktopListener : public DoublyLinkedListLinkImpl typedef DoublyLinkedList DesktopListenerDLList; -class DesktopObservable -{ - public: +class DesktopObservable { +public: DesktopObservable(); void RegisterListener(DesktopListener* listener); @@ -96,8 +94,8 @@ class DesktopObservable void InvokeGetDecoratorSettings(Window* window, BMessage& settings); - private: - class InvokeGuard{ +private: + class InvokeGuard { public: InvokeGuard(bool& invoking); ~InvokeGuard(); diff --git a/src/servers/app/ServerPicture.cpp b/src/servers/app/ServerPicture.cpp index 37223ea2fa..ccb8b64d9a 100644 --- a/src/servers/app/ServerPicture.cpp +++ b/src/servers/app/ServerPicture.cpp @@ -7,6 +7,7 @@ * Stefano Ceccherini (stefano.ceccherini@gmail.com) * Marcus Overhagen */ + #include "ServerPicture.h" #include diff --git a/src/servers/app/WindowBehaviour.h b/src/servers/app/WindowBehaviour.h index 41e3af962f..e8ba305958 100644 --- a/src/servers/app/WindowBehaviour.h +++ b/src/servers/app/WindowBehaviour.h @@ -5,7 +5,6 @@ * Authors: * Clemens Zeidler */ - #ifndef WINDOW_BEHAVIOUR_H #define WINDOW_BEHAVIOUR_H @@ -16,9 +15,8 @@ class BMessage; -class WindowBehaviour -{ - public: +class WindowBehaviour { +public: WindowBehaviour(); virtual ~WindowBehaviour(); @@ -31,7 +29,7 @@ class WindowBehaviour bool IsDragging() const { return fIsDragging; } bool IsResizing() const { return fIsResizing; } - protected: +protected: bool fIsResizing : 1; bool fIsDragging : 1; };