Harmonize naming

[lyx.git] / src / Buffer.h

diff --git a/src/Buffer.h b/src/Buffer.h
index e30a09a9c5a65572b8a1918d23bf56d328ac809b..5fdf020e4ce29ed7da08a354b70cd4d01e878bb9 100644 (file)
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -15,8 +15,6 @@
 #include "OutputEnums.h"
 #include "OutputParams.h"
 
-#include "insets/InsetCode.h"
-
 #include "support/strfwd.h"
 #include "support/types.h"
 
@@ -94,6 +92,9 @@ typedef std::set<Buffer *> CloneList;
  * minimal, probably not.
  * \author Lars Gullik Bjønnes
  */
+
+class MarkAsExporting;
+
 class Buffer {
 public:
        /// What type of log will \c getLogName() return?
@@ -222,11 +223,14 @@ public:
        /// emergency or autosave files, one should use \c loadLyXFile.
        /// /sa loadLyXFile
        ReadStatus loadThisLyXFile(support::FileName const & fn);
+       /// import a new document from a string
+       bool importString(std::string const &, docstring const &, ErrorList &);
+       /// import a new file
+       bool importFile(std::string const &, support::FileName const &, ErrorList &);
        /// read a new document from a string
        bool readString(std::string const &);
        /// Reloads the LyX file
-       /// \param clearUndo if false, leave alone the undo stack.
-       ReadStatus reload(bool clearUndo = true);
+       ReadStatus reload();
 //FIXME: The following function should be private
 //private:
        /// read the header, returns number of unknown tokens
@@ -390,7 +394,7 @@ public:
        /// Returns the buffer's filename. It is always an absolute path.
        std::string absFileName() const;
 
-       /// Returns the the path where the buffer lives.
+       /// Returns the path where the buffer lives.
        /// It is always an absolute path.
        std::string filePath() const;
 
@@ -584,8 +588,7 @@ public:
 
        /// Replace the inset contents for insets which InsetCode is equal
        /// to the passed \p inset_code.
-       void changeRefsIfUnique(docstring const & from, docstring const & to,
-               InsetCode code);
+       void changeRefsIfUnique(docstring const & from, docstring const & to);
 
        /// get source code (latex/docbook) for some paragraphs, or all paragraphs
        /// including preamble
@@ -713,7 +716,6 @@ public:
        int charCount(bool with_blanks) const;
 
 private:
-       class MarkAsExporting;
        friend class MarkAsExporting;
        /// mark the buffer as busy exporting something, or not
        void setExportStatus(bool e) const;
@@ -749,6 +751,25 @@ private:
 };
 
 
+/// Helper class, to guarantee that the export status
+/// gets reset properly. To use, simply create a local variable:
+///    MarkAsExporting mex(bufptr);
+/// and leave the rest to us.
+class MarkAsExporting {
+public:
+       MarkAsExporting(Buffer const * buf) : buf_(buf)
+       {
+               buf_->setExportStatus(true);
+       }
+       ~MarkAsExporting()
+       {
+               buf_->setExportStatus(false);
+       }
+private:
+       Buffer const * const buf_;
+};
+
+
 } // namespace lyx
 
 #endif