X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fproperty-iterator.hh;h=bd5f28c280119d2727e2a6ad5f29edb9c2275d75;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=e72a0a894fa332d004def33c2e531e8c9e87cf15;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/lily/include/property-iterator.hh b/lily/include/property-iterator.hh
index e72a0a894f..bd5f28c280 100644
--- a/lily/include/property-iterator.hh
+++ b/lily/include/property-iterator.hh
@@ -3,27 +3,37 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef PROPERTY_ITERATOR_HH
 #define PROPERTY_ITERATOR_HH
 
 #include "simple-music-iterator.hh"
 
+/**
+   Iterate a property.
+*/
+class Property_iterator : public Simple_music_iterator
+{
+public:
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_SCHEME_CALLBACK (once_finalization, (SCM, SCM));
+  DECLARE_CLASSNAME(Property_iterator);
 
-
+protected:
+  virtual void do_quit ();
+  virtual void process (Moment);
+};
 
 /**
-  Iterate a property.  
- */
-class Property_iterator : public Simple_music_iterator
+   Iterate a property.
+*/
+class Property_unset_iterator : public Simple_music_iterator
 {
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
-  static SCM constructor_cxx_function;
-  /* construction */
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME(Property_unset_iterator);
 protected:
   virtual void process (Moment);
 };
@@ -31,22 +41,21 @@ protected:
 class Push_property_iterator : public Simple_music_iterator
 {
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
-  static SCM constructor_cxx_function;  
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_SCHEME_CALLBACK (once_finalization, (SCM, SCM));
+  DECLARE_CLASSNAME(Push_property_iterator);
 protected:
-  /* construction */
   virtual void process (Moment);
+  virtual void do_quit ();
 };
 
 class Pop_property_iterator : public Simple_music_iterator
 {
 public:
-  static SCM constructor_cxx_function;
-  VIRTUAL_COPY_CONS (Music_iterator);
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME(Pop_property_iterator);
 protected:
-  /* construction */
   virtual void process (Moment);
 };
 
-
 #endif // PROPERTY_ITERATOR_HH