another pesky \#warning snuck in

[lyx.git] / src / DepTable.C

diff --git a/src/DepTable.C b/src/DepTable.C
index 856a07ef429db6ff9dfac61916fb250367c198c6..bd70a1971a381c3ea4234603f53f63fac0e615e0 100644 (file)
--- a/src/DepTable.C
+++ b/src/DepTable.C
@@ -2,10 +2,10 @@
  * ====================================================== 
  * 
  *           LyX, The Document Processor
- *          Copyright (C) 1995 Matthias Ettrich
- *           Copyright (C) 1995-1998 The LyX Team.
+ *          Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2000 The LyX Team.
  *
- *           This file is Copyright (C) 1996-1998
+ *           This file is Copyright 1996-2000
  *           Lars Gullik Bjønnes
  *
  * ====================================================== 
@@ -21,9 +21,11 @@
 #include "support/lyxlib.h"
 #include "support/filetools.h"
 #include <fstream>
+
 using std::make_pair;
 using std::ofstream;
 using std::ifstream;
+using std::endl;
 
 void DepTable::insert(string const & fi,
                      bool upd,
@@ -35,7 +37,7 @@ void DepTable::insert(string const & fi,
        if (deplist.find(f) == deplist.end()) {
                if (upd) {
                        one = two;
-                       two = lyxsum(f.c_str());
+                       two = lyx::sum(f);
                }
                deplist[f] = make_pair(one, two);
        }
@@ -44,15 +46,18 @@ void DepTable::insert(string const & fi,
 
 void DepTable::update()
 {
-       for(DepList::iterator itr = deplist.begin();
+       for (DepList::iterator itr = deplist.begin();
            itr != deplist.end();
            ++itr) {
-               unsigned long one = (*itr).second.second;
-               unsigned long two = lyxsum((*itr).first.c_str());
+               unsigned long const one = (*itr).second.second;
+               unsigned long const two = lyx::sum((*itr).first);
                (*itr).second = make_pair(one, two);
-               if (lyxerr.debugging()) {
-                       lyxerr << "update: " << (*itr).first << " "
-                              << one << " " << two << endl;
+               if (lyxerr.debugging(Debug::DEPEND)) {
+                       lyxerr << "Update dep: " << (*itr).first << " "
+                              << one << " " << two;
+                       if (one != two)
+                               lyxerr << " +";
+                       lyxerr << endl;
                }
        }
 }
@@ -88,12 +93,11 @@ bool DepTable::extchanged(string const & ext) const
        for (DepList::const_iterator cit = deplist.begin();
             cit != deplist.end();
             ++cit) {
-               if (suffixIs((*cit).first, ext.c_str())) {
+               if (suffixIs((*cit).first, ext)) {
                        if ((*cit).second.first != (*cit).second.second)
                                return true;
                }
        }
-                    
        return false;
 }
 
@@ -109,13 +113,13 @@ bool DepTable::exist(string const & fil) const
 void DepTable::remove_files_with_extension(string const & suf)
 {
        DepList tmp;
-       for (DepList::const_iterator cit = deplist.begin();
+       // we want const_iterator (Lgb)
+       for (DepList::iterator cit = deplist.begin();
             cit != deplist.end(); ++cit) {
-               if (!suffixIs((*cit).first, suf.c_str()))
+               if (!suffixIs((*cit).first, suf))
                        tmp[(*cit).first] = (*cit).second;
        }
        deplist.swap(tmp);
-       
 }
 
 
@@ -123,9 +127,8 @@ void DepTable::write(string const & f) const
 {
        ofstream ofs(f.c_str());
        for (DepList::const_iterator cit = deplist.begin();
-            cit != deplist.end();
-            ++cit) {
-               if (lyxerr.debugging()) {
+            cit != deplist.end(); ++cit) {
+               if (lyxerr.debugging(Debug::DEPEND)) {
                        lyxerr << "Write dep: "
                               << (*cit).first << " "
                               << (*cit).second.first << " "
@@ -145,8 +148,8 @@ void DepTable::read(string const & f)
        unsigned long one = 0;
        unsigned long two = 0;
        while(ifs >> nome >> one >> two) {
-               if (lyxerr.debugging()) {
-                       lyxerr << "read dep: "
+               if (lyxerr.debugging(Debug::DEPEND)) {
+                       lyxerr << "Read dep: "
                               << nome << " "
                               << one << " "
                               << two << endl;