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

diff --git a/src/DepTable.C b/src/DepTable.C
index adbf627e1f..3de886dcda 100644
--- a/src/DepTable.C
+++ b/src/DepTable.C
@@ -13,6 +13,7 @@
 #include <config.h>
 
 #include "DepTable.h"
+
 #include "debug.h"
 
 #include "support/lyxlib.h"
@@ -24,19 +25,25 @@
 
 #include <fstream>
 
+
+namespace lyx {
+
 #ifndef CXX_GLOBAL_CSTD
 using std::time;
 #endif
 
-using namespace lyx::support;
+using support::ltrim;
+using support::makeAbsPath;
+using support::onlyFilename;
+using support::suffixIs;
+using support::sum;
 
-using std::make_pair;
-using std::ofstream;
-using std::ifstream;
-using std::flush;
 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
@@ -48,7 +55,7 @@ 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;
@@ -73,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()) {
@@ -83,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... ";
+				lyxerr[Debug::DEPEND] << itr->first << " CRC... " << flush;
 				di.crc_cur = sum(itr->first);
-				lyxerr[Debug::DEPEND] << "done";
+				lyxerr[Debug::DEPEND] << "done" << endl;
 			}
 		} else {
 			// file doesn't exist
@@ -108,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;
 }
@@ -128,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())
@@ -195,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
@@ -251,3 +258,6 @@ bool DepTable::read(string const & f)
 	}
 	return deplist.size();
 }
+
+
+} // namespace lyx