X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.h;h=12aa84123e3d87f22f4633a0ac374497450cd626;hb=43dd383073fc61cfe5f24b87294c4e8698a1827a;hp=599a2dbc714f1196a1f729a8671ce6cf87b77e80;hpb=c5a4f61f3377997a4b793481bd30a1a8e0627b86;p=lyx.git

diff --git a/src/buffer_funcs.h b/src/buffer_funcs.h
index 599a2dbc71..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,57 +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 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);
-
-/// 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);
-
-/// Expand the counters for the labelstring of \c layout
-std::string expandLabel(Buffer const & buf, LyXLayout_ptr const & layout,
-			bool appendix);
-
-
-/// update labels at "iter".
-/**
-A full updateLabels(Buffer const &) will be called if not possible.
-*/
-void updateLabels(Buffer const & buf, ParIterator & it);
+/** 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 = "");
 
-/// 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);
+/// 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);
 
-/// updates all counters
-void updateLabels(Buffer const &);
+} // namespace lyx
 
 #endif // BUFFER_FUNCS_H