Pure HTML output for math macros.

[lyx.git] / src / LyXVC.cpp

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index b33459a0dadd5aaa9ea7074eefd13bb2e75266f5..36b612190d9f05887d910edbaf10dd00fd3ab519 100644 (file)
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -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;
 }
 
 
@@ -287,7 +282,7 @@ string const LyXVC::getLogFile() const
 }
 
 
-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