Change the "empty layout" to the "plain layout", to try to avoid confusion.

[lyx.git] / src / buffer_funcs.h

diff --git a/src/buffer_funcs.h b/src/buffer_funcs.h
index 8c251add441f2bf4e3b1a6950ecb837c7ab48bcd..44ff0a37ed19f14658eebd719ea6d001f8302ab0 100644 (file)
--- a/src/buffer_funcs.h
+++ b/src/buffer_funcs.h
@@ -12,44 +12,47 @@
 #ifndef BUFFER_FUNCS_H
 #define BUFFER_FUNCS_H
 
-#include "lyxlayout_ptr_fwd.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);
-///
-void bufferErrors(Buffer const &, TeXErrors const &);
-///
-void bufferErrors(Buffer const &, ErrorList 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);
 
-/// Expand the counters for the labelstring of \c layout
-std::string 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);
 
 /// updates all counters
-void updateCounters(Buffer const &);
+void updateLabels(Buffer const &, bool childonly = false);
+
+///
+void updateLabels(Buffer const &, ParIterator &);
 
+} // namespace lyx
 
 #endif // BUFFER_FUNCS_H