ws changes only

[lyx.git] / src / insets / insetcollapsable.h

diff --git a/src/insets/insetcollapsable.h b/src/insets/insetcollapsable.h
index 9c0b2f6af3ba1093310d3d6413b377a75c9cb6bd..37e61f70f1c18b95532ceea6b323942ed3aa3b1e 100644 (file)
--- a/src/insets/insetcollapsable.h
+++ b/src/insets/insetcollapsable.h
@@ -20,8 +20,6 @@
 #include "box.h"
 #include "lyxfont.h"
 
-#include <boost/weak_ptr.hpp>
-
 class Painter;
 class LyXText;
 class Paragraph;
@@ -70,7 +68,7 @@ public:
        ///
        int insetInInsetY() const;
        ///
-       RESULT localDispatch(FuncRequest const &);
+       dispatch_result localDispatch(FuncRequest const &);
        ///
        int latex(Buffer const &, std::ostream &,
                  LatexRunParams const &) const;
@@ -96,7 +94,7 @@ public:
        void setFont(BufferView *, LyXFont const &, bool toggleall = false,
                 bool selectall = false);
        ///
-       void setLabel(string const & l) const;
+       void setLabel(std::string const & l) const;
        ///
        void setLabelFont(LyXFont & f);
 #if 0
@@ -107,8 +105,8 @@ public:
        LyXText * getLyXText(BufferView const *, bool const recursive) const;
        ///
        void deleteLyXText(BufferView *, bool recursive=true) const;
-       ///
-       void getLabelList(std::vector<string> &) const;
+       /// Appends \c list with all labels found within this inset.
+       void getLabelList(Buffer const &, std::vector<std::string> & list) const;
        ///
        int scroll(bool recursive=true) const;
        ///
@@ -140,20 +138,15 @@ public:
        bool nextChange(BufferView * bv, lyx::pos_type & length);
 
        ///
-       bool searchForward(BufferView * bv, string const & str,
+       bool searchForward(BufferView * bv, std::string const & str,
                           bool = true, bool = false);
-       bool searchBackward(BufferView * bv, string const & str,
+       bool searchBackward(BufferView * bv, std::string const & str,
                            bool = true, bool = false);
 
        ///
        void addPreview(lyx::graphics::PreviewLoader &) const;
 
 protected:
-       ///
-       virtual void cache(BufferView *) const;
-       ///
-       virtual BufferView * view() const;
-
        ///
        void dimension_collapsed(Dimension &) const;
        ///
@@ -188,7 +181,7 @@ private:
        mutable int topbaseline;
 
        ///
-       mutable string label;
+       mutable std::string label;
 #if 0
        ///
        bool autocollapse;
@@ -197,8 +190,6 @@ private:
        bool in_update;
        ///
        mutable bool first_after_edit;
-       ///
-       mutable boost::weak_ptr<BufferView> view_;
 };