Ensure all #warning statements are wrapped by #ifdef WITH_WARNINGS.

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

diff --git a/src/mathed/math_exintinset.C b/src/mathed/math_exintinset.C
index 7175cba3e3551f0b2ae610c966550d019a1f2607..e41dad31346ccb8ff075bd239999bab548313280 100644 (file)
--- a/src/mathed/math_exintinset.C
+++ b/src/mathed/math_exintinset.C
@@ -1,13 +1,17 @@
-
-
-#ifdef __GNUG__
-#pragma implementation 
-#endif
+/**
+ * \file math_exintinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
 #include "math_exintinset.h"
-#include "math_support.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
 #include "math_symbolinset.h"
@@ -16,6 +20,11 @@
 #include <boost/scoped_ptr.hpp>
 
 
+using std::string;
+using std::auto_ptr;
+using std::endl;
+
+
 MathExIntInset::MathExIntInset(string const & name)
        : MathNestInset(4), symbol_(name)
 {}
@@ -26,9 +35,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));
 }
 
 
@@ -53,19 +62,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())
@@ -79,39 +88,39 @@ void MathExIntInset::maplize(MapleStream & os) const
 }
 
 
-void MathExIntInset::maximize(MaximaStream & os) const
+void MathExIntInset::maxima(MaximaStream & os) const
 {
-       if ( symbol_ == "int" ) 
+       if ( symbol_ == "int" )
                os << "integrate(";
-       else 
+       else
                os << symbol_ << '(';
-       
+
        if (cell(0).size())
                os << cell(0) << ',';
        else
                os << '1' << ',';
        if (hasScripts())
                os << cell(1) << ',' << cell(2) << ',' << cell(3) << ')';
-       else 
+       else
                os << cell(1) << ')';
 }
 
-void MathExIntInset::mathematicize(MathematicaStream & os) const
+void MathExIntInset::mathematica(MathematicaStream & os) const
 {
-       if ( symbol_ == "int" ) 
+       if ( symbol_ == "int" )
                os << "Integrate[";
-       else if (symbol_ == "sum") 
+       else if (symbol_ == "sum")
                os << "Sum[";
-       else 
+       else
                os << symbol_ << '[';
-       
+
        if (cell(0).size())
                os << cell(0) << ',';
        else
                os << '1' << ',';
        if (hasScripts())
                os << '{' << cell(1) << ',' << cell(2) << ',' << cell(3) << "}]";
-       else 
+       else
                os << cell(1) << ']';
 }
 
@@ -131,5 +140,5 @@ void MathExIntInset::mathmlize(MathMLStream & os) const
 
 void MathExIntInset::write(WriteStream &) const
 {
-       lyxerr << "should not happen\n";
+       lyxerr << "should not happen" << endl;
 }