X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.h;h=12aa84123e3d87f22f4633a0ac374497450cd626;hb=b6eb780d64deb6023d2f0824c4b9f3989ad1a17c;hp=aa4b2a7ce0aa5e69a45a37d396e980fd11aed050;hpb=1e7112db43e14f6e4f2c021dd3daeea0a46cc808;p=lyx.git

diff --git a/src/buffer_funcs.h b/src/buffer_funcs.h
index aa4b2a7ce0..12aa84123e 100644
--- a/src/buffer_funcs.h
+++ b/src/buffer_funcs.h
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Alfredo Braunstein
  *
  * Full author contact details are available in file CREDITS.
@@ -12,45 +12,40 @@
 #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 LyXTextClass;
-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,
+		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(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 &);
-
-/// 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(LyXTextClass const & textclass,
-		LyXLayout_ptr const & layout, bool appendix);
+/** Make a new unnamed file (buffer) with prefix \c prefix
+ *  based on a template named \c templatename
+ */
+Buffer * newUnnamedFile(support::FileName const & path,
+	std::string const & prefix, std::string const & templatename = "");
 
-/// updates all counters
-void updateCounters(Buffer const &);
+/// Load the file with name \c fname, and returns the buffer. If the
+/// file was already loaded it just returns the associated buffer.
+Buffer * loadIfNeeded(support::FileName const & fname);
 
+} // namespace lyx
 
 #endif // BUFFER_FUNCS_H