fix "make check" with gcc 4.3

[lyx.git] / src / Buffer.h

diff --git a/src/Buffer.h b/src/Buffer.h
index c62d5e702f1b114f8ebb0e2870877904234d33d2..f57a4c09b5a0d6089be1f99f53d00871a07ea669 100644 (file)
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -282,6 +282,9 @@ public:
 
        /// \return true if \p child is a child of this \c Buffer.
        bool isChild(Buffer * child) const;
+       
+       /// return a vector with all children and grandchildren
+       std::vector<Buffer *> getChildren() const;
 
        /// Is buffer read-only?
        bool isReadonly() const;
@@ -473,9 +476,17 @@ public:
        void setInsetLabel(docstring const & label, InsetLabel const * il);
        InsetLabel const * insetLabel(docstring const & label) const;
 
-       // FIXME: buf should should be const because updateLabels() modifies
-       // the contents of the paragraphs.
-       void updateLabels(bool childonly = false) const;
+       /// sets the buffer_ member for every inset in this buffer.
+       // FIXME This really shouldn't be needed, but at the moment it's not
+       // clear how to do it just for the individual pieces we need.
+       void setBuffersForInsets() const;
+       ///
+       enum UpdateScope {
+               UpdateMaster,
+               UpdateChildOnly
+       };
+       ///
+       void updateLabels(UpdateScope = UpdateMaster) const;
        ///
        void updateLabels(ParIterator & parit) const;