From 72f045c60fbb1f12c288e131f01b293a21ecb78e Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Wed, 31 Mar 2004 09:24:43 +0000 Subject: [PATCH] Rename getOutOfInset as leaveInset. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8568 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/ChangeLog | 4 ++++ src/insets/insetbranch.C | 4 ++-- src/insets/insetcollapsable.C | 6 +++--- src/insets/insetcollapsable.h | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index bb51bbe911..bc9b41eeb3 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,7 @@ +2004-03-31 Angus Leeming + + * insetcollapsable.[Ch]: (leaveInset): renaming of getOutOfInset. + 2004-03-31 Angus Leeming * insetcollapsable.[Ch] (getOutOfInset): new function which pushes diff --git a/src/insets/insetbranch.C b/src/insets/insetbranch.C index e7f4f30b5a..d1a400e08e 100644 --- a/src/insets/insetbranch.C +++ b/src/insets/insetbranch.C @@ -149,7 +149,7 @@ void InsetBranch::priv_dispatch(LCursor & cur, FuncRequest & cmd) setStatus(Open); else if (cmd.argument == "close") { setStatus(Collapsed); - getOutOfInset(cur, *this); + leaveInset(cur, *this); // The branch inset specialises its behaviour on "toggle". } else if (cmd.argument == "toggle" @@ -164,7 +164,7 @@ void InsetBranch::priv_dispatch(LCursor & cur, FuncRequest & cmd) } else { if (status() != Collapsed) { setStatus(Collapsed); - getOutOfInset(cur, *this); + leaveInset(cur, *this); } else cur.undispatched(); } diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C index d36a7a4c58..36ea94d817 100644 --- a/src/insets/insetcollapsable.C +++ b/src/insets/insetcollapsable.C @@ -39,7 +39,7 @@ using std::min; using std::ostream; -void getOutOfInset(LCursor & cur, InsetBase const & in) +void leaveInset(LCursor & cur, InsetBase const & in) { for (unsigned int i = 0; i != cur.size(); ++i) { if (&cur[i].inset() == &in) { @@ -315,12 +315,12 @@ void InsetCollapsable::priv_dispatch(LCursor & cur, FuncRequest & cmd) setStatus(Open); else if (cmd.argument == "close") { setStatus(Collapsed); - getOutOfInset(cur, *this); + leaveInset(cur, *this); } else if (cmd.argument == "toggle" || cmd.argument.empty()) { if (isOpen()) { setStatus(Collapsed); - getOutOfInset(cur, *this); + leaveInset(cur, *this); } else setStatus(Open); } diff --git a/src/insets/insetcollapsable.h b/src/insets/insetcollapsable.h index 4ccdaadff7..ebb05fbec4 100644 --- a/src/insets/insetcollapsable.h +++ b/src/insets/insetcollapsable.h @@ -124,6 +124,6 @@ private: }; // A helper function that pushes the cursor out of the inset. -void getOutOfInset(LCursor & cur, InsetBase const & in); +void leaveInset(LCursor & cur, InsetBase const & in); #endif -- 2.39.2