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

diff --git a/src/ChangeLog b/src/ChangeLog
index 407e728a351589cb52bcecaa7264b5219da31557..1f38a46c9a60870981cf98334a0647456297200d 100644 (file)
--- a/src/ChangeLog
+++ b/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:

diff --git a/src/box.C b/src/box.C
index 159be4cc3ba47ad650c939aec5cb444b6f0917f8..9c2213ef9315060c87e0ccd702252488475745d6 100644 (file)
--- a/src/box.C
+++ b/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);
 }

diff --git a/src/box.h b/src/box.h
index 262e72d11ac661d7d410dbde7e9238d9ba647838..156833f75acf65eedf7e6d7dfee742b5a8719381 100644 (file)
--- a/src/box.h
+++ b/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);
 };
 
 

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index a86ebc3f1628ba05c943780c4137398d767da11d..1732465503c77c327d291f708ff4512e31987f9e 100644 (file)
--- a/src/insets/insetcollapsable.C
+++ b/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);
 }
 
 

diff --git a/src/text3.C b/src/text3.C
index 7af209bf590bb9f42daa2164aed7c5afb49d1279..2203305b57043c42851a1ad68b8790623b97fa30 100644 (file)
--- a/src/text3.C
+++ b/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;