the DocIterator stuff

[lyx.git] / src / mathed / math_binominset.C

diff --git a/src/mathed/math_binominset.C b/src/mathed/math_binominset.C
index a240adb6c6497bf0facbb3b495c5558732253aa8..69ff5aa98f358b7ab90b80c504b13e80ff628af3 100644 (file)
--- a/src/mathed/math_binominset.C
+++ b/src/mathed/math_binominset.C
@@ -1,12 +1,23 @@
+/**
+ * \file math_binominset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #include <config.h>
 
 #include "math_binominset.h"
+#include "math_data.h"
 #include "math_support.h"
-#include "support/LOstream.h"
 #include "math_mathmlstream.h"
 
 
 using std::max;
+using std::auto_ptr;
 
 
 MathBinomInset::MathBinomInset(bool choose)
@@ -14,9 +25,9 @@ MathBinomInset::MathBinomInset(bool choose)
 {}
 
 
-MathInset * MathBinomInset::clone() const
+auto_ptr<InsetBase> MathBinomInset::clone() const
 {
-       return new MathBinomInset(*this);
+       return auto_ptr<InsetBase>(new MathBinomInset(*this));
 }
 
 
@@ -31,7 +42,7 @@ int MathBinomInset::dw() const
 }
 
 
-Dimension MathBinomInset::metrics(MetricsInfo & mi) const
+void MathBinomInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        ScriptChanger dummy(mi.base);
        cell(0).metrics(mi);
@@ -39,7 +50,7 @@ Dimension MathBinomInset::metrics(MetricsInfo & mi) const
        dim_.asc = cell(0).height() + 4 + 5;
        dim_.des = cell(1).height() + 4 - 5;
        dim_.wid = max(cell(0).width(), cell(1).width()) + 2 * dw() + 4;
-       return dim_;
+       dim = dim_;
 }