Fix crash with updateLabels(). I changed the the test in the assertion but endless...

[lyx.git] / src / Buffer.h

diff --git a/src/Buffer.h b/src/Buffer.h
index 586c47db022d6955b1e834f6ab24a187929f9925..218f472744e20343b7142b41d71941d4b8277f19 100644 (file)
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -12,9 +12,6 @@
 #ifndef BUFFER_H
 #define BUFFER_H
 
-#include "ErrorList.h"
-#include "InsetList.h"
-
 #include "DocIterator.h"
 
 #include "support/FileName.h"
@@ -37,6 +34,7 @@ namespace lyx {
 
 class BufferParams;
 class ErrorItem;
+class ErrorList;
 class FuncRequest;
 class Inset;
 class InsetText;
@@ -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
@@ -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;
 
@@ -395,7 +412,7 @@ private:
            \return \c false if method fails.
        */
        ReadStatus readFile(Lexer &, support::FileName const & filename,
-                           bool fromString = false);
+                           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_;
 };