more IU

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

diff --git a/src/mathed/math_inset.h b/src/mathed/math_inset.h
index a4c0751dfba9bccbf34688b872cea69c3538b72b..779e590fa38925b9bf8b6341770de4b4abbac321 100644 (file)
--- a/src/mathed/math_inset.h
+++ b/src/mathed/math_inset.h
@@ -13,9 +13,10 @@
 #ifndef MATH_INSET_H
 #define MATH_INSET_H
 
-#include "support/std_string.h"
 #include "insets/insetbase.h"
 
+#include <string>
+
 /**
 
 Abstract base class for all math objects.  A math insets is for use of the
@@ -30,7 +31,7 @@ inclusion in the "real LyX insets" FormulaInset and FormulaMacroInset.
 
 */
 
-
+class OutputParams;
 class MathArrayInset;
 class MathAMSArrayInset;
 class MathCharInset;
@@ -203,9 +204,7 @@ public:
        virtual bool takesLimits() const { return false; }
 
        /// char char code if possible
-       virtual void handleFont(string const &) {}
-       /// is this inset equal to a given other inset?
-       virtual bool match(MathAtom const &) const { return false; }
+       virtual void handleFont(std::string const &) {}
        /// replace things by other things
        virtual void replace(ReplaceData &) {}
        /// do we contain a given subsequence?
@@ -236,11 +235,11 @@ public:
        /// describe content if cursor behind
        virtual void infoize2(std::ostream &) const {}
        /// plain ascii output
-       virtual int ascii(std::ostream & os, int) const;
+       virtual int plaintext(std::ostream & os, OutputParams const &) const;
        /// linuxdoc output
-       virtual int linuxdoc(std::ostream & os) const;
+       virtual int linuxdoc(std::ostream & os, OutputParams const &) const;
        /// docbook output
-       virtual int docbook(std::ostream & os, bool) const;
+       virtual int docbook(std::ostream & os, OutputParams const &) const;
 
        /// dump content to stderr for debugging
        virtual void dump() const;
@@ -248,17 +247,13 @@ public:
        /// LyXInset stuff
        virtual bool numberedType() const { return false; }
        /// hull type
-       virtual string const & getType() const;
+       virtual std::string const & getType() const;
        /// change type
-       virtual void mutate(string const &) {}
+       virtual void mutate(std::string const &) {}
        /// how is the inset called in the .lyx file?
-       virtual string fileInsetLabel() const;
+       virtual std::string fileInsetLabel() const;
        /// usually the latex name
-       virtual string name() const;
-
-protected:
-       /// a dirty hack
-       BufferView * view() const;
+       virtual std::string name() const;
 };
 
 std::ostream & operator<<(std::ostream &, MathAtom const &);