merge CursorItem and MathPos

[lyx.git] / src / cursor.h

diff --git a/src/cursor.h b/src/cursor.h
index 1d46d7b030e9656c8b5881ddbc57d3998aca2d23..c4872b4494f3fa389ce62de97ee03326af39b46a 100644 (file)
--- a/src/cursor.h
+++ b/src/cursor.h
@@ -13,6 +13,7 @@
 #define CURSOR_H
 
 #include "textcursor.h"
+#include "cursor_slice.h"
 
 #include "support/types.h"
 
@@ -31,29 +32,6 @@ class InsetTabular;
  * The cursor class describes the position of a cursor within a document.
  */
 
-class CursorItem {
-public:
-       ///
-       CursorItem() : inset_(0), idx_(0), par_(0), pos_(0) {}
-       ///
-       explicit CursorItem(UpdatableInset * inset)
-               : inset_(inset), idx_(0), par_(0), pos_(0)
-       {}
-       ///
-       LyXText * text() const;
-       ///
-       friend std::ostream & operator<<(std::ostream &, CursorItem const &);
-public:
-       ///
-       UpdatableInset * inset_;
-       ///
-       int idx_;
-       ///
-       int par_;
-       ///
-       int pos_;
-};
-
 
 class LCursor {
 public:
@@ -85,7 +63,7 @@ public:
        friend std::ostream & operator<<(std::ostream &, LCursor const &);
 public:
        /// mainly used as stack, but wee need random access
-       std::vector<CursorItem> data_;
+       std::vector<CursorSlice> data_;
        ///
        BufferView * bv_;
 private: