X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetquotes.h;h=cbd2f5dcbfcdff84687a51709ca9e19eb23e4f85;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=116005f3b51e4b799384e473f40b9a94e17922a7;hpb=6afe0b915c00fe8c95021a63b3b0b391c56b7c2f;p=lyx.git

diff --git a/src/insets/insetquotes.h b/src/insets/insetquotes.h
index 116005f3b5..cbd2f5dcbf 100644
--- a/src/insets/insetquotes.h
+++ b/src/insets/insetquotes.h
@@ -17,9 +17,11 @@
 
 #include "support/types.h"
 
+
+namespace lyx {
+
 class BufferParams;
 class Language;
-
 class LaTeXFeatures;
 
 
@@ -68,11 +70,11 @@ public:
 	explicit
 	InsetQuotes(std::string const & str = "eld");
 	/// Create the right quote inset after character c
-	InsetQuotes(lyx::char_type c, BufferParams const & params);
+	InsetQuotes(char_type c, BufferParams const & params);
 	/// Direct access to inner/outer quotation marks
-	InsetQuotes(lyx::char_type c, quote_language l, quote_times t);
+	InsetQuotes(char_type c, quote_language l, quote_times t);
 	///
-	void metrics(MetricsInfo &, Dimension &) const;
+	bool metrics(MetricsInfo &, Dimension &) const;
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
 #if 0
@@ -84,18 +86,14 @@ public:
 	///
 	void read(Buffer const &, LyXLex & lex);
 	///
-	int latex(Buffer const &, std::ostream &,
-		  OutputParams const &) const;
+	int latex(Buffer const &, odocstream &, OutputParams const &) const;
 	///
-	int plaintext(Buffer const &, std::ostream &,
-		  OutputParams const &) const;
+	int plaintext(Buffer const &, odocstream &, OutputParams const &) const;
 	///
-	int docbook(Buffer const &, std::ostream &,
-		    OutputParams const &) const;
+	int docbook(Buffer const &, odocstream &, OutputParams const &) const;
 
 	/// the string that is passed to the TOC
-	virtual int textString(Buffer const &, std::ostream & os,
-		OutputParams const &) const;
+	virtual void textString(Buffer const &, odocstream &) const;
 
 	///
 	void validate(LaTeXFeatures &) const;
@@ -119,10 +117,13 @@ private:
 	 */
 	InsetQuotes(quote_language l, quote_side s, quote_times t);
 	/// Decide whether we need left or right quotation marks
-	void getPosition(lyx::char_type c);
+	void getPosition(char_type c);
 	///
 	void parseString(std::string const &);
 	///
-	std::string const dispString(Language const *) const;
+	lyx::docstring const dispString(Language const *) const;
 };
+
+} // namespace lyx
+
 #endif