/**
* \file box.C
- * Copyright 2001 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * \author John Levon <moz@compsoc.man.ac.uk>
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
*/
// Code moved out of line and out of box.h by Angus (7 Jan 2002)
{}
-bool Box::contained(int x, int y)
+bool Box::contains(int x, int y)
{
- return (x1 < x && x2 > x &&
- y1 < y && y2 > y);
+ return (x1 < x && x2 > x && y1 < y && y2 > y);
}
-ostream & operator<<(ostream & o, Box const & b)
+ostream & operator<<(ostream & os, Box const & b)
{
- return o << "x1,y1: " << b.x1 << "," << b.y1
- << " x2,y2: " << b.x2 << "," << b.y2
+ return os << "x1,y1: " << b.x1 << ',' << b.y1
+ << " x2,y2: " << b.x2 << ',' << b.y2
<< std::endl;
}