oh well

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

diff --git a/src/mathed/math_exintinset.C b/src/mathed/math_exintinset.C
index 0a8c4979e55c52d60b31ebbb5e951d7d83a845cb..663b527856236919b43fb02dd52a9e98d51ef82a 100644 (file)
--- a/src/mathed/math_exintinset.C
+++ b/src/mathed/math_exintinset.C
@@ -1,9 +1,16 @@
+#include <config.h>
+
 #include "math_exintinset.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
+#include "math_streamstr.h"
 #include "math_symbolinset.h"
 #include "debug.h"
 
+#include <boost/smart_ptr.hpp>
+
+using std::endl;
+
 
 MathExIntInset::MathExIntInset(string const & name)
        : MathNestInset(4), symbol_(name)
@@ -37,29 +44,29 @@ bool MathExIntInset::hasScripts() const
 
 void MathExIntInset::normalize(NormalStream & os) const
 {
-       os << '[' << symbol_.c_str() << ' ' << cell(0) << ' ' << cell(1) << ' ' 
+       os << '[' << symbol_ << ' ' << cell(0) << ' ' << cell(1) << ' '
           << cell(2) << ' ' << cell(3) << ']';
 }
 
 
 void MathExIntInset::metrics(MathMetricsInfo const &) const
 {
-       lyxerr << "should not happen\n";
+       lyxerr << "should not happen" << endl;
 }
 
 
 void MathExIntInset::draw(Painter &, int, int) const
-{  
-       lyxerr << "should not happen\n";
+{
+       lyxerr << "should not happen" << endl;
 }
 
 
 void MathExIntInset::maplize(MapleStream & os) const
 {
-       os << symbol_.c_str() << '(';
+       os << symbol_ << '(';
        if (cell(0).size())
                os << cell(0);
-       else 
+       else
                os << '1';
        os << ',' << cell(1);
        if (hasScripts())
@@ -70,12 +77,11 @@ void MathExIntInset::maplize(MapleStream & os) const
 
 void MathExIntInset::mathmlize(MathMLStream & os) const
 {
-       MathSymbolInset * sym = new MathSymbolInset(symbol_.c_str());
+       boost::scoped_ptr<MathSymbolInset> sym(new MathSymbolInset(symbol_));
        //if (hasScripts())
        //      mathmlize(sym, os);
-       //else 
+       //else
                sym->mathmlize(os);
-       delete sym;
        os << cell(0) << "<mo> &InvisibleTimes; </mo>"
           << MTag("mrow") << "<mo> &DifferentialD; </mo>"
           << cell(1) << ETag("mrow");
@@ -84,6 +90,5 @@ void MathExIntInset::mathmlize(MathMLStream & os) const
 
 void MathExIntInset::write(WriteStream &) const
 {
-       lyxerr << "should not happen\n";
+       lyxerr << "should not happen" << endl;
 }
-