small cleanup, doxygen, formatting changes

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

diff --git a/src/mathed/math_iter.h b/src/mathed/math_iter.h
index 29bf9297c1a7f1c2cae3c6e45e4eed8a88ea8599..846c845983092b998d1ad1c6864eb127cd87767c 100644 (file)
--- a/src/mathed/math_iter.h
+++ b/src/mathed/math_iter.h
@@ -24,16 +24,19 @@
 #pragma interface
 #endif
 
+#include "mathed/support.h"
 #include "math_defs.h"
 
 class MathedInset;
+class MathedArray;
+class MathParInset;
 
 ///
 enum mathIterFlags {
-    /// Allow newlines
-    MthIF_CR = 1,
-    /// Allow tabs
-    MthIF_Tabs = 2
+       /// Allow newlines
+       MthIF_CR = 1,
+       /// Allow tabs
+       MthIF_Tabs = 2
 };
 
 
@@ -43,13 +46,7 @@ enum mathIterFlags {
 class MathedIter {
 public:
        ///
-       MathedIter() {
-               pos = 0;
-               fcode = 0;
-               array = 0;
-               flags = 0;
-               ncols = row = col = 0;
-       }
+       MathedIter();
        ///
        explicit
        MathedIter(MathedArray *);
@@ -58,8 +55,6 @@ public:
        ///
        bool goNextCode(MathedTextCodes);
        ///
-       void goPosRel(int);
-       ///
        void goPosAbs(int);
        ///
        int Empty() const;
@@ -131,7 +126,11 @@ protected:
        ///
        mutable int pos;
        ///
-       int row, col, ncols;
+       int row;
+       ///
+       int col;
+       ///
+       int ncols;
        ///
        MathedArray * array;
        // one element stack
@@ -139,9 +138,15 @@ protected:
                ///
                short fcode;
                ///
-               int x, y;
+               int x;
+               ///
+               int y;
+               ///
+               int pos;
+               ///
+               int row;
                ///
-               int pos, row, col;
+               int col;
        };
        ///
        MIState stck;
@@ -152,8 +157,8 @@ protected:
 };
 
 ///
-#define MX_WAS_SUB   1
+//#define MX_WAS_SUB   1
 ///
-#define MX_WAS_SUPER 2
+//#define MX_WAS_SUPER 2
 
 #endif