Fix loop when opening TOC widget in an empty document, basically by Richard Heck.

[lyx.git] / src / lyxvc.C

diff --git a/src/lyxvc.C b/src/lyxvc.C
index 73c8452460506bb4a046ea011f5ac522c4211e0c..807226427ebc00a932c77eff6b6fe1d8826f9c11 100644 (file)
--- a/src/lyxvc.C
+++ b/src/lyxvc.C
@@ -54,9 +54,9 @@ LyXVC::~LyXVC()
 {}
 
 
-bool LyXVC::file_found_hook(string const & fn)
+bool LyXVC::file_found_hook(FileName const & fn)
 {
-       string found_file;
+       FileName found_file;
        // Check if file is under RCS
        if (!(found_file = RCS::find_file(fn)).empty()) {
                vcs.reset(new RCS(found_file));
@@ -74,7 +74,7 @@ bool LyXVC::file_found_hook(string const & fn)
 }
 
 
-bool LyXVC::file_not_found_hook(string const & fn)
+bool LyXVC::file_not_found_hook(FileName const & fn)
 {
        // Check if file is under RCS
        if (!RCS::find_file(fn).empty())
@@ -93,10 +93,10 @@ void LyXVC::buffer(Buffer * buf)
 
 void LyXVC::registrer()
 {
-       string const filename = owner_->fileName();
+       FileName const filename(owner_->fileName());
 
        // there must be a file to save
-       if (!isFileReadable(FileName(makeAbsPath(filename)))) {
+       if (!isFileReadable(filename)) {
                Alert::error(_("Document not saved"),
                             _("You must save the document "
                                            "before it can be registered."));
@@ -105,19 +105,19 @@ void LyXVC::registrer()
 
        // it is very likely here that the vcs is not created yet...
        if (!vcs) {
-               string const cvs_entries = "CVS/Entries";
+               FileName const cvs_entries(makeAbsPath("CVS/Entries"));
 
-               if (isFileReadable(FileName(makeAbsPath(cvs_entries)))) {
-                       lyxerr[Debug::LYXVC]
+               if (isFileReadable(cvs_entries)) {
+                       LYXERR(Debug::LYXVC)
                                << "LyXVC: registering "
-                               << to_utf8(makeDisplayPath(filename))
+                               << to_utf8(makeDisplayPath(filename.absFilename()))
                                << " with CVS" << endl;
                        vcs.reset(new CVS(cvs_entries, filename));
 
                } else {
-                       lyxerr[Debug::LYXVC]
+                       LYXERR(Debug::LYXVC)
                                << "LyXVC: registering "
-                               << to_utf8(makeDisplayPath(filename))
+                               << to_utf8(makeDisplayPath(filename.absFilename()))
                                << " with RCS" << endl;
                        vcs.reset(new RCS(filename));
                }
@@ -125,13 +125,13 @@ void LyXVC::registrer()
                vcs->owner(owner_);
        }
 
-       lyxerr[Debug::LYXVC] << "LyXVC: registrer" << endl;
+       LYXERR(Debug::LYXVC) << "LyXVC: registrer" << endl;
        pair<bool, docstring> tmp =
                Alert::askForText(_("LyX VC: Initial description"),
                           _("(no initial description)"));
        if (!tmp.first || tmp.second.empty()) {
                // should we insist on checking tmp.second.empty()?
-               lyxerr[Debug::LYXVC] << "LyXVC: user cancelled" << endl;
+               LYXERR(Debug::LYXVC) << "LyXVC: user cancelled" << endl;
                return;
        }
 
@@ -142,7 +142,7 @@ void LyXVC::registrer()
 void LyXVC::checkIn()
 {
 
-       lyxerr[Debug::LYXVC] << "LyXVC: checkIn" << endl;
+       LYXERR(Debug::LYXVC) << "LyXVC: checkIn" << endl;
        pair<bool, docstring> tmp = Alert::askForText(_("LyX VC: Log Message"));
        if (tmp.first) {
                if (tmp.second.empty()) {
@@ -150,14 +150,14 @@ void LyXVC::checkIn()
                }
                vcs->checkIn(to_utf8(tmp.second));
        } else {
-               lyxerr[Debug::LYXVC] << "LyXVC: user cancelled" << endl;
+               LYXERR(Debug::LYXVC) << "LyXVC: user cancelled" << endl;
        }
 }
 
 
 void LyXVC::checkOut()
 {
-       lyxerr[Debug::LYXVC] << "LyXVC: checkOut" << endl;
+       LYXERR(Debug::LYXVC) << "LyXVC: checkOut" << endl;
 
        vcs->checkOut();
 }
@@ -165,7 +165,7 @@ void LyXVC::checkOut()
 
 void LyXVC::revert()
 {
-       lyxerr[Debug::LYXVC] << "LyXVC: revert" << endl;
+       LYXERR(Debug::LYXVC) << "LyXVC: revert" << endl;
 
        docstring const file = makeDisplayPath(owner_->fileName(), 20);
        docstring text = bformat(_("Reverting to the stored version of the "
@@ -189,11 +189,11 @@ void LyXVC::toggleReadOnly()
 {
        switch (vcs->status()) {
        case VCS::UNLOCKED:
-               lyxerr[Debug::LYXVC] << "LyXVC: toggle to locked" << endl;
+               LYXERR(Debug::LYXVC) << "LyXVC: toggle to locked" << endl;
                checkOut();
                break;
        case VCS::LOCKED:
-               lyxerr[Debug::LYXVC] << "LyXVC: toggle to unlocked" << endl;
+               LYXERR(Debug::LYXVC) << "LyXVC: toggle to unlocked" << endl;
                checkIn();
                break;
        }
@@ -229,15 +229,15 @@ string const LyXVC::getLogFile() const
        if (!vcs)
                return string();
 
-       string tmpf = tempName(string(), "lyxvclog");
+       FileName const tmpf(tempName(FileName(), "lyxvclog"));
        if (tmpf.empty()) {
-               lyxerr[Debug::LYXVC] << "Could not generate logfile "
+               LYXERR(Debug::LYXVC) << "Could not generate logfile "
                                     << tmpf << endl;
                return string();
        }
-       lyxerr[Debug::LYXVC] << "Generating logfile " << tmpf << endl;
+       LYXERR(Debug::LYXVC) << "Generating logfile " << tmpf << endl;
        vcs->getLog(tmpf);
-       return tmpf;
+       return tmpf.absFilename();
 }