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: cosmetics and comments.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32928 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-01-09 23:59:33 +00:00
parent c49dea81a9
commit 6bb8b55156
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Compare.cpp
View File

@ -170,7 +170,7 @@ public:
};
DocRangePair stepIntoInset(DocPair const & inset_location)
static DocRangePair stepIntoInset(DocPair const & inset_location)
{
DocRangePair rp(inset_location, inset_location);
rp.o.from.forwardPos();
@ -236,9 +236,9 @@ private:
void writeToDestBuffer(ParagraphList const & copy_pars) const;
/// The length of the old chunk currently processed
int N;
int N_;
/// The length of the new chunk currently processed
int M;
int M_;
/// The thread object, used to emit signals to the GUI
Compare const & compare_;
@ -307,7 +307,7 @@ void Compare::abort()
}
void get_paragraph_list(DocRange const & range,
static void get_paragraph_list(DocRange const & range,
ParagraphList & pars)
{
// Clone the paragraphs within the selection.
@ -329,7 +329,7 @@ void get_paragraph_list(DocRange const & range,
}
bool equal(Inset const * i_o, Inset const * i_n)
static bool equal(Inset const * i_o, Inset const * i_n)
{
if (!i_o || !i_n)
return false;
@ -357,7 +357,7 @@ bool equal(Inset const * i_o, Inset const * i_n)
}
bool equal(DocIterator & o, DocIterator & n) {
static bool equal(DocIterator & o, DocIterator & n) {
Paragraph const & old_par = o.text()->getPar(o.pit());
Paragraph const & new_par = n.text()->getPar(n.pit());
@ -380,10 +380,17 @@ bool equal(DocIterator & o, DocIterator & n) {
}
bool traverse_snake(DocPair & p, DocRangePair const & rp, Direction direction)
/// Traverses a snake in a certain direction. p points to a
/// position in the old and new file and they are synchronously
/// moved along the snake. The function returns true if a snake
/// was found.
static bool traverse_snake(DocPair & p, DocRangePair const & range,
Direction direction)
{
bool ret = false;
DocPair const & p_end = direction == Forward ? rp.to() : rp.from();
DocPair const & p_end =
direction == Forward ? range.to() : range.from();
while (p != p_end) {
if (direction == Backward)
--p;
@ -409,9 +416,9 @@ bool traverse_snake(DocPair & p, DocRangePair const & rp, Direction direction)
int Compare::Impl::find_middle_snake(DocRangePair const & rp,
DocPair &)
{
N = rp.o.length();
M = rp.n.length();
return M+N;
N_ = rp.o.length();
M_ = rp.n.length();
return M_ + N_;
}