release: 1.0.15

[lilypond.git] / flower / include / cursor.hh

diff --git a/flower/include/cursor.hh b/flower/include/cursor.hh
index f19f3ac62b723810dfe9db3cd0924648e8ebaa04..a7e5a1836d911cc9bb86722384078b49ee7cd9dc 100644 (file)
--- a/flower/include/cursor.hh
+++ b/flower/include/cursor.hh
@@ -21,10 +21,6 @@ public:
   /** create cursor, set at top. The const part isn't true, actually, #list#
     surely isn't const, but I get tired of the warning messages.  */
   Cursor (const List<T>& list, Link<T>* pointer = 0);
-  /**
-    Create an invalid cursor (pointing to nothing, associated with   no list.)
-    */
-  Cursor();
   Cursor (const Cursor<T>& cursor);
 
   T& thing();
@@ -32,13 +28,13 @@ public:
   /// return current T
   T& operator *() { return thing(); }
   operator T() { return thing(); }
-  Cursor<T> operator =( const Cursor<T>& c);
+  Cursor<T> operator =(const Cursor<T>& c);
 
   /// make cursor with #no# items back
-  Cursor<T> operator -( int no) const;
+  Cursor<T> operator -(int no) const;
 
   /// make cursor with #no# items further
-  Cursor<T> operator +( int no) const;
+  Cursor<T> operator +(int no) const;
   int operator -(Cursor<T> op) const;
   Cursor<T> operator -=(int);
   Cursor<T> operator +=(int);
@@ -47,10 +43,10 @@ public:
   /// move one up.
   void previous();
   /// return current and move one down
-  Cursor<T> operator ++( int);
+  Cursor<T> operator ++(int);
     
   /// return current and move one up
-  Cursor<T> operator --( int); 
+  Cursor<T> operator --(int); 
 
   /// point to link?
   bool ok() const;
@@ -94,12 +90,14 @@ public:
   void del();
     
   /// access the list this came from
-  List<T>& list() const ;
+  List<T>* list_l() const ;
   Link<T>* pointer();
   static   int compare (Cursor<T> a,Cursor<T>b) { return a-b; }
+
 private:
-  List<T>& list_;
+  
   Link<T>* pointer_;
+  List<T>* list_l_;
 };