X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetert.h;h=77f81aef220a049bcaf6f5d780c4770c5c28c2d8;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=9cb08225e3e4f485a78bb711e73c0ffaac62b27a;hpb=59413be9a0b999c17784d1abad01e55819ecd27a;p=lyx.git

diff --git a/src/insets/insetert.h b/src/insets/insetert.h
index 9cb08225e3..77f81aef22 100644
--- a/src/insets/insetert.h
+++ b/src/insets/insetert.h
@@ -13,8 +13,11 @@
 #ifndef INSETERT_H
 #define INSETERT_H
 
-
 #include "insetcollapsable.h"
+#include "mailinset.h"
+
+
+namespace lyx {
 
 /** A collapsable text inset for LaTeX insertions.
 
@@ -31,35 +34,36 @@ class InsetERT : public InsetCollapsable {
 public:
 	///
 	InsetERT(BufferParams const &, CollapseStatus status = Open);
+#if 0
 	///
 	InsetERT(BufferParams const &,
 		 Language const *, std::string const & contents, CollapseStatus status);
+#endif
 	///
 	~InsetERT();
 	///
-	InsetOld::Code lyxCode() const { return InsetOld::ERT_CODE; }
+	InsetBase::Code lyxCode() const { return InsetBase::ERT_CODE; }
 	///
 	void write(Buffer const & buf, std::ostream & os) const;
 	///
-	std::string const editMessage() const;
+	void read(Buffer const & buf, LyXLex & lex);
+	///
+	virtual docstring const editMessage() const;
 	///
-	bool insetAllowed(InsetOld::Code code) const;
+	bool insetAllowed(InsetBase::Code code) const;
 	///
-	int latex(Buffer const &, std::ostream &,
+	int latex(Buffer const &, odocstream &,
 		  OutputParams const &) const;
 	///
-	int plaintext(Buffer const &, std::ostream &,
+	int plaintext(Buffer const &, odocstream &,
 		  OutputParams const & runparams) const;
 	///
-	int linuxdoc(Buffer const &, std::ostream &,
-		     OutputParams const &) const;
-	///
-	int docbook(Buffer const &, std::ostream &,
+	int docbook(Buffer const &, odocstream &,
 		    OutputParams const & runparams) const;
 	///
 	void validate(LaTeXFeatures &) const {}
 	///
-	void metrics(MetricsInfo &, Dimension &) const;
+	bool metrics(MetricsInfo &, Dimension &) const;
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
 	///
@@ -67,11 +71,13 @@ public:
 	///
 	void getDrawFont(LyXFont &) const;
 	///
-	bool forceDefaultParagraphs(InsetBase const *) const { return true; }
+	bool forceDefaultParagraphs(idx_type) const { return true; }
+	/// should paragraph indendation be ommitted in any case?
+	bool neverIndent(Buffer const &) const { return true; }
 protected:
 	InsetERT(InsetERT const &);
 	///
-	virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd);
+	virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
 	///
 	bool getStatus(LCursor & cur, FuncRequest const & cmd, FuncStatus &) const;
 private:
@@ -85,8 +91,6 @@ private:
 };
 
 
-#include "mailinset.h"
-
 class InsetERTMailer : public MailInset {
 public:
 	///
@@ -109,4 +113,7 @@ private:
 	InsetERT & inset_;
 };
 
+
+} // namespace lyx
+
 #endif