From: André Pönitz <poenitz@gmx.net>
Date: Tue, 29 Apr 2003 10:39:08 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: 1.6.10~16902
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=263b9fc043acb50b768cec3dbaa7210c2793978e;p=lyx.git

*** empty log message ***


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

diff --git a/src/ChangeLog b/src/ChangeLog
index b9a28840fd..8bd527b6df 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -6,6 +6,10 @@
 
 	* ParagraphList.C: whitespace
 
+	* paragraph.[Ch]:
+	  paragraph_pimpl.[Ch]:
+	  undo_funcs.C: Paragraph *  -> Paragraph (const) &
+
 2003-04-28  John Levon  <levon@movementarian.org>
 
 	* bufferlist.C: changes for unsaved changes dialog
diff --git a/src/paragraph.C b/src/paragraph.C
index 863e373468..3f9b040ab0 100644
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -1303,7 +1303,7 @@ void Paragraph::resizeInsetsLyXText(BufferView * bv)
 }
 
 
-void Paragraph::setContentsFromPar(Paragraph * par)
+void Paragraph::setContentsFromPar(Paragraph const & par)
 {
 	pimpl_->setContentsFromPar(par);
 }
diff --git a/src/paragraph.h b/src/paragraph.h
index 8281ef0d26..e06f6ff933 100644
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -125,7 +125,7 @@ public:
 	///
 	bool empty() const;
 	///
-	void setContentsFromPar(Paragraph * par);
+	void setContentsFromPar(Paragraph const & par);
 	///
 	void clearContents();
 
diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index a29dd64185..f7a3a6425b 100644
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -84,12 +84,11 @@ void Paragraph::Pimpl::clear()
 }
 
 
-void Paragraph::Pimpl::setContentsFromPar(Paragraph const * par)
+void Paragraph::Pimpl::setContentsFromPar(Paragraph const & par)
 {
-	lyx::Assert(par);
-	text = par->pimpl_->text;
-	if (par->pimpl_->tracking()) {
-		changes_.reset(new Changes(*(par->pimpl_->changes_.get())));
+	text = par.pimpl_->text;
+	if (par.pimpl_->tracking()) {
+		changes_.reset(new Changes(*(par.pimpl_->changes_.get())));
 	}
 }
 
diff --git a/src/paragraph_pimpl.h b/src/paragraph_pimpl.h
index 63e4f735e7..1001208a5b 100644
--- a/src/paragraph_pimpl.h
+++ b/src/paragraph_pimpl.h
@@ -36,7 +36,7 @@ struct Paragraph::Pimpl {
 	///
 	void clear();
 	///
-	void setContentsFromPar(Paragraph const * par);
+	void setContentsFromPar(Paragraph const & par);
 	/// set tracking mode
 	void trackChanges(Change::Type type = Change::UNCHANGED);
 	/// stop tracking
diff --git a/src/undo_funcs.C b/src/undo_funcs.C
index 5917493052..e4cf78c5d4 100644
--- a/src/undo_funcs.C
+++ b/src/undo_funcs.C
@@ -145,7 +145,7 @@ bool textHandleUndo(BufferView * bv, Undo & undo)
 			// is stored in the undo. So restore
 			// the text informations.
 			if (undo.kind == Undo::EDIT) {
-				tmppar2->setContentsFromPar(tmppar);
+				tmppar2->setContentsFromPar(*tmppar);
 				tmppar2 = tmppar2->next();
 			}
 		}