X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDepTable.cpp;h=835130717fc253a33a74d343a95ddd70718210ee;hb=4be1b1a2a4f475297088820279494aa12aa3859d;hp=8ebb08aa06a04da7ea1dea156eb8f116d4236572;hpb=377ae30bd8dd025e6e676691b9142c086aad87e9;p=lyx.git diff --git a/src/DepTable.cpp b/src/DepTable.cpp index 8ebb08aa06..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 * @@ -15,7 +15,6 @@ #include "DepTable.h" #include "support/debug.h" -#include "support/lyxlib.h" #include "support/filetools.h" #include "support/lstrings.h" #include "support/lyxtime.h" @@ -24,20 +23,11 @@ #include -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; inline bool DepTable::dep_info::changed() const @@ -118,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; } @@ -140,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; } @@ -154,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; } @@ -173,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