X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferlist.C;h=2ae3df66871419a7450d8f7a8e690c61e7c547fc;hb=9ee46b846e5e84ad40ceda4f4af94aeb86cd90a2;hp=29fabe9d84753de981221b0a90ce7bc0ca59c88e;hpb=0d43ba149a41e8860dde316ccbd4336d6b0bbdfa;p=lyx.git

diff --git a/src/bufferlist.C b/src/bufferlist.C
index 29fabe9d84..2ae3df6687 100644
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -27,28 +27,34 @@
 #include "frontends/Alert.h"
 
 #include "support/filetools.h"
-#include "support/lyxfunctional.h"
+#include "support/package.h"
 
 #include <boost/bind.hpp>
 
+#include <algorithm>
+#include <functional>
+
 using lyx::support::AddName;
 using lyx::support::bformat;
-using lyx::support::GetEnvPath;
 using lyx::support::MakeAbsPath;
 using lyx::support::MakeDisplayPath;
 using lyx::support::OnlyFilename;
 using lyx::support::removeAutosaveFile;
+using lyx::support::package;
 using lyx::support::prefixIs;
 
 using boost::bind;
 
 using std::auto_ptr;
 using std::endl;
+using std::equal_to;
 using std::find;
 using std::find_if;
 using std::for_each;
 using std::string;
 using std::vector;
+using std::back_inserter;
+using std::transform;
 
 
 BufferList::BufferList()
@@ -63,14 +69,17 @@ bool BufferList::empty() const
 
 bool BufferList::quitWriteBuffer(Buffer * buf)
 {
+	BOOST_ASSERT(buf);
+
 	string file;
 	if (buf->isUnnamed())
 		file = OnlyFilename(buf->fileName());
 	else
 		file = MakeDisplayPath(buf->fileName(), 30);
 
-	string text = bformat(_("The document %1$s has unsaved changes.\n\n"
-		"Do you want to save the document or discard the changes?"), file);
+	string 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"));
 
@@ -121,16 +130,18 @@ bool BufferList::quitWriteAll()
 void BufferList::release(Buffer * buf)
 {
 	BOOST_ASSERT(buf);
-	BufferStorage::iterator it = find(bstore.begin(), bstore.end(), buf);
+	BufferStorage::iterator const it =
+		find(bstore.begin(), bstore.end(), buf);
 	if (it != bstore.end()) {
 		Buffer * tmp = (*it);
+		BOOST_ASSERT(tmp);
 		bstore.erase(it);
 		delete tmp;
 	}
 }
 
 
-Buffer * BufferList::newBuffer(string const & s, bool ronly)
+Buffer * BufferList::newBuffer(string const & s, bool const ronly)
 {
 	auto_ptr<Buffer> tmpbuf(new Buffer(s, ronly));
 	tmpbuf->params().useClassDefaults();
@@ -149,7 +160,7 @@ void BufferList::closeAll()
 }
 
 
-bool BufferList::close(Buffer * buf, bool ask)
+bool BufferList::close(Buffer * buf, bool const ask)
 {
 	BOOST_ASSERT(buf);
 
@@ -165,8 +176,9 @@ bool BufferList::close(Buffer * buf, bool ask)
 	else
 		fname = MakeDisplayPath(buf->fileName(), 30);
 
-	string text = bformat(_("The document %1$s has unsaved changes.\n\n"
-		"Do you want to save the document or discard the changes?"), fname);
+	string 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"));
 
@@ -195,8 +207,9 @@ bool BufferList::close(Buffer * buf, bool ask)
 vector<string> const BufferList::getFileNames() const
 {
 	vector<string> nvec;
-	std::copy(bstore.begin(), bstore.end(),
-		  lyx::back_inserter_fun(nvec, &Buffer::fileName));
+	transform(bstore.begin(), bstore.end(),
+		  back_inserter(nvec),
+		  boost::bind(&Buffer::fileName, _1));
 	return nvec;
 }
 
@@ -209,7 +222,7 @@ Buffer * BufferList::first()
 }
 
 
-Buffer * BufferList::getBuffer(unsigned int choice)
+Buffer * BufferList::getBuffer(unsigned int const choice)
 {
 	if (choice >= bstore.size())
 		return 0;
@@ -217,6 +230,39 @@ Buffer * BufferList::getBuffer(unsigned int choice)
 }
 
 
+Buffer * BufferList::next(Buffer const * buf) const
+{
+	BOOST_ASSERT(buf);
+
+	if (bstore.empty())
+		return 0;
+	BufferStorage::const_iterator it = find(bstore.begin(),
+						bstore.end(), buf);
+	BOOST_ASSERT(it != bstore.end());
+	++it;
+	if (it == bstore.end())
+		return bstore.front();
+	else
+		return *it;
+}
+
+
+Buffer * BufferList::previous(Buffer const * buf) const
+{
+	BOOST_ASSERT(buf);
+
+	if (bstore.empty())
+		return 0;
+	BufferStorage::const_iterator it = find(bstore.begin(),
+						bstore.end(), buf);
+	BOOST_ASSERT(it != bstore.end());
+	if (it == bstore.begin())
+		return bstore.back();
+	else
+		return *(it - 1);
+}
+
+
 void BufferList::updateIncludedTeXfiles(string const & mastertmpdir,
 					OutputParams const & runparams)
 {
@@ -244,10 +290,9 @@ void BufferList::emergencyWriteAll()
 
 void BufferList::emergencyWrite(Buffer * buf)
 {
-	// assert(buf) // this is not good since C assert takes an int
-		       // and a pointer is a long (JMarc)
-	assert(buf != 0); // use c assert to avoid a loop
-
+	// Use ::assert to avoid a loop, BOOST_ASSERT ends up calling ::assert
+	// compare with 0 to avoid pointer/interger comparison
+	assert(buf != 0);
 
 	// No need to save if the buffer has not changed.
 	if (buf->isClean())
@@ -274,7 +319,7 @@ void BufferList::emergencyWrite(Buffer * buf)
 	}
 
 	// 2) In HOME directory.
-	string s = AddName(GetEnvPath("HOME"), buf->fileName());
+	string s = AddName(package().home_dir(), buf->fileName());
 	s += ".emergency";
 	lyxerr << ' ' << s << endl;
 	if (buf->writeFile(s)) {
@@ -303,7 +348,9 @@ void BufferList::emergencyWrite(Buffer * buf)
 bool BufferList::exists(string const & s) const
 {
 	return find_if(bstore.begin(), bstore.end(),
-		       lyx::compare_memfun(&Buffer::fileName, s))
+		       bind(equal_to<string>(),
+			    bind(&Buffer::fileName, _1),
+			    s))
 		!= bstore.end();
 }
 
@@ -321,7 +368,10 @@ Buffer * BufferList::getBuffer(string const & s)
 {
 	BufferStorage::iterator it =
 		find_if(bstore.begin(), bstore.end(),
-			lyx::compare_memfun(&Buffer::fileName, s));
+			bind(equal_to<string>(),
+			     bind(&Buffer::fileName, _1),
+			     s));
+
 	return it != bstore.end() ? (*it) : 0;
 }