X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDepTable.C;h=3de886dcda8a81ef070cc85f9d7212d5de34dd77;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=efb487e66969ae116ec4c339e380dfa9c65845b1;hpb=99d1627a471b92f403598d03dfc861ddc3c11be0;p=lyx.git

diff --git a/src/DepTable.C b/src/DepTable.C
index efb487e669..3de886dcda 100644
--- a/src/DepTable.C
+++ b/src/DepTable.C
@@ -1,20 +1,19 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file DepTable.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
- *	     Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author Ben Stanley
  *
- *           This file is Copyright 1996-2001
- *           Lars Gullik Bjønnes
- *           Ben Stanley
- *
- * ======================================================
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "DepTable.h"
+
 #include "debug.h"
 
 #include "support/lyxlib.h"
@@ -22,24 +21,29 @@
 #include "support/lstrings.h"
 #include "support/lyxtime.h"
 
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 
 #include <fstream>
-#include <ctime>
+
+
+namespace lyx {
 
 #ifndef CXX_GLOBAL_CSTD
 using std::time;
 #endif
 
-using std::make_pair;
-using std::ofstream;
-using std::ifstream;
-using std::flush;
+using support::ltrim;
+using support::makeAbsPath;
+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
@@ -51,13 +55,13 @@ bool DepTable::dep_info::changed() const
 void DepTable::insert(string const & fi, bool upd)
 {
 	// not quite sure if this is the correct place for MakeAbsPath
-	string const f = MakeAbsPath(fi);
+	string const f = makeAbsPath(fi);
 	if (deplist.find(f) == deplist.end()) {
 		dep_info di;
 		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);
@@ -76,7 +80,7 @@ void DepTable::insert(string const & fi, bool upd)
 void DepTable::update()
 {
 	lyxerr[Debug::DEPEND] << "Updating DepTable..." << endl;
-	lyx::time_type const start_time = lyx::current_time();
+	time_type const start_time = current_time();
 
 	DepList::iterator itr = deplist.begin();
 	while (itr != deplist.end()) {
@@ -86,12 +90,12 @@ void DepTable::update()
 		if (stat(itr->first.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";
+				lyxerr[Debug::DEPEND] << itr->first << " same mtime" << endl;
 			} else {
 				di.crc_prev = di.crc_cur;
-				lyxerr[Debug::DEPEND] << itr->first << " CRC... ";
-				di.crc_cur = lyx::sum(itr->first);
-				lyxerr[Debug::DEPEND] << "done";
+				lyxerr[Debug::DEPEND] << itr->first << " CRC... " << flush;
+				di.crc_cur = sum(itr->first);
+				lyxerr[Debug::DEPEND] << "done" << endl;
 			}
 		} else {
 			// file doesn't exist
@@ -111,7 +115,7 @@ void DepTable::update()
 		}
 		++itr;
 	}
-	lyx::time_type const time_sec = lyx::current_time() - start_time;
+	time_type const time_sec = current_time() - start_time;
 	lyxerr[Debug::DEPEND] << "Finished updating DepTable ("
 		<< time_sec << " sec)." << endl;
 }
@@ -131,7 +135,7 @@ bool DepTable::sumchange() const
 bool DepTable::haschanged(string const & f) const
 {
 	// not quite sure if this is the correct place for MakeAbsPath
-	string const fil = MakeAbsPath(f);
+	string const fil = makeAbsPath(f);
 	DepList::const_iterator cit = deplist.find(fil);
 	if (cit != deplist.end()) {
 		if (cit->second.changed())
@@ -198,7 +202,7 @@ void DepTable::remove_file(string const & filename)
 	DepList::iterator cit = deplist.begin();
 	DepList::iterator end = deplist.end();
 	while (cit != end) {
-		if (OnlyFilename(cit->first) == filename) {
+		if (onlyFilename(cit->first) == filename) {
 			// Can't erase the current iterator, but we
 			// can increment and then erase.
 			// deplist is a map so only the erased
@@ -234,7 +238,7 @@ void DepTable::write(string const & f) const
 }
 
 
-void DepTable::read(string const & f)
+bool DepTable::read(string const & f)
 {
 	ifstream ifs(f.c_str());
 	string nome;
@@ -252,4 +256,8 @@ void DepTable::read(string const & f)
 		}
 		deplist[nome] = di;
 	}
+	return deplist.size();
 }
+
+
+} // namespace lyx