move around stuff, remove unneeded declarations etc

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

diff --git a/src/mathed/math_binaryopinset.C b/src/mathed/math_binaryopinset.C
index b38add432d2485612f486f4f1f85f4df9b45bbb1..ce6dc2c5ace9dd46ae2e73d75351d4577557bdb5 100644 (file)
--- a/src/mathed/math_binaryopinset.C
+++ b/src/mathed/math_binaryopinset.C
@@ -1,9 +1,19 @@
-#include <config.h>
+/**
+ * \file math_binaryopinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
+#include <config.h>
 
 #include "math_binaryopinset.h"
-#include "MathPainterInfo.h"
-#include "support/LOstream.h"
+#include "PainterInfo.h"
+#include "support/std_ostream.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
 
@@ -16,9 +26,9 @@ MathBinaryOpInset::MathBinaryOpInset(char op)
 {}
 
 
-MathInset * MathBinaryOpInset::clone() const
+auto_ptr<InsetBase> MathBinaryOpInset::clone() const
 {
-       return new MathBinaryOpInset(*this);
+       return auto_ptr<InsetBase>(new MathBinaryOpInset(*this));
 }
 
 
@@ -28,7 +38,13 @@ int MathBinaryOpInset::opwidth() const
 }
 
 
-void MathBinaryOpInset::metrics(MathMetricsInfo & mi) const
+#ifdef WITH_WARNINGS
+#warning Andre, have a look here. (Lgb)
+#endif
+#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);
@@ -37,9 +53,10 @@ 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_);