Final touch 'inset display()'; fix 'is a bit silly' bug

[lyx.git] / src / insets / insetoptarg.C

diff --git a/src/insets/insetoptarg.C b/src/insets/insetoptarg.C
index 7a082361026aa987d261465aea5f9593c08ae2e7..94da626e58d9e55a3f50c3b5ee8d930d38e69255 100644 (file)
--- a/src/insets/insetoptarg.C
+++ b/src/insets/insetoptarg.C
@@ -5,27 +5,23 @@
  *
  * \author Martin Vermeer
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
+#include "insetoptarg.h"
 
 #include "debug.h"
-
-#include "insetoptarg.h"
-#include "support/LOstream.h"
-#include "frontends/Alert.h"
-#include "support/lstrings.h" // frontStrip, strip
-#include "lyxtext.h"
-#include "buffer.h"
 #include "gettext.h"
-#include "BufferView.h"
-#include "support/lstrings.h"
+#include "LColor.h"
+#include "paragraph.h"
 
+
+using std::string;
+using std::auto_ptr;
 using std::ostream;
-using std::vector;
-using std::pair;
+
 
 InsetOptArg::InsetOptArg(BufferParams const & ins)
        : InsetCollapsable(ins, true)
@@ -47,9 +43,9 @@ InsetOptArg::InsetOptArg(InsetOptArg const & in)
 }
 
 
-Inset * InsetOptArg::clone(Buffer const &) const
+auto_ptr<InsetBase> InsetOptArg::clone() const
 {
-       return new InsetOptArg(*this);
+       return auto_ptr<InsetBase>(new InsetOptArg(*this));
 }
 
 
@@ -59,21 +55,21 @@ string const InsetOptArg::editMessage() const
 }
 
 
-void InsetOptArg::write(Buffer const * buf, ostream & os) const
+void InsetOptArg::write(Buffer const & buf, ostream & os) const
 {
        os << "OptArg" << "\n";
        InsetCollapsable::write(buf, os);
 }
 
 
-int InsetOptArg::latex(Buffer const *, ostream &,
+int InsetOptArg::latex(Buffer const &, ostream &,
                       LatexRunParams const &) const
 {
        return 0;
 }
 
 
-int InsetOptArg::latexOptional(Buffer const * buf, ostream & os,
+int InsetOptArg::latexOptional(Buffer const & buf, ostream & os,
                               LatexRunParams const & runparams) const
 {
        os << '[';