parlist-23-a,diff

[features.git] / src / buffer.C

diff --git a/src/buffer.C b/src/buffer.C
index ea8485e06667046a9481b4935a29333757b00a0b..0e0a47d04dd463c54985c2f244a8cfc632881a76 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -369,6 +369,7 @@ int Buffer::readParagraph(LyXLex & lex, string const & token,
                lex.pushToken(token);
 
                Paragraph par;
+               par.owningBuffer(*this);
                par.params().depth(depth);
                if (params.tracking_changes)
                        par.trackChanges();
@@ -680,8 +681,8 @@ bool Buffer::writeFile(string const & fname) const
 
        // this will write out all the paragraphs
        // using recursive descent.
-       ParagraphList::iterator pit = paragraphs.begin();
-       ParagraphList::iterator pend = paragraphs.end();
+       ParagraphList::const_iterator pit = paragraphs.begin();
+       ParagraphList::const_iterator pend = paragraphs.end();
        for (; pit != pend; ++pit)
                pit->write(this, ofs, params, depth);
 
@@ -2253,13 +2254,13 @@ ParIterator Buffer::par_iterator_end()
 
 ParConstIterator Buffer::par_iterator_begin() const
 {
-       return ParConstIterator(paragraphs.begin(), paragraphs);
+       return ParConstIterator(const_cast<ParagraphList&>(paragraphs).begin(), paragraphs);
 }
 
 
 ParConstIterator Buffer::par_iterator_end() const
 {
-       return ParConstIterator(paragraphs.end(), paragraphs);
+       return ParConstIterator(const_cast<ParagraphList&>(paragraphs).end(), paragraphs);
 }
 
 
@@ -2382,7 +2383,7 @@ void Buffer::setParentName(string const & name)
 
 
 Buffer::inset_iterator::inset_iterator()
-       : pit(0), pend(0)
+       : pit(), pend()
 {}