-using lyx::support::bformat;
-using lyx::support::IsFileReadable;
-using lyx::support::MakeDisplayPath;
-using lyx::support::tempName;
+
+namespace lyx {
+
+using support::bformat;
+using support::isFileReadable;
+using support::makeDisplayPath;
+using support::tempName;
Alert::error(_("Document not saved"),
_("You must save the document "
Alert::error(_("Document not saved"),
_("You must save the document "
Alert::askForText(_("LyX VC: Initial description"),
_("(no initial description)"));
if (!tmp.first || tmp.second.empty()) {
Alert::askForText(_("LyX VC: Initial description"),
_("(no initial description)"));
if (!tmp.first || tmp.second.empty()) {
- string const file = MakeDisplayPath(owner_->fileName(), 20);
- string text = bformat(_("Reverting to the stored version of the "
+ docstring const file = makeDisplayPath(owner_->fileName(), 20);
+ docstring text = bformat(_("Reverting to the stored version of the "
int const ret = Alert::prompt(_("Revert to stored version of document?"),
text, 0, 1, _("&Revert"), _("&Cancel"));
int const ret = Alert::prompt(_("Revert to stored version of document?"),
text, 0, 1, _("&Revert"), _("&Cancel"));
string tmpf = tempName(string(), "lyxvclog");
if (tmpf.empty()) {
lyxerr[Debug::LYXVC] << "Could not generate logfile "
string tmpf = tempName(string(), "lyxvclog");
if (tmpf.empty()) {
lyxerr[Debug::LYXVC] << "Could not generate logfile "