X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFloat.h;h=8a39303310834a0be85789308c4da2dbd5ffbbf2;hb=db8c16d554ebb1dcb319e44d318572de6eff024b;hp=21abf3be595e5fb734c58ff77116e9136f81491a;hpb=d3e30f8d9b68d51141290c7f4888040e9cfbaffa;p=lyx.git

diff --git a/src/insets/InsetFloat.h b/src/insets/InsetFloat.h
index 21abf3be59..8a39303310 100644
--- a/src/insets/InsetFloat.h
+++ b/src/insets/InsetFloat.h
@@ -51,28 +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; }
 	///
-	virtual bool wide() const { return false; }
+	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 */
@@ -87,11 +84,13 @@ public:
 	InsetFloatParams const & params() const { return params_; }
 	///
 	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
+	// Update the counters of this inset and of its contents
+	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_;
 	///