* src/LaTeX.C: beautification: use identical user messages

[lyx.git] / src / buffer_funcs.h

diff --git a/src/buffer_funcs.h b/src/buffer_funcs.h
index 4d6d71e899095a34d9c408914b94fa8c112e703d..d3fdb59701529b323bdfb8bdca413f924cb262e2 100644 (file)
--- 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;
@@ -36,28 +40,37 @@ Buffer * newFile(std::string const & filename, std::string const & templatename,
                 bool isNamed = false);
 
 ///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 &);
+std::string const bufferFormat(Buffer const & buffer);
+
+/// 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);
+
 
-/// updates current counter and/or label if possible.
+/// update labels at "iter".
 /**
-\retval true if a full updateCounters is required.
-\retval false if a full updateCounters is not required.
+A full updateLabels(Buffer const &) will be called if not possible.
 */
-bool needsUpdateCounters(Buffer const & buf, ParIterator & it);
+void updateLabels(Buffer const & buf, ParIterator & it);
+
+/// 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);
 
 /// updates all counters
-void updateCounters(Buffer const &);
+void updateLabels(Buffer const &);
+
 
+} // namespace lyx
 
 #endif // BUFFER_FUNCS_H