#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::isFileReadable;
+using support::makeDisplayPath;
+using support::tempName;
using std::endl;
using std::string;
using std::pair;
+namespace Alert = frontend::Alert;
+
LyXVC::LyXVC()
{
if (!isFileReadable(filename)) {
Alert::error(_("Document not saved"),
_("You must save the document "
- "before it can be registered."));
+ "before it can be registered."));
return;
}
if (isFileReadable(cvs_entries)) {
lyxerr[Debug::LYXVC]
<< "LyXVC: registering "
- << MakeDisplayPath(filename)
+ << to_utf8(makeDisplayPath(filename))
<< " with CVS" << endl;
vcs.reset(new CVS(cvs_entries, filename));
} else {
lyxerr[Debug::LYXVC]
<< "LyXVC: registering "
- << MakeDisplayPath(filename)
+ << to_utf8(makeDisplayPath(filename))
<< " with RCS" << endl;
vcs.reset(new RCS(filename));
}
}
lyxerr[Debug::LYXVC] << "LyXVC: registrer" << endl;
- pair<bool, string> tmp =
+ pair<bool, docstring> tmp =
Alert::askForText(_("LyX VC: Initial description"),
_("(no initial description)"));
if (!tmp.first || tmp.second.empty()) {
return;
}
- vcs->registrer(tmp.second);
+ vcs->registrer(to_utf8(tmp.second));
}
{
lyxerr[Debug::LYXVC] << "LyXVC: checkIn" << endl;
- pair<bool, string> tmp = Alert::askForText(_("LyX VC: Log Message"));
+ pair<bool, docstring> tmp = Alert::askForText(_("LyX VC: Log Message"));
if (tmp.first) {
if (tmp.second.empty()) {
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: revert" << endl;
- 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 "
"document %1$s will lose all current changes.\n\n"
- "Do you want to revert to the saved version?"), file);
+ "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"));
vcs->getLog(tmpf);
return tmpf;
}
+
+
+} // namespace lyx