hopefully fix tex2lyx linking.

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

diff --git a/src/insets/insetcollapsable.h b/src/insets/insetcollapsable.h
index a3cabdd1e267901702c26aac0db7a728d282b530..539d1c78c9c8daee527db96a485f857393c3c008 100644 (file)
--- a/src/insets/insetcollapsable.h
+++ b/src/insets/insetcollapsable.h
@@ -22,16 +22,13 @@
 
 #include <string>
 
+namespace lyx {
+
 class LyXText;
 class Paragraph;
 class CursorSlice;
 
-namespace lyx {
-namespace frontend {
-class Painter;
-}
-}
-
+namespace frontend { class Painter; }
 
 /** A collapsable text inset
 
@@ -55,17 +52,18 @@ public:
        ///
        void drawSelection(PainterInfo & pi, int x, int y) const;
        /// return x,y of given position relative to the inset's baseline
-       void cursorPos(CursorSlice const & sl, bool boundary, int & x, int & y) const;
+       void cursorPos(BufferView const & bv, CursorSlice const & sl,
+               bool boundary, int & x, int & y) const;
        ///
        bool hitButton(FuncRequest const &) const;
        ///
-       std::string const getNewLabel(std::string const & l) const;
+       docstring const getNewLabel(docstring const & l) const;
        ///
        EDITABLE editable() const;
        /// can we go further down on mouse click?
        bool descendable() const;
        ///
-       void setLabel(std::string const & l);
+       void setLabel(docstring const & l);
        ///
        virtual void setButtonLabel() {}
        ///
@@ -97,7 +95,7 @@ protected:
        ///
        void setInlined() { status_ = Inlined; }
        ///
-       std::string floatName(std::string const & type, BufferParams const &);
+       docstring floatName(std::string const & type, BufferParams const &);
 
 protected:
        ///
@@ -109,7 +107,7 @@ protected:
        ///
        mutable int topbaseline;
        ///
-       mutable std::string label;
+       mutable docstring label;
 private:
        ///
        mutable CollapseStatus status_;
@@ -124,4 +122,6 @@ private:
 // A helper function that pushes the cursor out of the inset.
 void leaveInset(LCursor & cur, InsetBase const & in);
 
+} // namespace lyx
+
 #endif