anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-25 22:06:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small clanup (just move functions around)

Browse Source
This commit is contained in:
Jean-Marc Lasgouttes 2013-05-06 22:50:26 +02:00
parent 68202fdf44
commit 249d96ed94
2 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/lyxfind.cpp
View File

@ -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 {

4
src/lyxfind.h
View File

@ -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 {