(finishing patch -- question was restored, but there were still problems)

[lyx.git] / src / Buffer.h

diff --git a/src/Buffer.h b/src/Buffer.h
index deb66ee4975b056724c7f0ec947c60eff7c4e199..35d1da1b42eec1df852b50685d7d7dc1e322d3e1 100644 (file)
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -177,6 +177,8 @@ public:
            Returns \c true if the save is successful, \c false otherwise.
        */
        bool save() const;
+       /// Renames and saves the buffer
+       bool saveAs(support::FileName const & fn);
 
        /// Write document to stream. Returns \c false if unsuccesful.
        bool write(std::ostream &) const;
@@ -185,13 +187,13 @@ public:
 
        /// \name Functions involved in reading files/strings.
        //@{
-       /// Loads a LyX file \c fn into the buffer. This function
+       /// Loads the LyX file into the buffer. This function
        /// tries to extract the file from version control if it
        /// cannot be found. If it can be found, it will try to
        /// read an emergency save file or an autosave file.
        /// \sa loadThisLyXFile
-       ReadStatus loadLyXFile(support::FileName const & fn);
-       /// Loads a LyX file \c fn into the buffer. If you want
+       ReadStatus loadLyXFile();
+       /// Loads the LyX file \c fn into the buffer. If you want
        /// to check for files in a version control container,
        /// emergency or autosave files, one should use \c loadLyXFile.
        /// /sa loadLyXFile
@@ -199,12 +201,14 @@ public:
        /// read a new document from a string
        bool readString(std::string const &);
        /// Reloads the LyX file
-       bool reload();
-//FIXME: The following function should be private
+       ReadStatus reload();
+//FIXME: The following two functions should be private
 //private:
        /// read the header, returns number of unknown tokens
        int readHeader(Lexer & lex);
-       
+       /// save timestamp and checksum of the given file.
+       void saveCheckSum() const;
+
 private:
        /// read a new file
        ReadStatus readFile(support::FileName const & fn);
@@ -216,7 +220,7 @@ private:
        /// before reading if the file cannot be found. This is only
        /// implemented for RCS.
        /// \sa LyXVC::file_not_found_hook
-       ReadStatus readFromVC(support::FileName const & fn);
+       ReadStatus extractFromVC();
        /// Reads the first tag of a LyX File and 
        /// returns the file format number.
        ReadStatus parseLyXFormat(Lexer & lex, support::FileName const & fn,
@@ -247,19 +251,12 @@ public:
        support::FileName getAutosaveFileName() const;
        
 private:
-       /// Try to read an autosave file associated to \c fn.
-       ReadStatus readAutosave(support::FileName const & fn);
-       /// Get the filename of the autosave file associated with \c fn
-       support::FileName getAutosaveFileNameFor(support::FileName const & fn)
-               const;
-
-       /// Try to read an emergency file associated to \c fn. 
-       ReadStatus readEmergency(support::FileName const & fn);
+       /// Try to load an autosave file associated to \c fn.
+       ReadStatus loadAutosave();
+       /// Try to load an emergency file associated to \c fn. 
+       ReadStatus loadEmergency();
        /// Get the filename of the emergency file associated with the Buffer
        support::FileName getEmergencyFileName() const;
-       /// Get the filename of the emergency file associated with \c fn
-       support::FileName getEmergencyFileNameFor(support::FileName const & fn)
-               const;
        //@}
 
 public:
@@ -328,9 +325,6 @@ public:
        /// whether or not disk file has been externally modified
        bool isExternallyModified(CheckMethod method) const;
 
-       /// save timestamp and checksum of the given file.
-       void saveCheckSum(support::FileName const & file) const;
-
        /// mark the main lyx file as not needing saving
        void markClean() const;
 
@@ -514,6 +508,11 @@ public:
        /// Set by buffer_funcs' newFile.
        void setFullyLoaded(bool);
 
+       /// Update the LaTeX preview snippets associated with this buffer
+       void updatePreviews() const;
+       /// Remove any previewed LaTeX snippets associated with this buffer
+       void removePreviews() const;
+
        /// Our main text (inside the top InsetText)
        Text & text() const;