* src/tabular.[Ch]: simplify plaintext methods, because there

[lyx.git] / src / DepTable.C

diff --git a/src/DepTable.C b/src/DepTable.C
index 865c6250b3df4d35c408c92c4a0888ed7b9f03ab..0c745f0950c15a6652f19968eacc544db80b789d 100644 (file)
--- a/src/DepTable.C
+++ b/src/DepTable.C
@@ -25,20 +25,23 @@
 
 #include <fstream>
 
+
+namespace lyx {
+
 #ifndef CXX_GLOBAL_CSTD
 using std::time;
 #endif
 
-using lyx::support::ltrim;
-using lyx::support::MakeAbsPath;
-using lyx::support::OnlyFilename;
-using lyx::support::suffixIs;
-using lyx::support::sum;
+using support::FileName;
+using support::ltrim;
+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;
 
@@ -49,10 +52,8 @@ bool DepTable::dep_info::changed() const
 }
 
 
-void DepTable::insert(string const & fi, bool upd)
+void DepTable::insert(FileName const & f, bool upd)
 {
-       // not quite sure if this is the correct place for MakeAbsPath
-       string const f = MakeAbsPath(fi);
        if (deplist.find(f) == deplist.end()) {
                dep_info di;
                di.crc_prev = 0;
@@ -61,7 +62,7 @@ void DepTable::insert(string const & fi, bool upd)
                        di.crc_cur = sum(f);
                        lyxerr[Debug::DEPEND] << "done." << endl;
                        struct stat f_info;
-                       stat(fi.c_str(), &f_info);
+                       stat(f.toFilesystemEncoding().c_str(), &f_info);
                        di.mtime_cur = f_info.st_mtime;
                } else {
                        di.crc_cur = 0;
@@ -77,22 +78,22 @@ 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()) {
                dep_info &di = itr->second;
 
                struct stat f_info;
-               if (stat(itr->first.c_str(), &f_info) == 0) {
+               if (stat(itr->first.toFilesystemEncoding().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
@@ -112,7 +113,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;
 }
@@ -129,10 +130,8 @@ bool DepTable::sumchange() const
 }
 
 
-bool DepTable::haschanged(string const & f) const
+bool DepTable::haschanged(FileName const & fil) const
 {
-       // not quite sure if this is the correct place for MakeAbsPath
-       string const fil = MakeAbsPath(f);
        DepList::const_iterator cit = deplist.find(fil);
        if (cit != deplist.end()) {
                if (cit->second.changed())
@@ -147,7 +146,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, ext)) {
+               if (suffixIs(cit->first.absFilename(), ext)) {
                        if (cit->second.changed())
                                return true;
                }
@@ -161,7 +160,7 @@ 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, ext)) {
+               if (suffixIs(cit->first.absFilename(), ext)) {
                        return true;
                }
        }
@@ -169,7 +168,7 @@ bool DepTable::ext_exist(string const & ext) const
 }
 
 
-bool DepTable::exist(string const & fil) const
+bool DepTable::exist(FileName const & fil) const
 {
        return deplist.find(fil) != deplist.end();
 }
@@ -180,7 +179,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, 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
@@ -194,12 +193,12 @@ void DepTable::remove_files_with_extension(string const & suf)
 }
 
 
-void DepTable::remove_file(string const & filename)
+void DepTable::remove_file(FileName const & filename)
 {
        DepList::iterator cit = deplist.begin();
        DepList::iterator end = deplist.end();
        while (cit != end) {
-               if (OnlyFilename(cit->first) == filename) {
+               if (cit->first == filename) {
                        // Can't erase the current iterator, but we
                        // can increment and then erase.
                        // deplist is a map so only the erased
@@ -213,9 +212,9 @@ void DepTable::remove_file(string const & filename)
 }
 
 
-void DepTable::write(string const & f) const
+void DepTable::write(FileName const & f) const
 {
-       ofstream ofs(f.c_str());
+       ofstream ofs(f.toFilesystemEncoding().c_str());
        DepList::const_iterator cit = deplist.begin();
        DepList::const_iterator end = deplist.end();
        for (; cit != end; ++cit) {
@@ -235,9 +234,9 @@ void DepTable::write(string const & f) const
 }
 
 
-bool DepTable::read(string const & f)
+bool DepTable::read(FileName const & f)
 {
-       ifstream ifs(f.c_str());
+       ifstream ifs(f.toFilesystemEncoding().c_str());
        string nome;
        dep_info di;
        // This doesn't change through the loop.
@@ -251,7 +250,10 @@ bool DepTable::read(string const & f)
                               << di.mtime_cur << ' '
                               << nome << endl;
                }
-               deplist[nome] = di;
+               deplist[FileName(nome)] = di;
        }
        return deplist.size();
 }
+
+
+} // namespace lyx