Amend 3093789e for cmake build

[lyx.git] / src / VCBackend.cpp

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index 42fd36be318c17358fb5cb8f7b87198cede63a93..bee398cc4eb6dc4cd866b3cb7c7c5f1bd74e38b2 100644 (file)
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -13,7 +13,6 @@
 
 #include "VCBackend.h"
 #include "Buffer.h"
-#include "DispatchResult.h"
 #include "LyX.h"
 #include "FuncRequest.h"
 
@@ -971,7 +970,7 @@ string CVS::repoUpdate()
                        dispatch(FuncRequest(LFUN_DIALOG_SHOW, "file " + tmpf.absFileName()));
                        ret = frontend::Alert::prompt(_("Changes detected"),
                                text, 0, 1, _("&Continue"), _("&Abort"));
-                       hideDialogs("file", 0);
+                       hideDialogs("file", nullptr);
                }
                if (ret == 1)
                        return string();
@@ -1156,7 +1155,7 @@ SVN::SVN(FileName const & m, Buffer * b) : VCS(b)
        // Here we know that the buffer file is either already in SVN or
        // about to be registered
        master_ = m;
-       locked_mode_ = 0;
+       locked_mode_ = false;
        scanMaster();
 }
 
@@ -1532,7 +1531,7 @@ string SVN::repoUpdate()
                        dispatch(FuncRequest(LFUN_DIALOG_SHOW, "file " + tmpf.absFileName()));
                        ret = frontend::Alert::prompt(_("Changes detected"),
                                text, 0, 1, _("&Yes"), _("&No"));
-                       hideDialogs("file", 0);
+                       hideDialogs("file", nullptr);
                }
                if (ret == 1)
                        return string();