X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDepTable.cpp;h=835130717fc253a33a74d343a95ddd70718210ee;hb=4cfc110d4aeb28c4d570ec47ab1607ad7672e792;hp=1279e8cf205d2440dc13bbb21bedf0e4a006ca4a;hpb=e1ce2f92db49d50c688414a32944be8e718faa2e;p=lyx.git

diff --git a/src/DepTable.cpp b/src/DepTable.cpp
index 1279e8cf20..835130717f 100644
--- 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,21 +23,11 @@
 
 #include <fstream>
 
-using std::endl;
-using std::flush;
-using std::getline;
-using std::string;
-using std::ofstream;
-using std::ifstream;
-
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileName;
-using support::ltrim;
-using support::onlyFilename;
-using support::suffixIs;
-using support::sum;
 
 inline
 bool DepTable::dep_info::changed() const
@@ -55,7 +43,7 @@ void DepTable::insert(FileName const & f, bool upd)
 		di.crc_prev = 0;
 		if (upd) {
 			LYXERR(Debug::DEPEND, " CRC...");
-			di.crc_cur = sum(f);
+			di.crc_cur = f.checksum();
 			LYXERR(Debug::DEPEND, "done.");
 			struct stat f_info;
 			stat(f.toFilesystemEncoding().c_str(), &f_info);
@@ -74,7 +62,7 @@ void DepTable::insert(FileName const & f, bool upd)
 void DepTable::update()
 {
 	LYXERR(Debug::DEPEND, "Updating DepTable...");
-	time_type const start_time = current_time();
+	time_t const start_time = current_time();
 
 	DepList::iterator itr = deplist.begin();
 	while (itr != deplist.end()) {
@@ -88,7 +76,7 @@ void DepTable::update()
 			} else {
 				di.crc_prev = di.crc_cur;
 				LYXERR(Debug::DEPEND, itr->first << " CRC... ");
-				di.crc_cur = sum(itr->first);
+				di.crc_cur = itr->first.checksum();
 				LYXERR(Debug::DEPEND, "done");
 			}
 		} else {
@@ -109,9 +97,9 @@ void DepTable::update()
 		}
 		++itr;
 	}
-	time_type const time_sec = current_time() - start_time;
+	time_t const time_sec = current_time() - start_time;
 	LYXERR(Debug::DEPEND, "Finished updating DepTable ("
-		<< time_sec << " sec).");
+		<< long(time_sec) << " sec).");
 }
 
 
@@ -120,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;
 }
@@ -142,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;
 		}
@@ -156,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;
 }
@@ -175,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