X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferlist.C;h=d38fdc9cf45554ce21a5612db983fd0ea5464c76;hb=c727c6db7f2dd7f6a727462f5d11964888d0e76e;hp=861bb6fb43bab197ca981a2d719775cadd28f3f5;hpb=3adfeaa2c71619e49370dba517e575e6183eeb2c;p=lyx.git

diff --git a/src/bufferlist.C b/src/bufferlist.C
index 861bb6fb43..d38fdc9cf4 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::FileName;
+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()
 {}
@@ -67,19 +72,44 @@ bool BufferList::empty() const
 }
 
 
+BufferList::iterator BufferList::begin()
+{
+	return bstore.begin();
+}
+
+
+BufferList::const_iterator BufferList::begin() const
+{
+	return bstore.begin();
+}
+
+
+BufferList::iterator BufferList::end()
+{
+	return bstore.end();
+}
+
+
+BufferList::const_iterator BufferList::end() const
+{
+	return bstore.end();
+}
+
+
 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 =
+	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);
+				       "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"));
 
@@ -126,10 +156,10 @@ bool BufferList::quitWriteAll()
 	// save file names to .lyx/session
 	it = bstore.begin();
 	for (; it != end; ++it) {
-		// if master/slave are both open, do not save slave since it 
+		// 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(FileName((*it)->fileName()));
 	}
 
 	return true;
@@ -178,15 +208,16 @@ 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 =
+	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);
+				       "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"));
 
@@ -228,6 +259,14 @@ Buffer * BufferList::first()
 }
 
 
+Buffer * BufferList::last()
+{
+	if (bstore.empty())
+		return 0;
+	return bstore.back();
+}
+
+
 Buffer * BufferList::getBuffer(unsigned int const choice)
 {
 	if (choice >= bstore.size())
@@ -279,7 +318,7 @@ void BufferList::updateIncludedTeXfiles(string const & mastertmpdir,
 			string writefile = mastertmpdir;
 			writefile += '/';
 			writefile += (*it)->getLatexName();
-			(*it)->makeLaTeXFile(writefile, mastertmpdir,
+			(*it)->makeLaTeXFile(FileName(writefile), mastertmpdir,
 					     runparams, false);
 			(*it)->markDepClean(mastertmpdir);
 		}
@@ -307,7 +346,9 @@ void BufferList::emergencyWrite(Buffer * buf)
 	string const doc = buf->isUnnamed()
 		? onlyFilename(buf->fileName()) : buf->fileName();
 
-	lyxerr << bformat(_("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.
@@ -315,12 +356,12 @@ void BufferList::emergencyWrite(Buffer * buf)
 		string s = buf->fileName();
 		s += ".emergency";
 		lyxerr << "  " << s << endl;
-		if (buf->writeFile(s)) {
+		if (buf->writeFile(FileName(s))) {
 			buf->markClean();
-			lyxerr << _("  Save seems successful. Phew.") << endl;
+			lyxerr << to_utf8(_("  Save seems successful. Phew.")) << endl;
 			return;
 		} else {
-			lyxerr << _("  Save failed! Trying...") << endl;
+			lyxerr << to_utf8(_("  Save failed! Trying...")) << endl;
 		}
 	}
 
@@ -328,13 +369,13 @@ void BufferList::emergencyWrite(Buffer * buf)
 	string s = addName(package().home_dir(), buf->fileName());
 	s += ".emergency";
 	lyxerr << ' ' << s << endl;
-	if (buf->writeFile(s)) {
+	if (buf->writeFile(FileName(s))) {
 		buf->markClean();
-		lyxerr << _("  Save seems successful. Phew.") << endl;
+		lyxerr << to_utf8(_("  Save seems successful. Phew.")) << endl;
 		return;
 	}
 
-	lyxerr << _("  Save failed! Trying...") << endl;
+	lyxerr << to_utf8(_("  Save failed! Trying...")) << endl;
 
 	// 3) In "/tmp" directory.
 	// MakeAbsPath to prepend the current
@@ -342,12 +383,12 @@ void BufferList::emergencyWrite(Buffer * buf)
 	s = addName(package().temp_dir(), buf->fileName());
 	s += ".emergency";
 	lyxerr << ' ' << s << endl;
-	if (buf->writeFile(s)) {
+	if (buf->writeFile(FileName(s))) {
 		buf->markClean();
-		lyxerr << _("  Save seems successful. Phew.") << endl;
+		lyxerr << to_utf8(_("  Save seems successful. Phew.")) << endl;
 		return;
 	}
-	lyxerr << _("  Save failed! Bummer. Document is lost.") << endl;
+	lyxerr << to_utf8(_("  Save failed! Bummer. Document is lost.")) << endl;
 }
 
 
@@ -393,7 +434,7 @@ Buffer * BufferList::getBufferFromTmp(string const & s)
 }
 
 
-void BufferList::setCurrentAuthor(string const & name, string const & email)
+void BufferList::setCurrentAuthor(docstring const & name, docstring const & email)
 {
 	BufferStorage::iterator it = bstore.begin();
 	BufferStorage::iterator end = bstore.end();
@@ -401,3 +442,6 @@ void BufferList::setCurrentAuthor(string const & name, string const & email)
 		(*it)->params().authors().record(0, Author(name, email));
 	}
 }
+
+
+} // namespace lyx