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

[lyx.git] / src / Buffer.h

diff --git a/src/Buffer.h b/src/Buffer.h
index e3df4aa2b9616ab8b6144916e5b992bbec427d52..218f472744e20343b7142b41d71941d4b8277f19 100644 (file)
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -12,13 +12,9 @@
 #ifndef BUFFER_H
 #define BUFFER_H
 
-#include "ErrorList.h"
-#include "InsetList.h"
-
 #include "DocIterator.h"
-#include "ParagraphList_fwd.h"
 
-#include "support/filename.h"
+#include "support/FileName.h"
 #include "support/limited_stack.h"
 #include "support/types.h"
 #include "support/docstring.h"
@@ -38,13 +34,14 @@ namespace lyx {
 
 class BufferParams;
 class ErrorItem;
+class ErrorList;
 class FuncRequest;
-class InsetBase;
+class Inset;
 class InsetText;
-class LyXFont;
-class LyXLex;
+class Font;
+class Lexer;
 class LyXRC;
-class LyXText;
+class Text;
 class LyXVC;
 class LaTeXFeatures;
 class Language;
@@ -52,17 +49,18 @@ class MacroData;
 class OutputParams;
 class ParConstIterator;
 class ParIterator;
+class ParagraphList;
+class StableDocIterator;
 class TeXErrors;
 class TexRow;
 class TocBackend;
 class Undo;
-class StableDocIterator;
 
 
 /** The buffer object.
  * This is the buffer object. It contains all the informations about
  * a document loaded into LyX.
- * The buffer object owns the LyXText (wrapped in an InsetText), which
+ * The buffer object owns the Text (wrapped in an InsetText), which
  * contains the individual paragraphs of the document.
  *
  *
@@ -85,6 +83,22 @@ public:
                wrongversion ///< The version of the file does not match ours
        };
 
+       /// Method to check if a file is externally modified, used by 
+       /// isExternallyModified()
+       /**
+        * timestamp is fast but inaccurate. For example, the granularity
+        * of timestamp on a FAT filesystem is 2 second. Also, various operations
+        * may touch the timestamp of a file even when its content is unchanged.
+        *
+        * checksum is accurate but slow, which can be a problem when it is 
+        * frequently used, or used for a large file on a slow (network) file
+        * system.
+        */
+       enum CheckMethod {
+               checksum_method,  ///< Use file check sum
+               timestamp_method, ///< Use timestamp, and checksum if timestamp has changed
+       };
+       
        /** Constructor
            \param file
            \param b  optional \c false by default
@@ -111,18 +125,18 @@ public:
        bool readFile(support::FileName const & filename);
 
        /// read the header, returns number of unknown tokens
-       int readHeader(LyXLex & lex);
+       int readHeader(Lexer & lex);
 
        /** Reads a file without header.
            \param par if != 0 insert the file.
            \return \c false if file is not completely read.
        */
-       bool readDocument(LyXLex &);
+       bool readDocument(Lexer &);
 
        ///
        void insertStringAsLines(ParagraphList & plist,
                pit_type &, pos_type &,
-               LyXFont const &, docstring const &, bool);
+               Font const &, docstring const &, bool);
        ///
        ParIterator getParFromID(int id) const;
        /// do we have a paragraph with this id?
@@ -212,6 +226,9 @@ public:
        ///
        bool isDepClean(std::string const & name) const;
 
+       /// whether or not disk file has been externally modified
+       bool isExternallyModified(CheckMethod method) const;
+
        /// mark the main lyx file as not needing saving
        void markClean() const;
 
@@ -349,10 +366,10 @@ public:
        void fully_loaded(bool);
 
        /// Our main text (inside the top InsetText)
-       LyXText & text() const;
+       Text & text() const;
 
        /// Our top InsetText!
-       InsetBase & inset() const;
+       Inset & inset() const;
 
        //
        // Macro handling
@@ -374,7 +391,7 @@ public:
        StableDocIterator getAnchor() const { return anchor_; }
        ///
        void changeRefsIfUnique(docstring const & from, docstring const & to,
-               InsetBase::Code code);
+               Inset::Code code);
 /// get source code (latex/docbook) for some paragraphs, or all paragraphs
 /// including preamble
        void getSourceCode(odocstream & os, pit_type par_begin, pit_type par_end, bool full_source);
@@ -394,8 +411,8 @@ private:
        /** Inserts a file into a document
            \return \c false if method fails.
        */
-       ReadStatus readFile(LyXLex &, support::FileName const & filename,
-                           bool fromString = false);
+       ReadStatus readFile(Lexer &, support::FileName const & filename,
+                           bool fromString = false);
 
        /// Use the Pimpl idiom to hide the internals.
        class Impl;
@@ -410,9 +427,6 @@ private:
        /// A cache for the bibfiles (including bibfiles of loaded child
        /// documents), needed for appropriate update of natbib labels.
        mutable std::vector<support::FileName> bibfilesCache_;
-
-       /// Container for all sort of Buffer dependant errors.
-       std::map<std::string, ErrorList> errorLists_;
 };