*** 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 b9a28840fdfc78b7011ba63bf481a12479833153..8bd527b6df16499840c1e4b96b0ba80b991a306a 100644 (file)
--- 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 863e37346801ff0b68dc033623c8373c0034bdfd..3f9b040ab02c0ff3dd1c5d95fc81a9fecd807408 100644 (file)
--- 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 8281ef0d26fbb9f8d4d3e97761a1a748b8e74310..e06f6ff9339eee37a653779aef2dd6540685e109 100644 (file)
--- 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 a29dd641853c56de9e50feecb52b4f07afe059cb..f7a3a6425b5a13749f32925d3c041ec011fd7d6a 100644 (file)
--- 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 63e4f735e7e1b5fbf5419c46287d44ce46cfdbbc..1001208a5b8deb1810119497d448f412e89ebbfe 100644 (file)
--- 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 5917493052272934e573491571a6422c844ae847..e4cf78c5d4b309e3ed336a7b1e2ac7cd5e9b217f 100644 (file)
--- 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();
                        }
                }