architectural changes to tex2lyx

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

diff --git a/src/mathed/math_unknowninset.C b/src/mathed/math_unknowninset.C
index d8727778e7d812cf2542ecbbcb118c30dfb37688..6a126c1c28ecc24e984f9b65dcb7f5d6a94750e6 100644 (file)
--- a/src/mathed/math_unknowninset.C
+++ b/src/mathed/math_unknowninset.C
@@ -1,64 +1,57 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "math_unknowninset.h"
 #include "math_support.h"
+#include "math_atom.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
 
+using std::auto_ptr;
+
 
 MathUnknownInset::MathUnknownInset(string const & nm, bool final, bool black)
        : name_(nm), final_(final), black_(black)
 {}
 
 
-MathInset * MathUnknownInset::clone() const
+auto_ptr<InsetBase> MathUnknownInset::clone() const
 {
-       return new MathUnknownInset(*this);
+       return auto_ptr<InsetBase>(new MathUnknownInset(*this));
 }
 
 
-string const & MathUnknownInset::name() const
+string MathUnknownInset::name() const
 {
        return name_;
 }
 
 
-string & MathUnknownInset::name()
+void MathUnknownInset::setName(string const & name)
 {
-       return name_;
+       name_ = name;
 }
 
 
-bool MathUnknownInset::match(MathInset * p) const
+bool MathUnknownInset::match(MathAtom const & at) const
 {
-       MathUnknownInset const * q = p->asUnknownInset();
+       MathUnknownInset const * q = at->asUnknownInset();
        return q && name_ == q->name_;
 }
 
 
-void MathUnknownInset::write(WriteStream & os) const
-{
-       os << "\\" << name_ << ' ';
-}
-
-
 void MathUnknownInset::normalize(NormalStream & os) const
 {
        os << "[unknown " << name_ << ']';
 }
 
 
-void MathUnknownInset::metrics(MathMetricsInfo & mi) const
+void MathUnknownInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       mathed_string_dim(mi.base.font, name_, dim_);
+       mathed_string_dim(mi.base.font, name_, dim);
 }
 
 
-void MathUnknownInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathUnknownInset::draw(PainterInfo & pi, int x, int y) const
 {
        if (black_)
                drawStrBlack(pi, x, y, name_);
@@ -79,12 +72,12 @@ bool MathUnknownInset::final() const
 }
 
 
-void MathUnknownInset::maplize(MapleStream & os) const
+void MathUnknownInset::maple(MapleStream & os) const
 {
        os << name_;
 }
 
-void MathUnknownInset::mathematicize(MathematicaStream & os) const
+void MathUnknownInset::mathematica(MathematicaStream & os) const
 {
        os << name_;
 }
@@ -96,7 +89,7 @@ void MathUnknownInset::mathmlize(MathMLStream & os) const
 }
 
 
-void MathUnknownInset::octavize(OctaveStream & os) const
+void MathUnknownInset::octave(OctaveStream & os) const
 {
        os << name_;
 }