X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFloat.h;h=4a4c7d5bfbded980859a3d7174ebf884695af1dd;hb=bfddee97e191a853f0576f4fab3f095c4e9ce0de;hp=b1500f9a0ed99d9d17ea3e0ecdf57bdd59ce2a4d;hpb=e4dea6c076aa4ca929ba31504fcbf3b8911f91d8;p=lyx.git

diff --git a/src/insets/InsetFloat.h b/src/insets/InsetFloat.h
index b1500f9a0e..4a4c7d5bfb 100644
--- a/src/insets/InsetFloat.h
+++ b/src/insets/InsetFloat.h
@@ -4,8 +4,8 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Jürgen Vigna
- * \author Lars Gullik Bjønnes
+ * \author Jürgen Vigna
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -51,27 +51,25 @@ class InsetFloat : public InsetCollapsable
 {
 public:
 	///
-	InsetFloat(Buffer const &, std::string const &);
-	///
-	~InsetFloat();
+	InsetFloat(Buffer * buffer, std::string params_str);
 
 	///
 	static void string2params(std::string const &, InsetFloatParams &);
 	///
 	static std::string params2string(InsetFloatParams const &);
 	///
-	void setWide(bool w, BufferParams const &, bool update_label = true);
+	void setWide(bool w, bool update_label = true);
 	///
-	void setSideways(bool s, BufferParams const &, bool update_label = true);
+	void setSideways(bool s, bool update_label = true);
 	///
-	void setSubfloat(bool s, BufferParams const &, bool update_label = true);
+	void setSubfloat(bool s, bool update_label = true);
 	///
-	void setNewLabel(BufferParams const &);
+	void setNewLabel();
 	///
 	InsetFloatParams const & params() const { return params_; }
 private:
 	///
-	docstring name() const { return name_; }
+	docstring layoutName() const;
 	///
 	docstring toolTip(BufferView const & bv, int x, int y) const;
 	///
@@ -83,25 +81,23 @@ private:
 	///
 	InsetCode lyxCode() const { return FLOAT_CODE; }
 	///
-	int latex(odocstream &, OutputParams const &) const;
+	void latex(otexstream &, OutputParams const &) const;
 	///
 	int plaintext(odocstream &, OutputParams const &) const;
 	///
 	int docbook(odocstream &, OutputParams const &) const;
 	///
-	docstring editMessage() const;
+	docstring xhtml(XHTMLStream &, OutputParams const &) const;
 	///
 	bool insetAllowed(InsetCode) const;
-	/** returns true if, when outputing LaTeX, font changes should
+	/** returns false if, when outputing LaTeX, font changes should
 	    be closed before generating this inset. This is needed for
 	    insets that may contain several paragraphs */
-	bool noFontChange() const { return true; }
-	///
-	bool showInsetDialog(BufferView *) const;
+	bool inheritFont() const { return false; }
 	///
 	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
 	// Update the counters of this inset and of its contents
-	void updateLabels(ParIterator const &);
+	void updateBuffer(ParIterator const &, UpdateType);
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
 	///
@@ -109,11 +105,7 @@ private:
 	///
 	docstring getCaption(OutputParams const &) const;
 	///
-	docstring getCaptionText(OutputParams const &) const;
-	///
 	InsetFloatParams params_;
-	///
-	docstring name_;
 };