Further cleanup of InsetFlex, InsetCollapsable and InsetLayout:

[lyx.git] / src / LyXVC.cpp

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index cb82337f72776c420c75bc20479edf58ab28b373..fca70971f5226fc545f40f835d7a86d26217f686 100644 (file)
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -31,7 +31,6 @@ namespace lyx {
 
 using support::bformat;
 using support::FileName;
-using support::isFileReadable;
 using support::makeAbsPath;
 using support::makeDisplayPath;
 using support::tempName;
@@ -85,7 +84,7 @@ bool LyXVC::file_not_found_hook(FileName const & fn)
 }
 
 
-void LyXVC::buffer(Buffer * buf)
+void LyXVC::setBuffer(Buffer * buf)
 {
        owner_ = buf;
 }
@@ -93,10 +92,10 @@ void LyXVC::buffer(Buffer * buf)
 
 void LyXVC::registrer()
 {
-       FileName const filename(owner_->fileName());
+       FileName const filename(owner_->absFileName());
 
        // there must be a file to save
-       if (!isFileReadable(filename)) {
+       if (!filename.isFileReadable()) {
                Alert::error(_("Document not saved"),
                             _("You must save the document "
                                            "before it can be registered."));
@@ -107,7 +106,7 @@ void LyXVC::registrer()
        if (!vcs) {
                FileName const cvs_entries(makeAbsPath("CVS/Entries"));
 
-               if (isFileReadable(cvs_entries)) {
+               if (cvs_entries.isFileReadable()) {
                        LYXERR(Debug::LYXVC)
                                << "LyXVC: registering "
                                << to_utf8(makeDisplayPath(filename.absFilename()))
@@ -167,7 +166,7 @@ void LyXVC::revert()
 {
        LYXERR(Debug::LYXVC) << "LyXVC: revert" << endl;
 
-       docstring const file = makeDisplayPath(owner_->fileName(), 20);
+       docstring const file = makeDisplayPath(owner_->absFileName(), 20);
        docstring text = bformat(_("Reverting to the stored version of the "
                "document %1$s will lose all current changes.\n\n"
                                             "Do you want to revert to the saved version?"), file);
@@ -202,7 +201,8 @@ void LyXVC::toggleReadOnly()
 
 bool LyXVC::inUse()
 {
-       if (vcs) return true;
+       if (vcs)
+               return true;
        return false;
 }
 
@@ -212,6 +212,7 @@ bool LyXVC::inUse()
 //     return vcs->version();
 //}
 
+
 string const LyXVC::versionString() const
 {
        return vcs->versionString();