anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 13:04:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use getChildren() to collect all the relatives. Note that this makes

Browse Source 
allRelatives() "stable", in the sense that what it returns does not
depend upon which Buffer we start with.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35530 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-09-29 11:59:31 +00:00
parent 2291614a6c
commit f5696b8872
1 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/Buffer.cpp
View File

@ -143,9 +143,6 @@ void showPrintError(string const & name)
} // namespace anon } // namespace anon
typedef std::set<Buffer *> BufferSet;
class Buffer::Impl class Buffer::Impl
{ {
public: public:
@ -169,8 +166,6 @@ public:
void updateMacros(DocIterator & it, DocIterator & scope); void updateMacros(DocIterator & it, DocIterator & scope);
/// ///
void setLabel(ParIterator & it, UpdateType utype) const; void setLabel(ParIterator & it, UpdateType utype) const;
///
void collectRelatives(BufferSet & bufs) const;
/** If we have branches that use the file suffix /** If we have branches that use the file suffix
feature, return the file name with suffix appended. feature, return the file name with suffix appended.
@ -2485,29 +2480,11 @@ Buffer const * Buffer::parent() const
} }
void Buffer::Impl::collectRelatives(BufferSet & bufs) const
{
bufs.insert(owner_);
if (parent())
parent()->d->collectRelatives(bufs);
// loop over children
BufferPositionMap::const_iterator it = children_positions.begin();
BufferPositionMap::const_iterator end = children_positions.end();
for (; it != end; ++it)
bufs.insert(const_cast<Buffer *>(it->first));
}
ListOfBuffers Buffer::allRelatives() const ListOfBuffers Buffer::allRelatives() const
{ {
BufferSet bufs; if (parent())
d->collectRelatives(bufs); return parent()->allRelatives();
BufferSet::iterator it = bufs.begin(); return getChildren(/* true */);
ListOfBuffers ret;
for (; it != bufs.end(); ++it)
ret.push_back(*it);
return ret;
} }
@ -2545,11 +2522,9 @@ void Buffer::getChildren(ListOfBuffers & clist, bool grand_children) const
for (; it != end; ++it) { for (; it != end; ++it) {
Buffer * child = const_cast<Buffer *>(it->first); Buffer * child = const_cast<Buffer *>(it->first);
clist.push_back(child); clist.push_back(child);
if (grand_children) { if (grand_children)
// there might be grandchildren // there might be grandchildren
ListOfBuffers glist = child->getChildren(); child->getChildren(clist /*, true */);
clist.insert(clist.end(), glist.begin(), glist.end());
}
} }
} }