New XHTML math options. Format change.

[lyx.git] / src / LyXVC.cpp

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 168bf55782cec6867d915c2ef152f635948414ec..5d3a49fdd935e29e07e36f2c6da73e7b3c9395e1 100644 (file)
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -80,7 +80,7 @@ bool LyXVC::file_not_found_hook(FileName const & fn)
        // Seems there is no reasonable scenario for adding implementation
        // of retrieve for cvs or svn.
        if (!RCS::findFile(fn).empty()) {       
-               docstring const file = makeDisplayPath(fn.absFilename(), 20);
+               docstring const file = makeDisplayPath(fn.absFileName(), 20);
                docstring const text =
                        bformat(_("Do you want to retrieve the document"
                                                   " %1$s from version control?"), file);
@@ -120,8 +120,8 @@ bool LyXVC::registrer()
        // it is very likely here that the vcs is not created yet...
        if (!vcs) {
                //check in the root directory of the document
-               FileName const cvs_entries(onlyPath(filename.absFilename()) + "/CVS/Entries");
-               FileName const svn_entries(onlyPath(filename.absFilename()) + "/.svn/entries");
+               FileName const cvs_entries(onlyPath(filename.absFileName()) + "/CVS/Entries");
+               FileName const svn_entries(onlyPath(filename.absFileName()) + "/.svn/entries");
 
                if (svn_entries.isReadableFile()) {
                        LYXERR(Debug::LYXVC, "LyXVC: registering "
@@ -182,7 +182,8 @@ string LyXVC::checkIn()
 string LyXVC::checkOut()
 {
        //RCS allows checkOut only in ReadOnly mode
-       if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly()) return string();
+       if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly())
+               return string();
 
        LYXERR(Debug::LYXVC, "LyXVC: checkOut");
        return vcs->checkOut();
@@ -277,7 +278,7 @@ string const LyXVC::getLogFile() const
        }
        LYXERR(Debug::LYXVC, "Generating logfile " << tmpf);
        vcs->getLog(tmpf);
-       return tmpf.absFilename();
+       return tmpf.absFileName();
 }