Minor changes in Changes.cpp

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32914 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Compare.cpp b/src/Compare.cpp
index 709a25c39537a9e07f61b7833a5d029a096b5ec2..afc28013f3a31ff379febc20bf1479ded6ba7801 100644 (file)
--- a/src/Compare.cpp
+++ b/src/Compare.cpp
@@ -12,7 +12,6 @@
 
 #include "Compare.h"
 
-#include "Buffer.h"
 #include "BufferParams.h"
 #include "Changes.h"
 
@@ -201,13 +200,13 @@ public:
        bool abort_;
 
 private:
-       // Finds the middle snake and returns the length of the
-       // shortest edit script.
+       /// Finds the middle snake and returns the length of the
+       /// shortest edit script.
        int find_middle_snake(DocRangePair const & rp, DocPair & middle_snake);
 
-       // This function is called recursively by a divide and conquer
-       // algorithm. Each time, the string is divided into two split
-       // around the middle snake.
+       /// This function is called recursively by a divide and conquer
+       /// algorithm. Each time, the string is divided into two split
+       /// around the middle snake.
        void diff_i(DocRangePair const & rp);
 
        /// Processes the splitted chunks. It either adds them as deleted,
@@ -218,8 +217,8 @@ private:
        /// and adds the result to /c pars.
        void diff_inset(Inset * inset, DocPair const & p);
 
-       // Adds the snake to the destination buffer. The algorithm will
-       // recursively be applied to any InsetTexts that are within the snake.
+       /// Adds the snake to the destination buffer. The algorithm will
+       /// recursively be applied to any InsetTexts that are within the snake.
        void process_snake(DocRangePair const & rp);
 
        /// Writes the range to the destination buffer
@@ -229,9 +228,9 @@ private:
        /// Writes the paragraph list to the destination buffer
        void writeToDestBuffer(ParagraphList const & copy_pars) const;
 
-       /// The length of the first chunk currently processed
+       /// The length of the old chunk currently processed
        int N;
-       /// The length of the second chunk currently processed
+       /// The length of the new chunk currently processed
        int M;
 
        /// The thread object, used to emit signals to the GUI