X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferlist.C;h=fe6516fa4be836f54552ca53e9110a4d4d340f9b;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=ae1057bfcf264300a9400400ab6979a63d582d96;hpb=43b77ba2d722cdb8a9437926f839c1dcbf3c0b89;p=lyx.git

diff --git a/src/bufferlist.C b/src/bufferlist.C
index ae1057bfcf..fe6516fa4b 100644
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -34,14 +34,17 @@
 #include <algorithm>
 #include <functional>
 
-using lyx::support::addName;
-using lyx::support::bformat;
-using lyx::support::makeAbsPath;
-using lyx::support::makeDisplayPath;
-using lyx::support::onlyFilename;
-using lyx::support::removeAutosaveFile;
-using lyx::support::package;
-using lyx::support::prefixIs;
+
+namespace lyx {
+
+using support::addName;
+using support::bformat;
+using support::makeAbsPath;
+using support::makeDisplayPath;
+using support::onlyFilename;
+using support::removeAutosaveFile;
+using support::package;
+using support::prefixIs;
 
 using boost::bind;
 
@@ -56,6 +59,8 @@ using std::vector;
 using std::back_inserter;
 using std::transform;
 
+namespace Alert = lyx::frontend::Alert;
+
 
 BufferList::BufferList()
 {}
@@ -71,17 +76,18 @@ bool BufferList::quitWriteBuffer(Buffer * buf)
 {
 	BOOST_ASSERT(buf);
 
-	string file;
+	docstring file;
 	if (buf->isUnnamed())
-		file = onlyFilename(buf->fileName());
+		file = from_utf8(onlyFilename(buf->fileName()));
 	else
 		file = makeDisplayPath(buf->fileName(), 30);
 
-	string const text =
-		bformat(lyx::to_utf8(_("The document %1$s has unsaved changes.\n\n"
-				       "Do you want to save the document or discard the changes?")), file);
-	int const ret = Alert::prompt(lyx::to_utf8(_("Save changed document?")),
-		text, 0, 2, lyx::to_utf8(_("&Save")), lyx::to_utf8(_("&Discard")), lyx::to_utf8(_("&Cancel")));
+	docstring const text =
+		bformat(_("The document %1$s has unsaved changes.\n\n"
+				       "Do you want to save the document or discard the changes?"),
+					   file);
+	int const ret = Alert::prompt(_("Save changed document?"),
+		text, 0, 2, _("&Save"), _("&Discard"), _("&Cancel"));
 
 	if (ret == 0) {
 		// FIXME: WriteAs can be asynch !
@@ -129,7 +135,7 @@ bool BufferList::quitWriteAll()
 		// if master/slave are both open, do not save slave since it
 		// will be automatically loaded when the master is loaded
 		if ((*it)->getMasterBuffer() == (*it))
-			LyX::ref().session().addLastOpenedFile((*it)->fileName());
+			LyX::ref().session().lastOpened().add((*it)->fileName());
 	}
 
 	return true;
@@ -178,17 +184,18 @@ bool BufferList::close(Buffer * buf, bool const ask)
 		return true;
 	}
 
-	string fname;
+	docstring fname;
 	if (buf->isUnnamed())
-		fname = onlyFilename(buf->fileName());
+		fname = from_utf8(onlyFilename(buf->fileName()));
 	else
 		fname = makeDisplayPath(buf->fileName(), 30);
 
-	string const text =
-		bformat(lyx::to_utf8(_("The document %1$s has unsaved changes.\n\n"
-				       "Do you want to save the document or discard the changes?")), fname);
-	int const ret = Alert::prompt(lyx::to_utf8(_("Save changed document?")),
-		text, 0, 2, lyx::to_utf8(_("&Save")), lyx::to_utf8(_("&Discard")), lyx::to_utf8(_("&Cancel")));
+	docstring const text =
+		bformat(_("The document %1$s has unsaved changes.\n\n"
+				       "Do you want to save the document or discard the changes?"),
+					   fname);
+	int const ret = Alert::prompt(_("Save changed document?"),
+		text, 0, 2, _("&Save"), _("&Discard"), _("&Cancel"));
 
 	if (ret == 0) {
 		if (buf->isUnnamed()) {
@@ -307,7 +314,9 @@ void BufferList::emergencyWrite(Buffer * buf)
 	string const doc = buf->isUnnamed()
 		? onlyFilename(buf->fileName()) : buf->fileName();
 
-	lyxerr << bformat(lyx::to_utf8(_("LyX: Attempting to save document %1$s")), doc) << endl;
+	lyxerr << to_utf8(
+		bformat(_("LyX: Attempting to save document %1$s"), from_utf8(doc)))
+		<< endl;
 
 	// We try to save three places:
 	// 1) Same place as document. Unless it is an unnamed doc.
@@ -317,10 +326,10 @@ void BufferList::emergencyWrite(Buffer * buf)
 		lyxerr << "  " << s << endl;
 		if (buf->writeFile(s)) {
 			buf->markClean();
-			lyxerr << lyx::to_utf8(_("  Save seems successful. Phew.")) << endl;
+			lyxerr << to_utf8(_("  Save seems successful. Phew.")) << endl;
 			return;
 		} else {
-			lyxerr << lyx::to_utf8(_("  Save failed! Trying...")) << endl;
+			lyxerr << to_utf8(_("  Save failed! Trying...")) << endl;
 		}
 	}
 
@@ -330,11 +339,11 @@ void BufferList::emergencyWrite(Buffer * buf)
 	lyxerr << ' ' << s << endl;
 	if (buf->writeFile(s)) {
 		buf->markClean();
-		lyxerr << lyx::to_utf8(_("  Save seems successful. Phew.")) << endl;
+		lyxerr << to_utf8(_("  Save seems successful. Phew.")) << endl;
 		return;
 	}
 
-	lyxerr << lyx::to_utf8(_("  Save failed! Trying...")) << endl;
+	lyxerr << to_utf8(_("  Save failed! Trying...")) << endl;
 
 	// 3) In "/tmp" directory.
 	// MakeAbsPath to prepend the current
@@ -344,10 +353,10 @@ void BufferList::emergencyWrite(Buffer * buf)
 	lyxerr << ' ' << s << endl;
 	if (buf->writeFile(s)) {
 		buf->markClean();
-		lyxerr << lyx::to_utf8(_("  Save seems successful. Phew.")) << endl;
+		lyxerr << to_utf8(_("  Save seems successful. Phew.")) << endl;
 		return;
 	}
-	lyxerr << lyx::to_utf8(_("  Save failed! Bummer. Document is lost.")) << endl;
+	lyxerr << to_utf8(_("  Save failed! Bummer. Document is lost.")) << endl;
 }
 
 
@@ -401,3 +410,6 @@ void BufferList::setCurrentAuthor(string const & name, string const & email)
 		(*it)->params().authors().record(0, Author(name, email));
 	}
 }
+
+
+} // namespace lyx