Natbib authoryear uses (Ref1; Ref2) by default.

[lyx.git] / src / DepTable.cpp

diff --git a/src/DepTable.cpp b/src/DepTable.cpp
index c68eef628e45fa567e1898edb0aa54c2a0156b32..835130717fc253a33a74d343a95ddd70718210ee 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
  *
@@ -14,9 +14,7 @@
 
 #include "DepTable.h"
 
-#include "debug.h"
-
-#include "support/lyxlib.h"
+#include "support/debug.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 #include "support/lyxtime.h"
@@ -25,25 +23,11 @@
 
 #include <fstream>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-#ifndef CXX_GLOBAL_CSTD
-using std::time;
-#endif
-
-using support::FileName;
-using support::ltrim;
-using support::onlyFilename;
-using support::suffixIs;
-using support::sum;
-
-using std::endl;
-using std::flush;
-using std::getline;
-using std::string;
-using std::ofstream;
-using std::ifstream;
 
 inline
 bool DepTable::dep_info::changed() const
@@ -58,27 +42,27 @@ void DepTable::insert(FileName const & f, bool upd)
                dep_info di;
                di.crc_prev = 0;
                if (upd) {
-                       LYXERR(Debug::DEPEND) << " CRC..." << flush;
-                       di.crc_cur = sum(f);
-                       LYXERR(Debug::DEPEND) << "done." << endl;
+                       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 = f_info.st_mtime;
+                       di.mtime_cur = long(f_info.st_mtime);
                } else {
                        di.crc_cur = 0;
                        di.mtime_cur = 0;
                }
                deplist[f] = di;
        } else {
-               LYXERR(Debug::DEPEND) << " Already in DepTable" << endl;
+               LYXERR(Debug::DEPEND, " Already in DepTable");
        }
 }
 
 
 void DepTable::update()
 {
-       LYXERR(Debug::DEPEND) << "Updating DepTable..." << endl;
-       time_type const start_time = current_time();
+       LYXERR(Debug::DEPEND, "Updating DepTable...");
+       time_t const start_time = current_time();
 
        DepList::iterator itr = deplist.begin();
        while (itr != deplist.end()) {
@@ -88,19 +72,19 @@ void DepTable::update()
                if (stat(itr->first.toFilesystemEncoding().c_str(), &f_info) == 0) {
                        if (di.mtime_cur == f_info.st_mtime) {
                                di.crc_prev = di.crc_cur;
-                               LYXERR(Debug::DEPEND) << itr->first << " same mtime" << endl;
+                               LYXERR(Debug::DEPEND, itr->first << " same mtime");
                        } else {
                                di.crc_prev = di.crc_cur;
-                               LYXERR(Debug::DEPEND) << itr->first << " CRC... " << flush;
-                               di.crc_cur = sum(itr->first);
-                               LYXERR(Debug::DEPEND) << "done" << endl;
+                               LYXERR(Debug::DEPEND, itr->first << " CRC... ");
+                               di.crc_cur = itr->first.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." << endl;
+                       LYXERR(Debug::DEPEND, itr->first
+                               << " doesn't exist. removing from DepTable.");
                        DepList::iterator doomed = itr++;
                        deplist.erase(doomed);
                        continue;
@@ -113,9 +97,9 @@ void DepTable::update()
                }
                ++itr;
        }
-       time_type const time_sec = current_time() - start_time;
-       LYXERR(Debug::DEPEND) << "Finished updating DepTable ("
-               << time_sec << " sec)." << endl;
+       time_t const time_sec = current_time() - start_time;
+       LYXERR(Debug::DEPEND, "Finished updating DepTable ("
+               << long(time_sec) << " sec).");
 }
 
 
@@ -124,7 +108,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;
 }
@@ -146,7 +131,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;
                }
@@ -160,9 +145,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;
 }
@@ -179,7 +163,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
@@ -221,10 +205,10 @@ void DepTable::write(FileName const & f) const
                // Store the second (most recently calculated)
                // CRC value.
                // The older one is effectively set to 0 upon re-load.
-               LYXERR(Debug::DEPEND) << "Write dep: "
+               LYXERR(Debug::DEPEND, "Write dep: "
                       << cit->second.crc_cur << ' '
                       << cit->second.mtime_cur << ' '
-                      << cit->first << endl;
+                      << cit->first);
 
                ofs << cit->second.crc_cur << ' '
                    << cit->second.mtime_cur << ' '
@@ -244,8 +228,8 @@ bool DepTable::read(FileName const & f)
        while (ifs >> di.crc_cur >> di.mtime_cur && getline(ifs, nome)) {
                nome = ltrim(nome);
 
-               LYXERR(Debug::DEPEND) << "Read dep: "
-                      << di.crc_cur << ' ' << di.mtime_cur << ' ' << nome << endl;
+               LYXERR(Debug::DEPEND, "Read dep: "
+                      << di.crc_cur << ' ' << di.mtime_cur << ' ' << nome);
 
                deplist[FileName(nome)] = di;
        }