Replace LString.h with support/std_string.h,

[features.git] / src / mathed / math_fontinset.C

diff --git a/src/mathed/math_fontinset.C b/src/mathed/math_fontinset.C
index a73dbb78fffa906a6f64bf7c2149ac443f943799..79d25a16cb7d4ea9a6679cfd9e7fecace4a5d0a3 100644 (file)
--- a/src/mathed/math_fontinset.C
+++ b/src/mathed/math_fontinset.C
@@ -1,15 +1,22 @@
-#include <config.h>
+/**
+ * \file math_fontinset.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_fontinset.h"
 #include "math_mathmlstream.h"
-#include "math_streamstr.h"
-#include "math_support.h"
 #include "math_parser.h"
 #include "LaTeXFeatures.h"
-#include "support/LOstream.h"
-#include "textpainter.h"
+#include "support/std_ostream.h"
 
+using std::auto_ptr;
 
 
 MathFontInset::MathFontInset(latexkeys const * key)
@@ -17,9 +24,9 @@ MathFontInset::MathFontInset(latexkeys const * key)
 {}
 
 
-MathInset * MathFontInset::clone() const
+auto_ptr<InsetBase> MathFontInset::clone() const
 {
-       return new MathFontInset(*this);
+       return auto_ptr<InsetBase>(new MathFontInset(*this));
 }
 
 
@@ -33,11 +40,12 @@ MathInset::mode_type MathFontInset::currentMode() const
 }
 
 
-void MathFontInset::metrics(MetricsInfo & mi) const
+void MathFontInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        FontSetChanger dummy(mi.base, key_->name.c_str());
-       dim_ = cell(0).metrics(mi);
-       metricsMarkers();
+       cell(0).metrics(mi, dim_);
+       metricsMarkers(1);
+       dim = dim_;
 }
 
 
@@ -49,9 +57,9 @@ void MathFontInset::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-void MathFontInset::metricsT(TextMetricsInfo const & mi) const
+void MathFontInset::metricsT(TextMetricsInfo const & mi, Dimension & /*dim*/) const
 {
-       dim_ = cell(0).metricsT(mi);
+       cell(0).metricsT(mi, dim_);
 }