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

diff --git a/src/insets/insetquotes.h b/src/insets/insetquotes.h
index f8d453b983..cbd2f5dcbf 100644
--- a/src/insets/insetquotes.h
+++ b/src/insets/insetquotes.h
@@ -15,10 +15,14 @@
 
 #include "inset.h"
 
+#include "support/types.h"
+
+
+namespace lyx {
+
 class BufferParams;
 class Language;
-
-struct LaTeXFeatures;
+class LaTeXFeatures;
 
 
 /** Quotes.
@@ -66,13 +70,11 @@ public:
 	explicit
 	InsetQuotes(std::string const & str = "eld");
 	/// Create the right quote inset after character c
-	InsetQuotes(char c, BufferParams const & params);
+	InsetQuotes(char_type c, BufferParams const & params);
 	/// Direct access to inner/outer quotation marks
-	InsetQuotes(char c, quote_language l, quote_times t);
-	///
-	virtual std::auto_ptr<InsetBase> clone() const;
+	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,25 +86,25 @@ public:
 	///
 	void read(Buffer const &, LyXLex & lex);
 	///
-	int latex(Buffer const &, std::ostream &,
-		  OutputParams const &) const;
-	///
-	int plaintext(Buffer const &, std::ostream &,
-		  OutputParams const &) const;
+	int latex(Buffer const &, odocstream &, OutputParams const &) const;
 	///
-	int linuxdoc(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 void textString(Buffer const &, odocstream &) const;
+
 	///
 	void validate(LaTeXFeatures &) const;
 	///
-	InsetOld::Code lyxCode() const;
+	InsetBase::Code lyxCode() const;
 	// should this inset be handled like a normal character
 	bool isChar() const { return true; }
 
 private:
+	virtual std::auto_ptr<InsetBase> doClone() const;
+
 	///
 	quote_language language_;
 	///
@@ -115,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(char 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