Fixed some lines that were too long. It compiled afterwards.

[lyx.git] / src / buffer_funcs.h

diff --git a/src/buffer_funcs.h b/src/buffer_funcs.h
index dba8ec93b591957539613394505dd3c5f9075ff3..655d59bf34242a703dc17c5fb37bee55b504eff6 100644 (file)
--- a/src/buffer_funcs.h
+++ b/src/buffer_funcs.h
@@ -13,57 +13,61 @@
 #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;
 
+
+/** 
+ * 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 *, std::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(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 &);
+
+/// 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);
+/// 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 checkBufferStructure(Buffer &, ParIterator const &);
 
-/// updates all counters
-void updateLabels(Buffer const &);
+} // namespace lyx
 
 #endif // BUFFER_FUNCS_H