X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fproperty-iterator.hh;h=2f70d027e01f54e42ccba09f27a757a2e5e877a8;hb=1e9b3a12dfaa81f718a5b5d203161be8ca732013;hp=9dd3b2cce08abb650bd8cca34278ee5991359e6b;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git

diff --git a/lily/include/property-iterator.hh b/lily/include/property-iterator.hh
index 9dd3b2cce0..2f70d027e0 100644
--- a/lily/include/property-iterator.hh
+++ b/lily/include/property-iterator.hh
@@ -3,43 +3,37 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef PROPERTY_ITERATOR_HH
 #define PROPERTY_ITERATOR_HH
 
 #include "simple-music-iterator.hh"
 
-
-
-
 /**
-  Iterate a property.  
- */
+   Iterate a property.
+*/
 class Property_iterator : public Simple_music_iterator
 {
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
-  static SCM constructor_cxx_function;
-  /* construction */
+  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.  
- */
+   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);
 };
@@ -47,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