X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.h;h=44ff0a37ed19f14658eebd719ea6d001f8302ab0;hb=8a69ffd3bfaa4ab23b281a38b9a65f0a8550c997;hp=eb2b3d4a684c8963942a190213b14761b48d693f;hpb=2b01ca42d85a4bb019778a50e1b806b76cedd6a4;p=lyx.git

diff --git a/src/buffer_funcs.h b/src/buffer_funcs.h
index eb2b3d4a68..44ff0a37ed 100644
--- a/src/buffer_funcs.h
+++ b/src/buffer_funcs.h
@@ -12,59 +12,47 @@
 #ifndef BUFFER_FUNCS_H
 #define BUFFER_FUNCS_H
 
-#include "lyxlayout_ptr_fwd.h"
-#include "support/docstring.h"
-
 #include <string>
 
+namespace lyx {
+
+namespace support { class FileName; }
 
 class Buffer;
 class DocIterator;
-class ErrorList;
-class TeXErrors;
 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 *, std::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(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);
-
-/// Fill in the ErrorList with the TeXErrors
-void bufferErrors(Buffer const &, TeXErrors const &, ErrorList &);
+/** 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);
 
-/// Expand the counters for the labelstring of \c layout
-lyx::docstring expandLabel(Buffer const & buf,
-			   LyXLayout_ptr const & layout,
-			   bool appendix);
-
+/// Count the number of chars in the text between these two iterators
+int countChars(DocIterator const & from, DocIterator const & to, bool with_blanks);
 
-/// update labels at "iter".
-/**
-A full updateLabels(Buffer const &) will be called if not possible.
-*/
-void updateLabels(Buffer const & buf, ParIterator & it);
+/// updates all counters
+void updateLabels(Buffer const &, 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);
+///
+void updateLabels(Buffer const &, ParIterator &);
 
-/// updates all counters
-void updateLabels(Buffer const &);
+} // namespace lyx
 
 #endif // BUFFER_FUNCS_H