X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCursorSlice.h;h=19a6e1f581f69a55deac74e540aed0bb979535c8;hb=fa2f219d928f7b07ee98cb499f78f7581b62dabc;hp=cdd13ecec0124ac7275f607a07e88ee645540339;hpb=3fdbf5b9c4122b5c9a122978f6374e0b9bcab010;p=lyx.git

diff --git a/src/CursorSlice.h b/src/CursorSlice.h
index cdd13ecec0..19a6e1f581 100644
--- a/src/CursorSlice.h
+++ b/src/CursorSlice.h
@@ -4,12 +4,12 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Matthias Ettrich
  * \author John Levon
- * \author André Pönitz
+ * \author André Pönitz
  * \author Dekel Tsur
- * \author Jürgen Vigna
+ * \author Jürgen Vigna
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -18,14 +18,9 @@
 #define CURSORSLICE_H
 
 #include "support/types.h"
+#include "support/strfwd.h"
 #include "insets/Inset.h"
 
-#include <boost/signal.hpp>
-#include <boost/signals/trackable.hpp>
-
-#include <cstddef>
-#include <iosfwd>
-
 
 namespace lyx {
 
@@ -41,7 +36,7 @@ class Paragraph;
 // that of MathData and Text should vanish. They are conceptually the
 // same (now...)
 
-class CursorSlice : public boost::signals::trackable {
+class CursorSlice {
 public:
 	/// Those needs inset_ access.
 	///@{
@@ -59,13 +54,16 @@ public:
 	///
 	CursorSlice();
 	///
-	CursorSlice(CursorSlice const &);
-	///
 	explicit CursorSlice(Inset &);
-	///
-	CursorSlice & operator=(CursorSlice const &);
-	///
-	bool isValid() const;
+
+	/// comparison operators.
+	//@{
+	friend bool operator==(CursorSlice const &, CursorSlice const &);
+	friend bool operator!=(CursorSlice const &, CursorSlice const &);
+	friend bool operator<(CursorSlice const &, CursorSlice const &);
+	friend bool operator>(CursorSlice const &, CursorSlice const &);
+	friend bool operator<=(CursorSlice const &, CursorSlice const &);
+	//@}
 
 	/// the current inset
 	Inset & inset() const { return *inset_; }
@@ -79,6 +77,8 @@ public:
 	pit_type pit() const { return pit_; }
 	/// set the offset of the paragraph this cursor is in
 	pit_type & pit() { return pit_; }
+	/// return the last paragraph offset within the ParagraphList
+	pit_type lastpit() const;
 	/// increments the paragraph this cursor is in
 	void incrementPar();
 	/// decrements the paragraph this cursor is in
@@ -110,13 +110,9 @@ public:
 	/// texted specific stuff
 	///
 	/// returns text corresponding to this position
-	Text * text() { return inset_->getText(idx_); }
-	/// returns text corresponding to this position
-	Text const * text() const { return inset_->getText(idx_); }
-	/// paragraph in this cell
-	Paragraph & paragraph();
+	Text * text() const { return inset_->getText(idx_); }
 	/// paragraph in this cell
-	Paragraph const & paragraph() const;
+	Paragraph & paragraph() const;
 
 	///
 	/// mathed specific stuff
@@ -128,9 +124,20 @@ public:
 
 	/// write some debug information to \p os
 	friend std::ostream & operator<<(std::ostream &, CursorSlice const &);
+	/// move to next position
+	void forwardPos();
+	/// move to previous position
+	void backwardPos();
+	/// move to next cell
+	void forwardIdx();
+	/// move to previous cell
+	void backwardIdx();
+	/// are we at the end of this slice
+	bool at_end() const;
+	/// are we at the start of this slice
+	bool at_begin() const;
+	
 private:
-	///
-	void invalidate();
 
 	/// pointer to 'owning' inset. This is some kind of cache.
 	Inset * inset_;
@@ -152,23 +159,10 @@ private:
 	idx_type idx_;
 	/// paragraph in this cell (used by texted)
 	pit_type pit_;
-	/// true if 'pit' was properly initialized
-	bool pit_valid_;
 	/// position in this cell
 	pos_type pos_;
 };
 
-/// test for equality
-bool operator==(CursorSlice const &, CursorSlice const &);
-/// test for inequality
-bool operator!=(CursorSlice const &, CursorSlice const &);
-/// test for order
-bool operator<(CursorSlice const &, CursorSlice const &);
-/// test for order
-bool operator>(CursorSlice const &, CursorSlice const &);
-/// test for order
-bool operator<=(CursorSlice const &, CursorSlice const &);
-
 
 } // namespace lyx