i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21116 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2007-05-12 15:49:01 +00:00
parent 0003f080c5
commit 0473808ce2
2 changed files with 35 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/Point.h
+26 -57
View File
@@ -1,49 +1,19 @@
//------------------------------------------------------------------------------ /*
// Copyright (c) 2001-2002, OpenBeOS * Copyright 2001-2007, Haiku, Inc. All Rights Reserved.
// * Distributed under the terms of the MIT License.
// Permission is hereby granted, free of charge, to any person obtaining a *
// copy of this software and associated documentation files (the "Software"), * Authors:
// to deal in the Software without restriction, including without limitation * Frans van Nispen
// 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.
//------------------------------------------------------------------------------
#ifndef _POINT_H #ifndef _POINT_H
#define _POINT_H #define _POINT_H
// Standard Includes -----------------------------------------------------------
// System Includes -------------------------------------------------------------
#include <BeBuild.h> #include <BeBuild.h>
#include <SupportDefs.h> #include <SupportDefs.h>
// Project Includes ------------------------------------------------------------
// Local Includes --------------------------------------------------------------
// Local Defines ---------------------------------------------------------------
// Globals ---------------------------------------------------------------------
class BRect; class BRect;
// BPoint class ----------------------------------------------------------------
class BPoint { class BPoint {
public: public:
float x; float x;
@@ -67,48 +37,47 @@ public:
bool operator!=(const BPoint &p) const; bool operator!=(const BPoint &p) const;
bool operator==(const BPoint &p) const; bool operator==(const BPoint &p) const;
}; };
//------------------------------------------------------------------------------
extern _IMPEXP_BE const BPoint B_ORIGIN; // returns (0,0) extern _IMPEXP_BE const BPoint B_ORIGIN; // returns (0,0)
//------------------------------------------------------------------------------
inline BPoint::BPoint() inline
BPoint::BPoint()
{ {
x = y = 0; x = y = 0;
} }
//------------------------------------------------------------------------------
inline BPoint::BPoint(float X, float Y)
inline
BPoint::BPoint(float X, float Y)
{ {
x = X; x = X;
y = Y; y = Y;
} }
//------------------------------------------------------------------------------
inline BPoint::BPoint(const BPoint& pt)
inline
BPoint::BPoint(const BPoint& pt)
{ {
x = pt.x; x = pt.x;
y = pt.y; y = pt.y;
} }
//------------------------------------------------------------------------------
inline BPoint &BPoint::operator=(const BPoint& from)
inline BPoint &
BPoint::operator=(const BPoint& from)
{ {
x = from.x; x = from.x;
y = from.y; y = from.y;
return *this; return *this;
} }
//------------------------------------------------------------------------------
inline void BPoint::Set(float X, float Y)
inline void
BPoint::Set(float X, float Y)
{ {
x = X; x = X;
y = Y; y = Y;
} }
//------------------------------------------------------------------------------
#endif // _POINT_H #endif // _POINT_H
/*
* $Log $
*
* $Id $
*
*/
src/kits/interface/Point.cpp
+9 -28
View File
@@ -1,36 +1,17 @@
//------------------------------------------------------------------------------ /*
// Copyright (c) 2001-2004, Haiku * Copyright 2001-2007, Haiku, Inc. All Rights Reserved.
// * Distributed under the terms of the MIT License.
// Permission is hereby granted, free of charge, to any person obtaining a *
// copy of this software and associated documentation files (the "Software"), * Authors:
// to deal in the Software without restriction, including without limitation * Frans van Nispen
// 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: #include <Point.h>
//
// 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.
//------------------------------------------------------------------------------
// Standard Includes -----------------------------------------------------------
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
// System Includes -------------------------------------------------------------
#include <SupportDefs.h> #include <SupportDefs.h>
#include <Point.h>
#include <Rect.h> #include <Rect.h>