* docstream: factorize out some code and introduce odocfstream::reset()

[lyx.git] / src / LyXVC.cpp

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 8b9d7c608ea382b9969025b75b5bdbeb0cc6b9a9..2e316d6af7fa28a08c6225af65cf986d1d4f024a 100644 (file)
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -17,9 +17,9 @@
 
 #include "LyXVC.h"
 #include "VCBackend.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "Buffer.h"
-#include "gettext.h"
+#include "support/gettext.h"
 
 #include "frontends/alert.h"
 
@@ -35,9 +35,7 @@ using support::FileName;
 using support::makeAbsPath;
 using support::tempName;
 
-using std::endl;
 using std::string;
-using std::pair;
 
 namespace Alert = frontend::Alert;
 
@@ -57,13 +55,13 @@ bool LyXVC::file_found_hook(FileName const & fn)
 {
        FileName found_file;
        // Check if file is under RCS
-       if (!(found_file = RCS::find_file(fn)).empty()) {
+       if (!(found_file = RCS::findFile(fn)).empty()) {
                vcs.reset(new RCS(found_file));
                vcs->owner(owner_);
                return true;
        }
        // Check if file is under CVS
-       if (!(found_file = CVS::find_file(fn)).empty()) {
+       if (!(found_file = CVS::findFile(fn)).empty()) {
                vcs.reset(new CVS(found_file, fn));
                vcs->owner(owner_);
                return true;
@@ -76,9 +74,9 @@ bool LyXVC::file_found_hook(FileName const & fn)
 bool LyXVC::file_not_found_hook(FileName const & fn)
 {
        // Check if file is under RCS
-       if (!RCS::find_file(fn).empty())
+       if (!RCS::findFile(fn).empty())
                return true;
-       if (!CVS::find_file(fn).empty())
+       if (!CVS::findFile(fn).empty())
                return true;
        return false;
 }
@@ -95,7 +93,7 @@ void LyXVC::registrer()
        FileName const filename = owner_->fileName();
 
        // there must be a file to save
-       if (!filename.isFileReadable()) {
+       if (!filename.isReadableFile()) {
                Alert::error(_("Document not saved"),
                             _("You must save the document "
                                            "before it can be registered."));
@@ -106,7 +104,7 @@ void LyXVC::registrer()
        if (!vcs) {
                FileName const cvs_entries(makeAbsPath("CVS/Entries"));
 
-               if (cvs_entries.isFileReadable()) {
+               if (cvs_entries.isReadableFile()) {
                        LYXERR(Debug::LYXVC, "LyXVC: registering "
                                << to_utf8(filename.displayName()) << " with CVS");
                        vcs.reset(new CVS(cvs_entries, filename));