cosmetics

[lyx.git] / src / VCBackend.cpp

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index af20123fcd77d520b784b2163e882c49f782a6ee..24076ca0f73bf133718604678ef4d4dcfb44c4a3 100644 (file)
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -16,11 +16,9 @@
 
 #include "support/Path.h"
 #include "support/filetools.h"
-#include "support/fs_extras.h"
 #include "support/lstrings.h"
 #include "support/Systemcall.h"
 
-#include <boost/filesystem/operations.hpp>
 #include <boost/regex.hpp>
 
 #include <fstream>
@@ -53,14 +51,12 @@ using std::getline;
 using std::string;
 using std::ifstream;
 
-namespace fs = boost::filesystem;
-
 
 int VCS::doVCCommand(string const & cmd, FileName const & path)
 {
        LYXERR(Debug::LYXVC) << "doVCCommand: " << cmd << endl;
        Systemcall one;
-       support::Path p(path);
+       support::PathChanger p(path);
        int const ret = one.startscript(Systemcall::Wait, cmd);
        return ret;
 }
@@ -85,21 +81,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 +248,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 +290,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