X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph_pimpl.h;h=efb347c2494dfbdc341c305c42a8c9b325ec72cb;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=010196b8d0acf10d343a705fefbc8ba4ac2b11ea;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git

diff --git a/src/paragraph_pimpl.h b/src/paragraph_pimpl.h
index 010196b8d0..efb347c249 100644
--- a/src/paragraph_pimpl.h
+++ b/src/paragraph_pimpl.h
@@ -35,8 +35,6 @@ public:
 	Pimpl(Paragraph * owner);
 	/// "Copy constructor"
 	Pimpl(Pimpl const &, Paragraph * owner);
-	///
-	void setContentsFromPar(Paragraph const & par);
 
 	//
 	// Change tracking
@@ -49,27 +47,21 @@ public:
         void setChange(Change const & change);
 	/// set change at given pos
 	void setChange(pos_type pos, Change const & change);
-	/// accept change
-	void acceptChange(pos_type start, pos_type end);
-	/// reject change
-	void rejectChange(pos_type start, pos_type end);
-	/// are we tracking changes ?
-	bool tracking() const { return changes_.get(); }
+	/// accept changes within the given range
+	void acceptChanges(pos_type start, pos_type end);
+	/// reject changes within the given range
+	void rejectChanges(pos_type start, pos_type end);
 
 	///
 	value_type getChar(pos_type pos) const;
 	///
-	void setChar(pos_type pos, value_type c);
-	///
 	void insertChar(pos_type pos, value_type c, Change const & change);
 	///
 	void insertInset(pos_type pos, InsetBase * inset, Change const & change);
-	/// definite erase
-	void erase(pos_type pos);
-	/// erase the given position. Returns true if it was actually erased
-	bool erase(pos_type pos, bool trackChanges);
-	/// erase the given range
-	int erase(pos_type start, pos_type end, bool trackChanges);
+	/// (logically) erase the char at pos; return true if it was actually erased
+	bool eraseChar(pos_type pos, bool trackChanges);
+	/// (logically) erase the given range; return the number of chars actually erased
+	int eraseChars(pos_type start, pos_type end, bool trackChanges);
 	///
 	InsetBase * inset_owner;
 
@@ -164,8 +156,8 @@ private:
 	/// match a string against a particular point in the paragraph
 	bool isTextAt(std::string const & str, pos_type pos) const;
 
-	/// for recording and looking up changes in revision tracking mode
-	boost::scoped_ptr<Changes> changes_;
+	/// for recording and looking up changes
+	Changes changes_;
 
 	/// Who owns us?
 	Paragraph * owner_;