Run codespell on tex2lyx/, client/, convert/ and graphics/

[lyx.git] / src / LyXVC.cpp

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index d48031102b76436b578f667e76c9f6aa66e57f73..806d5e81436790e8bc6ed4b949fb9e68e5353443 100644 (file)
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -37,13 +37,19 @@ namespace Alert = frontend::Alert;
 
 LyXVC::LyXVC()
 {
-       owner_ = 0;
+       owner_ = nullptr;
 }
 
 
-// for the sake of boost::scoped_ptr
-LyXVC::~LyXVC()
-{}
+docstring LyXVC::vcstatus() const
+{
+       if (!vcs)
+               return docstring();
+       if (locking())
+               return bformat(_("%1$s lock"), from_ascii(vcs->vcname()));
+       else
+               return from_ascii(vcs->vcname());
+}
 
 
 bool LyXVC::fileInVC(FileName const & fn)
@@ -85,7 +91,7 @@ bool LyXVC::file_found_hook(FileName const & fn)
        }
 
        // file is not under any VCS.
-       vcs.reset(0);
+       vcs.reset(nullptr);
        return false;
 }
 
@@ -180,7 +186,7 @@ bool LyXVC::registrer()
                        _("(no initial description)"));
        if (!ok) {
                LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
-               vcs.reset(0);
+               vcs.reset(nullptr);
                return false;
        }
        if (response.empty())
@@ -256,7 +262,7 @@ string LyXVC::checkOut()
        if (!vcs)
                return string();
        //RCS allows checkOut only in ReadOnly mode
-       if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly())
+       if (vcs->toggleReadOnlyEnabled() && !owner_->hasReadonlyFlag())
                return string();
 
        LYXERR(Debug::LYXVC, "LyXVC: checkOut");
@@ -329,7 +335,7 @@ string LyXVC::toggleReadOnly()
        }
        case VCS::NOLOCKING:
                Buffer * b = vcs->owner();
-               bool const newstate = !b->isReadonly();
+               bool const newstate = !b->hasReadonlyFlag();
                string result = "LyXVC: toggle to ";
                result += (newstate ? "readonly" : "readwrite");
                LYXERR(Debug::LYXVC, result);
@@ -441,8 +447,8 @@ bool LyXVC::repoUpdateEnabled() const
 {
        return vcs && vcs->repoUpdateEnabled();
 }
-       
-       
+
+
 bool LyXVC::prepareFileRevision(string const & rev, std::string & f)
 {
        return vcs && vcs->prepareFileRevision(rev, f);