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

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 468178b0f8281fa2e39a374f32b9c4221e5fb384..7bed397524734cad025e3df28aabb0201902ee81 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -20,12 +20,12 @@
 #include "bufferparams.h"
 #include "texrow.h"
 #include "ParagraphList.h"
-#include "paragraph.h"
 #include "author.h"
 #include "iterators.h"
+#include "errorlist.h"
 
-#include <boost/shared_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
+#include <boost/signals/signal1.hpp>
 
 class BufferView;
 class LyXRC;
@@ -128,6 +128,9 @@ public:
        bool hasParWithID(int id) const;
 
 public:
+       /// This signal is emitted when a parsing error shows up.
+       boost::signal1<void, ErrorItem> parseError;
+
        /** Save file.
            Takes care of auto-save files and backup file if requested.
            Returns \c true if the save is successful, \c false otherwise.
@@ -170,9 +173,6 @@ public:
        ///
        void makeDocBookFile(string const & filename,
                             bool nice, bool only_body = false);
-       ///
-       void sgmlError(ParagraphList::iterator par, int pos, string const & message) const;
-
        /// returns the main language for the buffer (document)
        Language const * getLanguage() const;
        /// get l10n translated to the buffers language
@@ -258,7 +258,7 @@ public:
        /// return all bibkeys from buffer and its childs
        void fillWithBibKeys(std::vector<std::pair<string, string> > & keys) const;
        ///
-       std::vector<string> const getLabelList() const;
+       void getLabelList(std::vector<string> &) const;
 
        /** This will clearly have to change later. Later we can have more
            than one user per buffer. */
@@ -274,10 +274,10 @@ public:
        bool isMultiLingual();
 
        /// Does this mean that this is buffer local?
-       limited_stack<boost::shared_ptr<Undo> > undostack;
+       limited_stack<Undo> undostack;
 
        /// Does this mean that this is buffer local?
-       limited_stack<boost::shared_ptr<Undo> > redostack;
+       limited_stack<Undo> redostack;
 
        ///
        BufferParams params;
@@ -387,25 +387,17 @@ public:
                InsetList::iterator it;
        };
 
-       ///
-       inset_iterator inset_iterator_begin() {
-               return inset_iterator(paragraphs.begin(), paragraphs.end());
-       }
+       /// return an iterator to all *top-level* insets in the buffer
+       inset_iterator inset_iterator_begin();
 
-       ///
-       inset_iterator inset_iterator_end() {
-               return inset_iterator();
-       }
+       /// return the end of all *top-level* insets in the buffer
+       inset_iterator inset_iterator_end();
 
-       ///
-       inset_iterator inset_const_iterator_begin() const {
-               return inset_iterator(paragraphs.begin(), paragraphs.end());
-       }
+       /// return a const iterator to all *top-level* insets in the buffer
+       inset_iterator inset_const_iterator_begin() const;
 
-       ///
-       inset_iterator inset_const_iterator_end() const {
-               return inset_iterator();
-       }
+       /// return the const end of all *top-level* insets in the buffer
+       inset_iterator inset_const_iterator_end() const;
 
        ///
        ParIterator par_iterator_begin();