architectural changes to tex2lyx

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

diff --git a/src/mathed/math_exintinset.C b/src/mathed/math_exintinset.C
index f35c32685eae8b1add34f95e93d323dd254b7c66..f044f5134048cf6ca8d293d50963d9c00f778a8e 100644 (file)
--- a/src/mathed/math_exintinset.C
+++ b/src/mathed/math_exintinset.C
@@ -1,7 +1,3 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include <config.h>
 
 #include "math_exintinset.h"
@@ -13,6 +9,9 @@
 
 #include <boost/scoped_ptr.hpp>
 
+using std::auto_ptr;
+using std::endl;
+
 
 MathExIntInset::MathExIntInset(string const & name)
        : MathNestInset(4), symbol_(name)
@@ -24,9 +23,9 @@ MathExIntInset::MathExIntInset(string const & name)
 // 3 - upper
 
 
-MathInset * MathExIntInset::clone() const
+auto_ptr<InsetBase> MathExIntInset::clone() const
 {
-       return new MathExIntInset(*this);
+       return auto_ptr<InsetBase>(new MathExIntInset(*this));
 }
 
 
@@ -51,19 +50,19 @@ void MathExIntInset::normalize(NormalStream & os) const
 }
 
 
-void MathExIntInset::metrics(MathMetricsInfo &) const
+void MathExIntInset::metrics(MetricsInfo &, Dimension &) const
 {
-       lyxerr << "should not happen\n";
+       lyxerr << "should not happen" << endl;
 }
 
 
-void MathExIntInset::draw(MathPainterInfo &, int, int) const
+void MathExIntInset::draw(PainterInfo &, int, int) const
 {
-       lyxerr << "should not happen\n";
+       lyxerr << "should not happen" << endl;
 }
 
 
-void MathExIntInset::maplize(MapleStream & os) const
+void MathExIntInset::maple(MapleStream & os) const
 {
        os << symbol_ << '(';
        if (cell(0).size())
@@ -77,7 +76,7 @@ void MathExIntInset::maplize(MapleStream & os) const
 }
 
 
-void MathExIntInset::maximize(MaximaStream & os) const
+void MathExIntInset::maxima(MaximaStream & os) const
 {
        if ( symbol_ == "int" )
                os << "integrate(";
@@ -94,7 +93,7 @@ void MathExIntInset::maximize(MaximaStream & os) const
                os << cell(1) << ')';
 }
 
-void MathExIntInset::mathematicize(MathematicaStream & os) const
+void MathExIntInset::mathematica(MathematicaStream & os) const
 {
        if ( symbol_ == "int" )
                os << "Integrate[";
@@ -129,5 +128,5 @@ void MathExIntInset::mathmlize(MathMLStream & os) const
 
 void MathExIntInset::write(WriteStream &) const
 {
-       lyxerr << "should not happen\n";
+       lyxerr << "should not happen" << endl;
 }