progress on buffer-reference-in-insets. beware of instabilities...

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

diff --git a/src/insets/InsetFloat.h b/src/insets/InsetFloat.h
index ca18156b77c914c435d130e62f194f1c0cc821cc..8a39303310834a0be85789308c4da2dbd5ffbbf2 100644 (file)
--- a/src/insets/InsetFloat.h
+++ b/src/insets/InsetFloat.h
@@ -51,26 +51,25 @@ public:
        ///
        docstring name() const { return name_; }
        ///
-       void write(Buffer const & buf, std::ostream & os) const;
+       void write(std::ostream & os) const;
        ///
-       void read(Buffer const & buf, Lexer & lex);
+       void read(Lexer & lex);
        ///
        void validate(LaTeXFeatures & features) const;
        ///
-       Inset::Code lyxCode() const { return Inset::FLOAT_CODE; }
+       InsetCode lyxCode() const { return FLOAT_CODE; }
+       ///
+       bool isMacroScope() const { return true; }
        ///
-       int latex(Buffer const &, odocstream &,
-                 OutputParams const &) const;
+       int latex(odocstream &, OutputParams const &) const;
        ///
-       int plaintext(Buffer const &, odocstream &,
-                     OutputParams const &) const;
+       int plaintext(odocstream &, OutputParams const &) const;
        ///
-       int docbook(Buffer const &, odocstream &,
-                   OutputParams const &) const;
+       int docbook(odocstream &, OutputParams const &) const;
        ///
-       virtual docstring const editMessage() const;
+       docstring 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 */
@@ -86,12 +85,12 @@ public:
        ///
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
        // Update the counters of this inset and of its contents
-       virtual void updateLabels(Buffer const &, ParIterator const &);
+       void updateLabels(ParIterator const &);
 protected:
        virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
 private:
        ///
-       virtual std::auto_ptr<Inset> doClone() const;
+       virtual Inset * clone() const;
        ///
        InsetFloatParams params_;
        ///