last Friday's text*.C -> text_func shuffle

[lyx.git] / src / BufferView.C

diff --git a/src/BufferView.C b/src/BufferView.C
index 016f495ae5a0b0e407ede88cf688de8bfe76f36a..5f34fa5885a692ce0df9df8c0f44399295a840be 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -3,7 +3,7 @@
  * Copyright 1995-2002 the LyX Team
  * Read the file COPYING
  *
- * \author unknown
+ * \author Lars Gullik Bjønnes
  * \author John Levon <moz@compsoc.man.ac.uk>
  */
 
@@ -36,7 +36,6 @@
 #include "frontends/screen.h"
 
 #include "insets/insetcommand.h" // ChangeRefs
-#include "insets/inseterror.h"
 #include "insets/updatableinset.h"
 
 #include "support/FileInfo.h"
@@ -50,6 +49,7 @@
 extern BufferList bufferlist;
 
 using lyx::pos_type;
+using namespace lyx::support;
 
 using std::pair;
 using std::endl;
@@ -104,11 +104,17 @@ void BufferView::buffer(Buffer * b)
 }
 
 
+bool BufferView::loadLyXFile(string const & fn, bool tl)
+{
+       return pimpl_->loadLyXFile(fn, tl);
+}
+
+
 void BufferView::reload()
 {
        string const fn = buffer()->fileName();
        if (bufferlist.close(buffer(), false))
-               buffer(bufferlist.loadLyXFile(fn));
+               loadLyXFile(fn);
 }
 
 
@@ -331,30 +337,12 @@ bool BufferView::insertLyXFile(string const & filen)
 }
 
 
-void BufferView::resetErrorList()
-{
-       pimpl_->errorlist_.clear();
-}
-
-
-void BufferView::setErrorList(ErrorList const & el)
-{
-       pimpl_->errorlist_ = el;
-}
-
-
-void BufferView::addError(ErrorItem const & ei)
-{
-       pimpl_->errorlist_.push_back(ei);
-
-}
-
-
 void BufferView::showErrorList(string const & action) const
 {
        if (getErrorList().size()) {
                string const title = bformat(_("LyX: %1$s errors (%2$s)"), action, buffer()->fileName());
                owner()->getDialogs().show("errorlist", title);
+               pimpl_->errorlist_.clear();
        }
 }
 
@@ -395,7 +383,8 @@ void BufferView::gotoLabel(string const & label)
 {
        for (Buffer::inset_iterator it = buffer()->inset_iterator_begin();
             it != buffer()->inset_iterator_end(); ++it) {
-               vector<string> labels = it->getLabelList();
+               vector<string> labels;
+               it->getLabelList(labels);
                if (find(labels.begin(),labels.end(),label)
                     != labels.end()) {
                        beforeChange(text);
@@ -648,7 +637,7 @@ bool BufferView::ChangeInsets(Inset::Code code,
                                text->setCursorIntern(it.pit(), 0);
                                text->redoParagraphs(text->cursor,
                                                     boost::next(text->cursor.par()));
-                               text->fullRebreak();
+                               text->partialRebreak();
                        }
                }
        }
@@ -660,7 +649,8 @@ bool BufferView::ChangeInsets(Inset::Code code,
 bool BufferView::ChangeRefsIfUnique(string const & from, string const & to)
 {
        // Check if the label 'from' appears more than once
-       vector<string> labels = buffer()->getLabelList();
+       vector<string> labels;
+       buffer()->getLabelList(labels);
 
        if (lyx::count(labels.begin(), labels.end(), from) > 1)
                return false;