citation patch from Angus

[lyx.git] / src / lyxvc.C

diff --git a/src/lyxvc.C b/src/lyxvc.C
index 3097069d6652395bf4ad3c250e130d8188bdf171..ba4529c6dd61408ef76234b5b13095f89b962920 100644 (file)
--- a/src/lyxvc.C
+++ b/src/lyxvc.C
@@ -17,6 +17,8 @@
 #include "lyxfunc.h"
 #include "LyXView.h"
 
+using std::endl;
+using std::pair;
 
 LyXVC::LyXVC()
 {
@@ -33,9 +35,7 @@ LyXVC::~LyXVC()
                        fl_hide_form(browser->LaTeXLog);
                fl_free_form(browser->LaTeXLog);
        }
-       if (vcs) {
-               delete vcs;
-       }
+       delete vcs;
 }
 
 
@@ -102,8 +102,9 @@ void LyXVC::registrer()
        }
 
        lyxerr[Debug::LYXVC] << "LyXVC: registrer" << endl;
-       pair<bool, string> tmp = askForText(_("LyX VC: Initial description"),
-                                           _("(no initial description)"));
+       pair<bool, string> tmp =
+               askForText(_("LyX VC: Initial description"),
+                          _("(no initial description)"));
        if (!tmp.first || tmp.second.empty()) {
                // should we insist on checking tmp.second.empty()?
                lyxerr[Debug::LYXVC] << "LyXVC: user cancelled" << endl;
@@ -184,7 +185,7 @@ void LyXVC::undoLast()
 
 void LyXVC::toggleReadOnly()
 {
-       switch (vcs->stat()) {
+       switch (vcs->status()) {
        case VCS::UNLOCKED:
                lyxerr[Debug::LYXVC] << "LyXVC: toggle to locked" << endl;
                checkOut();