architectural changes to tex2lyx

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

diff --git a/src/mathed/math_binaryopinset.C b/src/mathed/math_binaryopinset.C
index 92b6173639fa54694ffbc7fc8383157318f6e18d..71ff00f4afb4ad9122827caf50b5cc9e99937584 100644 (file)
--- a/src/mathed/math_binaryopinset.C
+++ b/src/mathed/math_binaryopinset.C
@@ -1,11 +1,8 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_binaryopinset.h"
-#include "MathPainterInfo.h"
+#include "PainterInfo.h"
 #include "support/LOstream.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
@@ -19,7 +16,7 @@ MathBinaryOpInset::MathBinaryOpInset(char op)
 {}
 
 
-MathInset * MathBinaryOpInset::clone() const
+InsetBase * MathBinaryOpInset::clone() const
 {
        return new MathBinaryOpInset(*this);
 }
@@ -31,7 +28,11 @@ int MathBinaryOpInset::opwidth() const
 }
 
 
-void MathBinaryOpInset::metrics(MathMetricsInfo & mi) const
+#warning Andre, have a look here. (Lgb)
+#if 0
+// That this is not declared in class MathBinaryOpInset makes
+// Doxygen give warnings. (Lgb)
+void MathBinaryOpInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        mi_ = mi;
        cell(0).metrics(mi);
@@ -40,9 +41,9 @@ void MathBinaryOpInset::metrics(MathMetricsInfo & mi) const
        ascent_  = max(cell(0).ascent(),  cell(1).ascent());
        descent_ = max(cell(0).descent(), cell(1).descent());
 }
+#endif
 
-
-void MathBinaryOpInset::draw(MathPainterInfo & pain, int x, int y) const
+void MathBinaryOpInset::draw(PainterInfo & pain, int x, int y) const
 {
        cell(0).draw(pain, x, y);
        drawChar(pain, LM_TC_CONST, mi_, x + cell(0).width() , y, op_);