X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferList.cpp;h=e19c8aa63d3f86523e7da5f4609fef018c28cb82;hb=3dfe917a4ed504de29ac18028936d02f856c92b1;hp=61d62206a3f3e35e740c74f2cf25022e331d2370;hpb=570f96bc6e9af6c488234c7f261b320844f97dc0;p=lyx.git

diff --git a/src/BufferList.cpp b/src/BufferList.cpp
index 61d62206a3..e19c8aa63d 100644
--- a/src/BufferList.cpp
+++ b/src/BufferList.cpp
@@ -32,12 +32,12 @@
 #include "support/Package.h"
 
 #include "support/lassert.h"
-#include <boost/bind.hpp>
+#include "support/bind.h"
 
 #include <algorithm>
 #include <functional>
-
-using boost::bind;
+#include <iterator>
+#include <memory>
 
 using namespace std;
 using namespace lyx::support;
@@ -140,9 +140,12 @@ FileNameList const & BufferList::fileNames() const
 {
 	static FileNameList nvec;
 	nvec.clear();
-	transform(bstore.begin(), bstore.end(),
-		  back_inserter(nvec),
-		  boost::bind(&Buffer::fileName, _1));
+	BufferStorage::const_iterator it = bstore.begin();
+	BufferStorage::const_iterator end = bstore.end();
+	for (; it != end; ++it) {
+		Buffer * buf = *it;
+		nvec.push_back(buf->fileName());
+	}
 	return nvec;
 }
 
@@ -232,8 +235,10 @@ bool BufferList::exists(FileName const & fname) const
 }
 
 
-bool BufferList::isLoaded(Buffer const * b) const
+ bool BufferList::isLoaded(Buffer const * b) const
 {
+	if (!b)
+		return false;
 	BufferStorage::const_iterator cit =
 		find(bstore.begin(), bstore.end(), b);
 	return cit != bstore.end();
@@ -249,17 +254,33 @@ struct equivalent_to : public binary_function<FileName, FileName, bool>
 }
 
 
-Buffer * BufferList::getBuffer(support::FileName const & fname) const
+Buffer * BufferList::getBuffer(support::FileName const & fname, bool internal) const
 {
 	// 1) cheap test, using string comparison of file names
 	BufferStorage::const_iterator it = find_if(bstore.begin(), bstore.end(),
-		bind(equal_to<FileName>(), bind(&Buffer::fileName, _1), fname));
+		lyx::bind(equal_to<FileName>(), lyx::bind(&Buffer::fileName, _1), fname));
 	if (it != bstore.end())
-			return *it;
+		return *it;
 	// 2) possibly expensive test, using equivalence test of file names
 	it = find_if(bstore.begin(), bstore.end(),
-		bind(equivalent_to(), bind(&Buffer::fileName, _1), fname));
-	return it != bstore.end() ? (*it) : 0;
+		lyx::bind(equivalent_to(), lyx::bind(&Buffer::fileName, _1), fname));
+	if (it != bstore.end())
+		return *it;
+
+	if (internal) {
+		// 1) cheap test, using string comparison of file names
+		BufferStorage::const_iterator it = find_if(binternal.begin(), binternal.end(),
+			lyx::bind(equal_to<FileName>(), lyx::bind(&Buffer::fileName, _1), fname));
+		if (it != binternal.end())
+			return *it;
+		// 2) possibly expensive test, using equivalence test of file names
+		it = find_if(binternal.begin(), binternal.end(),
+			     lyx::bind(equivalent_to(), lyx::bind(&Buffer::fileName, _1), fname));
+		if (it != binternal.end())
+			return *it;
+	}
+
+	return 0;
 }
 
 
@@ -270,18 +291,17 @@ Buffer * BufferList::getBufferFromTmp(string const & s)
 	for (; it < end; ++it) {
 		if (prefixIs(s, (*it)->temppath())) {
 			// check whether the filename matches the master
-			string const master_name = changeExtension(onlyFilename(
-						(*it)->absFileName()), ".tex");
+			string const master_name = (*it)->latexName();
 			if (suffixIs(s, master_name))
 				return *it;
 			// if not, try with the children
-			vector<Buffer *> clist = (*it)->getChildren();
-			vector<Buffer *>::const_iterator cit = clist.begin();
-			vector<Buffer *>::const_iterator cend = clist.end();
-			for (; cit < cend; ++cit) {
+			ListOfBuffers clist = (*it)->getDescendents();
+			ListOfBuffers::const_iterator cit = clist.begin();
+			ListOfBuffers::const_iterator cend = clist.end();
+			for (; cit != cend; ++cit) {
 				string const mangled_child_name = DocFileName(
 					changeExtension((*cit)->absFileName(),
-						".tex")).mangledFilename();
+						".tex")).mangledFileName();
 				if (suffixIs(s, mangled_child_name))
 					return *cit;
 			}
@@ -291,12 +311,12 @@ Buffer * BufferList::getBufferFromTmp(string const & s)
 }
 
 
-void BufferList::setCurrentAuthor(docstring const & name, docstring const & email)
+void BufferList::recordCurrentAuthor(Author const & author)
 {
 	BufferStorage::iterator it = bstore.begin();
 	BufferStorage::iterator end = bstore.end();
 	for (; it != end; ++it)
-		(*it)->params().authors().record(0, Author(name, email));
+		(*it)->params().authors().recordCurrentAuthor(author);
 }