From 621a832488a17c2281190dd4c3d9f9d741ef1273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Sun, 23 Apr 2006 15:55:15 +0000
Subject: [PATCH] * Renamed ViewAux.h header to ViewPrivate.h. * Some cleanup.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17210 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../interface/{ViewAux.h => ViewPrivate.h}    | 22 +++++---
 src/kits/interface/Dragger.cpp                | 38 +++++---------
 src/kits/interface/View.cpp                   | 50 ++++++++-----------
 src/servers/app/ServerWindow.cpp              |  3 +-
 4 files changed, 51 insertions(+), 62 deletions(-)
 rename headers/private/interface/{ViewAux.h => ViewPrivate.h} (89%)

diff --git a/headers/private/interface/ViewAux.h b/headers/private/interface/ViewPrivate.h
similarity index 89%
rename from headers/private/interface/ViewAux.h
rename to headers/private/interface/ViewPrivate.h
index dfc84e6298..fbdc8a3c99 100644
--- a/headers/private/interface/ViewAux.h
+++ b/headers/private/interface/ViewPrivate.h
@@ -1,7 +1,17 @@
-#ifndef _VIEWAUX_H_
-#define _VIEWAUX_H_
+/*
+ * Copyright 2003-2006, Haiku.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Adrian Oanca <adioanca@cotty.iren.ro>
+ *		Axel Dörfler, axeld@pinc-software.de
+ */
+#ifndef VIEW_PRIVATE_H
+#define VIEW_PRIVATE_H
+
+
+#include <PortLink.h>
 
-#include <BeBuild.h>
 #include <Font.h>
 #include <InterfaceDefs.h>
 #include <Point.h>
@@ -11,11 +21,11 @@
 const static uint32 kDeleteDragger = 'JAHA';
 
 struct shape_data {
-	uint32	*opList;
+	uint32*	opList;
 	int32	opCount;
 	int32	opSize;
 	int32	opBlockSize;
-	BPoint	*ptList;
+	BPoint*	ptList;
 	int32	ptCount;
 	int32	ptSize;
 	int32	ptBlockSize;
@@ -133,4 +143,4 @@ struct _array_data_{
 	_array_hdr_*	array;
 };
 
-#endif	/* _VIEWAUX_H_ */
+#endif	/* VIEW_PRIVATE_H */
diff --git a/src/kits/interface/Dragger.cpp b/src/kits/interface/Dragger.cpp
index 320c846ec2..5614de3279 100644
--- a/src/kits/interface/Dragger.cpp
+++ b/src/kits/interface/Dragger.cpp
@@ -1,28 +1,15 @@
-//------------------------------------------------------------------------------
-//	Copyright (c) 2001-2004, Haiku
-//
-//	Permission is hereby granted, free of charge, to any person obtaining a
-//	copy of this software and associated documentation files (the "Software"),
-//	to deal in the Software without restriction, including without limitation
-//	the rights to use, copy, modify, merge, publish, distribute, sublicense,
-//	and/or sell copies of the Software, and to permit persons to whom the
-//	Software is furnished to do so, subject to the following conditions:
-//
-//	The above copyright notice and this permission notice shall be included in
-//	all copies or substantial portions of the Software.
-//
-//	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-//	DEALINGS IN THE SOFTWARE.
-//
-//	File Name:		Dragger.cpp
-//	Author:			Marc Flerackers (mflerackers@androme.be)
-//	Description:	BDragger represents a replicant "handle".
-//------------------------------------------------------------------------------
+/*
+ * Copyright 2001-2006, Haiku.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Marc Flerackers (mflerackers@androme.be)
+ */
+
+//!	BDragger represents a replicant "handle".
+
+#include <ViewPrivate.h>
+
 #include <Alert.h>
 #include <Beep.h>
 #include <Bitmap.h>
@@ -36,7 +23,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <ViewAux.h>
 
 bool BDragger::sVisible;
 bool BDragger::sInited;
diff --git a/src/kits/interface/View.cpp b/src/kits/interface/View.cpp
index a667bb3eb2..84dc26cd3d 100644
--- a/src/kits/interface/View.cpp
+++ b/src/kits/interface/View.cpp
@@ -8,40 +8,34 @@
  */
 
 
-#include <BeBuild.h>
-#include <InterfaceDefs.h>
-#include <PropertyInfo.h>
-#include <Handler.h>
-#include <View.h>
-#include <Window.h>
-#include <Message.h>
-#include <MessageQueue.h>
-#include <Rect.h>
-#include <Point.h>
-#include <Region.h>
-#include <Font.h>
-#include <ScrollBar.h>
-#include <Cursor.h>
-#include <Bitmap.h>
-#include <Picture.h>
-#include <Polygon.h>
-#include <Shape.h>
-#include <Button.h>
-#include <Shelf.h>
-#include <MenuBar.h>
-#include <String.h>
-#include <SupportDefs.h>
-#include <Application.h>
-
 #include <AppMisc.h>
-#include <ViewAux.h>
-#include <TokenSpace.h>
+#include <AppServerLink.h>
 #include <MessagePrivate.h>
 #include <MessageUtils.h>
-#include <AppServerLink.h>
 #include <PortLink.h>
 #include <ServerProtocol.h>
+#include <TokenSpace.h>
+#include <ViewPrivate.h>
 
+#include <Application.h>
+#include <Bitmap.h>
+#include <Button.h>
+#include <Cursor.h>
+#include <InterfaceDefs.h>
+#include <Message.h>
+#include <MessageQueue.h>
+#include <Picture.h>
+#include <Point.h>
+#include <Polygon.h>
+#include <PropertyInfo.h>
+#include <Region.h>
+#include <ScrollBar.h>
+#include <Shape.h>
+#include <Shelf.h>
+#include <String.h>
+#include <View.h>
+#include <Window.h>
+#include <MenuBar.h>
 
 #include <math.h>
 #include <new>
diff --git a/src/servers/app/ServerWindow.cpp b/src/servers/app/ServerWindow.cpp
index c3ec849f6a..19b9a4b769 100644
--- a/src/servers/app/ServerWindow.cpp
+++ b/src/servers/app/ServerWindow.cpp
@@ -44,7 +44,6 @@
 #include <MessagePrivate.h>
 #include <PictureProtocol.h>
 #include <PortLink.h>
-#include <ViewAux.h>
 #include <WindowInfo.h>
 #include <WindowPrivate.h>
 
@@ -2130,7 +2129,7 @@ ServerWindow::_DispatchViewDrawingMessage(int32 code, BPrivate::LinkReceiver &li
 
 			// Attached Data:
 			// 1) int32 Number of lines in the array
-			// 2) array of struct _array_data_ objects, as defined in ViewAux.h
+			// 2) LineArrayData
 
 			int32 lineCount;