* Fixed the style violations introduced by r33732, nothing too bad, though.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33767 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/servers/app/Desktop.cpp

@@ -217,8 +217,8 @@ MouseFilter::MouseFilter(Desktop* desktop)
 
 
 filter_result
-MouseFilter::Filter(BMessage* message, EventTarget** _target,
+MouseFilter::Filter(BMessage* message, EventTarget** _target, int32* _viewToken,
-	int32* _viewToken, BMessage* latestMouseMoved)
+	BMessage* latestMouseMoved)
 {
 	BPoint where;
 	if (message->FindPoint("where", &where) != B_OK)
@@ -1437,9 +1437,10 @@ Desktop::SetWindowFeel(Window* window, window_feel newFeel)
 	// A normal window that was once a floating or modal window will
 	// adopt the window's current workspaces
 
-	if (!window->IsNormal())
+	if (!window->IsNormal()) {
 		_ChangeWindowWorkspaces(window, window->Workspaces(),
 			window->SubsetWorkspaces());
+	}
 
 	// make sure the window has the correct position in the window lists
 	// (ie. all floating windows have to be on the top, ...)
@@ -2109,8 +2110,7 @@ Desktop::_LaunchInputServer()
 	if (entryStatus == B_OK)
 		entryStatus = roster.Launch(&ref);
 	if (entryStatus == B_OK || entryStatus == B_ALREADY_RUNNING) {
-		syslog(LOG_ERR,
+		syslog(LOG_ERR, "Failed to launch the input server by signature: %s!\n",
-			"Failed to launch the input server by signature: %s!\n",
 			strerror(status));
 		return;
 	}
@@ -2145,9 +2145,10 @@ Desktop::_PrepareQuit()
 	}
 
 	// wait for the last app to die
-	if (count > 0)
+	if (count > 0) {
 		acquire_sem_etc(fShutdownSemaphore, fShutdownCount, B_RELATIVE_TIMEOUT,
 			250000);
+	}
 
 	fApplicationsLock.Unlock();
 }
@@ -2432,8 +2433,8 @@ Desktop::_UpdateBack()
 {
 	fBack = NULL;
 
-	for (Window* window = _CurrentWindows().FirstWindow();
+	for (Window* window = _CurrentWindows().FirstWindow(); window != NULL;
-			window != NULL; window = window->NextWindow(fCurrentWorkspace)) {
+			window = window->NextWindow(fCurrentWorkspace)) {
 		if (window->IsHidden() || window->Feel() == kDesktopWindowFeel)
 			continue;
 
@@ -2455,8 +2456,7 @@ Desktop::_UpdateFront(bool updateFloating)
 {
 	fFront = NULL;
 
-	for (Window* window = _CurrentWindows().LastWindow();
+	for (Window* window = _CurrentWindows().LastWindow(); window != NULL;
-			window != NULL;
 			window = window->PreviousWindow(fCurrentWorkspace)) {
 		if (window->IsHidden() || window->IsFloating()
 			|| !window->SupportsFront())
@@ -3177,8 +3177,7 @@ Desktop::_SetWorkspace(int32 index)
 		}
 
 		if (window->Frame().LeftTop() != position) {
-			// the window was visible before, but its on-screen location
+			// the window was visible before, but its on-screen location changed
-			//	changed
 			BPoint offset = position - window->Frame().LeftTop();
 			MoveWindowBy(window, offset.x, offset.y);
 				// TODO: be a bit smarter than this...

src/servers/app/DesktopSettings.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008, Haiku.
+ * Copyright 2005-2009, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -199,18 +199,21 @@ DesktopSettingsPrivate::_Load()
 			int32 mode;
 			if (settings.FindInt32("mode", &mode) == B_OK)
 				fMouseMode = (mode_mouse)mode;
+
 			int32 focusFollowsMouseMode;
 			if (settings.FindInt32("focus follows mouse mode",
 					&focusFollowsMouseMode) == B_OK) {
-				fFocusFollowsMouseMode =
+				fFocusFollowsMouseMode
-					(mode_focus_follows_mouse)focusFollowsMouseMode;
+					= (mode_focus_follows_mouse)focusFollowsMouseMode;
 			}
+
 			bool acceptFirstClick;
 			if (settings.FindBool("accept first click", &acceptFirstClick)
-				== B_OK)
+					== B_OK) {
 				fAcceptFirstClick = acceptFirstClick;
 			}
 		}
+	}
 
 	// read appearance settings
 
@@ -247,8 +250,8 @@ DesktopSettingsPrivate::_Load()
 				fMenuInfo.click_to_open = clickToOpen;
 
 			bool triggersAlwaysShown;
-			if (settings.FindBool("triggers always shown",
+			if (settings.FindBool("triggers always shown", &triggersAlwaysShown)
-				&triggersAlwaysShown) == B_OK) {
+					 == B_OK) {
 				fMenuInfo.triggers_always_shown = triggersAlwaysShown;
 			}
 
@@ -514,8 +517,7 @@ DesktopSettingsPrivate::SetMouseMode(const mode_mouse mode)
 
 
 void
-DesktopSettingsPrivate::SetFocusFollowsMouseMode(
+DesktopSettingsPrivate::SetFocusFollowsMouseMode(mode_focus_follows_mouse mode)
-	const mode_focus_follows_mouse mode)
 {
 	fFocusFollowsMouseMode = mode;
 	Save(kMouseSettings);
@@ -943,8 +945,7 @@ LockedDesktopSettings::SetMouseMode(const mode_mouse mode)
 
 
 void
-LockedDesktopSettings::SetFocusFollowsMouseMode(
+LockedDesktopSettings::SetFocusFollowsMouseMode(mode_focus_follows_mouse mode)
-	const mode_focus_follows_mouse mode)
 {
 	fSettings->SetFocusFollowsMouseMode(mode);
 }

src/servers/app/DesktopSettings.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007, Haiku.
+ * Copyright 2001-2009, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -80,8 +80,8 @@ class LockedDesktopSettings : public DesktopSettings {
 
 		void			SetMouseMode(mode_mouse mode);
 		void			SetFocusFollowsMouseMode(
-							const mode_focus_follows_mouse mode);
+							mode_focus_follows_mouse mode);
-		void			SetAcceptFirstClick(bool accept_first_click);
+		void			SetAcceptFirstClick(bool acceptFirstClick);
 
 		void			SetShowAllDraggers(bool show);
 

src/servers/app/DesktopSettingsPrivate.h

@@ -49,7 +49,7 @@ public:
 									mode_focus_follows_mouse mode);
 			mode_focus_follows_mouse FocusFollowsMouseMode() const;
 			bool				FocusFollowsMouse() const;
-			void				SetAcceptFirstClick(bool accept_first_click);
+			void				SetAcceptFirstClick(bool acceptFirstClick);
 			bool				AcceptFirstClick() const;
 
 			void				SetShowAllDraggers(bool show);