* ANNOUNCE

[lyx.git] / src / BufferList.cpp

diff --git a/src/BufferList.cpp b/src/BufferList.cpp
index bed3e33617ca4bc47e1644fd7272dfe10c38d42d..0daca0929f6e53bb6b80b81a391fec6583c09778 100644 (file)
--- 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;
 }
 
@@ -255,12 +258,12 @@ Buffer * BufferList::getBuffer(support::FileName const & fname) 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;
        // 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));
+               lyx::bind(equivalent_to(), lyx::bind(&Buffer::fileName, _1), fname));
        return it != bstore.end() ? (*it) : 0;
 }
 
@@ -272,15 +275,14 @@ 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();
@@ -293,12 +295,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);
 }