X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbox.C;h=b4d8bdd5bc5b497f444c8a04f145c24cd85539ec;hb=65ca7003ba47b7348610393a9a0d2d309b4e9702;hp=41bb8bcfe31b71c34a1fc31f857a669bf7d36d56;hpb=8283e978f8d621041c432b9b88a476bfd567385c;p=lyx.git diff --git a/src/box.C b/src/box.C index 41bb8bcfe3..b4d8bdd5bc 100644 --- a/src/box.C +++ b/src/box.C @@ -1,32 +1,43 @@ /** * \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 + * \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) +#include + #include "box.h" -#include "support/LOstream.h" +#include "support/std_ostream.h" using std::ostream; -Box::Box(int x1_, int x2_, int y1_, int y2_) : - x1(x1_), x2(x2_), y1(y1_), y2(y2_) + +Box::Box() + : x1(0), x2(0), y1(0), y2(0) {} -bool Box::contained(int x, int y) + +Box::Box(int x1_, int x2_, int y1_, int y2_) + : x1(x1_), x2(x2_), y1(y1_), y2(y2_) +{} + + +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 << std::endl; + return os << "x1,y1: " << b.x1 << ',' << b.y1 + << " x2,y2: " << b.x2 << ',' << b.y2 + << std::endl; }