simplify GuiToc / TocWidget interaction. Much can still be simplified...

[lyx.git] / src / mathed / InsetMathDiff.cpp

diff --git a/src/mathed/InsetMathDiff.cpp b/src/mathed/InsetMathDiff.cpp
index 61b87a36c8b752f632261f2f08830c224bf624b1..a3688225b59ed1a44ed009b9817630ae16258b88 100644 (file)
--- a/src/mathed/InsetMathDiff.cpp
+++ b/src/mathed/InsetMathDiff.cpp
@@ -11,29 +11,25 @@
 #include <config.h>
 
 #include "InsetMathDiff.h"
-#include "MathArray.h"
+#include "MathData.h"
 #include "MathStream.h"
-#include "debug.h"
+#include "support/debug.h"
 
 
 namespace lyx {
 
-using std::auto_ptr;
-using std::endl;
-
-
 InsetMathDiff::InsetMathDiff()
        : InsetMathNest(1)
 {}
 
 
-auto_ptr<InsetBase> InsetMathDiff::doClone() const
+Inset * InsetMathDiff::clone() const
 {
-       return auto_ptr<InsetBase>(new InsetMathDiff(*this));
+       return new InsetMathDiff(*this);
 }
 
 
-void InsetMathDiff::addDer(MathArray const & der)
+void InsetMathDiff::addDer(MathData const & der)
 {
        cells_.push_back(der);
 }
@@ -48,16 +44,15 @@ void InsetMathDiff::normalize(NormalStream & os) const
 }
 
 
-bool InsetMathDiff::metrics(MetricsInfo &, Dimension &) const
+void InsetMathDiff::metrics(MetricsInfo &, Dimension &) const
 {
-       lyxerr << "should not happen" << endl;
-       return true;
+       LYXERR0("should not happen");
 }
 
 
 void InsetMathDiff::draw(PainterInfo &, int, int) const
 {
-       lyxerr << "should not happen" << endl;
+       LYXERR0("should not happen");
 }
 
 
@@ -113,7 +108,7 @@ void InsetMathDiff::mathmlize(MathStream & os) const
 
 void InsetMathDiff::write(WriteStream &) const
 {
-       lyxerr << "should not happen" << endl;
+       LYXERR0("should not happen");
 }