X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbox.C;h=aae0bf10ea47193dca8f736446c127b4df117c7a;hb=3f8fa07c6ed38218d6a4048f2993a512aa942c96;hp=afaba9c63e0a2f4f4b7ff34ba59f6786f149e98e;hpb=08bd49a344b4295698c8891572a03bc6ef4eb5d5;p=lyx.git

diff --git a/src/box.C b/src/box.C
index afaba9c63e..aae0bf10ea 100644
--- a/src/box.C
+++ b/src/box.C
@@ -1,32 +1,49 @@
 /**
  * \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)
 
+#include <config.h>
+
 #include "box.h"
 
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
+
+
+namespace lyx {
 
 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)
+{}
+
+
+Box::Box(int x1_, int x2_, int y1_, int y2_)
+	: x1(x1_), x2(x2_), y1(y1_), y2(y2_)
 {}
 
-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 << std::endl;
+	return os << "x1,y1: " << b.x1 << ',' << b.y1
+		 << " x2,y2: " << b.x2 << ',' << b.y2
+		 << std::endl;
 }
+
+
+} // namespace lyx