23 lines
898 B
Text
23 lines
898 B
Text
$NetBSD: patch-am,v 1.1 2004/02/18 23:09:03 kristerw Exp $
|
|
|
|
--- include/Utils.hh.orig Wed Feb 18 22:59:25 2004
|
|
+++ include/Utils.hh Wed Feb 18 23:01:36 2004
|
|
@@ -32,15 +32,15 @@
|
|
class Point {
|
|
public:
|
|
int X, Y;
|
|
- Point(const int _X=0, const int _Y=0) : X(_X), Y(_Y) { };
|
|
+ Point(const int tmp_X=0, const int tmp_Y=0) : X(tmp_X), Y(tmp_Y) { };
|
|
bool operator==(const Point& p) { return (p.X == X) && (p.Y == Y); };
|
|
};
|
|
|
|
class Rectangle {
|
|
public:
|
|
Point Origin, Size;
|
|
- Rectangle(const int _X=0, const int _Y=0, const int _W=0, const int _H=0)
|
|
- : Origin(_X, _Y), Size(_W, _H) { };
|
|
+ Rectangle(const int tmp_X=0, const int tmp_Y=0, const int _W=0, const int _H=0)
|
|
+ : Origin(tmp_X, tmp_Y), Size(_W, _H) { };
|
|
bool Inside(const Point& p) const;
|
|
bool Intersect(const Rectangle& second) const;
|
|
const int Right() const { return Origin.X+Size.X; };
|