* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

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

diff --git a/src/insets/insetcaption.h b/src/insets/insetcaption.h
index ab6d9711556321c4841d68c61222ff726cf8cca5..310b0e0fd1958cb33ee45ed44e01253dd09615af 100644 (file)
--- a/src/insets/insetcaption.h
+++ b/src/insets/insetcaption.h
@@ -16,6 +16,9 @@
 #include "insettext.h"
 #include "lyxtextclass.h"
 
+
+namespace lyx {
+
 /** A caption inset
 */
 class InsetCaption : public InsetText {
@@ -29,18 +32,18 @@ public:
        ///
        virtual bool display() const;
        ///
-       virtual bool neverIndent() const { return true; }
+       virtual bool neverIndent(Buffer const &) const { return true; }
        ///
        virtual InsetBase::Code lyxCode() const;
        ///
-       virtual lyx::docstring const editMessage() const;
+       virtual docstring const editMessage() const;
        ///
        virtual void cursorPos(BufferView const & bv,
                CursorSlice const & sl, bool boundary, int & x, int & y) const;
        ///
        bool descendable() const { return true; }
        ///
-       virtual void metrics(MetricsInfo & mi, Dimension & dim) const;
+       virtual bool metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
        virtual void draw(PainterInfo & pi, int x, int y) const;
        ///
@@ -48,13 +51,13 @@ public:
        ///
        virtual InsetBase * editXY(LCursor & cur, int x, int y);
        ///
-       virtual int latex(Buffer const & buf, std::ostream & os,
+       virtual int latex(Buffer const & buf, odocstream & os,
                          OutputParams const &) const;
        ///
-       int plaintext(Buffer const & buf, lyx::odocstream & os,
+       int plaintext(Buffer const & buf, odocstream & os,
                  OutputParams const & runparams) const;
        ///
-       int docbook(Buffer const & buf, std::ostream & os,
+       int docbook(Buffer const & buf, odocstream & os,
                    OutputParams const & runparams) const;
        ///
        void setCount(int c) { counter_ = c; }
@@ -64,7 +67,7 @@ private:
        ///
        virtual std::auto_ptr<InsetBase> doClone() const;
        ///
-       mutable std::string label;
+       mutable docstring label;
        ///
        mutable int labelwidth_;
        ///
@@ -87,4 +90,7 @@ InsetBase::Code InsetCaption::lyxCode() const
        return CAPTION_CODE;
 }
 
+
+} // namespace lyx
+
 #endif