X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDepTable.C;h=90849bb0d770ca7e2e5687a8abadcda0eab15609;hb=09e01879979643949f1f2c7216023f1f35d5ada2;hp=6ee37d40935ea5c2202471c70078dc2df8481840;hpb=53274e31ec1cc715c0b48921ee67818790c2e99a;p=lyx.git

diff --git a/src/DepTable.C b/src/DepTable.C
index 6ee37d4093..90849bb0d7 100644
--- a/src/DepTable.C
+++ b/src/DepTable.C
@@ -14,16 +14,13 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "DepTable.h"
 #include "debug.h"
 
 #include "support/lyxlib.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
+#include "support/lyxtime.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -36,11 +33,14 @@
 using std::time;
 #endif
 
+using namespace lyx::support;
+
 using std::make_pair;
 using std::ofstream;
 using std::ifstream;
 using std::flush;
 using std::endl;
+using std::getline;
 
 
 inline
@@ -59,7 +59,7 @@ void DepTable::insert(string const & fi, bool upd)
 		di.crc_prev = 0;
 		if (upd) {
 			lyxerr[Debug::DEPEND] << " CRC..." << flush;
-			di.crc_cur = lyx::sum(f);
+			di.crc_cur = sum(f);
 			lyxerr[Debug::DEPEND] << "done." << endl;
 			struct stat f_info;
 			stat(fi.c_str(), &f_info);
@@ -78,7 +78,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()) {
@@ -92,7 +92,7 @@ void DepTable::update()
 			} else {
 				di.crc_prev = di.crc_cur;
 				lyxerr[Debug::DEPEND] << itr->first << " CRC... ";
-				di.crc_cur = lyx::sum(itr->first);
+				di.crc_cur = sum(itr->first);
 				lyxerr[Debug::DEPEND] << "done";
 			}
 		} else {
@@ -113,7 +113,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;
 }
@@ -225,18 +225,18 @@ 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.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;
 	}
 }
 
 
-void DepTable::read(string const & f)
+bool DepTable::read(string const & f)
 {
 	ifstream ifs(f.c_str());
 	string nome;
@@ -244,13 +244,15 @@ 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.mtime_cur << ' '
+			       << nome << endl;
 		}
 		deplist[nome] = di;
 	}
+	return deplist.size();
 }