further code uglification to make Jean-Marc's compiler happy

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

diff --git a/src/mathed/formulabase.h b/src/mathed/formulabase.h
index be8e5ce689a5e2d18d8fc5f7fc3bf779440c3fd8..022b6352530dfa02ed7b4adad14ec6dd64de227d 100644 (file)
--- a/src/mathed/formulabase.h
+++ b/src/mathed/formulabase.h
@@ -20,10 +20,11 @@
 #endif
 
 #include <iosfwd>
-#include <boost/smart_ptr.hpp>
-
 #include "insets/inset.h"
 
+// only for getType():
+#include "math_defs.h"
+
 class Buffer;
 class BufferView;
 class MathInset;
@@ -31,12 +32,8 @@ class MathInset;
 ///
 class InsetFormulaBase : public UpdatableInset {
 public:
-       /// 
-       InsetFormulaBase(InsetFormulaBase const & p);
-       ///
-       explicit InsetFormulaBase(MathInset *);
        ///
-       virtual ~InsetFormulaBase();
+       InsetFormulaBase();
        ///
        virtual int ascent(BufferView *, LyXFont const &) const = 0;
        ///
@@ -45,36 +42,8 @@ public:
        virtual int width(BufferView *, LyXFont const &) const = 0;
        ///
        virtual void draw(BufferView *,LyXFont const &, int, float &, bool) const = 0;
-
-       /// These are just wrappers taking the unused Buffer * dummy parameter
-       /// 
-       virtual void write(Buffer const *, std::ostream &) const;
-       ///
-       virtual void read(Buffer const *, LyXLex & lex);
-       ///
-       virtual int latex(Buffer const *, std::ostream &,
-                 bool fragile, bool free_spc) const;
-       ///
-       virtual int ascii(Buffer const *, std::ostream &, int linelen) const;
-       ///
-       virtual int linuxdoc(Buffer const *, std::ostream &) const;
-       ///
-       virtual int docBook(Buffer const *, std::ostream &) const;
-
-protected:
-       /// the actual functions don't use the Buffer * parameter
        ///
-       virtual void write(std::ostream &) const = 0;
-       ///
-       virtual void read(LyXLex & lex) = 0;
-       ///
-       virtual int latex(std::ostream &, bool fragile, bool free_spc) const = 0;
-       ///
-       virtual int ascii(std::ostream &, int linelen) const = 0;
-       ///
-       virtual int linuxdoc(std::ostream &) const = 0;
-       ///
-       virtual int docBook(std::ostream &) const = 0;
+       virtual MathInsetTypes getType() const = 0;
 
 public:
        ///
@@ -83,13 +52,13 @@ public:
        virtual Inset * clone(Buffer const &, bool same_id = false) const = 0;
        ///
        virtual Inset::Code lyxCode() const;
-       ///
-       virtual LyXFont const convertFont(LyXFont const & f) const;
        /// what appears in the minibuffer when opening
        virtual string const editMessage() const;
        ///
        virtual void edit(BufferView *, int x, int y, unsigned int button);
        ///
+       virtual void edit(BufferView *, bool front = true);
+       ///
        virtual void toggleInsetCursor(BufferView *);
        ///
        virtual void showInsetCursor(BufferView *, bool show = true);
@@ -116,13 +85,15 @@ public:
        ///
        virtual std::vector<string> const getLabelList() const;
        ///
-       MathInset * par() const;
-protected:
+       virtual MathInset const * par() const = 0;
        ///
-       virtual void updateLocal(BufferView * bv);
-
+       virtual void metrics() const = 0;
+protected:
        ///
-       MathInset * par_;
+       virtual void updateLocal(BufferView * bv, bool mark_dirty);
+private:
+       /// unimplemented
+       void operator=(const InsetFormulaBase &);
 };
 
 // We don't really mess want around with mathed stuff outside mathed.
@@ -142,6 +113,8 @@ void mathDispatchInsertMath(BufferView *, string const &);
 //
 void mathDispatchInsertMatrix(BufferView *, string const &);
 //
+void mathDispatchGreek(BufferView *, string const &);
+//
 void mathDispatchMathImportSelection(BufferView *, string const &);
 
 #endif