prepare Qt 5.6 builds

[lyx.git] / src / DepTable.cpp

diff --git a/src/DepTable.cpp b/src/DepTable.cpp
index b37f9141509f41e6d6891de056678fb99980d895..835130717fc253a33a74d343a95ddd70718210ee 100644 (file)
--- 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"
@@ -25,13 +24,10 @@
 #include <fstream>
 
 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
@@ -112,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;
 }
@@ -134,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;
                }
@@ -148,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;
 }
@@ -167,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