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

diff --git a/src/lyxvc.C b/src/lyxvc.C
index 49b69ad94c..835408913f 100644
--- a/src/lyxvc.C
+++ b/src/lyxvc.C
@@ -26,17 +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;
 
-using lyx::docstring;
+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()
 {
@@ -49,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));
@@ -69,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())
@@ -88,7 +93,7 @@ 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)) {
@@ -100,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(cvs_entries)) {
 			lyxerr[Debug::LYXVC]
 				<< "LyXVC: registering "
-				<< lyx::to_utf8(makeDisplayPath(filename))
+				<< to_utf8(makeDisplayPath(filename.absFilename()))
 				<< " with CVS" << endl;
 			vcs.reset(new CVS(cvs_entries, filename));
 
 		} else {
 			lyxerr[Debug::LYXVC]
 				<< "LyXVC: registering "
-				<< lyx::to_utf8(makeDisplayPath(filename))
+				<< to_utf8(makeDisplayPath(filename.absFilename()))
 				<< " with RCS" << endl;
 			vcs.reset(new RCS(filename));
 		}
@@ -130,7 +135,7 @@ void LyXVC::registrer()
 		return;
 	}
 
-	vcs->registrer(lyx::to_utf8(tmp.second));
+	vcs->registrer(to_utf8(tmp.second));
 }
 
 
@@ -143,7 +148,7 @@ void LyXVC::checkIn()
 		if (tmp.second.empty()) {
 			tmp.second = _("(no log message)");
 		}
-		vcs->checkIn(lyx::to_utf8(tmp.second));
+		vcs->checkIn(to_utf8(tmp.second));
 	} else {
 		lyxerr[Debug::LYXVC] << "LyXVC: user cancelled" << endl;
 	}
@@ -224,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;
@@ -232,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