"Inter-word Space"

[lyx.git] / src / buffer.C

diff --git a/src/buffer.C b/src/buffer.C
index 147316fc75d8e6f7f4e73b77017cc7ea5ddd1b04..2200f0dc84d9835d1c34e356a3d5ff6634ea5bf5 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -368,16 +368,17 @@ int Buffer::readParagraph(LyXLex & lex, string const & token,
        if (token == "\\layout") {
                lex.pushToken(token);
 
-               Paragraph * par = new Paragraph();
-               par->params().depth(depth);
+               Paragraph par;
+               par.owningBuffer(*this);
+               par.params().depth(depth);
                if (params.tracking_changes)
-                       par->trackChanges();
+                       par.trackChanges();
                LyXFont f(LyXFont::ALL_INHERIT, params.language);
-               par->setFont(0, f);
+               par.setFont(0, f);
 
                // FIXME: goddamn InsetTabular makes us pass a Buffer
                // not BufferParams
-               unknown += ::readParagraph(*this, *par, lex);
+               unknown += ::readParagraph(*this, par, lex);
 
                // insert after
                if (pit != pars.end())
@@ -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);
 
@@ -1048,7 +1049,7 @@ void Buffer::makeLaTeXFile(ostream & os,
                texrow.newline();
        }
 
-       latexParagraphs(this, paragraphs, os, texrow, runparams, false);
+       latexParagraphs(this, paragraphs, os, texrow, runparams);
 
        // add this just in case after all the paragraphs
        os << endl;
@@ -2203,8 +2204,8 @@ Inset * Buffer::getInsetFromID(int id_arg) const
 ParIterator Buffer::getParFromID(int id) const
 {
 #warning FIXME: const correctness! (Andre)
-       ParIterator it(const_cast<Buffer*>(this)->par_iterator_begin());
-       ParIterator end(const_cast<Buffer*>(this)->par_iterator_end());
+       ParIterator it = const_cast<Buffer*>(this)->par_iterator_begin();
+       ParIterator end = const_cast<Buffer*>(this)->par_iterator_end();
 
 #warning FIXME, perhaps this func should return a ParIterator? (Lgb)
        if (id < 0) {
@@ -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()
 {}
 
 
@@ -2416,13 +2417,13 @@ Buffer::inset_iterator Buffer::inset_iterator::operator++(int)
 
 Buffer::inset_iterator::reference Buffer::inset_iterator::operator*()
 {
-       return *it.getInset();
+       return *it->inset;
 }
 
 
 Buffer::inset_iterator::pointer Buffer::inset_iterator::operator->()
 {
-       return it.getInset();
+       return it->inset;
 }
 
 
@@ -2434,7 +2435,7 @@ ParagraphList::iterator Buffer::inset_iterator::getPar() const
 
 lyx::pos_type Buffer::inset_iterator::getPos() const
 {
-       return it.getPos();
+       return it->pos;
 }