This should be the last of the commits refactoring the InsetLayout code.

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

diff --git a/src/insets/InsetOptArg.cpp b/src/insets/InsetOptArg.cpp
index 5d88cae11e2793a20b5cfe0bd46bdff0bf75fab2..c5da19b62d72443340f3f3d6db95c09625573098 100644 (file)
--- a/src/insets/InsetOptArg.cpp
+++ b/src/insets/InsetOptArg.cpp
@@ -12,45 +12,28 @@
 
 #include "InsetOptArg.h"
 
-#include "debug.h"
-#include "gettext.h"
-#include "Color.h"
-#include "Paragraph.h"
-
-#include <sstream>
+#include "support/debug.h"
+#include "support/docstream.h"
+#include "support/gettext.h"
 
+using namespace std;
 
 namespace lyx {
 
-using std::string;
-using std::auto_ptr;
-using std::ostream;
-using std::ostringstream;
-
 
 InsetOptArg::InsetOptArg(BufferParams const & ins)
        : InsetCollapsable(ins)
-{
-       Font font(Font::ALL_SANE);
-       font.setColor(Color::collapsable);
-       setLabelFont(font);
-       setLabel(_("opt"));
-}
+{}
 
 
 InsetOptArg::InsetOptArg(InsetOptArg const & in)
        : InsetCollapsable(in)
-{
-       Font font(Font::ALL_SANE);
-       font.setColor(Color::collapsable);
-       setLabelFont(font);
-       setLabel(_("opt"));
-}
+{}
 
 
-auto_ptr<Inset> InsetOptArg::doClone() const
+Inset * InsetOptArg::clone() const
 {
-       return auto_ptr<Inset>(new InsetOptArg(*this));
+       return new InsetOptArg(*this);
 }
 
 
@@ -68,21 +51,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;
 }