mathed uglyfication

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

diff --git a/src/mathed/formula.h b/src/mathed/formula.h
index ad731d12ae04a3a4be79eefc750bbd3de677db98..19acb55cea660525d64b3a5d227ca580b292cd26 100644 (file)
--- a/src/mathed/formula.h
+++ b/src/mathed/formula.h
@@ -18,6 +18,8 @@
 
 #include <boost/scoped_ptr.hpp>
 
+class RenderPreview;
+
 
 /// The main LyX math inset
 class InsetFormula : public InsetFormulaBase {
@@ -27,7 +29,7 @@ public:
        ///
        explicit InsetFormula(BufferView *);
        ///
-       explicit InsetFormula(string const & data);
+       explicit InsetFormula(std::string const & data);
        ///
        InsetFormula(InsetFormula const &);
        ///
@@ -43,13 +45,16 @@ public:
        void read(Buffer const &, LyXLex & lex);
        ///
        int latex(Buffer const &, std::ostream &,
-                 LatexRunParams const &) const;
+                 OutputParams const &) const;
        ///
-       int ascii(Buffer const &, std::ostream &, int linelen) const;
+       int plaintext(Buffer const &, std::ostream &,
+                 OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &) const;
+       int linuxdoc(Buffer const &, std::ostream &,
+                    OutputParams const &) const;
        ///
-       int docbook(Buffer const &, std::ostream &, bool mixcont) const;
+       int docbook(Buffer const &, std::ostream &,
+                   OutputParams const &) const;
 
        ///
        virtual std::auto_ptr<InsetBase> clone() const;
@@ -61,7 +66,7 @@ public:
        bool insetAllowed(InsetOld::Code code) const;
        /// Appends \c list with all labels found within this inset.
        void getLabelList(Buffer const &,
-                         std::vector<string> & list) const;
+                         std::vector<std::string> & list) const;
        ///
        MathAtom const & par() const { return par_; }
        ///
@@ -71,21 +76,18 @@ public:
        ///
        void addPreview(lyx::graphics::PreviewLoader &) const;
        ///
-       void mutate(string const & type);
+       void mutate(std::string const & type);
 
 private:
+       /// Slot receiving a signal that the preview is ready to display.
+       void statusChanged() const;
        /// available in AMS only?
        bool ams() const;
 
        /// contents
        MathAtom par_;
-       /// x offset for drawing displayed formula
-       mutable int offset_;
 
-       /// Use the Pimpl idiom to hide the internals of the previewer.
-       class PreviewImpl;
-       friend class PreviewImpl;
        /// The pointer never changes although *preview_'s contents may.
-       boost::scoped_ptr<PreviewImpl> const preview_;
+       boost::scoped_ptr<RenderPreview> const preview_;
 };
 #endif