X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetert.h;h=77f81aef220a049bcaf6f5d780c4770c5c28c2d8;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=5efe845e402afb4e2bdf4fc0be6987085a3f6244;hpb=90f00ecfa69b2cea5a8b8a9a3b9cf16b7cd6e6ce;p=lyx.git

diff --git a/src/insets/insetert.h b/src/insets/insetert.h
index 5efe845e40..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.
 
@@ -45,25 +48,22 @@ public:
 	///
 	void read(Buffer const & buf, LyXLex & lex);
 	///
-	std::string const editMessage() const;
+	virtual docstring const editMessage() 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;
 	///
@@ -73,7 +73,7 @@ public:
 	///
 	bool forceDefaultParagraphs(idx_type) const { return true; }
 	/// should paragraph indendation be ommitted in any case?
-	bool neverIndent() const { return true; }
+	bool neverIndent(Buffer const &) const { return true; }
 protected:
 	InsetERT(InsetERT const &);
 	///
@@ -91,8 +91,6 @@ private:
 };
 
 
-#include "mailinset.h"
-
 class InsetERTMailer : public MailInset {
 public:
 	///
@@ -115,4 +113,7 @@ private:
 	InsetERT & inset_;
 };
 
+
+} // namespace lyx
+
 #endif