mathed uglyfication

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

diff --git a/src/mathed/math_nestinset.h b/src/mathed/math_nestinset.h
index 4af8f0ab19c6679254230a2357c3303b8dbb57ec..2227ac2ae49256ff080dfcd8839e81584e74e1e5 100644 (file)
--- a/src/mathed/math_nestinset.h
+++ b/src/mathed/math_nestinset.h
@@ -14,8 +14,6 @@
 
 #include "math_diminset.h"
 
-class MathArray;
-
 
 /** Abstract base class for all math objects that contain nested items.
     This is basically everything that is not a single character or a
@@ -42,27 +40,27 @@ public:
        /// identifies NestInsets
        MathNestInset const * asNestInset() const { return this; }
        /// get cursor position
-       void getPos(idx_type idx, pos_type pos, int & x, int & y) const;
+       void getScreenPos(idx_type idx, pos_type pos, int & x, int & y) const;
 
        /// order of movement through the cells when pressing the left key
-       bool idxLeft(idx_type & idx, pos_type & pos) const;
+       bool idxLeft(BufferView &) const;
        /// order of movement through the cells when pressing the right key
-       bool idxRight(idx_type & idx, pos_type & pos) const;
+       bool idxRight(BufferView &) const;
 
        /// move one physical cell up
-       bool idxNext(idx_type & idx, pos_type & pos) const;
+       bool idxNext(BufferView &) const;
        /// move one physical cell down
-       bool idxPrev(idx_type & idx, pos_type & pos) const;
+       bool idxPrev(BufferView &) const;
 
        /// target pos when we enter the inset from the left by pressing "Right"
-       bool idxFirst(idx_type & idx, pos_type & pos) const;
+       bool idxFirst(BufferView &) const;
        /// target pos when we enter the inset from the right by pressing "Left"
-       bool idxLast(idx_type & idx, pos_type & pos) const;
+       bool idxLast(BufferView &) const;
 
        /// where should we go if we press home?
-       bool idxHome(idx_type & idx, pos_type & pos) const;
+       bool idxHome(BufferView &) const;
        /// where should we go if we press end?
-       bool idxEnd(idx_type & idx, pos_type & pos) const;
+       bool idxEnd(BufferView &) const;
 
        /// number of cells currently governed by us
        idx_type nargs() const;
@@ -83,8 +81,6 @@ public:
        /// request "external features"
        void validate(LaTeXFeatures & features) const;
 
-       /// match in all cells
-       bool match(MathAtom const &) const;
        /// replace in all cells
        void replace(ReplaceData &);
        /// do we contain a given pattern?
@@ -101,12 +97,12 @@ public:
        void write(WriteStream & os) const;
        /// writes [, name(), and args in []
        void normalize(NormalStream & os) const;
-
-       /// local dispatcher
-       dispatch_result
-               dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
-
 protected:
+       ///
+       virtual
+       DispatchResult
+       priv_dispatch(BufferView & bv, FuncRequest const & cmd);
+
        /// we store the cells in a vector
        typedef std::vector<MathArray> cells_type;
        /// thusly:
@@ -123,7 +119,6 @@ protected:
        void metricsMarkers(int frame = 1) const;
        /// add space for markers
        void metricsMarkers2(int frame = 1) const;
-
 };
 
 #endif