architectural changes to tex2lyx

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

diff --git a/src/mathed/formula.C b/src/mathed/formula.C
index 3dde08cc6b7cf4b9f82a684400af167ef4ca271a..8d0d88accb430a36808b6b064a4003904cb236e0 100644 (file)
--- a/src/mathed/formula.C
+++ b/src/mathed/formula.C
@@ -51,6 +51,8 @@
 
 using std::ostream;
 using std::vector;
+using std::auto_ptr;
+using std::endl;
 
 
 class InsetFormula::PreviewImpl : public lyx::graphics::PreviewedInset {
@@ -103,7 +105,7 @@ InsetFormula::InsetFormula(string const & data)
        if (!data.size())
                return;
        if (!mathed_parse_normal(par_, data))
-               lyxerr << "cannot interpret '" << data << "' as math\n";
+               lyxerr << "cannot interpret '" << data << "' as math" << endl;
 }
 
 
@@ -112,9 +114,9 @@ InsetFormula::~InsetFormula()
 {}
 
 
-Inset * InsetFormula::clone() const
+auto_ptr<InsetBase> InsetFormula::clone() const
 {
-       return new InsetFormula(*this);
+       return auto_ptr<InsetBase>(new InsetFormula(*this));
 }
 
 
@@ -184,13 +186,13 @@ void InsetFormula::read(Buffer const *, LyXLex & lex)
        // remove extra 'mathrm' for chemistry stuff.
        // will be re-added on write
        if (par_->asHullInset()->getType() =="chemistry")  {
-               lyxerr << "this is chemistry\n";
+               lyxerr << "this is chemistry" << endl;
                if (par_->cell(0).size() == 1) {
-                       lyxerr << "this is size 1\n";
-           if (par_->cell(0)[0]->asFontInset()) {
-                               lyxerr << "this is a font inset \n";
-                               lyxerr << "replacing " << par_.nucleus()->cell(0) <<
-                                       " with " << par_->cell(0)[0]->cell(0) << "\n";
+                       lyxerr << "this is size 1" << endl;
+                       if (par_->cell(0)[0]->asFontInset()) {
+                               lyxerr << "this is a font inset "
+                                      << "replacing " << par_.nucleus()->cell(0) <<
+                                       " with " << par_->cell(0)[0]->cell(0) << endl;
                        }
                }
        }
@@ -244,17 +246,15 @@ void InsetFormula::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-vector<string> const InsetFormula::getLabelList() const
+void InsetFormula::getLabelList(vector<string> & res) const
 {
-       vector<string> res;
        par()->getLabelList(res);
-       return res;
 }
 
 
-Inset::Code InsetFormula::lyxCode() const
+InsetOld::Code InsetFormula::lyxCode() const
 {
-       return Inset::MATH_CODE;
+       return InsetOld::MATH_CODE;
 }
 
 
@@ -264,12 +264,12 @@ void InsetFormula::validate(LaTeXFeatures & features) const
 }
 
 
-bool InsetFormula::insetAllowed(Inset::Code code) const
+bool InsetFormula::insetAllowed(InsetOld::Code code) const
 {
        return
-                  code == Inset::LABEL_CODE
-               || code == Inset::REF_CODE
-               || code == Inset::ERT_CODE;
+                  code == InsetOld::LABEL_CODE
+               || code == InsetOld::REF_CODE
+               || code == InsetOld::ERT_CODE;
 }