X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbox.h;h=adcb4958c49fa94c6cc0b5beb96585e68b5b533b;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=8a53c737a76757919b9759a1dc357234f5fa93ab;hpb=22c088071d45822551069b9b616e3d87f66666e3;p=lyx.git

diff --git a/src/box.h b/src/box.h
index 8a53c737a7..adcb4958c4 100644
--- a/src/box.h
+++ b/src/box.h
@@ -1,15 +1,21 @@
+// -*- C++ -*-
 /**
  * \file box.h
- * 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.
  */
 
 #ifndef BOX_H
 #define BOX_H
 
-#include "support/LOstream.h"
+#include <iosfwd>
+
+
+namespace lyx {
 
 /**
  * A simple class representing rectangular regions.
@@ -19,33 +25,30 @@
  *
  * Negative values are allowed.
  */
-struct Box {
+class Box {
+public:
 	int x1;
 	int x2;
 	int y1;
 	int y2;
 
-	Box(int x1_, int x2_,
-		int y1_, int y2_) :
-		x1(x1_), x2(x2_), y1(y1_), y2(y2_) {}
+	/// Zero-initialise the member variables.
+	Box();
+	/// Initialise the member variables.
+	Box(int x1_, int x2_, int y1_, int y2_);
 
 	/**
 	 * Returns true if the given co-ordinates are within
 	 * the box. Check is exclusive (point on a border
 	 * returns false).
 	 */
-	bool contained(int x, int y) {
-		return (x1 < x && x2 > x &&
-			y1 < y && y2 > y);
-	}
-
-	 
+	bool contains(int x, int y);
 };
- 
-inline std::ostream & operator<<(std::ostream & o, Box & b)
-{
-	return o << "x1,y1: " << b.x1 << "," << b.y1
-		<< " x2,y2: " << b.x2 << "," << b.y2 << std::endl;
-}
- 
+
+
+std::ostream & operator<<(std::ostream &, Box const &);
+
+
+} // namespace lyx
+
 #endif // BOX_H