New XHTML math options. Format change.

[lyx.git] / src / LyXVC.cpp

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index b33459a0dadd5aaa9ea7074eefd13bb2e75266f5..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();
@@ -253,21 +254,15 @@ bool LyXVC::inUse() const
 }
 
 
-//string const & LyXVC::version() const
-//{
-//     return vcs->version();
-//}
-
-
 string const LyXVC::versionString() const
 {
        return vcs->versionString();
 }
 
 
-string const & LyXVC::locker() const
+bool LyXVC::locking() const
 {
-       return vcs->locker();
+       return vcs->status() != VCS::NOLOCKING;
 }
 
 
@@ -283,11 +278,11 @@ string const LyXVC::getLogFile() const
        }
        LYXERR(Debug::LYXVC, "Generating logfile " << tmpf);
        vcs->getLog(tmpf);
-       return tmpf.absFilename();
+       return tmpf.absFileName();
 }
 
 
-std::string const LyXVC::revisionInfo(RevisionInfo const info)
+std::string LyXVC::revisionInfo(RevisionInfo const info)
 {
        if (!vcs)
                return string();
@@ -319,5 +314,15 @@ bool LyXVC::undoLastEnabled() const
        return vcs && vcs->undoLastEnabled();
 }
 
+bool LyXVC::prepareFileRevision(string const & rev, std::string & f)
+{
+       return vcs && vcs->prepareFileRevision(rev, f);
+}
+
+
+bool LyXVC::prepareFileRevisionEnabled()
+{
+       return vcs && vcs->prepareFileRevisionEnabled();
+}
 
 } // namespace lyx