Further cleanup of collapsable insets. The layouts are now properly read and applied.

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

diff --git a/src/insets/InsetFloat.h b/src/insets/InsetFloat.h
index d56ededc5dcf09c4d5b22df5752f59d83345b8b1..ee2728a768d9f86ba2ff340357e84cd02447517a 100644 (file)
--- a/src/insets/InsetFloat.h
+++ b/src/insets/InsetFloat.h
@@ -57,9 +57,7 @@ public:
        ///
        void validate(LaTeXFeatures & features) const;
        ///
-       Inset::Code lyxCode() const { return Inset::FLOAT_CODE; }
-       ///
-       virtual bool wide() const { return false; }
+       InsetCode lyxCode() const { return FLOAT_CODE; }
        ///
        int latex(Buffer const &, odocstream &,
                  OutputParams const &) const;
@@ -72,7 +70,7 @@ public:
        ///
        virtual docstring const editMessage() const;
        ///
-       bool insetAllowed(Inset::Code) const;
+       bool insetAllowed(InsetCode) const;
        /** returns true if, when outputing LaTeX, font changes should
            be closed before generating this inset. This is needed for
            insets that may contain several paragraphs */
@@ -93,7 +91,7 @@ protected:
        virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
 private:
        ///
-       virtual std::auto_ptr<Inset> doClone() const;
+       virtual Inset * clone() const;
        ///
        InsetFloatParams params_;
        ///