Do not error out if -geometry is used with QPA_XCB defined.

[lyx.git] / src / buffer_funcs.h

diff --git a/src/buffer_funcs.h b/src/buffer_funcs.h
index 044db3fc84ab5bcbe05644b607048760022b6182..7d0bd07f84294d24fe6e9c18bd4773aa369aa24c 100644 (file)
--- 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,40 +12,21 @@
 #ifndef BUFFER_FUNCS_H
 #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 *, support::FileName const & filename);
 
 /**
  *  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);
+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
@@ -53,29 +34,15 @@ Buffer * checkAndLoadLyXFile(support::FileName const & filename);
 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);
-
-/// updates all counters
-void updateLabels(Buffer const &, bool childonly = false);
-
-///
-void updateLabels(Buffer const &, ParIterator &);
-
-///
-void checkBufferStructure(Buffer &, ParIterator const &);
-
-///
-textclass_type defaultTextclass();
+/** 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 = "");
 
-///
-void loadChildDocuments(Buffer const & buffer);
+/// 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