X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetoptarg.h;h=6e4546c3a278d7a07f8d217b14a80617b0b24422;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=5521a56f4feda2643420961a28d265b4fe120b86;hpb=3382c78af9e19dae30e40023f14623e88ca9b5bd;p=lyx.git

diff --git a/src/insets/insetoptarg.h b/src/insets/insetoptarg.h
index 5521a56f4f..6e4546c3a2 100644
--- a/src/insets/insetoptarg.h
+++ b/src/insets/insetoptarg.h
@@ -16,6 +16,9 @@
 #include "insetcollapsable.h"
 
 
+namespace lyx {
+
+
 /**
  * InsetOptArg. Used to insert a short version of sectioning header etc.
  * automatically, or other optional LaTeX arguments
@@ -27,34 +30,34 @@ public:
 	/// code of the inset
 	InsetBase::Code lyxCode() const { return InsetBase::OPTARG_CODE; }
 	/// return an message upon editing
-	std::string const editMessage() const;
+	virtual docstring const editMessage() const;
 
 	/// Standard LaTeX output -- short-circuited
-	int latex(Buffer const &, std::ostream &,
+	int latex(Buffer const &, odocstream &,
 		  OutputParams const &) const;
 	/// Standard DocBook output -- short-circuited
-	int docbook(Buffer const &, std::ostream &,
-		  OutputParams const &) const;
-	/// Standard LinuxDoc output -- short-circuited
-	int linuxdoc(Buffer const &, std::ostream &,
+	int docbook(Buffer const &, odocstream &,
 		  OutputParams const &) const;
 
 	/// Standard plain text output -- short-circuited
-	int plaintext(Buffer const &, std::ostream &,
+	int plaintext(Buffer const &, odocstream &,
 		  OutputParams const &) const;
 
 	/// Outputting the optional parameter of a LaTeX command
-	int latexOptional(Buffer const &, std::ostream &,
+	int latexOptional(Buffer const &, odocstream &,
 			  OutputParams const &) const;
-	/// Write out tothe .lyx file
+	/// Write out to the .lyx file
 	void write(Buffer const & buf, std::ostream & os) const;
 
 	/// should paragraph indendation be ommitted in any case?
-	virtual bool neverIndent() const { return true; }
+	virtual bool neverIndent(Buffer const &) const { return true; }
 protected:
 	InsetOptArg(InsetOptArg const &);
 private:
 	virtual std::auto_ptr<InsetBase> doClone() const;
 };
 
+
+} // namespace lyx
+
 #endif // INSETOPTARG_H