#include "support/Package.h"
#include "support/lassert.h"
-#include "support/bind.h"
#include <algorithm>
-#include <functional>
#include <iterator>
#include <memory>
BufferList::~BufferList()
{
- BufferStorage::iterator it = binternal.begin();
- BufferStorage::iterator end = binternal.end();
- for (; it != end; ++it)
- delete (*it);
+ for (Buffer * buf : binternal)
+ delete 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();
}
}
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_);
}
-FileNameList const & BufferList::fileNames() const
+FileNameList BufferList::fileNames() const
{
- static FileNameList nvec;
- nvec.clear();
- BufferStorage::const_iterator it = bstore.begin();
- BufferStorage::const_iterator end = bstore.end();
- for (; it != end; ++it) {
- Buffer * buf = *it;
+ FileNameList nvec;
+ for (Buffer const * buf : bstore)
nvec.push_back(buf->fileName());
- }
return nvec;
}
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;
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);
{
OutputParams runparams = runparams_in;
runparams.is_child = true;
- BufferStorage::iterator it = bstore.begin();
- BufferStorage::iterator end = bstore.end();
- for (; it != end; ++it) {
- if (!(*it)->isDepClean(masterTmpDir)) {
- string writefile = addName(masterTmpDir, (*it)->latexName());
- (*it)->makeLaTeXFile(FileName(writefile), masterTmpDir,
+ for (Buffer * buf : bstore) {
+ if (!buf->isDepClean(masterTmpDir)) {
+ string writefile = addName(masterTmpDir, buf->latexName());
+ buf->makeLaTeXFile(FileName(writefile), masterTmpDir,
runparams, Buffer::OnlyBody);
- (*it)->markDepClean(masterTmpDir);
+ buf->markDepClean(masterTmpDir);
}
}
- runparams.is_child = false;
}
void BufferList::emergencyWriteAll()
{
- BufferStorage::const_iterator it = bstore.begin();
- BufferStorage::const_iterator const en = bstore.end();
- for (; it != en; ++it)
- (*it)->emergencyWrite();
+ for (Buffer * buf : bstore)
+ buf->emergencyWrite();
+}
+
+
+void BufferList::invalidateConverterCache() const
+{
+ for (Buffer const * buf : bstore)
+ buf->params().invalidateConverterCache();
}
}
- bool BufferList::isLoaded(Buffer const * b) const
+bool BufferList::isLoaded(Buffer const * b) const
{
if (!b)
return false;
}
-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) const
{
- 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 const * 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;
}
Buffer * BufferList::getBufferFromTmp(string const & s)
{
- BufferStorage::iterator it = bstore.begin();
- BufferStorage::iterator end = bstore.end();
- for (; it < end; ++it) {
- if (prefixIs(s, (*it)->temppath())) {
+ for (Buffer * buf : bstore) {
+ if (prefixIs(s, buf->temppath())) {
// check whether the filename matches the master
- string const master_name = (*it)->latexName();
+ string const master_name = buf->latexName();
if (suffixIs(s, master_name))
- return *it;
+ return buf;
// if not, try with the children
- ListOfBuffers clist = (*it)->getDescendents();
- ListOfBuffers::const_iterator cit = clist.begin();
- ListOfBuffers::const_iterator cend = clist.end();
- for (; cit != cend; ++cit) {
+ for (Buffer * child : buf->getDescendents()) {
string const mangled_child_name = DocFileName(
- changeExtension((*cit)->absFileName(),
+ changeExtension(child->absFileName(),
".tex")).mangledFileName();
if (suffixIs(s, mangled_child_name))
- return *cit;
+ return child;
}
}
}
void BufferList::recordCurrentAuthor(Author const & author)
{
- BufferStorage::iterator it = bstore.begin();
- BufferStorage::iterator end = bstore.end();
- for (; it != end; ++it)
- (*it)->params().authors().recordCurrentAuthor(author);
+ for (Buffer * buf : bstore)
+ buf->params().authors().recordCurrentAuthor(author);
+}
+
+
+void BufferList::updatePreviews()
+{
+ for (Buffer * buf : bstore)
+ buf->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())
}
-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();
- 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);
+ for (Buffer const * buf : bstore)
+ buf->changed(update_metrics);
+ for (Buffer const * buf : binternal)
+ buf->changed(update_metrics);
}
projects / lyx.git / blobdiff