Fix a number of other uninitialized members.

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

diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index bc0b674de6d7ebb5506e7d4532323b6746fb9dee..1d8775e8ed39e7544afbacdf2bd6568913ff31f8 100644 (file)
--- a/src/insets/InsetCaption.h
+++ b/src/insets/InsetCaption.h
@@ -21,29 +21,29 @@ namespace lyx {
 class InsetCaption : public InsetText {
 public:
        ///
-       InsetCaption(Buffer *);
+       InsetCaption(Buffer *, std::string const &);
        ///
-       std::string const & type() const { return type_; }
+       std::string const & floattype() const { return floattype_; }
        ///
-       docstring name() const;
+       docstring layoutName() const;
        /// return the mandatory argument (LaTeX format) only
-       int getArgument(otexstream & os, OutputParams const &) const;
-       /// return the optional argument(s) only
-       int getOptArg(otexstream & os, OutputParams const &) const;
+       void getArgument(otexstream & os, OutputParams const &) const;
        /// return the caption text
        int getCaptionAsPlaintext(odocstream & os, OutputParams const &) const;
        /// return the caption text as HTML
        docstring getCaptionAsHTML(XHTMLStream & os, OutputParams const &) const;
+       ///
+       std::string contextMenuName() const;
 private:
        ///
        void write(std::ostream & os) const;
        ///
-       void read(Lexer & lex);
-       ///
        DisplayType display() const { return AlignCenter; }
        ///
        bool neverIndent() const { return true; }
        ///
+       bool forceLocalFontSwitch() const { return true; }
+       ///
        InsetCode lyxCode() const { return CAPTION_CODE; }
        ///
        void cursorPos(BufferView const & bv,
@@ -63,13 +63,16 @@ private:
        ///
        bool insetAllowed(InsetCode code) const;
        ///
+       void doDispatch(Cursor & cur, FuncRequest & cmd);
+       ///
        bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
        // Update the counters of this inset and of its contents
        void updateBuffer(ParIterator const &, UpdateType);
        ///
-       int latex(otexstream & os, OutputParams const &) const;
+       void latex(otexstream & os, OutputParams const &) const;
        ///
-       int plaintext(odocstream & os, OutputParams const & runparams) const;
+       int plaintext(odocstringstream & ods, OutputParams const & op,
+                     size_t max_length = INT_MAX) const;
        ///
        int docbook(odocstream & os, OutputParams const & runparams) const;
        /// 
@@ -77,7 +80,7 @@ private:
        ///
        void setCustomLabel(docstring const & label);
        ///
-       void addToToc(DocIterator const &) const;
+       void addToToc(DocIterator const & di, bool output_active, UpdateType utype) const;
        /// 
        virtual bool forcePlainLayout(idx_type = 0) const { return true; }
        /// Captions don't accept alignment, spacing, etc.
@@ -90,6 +93,10 @@ private:
        ///
        mutable int labelwidth_;
        ///
+       std::string floattype_;
+       ///
+       bool is_subfloat_;
+       ///
        std::string type_;
        ///
        docstring custom_label_;