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 ? buf->parent() : 0;
+ Buffer const * parent = buf->parent();
Buffer * tmp = (*it);
bstore.erase(it);
LASSERT(tmp, return);
exit(1);
} else if (message.type_ == WarningException) {
Alert::warning(message.title_, message.details_);
- return 0;
+ return nullptr;
}
}
tmpbuf->params().useClassDefaults();
FileNameList BufferList::fileNames() const
{
FileNameList nvec;
- BufferStorage::const_iterator it = bstore.begin();
- BufferStorage::const_iterator end = bstore.end();
- for (; it != end; ++it) {
- Buffer * buf = *it;
+ for (Buffer const * buf : bstore)
nvec.push_back(buf->fileName());
- }
return nvec;
}
Buffer * BufferList::first()
{
if (bstore.empty())
- return 0;
+ return nullptr;
return bstore.front();
}
Buffer * BufferList::last()
{
if (bstore.empty())
- return 0;
+ return nullptr;
return bstore.back();
}
Buffer * BufferList::getBuffer(unsigned int choice)
{
if (choice >= bstore.size())
- return 0;
+ return nullptr;
return bstore[choice];
}
Buffer * BufferList::next(Buffer const * buf) const
{
// Something is wrong, but we can probably survive it.
- LASSERT(buf, return 0);
+ LASSERT(buf, return nullptr);
if (bstore.empty())
- return 0;
+ return nullptr;
BufferStorage::const_iterator it =
find(bstore.begin(), bstore.end(), buf);
- LASSERT(it != bstore.end(), return 0);
+ LASSERT(it != bstore.end(), return nullptr);
++it;
Buffer * nextbuf = (it == bstore.end()) ? bstore.front() : *it;
return nextbuf;
Buffer * BufferList::previous(Buffer const * buf) const
{
// Something is wrong, but we can probably survive it.
- LASSERT(buf, return 0);
+ LASSERT(buf, return nullptr);
if (bstore.empty())
- return 0;
+ return nullptr;
BufferStorage::const_iterator it =
find(bstore.begin(), bstore.end(), buf);
- LASSERT(it != bstore.end(), return 0);
+ LASSERT(it != bstore.end(), return nullptr);
Buffer * previousbuf = (it == bstore.begin()) ? bstore.back() : *(it - 1);
return previousbuf;
{
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
{
- BufferStorage::const_iterator it = bstore.begin();
- BufferStorage::const_iterator const en = bstore.end();
- for (; it != en; ++it)
- (*it)->params().invalidateConverterCache();
+ for (Buffer const * buf : bstore)
+ buf->params().invalidateConverterCache();
}
bool BufferList::exists(FileName const & fname) const
{
- return getBuffer(fname) != 0;
+ return getBuffer(fname) != nullptr;
}
- bool BufferList::isLoaded(Buffer const * b) const
+bool BufferList::isLoaded(Buffer const * b) const
{
if (!b)
return false;
}
-bool BufferList::isOthersChild(Buffer * parent, Buffer * child)
+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();
+}
+
+
+bool BufferList::isOthersChild(Buffer * parent, Buffer * child) const
{
LASSERT(parent, return false);
LASSERT(child, return false);
if (parent_ && parent_ != parent)
return true;
- for(Buffer * buf : bstore)
+ for(Buffer const * buf : bstore)
if (buf != parent && buf->isChild(child))
return true;
return false;
if (equivalent(b->fileName(), fname))
return b;
}
- return 0;
+ return nullptr;
}
-Buffer * BufferList::getBufferFromTmp(string const & s)
+Buffer * BufferList::getBufferFromTmp(string const & s, bool realpath)
{
- BufferStorage::iterator it = bstore.begin();
- BufferStorage::iterator end = bstore.end();
- for (; it < end; ++it) {
- if (prefixIs(s, (*it)->temppath())) {
+ for (Buffer * buf : bstore) {
+ string const temppath = realpath ? FileName(buf->temppath()).realPath() : buf->temppath();
+ if (prefixIs(s, 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->getDescendants()) {
string const mangled_child_name = DocFileName(
- changeExtension((*cit)->absFileName(),
+ changeExtension(child->absFileName(),
".tex")).mangledFileName();
if (suffixIs(s, mangled_child_name))
- return *cit;
+ return child;
}
}
}
- return 0;
+ return nullptr;
}
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()
{
- BufferStorage::iterator it = bstore.begin();
- BufferStorage::iterator end = bstore.end();
- for (; it != end; ++it)
- (*it)->updatePreviews();
+ for (Buffer * buf : bstore)
+ buf->updatePreviews();
}
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);
}