Account for old versions of Pygments

[lyx.git] / src / DepTable.cpp

diff --git a/src/DepTable.cpp b/src/DepTable.cpp
index 17eab19fb3af58d927d7287a29aebe28a04da06f..47daf3911324d8f95d4c94a014f2bfacc41061ce 100644 (file)
--- a/src/DepTable.cpp
+++ b/src/DepTable.cpp
@@ -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 Jean-Marc Lasgouttes
  * \author Ben Stanley
  *
@@ -15,13 +15,10 @@
 #include "DepTable.h"
 
 #include "support/debug.h"
-#include "support/lyxlib.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 #include "support/lyxtime.h"
 
-#include <sys/stat.h>
-
 #include <fstream>
 
 using namespace std;
@@ -42,13 +39,11 @@ void DepTable::insert(FileName const & f, bool upd)
        if (deplist.find(f) == deplist.end()) {
                dep_info di;
                di.crc_prev = 0;
-               if (upd) {
+               if (upd && f.exists()) {
                        LYXERR(Debug::DEPEND, " CRC...");
                        di.crc_cur = f.checksum();
                        LYXERR(Debug::DEPEND, "done.");
-                       struct stat f_info;
-                       stat(f.toFilesystemEncoding().c_str(), &f_info);
-                       di.mtime_cur = long(f_info.st_mtime);
+                       di.mtime_cur = f.lastModified();
                } else {
                        di.crc_cur = 0;
                        di.mtime_cur = 0;
@@ -67,25 +62,24 @@ void DepTable::update()
 
        DepList::iterator itr = deplist.begin();
        while (itr != deplist.end()) {
+               FileName const & fn = itr->first;
                dep_info &di = itr->second;
 
-               struct stat f_info;
-               if (stat(itr->first.toFilesystemEncoding().c_str(), &f_info) == 0) {
-                       if (di.mtime_cur == f_info.st_mtime) {
+               if (fn.exists()) {
+                       if (di.mtime_cur == fn.lastModified()) {
                                di.crc_prev = di.crc_cur;
                                LYXERR(Debug::DEPEND, itr->first << " same mtime");
                        } else {
                                di.crc_prev = di.crc_cur;
                                LYXERR(Debug::DEPEND, itr->first << " CRC... ");
-                               di.crc_cur = itr->first.checksum();
+                               di.crc_cur = fn.checksum();
                                LYXERR(Debug::DEPEND, "done");
                        }
                } else {
                        // file doesn't exist
                        // remove stale files - if it's re-created, it
                        // will be re-inserted by deplog.
-                       LYXERR(Debug::DEPEND, itr->first
-                               << " doesn't exist. removing from DepTable.");
+                       LYXERR(Debug::DEPEND, fn << " doesn't exist. removing from DepTable.");
                        DepList::iterator doomed = itr++;
                        deplist.erase(doomed);
                        continue;
@@ -109,7 +103,8 @@ bool DepTable::sumchange() const
        DepList::const_iterator cit = deplist.begin();
        DepList::const_iterator end = deplist.end();
        for (; cit != end; ++cit) {
-               if (cit->second.changed()) return true;
+               if (cit->second.changed())
+                       return true;
        }
        return false;
 }
@@ -131,7 +126,7 @@ bool DepTable::extchanged(string const & ext) const
        DepList::const_iterator cit = deplist.begin();
        DepList::const_iterator end = deplist.end();
        for (; cit != end; ++cit) {
-               if (suffixIs(cit->first.absFilename(), ext)) {
+               if (suffixIs(cit->first.absFileName(), ext)) {
                        if (cit->second.changed())
                                return true;
                }
@@ -145,9 +140,8 @@ bool DepTable::ext_exist(string const & ext) const
        DepList::const_iterator cit = deplist.begin();
        DepList::const_iterator end = deplist.end();
        for (; cit != end; ++cit) {
-               if (suffixIs(cit->first.absFilename(), ext)) {
+               if (suffixIs(cit->first.absFileName(), ext))
                        return true;
-               }
        }
        return false;
 }
@@ -164,7 +158,7 @@ void DepTable::remove_files_with_extension(string const & suf)
        DepList::iterator cit = deplist.begin();
        DepList::iterator end = deplist.end();
        while (cit != end) {
-               if (suffixIs(cit->first.absFilename(), suf)) {
+               if (suffixIs(cit->first.absFileName(), suf)) {
                        // Can't erase the current iterator, but we
                        // can increment and then erase.
                        // Deplist is a map so only the erased