X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxcursor.C;h=fb298015452f491df3df0e8cc6a0b0e70641ac49;hb=09e01879979643949f1f2c7216023f1f35d5ada2;hp=2bd2e5f9a2a94a5afd39eed0dbae0a49062f2dae;hpb=ea853ed6130aebb78c1a10da38d41dfd635343c6;p=lyx.git

diff --git a/src/lyxcursor.C b/src/lyxcursor.C
index 2bd2e5f9a2..fb29801545 100644
--- a/src/lyxcursor.C
+++ b/src/lyxcursor.C
@@ -1,59 +1,47 @@
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- * 	 
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+/**
+ * \file lyxcursor.C
+ * Copyright 1995-2001 the LyX Team
+ * Read the file COPYING
  *
- * ====================================================== */
+ * \author Matthias Ettrich
+ */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "lyxcursor.h"
 
 
-LyXCursor::LyXCursor() : par_(0), pos_(0), boundary_(false),
-			 x_(0), x_fix_(0), y_(0), row_(0)
-{
-}
+LyXCursor::LyXCursor()
+	: par_(), pos_(0), boundary_(false),
+	  x_(0), ix_(0), x_fix_(0), y_(0), iy_(0)
+{}
 
 
-void LyXCursor::par(Paragraph * p) 
+void LyXCursor::par(ParagraphList::iterator pit)
 {
-	par_ = p;
+	par_ = pit;
 }
 
 
-//Paragraph * LyXCursor::par()
-//{
-//	return par_;
-//}
-
-
-Paragraph * LyXCursor::par() const
+ParagraphList::iterator LyXCursor::par() const
 {
 	return par_;
 }
 
 
-void LyXCursor::pos(Paragraph::size_type p)
+void LyXCursor::pos(lyx::pos_type p)
 {
 	pos_ = p;
 }
 
 
-Paragraph::size_type LyXCursor::pos() const
+lyx::pos_type LyXCursor::pos() const
 {
 	return pos_;
 }
 
 
-void LyXCursor::boundary(bool b) 
+void LyXCursor::boundary(bool b)
 {
 	boundary_ = b;
 }
@@ -76,6 +64,17 @@ int LyXCursor::x() const
 }
 
 
+void LyXCursor::ix(int n)
+{
+	ix_ = n;
+}
+
+int LyXCursor::ix() const
+{
+	return ix_;
+}
+
+
 void LyXCursor::x_fix(int i)
 {
 	x_fix_ = i;
@@ -100,19 +99,28 @@ int LyXCursor::y() const
 }
 
 
-void LyXCursor::row(Row * r)
+void LyXCursor::iy(int i)
 {
-	row_ = r;
+	iy_ = i;
 }
 
 
-//Row * LyXCursor::row()
-//{
-//	return row_;
-//}
+int LyXCursor::iy() const
+{
+	return iy_;
+}
 
 
-Row * LyXCursor::row() const
+bool operator==(LyXCursor const & a, LyXCursor const & b)
 {
-	return row_;
+	return a.par() == b.par()
+	    && a.pos() == b.pos()
+	    && a.boundary() == b.boundary();
 }
+
+
+bool operator!=(LyXCursor const & a, LyXCursor const & b)
+{
+	return !(a == b);
+}
+