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

diff --git a/src/insets/InsetFloat.h b/src/insets/InsetFloat.h
index b74faa0a6b..4a4c7d5bfb 100644
--- a/src/insets/InsetFloat.h
+++ b/src/insets/InsetFloat.h
@@ -51,7 +51,7 @@ class InsetFloat : public InsetCollapsable
 {
 public:
 	///
-	InsetFloat(Buffer *, std::string const &);
+	InsetFloat(Buffer * buffer, std::string params_str);
 
 	///
 	static void string2params(std::string const &, InsetFloatParams &);
@@ -69,7 +69,7 @@ public:
 	InsetFloatParams const & params() const { return params_; }
 private:
 	///
-	docstring name() const;
+	docstring layoutName() const;
 	///
 	docstring toolTip(BufferView const & bv, int x, int y) const;
 	///
@@ -81,7 +81,7 @@ 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;
 	///
@@ -90,16 +90,14 @@ private:
 	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 &, UpdateType);
+	void updateBuffer(ParIterator const &, UpdateType);
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
 	///
@@ -108,8 +106,6 @@ private:
 	docstring getCaption(OutputParams const &) const;
 	///
 	InsetFloatParams params_;
-	///
-	docstring name_;
 };