architectural changes to tex2lyx

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

diff --git a/src/mathed/formula.h b/src/mathed/formula.h
index 2e1c7fa9c3f431f6a078293c749f97d0ce1bd438..63b85275fe78c6685155bdf590be749c23f3711c 100644 (file)
--- a/src/mathed/formula.h
+++ b/src/mathed/formula.h
@@ -15,12 +15,12 @@
 #ifndef INSET_FORMULA_H
 #define INSET_FORMULA_H
 
-
 #include "formulabase.h"
 #include "math_atom.h"
 
 #include <boost/scoped_ptr.hpp>
 
+
 /// The main LyX math inset
 class InsetFormula : public InsetFormulaBase {
 public:
@@ -29,23 +29,23 @@ public:
        ///
        explicit InsetFormula(BufferView *);
        ///
-       explicit InsetFormula(const string & data);
+       explicit InsetFormula(string const & data);
        ///
        InsetFormula(InsetFormula const &);
        ///
        ~InsetFormula();
        ///
-       void dimension(BufferView *, LyXFont const &, Dimension &) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
-       void draw(BufferView *, LyXFont const &, int, float &) const;
+       void draw(PainterInfo & pi, int x, int y) const;
 
        ///
        void write(Buffer const *, std::ostream &) const;
        ///
        void read(Buffer const *, LyXLex & lex);
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool free_spc) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
@@ -54,15 +54,15 @@ public:
        int docbook(Buffer const *, std::ostream &, bool mixcont) const;
 
        ///
-       Inset * clone(Buffer const &, bool same_id = false) const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
        void validate(LaTeXFeatures & features) const;
        ///
-       Inset::Code lyxCode() const;
+       InsetOld::Code lyxCode() const;
        ///
-       bool insetAllowed(Inset::Code code) const;
+       bool insetAllowed(InsetOld::Code code) const;
        ///
-       std::vector<string> const getLabelList() const;
+       void getLabelList(std::vector<string> &) const;
        ///
        MathAtom const & par() const { return par_; }
        ///
@@ -70,7 +70,7 @@ public:
        ///
        void generatePreview() const;
        ///
-       void addPreview(grfx::PreviewLoader &) const;
+       void addPreview(lyx::graphics::PreviewLoader &) const;
        ///
        void mutate(string const & type);