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 243b18ece08ba12f0475ebf6085646ccf1454270..94da626e58d9e55a3f50c3b5ee8d930d38e69255 100644 (file)
--- a/src/insets/insetoptarg.C
+++ b/src/insets/insetoptarg.C
@@ -3,32 +3,25 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Martin Vermeer  
+ * \author Martin Vermeer
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#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)
@@ -40,8 +33,8 @@ InsetOptArg::InsetOptArg(BufferParams const & ins)
 }
 
 
-InsetOptArg::InsetOptArg(InsetOptArg const & in, bool same_id)
-       : InsetCollapsable(in, same_id)
+InsetOptArg::InsetOptArg(InsetOptArg const & in)
+       : InsetCollapsable(in)
 {
        LyXFont font(LyXFont::ALL_SANE);
        font.setColor(LColor::collapsable);
@@ -50,9 +43,9 @@ InsetOptArg::InsetOptArg(InsetOptArg const & in, bool same_id)
 }
 
 
-Inset * InsetOptArg::clone(Buffer const &, bool same_id) const
+auto_ptr<InsetBase> InsetOptArg::clone() const
 {
-       return new InsetOptArg(*this, same_id);
+       return auto_ptr<InsetBase>(new InsetOptArg(*this));
 }
 
 
@@ -62,24 +55,25 @@ 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 &, bool, bool) const
+
+int InsetOptArg::latex(Buffer const &, ostream &,
+                      LatexRunParams const &) const
 {
        return 0;
 }
 
- 
-int InsetOptArg::latexOptional(Buffer const * buf, ostream & os,
-                               bool, bool fp) const
+
+int InsetOptArg::latexOptional(Buffer const & buf, ostream & os,
+                              LatexRunParams const & runparams) const
 {
        os << '[';
-       int const i = inset.latex(buf, os, false, fp);
+       int const i = inset.latex(buf, os, runparams);
        os << ']';
        return i + 2;
 }