s/contained/contains/ and end (?) the expenditure of hot air ;-)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7641 a592a061-630c-0410-9148-cb99ea01b6c8

src/ChangeLog

@@ -1,3 +1,8 @@
+2003-09-02  Angus Leeming  <leeming@lyx.org>
+
+	* box.C (contains): renamed from 'contained' after a fantastic
+	amount of hot air.
+
 2003-09-02  John Levon  <levon@movementarian.org>
 
 	* BufferView.C:

src/box.C

@@ -24,7 +24,7 @@ Box::Box(int x1_, int x2_, int y1_, int y2_) :
 {}
 
 
-bool Box::contained(int x, int y)
+bool Box::contains(int x, int y)
 {
 	return (x1 < x && x2 > x && y1 < y && y2 > y);
 }

src/box.h

@@ -36,7 +36,7 @@ struct Box {
 	 * the box. Check is exclusive (point on a border
 	 * returns false).
 	 */
-	bool contained(int x, int y);
+	bool contains(int x, int y);
 };
 
 

src/insets/insetcollapsable.C

@@ -278,7 +278,7 @@ int InsetCollapsable::docbook(Buffer const & buf, ostream & os, bool mixcont) co
 
 bool InsetCollapsable::hitButton(FuncRequest const & cmd) const
 {
-	return button_dim.contained(cmd.x, cmd.y);
+	return button_dim.contains(cmd.x, cmd.y);
 }
 
 

src/text3.C

@@ -125,7 +125,7 @@ namespace {
 			cur.y() + inset->descent()
 		);
 
-		if (!b.contained(x, y)) {
+		if (!b.contains(x, y)) {
 			lyxerr[Debug::GUI] << "Missed inset at x,y "
 					   << x << ',' << y
 					   << " box " << b << endl;