X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXVC.cpp;h=36b612190d9f05887d910edbaf10dd00fd3ab519;hb=b8550d11e836e857967a31250e6ca248b2d43f82;hp=1c08863f1ebff00f03d16bc027e5c3187730417c;hpb=4c5ba07a7aa2f00c5b92aa6808f82672f1d313d5;p=lyx.git

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 1c08863f1e..36b612190d 100644
--- 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;
 }
 
 
@@ -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