Remove all BufferParam arguments in InsetXXX methods (since insets know about their...

[lyx.git] / src / insets / InsetOptArg.h

diff --git a/src/insets/InsetOptArg.h b/src/insets/InsetOptArg.h
index 7f57c87a5f1d7a5e488927c9a56a7ad17006020b..c5aa1115b6cfaf8174fb08054d9b644ecf5da291 100644 (file)
--- a/src/insets/InsetOptArg.h
+++ b/src/insets/InsetOptArg.h
@@ -23,39 +23,38 @@ 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 &);
 
-       /// code of the inset
-       Inset::Code lyxCode() const { return Inset::OPTARG_CODE; }
-       /// return an message upon editing
-       virtual docstring const editMessage() const;
+       /// Outputting the optional parameter of a LaTeX command
+       int latexOptional(odocstream &, OutputParams const &) const;
        ///
-       virtual bool wide() const { return false; }
+       bool hasSettings() const { return false; }
 
+private:
+       /// code of the inset
+       InsetCode lyxCode() const { return OPTARG_CODE; }
+       ///
+       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;
-
-       /// Outputting the optional parameter of a LaTeX command
-       int latexOptional(Buffer const &, odocstream &,
-                         OutputParams const &) const;
+       int docbook(odocstream &, OutputParams const &) const;
+       /// Standard XHTML output -- short-circuited
+       docstring xhtml(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); }
 };