X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetmarginal.C;h=e46838c06e78c61dfc7da8acfdb42cf864a29c29;hb=5603df4a5b7e511b31026c9a4f8f55b2b10fde57;hp=174d7db8439a8bac2ef1d6f09349e2d18620616e;hpb=453f294074a588ac62886d512e97619ff219c766;p=lyx.git

diff --git a/src/insets/insetmarginal.C b/src/insets/insetmarginal.C
index 174d7db843..e46838c06e 100644
--- a/src/insets/insetmarginal.C
+++ b/src/insets/insetmarginal.C
@@ -6,22 +6,21 @@
  * \author Jürgen Vigna
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-
 #include "insetmarginal.h"
+
 #include "gettext.h"
-#include "lyxfont.h"
-#include "BufferView.h"
-#include "lyxtext.h"
-#include "insets/insettext.h"
-#include "support/LOstream.h"
-#include "debug.h"
+#include "paragraph.h"
+
+#include "support/std_ostream.h"
 
 
+using std::string;
+using std::auto_ptr;
 using std::ostream;
 
 
@@ -33,17 +32,17 @@ InsetMarginal::InsetMarginal(BufferParams const & bp)
 }
 
 
-InsetMarginal::InsetMarginal(InsetMarginal const & in, bool same_id)
-	: InsetFootlike(in, same_id)
+InsetMarginal::InsetMarginal(InsetMarginal const & in)
+	: InsetFootlike(in)
 {
 	setLabel(_("margin"));
 	setInsetName("Marginal");
 }
 
 
-Inset * InsetMarginal::clone(Buffer const &, bool same_id) const
+auto_ptr<InsetBase> InsetMarginal::clone() const
 {
-	return new InsetMarginal(*const_cast<InsetMarginal *>(this), same_id);
+	return auto_ptr<InsetBase>(new InsetMarginal(*this));
 }
 
 
@@ -53,13 +52,11 @@ string const InsetMarginal::editMessage() const
 }
 
 
-int InsetMarginal::latex(Buffer const * buf, ostream & os,
-			 LatexRunParams const & runparams) const
+int InsetMarginal::latex(Buffer const & buf, ostream & os,
+			 OutputParams const & runparams) const
 {
 	os << "%\n\\marginpar{";
-
-	int const i = inset.latex(buf, os, runparams);
+	int const i = InsetText::latex(buf, os, runparams);
 	os << "%\n}";
-
 	return i + 2;
 }