tex2lyx/text.cpp: fix typos

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

diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index be5a73aeba056e67961a52b9d54226ad31bdb806..dc28873fb109acd464d1789f6f7688a0f5ed2186 100644 (file)
--- a/src/insets/InsetCaption.h
+++ b/src/insets/InsetCaption.h
@@ -13,7 +13,6 @@
 #define INSETCAPTION_H
 
 #include "InsetText.h"
-#include "support/strfwd.h"
 
 namespace lyx {
 
@@ -26,11 +25,11 @@ public:
        ///
        std::string const & type() const { return type_; }
        ///
-       docstring name() const;
+       docstring layoutName() const;
        /// return the mandatory argument (LaTeX format) only
-       int getArgument(odocstream & os, OutputParams const &) const;
+       void getArgument(otexstream & os, OutputParams const &) const;
        /// return the optional argument(s) only
-       int getOptArg(odocstream & os, OutputParams const &) const;
+       void getOptArg(otexstream & os, OutputParams const &) const;
        /// return the caption text
        int getCaptionAsPlaintext(odocstream & os, OutputParams const &) const;
        /// return the caption text as HTML
@@ -39,8 +38,6 @@ private:
        ///
        void write(std::ostream & os) const;
        ///
-       void read(Lexer & lex);
-       ///
        DisplayType display() const { return AlignCenter; }
        ///
        bool neverIndent() const { return true; }
@@ -53,6 +50,8 @@ private:
        bool descendable(BufferView const &) const { return true; }
        ///
        void metrics(MetricsInfo & mi, Dimension & dim) const;
+       ///     
+       void drawBackground(PainterInfo & pi, int x, int y) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
@@ -66,7 +65,7 @@ private:
        // Update the counters of this inset and of its contents
        void updateBuffer(ParIterator const &, UpdateType);
        ///
-       int latex(odocstream & os, OutputParams const &) const;
+       void latex(otexstream & os, OutputParams const &) const;
        ///
        int plaintext(odocstream & os, OutputParams const & runparams) const;
        ///
@@ -76,7 +75,7 @@ private:
        ///
        void setCustomLabel(docstring const & label);
        ///
-       void addToToc(DocIterator const &);
+       void addToToc(DocIterator const &) const;
        /// 
        virtual bool forcePlainLayout(idx_type = 0) const { return true; }
        /// Captions don't accept alignment, spacing, etc.