revert most of the stuff that got reverted yesterday but was not

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

diff --git a/src/mathed/math_cursor.h b/src/mathed/math_cursor.h
index 93f5d05bcf21bdf120bfe14d0309cc4679e29071..ec6ae8934b9bdca751ea773e70dadbcb3528173d 100644 (file)
--- a/src/mathed/math_cursor.h
+++ b/src/mathed/math_cursor.h
@@ -102,8 +102,8 @@ public:
        void setPos(int x, int y);
        /// in pixels from top of screen
        void getPos(int & x, int & y);
-       /// 
-       MathAtom & par() const;
+       /// current inset
+       MathInset * par() const;
        /// return the next enclosing grid inset and the cursor's index in it
        MathGridInset * enclosingGrid(idx_type &) const;
        ///
@@ -171,11 +171,9 @@ public:
        ///
        char halign() const;
        ///
-       col_type ncols() const;
+       col_type hullCol() const;
        ///
-       col_type col() const;
-       ///
-       row_type row() const;
+       row_type hullRow() const;
 
        /// make sure cursor position is valid
        void normalize() const;