From 249d96ed942ca92b056c404fbcfee9ca00bd8d2e Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Mon, 6 May 2013 22:50:26 +0200 Subject: [PATCH] Small clanup (just move functions around) --- src/lyxfind.cpp | 51 ++++++++++++++++++++++++++----------------------- src/lyxfind.h | 4 ---- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp index 9b4ea3f1bb..36b663e5e3 100644 --- a/src/lyxfind.cpp +++ b/src/lyxfind.cpp @@ -121,23 +121,6 @@ int findBackwards(DocIterator & cur, MatchString const & match, } -bool findChange(DocIterator & cur, bool next) -{ - if (!next) - cur.backwardPos(); - for (; cur; next ? cur.forwardPos() : cur.backwardPos()) - if (cur.inTexted() && cur.paragraph().isChanged(cur.pos())) { - if (!next) - // if we search backwards, take a step forward - // to correctly set the anchor - cur.forwardPos(); - return true; - } - - return false; -} - - bool searchAllowed(docstring const & str) { if (str.empty()) { @@ -404,15 +387,21 @@ bool lyxreplace(BufferView * bv, } -bool findNextChange(BufferView * bv) +namespace { +bool findChange(DocIterator & cur, bool next) { - return findChange(bv, true); -} - + if (!next) + cur.backwardPos(); + for (; cur; next ? cur.forwardPos() : cur.backwardPos()) + if (cur.inTexted() && cur.paragraph().isChanged(cur.pos())) { + if (!next) + // if we search backwards, take a step forward + // to correctly set the anchor + cur.forwardPos(); + return true; + } -bool findPreviousChange(BufferView * bv) -{ - return findChange(bv, false); + return false; } @@ -483,6 +472,20 @@ bool findChange(BufferView * bv, bool next) return true; } +} + + +bool findNextChange(BufferView * bv) +{ + return findChange(bv, true); +} + + +bool findPreviousChange(BufferView * bv) +{ + return findChange(bv, false); +} + namespace { diff --git a/src/lyxfind.h b/src/lyxfind.h index 589a5d01d5..9adcae968d 100644 --- a/src/lyxfind.h +++ b/src/lyxfind.h @@ -72,10 +72,6 @@ bool findNextChange(BufferView * bv); /// find the previous change in the buffer bool findPreviousChange(BufferView * bv); -/// find the change in the buffer -/// \param next true to find the next change, otherwise the previous -bool findChange(BufferView * bv, bool next); - class FindAndReplaceOptions { public: typedef enum { -- 2.39.2