X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFloat.h;h=7800d55c96d3c2b8351537483f226fccb36d2322;hb=2c357c1d23b7b83839a9beb8225d4f1ae4f793b4;hp=1c53db3f54b7d2101040a67dae855f970bf3e8ec;hpb=32871c1284f15265f652ff01c438e539a7c8181f;p=lyx.git

diff --git a/src/insets/InsetFloat.h b/src/insets/InsetFloat.h
index 1c53db3f54..7800d55c96 100644
--- a/src/insets/InsetFloat.h
+++ b/src/insets/InsetFloat.h
@@ -49,7 +49,7 @@ public:
 	///
 	~InsetFloat();
 	///
-	docstring insetName() const { return name_; }
+	docstring name() const { return name_; }
 	///
 	void write(Buffer const & buf, std::ostream & os) const;
 	///
@@ -57,22 +57,22 @@ public:
 	///
 	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(Buffer const &) const { return true; }
 	///
 	int latex(Buffer const &, odocstream &,
-	          OutputParams const &) const;
+		  OutputParams const &) const;
 	///
 	int plaintext(Buffer const &, odocstream &,
-	              OutputParams const &) const;
+		      OutputParams const &) const;
 	///
 	int docbook(Buffer const &, odocstream &,
-	            OutputParams const &) const;
+		    OutputParams const &) const;
 	///
 	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 */
@@ -82,18 +82,18 @@ public:
 	///
 	void sideways(bool s, BufferParams const &);
 	///
-	void addToToc(TocList &, Buffer const &) const;
-	///
 	bool  showInsetDialog(BufferView *) const;
 	///
 	InsetFloatParams const & params() const { return params_; }
 	///
 	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
+	// Update the counters of this inset and of its contents
+	virtual void updateLabels(Buffer const &, ParIterator const &);
 protected:
 	virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
 private:
 	///
-	virtual std::auto_ptr<Inset> doClone() const;
+	virtual Inset * clone() const;
 	///
 	InsetFloatParams params_;
 	///