Update it.po

[lyx.git] / src / BufferList.cpp

diff --git a/src/BufferList.cpp b/src/BufferList.cpp
index 68a1e808cb07ab98672b4f5a49185e7dba0f4f05..5e83c7b63ebe967dcad3d87f933a005ab07f9313 100644 (file)
--- a/src/BufferList.cpp
+++ b/src/BufferList.cpp
@@ -32,10 +32,8 @@
 #include "support/Package.h"
 
 #include "support/lassert.h"
-#include "support/bind.h"
 
 #include <algorithm>
-#include <functional>
 #include <iterator>
 #include <memory>
 
@@ -98,10 +96,15 @@ void BufferList::release(Buffer * buf)
        BufferStorage::iterator const it =
                find(bstore.begin(), bstore.end(), buf);
        if (it != bstore.end()) {
+               Buffer const * parent = buf->parent();
                Buffer * tmp = (*it);
                bstore.erase(it);
                LASSERT(tmp, return);
                delete tmp;
+               if (parent)
+                       // If this was a child, update the parent's buffer
+                       // to avoid crashes due to dangling pointers (bug 9979)
+                       parent->updateBuffer();
        }
 }
 
@@ -130,9 +133,9 @@ Buffer * BufferList::newBuffer(string const & s)
 
 Buffer * BufferList::createNewBuffer(string const & s)
 {
-       auto_ptr<Buffer> tmpbuf;
+       unique_ptr<Buffer> tmpbuf;
        try {
-               tmpbuf.reset(new Buffer(s));
+               tmpbuf = make_unique<Buffer>(s);
        } catch (ExceptionMessage const & message) {
                if (message.type_ == ErrorException) {
                        Alert::error(message.title_, message.details_);
@@ -198,7 +201,7 @@ Buffer * BufferList::next(Buffer const * buf) const
 
        if (bstore.empty())
                return 0;
-       BufferStorage::const_iterator it = 
+       BufferStorage::const_iterator it =
                        find(bstore.begin(), bstore.end(), buf);
        LASSERT(it != bstore.end(), return 0);
        ++it;
@@ -214,7 +217,7 @@ Buffer * BufferList::previous(Buffer const * buf) const
 
        if (bstore.empty())
                return 0;
-       BufferStorage::const_iterator it = 
+       BufferStorage::const_iterator it =
                        find(bstore.begin(), bstore.end(), buf);
        LASSERT(it != bstore.end(), return 0);
 
@@ -251,13 +254,22 @@ void BufferList::emergencyWriteAll()
 }
 
 
+void BufferList::invalidateConverterCache() const
+{
+       BufferStorage::const_iterator it = bstore.begin();
+       BufferStorage::const_iterator const en = bstore.end();
+       for (; it != en; ++it)
+               (*it)->params().invalidateConverterCache();
+}
+
+
 bool BufferList::exists(FileName const & fname) const
 {
        return getBuffer(fname) != 0;
 }
 
 
- bool BufferList::isLoaded(Buffer const * b) const
+bool BufferList::isLoaded(Buffer const * b) const
 {
        if (!b)
                return false;
@@ -267,43 +279,54 @@ bool BufferList::exists(FileName const & fname) const
 }
 
 
-namespace {
+bool BufferList::isInternal(Buffer const * b) const
+{
+       if (!b)
+               return false;
+       BufferStorage::const_iterator cit =
+               find(binternal.begin(), binternal.end(), b);
+       return cit != binternal.end();
+}
+
 
-struct equivalent_to : public binary_function<FileName, FileName, bool>
+bool BufferList::isOthersChild(Buffer * parent, Buffer * child)
 {
-       bool operator()(FileName const & x, FileName const & y) const
-       { return equivalent(x, y); }
-};
+       LASSERT(parent, return false);
+       LASSERT(child, return false);
+       LASSERT(parent->isChild(child), return false);
 
+       // Does child document have a different parent?
+       Buffer const * parent_ = child->parent();
+       if (parent_ && parent_ != parent)
+               return true;
+
+       for(Buffer * buf : bstore)
+               if (buf != parent && buf->isChild(child))
+                       return true;
+       return false;
 }
 
 
 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(),
-               lyx::bind(equal_to<FileName>(), lyx::bind(&Buffer::fileName, _1), fname));
-       if (it != bstore.end())
-               return *it;
+       for (Buffer * b : bstore)
+               if (b->fileName() == fname)
+                       return b;
        // 2) possibly expensive test, using equivalence test of file names
-       it = find_if(bstore.begin(), bstore.end(),
-               lyx::bind(equivalent_to(), lyx::bind(&Buffer::fileName, _1), fname));
-       if (it != bstore.end())
-               return *it;
-
+       for (Buffer * b : bstore)
+               if (equivalent(b->fileName(), fname))
+                       return b;
        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;
+               for (Buffer * b : binternal)
+                       if (b->fileName() == fname)
+                               return b;
                // 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;
+               for (Buffer * b : binternal)
+                       if (equivalent(b->fileName(), fname))
+                               return b;
        }
-
        return 0;
 }
 
@@ -364,31 +387,6 @@ int BufferList::bufferNum(FileName const & fname) const
 }
 
 
-bool BufferList::releaseChild(Buffer * parent, Buffer * child)
-{
-       LASSERT(parent, return false);
-       LASSERT(child, return false);
-       LASSERT(parent->isChild(child), return false);
-
-       // Child document has a different parent, don't close it.
-       Buffer const * parent_ = child->parent();
-       if (parent_ && parent_ != parent)
-               return false;
-
-       BufferStorage::iterator it = bstore.begin();
-       BufferStorage::iterator end = bstore.end();
-       for (; it != end; ++it) {
-               Buffer * buf = *it;
-               if (buf != parent && buf->isChild(child)) {
-                       child->setParent(0);
-                       return false;
-               }
-       }
-       release(child);
-       return true;
-}
-
-
 void BufferList::changed(bool update_metrics) const
 {
        BufferStorage::const_iterator it = bstore.begin();