LogUi.ui: string redundancy.

[lyx.git] / src / Buffer.h

diff --git a/src/Buffer.h b/src/Buffer.h
index 72c0d8ca097271162bb5ef0075619fe22dff9870..71e8ac32c13ce92f42abfc2f3b86b2b074f610b4 100644 (file)
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -20,6 +20,7 @@
 #include "support/types.h"
 #include "support/SignalSlot.h"
 
+#include <list>
 #include <string>
 #include <vector>
 
@@ -455,7 +456,7 @@ public:
        /// This function is called when the buffer structure is changed.
        void structureChanged() const;
        /// This function is called when some parsing error shows up.
-       void errors(std::string const & err) const;
+       void errors(std::string const & err, bool from_master = false) const;
        /// This function is called when the buffer busy status change.
        void setBusy(bool on) const;
        /// This function is called when the buffer readonly status change.
@@ -506,6 +507,9 @@ public:
        void setInsetLabel(docstring const & label, InsetLabel const * il);
        InsetLabel const * insetLabel(docstring const & label) const;
 
+       /// return a list of all used branches (also in children)
+       void getUsedBranches(std::list<docstring> &, bool const from_master = false) const;
+
        /// sets the buffer_ member for every inset in this buffer.
        // FIXME This really shouldn't be needed, but at the moment it's not
        // clear how to do it just for the individual pieces we need.
@@ -515,15 +519,12 @@ public:
        ///
        void updateLabels(ParIterator & parit) const;
 
-       /// Find next word starting from \p from.
-       /// \p from initial position to search, will then points to the next
+       /// Spellcheck starting from \p from.
+       /// \p from initial position, will then points to the next misspelled
        ///    word.
-       /// \p to will points to the end of the next word.
-       /// \p word will contain the found word if any.
-       /// \return true if a new word was found.
-       bool nextWord(DocIterator & from, DocIterator & to,
-               docstring & word) const;
-
+       /// \p to will points to the end of the next misspelled word.
+       /// \p word_lang will contain the found misspelled word.
+       /// \return progress if a new word was found.
        int spellCheck(DocIterator & from, DocIterator & to,
                WordLangTuple & word_lang, docstring_list & suggestions) const;