From: André Pönitz Date: Sat, 3 Nov 2007 17:56:29 +0000 (+0000) Subject: cosmetics X-Git-Tag: 1.6.10~7499 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=5b396fd1492d3679d764d133c09a5be06cb16d1b;p=lyx.git cosmetics git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21405 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp index af20123fcd..a405d2cf29 100644 --- a/src/VCBackend.cpp +++ b/src/VCBackend.cpp @@ -20,7 +20,6 @@ #include "support/lstrings.h" #include "support/Systemcall.h" -#include #include #include @@ -53,8 +52,6 @@ using std::getline; using std::string; using std::ifstream; -namespace fs = boost::filesystem; - int VCS::doVCCommand(string const & cmd, FileName const & path) { @@ -85,21 +82,22 @@ FileName const RCS::find_file(FileName const & file) FileName tmp(file.absFilename() + ",v"); LYXERR(Debug::LYXVC) << "Checking if file is under rcs: " << tmp << endl; - if (fs::is_readable(tmp.toFilesystemEncoding())) { + if (tmp.isReadable()) { LYXERR(Debug::LYXVC) << "Yes " << file << " is under rcs." << endl; return tmp; - } else { - // 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 << endl; - if (fs::is_readable(tmp.toFilesystemEncoding())) { - LYXERR(Debug::LYXVC) << "Yes " << file - << " it is under rcs."<< endl; - return tmp; - } } + + // 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 << endl; + if (tmp.isReadable()) { + LYXERR(Debug::LYXVC) << "Yes " << file + << " it is under rcs."<< endl; + return tmp; + } + return FileName(); } @@ -251,7 +249,7 @@ FileName const CVS::find_file(FileName const & file) string const tmpf = '/' + onlyFilename(file.absFilename()) + '/'; LYXERR(Debug::LYXVC) << "LyXVC: checking in `" << dir << "' for `" << tmpf << '\'' << endl; - if (fs::is_readable(dir.toFilesystemEncoding())) { + if (dir.isReadable()) { // 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. @@ -293,7 +291,7 @@ void CVS::scanMaster() //sm[4]; // options //sm[5]; // tag or tagdate // FIXME: must double check file is stattable/existing - time_t mod = fs::last_write_time(file_.toFilesystemEncoding()); + time_t mod = file_.lastModified(); string mod_date = rtrim(asctime(gmtime(&mod)), "\n"); LYXERR(Debug::LYXVC) << "Date in Entries: `" << file_date