the spellcheck cleanup

[lyx.git] / src / lyxcursor.h

diff --git a/src/lyxcursor.h b/src/lyxcursor.h
index f19915e0657ff7e37cb6611978c536942321910e..dd9497e2974b5a17fcd04491eae6c06bd4dd24bf 100644 (file)
--- a/src/lyxcursor.h
+++ b/src/lyxcursor.h
@@ -1,17 +1,22 @@
 // -*- C++ -*-
 /**
  * \file lyxcursor.h
- * Copyright 1995-2001 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
+ * \author Lars Gullik Bjønnes
  * \author Matthias Ettrich
+ * \author John Levon
+ * \author André Pönitz
+ * \author Dekel Tsur
+ * \author Jürgen Vigna
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef LYXCURSOR_H
 #define LYXCURSOR_H
 
-#include "RowList.h"
-#include "ParagraphList.h"
 #include "support/types.h"
 
 /**
@@ -25,9 +30,9 @@ class LyXCursor {
 public:
        LyXCursor();
        /// set the paragraph that contains this cursor
-       void par(ParagraphList::iterator pit);
+       void par(lyx::paroffset_type pit);
        /// return the paragraph this cursor is in
-       ParagraphList::iterator par() const;
+       lyx::paroffset_type par() const;
        /// set the position within the paragraph
        void pos(lyx::pos_type p);
        /// return the position within the paragraph
@@ -40,62 +45,14 @@ public:
        void x(int i);
        /// return the x position in pixels
        int x() const;
-       /// set the stored next-line position when at the end of a row
-       void ix(int i);
-       /**
-        * Return the x position of the start of the next row, when this
-        * cursor is at the end of the previous row, for insets that take
-        * a full row.
-        *
-        * FIXME: explain why we need this ?
-        */
-       int ix() const;
-       /// set the cached x position
-       void x_fix(int i);
-       /**
-        * Return the cached x position of the cursor. This is used for when
-        * we have text like :
-        *
-        * blah blah blah blah| blah blah blah
-        * blah blah blah
-        * blah blah blah blah blah blah
-        *
-        * When we move onto row 3, we would like to be vertically aligned
-        * with where we were in row 1, despite the fact that row 2 is
-        * shorter than x()
-        */
-       int x_fix() const;
        /// set the y position in pixels
        void y(int i);
        /// return the y position in pixels
        int y() const;
-       /// set the stored next-line y position when at the end of a row
-       void iy(int i);
-       /**
-        * Return the y position of the start of the next row, when this
-        * cursor is at the end of the previous row, for insets that take
-        * a full row.
-        *
-        * FIXME: explain why we need this ? especially for y...
-        */
-       int iy() const;
-       /// set the row of the paragraph the cursor is in
-       void row(RowList::iterator r);
-       /// return the row of the paragraph this cursor is in
-       RowList::iterator row() const;
-       /// set the stored next row
-       void irow(RowList::iterator r);
-       /**
-        * Return the next row, when this
-        * cursor is at the end of the previous row, for insets that take
-        * a full row.
-        *
-        * FIXME: explain why we need this ? especially for y...
-        */
-       RowList::iterator irow() const;
+
 private:
        /// The paragraph the cursor is in.
-       ParagraphList::iterator par_;
+       lyx::paroffset_type par_;
        /// The position inside the paragraph
        lyx::pos_type pos_;
        /**
@@ -116,59 +73,13 @@ private:
        bool boundary_;
        /// the pixel x position
        int x_;
-       /// the stored next-row x position
-       int ix_;
-       /// the cached x position
-       int x_fix_;
        /// the pixel y position
        int y_;
-       /// the stored next-row y position
-       int iy_;
-       /// the containing row
-       RowList::iterator row_;
-       /// the containing row for the next line
-       RowList::iterator irow_;
 };
 
-/// these three dictate the others
-inline
-bool operator==(LyXCursor const & a, LyXCursor const & b)
-{
-       return (a.par() == b.par())
-               && (a.pos() == b.pos())
-               && a.boundary() == b.boundary();
-}
-
-inline
-bool operator!=(LyXCursor const & a, LyXCursor const & b)
-{
-       return !(a == b);
-}
-
-/// only compares y() and pos(). Can this be done in another way?
-inline
-bool operator<(LyXCursor const & a, LyXCursor const & b)
-{
-       return (a.y() < b.y() && a.pos() < b.pos());
-}
-
-inline
-bool operator>(LyXCursor const & a, LyXCursor const & b)
-{
-       return b < a;
-}
-
-inline
-bool operator>=(LyXCursor const & a, LyXCursor const & b)
-{
-       return !(a < b);
-}
-
-
-inline
-bool operator<=(LyXCursor const & a, LyXCursor const & b)
-{
-       return !(a > b);
-}
+///
+bool operator==(LyXCursor const & a, LyXCursor const & b);
+///
+bool operator!=(LyXCursor const & a, LyXCursor const & b);
 
 #endif // LYXCURSOR_H