X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_boxinset.C;h=10e070c8b75dc492f3a13e573db64790695eb6e1;hb=07cc9f67534474b167ca1ea727bda643fdd8d197;hp=61a1bf1f2b8948cb40a5bd141f457a3ea03c5e1c;hpb=00413a78417988ae9c0927729771cc188a8da6fb;p=lyx.git

diff --git a/src/mathed/math_boxinset.C b/src/mathed/math_boxinset.C
index 61a1bf1f2b..10e070c8b7 100644
--- a/src/mathed/math_boxinset.C
+++ b/src/mathed/math_boxinset.C
@@ -1,14 +1,23 @@
-#include <config.h>
+/**
+ * \file math_boxinset.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.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
 #include "math_boxinset.h"
-#include "math_support.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
+
+using std::string;
+using std::auto_ptr;
 
 
 MathBoxInset::MathBoxInset(string const & name)
@@ -16,15 +25,15 @@ MathBoxInset::MathBoxInset(string const & name)
 {}
 
 
-MathInset * MathBoxInset::clone() const
+auto_ptr<InsetBase> MathBoxInset::clone() const
 {
-	return new MathBoxInset(*this);
+	return auto_ptr<InsetBase>(new MathBoxInset(*this));
 }
 
 
 void MathBoxInset::write(WriteStream & os) const
 {
-	os << "\\" << name_ << "{" << cell(0) << "}";
+	os << '\\' << name_ << '{' << cell(0) << '}';
 }
 
 
@@ -36,20 +45,20 @@ void MathBoxInset::normalize(NormalStream & os) const
 }
 
 
-void MathBoxInset::metrics(MathMetricsInfo & mi) const
+void MathBoxInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	MathFontSetChanger dummy(mi.base, "textnormal");
-	cell(0).metrics(mi);
-	dim_ = cell(0).dim();
-	metricsMarkers2();
+	FontSetChanger dummy(mi.base, "textnormal");
+	cell(0).metrics(mi, dim);
+	metricsMarkers(dim);
+	dim_ = dim;
 }
 
 
-void MathBoxInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathBoxInset::draw(PainterInfo & pi, int x, int y) const
 {
-	MathFontSetChanger dummy(pi.base, "textnormal");
+	FontSetChanger dummy(pi.base, "textnormal");
 	cell(0).draw(pi, x, y);
-	drawMarkers2(pi, x + 1, y);
+	drawMarkers(pi, x, y);
 }