Japanese docs: fix some more paths

[lyx.git] / src / BufferList.cpp

diff --git a/src/BufferList.cpp b/src/BufferList.cpp
index 341ddf455bdcbd5ba83a412aad846909ec82aa91..ff99a090f35ea08ad398bbb8eabaf1ca92ef9238 100644 (file)
--- a/src/BufferList.cpp
+++ b/src/BufferList.cpp
@@ -154,10 +154,9 @@ void BufferList::closeAll()
 }
 
 
-FileNameList const & BufferList::fileNames() const
+FileNameList BufferList::fileNames() const
 {
-       static FileNameList nvec;
-       nvec.clear();
+       FileNameList nvec;
        BufferStorage::const_iterator it = bstore.begin();
        BufferStorage::const_iterator end = bstore.end();
        for (; it != end; ++it) {
@@ -268,6 +267,28 @@ bool BufferList::exists(FileName const & fname) const
 }
 
 
+bool BufferList::isOthersChild(Buffer * parent, Buffer * child)
+{
+       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;
+       
+       BufferStorage::iterator it = bstore.begin();
+       BufferStorage::iterator end = bstore.end();
+       for (; it != end; ++it) {
+               Buffer * buf = *it;
+               if (buf != parent && buf->isChild(child))
+                       return true;
+       }
+       return false;
+}
+
+
 namespace {
 
 struct equivalent_to : public binary_function<FileName, FileName, bool>
@@ -345,9 +366,18 @@ void BufferList::recordCurrentAuthor(Author const & author)
 }
 
 
+void BufferList::updatePreviews()
+{
+       BufferStorage::iterator it = bstore.begin();
+       BufferStorage::iterator end = bstore.end();
+       for (; it != end; ++it)
+               (*it)->updatePreviews();
+}
+
+
 int BufferList::bufferNum(FileName const & fname) const
 {
-       FileNameList const & buffers = fileNames();
+       FileNameList const buffers(fileNames());
        FileNameList::const_iterator cit =
                find(buffers.begin(), buffers.end(), fname);
        if (cit == buffers.end())
@@ -356,31 +386,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();