X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbuffer_funcs.h;h=655d59bf34242a703dc17c5fb37bee55b504eff6;hb=559c2f648239fff4fec769b34b30ccff23491e31;hp=24b5a5d97a1923b5474e4eb0bbe048699d81d208;hpb=ffdb0baea3cfed37790f3769ae74081183d439cc;p=lyx.git

diff --git a/src/buffer_funcs.h b/src/buffer_funcs.h
index 24b5a5d97a..655d59bf34 100644
--- a/src/buffer_funcs.h
+++ b/src/buffer_funcs.h
@@ -12,29 +12,62 @@
 #ifndef BUFFER_FUNCS_H
 #define BUFFER_FUNCS_H
 
-#include "support/std_string.h"
+#include "lyxlayout_ptr_fwd.h"
+#include "support/docstring.h"
+
+#include <string>
+
+
+namespace lyx {
+
+namespace support { class FileName; }
 
 class Buffer;
-class TeXErrors;
+class DocIterator;
 class ErrorList;
+class TeXErrors;
+class ParIterator;
+
+
+/** 
+ * Returns true if the file is already loaded into a buffer.
+ */
+bool checkIfLoaded(support::FileName const & fn);
 
 /**
  *  Loads a LyX file \c filename into \c Buffer
  *  and \return success status.
  */
-bool loadLyXFile(Buffer *, string const & filename);
+bool loadLyXFile(Buffer *, support::FileName const & filename);
 
-/* Make a new file (buffer) with name \c filename based on a template
- * named \c templatename
+/**
+ *  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.
+ */
+Buffer * checkAndLoadLyXFile(support::FileName const & filename);
+
+/** 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 &);
+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);
+
+/// updates all counters
+void updateLabels(Buffer const &, bool childonly = false);
+
 ///
-void bufferErrors(Buffer const &, ErrorList const &);
+void checkBufferStructure(Buffer &, ParIterator const &);
+
+} // namespace lyx
 
 #endif // BUFFER_FUNCS_H