From 50d4d2bd7e78cc20c323d4d7adcfe164c01e0d15 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Tue, 2 Sep 2003 20:42:28 +0000 Subject: [PATCH] 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 | 5 +++++ src/box.C | 2 +- src/box.h | 2 +- src/insets/insetcollapsable.C | 2 +- src/text3.C | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 407e728a35..1f38a46c9a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2003-09-02 Angus Leeming + + * box.C (contains): renamed from 'contained' after a fantastic + amount of hot air. + 2003-09-02 John Levon * BufferView.C: diff --git a/src/box.C b/src/box.C index 159be4cc3b..9c2213ef93 100644 --- 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 262e72d11a..156833f75a 100644 --- 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 a86ebc3f16..1732465503 100644 --- 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 7af209bf59..2203305b57 100644 --- 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; -- 2.39.2