X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetOptArg.h;h=20867f299a0e321c463964bd0879d88569c88d5b;hb=d6f1915684328c6e3fe61c6eef8846b5cabec334;hp=7f57c87a5f1d7a5e488927c9a56a7ad17006020b;hpb=32871c1284f15265f652ff01c438e539a7c8181f;p=lyx.git

diff --git a/src/insets/InsetOptArg.h b/src/insets/InsetOptArg.h
index 7f57c87a5f..20867f299a 100644
--- a/src/insets/InsetOptArg.h
+++ b/src/insets/InsetOptArg.h
@@ -23,39 +23,39 @@ namespace lyx {
  * InsetOptArg. Used to insert a short version of sectioning header etc.
  * automatically, or other optional LaTeX arguments
  */
-class InsetOptArg : public InsetCollapsable {
+class InsetOptArg : public InsetCollapsable
+{
 public:
-	InsetOptArg(BufferParams const &);
+	///
+	InsetOptArg(Buffer const &);
+
+	/// Outputting the optional parameter of a LaTeX command
+	int latexOptional(odocstream &, OutputParams const &) const;
 
+private:
 	/// code of the inset
-	Inset::Code lyxCode() const { return Inset::OPTARG_CODE; }
-	/// return an message upon editing
-	virtual docstring const editMessage() const;
+	InsetCode lyxCode() const { return OPTARG_CODE; }
 	///
-	virtual bool wide() const { return false; }
+	docstring name() const { return from_ascii("OptArg"); }
+	/// return an message upon editing
+	docstring editMessage() const;
 
 	/// Standard LaTeX output -- short-circuited
-	int latex(Buffer const &, odocstream &,
-	          OutputParams const &) const;
+	int latex(odocstream &, OutputParams const &) const;
 	/// Standard plain text output -- short-circuited
-	int plaintext(Buffer const &, odocstream &,
-	              OutputParams const &) const;
+	int plaintext(odocstream &, OutputParams const &) const;
 	/// Standard DocBook output -- short-circuited
-	int docbook(Buffer const &, odocstream &,
-	            OutputParams const &) const;
+	int docbook(odocstream &, OutputParams const &) const;
+	///
+	virtual bool forcePlainLayout(idx_type = 0) const { return true; }
 
-	/// Outputting the optional parameter of a LaTeX command
-	int latexOptional(Buffer const &, odocstream &,
-			  OutputParams const &) const;
 	/// Write out to the .lyx file
-	void write(Buffer const & buf, std::ostream & os) const;
+	void write(std::ostream & os) const;
 
 	/// should paragraph indendation be ommitted in any case?
-	virtual bool neverIndent(Buffer const &) const { return true; }
-protected:
-	InsetOptArg(InsetOptArg const &);
-private:
-	virtual std::auto_ptr<Inset> doClone() const;
+	bool neverIndent() const { return true; }
+	///
+	Inset * clone() const { return new InsetOptArg(*this); }
 };