X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FVCBackend.cpp;h=0fd2094822a42b5a09ba3afa5273ffe968e496b7;hb=8c6ac457ecc69f57ab54cd8c9b8b7893607c65d6;hp=01ad8378e20c05eab595fed9d4b66f7bc6fa3342;hpb=e1ce2f92db49d50c688414a32944be8e718faa2e;p=lyx.git diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp index 01ad8378e2..0fd2094822 100644 --- a/src/VCBackend.cpp +++ b/src/VCBackend.cpp @@ -11,7 +11,7 @@ #include #include "VCBackend.h" -#include "debug.h" +#include "support/debug.h" #include "Buffer.h" #include "support/Path.h" @@ -75,12 +75,12 @@ RCS::RCS(FileName const & m) } -FileName const RCS::find_file(FileName const & file) +FileName const RCS::findFile(FileName const & file) { // Check if *,v exists. FileName tmp(file.absFilename() + ",v"); LYXERR(Debug::LYXVC, "Checking if file is under rcs: " << tmp); - if (tmp.isReadable()) { + if (tmp.isReadableFile()) { LYXERR(Debug::LYXVC, "Yes " << file << " is under rcs."); return tmp; } @@ -88,7 +88,7 @@ FileName const RCS::find_file(FileName const & file) // Check if RCS/*,v exists. tmp = FileName(addName(addPath(onlyPath(file.absFilename()), "RCS"), file.absFilename()) + ",v"); LYXERR(Debug::LYXVC, "Checking if file is under rcs: " << tmp); - if (tmp.isReadable()) { + if (tmp.isReadableFile()) { LYXERR(Debug::LYXVC, "Yes " << file << " it is under rcs."); return tmp; } @@ -232,7 +232,7 @@ CVS::CVS(FileName const & m, FileName const & f) } -FileName const CVS::find_file(FileName const & file) +FileName const CVS::findFile(FileName const & file) { // First we look for the CVS/Entries in the same dir // where we have file. @@ -240,7 +240,7 @@ FileName const CVS::find_file(FileName const & file) string const tmpf = '/' + onlyFilename(file.absFilename()) + '/'; LYXERR(Debug::LYXVC, "LyXVC: checking in `" << dir << "' for `" << tmpf << '\''); - if (dir.isReadable()) { + if (dir.isReadableDirectory()) { // Ok we are at least in a CVS dir. Parse the CVS/Entries // and see if we can find this file. We do a fast and // dirty parse here.