hopefully fix tex2lyx linking.

[lyx.git] / src / lyxvc.C

diff --git a/src/lyxvc.C b/src/lyxvc.C
index 0c67bef703d0b5251521ca4aa58b37fcc1199f0e..6e4d421eee50fab9f8bad8db90e5d3899bc253d5 100644 (file)
--- a/src/lyxvc.C
+++ b/src/lyxvc.C
@@ -26,15 +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;
+
+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()
 {
@@ -89,10 +94,10 @@ void LyXVC::registrer()
        string const filename = owner_->fileName();
 
        // there must be a file to save
-       if (!IsFileReadable(filename)) {
+       if (!isFileReadable(filename)) {
                Alert::error(_("Document not saved"),
                             _("You must save the document "
-                              "before it can be registered."));
+                                           "before it can be registered."));
                return;
        }
 
@@ -100,17 +105,17 @@ void LyXVC::registrer()
        if (!vcs) {
                string const cvs_entries = "CVS/Entries";
 
-               if (IsFileReadable(cvs_entries)) {
+               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));
                }
@@ -119,7 +124,7 @@ void LyXVC::registrer()
        }
 
        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()) {
@@ -128,7 +133,7 @@ void LyXVC::registrer()
                return;
        }
 
-       vcs->registrer(tmp.second);
+       vcs->registrer(to_utf8(tmp.second));
 }
 
 
@@ -136,12 +141,12 @@ void LyXVC::checkIn()
 {
 
        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;
        }
@@ -160,10 +165,10 @@ void LyXVC::revert()
 {
        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"));
 
@@ -232,3 +237,6 @@ string const LyXVC::getLogFile() const
        vcs->getLog(tmpf);
        return tmpf;
 }
+
+
+} // namespace lyx