architectural changes to tex2lyx

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

diff --git a/src/mathed/math_charinset.C b/src/mathed/math_charinset.C
index 827aa7f7ad1e7e634320fe495264dbff62ba1c3c..2c02372832a62f5c84714a6c6ea3a40cb2f5552e 100644 (file)
--- a/src/mathed/math_charinset.C
+++ b/src/mathed/math_charinset.C
@@ -2,6 +2,7 @@
 
 #include "math_charinset.h"
 #include "LColor.h"
+#include "dimension.h"
 #include "frontends/Painter.h"
 #include "frontends/font_metrics.h"
 #include "support/LOstream.h"
@@ -17,6 +18,7 @@
 
 using std::ostream;
 using std::endl;
+using std::auto_ptr;
 
 #ifndef CXX_GLOBAL_CSTD
 using std::strchr;
@@ -48,15 +50,14 @@ MathCharInset::MathCharInset(char c)
 
 
 
-MathInset * MathCharInset::clone() const
+auto_ptr<InsetBase> MathCharInset::clone() const
 {
-       return new MathCharInset(*this);
+       return auto_ptr<InsetBase>(new MathCharInset(*this));
 }
 
 
-Dimension MathCharInset::metrics(MetricsInfo & mi) const
+void MathCharInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       Dimension dim;
 #if 1
        if (char_ == '=' && has_math_fonts) {
                FontSetChanger dummy(mi.base, "cmr");
@@ -80,9 +81,8 @@ Dimension MathCharInset::metrics(MetricsInfo & mi) const
        mathed_char_dim(font_, char_, dim_);
        if (isBinaryOp(char_, code_))
                width_ += 2 * font_metrics::width(' ', font_);
-       lyxerr << "MathCharInset::metrics: " << dim << "\n";
+       lyxerr << "MathCharInset::metrics: " << dim << endl;
 #endif
-       return dim;
 }