X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxvc.C;h=835408913fea55f57274c2e2cb01f4e54d9aa795;hb=cd4033aef3a3f1efdb5a676b8bab3d367f53a830;hp=b7de1af96f0dcabd88bd6d53fb52316dff9e2ea4;hpb=43b77ba2d722cdb8a9437926f839c1dcbf3c0b89;p=lyx.git

diff --git a/src/lyxvc.C b/src/lyxvc.C
index b7de1af96f..835408913f 100644
--- 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]
 				<< "LyXVC: registering "
-				<< makeDisplayPath(filename)
+				<< to_utf8(makeDisplayPath(filename.absFilename()))
 				<< " with CVS" << endl;
 			vcs.reset(new CVS(cvs_entries, filename));
 
 		} else {
 			lyxerr[Debug::LYXVC]
 				<< "LyXVC: registering "
-				<< makeDisplayPath(filename)
+				<< to_utf8(makeDisplayPath(filename.absFilename()))
 				<< " with RCS" << endl;
 			vcs.reset(new RCS(filename));
 		}
@@ -119,16 +126,16 @@ void LyXVC::registrer()
 	}
 
 	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)")));
+	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;
 		return;
 	}
 
-	vcs->registrer(tmp.second);
+	vcs->registrer(to_utf8(tmp.second));
 }
 
 
@@ -136,12 +143,12 @@ void LyXVC::checkIn()
 {
 
 	lyxerr[Debug::LYXVC] << "LyXVC: checkIn" << endl;
-	pair<bool, string> tmp = Alert::askForText(lyx::to_utf8(_("LyX VC: Log Message")));
+	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;
 	}
@@ -160,12 +167,12 @@ void LyXVC::revert()
 {
 	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();
@@ -222,7 +229,7 @@ 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 "
 				     << tmpf << endl;
@@ -230,5 +237,8 @@ string const LyXVC::getLogFile() const
 	}
 	lyxerr[Debug::LYXVC] << "Generating logfile " << tmpf << endl;
 	vcs->getLog(tmpf);
-	return tmpf;
+	return tmpf.absFilename();
 }
+
+
+} // namespace lyx