X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.h;h=44ff0a37ed19f14658eebd719ea6d001f8302ab0;hb=cca78e3c8ae27431323746abd64f9d7db017099d;hp=a09c44684eace457c0b1a3160afb9d828e9a30a0;hpb=236ea81bc5c0ce7101c9460d1ee97b8f3c9be9df;p=lyx.git

diff --git a/src/buffer_funcs.h b/src/buffer_funcs.h
index a09c44684e..44ff0a37ed 100644
--- a/src/buffer_funcs.h
+++ b/src/buffer_funcs.h
@@ -12,29 +12,47 @@
 #ifndef BUFFER_FUNCS_H
 #define BUFFER_FUNCS_H
 
-#include "support/std_string.h"
+#include <string>
+
+namespace lyx {
+
+namespace support { class FileName; }
 
 class Buffer;
-class TeXErrors;
-class ErrorList;
+class DocIterator;
+class ParIterator;
 
 /**
- *  Loads a LyX file \c filename into \c Buffer 
- *  and \return success status.
+ *  Checks and loads a LyX file \param filename.
+ *  \retval the newly created \c Buffer pointer if successful or 0.
+ *  \retval 0 if the \c Buffer could not be created.
  */
-bool loadLyXFile(Buffer *, string const & filename);
+Buffer * checkAndLoadLyXFile(support::FileName const & filename);
 
-/* Make a new file (buffer) with name \c filename based on a template
- * named \c templatename
+/** Make a new file (buffer) with name \c filename based on a template
+ *  named \c templatename
  */
-Buffer * newFile(string const & filename, string const & templatename, 
+Buffer * newFile(std::string const & filename, std::string const & templatename,
 		 bool isNamed = false);
 
-///return the format of the buffer on a string
-string const BufferFormat(Buffer const & buffer);
-///
-void bufferErrors(Buffer const &, TeXErrors const &);
+/** Make a new unnamed file (buffer) based on a template
+ *  named \c templatename
+ */
+Buffer * newUnnamedFile(std::string const & templatename,
+	support::FileName const & path);
+
+/// Count the number of words in the text between these two iterators
+int countWords(DocIterator const & from, DocIterator const & to);
+
+/// Count the number of chars in the text between these two iterators
+int countChars(DocIterator const & from, DocIterator const & to, bool with_blanks);
+
+/// updates all counters
+void updateLabels(Buffer const &, bool childonly = false);
+
 ///
-void bufferErrors(Buffer const &, ErrorList const &);
+void updateLabels(Buffer const &, ParIterator &);
+
+} // namespace lyx
 
 #endif // BUFFER_FUNCS_H