Avoid too much verbosity.

[lyx.git] / src / BufferList.cpp

diff --git a/src/BufferList.cpp b/src/BufferList.cpp
index ecf7fdc4df54ca751a240d3de1b632a0e8f68bd8..e19c8aa63d3f86523e7da5f4609fef018c28cb82 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;
@@ -119,7 +119,7 @@ Buffer * BufferList::newBuffer(string const & s, bool const ronly)
                }
        }
        tmpbuf->params().useClassDefaults();
-       if (tmpbuf->fileName().extension() == "internal") {
+       if (tmpbuf->isInternal()) {
                binternal.push_back(tmpbuf.get());
        } else {
                LYXERR(Debug::INFO, "Assigning to buffer " << bstore.size());
@@ -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);
 }
 
 
@@ -318,7 +338,8 @@ bool BufferList::releaseChild(Buffer * parent, Buffer * child)
        LASSERT(parent->isChild(child), return false);
 
        // Child document has a different parent, don't close it.
-       if (child->parent() != parent)
+       Buffer const * parent_ = child->parent();
+       if (parent_ && parent_ != parent)
                return false;
 
        BufferStorage::iterator it = bstore.begin();
@@ -335,4 +356,17 @@ bool BufferList::releaseChild(Buffer * parent, Buffer * child)
 }
 
 
+void BufferList::changed(bool update_metrics) const
+{
+       BufferStorage::const_iterator it = bstore.begin();
+       BufferStorage::const_iterator end = bstore.end();
+       for (; it != end; ++it)
+               (*it)->changed(update_metrics);
+       it = binternal.begin();
+       end = binternal.end();
+       for (; it != end; ++it)
+               (*it)->changed(update_metrics);
+}
+
+
 } // namespace lyx