remove noload/don't typeset

[lyx.git] / src / lyxvc.C

diff --git a/src/lyxvc.C b/src/lyxvc.C
index a181ec96b4da783e6e44bc9ce16eef974a93c51e..595c9bb72ce1afc0fe2dfda5cda8c89e02abb6d7 100644 (file)
--- a/src/lyxvc.C
+++ b/src/lyxvc.C
@@ -9,8 +9,8 @@
 #include "debug.h"
 #include "buffer.h"
 #include "BufferView.h"
-#include "lyxfunc.h"
 #include "gettext.h"
+#include "funcrequest.h"
 
 #include "frontends/Alert.h"
 #include "frontends/LyXView.h"
@@ -108,19 +108,18 @@ void LyXVC::registrer()
        }
 
        // If the document is changed, we might want to save it
-       if (!vcs->owner()->isLyxClean() &&
+       if (!vcs->owner()->isClean() &&
            Alert::askQuestion(_("Changes in document:"),
                        MakeDisplayPath(filename, 50),
                        _("Save document and proceed?"))) {
                vcs->owner()->getUser()->owner()
-                       ->getLyXFunc()->dispatch(LFUN_MENUWRITE);
+                       ->dispatch(FuncRequest(LFUN_MENUWRITE));
        }
 
        // Maybe the save fails, or we answered "no". In both cases,
        // the document will be dirty, and we abort.
-       if (!vcs->owner()->isLyxClean()) {
+       if (!vcs->owner()->isClean())
                return;
-       }
 
        lyxerr[Debug::LYXVC] << "LyXVC: registrer" << endl;
        pair<bool, string> tmp =
@@ -141,19 +140,18 @@ void LyXVC::registrer()
 void LyXVC::checkIn()
 {
        // If the document is changed, we might want to save it
-       if (!vcs->owner()->isLyxClean() &&
+       if (!vcs->owner()->isClean() &&
            Alert::askQuestion(_("Changes in document:"),
                        MakeDisplayPath(vcs->owner()->fileName(), 50),
                        _("Save document and proceed?"))) {
                vcs->owner()->getUser()->owner()
-                       ->getLyXFunc()->dispatch(LFUN_MENUWRITE);
+                       ->dispatch(FuncRequest(LFUN_MENUWRITE));
        }
 
        // Maybe the save fails, or we answered "no". In both cases,
        // the document will be dirty, and we abort.
-       if (!vcs->owner()->isLyxClean()) {
+       if (!vcs->owner()->isClean())
                return;
-       }
 
        lyxerr[Debug::LYXVC] << "LyXVC: checkIn" << endl;
        pair<bool, string> tmp = Alert::askForText(_("LyX VC: Log Message"));
@@ -171,7 +169,7 @@ void LyXVC::checkIn()
 void LyXVC::checkOut()
 {
        lyxerr[Debug::LYXVC] << "LyXVC: checkOut" << endl;
-       if (!vcs->owner()->isLyxClean()
+       if (!vcs->owner()->isClean()
            && !Alert::askQuestion(_("Changes in document:"),
                           MakeDisplayPath(vcs->owner()->fileName(), 50),
                           _("Ignore changes and proceed with check out?"))) {