add GuiView parent to QToc for proper memory management.

[lyx.git] / src / lyxvc.C

diff --git a/src/lyxvc.C b/src/lyxvc.C
index b7de1af96f0dcabd88bd6d53fb52316dff9e2ea4..807226427ebc00a932c77eff6b6fe1d8826f9c11 100644 (file)
--- a/src/lyxvc.C
+++ b/src/lyxvc.C
@@ -26,15 +26,22 @@
 #include "support/filetools.h"
 #include "support/lyxlib.h"
 
-using lyx::support::bformat;
-using lyx::support::isFileReadable;
-using lyx::support::makeDisplayPath;
-using lyx::support::tempName;
+
+namespace lyx {
+
+using support::bformat;
+using support::FileName;
+using support::isFileReadable;
+using support::makeAbsPath;
+using support::makeDisplayPath;
+using support::tempName;
 
 using std::endl;
 using std::string;
 using std::pair;
 
+namespace Alert = frontend::Alert;
+
 
 LyXVC::LyXVC()
 {
@@ -47,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));
@@ -67,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())
@@ -86,31 +93,31 @@ 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)) {
-               Alert::error(lyx::to_utf8(_("Document not saved")),
-                            lyx::to_utf8(_("You must save the document "
-                                           "before it can be registered.")));
+               Alert::error(_("Document not saved"),
+                            _("You must save the document "
+                                           "before it can be registered."));
                return;
        }
 
        // 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(cvs_entries)) {
-                       lyxerr[Debug::LYXVC]
+                       LYXERR(Debug::LYXVC)
                                << "LyXVC: registering "
-                               << 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 "
-                               << makeDisplayPath(filename)
+                               << to_utf8(makeDisplayPath(filename.absFilename()))
                                << " with RCS" << endl;
                        vcs.reset(new RCS(filename));
                }
@@ -118,39 +125,39 @@ void LyXVC::registrer()
                vcs->owner(owner_);
        }
 
-       lyxerr[Debug::LYXVC] << "LyXVC: registrer" << endl;
-       pair<bool, string> tmp =
-               Alert::askForText(lyx::to_utf8(_("LyX VC: Initial description")),
-                          lyx::to_utf8(_("(no initial description)")));
+       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;
        }
 
-       vcs->registrer(tmp.second);
+       vcs->registrer(to_utf8(tmp.second));
 }
 
 
 void LyXVC::checkIn()
 {
 
-       lyxerr[Debug::LYXVC] << "LyXVC: checkIn" << endl;
-       pair<bool, string> tmp = Alert::askForText(lyx::to_utf8(_("LyX VC: Log Message")));
+       LYXERR(Debug::LYXVC) << "LyXVC: checkIn" << endl;
+       pair<bool, docstring> tmp = Alert::askForText(_("LyX VC: Log Message"));
        if (tmp.first) {
                if (tmp.second.empty()) {
-                       tmp.second = lyx::to_utf8(_("(no log message)"));
+                       tmp.second = _("(no log message)");
                }
-               vcs->checkIn(tmp.second);
+               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();
 }
@@ -158,14 +165,14 @@ void LyXVC::checkOut()
 
 void LyXVC::revert()
 {
-       lyxerr[Debug::LYXVC] << "LyXVC: revert" << endl;
+       LYXERR(Debug::LYXVC) << "LyXVC: revert" << endl;
 
-       string const file = makeDisplayPath(owner_->fileName(), 20);
-       string text = bformat(lyx::to_utf8(_("Reverting to the stored version of the "
+       docstring const file = makeDisplayPath(owner_->fileName(), 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);
-       int const ret = Alert::prompt(lyx::to_utf8(_("Revert to stored version of document?")),
-               text, 0, 1, lyx::to_utf8(_("&Revert")), lyx::to_utf8(_("&Cancel")));
+                                            "Do you want to revert to the saved version?"), file);
+       int const ret = Alert::prompt(_("Revert to stored version of document?"),
+               text, 0, 1, _("&Revert"), _("&Cancel"));
 
        if (ret == 0)
                vcs->revert();
@@ -182,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;
        }
@@ -222,13 +229,16 @@ 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();
 }
+
+
+} // namespace lyx