anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 10:18:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare: simplify the step functions.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32927 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-01-09 23:56:46 +00:00
parent 28b0075b11
commit c49dea81a9
1 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/Compare.cpp
View File

@ -34,35 +34,22 @@ enum Direction {
}; };
void step_forward(DocIterator & dit) static void step(DocIterator & dit, Direction direction)
{ {
dit.top().forwardPos(); if (direction == Forward)
dit.top().forwardPos();
else
dit.top().backwardPos();
} }
void step_backward(DocIterator & dit) static void step(DocIterator & dit, DocIterator const & end, Direction direction)
{ {
dit.top().backwardPos(); if (dit != end)
step(dit, direction);
} }
bool step_forward(DocIterator & dit, DocIterator const & end)
{
if (dit == end)
return false;
step_forward(dit);
return true;
}
bool step_backward(DocIterator & dit, DocIterator const & beg)
{
if (dit == beg)
return false;
step_backward(dit);
return true;
}
/** /**
* A pair of two DocIterators that form a range. * A pair of two DocIterators that form a range.
*/ */
@ -138,15 +125,15 @@ public:
DocPair & operator++() DocPair & operator++()
{ {
step_forward(o); step(o, Forward);
step_forward(n); step(n, Forward);
return *this; return *this;
} }
DocPair & operator--() DocPair & operator--()
{ {
step_backward(o); step(o, Backward);
step_backward(n); step(n, Backward);
return *this; return *this;
} }
/// ///
@ -188,8 +175,8 @@ DocRangePair stepIntoInset(DocPair const & inset_location)
DocRangePair rp(inset_location, inset_location); DocRangePair rp(inset_location, inset_location);
rp.o.from.forwardPos(); rp.o.from.forwardPos();
rp.n.from.forwardPos(); rp.n.from.forwardPos();
step_forward(rp.o.to); step(rp.o.to, Forward);
step_forward(rp.n.to); step(rp.n.to, Forward);
rp.o.to.backwardPos(); rp.o.to.backwardPos();
rp.n.to.backwardPos(); rp.n.to.backwardPos();
return rp; return rp;