X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.h;h=8e67a3fdc611c2b0ac24015e5c24a45253afaca6;hb=4df7d8ab1ae443119057562fb76c2e438c053eef;hp=dc6a440b76fbaa825f686f30cdb6e062a60de3c3;hpb=2d8eb4b9d466e8293534ef7410737aa9448361c6;p=lyx.git

diff --git a/src/buffer_funcs.h b/src/buffer_funcs.h
index dc6a440b76..8e67a3fdc6 100644
--- a/src/buffer_funcs.h
+++ b/src/buffer_funcs.h
@@ -6,21 +6,48 @@
  * \author Lars Gullik Bjønnes
  * \author Alfredo Braunstein
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
-#include "LString.h"
+#ifndef BUFFER_FUNCS_H
+#define BUFFER_FUNCS_H
+
+#include <string>
+
+namespace lyx {
+
+namespace support { class FileName; }
 
 class Buffer;
+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,
+		bool acceptDirty = false);
 
-/* 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);
+
+/** 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);
+
+} // namespace lyx
+
+#endif // BUFFER_FUNCS_H