From 0473808ce22a07188daafd556599cf3f5dab6353 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 12 May 2007 15:49:01 +0000 Subject: [PATCH] Cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21116 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/interface/Point.h | 83 +++++++++++------------------------- src/kits/interface/Point.cpp | 37 ++++------------ 2 files changed, 35 insertions(+), 85 deletions(-) diff --git a/headers/os/interface/Point.h b/headers/os/interface/Point.h index 5d7684fdf4..2bd4fab359 100644 --- a/headers/os/interface/Point.h +++ b/headers/os/interface/Point.h @@ -1,49 +1,19 @@ -//------------------------------------------------------------------------------ -// Copyright (c) 2001-2002, OpenBeOS -// -// 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: Point.h -// Author: Frans van Nispen -// Description: BPoint represents a single x,y coordinate. -//------------------------------------------------------------------------------ +/* + * Copyright 2001-2007, Haiku, Inc. All Rights Reserved. + * Distributed under the terms of the MIT License. + * + * Authors: + * Frans van Nispen + */ #ifndef _POINT_H #define _POINT_H -// Standard Includes ----------------------------------------------------------- - -// System Includes ------------------------------------------------------------- #include #include -// Project Includes ------------------------------------------------------------ - -// Local Includes -------------------------------------------------------------- - -// Local Defines --------------------------------------------------------------- - -// Globals --------------------------------------------------------------------- - class BRect; -// BPoint class ---------------------------------------------------------------- class BPoint { public: float x; @@ -67,48 +37,47 @@ public: bool operator!=(const BPoint &p) const; bool operator==(const BPoint &p) const; }; -//------------------------------------------------------------------------------ extern _IMPEXP_BE const BPoint B_ORIGIN; // returns (0,0) -//------------------------------------------------------------------------------ -inline BPoint::BPoint() + +inline +BPoint::BPoint() { x = y = 0; } -//------------------------------------------------------------------------------ -inline BPoint::BPoint(float X, float Y) + + +inline +BPoint::BPoint(float X, float Y) { x = X; y = Y; } -//------------------------------------------------------------------------------ -inline BPoint::BPoint(const BPoint& pt) + + +inline +BPoint::BPoint(const BPoint& pt) { x = pt.x; y = pt.y; } -//------------------------------------------------------------------------------ -inline BPoint &BPoint::operator=(const BPoint& from) + + +inline BPoint & +BPoint::operator=(const BPoint& from) { x = from.x; y = from.y; return *this; } -//------------------------------------------------------------------------------ -inline void BPoint::Set(float X, float Y) + + +inline void +BPoint::Set(float X, float Y) { x = X; y = Y; } -//------------------------------------------------------------------------------ #endif // _POINT_H - -/* - * $Log $ - * - * $Id $ - * - */ - diff --git a/src/kits/interface/Point.cpp b/src/kits/interface/Point.cpp index 8ea28f3ead..520fb19388 100644 --- a/src/kits/interface/Point.cpp +++ b/src/kits/interface/Point.cpp @@ -1,36 +1,17 @@ -//------------------------------------------------------------------------------ -// 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: Point.cpp -// Author: Frans van Nispen -// Description: BPoint represents a single x,y coordinate. -//------------------------------------------------------------------------------ +/* + * Copyright 2001-2007, Haiku, Inc. All Rights Reserved. + * Distributed under the terms of the MIT License. + * + * Authors: + * Frans van Nispen + */ + +#include -// Standard Includes ----------------------------------------------------------- #include #include -// System Includes ------------------------------------------------------------- #include -#include #include