X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCompare.cpp;h=68bd632d2d2bce02c65189eb5c2bf078a65312b8;hb=da67bde61af6dfecef7a237b72b878fe30638a81;hp=796eb19989f5a45ca3ca662bc8a7c408a877abb9;hpb=75bfed55079cab6b73fbea6ce4ae3f10d1af3b91;p=lyx.git

diff --git a/src/Compare.cpp b/src/Compare.cpp
index 796eb19989..68bd632d2d 100644
--- a/src/Compare.cpp
+++ b/src/Compare.cpp
@@ -233,8 +233,8 @@ public:
 	Impl(Compare const & compare)
 		: abort_(false), n_(0), m_(0), offset_reverse_diagonal_(0),
 		  odd_offset_(0), compare_(compare),
-		  old_buf_(0), new_buf_(0), dest_buf_(0), dest_pars_(0),
-		  recursion_level_(0), nested_inset_level_(0), D_(0)
+		  old_buf_(nullptr), new_buf_(nullptr), dest_buf_(nullptr),
+		  dest_pars_(nullptr), recursion_level_(0), nested_inset_level_(0), D_(0)
 	{}
 
 	///
@@ -439,8 +439,8 @@ static void getParagraphList(DocRange const & range,
 	pit_type startpit = range.from.pit();
 	pit_type endpit = range.to.pit();
 	ParagraphList const & ps_ = range.text()->paragraphs();
-	ParagraphList tmp_pars(lyx::next(ps_.begin(), startpit),
-		lyx::next(ps_.begin(), endpit + 1));
+	ParagraphList tmp_pars(ps_.iterator_at(startpit),
+		ps_.iterator_at(endpit + 1));
 
 	// Remove the end of the last paragraph; afterwards, remove the
 	// beginning of the first paragraph. Keep this order - there may only
@@ -736,7 +736,7 @@ bool Compare::Impl::diff(Buffer const * new_buf, Buffer const * old_buf,
 		diff_i(rp_new);
 
 	for (pit_type p = 0; p < (pit_type)dest_pars_->size(); ++p) {
-		(*dest_pars_)[p].setBuffer(const_cast<Buffer &>(*dest_buf));
+		(*dest_pars_)[p].setInsetBuffers(const_cast<Buffer &>(*dest_buf));
 		(*dest_pars_)[p].setInsetOwner(&dest_buf_->inset());
 	}