X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetEnvironment.h;h=69fc9c4507ee39410324bc0bdeeb09697f0278c2;hb=0362c6aae73c293d1c20277c12d362acfe0b2ef6;hp=14d944126abaa1b90d8d1d2ba3f59bf941d4e580;hpb=32871c1284f15265f652ff01c438e539a7c8181f;p=lyx.git

diff --git a/src/insets/InsetEnvironment.h b/src/insets/InsetEnvironment.h
index 14d944126a..69fc9c4507 100644
--- a/src/insets/InsetEnvironment.h
+++ b/src/insets/InsetEnvironment.h
@@ -13,7 +13,7 @@
 #define INSETENVIRONMENT_H
 
 #include "InsetText.h"
-#include "lyxlayout_ptr_fwd.h"
+#include "LayoutPtr.h"
 
 
 namespace lyx {
@@ -21,27 +21,27 @@ namespace lyx {
 class InsetEnvironment : public InsetText {
 public:
 	///
-	InsetEnvironment(BufferParams const &, std::string const & name);
+	InsetEnvironment(BufferParams const &, docstring const & name);
 	///
-	docstring insetName() const { return name_; }
+	docstring name() const { return name_; }
 	///
 	void write(Buffer const & buf, std::ostream & os) const;
 	///
 	void read(Buffer const & buf, Lexer & lex);
 	///
-	Inset::Code lyxCode() const { return Inset::ENVIRONMENT_CODE; }
+	InsetCode lyxCode() const { return ENVIRONMENT_CODE; }
 	///
 	int latex(Buffer const &, odocstream &,
-	          OutputParams const &) const;
+		  OutputParams const &) const;
 	///
 	int plaintext(Buffer const &, odocstream &,
-	              OutputParams const &) const;
+		      OutputParams const &) const;
 	///
 	virtual docstring const editMessage() const;
 	///
 	Inset::EDITABLE editable() const { return HIGHLY_EDITABLE; }
 	///
-	LyXLayout_ptr const & layout() const;
+	LayoutPtr const & layout() 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 */
@@ -49,9 +49,9 @@ public:
 protected:
 	InsetEnvironment(InsetEnvironment const &);
 private:
-	virtual std::auto_ptr<Inset> doClone() const;
+	virtual Inset * clone() const;
 	/// the layout
-	LyXLayout_ptr layout_;
+	LayoutPtr layout_;
 	///
 	docstring name_;
 };