X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFloat.h;h=7800d55c96d3c2b8351537483f226fccb36d2322;hb=06254d11dfdf670fab3548dc2a2674e7a261262c;hp=1ed9cba01437c158f4dfc419efc69c5c4505390b;hpb=c8d00ed1272cd489041bed2115081008b6a26489;p=lyx.git

diff --git a/src/insets/InsetFloat.h b/src/insets/InsetFloat.h
index 1ed9cba014..7800d55c96 100644
--- a/src/insets/InsetFloat.h
+++ b/src/insets/InsetFloat.h
@@ -27,7 +27,7 @@ public:
 	///
 	void write(std::ostream & os) const;
 	///
-	void read(LyXLex & lex);
+	void read(Lexer & lex);
 	///
 	std::string type;
 	///
@@ -49,28 +49,30 @@ public:
 	///
 	~InsetFloat();
 	///
+	docstring name() const { return name_; }
+	///
 	void write(Buffer const & buf, std::ostream & os) const;
 	///
-	void read(Buffer const & buf, LyXLex & lex);
+	void read(Buffer const & buf, Lexer & lex);
 	///
 	void validate(LaTeXFeatures & features) const;
 	///
-	InsetBase::Code lyxCode() const { return InsetBase::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(InsetBase::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 */
@@ -80,20 +82,22 @@ 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(LCursor &, FuncRequest const &, FuncStatus &) const;
+	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(LCursor & cur, FuncRequest & cmd);
+	virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
 private:
-	virtual std::auto_ptr<InsetBase> doClone() const;
-
+	///
+	virtual Inset * clone() const;
 	///
 	InsetFloatParams params_;
+	///
+	docstring name_;
 };
 
 
@@ -102,7 +106,7 @@ public:
 	///
 	InsetFloatMailer(InsetFloat & inset);
 	///
-	virtual InsetBase & inset() const { return inset_; }
+	virtual Inset & inset() const { return inset_; }
 	///
 	virtual std::string const & name() const { return name_; }
 	///