revert last patch. there's something wrong, possibly unrelated to this

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

diff --git a/src/mathed/InsetMath.h b/src/mathed/InsetMath.h
index aeaebb9d9a812d2c3227902d91405acbdbafc707..2f91e9ede5e6f872d3b8fd753fc8b56205ebfed8 100644 (file)
--- a/src/mathed/InsetMath.h
+++ b/src/mathed/InsetMath.h
@@ -15,7 +15,7 @@
 
 #include "MathData.h"
 
-#include "insets/InsetBase.h"
+#include "insets/Inset.h"
 
 
 namespace lyx {
@@ -63,14 +63,13 @@ class InsetMathGrid;
 class InsetMathHull;
 class InsetMathMatrix;
 class InsetMathNest;
-class InsetMathParbox;
 class InsetMathScript;
 class InsetMathString;
 class InsetMathSpace;
 class InsetMathSymbol;
 class InsetMathUnknown;
 
-class RefInset;
+class InsetMathRef;
 
 class NormalStream;
 class OctaveStream;
@@ -90,7 +89,7 @@ class TextMetricsInfo;
 class ReplaceData;
 
 
-class InsetMath : public InsetBase {
+class InsetMath : public Inset {
 public:
        /// identification as math inset
        InsetMath * asInsetMath() { return this; }
@@ -113,6 +112,7 @@ public:
        virtual InsetMathAMSArray const * asAMSArrayInset() const { return 0; }
        virtual InsetMathArray          * asArrayInset()          { return 0; }
        virtual InsetMathArray const    * asArrayInset() const    { return 0; }
+       virtual InsetMathBrace          * asBraceInset()          { return 0; }
        virtual InsetMathBrace const    * asBraceInset() const    { return 0; }
        virtual InsetMathChar const     * asCharInset() const     { return 0; }
        virtual InsetMathDelim          * asDelimInset()          { return 0; }
@@ -132,7 +132,6 @@ public:
        virtual InsetMathMatrix const   * asMatrixInset() const   { return 0; }
        virtual InsetMathNest           * asNestInset()           { return 0; }
        virtual InsetMathNest const     * asNestInset() const     { return 0; }
-       virtual InsetMathParbox         * asParboxInset()         { return 0; }
        virtual InsetMathScript         * asScriptInset()         { return 0; }
        virtual InsetMathScript const   * asScriptInset() const   { return 0; }
        virtual InsetMathSpace          * asSpaceInset()          { return 0; }
@@ -142,7 +141,7 @@ public:
        virtual InsetMathSymbol const   * asSymbolInset() const   { return 0; }
        virtual InsetMathUnknown        * asUnknownInset()        { return 0; }
        virtual InsetMathUnknown const  * asUnknownInset() const  { return 0; }
-       virtual RefInset                * asRefInset()            { return 0; }
+       virtual InsetMathRef            * asRefInset()            { return 0; }
 
        /// identifies things that can get scripts
        virtual bool isScriptable() const { return false; }
@@ -183,8 +182,7 @@ public:
        virtual void octave(OctaveStream &) const;
 
        /// plain text output in ucs4 encoding
-       int plaintext(Buffer const &, odocstream &,
-                     OutputParams const &) const;
+       int plaintext(odocstream &, OutputParams const &) const;
 
        /// dump content to stderr for debugging
        virtual void dump() const;
@@ -195,14 +193,12 @@ public:
        virtual HullType getType() const;
        /// change type
        virtual void mutate(HullType /*newtype*/) {}
-       /// usually the latex name
-       virtual docstring name() const;
 
        /// math stuff usually isn't allowed in text mode
        virtual bool allowedIn(mode_type mode) const { return mode == MATH_MODE; }
 
        /// superscript kerning
-       virtual int kerning() const { return 0; }
+       virtual int kerning(BufferView const *) const { return 0; }
 };
 
 ///