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

diff --git a/src/lyxvc.C b/src/lyxvc.C
index 49b69ad94c..6e4d421eee 100644
--- a/src/lyxvc.C
+++ b/src/lyxvc.C
@@ -26,17 +26,20 @@
 #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::isFileReadable;
+using support::makeDisplayPath;
+using support::tempName;
 
 using std::endl;
 using std::string;
 using std::pair;
 
+namespace Alert = frontend::Alert;
+
 
 LyXVC::LyXVC()
 {
@@ -105,14 +108,14 @@ void LyXVC::registrer()
 		if (isFileReadable(cvs_entries)) {
 			lyxerr[Debug::LYXVC]
 				<< "LyXVC: registering "
-				<< lyx::to_utf8(makeDisplayPath(filename))
+				<< to_utf8(makeDisplayPath(filename))
 				<< " 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))
 				<< " with RCS" << endl;
 			vcs.reset(new RCS(filename));
 		}
@@ -130,7 +133,7 @@ void LyXVC::registrer()
 		return;
 	}
 
-	vcs->registrer(lyx::to_utf8(tmp.second));
+	vcs->registrer(to_utf8(tmp.second));
 }
 
 
@@ -143,7 +146,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;
 	}
@@ -234,3 +237,6 @@ string const LyXVC::getLogFile() const
 	vcs->getLog(tmpf);
 	return tmpf;
 }
+
+
+} // namespace lyx