introduce namespace lyx::support

[lyx.git] / src / lyxvc.C

diff --git a/src/lyxvc.C b/src/lyxvc.C
index 3def73dfec3b30ee5ec01075000fb8b01f9ff09c..9f6ce7e2bb873e999c83059cde3616bd456916e7 100644 (file)
--- a/src/lyxvc.C
+++ b/src/lyxvc.C
@@ -13,13 +13,15 @@
 
 #include "support/filetools.h"
 #include "support/lyxlib.h"
-#include "support/BoostFormat.h"
 
 #include <unistd.h>
 
+using namespace lyx::support;
+
 using std::endl;
 using std::pair;
 
+
 /* WARNING: Several of the vcs-> methods end up
  * deleting this object via BufferView::reload() !
  */
@@ -80,16 +82,10 @@ bool LyXVC::ensureClean()
                return true;
 
        string const file = MakeDisplayPath(owner_->fileName(), 30);
-#if USE_BOOST_FORMAT
-       boost::format fmt(_("The document %1$s has unsaved changes.\n\nDo you want to save the document?"));
-       fmt % file;
-       string text = fmt.str();
-#else
-       string text = _("The document ");
-       text += file + _(" has unsaved changes.\n\nDo you want to save the document?");
-#endif
+       string text = bformat(_("The document %1$s has unsaved changes.\n\n"
+               "Do you want to save the document?"), file);
        int const ret = Alert::prompt(_("Save changed document?"),
-               text, 0, _("&Save"), _("&Cancel"));
+               text, 0, 1, _("&Save"), _("&Cancel"));
 
        if (ret == 0) {
                vcs->owner()->getUser()->owner()->dispatch(FuncRequest(LFUN_MENUWRITE));
@@ -193,17 +189,11 @@ void LyXVC::revert()
        lyxerr[Debug::LYXVC] << "LyXVC: revert" << endl;
 
        string const file = MakeDisplayPath(owner_->fileName(), 20);
-#if USE_BOOST_FORMAT
-       boost::format fmt(_("Reverting to the stored version of the document %1$s will "
-                       "lose all current changes.\n\nDo you want to revert to the saved version?"));
-       fmt % file;
-       string text = fmt.str();
-#else
-       string text = _("Reverting to the stored version of the document ");
-       text += file + _(" will lose all current changes.\n\nDo you want to revert to the saved version?");
-#endif
+       string 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);
        int const ret = Alert::prompt(_("Revert to stored version of document?"),
-               text, 1, _("&Revert"), _("&Cancel"));
+               text, 0, 1, _("&Revert"), _("&Cancel"));
 
        if (ret == 0)
                vcs->revert();
@@ -255,12 +245,12 @@ string const & LyXVC::locker() const
 }
 
 
-const string LyXVC::getLogFile() const
+string const LyXVC::getLogFile() const
 {
        if (!vcs)
                return string();
 
-       string tmpf = lyx::tempName(string(), "lyxvclog");
+       string tmpf = tempName(string(), "lyxvclog");
        lyxerr[Debug::LYXVC] << "Generating logfile " << tmpf << endl;
        vcs->getLog(tmpf);
        return tmpf;