clean up a bit

[lyx.git] / src / DepTable.C

diff --git a/src/DepTable.C b/src/DepTable.C
index fecf867d8ddc25d29aed84c18cdc9dc35662e6d5..8e0997f8cef643a55594c7430c86eb86bbfdae82 100644 (file)
--- a/src/DepTable.C
+++ b/src/DepTable.C
@@ -24,6 +24,7 @@
 #include "support/lyxlib.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
+#include "support/lyxtime.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -32,11 +33,16 @@
 #include <fstream>
 #include <ctime>
 
+#ifndef CXX_GLOBAL_CSTD
+using std::time;
+#endif
+
 using std::make_pair;
 using std::ofstream;
 using std::ifstream;
 using std::flush;
 using std::endl;
+using std::getline;
 
 
 inline
@@ -74,7 +80,7 @@ void DepTable::insert(string const & fi, bool upd)
 void DepTable::update()
 {
        lyxerr[Debug::DEPEND] << "Updating DepTable..." << endl;
-       time_t start_time = time(0);
+       lyx::time_type const start_time = lyx::current_time();
 
        DepList::iterator itr = deplist.begin();
        while (itr != deplist.end()) {
@@ -109,7 +115,7 @@ void DepTable::update()
                }
                ++itr;
        }
-       time_t time_sec = time(0) - start_time;
+       lyx::time_type const time_sec = lyx::current_time() - start_time;
        lyxerr[Debug::DEPEND] << "Finished updating DepTable ("
                << time_sec << " sec)." << endl;
 }
@@ -221,13 +227,13 @@ void DepTable::write(string const & f) const
                        // CRC value.
                        // The older one is effectively set to 0 upon re-load.
                        lyxerr << "Write dep: "
-                              << cit->first << " "
-                              << cit->second.crc_cur << " "
-                              << cit->second.mtime_cur << endl;
+                              << cit->second.crc_cur << ' '
+                              << cit->second.mtime_cur << ' '
+                              << cit->first << endl;
                }
-               ofs << cit->first << " "
-                   << cit->second.crc_cur << " "
-                   << cit->second.mtime_cur << endl;
+               ofs << cit->second.crc_cur << ' '
+                   << cit->second.mtime_cur << ' '
+                   << cit->first << endl;
        }
 }
 
@@ -240,12 +246,13 @@ void DepTable::read(string const & f)
        // This doesn't change through the loop.
        di.crc_prev = 0;
 
-       while (ifs >> nome >> di.crc_cur >> di.mtime_cur) {
+       while (ifs >> di.crc_cur >> di.mtime_cur && getline(ifs, nome)) {
+               nome = ltrim(nome);
                if (lyxerr.debugging(Debug::DEPEND)) {
                        lyxerr << "Read dep: "
-                              << nome << " "
-                              << di.crc_cur << " "
-                              << di.mtime_cur << endl;
+                              << di.crc_cur << ' '
+                              << di.mtime_cur << ' '
+                              << nome << endl;
                }
                deplist[nome] = di;
        }