some reindentation, revert workarea xpos++, constify, remove all traces of LyXParagra...

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

diff --git a/src/insets/insetmarginal.C b/src/insets/insetmarginal.C
index 017a0e642d4aa3d23f67f5bf4cb1c7054e95b40f..4a631bd8ccef46150748636aa2542e3fd76bb1d5 100644 (file)
--- a/src/insets/insetmarginal.C
+++ b/src/insets/insetmarginal.C
@@ -23,9 +23,6 @@
 #include "support/LOstream.h"
 #include "debug.h"
 
-using std::ostream;
-using std::endl;
-
 
 InsetMarginal::InsetMarginal()
        : InsetFootlike()
@@ -35,28 +32,28 @@ InsetMarginal::InsetMarginal()
 }
 
 
-Inset * InsetMarginal::Clone() const
+Inset * InsetMarginal::Clone(Buffer const &) const
 {
        InsetMarginal * result = new InsetMarginal;
-       result->inset->init(inset);
+       result->inset.init(&inset);
        
        result->collapsed = collapsed;
        return result;
 }
 
 
-char const * InsetMarginal::EditMessage() const
+string const InsetMarginal::EditMessage() const
 {
        return _("Opened Marginal Note Inset");
 }
 
 
 int InsetMarginal::Latex(Buffer const * buf,
-                        ostream & os, bool fragile, bool fp) const
+                        std::ostream & os, bool fragile, bool fp) const
 {
        os << "\\marginpar{%\n";
        
-       int i = inset->Latex(buf, os, fragile, fp);
+       int const i = inset.Latex(buf, os, fragile, fp);
        os << "}%\n";
        
        return i + 2;