X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetert.h;h=86c9694e5fe57380bae394f5f67cdef36a5aa3a0;hb=b0eb70e869128e30ab7e4538aa32a244fd4cea57;hp=1a1cc59c0d90c4628861fbb515d7034de06cb838;hpb=e22ee4208daabef736f94ff479701a66e07255f9;p=lyx.git

diff --git a/src/insets/insetert.h b/src/insets/insetert.h
index 1a1cc59c0d..86c9694e5f 100644
--- a/src/insets/insetert.h
+++ b/src/insets/insetert.h
@@ -7,7 +7,7 @@
  * \author Jürgen Vigna
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef INSETERT_H
@@ -38,55 +38,47 @@ public:
 	///
 	InsetERT(BufferParams const &, bool collapsed = false);
 	///
-	InsetERT(InsetERT const &, bool same_id = false);
+	InsetERT(InsetERT const &);
 	///
-	Inset * clone(Buffer const &, bool same_id = false) const;
+	virtual std::auto_ptr<InsetBase> clone() const;
 	///
 	InsetERT(BufferParams const &,
-		 Language const *, string const & contents, bool collapsed);
+		 Language const *, std::string const & contents, bool collapsed);
 	///
 	~InsetERT();
 	///
-	Inset::Code lyxCode() const { return Inset::ERT_CODE; }
+	InsetOld::Code lyxCode() const { return InsetOld::ERT_CODE; }
 	///
-	void read(Buffer const * buf, LyXLex & lex);
+	void read(Buffer const & buf, LyXLex & lex);
 	///
-	void write(Buffer const * buf, std::ostream & os) const;
+	void write(Buffer const & buf, std::ostream & os) const;
 	///
-	string const editMessage() const;
+	std::string const editMessage() const;
 	///
-	bool insertInset(BufferView *, Inset *);
+	bool insertInset(BufferView *, InsetOld *);
 	///
-	bool insetAllowed(Inset::Code) const { return false; }
+	bool insetAllowed(InsetOld::Code code) const { return code == InsetOld::NEWLINE_CODE; }
 	///
 	void setFont(BufferView *, LyXFont const &,
 			     bool toggleall = false, bool selectall = false);
 	///
-	void edit(BufferView *, int, int, mouse_button::state);
-	///
-	void edit(BufferView * bv, bool front = true);
-	///
 	EDITABLE editable() const;
 	///
-	int latex(Buffer const *, std::ostream &, bool fragile,
-		  bool free_spc) const;
+	int latex(Buffer const &, std::ostream &,
+		  LatexRunParams const &) const;
 	///
-	int ascii(Buffer const *,
+	int ascii(Buffer const &,
 			  std::ostream &, int linelen = 0) const;
 	///
-	int linuxdoc(Buffer const *, std::ostream &) const;
+	int linuxdoc(Buffer const &, std::ostream &) const;
 	///
-	int docbook(Buffer const *, std::ostream &, bool mixcont) const;
+	int docbook(Buffer const &, std::ostream &, bool mixcont) const;
 	///
 	void validate(LaTeXFeatures &) const {}
 	///
-	RESULT localDispatch(FuncRequest const &);
-	///
 	bool checkInsertChar(LyXFont &);
 	///
-	// this are needed here because of the label/inlined functionallity
-	///
-	bool needFullRow() const { return status_ == Open; }
+	// these are needed here because of the label/inlined functionallity
 	///
 	bool isOpen() const { return status_ == Open || status_ == Inlined; }
 	///
@@ -103,13 +95,9 @@ public:
 	WordLangTuple const
 	selectNextWordToSpellcheck(BufferView *, float &) const;
 	///
-	int ascent(BufferView *, LyXFont const &) const;
+	void metrics(MetricsInfo &, Dimension &) const;
 	///
-	int descent(BufferView *, LyXFont const &) const;
-	///
-	int width(BufferView *, LyXFont const &) const;
-	///
-	void draw(BufferView *, const LyXFont &, int , float &, bool) const;
+	void draw(PainterInfo & pi, int x, int y) const;
 	/// set the status of the inset
 	void status(BufferView *, ERTStatus const st) const;
 	///
@@ -117,14 +105,14 @@ public:
 	///
 	void getDrawFont(LyXFont &) const;
 	///
-	bool forceDefaultParagraphs(Inset const *) const {
+	bool forceDefaultParagraphs(InsetOld const *) const {
 		return true;
 	}
+protected:
 	///
-	int getMaxWidth(BufferView *, UpdatableInset const *) const;
-	///
-	void update(BufferView *, LyXFont const &, bool =false);
-
+	virtual
+	DispatchResult
+	priv_dispatch(FuncRequest const &, idx_type &, pos_type &);
 private:
 	///
 	void lfunMousePress(FuncRequest const &);
@@ -139,7 +127,7 @@ private:
 	///
 	void init();
 	///
-	string const get_new_label() const;
+	std::string const get_new_label() const;
 	///
 	void setButtonLabel() const;
 	///
@@ -159,18 +147,18 @@ public:
 	///
 	InsetERTMailer(InsetERT & inset);
 	///
-	virtual Inset & inset() const { return inset_; }
+	virtual InsetBase & inset() const { return inset_; }
 	///
-	virtual string const & name() const { return name_; }
+	virtual std::string const & name() const { return name_; }
 	///
-	virtual string const inset2string() const;
+	virtual std::string const inset2string(Buffer const &) const;
 	///
-	static void string2params(string const &, InsetERT::ERTStatus &);
+	static void string2params(std::string const &, InsetERT::ERTStatus &);
 	///
-	static string const params2string(InsetERT::ERTStatus);
+	static std::string const params2string(InsetERT::ERTStatus);
 private:
 	///
-	static string const name_;
+	static std::string const name_;
 	///
 	InsetERT & inset_;
 };