hopefully fix tex2lyx linking.

[lyx.git] / src / DepTable.C

diff --git a/src/DepTable.C b/src/DepTable.C
index 2718bcacf934fb4d4565f341fa376f4bcb95ebe4..3de886dcda8a81ef070cc85f9d7212d5de34dd77 100644 (file)
--- a/src/DepTable.C
+++ b/src/DepTable.C
@@ -25,15 +25,18 @@
 
 #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::ltrim;
+using support::makeAbsPath;
+using support::onlyFilename;
+using support::suffixIs;
+using support::sum;
 
 using std::endl;
 using std::flush;
@@ -52,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;
@@ -77,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()) {
@@ -112,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;
 }
@@ -132,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())
@@ -199,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
@@ -255,3 +258,6 @@ bool DepTable::read(string const & f)
        }
        return deplist.size();
 }
+
+
+} // namespace lyx