fix merged build

[lyx.git] / src / LyXVC.cpp

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 7b44efa19d9fd6a9a83f3bd7a17583de8c89e216..4acdd399723da9edc8c81c8d3700c5559d444b53 100644 (file)
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -170,6 +170,20 @@ string LyXVC::checkOut()
 }
 
 
+string LyXVC::repoSynchro()
+{
+       LYXERR(Debug::LYXVC, "LyXVC: repoSynchro");
+       return vcs->repoSynchro();
+}
+
+
+string LyXVC::lockingToggle()
+{
+       LYXERR(Debug::LYXVC, "LyXVC: toggle locking property");
+       return vcs->lockingToggle();
+}
+
+
 void LyXVC::revert()
 {
        LYXERR(Debug::LYXVC, "LyXVC: revert");
@@ -206,7 +220,7 @@ void LyXVC::toggleReadOnly()
                LYXERR(Debug::LYXVC, "LyXVC: toggle to unlocked");
                checkIn();
                break;
-       default:
+       case VCS::NOLOCKING:
                break;
        }
 }
@@ -266,6 +280,12 @@ bool LyXVC::checkInEnabled()
 }
 
 
+bool LyXVC::lockingToggleEnabled()
+{
+       return vcs && vcs->lockingToggleEnabled();
+}
+
+
 bool LyXVC::undoLastEnabled()
 {
        return vcs && vcs->undoLastEnabled();