X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.h;h=7ad1b56d07fa3597e0f5fe79f69ae8277254a5c3;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=dba8ec93b591957539613394505dd3c5f9075ff3;hpb=f6bcac72853d41ff9e1750817a39fe5bd9b7ba42;p=lyx.git

diff --git a/src/buffer_funcs.h b/src/buffer_funcs.h
index dba8ec93b5..7ad1b56d07 100644
--- a/src/buffer_funcs.h
+++ b/src/buffer_funcs.h
@@ -13,10 +13,14 @@
 #define BUFFER_FUNCS_H
 
 #include "lyxlayout_ptr_fwd.h"
+#include "support/docstring.h"
 
 #include <string>
 
 
+namespace lyx {
+
+
 class Buffer;
 class DocIterator;
 class ErrorList;
@@ -37,33 +41,36 @@ Buffer * newFile(std::string const & filename, std::string const & templatename,
 
 ///return the format of the buffer on a string
 std::string const bufferFormat(Buffer const & buffer);
-///
-void bufferErrors(Buffer const &, TeXErrors const &);
-///
-void bufferErrors(Buffer const &, ErrorList const &);
+
+/// Fill in the ErrorList with the TeXErrors
+void bufferErrors(Buffer const &, TeXErrors const &, ErrorList &);
 
 /// Count the number of words in the text between these two iterators
 int countWords(DocIterator const & from, DocIterator const & to);
 
 /// Expand the counters for the labelstring of \c layout
-std::string expandLabel(Buffer const & buf, LyXLayout_ptr const & layout,
-			bool appendix);
+lyx::docstring expandLabel(Buffer const & buf,
+			   LyXLayout_ptr const & layout,
+			   bool appendix);
 
 
 /// update labels at "iter".
 /**
 A full updateLabels(Buffer const &) will be called if not possible.
 */
-void updateLabels(Buffer const & buf, ParIterator & it);
+void updateLabels(Buffer const & buf, ParIterator & it, bool childonly = false);
 
 /// update labels between "from" and "to" if possible.
 /**
 A full updateLabels(Buffer const &) will be called if not possible.
 */
 void updateLabels(Buffer const & buf,
-	ParIterator & from, ParIterator & to);
+	ParIterator & from, ParIterator & to, bool childonly = false);
 
 /// updates all counters
-void updateLabels(Buffer const &);
+void updateLabels(Buffer const &, bool childonly = false);
+
+
+} // namespace lyx
 
 #endif // BUFFER_FUNCS_H