Fix text frame drawing.

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

diff --git a/src/insets/InsetOptArg.cpp b/src/insets/InsetOptArg.cpp
index d6a85574bb3e74c21f5b0486036159416c7f7aa8..6150bc8bdbc4dfcdd9220a98a83004ad281b422e 100644 (file)
--- a/src/insets/InsetOptArg.cpp
+++ b/src/insets/InsetOptArg.cpp
@@ -14,24 +14,15 @@
 
 #include "debug.h"
 #include "gettext.h"
-#include "Color.h"
-#include "Paragraph.h"
-
-#include <sstream>
 
 
 namespace lyx {
 
-using std::string;
-using std::auto_ptr;
-using std::ostream;
-using std::ostringstream;
-
 
 InsetOptArg::InsetOptArg(BufferParams const & ins)
        : InsetCollapsable(ins)
 {
-       LyXFont font(LyXFont::ALL_SANE);
+       Font font(Font::ALL_SANE);
        font.setColor(Color::collapsable);
        setLabelFont(font);
        setLabel(_("opt"));
@@ -41,16 +32,16 @@ InsetOptArg::InsetOptArg(BufferParams const & ins)
 InsetOptArg::InsetOptArg(InsetOptArg const & in)
        : InsetCollapsable(in)
 {
-       LyXFont font(LyXFont::ALL_SANE);
+       Font font(Font::ALL_SANE);
        font.setColor(Color::collapsable);
        setLabelFont(font);
        setLabel(_("opt"));
 }
 
 
-auto_ptr<InsetBase> InsetOptArg::doClone() const
+Inset * InsetOptArg::clone() const
 {
-       return auto_ptr<InsetBase>(new InsetOptArg(*this));
+       return new InsetOptArg(*this);
 }
 
 
@@ -60,7 +51,7 @@ docstring const InsetOptArg::editMessage() const
 }
 
 
-void InsetOptArg::write(Buffer const & buf, ostream & os) const
+void InsetOptArg::write(Buffer const & buf, std::ostream & os) const
 {
        os << "OptArg" << "\n";
        InsetCollapsable::write(buf, os);
@@ -68,21 +59,21 @@ void InsetOptArg::write(Buffer const & buf, ostream & os) const
 
 
 int InsetOptArg::latex(Buffer const &, odocstream &,
-                       OutputParams const &) const
+                      OutputParams const &) const
 {
        return 0;
 }
 
 
 int InsetOptArg::plaintext(Buffer const &, odocstream &,
-                           OutputParams const &) const
+                          OutputParams const &) const
 {
        return 0; // do not output optional arguments
 }
 
 
 int InsetOptArg::docbook(Buffer const &, odocstream &,
-                         OutputParams const &) const
+                        OutputParams const &) const
 {
        return 0;
 }