architectural changes to tex2lyx

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

diff --git a/src/mathed/formula.C b/src/mathed/formula.C
index d2a2aa98f1cd5bf63d553f1d8b954ea3ebb5b683..8d0d88accb430a36808b6b064a4003904cb236e0 100644 (file)
--- a/src/mathed/formula.C
+++ b/src/mathed/formula.C
@@ -51,10 +51,11 @@
 
 using std::ostream;
 using std::vector;
+using std::auto_ptr;
+using std::endl;
 
-namespace grfx = lyx::graphics;
 
-class InsetFormula::PreviewImpl : public grfx::PreviewedInset {
+class InsetFormula::PreviewImpl : public lyx::graphics::PreviewedInset {
 public:
        ///
        PreviewImpl(InsetFormula & p) : PreviewedInset(p) {}
@@ -104,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;
 }
 
 
@@ -113,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));
 }
 
 
@@ -185,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;
                        }
                }
        }
@@ -245,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;
 }
 
 
@@ -265,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;
 }
 
 
@@ -288,7 +287,7 @@ void InsetFormula::metrics(MetricsInfo & m, Dimension & dim) const
                MetricsInfo mi = m;
                mi.base.style = LM_ST_TEXT;
                mi.base.font.setColor(LColor::math);
-               par()->metrics(mi, dim_);
+               par()->metrics(mi, dim);
                dim.asc += 1;
                dim.des += 1;
        }
@@ -306,7 +305,7 @@ void InsetFormula::mutate(string const & type)
 // preview stuff
 //
 
-void InsetFormula::addPreview(grfx::PreviewLoader & ploader) const
+void InsetFormula::addPreview(lyx::graphics::PreviewLoader & ploader) const
 {
        preview_->addPreview(ploader);
 }